<!-- task=m-iop-agent-cli-runtime/12+10,11_change_set_integration plan=1 tag=REVIEW_API -->

# Code Review Reference - REVIEW_API

> **[IMPLEMENTING AGENT — READ FIRST] Filling in this file is the mandatory final step of implementation.**
> The task is NOT complete until every implementation-owned section below is filled in.
> Complete the `Implementation Checklist`; the final checklist item is mandatory before saving.
> Fill implementation-owned sections, then stop with active files in place and report ready for review.
> If implementation is blocked, record the exact blocker, attempted commands/output, and resume condition only in implementation-owned evidence fields.
> Do not ask the user directly, present choices, call user-input tools, create control-plane stop files, or classify the next state.
> Finalization (`Code Review Result`, log rename, `complete.log`, archive moves, `Review-Only Checklist`) is review-agent-only, even after compaction/resume.
> Follow the ownership table at the bottom of this file for which sections you own.

## Overview

date=2026-07-29
task=m-iop-agent-cli-runtime/12+10,11_change_set_integration, plan=1, tag=REVIEW_API

## Roadmap Targets

- Milestone: `agent-roadmap/phase/automation-runtime-bridge/milestones/iop-agent-cli-runtime.md`
- Milestone link: [Milestone document](agent-roadmap/phase/automation-runtime-bridge/milestones/iop-agent-cli-runtime.md)
- Task ids:
  - `change-set-integration`: immutable change set and serial integration
- Completion mode: check-on-pass

## Archive Evidence Snapshot

- Prior plan: `agent-task/m-iop-agent-cli-runtime/12+10,11_change_set_integration/plan_cloud_G10_0.log`
- Prior review: `agent-task/m-iop-agent-cli-runtime/12+10,11_change_set_integration/code_review_cloud_G10_0.log`
- Verdict: FAIL; Required=3, Suggested=0, Nit=0.
- Affected files: `packages/go/agentworkspace/integrator.go`, `packages/go/agentworkspace/integrator_test.go`, `packages/go/agenttask/integration_queue.go`, `packages/go/agenttask/integration_queue_test.go`.
- Evidence: the fresh race suite, package-wide suite, vet, formatting, and diff checks passed; a focused reviewer reproducer failed because an ordinal-2 directory deletion removed `tree/new.txt` added by ordinal 1.
- Roadmap carryover: `change-set-integration` remains incomplete until S19 clean merge, exact rollback, deterministic ordinal, revised retry, restart, and retention evidence pass.

## For the Review Agent

> **[REVIEW AGENT ONLY]** The finalization steps below are review-agent only. Implementing agents must not execute this section.

Compare implementation of each item against source files and verify that output in `Verification Results` matches code.
Review completion means the following steps are finished:

1. Append verdict and `review_rework_count` / `evidence_integrity_failure` routing signals.
2. Archive `CODE_REVIEW-cloud-G10.md` → `code_review_cloud_G10_1.log` and `PLAN-cloud-G08.md` → `plan_cloud_G08_1.log`.
3. If PASS, write `complete.log` and move active task directory to `agent-task/archive/YYYY/MM/m-iop-agent-cli-runtime/12+10,11_change_set_integration/`. If WARN/FAIL, fully write the next filesystem state required by the code-review skill.
4. If PASS and task group is `m-<milestone-slug>`, report completion event metadata. Roadmap state check and `update-roadmap` calls are runtime responsibilities.
5. Check applicable `Review-Only Checklist` items at the final `.log` location before reporting.

---

## Implementation Item Completion

| Item | Status |
|------|---------|
| REVIEW_API-1 Make candidate validation and hierarchical merge atomic | [x] |
| REVIEW_API-2 Enforce terminal lower-ordinal admission | [x] |

## Implementation Checklist

- [x] Preserve or explicitly conflict on managed predecessor descendants during directory deletion/type replacement, and validate the candidate outside the canonical workspace before mutation.
- [x] Require every lower dispatch ordinal to be completed or terminal-deferred before integration, and add real backend revised-retry plus focused ordering/rollback regressions.
- [x] Fill implementation-owned sections in CODE_REVIEW-*-G??.md with actual implementation notes and verification output.

## Review-Only Checklist

> **[REVIEW AGENT ONLY]** This checklist is used only by the review agent.
> Implementing agents must not modify or check this section.

- [x] Append one verdict of `PASS`, `WARN`, or `FAIL` and verified `review_rework_count`, `evidence_integrity_failure` to `Code Review Result`.
- [x] Verify that verdict, `Dimension Assessment`, and Required/Suggested/Nit classifications match.
- [x] Archive active `CODE_REVIEW-*-G??.md` to `code_review_cloud_G10_1.log`.
- [x] Archive active `PLAN-*-G??.md` to `plan_cloud_G08_1.log`.
- [x] Verify that the Agent-Ops managed block in `.gitignore` unignores `agent-task/**/*.md` and `agent-task/**/*.log` and ignores `agent-roadmap/current.md`.
- [ ] If PASS, write `complete.log` based on `agent-ops/skills/common/code-review/templates/complete-log-template.md` and leave no active `.md` files.
- [ ] If PASS, move active task directory `agent-task/m-iop-agent-cli-runtime/12+10,11_change_set_integration/` to `agent-task/archive/YYYY/MM/m-iop-agent-cli-runtime/12+10,11_change_set_integration/` and update this checklist at the final archive path.
- [ ] If PASS and task group is `m-<milestone-slug>`, report completion event metadata for runtime, without modifying roadmap or directly calling `update-roadmap`.
- [ ] If PASS for split work, remove empty active parent `agent-task/m-iop-agent-cli-runtime/` or verify it was kept due to remaining siblings/files.
- [x] If WARN/FAIL, write the next filesystem state matching code-review verdict and do not write `complete.log`.

## Deviations from Plan

- The `applying` durable record keeps `Validation = "pending"` (not `"passed"`) even though candidate validation already succeeded before it is written. `validateIntegrationRecord` requires an applying record to carry `Validation == "pending"`, and restart recovery replays that exact record; changing it would break `TestSerialIntegratorRestartRecoversInterruptedApplyByRollback`. Validation success is instead reflected only on the terminal `integrated` record (`Validation == "passed"`). This is an internal record-field choice, not a semantic deviation.
- Added a canonical drift reconfirmation after candidate validation (`reconfirmed.Revision != observed.Revision` → retained terminal-deferred). The plan's Solution explicitly calls for reconfirming the canonical fingerprint after validation; it is realized as an extra terminal branch that touches no canonical state.
- `installRegular`/`installSymlink` were also hardened to refuse recursive deletion of a non-empty directory during a type replacement (defense in depth). `prepareChanges` already converts such a case into a retained conflict before any mutation, so this guard is never expected to fire in a valid flow, but it closes the "never use recursive deletion for an unproven-empty managed parent" requirement at the lowest layer.

## Key Design Decisions

- **Candidate-before-canonical ordering (REVIEW_API-1, finding 2).** `Integrate` now builds a runtime-owned candidate view (`prepareValidationCandidate` → `copyWorkspaceTree` of the exact observed workspace minus `.git`, then `applyPreparedChanges` of the frozen three-way result) and runs the host validator against that `ValidationRoot`. The candidate is removed immediately after validation. Because validation runs before any canonical mutation, a validator side effect (inside or outside the change-set write set) can never survive: on failure the run commits a retained terminal-deferred record and the canonical workspace is never touched. `CanonicalRoot` remains the immutable workspace identity in the request; `ValidationRoot` is the new candidate field.
- **Hierarchy-aware three-way preparation (REVIEW_API-1, finding 1).** `prepareChanges` now tracks the change set's owned paths and, for any operation that deletes or type-replaces a directory, calls `hasIndependentDescendants` over the observed snapshot. A managed-predecessor descendant not owned by this change set causes a pure directory delete to be preserved (the container is kept) and a directory→non-directory replacement to become a retained conflict (`integrationBlocker`). `applyPreparedChanges` uses `removePreparedTarget`, which removes a directory only when it is empty (non-recursive) and otherwise preserves it, so a managed predecessor's unseen descendant can never be destroyed by a later parent-directory operation. `os.RemoveAll` is no longer used for change-set-owned deletions or type replacements.
- **Terminal-only lower-ordinal admission (REVIEW_API-2, finding 3).** `integrationCandidateReady` now releases a higher ordinal only when every lower dispatch ordinal is `completed` or `terminal_deferred`. The prior `blocked`/`stopped`-with-no-change-set bypass is removed, because those states can return to `ready` under the same `DispatchOrdinal` and later produce a change set; they now remain barriers regardless of whether a change set is currently present.
- **Regression coverage.** Backend regressions exercise managed-descendant preservation across a directory delete, validator side-effect isolation on the candidate view, and a revised immutable change set integrating at the next attempt after a retained conflict on a real durable backend. Manager regressions add a table over reviewing/blocked/stopped/completed/terminal-deferred lower ordinals and a stop/resume ordering case proving the halted lower ordinal integrates before the waiting higher ordinal.

## Reviewer Checkpoints

- A managed predecessor descendant is never removed by a later parent-directory operation unless the three-way result explicitly owns that descendant.
- Validator side effects remain outside canonical state, and any rejected apply restores the exact observed fingerprint.
- A higher dispatch ordinal remains ineligible until every lower ordinal is completed or terminal-deferred.
- A revised immutable change set can integrate after a retained conflict and later independent advance without replaying the first attempt.

## Verification Results

Paste actual stdout/stderr and exit status under every command. If a command changes, record the replacement and reason in `Deviations from Plan`.

### `command -v go && readlink -f "$(command -v go)" && go version && go env GOROOT`

```text
/config/.local/bin/go
/config/opt/go/bin/go
go version go1.26.2 linux/arm64
/config/opt/go
```

### `command -v git`

```text
/bin/git
```

### `go test -count=1 -run '^TestSerialIntegrator' -v ./packages/go/agentworkspace`

```text
=== RUN   TestSerialIntegratorAppliesDisjointSetsAndReplaysAfterRestart
--- PASS: TestSerialIntegratorAppliesDisjointSetsAndReplaysAfterRestart (3.94s)
=== RUN   TestSerialIntegratorThreeWayMergesManagedPredecessor
--- PASS: TestSerialIntegratorThreeWayMergesManagedPredecessor (0.60s)
=== RUN   TestSerialIntegratorRetainsConflictAndAdvancesIndependentChangeSet
--- PASS: TestSerialIntegratorRetainsConflictAndAdvancesIndependentChangeSet (0.85s)
=== RUN   TestSerialIntegratorRejectsUnmanagedDriftWithoutMutation
--- PASS: TestSerialIntegratorRejectsUnmanagedDriftWithoutMutation (0.42s)
=== RUN   TestSerialIntegratorRollsBackFailedValidationAndReplaysTerminalResult
--- PASS: TestSerialIntegratorRollsBackFailedValidationAndReplaysTerminalResult (0.29s)
=== RUN   TestSerialIntegratorRestartRecoversInterruptedApplyByRollback
--- PASS: TestSerialIntegratorRestartRecoversInterruptedApplyByRollback (0.30s)
=== RUN   TestSerialIntegratorPreservesManagedDescendantAcrossDirectoryDeletion
--- PASS: TestSerialIntegratorPreservesManagedDescendantAcrossDirectoryDeletion (7.36s)
=== RUN   TestSerialIntegratorValidationMutationDoesNotEscapeCandidateView
--- PASS: TestSerialIntegratorValidationMutationDoesNotEscapeCandidateView (2.36s)
=== RUN   TestSerialIntegratorRevisedChangeSetAfterConflictAndLaterAdvance
--- PASS: TestSerialIntegratorRevisedChangeSetAfterConflictAndLaterAdvance (7.47s)
PASS
ok  	iop/packages/go/agentworkspace	23.588s
```

### `go test -count=1 -run '^(TestIntegrationCandidateRequiresTerminalLowerOrdinal|TestIntegrationStopResumePreservesOrdinal|TestIntegrationOutOfOrderWorkerCompletionUsesDispatchOrdinal|TestIntegrationTerminalDeferredAdvancesIndependentQueue|TestRevisedChangeSetUsesNextIntegrationAttempt|TestRestartReplayUsesStableIdempotencyKeysWithoutDuplicateCalls)$' -v ./packages/go/agenttask`

```text
=== RUN   TestIntegrationOutOfOrderWorkerCompletionUsesDispatchOrdinal
--- PASS: TestIntegrationOutOfOrderWorkerCompletionUsesDispatchOrdinal (0.10s)
=== RUN   TestIntegrationTerminalDeferredAdvancesIndependentQueue
--- PASS: TestIntegrationTerminalDeferredAdvancesIndependentQueue (0.10s)
=== RUN   TestIntegrationCandidateRequiresTerminalLowerOrdinal
=== RUN   TestIntegrationCandidateRequiresTerminalLowerOrdinal/reviewing_barrier
=== RUN   TestIntegrationCandidateRequiresTerminalLowerOrdinal/pending_barrier
=== RUN   TestIntegrationCandidateRequiresTerminalLowerOrdinal/blocked_without_change_set_barrier
=== RUN   TestIntegrationCandidateRequiresTerminalLowerOrdinal/blocked_with_change_set_barrier
=== RUN   TestIntegrationCandidateRequiresTerminalLowerOrdinal/stopped_without_change_set_barrier
=== RUN   TestIntegrationCandidateRequiresTerminalLowerOrdinal/stopped_with_change_set_barrier
=== RUN   TestIntegrationCandidateRequiresTerminalLowerOrdinal/completed_releases
=== RUN   TestIntegrationCandidateRequiresTerminalLowerOrdinal/terminal-deferred_releases
--- PASS: TestIntegrationCandidateRequiresTerminalLowerOrdinal (0.00s)
    --- PASS: TestIntegrationCandidateRequiresTerminalLowerOrdinal/reviewing_barrier (0.00s)
    --- PASS: TestIntegrationCandidateRequiresTerminalLowerOrdinal/pending_barrier (0.00s)
    --- PASS: TestIntegrationCandidateRequiresTerminalLowerOrdinal/blocked_without_change_set_barrier (0.00s)
    --- PASS: TestIntegrationCandidateRequiresTerminalLowerOrdinal/blocked_with_change_set_barrier (0.00s)
    --- PASS: TestIntegrationCandidateRequiresTerminalLowerOrdinal/stopped_without_change_set_barrier (0.00s)
    --- PASS: TestIntegrationCandidateRequiresTerminalLowerOrdinal/stopped_with_change_set_barrier (0.00s)
    --- PASS: TestIntegrationCandidateRequiresTerminalLowerOrdinal/completed_releases (0.00s)
    --- PASS: TestIntegrationCandidateRequiresTerminalLowerOrdinal/terminal-deferred_releases (0.00s)
=== RUN   TestIntegrationStopResumePreservesOrdinal
--- PASS: TestIntegrationStopResumePreservesOrdinal (0.00s)
=== RUN   TestRevisedChangeSetUsesNextIntegrationAttempt
--- PASS: TestRevisedChangeSetUsesNextIntegrationAttempt (0.12s)
=== RUN   TestRestartReplayUsesStableIdempotencyKeysWithoutDuplicateCalls
--- PASS: TestRestartReplayUsesStableIdempotencyKeysWithoutDuplicateCalls (0.11s)
PASS
ok  	iop/packages/go/agenttask	0.460s
```

### `go test -count=1 -race ./packages/go/agentworkspace ./packages/go/agentstate ./packages/go/agenttask`

```text
ok  	iop/packages/go/agentworkspace	32.400s
ok  	iop/packages/go/agentstate	1.257s
ok  	iop/packages/go/agenttask	7.146s
```

### `go test -count=1 ./packages/go/...`

```text
ok  	iop/packages/go/agentconfig	0.066s
ok  	iop/packages/go/agentguard	0.052s
ok  	iop/packages/go/agentpolicy	0.058s
ok  	iop/packages/go/agentprovider/catalog	0.091s
ok  	iop/packages/go/agentprovider/cli	37.579s
?   	iop/packages/go/agentprovider/cli/internal/testutil	[no test files]
ok  	iop/packages/go/agentprovider/cli/status	43.753s
ok  	iop/packages/go/agentruntime	0.924s
ok  	iop/packages/go/agentstate	0.361s
ok  	iop/packages/go/agenttask	3.991s
ok  	iop/packages/go/agentworkspace	59.909s
ok  	iop/packages/go/audit	0.022s
?   	iop/packages/go/auth	[no test files]
ok  	iop/packages/go/config	0.178s
?   	iop/packages/go/events	[no test files]
ok  	iop/packages/go/hostsetup	0.024s
?   	iop/packages/go/jobs	[no test files]
?   	iop/packages/go/metadata	[no test files]
ok  	iop/packages/go/observability	0.072s
?   	iop/packages/go/policy	[no test files]
ok  	iop/packages/go/streamgate	0.948s
?   	iop/packages/go/version	[no test files]
```

### `go vet ./packages/go/...`

```text
(no stdout/stderr; exit 0)
```

### `gofmt -d packages/go/agentworkspace/integrator.go packages/go/agentworkspace/integrator_test.go packages/go/agenttask/integration_queue.go packages/go/agenttask/integration_queue_test.go`

```text
(no stdout/stderr; exit 0)
```

### `git diff --check`

```text
(no stdout/stderr; exit 0)
```

### Repository E2E smoke and full-cycle execution

```text
Not applicable. The change is confined to the host-neutral packages agentworkspace/integrator.go and agenttask/integration_queue.go plus their tests. No binary entrypoint, transport, provider invocation, configuration, or protobuf contract changed; ValidationRequest gained an additive ValidationRoot field consumed only inside the workspace backend. No scope change.
```

---

> **[IMPLEMENTING AGENT — BEFORE SAVING] Have you filled in every implementation-owned section?**
> If anything is blank, go back and fill it in before saving this file.
> Leave review-agent-only sections unchanged.

## Section Ownership

| Section | Owner | Note |
|---------|-------|------|
| Header comment, Overview, Review Agent Instructions | Fixed at stub creation | Implementing agent must not modify or execute these (archive, complete.log, and task-directory archive move are review-agent only) |
| Roadmap Targets | Fixed at stub creation from plan when present | Implementing agent must not modify; code-review copies it into `complete.log` as `Roadmap Completion` only on PASS |
| Archive Evidence Snapshot | Fixed at stub creation from plan when present | Implementing agent uses it as default prior-loop context; read only the specific archive files cited there when more detail is required |
| Implementation Item Completion (item names) | Fixed at stub creation | Implementing agent checks `[ ]` → `[x]` only |
| Implementation Checklist (item text/order) | Fixed at stub creation from plan | Implementing agent checks `[ ]` → `[x]` only |
| Review-Only Checklist | Review agent only | Implementing agent must not modify or check this section |
| Deviations from Plan, Key Design Decisions | Implementing agent | Replace placeholder text with actual content |
| Reviewer Checkpoints | Fixed at stub creation | Pre-filled from plan |
| Verification Results (section headings + commands) | Fixed at stub creation | Implementing agent fills in command output only; command changes require a `Deviations from Plan` entry |
| Code Review Result | Review agent appends | Not included in stub |

## Code Review Result

- Overall Verdict: FAIL
- Dimension Assessment:
  - Correctness: Fail
  - Completeness: Fail
  - Test coverage: Fail
  - API contract: Fail
  - Code quality: Pass
  - Implementation deviation: Fail
  - Verification trust: Fail
  - Spec conformance: Fail
- Findings:
  - Required — `packages/go/agentworkspace/integrator.go:1058`: `applyPreparedChanges` orders every non-delete before every delete. A valid directory-to-regular or directory-to-symlink change set therefore attempts to replace the parent while its change-set-owned descendants still exist, and `removeEmptyDirectory` rejects the non-empty directory before either the validation candidate or canonical apply can complete. Fresh reviewer evidence from `go test -count=1 -run '^TestReviewReproducer' -v ./packages/go/agentworkspace` failed `TestReviewReproducerDirectoryToRegularReplacement` with `refusing to replace non-empty directory`, contradicting the recorded package-wide pass and violating S19 clean type-replacement integration. Apply owned descendant deletions before their parent type replacement, retain shallow-before-deep ordering for writes, cover both regular and symlink replacements in the canonical integration suite, and remove the temporary reviewer reproducer after migrating its regression.
- Routing Signals:
  - `review_rework_count=2`
  - `evidence_integrity_failure=true`
- Next Step: Invoke the plan skill with this raw finding and create the smallest freshly routed follow-up pair.
