ai-delivery-workflow 0.4.0 → 0.5.1

package/skills/ai-delivery-assemble-release/scripts/plan-release.mjs

@@ -69,6 +69,7 @@ function repositoriesFromWorkspace(workspaceRoot) {
     codeRepo,
     workflowRepo: root,
     repoId,
+    productionBranch: value(codeSection, "default_branch") || "main",
     codeRemote: value(codeSection, "remote"),
     workflowRemote: value(workflowSection, "remote"),
   };
@@ -134,6 +135,72 @@ function validateRemoteTag(remote, tag, expectedCommit) {
   }
 }
 
+function validateRemoteBranch(remote, branch, expectedCommit) {
+  if (!remote) return;
+  const reference = `refs/heads/${branch}`;
+  const result = spawnSync("git", ["ls-remote", "--heads", remote, reference], {
+    encoding: "utf8",
+    windowsHide: true,
+  });
+  if (result.status !== 0) {
+    throw new Error(`Remote branch validation failed for ${branch}: ${result.stderr.trim()}`);
+  }
+  const commits = result.stdout.split(/\r?\n/).filter(Boolean).map((line) => line.split(/\s+/)[0].toLowerCase());
+  if (!commits.length) throw new Error(`Remote is missing production branch ${branch}: ${remote}`);
+  if (!commits.includes(expectedCommit.toLowerCase())) {
+    throw new Error(
+      `Remote production branch ${branch} drifted from the captured main commit ${expectedCommit}; refresh the release request.`,
+    );
+  }
+}
+
+function validateReleaseBase(repo, branch, currentProduction, remote) {
+  const reference = `refs/heads/${branch}`;
+  const commit = git(repo, ["rev-parse", "--verify", `${reference}^{commit}`]);
+  validateRemoteBranch(remote, branch, commit);
+  if (currentProduction) {
+    const result = spawnSync(
+      "git",
+      ["merge-base", "--is-ancestor", currentProduction.candidate_commit, commit],
+      { cwd: repo, encoding: "utf8", windowsHide: true },
+    );
+    if (result.status !== 0) {
+      throw new Error(
+        `Production branch ${branch} is not descended from current production ${currentProduction.version_id}; refusing a divergent release base.`,
+      );
+    }
+  }
+  return commit;
+}
+
+function validateTargetContainsReleaseBase(repo, branch, releaseBase, target) {
+  if (releaseBase.toLowerCase() === String(target.candidate_commit).toLowerCase()) {
+    throw new Error(
+      `Target ${target.version_ready_tag} equals captured production branch ${branch} commit ${releaseBase}; an incremental release target must strictly descend from the R00 main snapshot.`,
+    );
+  }
+  const targetAlreadyReachable = spawnSync(
+    "git",
+    ["merge-base", "--is-ancestor", target.candidate_commit, releaseBase],
+    { cwd: repo, encoding: "utf8", windowsHide: true },
+  );
+  if (targetAlreadyReachable.status === 0) {
+    throw new Error(
+      `Target ${target.version_ready_tag} is already reachable from captured production branch ${branch} commit ${releaseBase}; an incremental release target must strictly descend from the R00 main snapshot.`,
+    );
+  }
+  const result = spawnSync(
+    "git",
+    ["merge-base", "--is-ancestor", releaseBase, target.candidate_commit],
+    { cwd: repo, encoding: "utf8", windowsHide: true },
+  );
+  if (result.status !== 0) {
+    throw new Error(
+      `Captured production branch ${branch} commit ${releaseBase} is not an ancestor of target ${target.version_ready_tag}; recreate the version candidate before release.`,
+    );
+  }
+}
+
 function validateAdjacentAncestry(repo, selected, currentProduction, commitField, label) {
   const chain = currentProduction
     ? [currentProduction, ...selected.filter((version) => version.version_id !== currentProduction.version_id)]
@@ -199,9 +266,21 @@ export function planRelease(lineage, request, options = {}) {
   }
 
   const target = ordered[targetIndex];
+  const sameVersionRedeploy = targetIndex === currentIndex;
   const newlyIncluded = ordered.slice(currentIndex + 1, targetIndex + 1);
-  const releaseEvidence = targetIndex === currentIndex ? [target] : newlyIncluded;
+  const releaseEvidence = sameVersionRedeploy ? [target] : newlyIncluded;
   const dependencyClosure = ordered.slice(0, targetIndex + 1);
+  const productionBranch = options.productionBranch || "main";
+  const currentProduction = currentIndex < 0 ? null : ordered[currentIndex];
+  let releaseBaseCommit = null;
+  if (!sameVersionRedeploy
+    && currentProduction?.candidate_commit
+    && target.candidate_commit
+    && String(currentProduction.candidate_commit).toLowerCase() === String(target.candidate_commit).toLowerCase()) {
+    throw new Error(
+      `Incremental target ${target.version_id} reuses current production ${currentProduction.version_id} candidate commit; use same-version redeploy instead.`,
+    );
+  }
   for (const version of releaseEvidence) {
     if (!ELIGIBLE_STATUSES.has(version.status)) {
       throw new Error(`Version ${version.version_id} is not eligible for release: ${version.status || "missing status"}.`);
@@ -221,6 +300,20 @@ export function planRelease(lineage, request, options = {}) {
   }
 
   if (!options.skipGit) {
+    releaseBaseCommit = validateReleaseBase(
+      path.resolve(options.repo || process.cwd()),
+      productionBranch,
+      currentProduction,
+      options.codeRemote || null,
+    );
+    if (!sameVersionRedeploy) {
+      validateTargetContainsReleaseBase(
+        path.resolve(options.repo || process.cwd()),
+        productionBranch,
+        releaseBaseCommit,
+        target,
+      );
+    }
     validateGit(
       path.resolve(options.repo || process.cwd()),
       dependencyClosure,
@@ -244,7 +337,7 @@ export function planRelease(lineage, request, options = {}) {
     target_environment: "production",
     current_production_version: currentId,
     target_version: target.version_id,
-    mode: targetIndex === currentIndex ? "same-version-redeploy" : "incremental",
+    mode: sameVersionRedeploy ? "same-version-redeploy" : "incremental",
     newly_included_versions: newlyIncluded.map((version) => version.version_id),
     dependency_closure: dependencyClosure.map((version) => version.version_id),
     target: {
@@ -262,6 +355,29 @@ export function planRelease(lineage, request, options = {}) {
     requires_fresh_verification: true,
     requires_fresh_approval: true,
     rollback_strategy: "previous-immutable-image-digest",
+    release_base: {
+      branch: productionBranch,
+      commit: releaseBaseCommit,
+      status: releaseBaseCommit ? "captured" : "pending-git-validation",
+      target_relation: sameVersionRedeploy
+        ? "target-already-in-release-base"
+        : "target-must-descend-from-release-base",
+    },
+    release_merge: {
+      strategy: sameVersionRedeploy ? "target-already-in-release-base" : "no-ff-single-version-ready-tag",
+      source_tag: target.version_ready_tag,
+      source_commit: target.candidate_commit,
+      merge_commit: null,
+      merge_created: !sameVersionRedeploy,
+      status: "pending-controlled-git-operation",
+    },
+    release_candidate: {
+      commit: sameVersionRedeploy ? releaseBaseCommit : null,
+      identity_source: sameVersionRedeploy
+        ? "release-base-when-target-already-reachable"
+        : "release-branch-head-after-merge",
+      status: "pending-controlled-git-operation",
+    },
   };
 }
 
@@ -270,7 +386,14 @@ function main(argv) {
   const lineageFile = path.resolve(required(options, "--lineage"));
   const configured = options.get("--workspace")
     ? repositoriesFromWorkspace(options.get("--workspace"))
-    : { codeRepo: process.cwd(), workflowRepo: process.cwd(), repoId: null, codeRemote: null, workflowRemote: null };
+    : {
+      codeRepo: process.cwd(),
+      workflowRepo: process.cwd(),
+      repoId: null,
+      productionBranch: "main",
+      codeRemote: null,
+      workflowRemote: null,
+    };
   const result = planRelease(readLineage(lineageFile), {
     release_id: required(options, "--release-id"),
     target_version: required(options, "--target"),
@@ -280,6 +403,7 @@ function main(argv) {
     repo: options.get("--repo") || configured.codeRepo,
     workflowRepo: options.get("--workflow-repo") || configured.workflowRepo,
     repoId: configured.repoId,
+    productionBranch: options.get("--production-branch") || configured.productionBranch || "main",
     codeRemote: configured.codeRemote,
     workflowRemote: configured.workflowRemote,
     skipGit: options.get("--skip-git") === true,

package/skills/ai-delivery-bootstrap/SKILL.md

@@ -44,7 +44,7 @@ The first product question is the safe stopping point. Do not invent the initial
 - `codebase-uninitialized`: use packaged `ai-delivery bootstrap`, review the repository baseline, inventory, context index, and adoption assessment, then invoke `$ai-delivery-define-product` to distinguish observed behavior from intended product behavior.
 - `workflow-interrupted`: do not write bootstrap artifacts. If `runtime.next_action_owner` is `user`, return the recorded `next_action` as the single business question and perform no recovery, activation, checkpoint, task, artifact, or Git mutation. If it is `external`, report the recorded wait condition without mutation. Only an `agent`-owned next action may invoke `$ai-delivery-checkpoint-task recover`, reconcile reality, inspect the pending Evolution queue without applying changes mid-task, and continue `recommended_task_id`. When required input arrives, transfer ownership with both `--next-action-owner agent` and a new idempotent `--next-action`.
 - `workflow-ready`: when a queued task is recommended, first apply the same `next_action_owner` boundary; activate it through `$ai-delivery-checkpoint-task` only when the owner is `agent`. Otherwise use the reported specialist skill or `$ai-delivery-orchestrate` to derive the next development node. Treat `release-ready` versions as completed development evidence, not implicit release intent. Route to `$ai-delivery-orchestrate-release` only when the user explicitly requests a release.
-- `workflow-inconsistent`: stop automatic mutation, run the available project/package doctor internally, report exact conflicts, and obtain a repair decision. An installed project must use packaged `upgrade --dry-run` for managed installation drift and `migrate --dry-run` for legacy schema, task grouping, anchor, or archive conflicts rather than repeat `init`. Structural migration copies legacy-root workflow material, adds explicit task attempts, and preserves lifecycle and scope facts; grouping ambiguities require a source-checksum-bound `--decisions` document with a `human:` actor and rationale. Route an approved premature-archive correction through packaged `repair --invalidate-archive` with a human actor, reason, RCA evidence, and recovery evidence; the original archive remains immutable. Use `upgrade --force` only when the user explicitly approves replacing the reported managed files.
+- `workflow-inconsistent`: stop automatic mutation, run the available project/package doctor internally, report exact conflicts, and obtain an explicit repair decision. Use `upgrade --dry-run` for current managed installation drift; malformed current state, missing anchors, archive conflicts, and checksum drift fail closed until repaired through the governed current-state interface. Use `upgrade --force` only when the user explicitly approves replacing the reported managed files.
 
 ## Brownfield Rules
 

package/skills/ai-delivery-bootstrap/agents/openai.yaml

@@ -1,4 +1,4 @@
-interface:
-  display_name: "Bootstrap AI Delivery"
-  short_description: "Inspect project state and route the next workflow action"
+interface:
+  display_name: "Bootstrap AI Delivery"
+  short_description: "Inspect project state and route the next workflow action"
   default_prompt: "Use $ai-delivery-bootstrap to inspect the dual-repository workspace, recover shared checkpoints, or initialize the minimum delivery context."

package/skills/ai-delivery-bootstrap/references/bootstrap-contract.md

@@ -28,7 +28,7 @@ After installation, `node .workflow/tools/bootstrap/bootstrap.mjs inspect` is th
 
 `ai-delivery bootstrap <project-root>` may initialize only `empty-uninitialized` and `codebase-uninitialized` projects through the project-scoped installer. Preserve existing code and configuration. On partial or conflicting installation, return `workflow-inconsistent` without writes. `--force` is allowed only after explicit user approval.
 
-For an installed legacy or conflicting state, keep Bootstrap read-only. Use packaged `migrate --dry-run` to report schema conversion, semantic task groups and ambiguities, state/archive conflicts, verified anchors, and exact file changes. A legacy root migration copies `delivery/`, `control/`, and `standards/` into `.workflow/` while preserving source bytes; flat task shards gain explicit attempts with checksummed rollback backups. Resolve grouping ambiguities only through a checksum-bound `--decisions` document with a `human:` actor and rationale. Migration must not activate or close tasks, infer completion, change scope, or rewrite legacy events. Incorrect archives require the separate packaged `repair --invalidate-archive` forward transaction with an explicit human actor, reason, RCA evidence, and recovery evidence; the original archive bytes remain authoritative history.
+For an installed or conflicting state, keep Bootstrap read-only and return `workflow-inconsistent` with the failing path and remediation. Use the packaged `repair --invalidate-archive` forward transaction only for an explicitly identified archive integrity defect; it records a human actor, reason, RCA evidence, and recovery evidence without rewriting immutable history.
 
 For an uninitialized project, generate repository inventory and context artifacts from the first read-only scan snapshot. Do not let installer-generated `AGENTS.md`, `.gitignore`, Hook, skill, standard, or delivery files contaminate the observed pre-install codebase baseline.
 

package/skills/ai-delivery-checkpoint-task/SKILL.md

@@ -11,10 +11,6 @@ Treat explicit task snapshots as authoritative. Treat Hook events as an audit tr
 
 Write portable task state to `.workflow/control/tasks/<task-id>.yaml` and `.workflow/control/checkpoints/<task-id>/<checkpoint-id>.yaml`. Keep only PID, heartbeat, temporary locks, raw Hook events, and unshared context under ignored `.workflow/delivery/runtime/`. Keep durable node documents under `.workflow/iterations/<iteration-id>/<node-id>/`; runtime snapshots never replace registered delivery artifacts. Resolve code branch and commit from `.workflow/config/workspace.yaml` and the nested code repository.
 
-## Legacy Node Boundary
-
-Legacy development nodes are read-only compatibility. `inspect` remains a strictly read-only diagnosis path for historical tasks. `init`, `activate`, `checkpoint`, `finish`, and `archive-version` reject legacy task targets before mutation or Hook dispatch; `recover` refuses to materialize them and `publish` refuses to share them. New tasks use only the `development-seven-node` route, while `R00-release-request` through `R10-release-archive` remain writable.
-
 ## Start Or Resume
 
 1. Locate the project root and shared state root.

package/skills/ai-delivery-checkpoint-task/agents/openai.yaml

@@ -1,4 +1,4 @@
-interface:
-  display_name: "Checkpoint Delivery Task"
-  short_description: "Persist task checkpoints, hook events, and resume context"
+interface:
+  display_name: "Checkpoint Delivery Task"
+  short_description: "Persist task checkpoints, hook events, and resume context"
   default_prompt: "Use $ai-delivery-checkpoint-task to start, checkpoint, publish, finish, or recover a shared delivery task."

package/skills/ai-delivery-checkpoint-task/references/checkpoint-contract.md

@@ -34,7 +34,7 @@ Keep `.workflow/delivery/runtime/` local and ignored. Persist durable stage outp
 
 `task-state.mjs` is the only runtime-state writer. Do not directly edit task JSON, checkpoint JSON, active-task markers, recovery output, or archive indexes. Formal workflow and artifact state belong to `.workflow/tools/state/state.mjs`; do not edit its YAML or JSONL streams directly.
 
-Legacy development nodes are read-only compatibility. `inspect` remains read-only for historical task diagnosis. `init`, `activate`, `checkpoint`, `finish`, and `archive-version` reject legacy task targets before mutation or Hook dispatch; `recover` does not hydrate them and `publish` does not share them. New task contracts use only the `development-seven-node` route, while `R00-release-request` through `R10-release-archive` remain writable.
+Task contracts use the current `development-seven-node` route or the independent `R00-release-request` through `R10-release-archive` release route. `inspect` is read-only diagnosis; `init`, `activate`, `checkpoint`, `finish`, `recover`, `archive-version`, and `publish` operate only on current task contracts.
 
 When the installed Evolution CLI exists, `init`, `activate`, `checkpoint`, `finish`, and `archive-version` emit idempotent schema 1 `task.before`, `task.after`, and `task.failed` events. An approved blocking `task.before` result stops the task command before mutation. Hook dispatch failures otherwise fail open as warnings and never replace checkpoint state as the completion authority.
 
@@ -75,7 +75,7 @@ For an installed dual-repository project, `task-state.mjs` resolves `code_branch
 
 `blockers` represents current unresolved blockers. A `blocked` update replaces that list; any transition to another status clears it. Historical blocker text remains available in prior checkpoints and events.
 
-`next_action_owner` is required in persisted state and has exactly three values: `agent`, `user`, or `external`; only a truly absent field in a legacy snapshot defaults to `agent`, while explicit null, empty, boolean, numeric, or unknown values are invalid. `user` and `external` are zero-mutation wait states. `recover` may report shared wait state but must not hydrate local task or resume files for it. After the required input arrives, `activate` requires both `--next-action-owner agent` and a new idempotent `--next-action`; it may atomically hydrate a missing local runtime snapshot from the matching shared shard and transfer ownership in the same transition. Same-revision local and shared content must have identical semantic checksums. Evidence arrays are ordered sets: replaying an already recorded `--evidence` value does not append a duplicate.
+`next_action_owner` is required in persisted state and has exactly three values: `agent`, `user`, or `external`; explicit null, empty, boolean, numeric, or unknown values are invalid. `user` and `external` are zero-mutation wait states. `recover` may report shared wait state but must not hydrate local task or resume files for it. After the required input arrives, `activate` requires both `--next-action-owner agent` and a new idempotent `--next-action`; it may atomically hydrate a missing local runtime snapshot from the matching shared shard and transfer ownership in the same transition. Same-revision local and shared content must have identical semantic checksums. Evidence arrays are ordered sets: replaying an already recorded `--evidence` value does not append a duplicate.
 
 Pass `--state-root` when worktrees must write to one shared primary state directory. Pass `--worktree` during init so the script writes a local `.workflow/delivery/runtime/active-task.json` marker pointing to that state root. Later `checkpoint`, `finish`, and `recover` commands automatically use the marker's shared state root.
 

package/skills/ai-delivery-checkpoint-task/scripts/hook-event.mjs

@@ -144,15 +144,9 @@ function enforceFrontendGuard(projectRoot, input) {
 }
 
 try {
-  const currentProjectFile = findUp(process.cwd(), path.join(".workflow", "delivery", "project.yaml"));
-  const legacyProjectFile = currentProjectFile
-    ? null
-    : findUp(process.cwd(), path.join("delivery", "project.yaml"));
-  const projectFile = currentProjectFile || legacyProjectFile;
+  const projectFile = findUp(process.cwd(), path.join(".workflow", "delivery", "project.yaml"));
   if (!projectFile) process.exit(0);
-  const projectRoot = currentProjectFile
-    ? path.dirname(path.dirname(path.dirname(projectFile)))
-    : path.dirname(path.dirname(projectFile));
+  const projectRoot = path.dirname(path.dirname(path.dirname(projectFile)));
   const markerFile = path.join(projectRoot, ".workflow", "delivery", "runtime", "active-task.json");
   const marker = fs.existsSync(markerFile) ? JSON.parse(fs.readFileSync(markerFile, "utf8")) : null;
   const raw = await readStdin();

package/skills/ai-delivery-checkpoint-task/scripts/task-state.mjs

@@ -42,19 +42,13 @@ const REPEATABLE_ARGS = new Set([
   "completed-step", "blocker", "evidence", "depends-on", "acceptance", "finding-json",
   "change-set-json",
 ]);
-const LEGACY_DEVELOPMENT_NODE_IDS = new Set([
-  "01-product-discovery",
-  "02-product-definition",
-  "03-architecture-initial",
-  "04-experience-design",
-  "05-architecture-reconcile",
-  "06-platform-preparation",
-  "07-iteration-planning",
-  "08-test-design",
-  "09-development",
-  "10-change-review",
-  "11-candidate-verification",
-  "12-version-closeout",
+const VALID_NODE_IDS = new Set([
+  "00-bootstrap", "01-product-shaping", "02-solution-design", "03-delivery-readiness",
+  "04-implementation", "05-candidate-assurance", "06-version-closeout",
+  "R00-release-request", "R01-version-selection", "R02-release-eligibility", "R03-material-aggregation",
+  "R04-release-candidate", "R05-release-verification", "R06-release-preparation", "R07-production-approval",
+  "R08-production-deployment", "R09-production-verification", "R10-release-archive",
+  "development", "implementation", "planning", "test", "review",
 ]);
 
 function parseArgs(argv) {
@@ -83,10 +77,8 @@ function requireValue(args, key) {
   return value;
 }
 
-function assertNotLegacyDevelopmentNode(node) {
-  if (LEGACY_DEVELOPMENT_NODE_IDS.has(node)) {
-    throw new Error(`Legacy workflow node is read-only: ${node}`);
-  }
+function assertCurrentNode(node) {
+  if (!VALID_NODE_IDS.has(node)) throw new Error(`Unsupported workflow node: ${node}`);
   return node;
 }
 
@@ -720,7 +712,7 @@ function repairChangesSinceBaseline(workflowRoot, baseline) {
 }
 
 function writeSharedTask(runtime, workflowRoot, task) {
-  assertNotLegacyDevelopmentNode(task.node);
+  assertCurrentNode(task.node);
   const sharedFile = sharedTaskFile(workflowRoot, task.task_id);
   let previousRevision = 0;
   if (fs.existsSync(sharedFile)) {
@@ -786,25 +778,15 @@ function normalizeTask(task) {
     task[key] = [...new Set(task[key])];
   }
   task.sequence = parseSequence(task.sequence);
-  task.next_action_owner = parseNextActionOwner(task.next_action_owner);
-  task.responsibility = task.responsibility || task.skill || "agent";
+  task.next_action_owner = parseNextActionOwner(task.next_action_owner, undefined);
+  if (!task.responsibility) throw new Error(`Task ${task.task_id || "unknown"} is missing responsibility.`);
   task.derived_from = task.derived_from || null;
   task.supersedes = task.supersedes || null;
-  if (!Array.isArray(task.attempts)) {
-    const legacyNumber = Number(task.attempt || 0);
-    task.attempts = legacyNumber > 0 && (task.started_at || task.status !== "queued")
-      ? [normalizeAttempt(task.task_id, {
-        number: legacyNumber,
-        status: projectedTaskStatus(task.status, "attempt"),
-        started_at: task.started_at || task.created_at || null,
-        finished_at: CLOSED_STATUS.has(task.status) ? task.finished_at || task.updated_at || null : null,
-      }, legacyNumber)]
-      : [];
-  } else {
-    task.attempts = task.attempts.map((attempt, index) => normalizeAttempt(task.task_id, attempt, index + 1));
+  if (Object.prototype.hasOwnProperty.call(task, "attempt") || !Array.isArray(task.attempts)) {
+    throw new Error(`Task ${task.task_id || "unknown"} must use canonical attempts.`);
   }
+  task.attempts = task.attempts.map((attempt, index) => normalizeAttempt(task.task_id, attempt, index + 1));
   task.change_sets = Array.isArray(task.change_sets) ? task.change_sets.map((item) => normalizeChangeSet(item)) : [];
-  task.attempt = task.attempts.at(-1)?.number || 0;
   return task;
 }
 
@@ -852,7 +834,6 @@ function startAttempt(task, phase, timestamp) {
     time_entries: [],
   }, number);
   task.attempts.push(attempt);
-  task.attempt = number;
   return attempt;
 }
 
@@ -1379,7 +1360,7 @@ function summarizeIteration(tasks, iterationId) {
 function commandInit(args) {
   const taskId = sanitizeId(requireValue(args, "task-id"));
   const iterationId = sanitizeId(requireValue(args, "iteration-id"));
-  const node = assertNotLegacyDevelopmentNode(requireValue(args, "node"));
+  const node = assertCurrentNode(requireValue(args, "node"));
   const { projectRoot, stateRoot, workflowRoot, runtime } = statePaths(args);
   return withTaskLock(runtime, `version.${iterationId}`, () => withTaskLock(runtime, taskId, () => {
     if (fs.existsSync(archivedTaskIndexFile(runtime, taskId))) {
@@ -1424,6 +1405,7 @@ function commandInit(args) {
     const candidateContract = normalizeTask({
       ...(existing || {}),
       ...contractFields,
+      attempts: existing?.attempts || [],
       next_action_owner: existing?.next_action_owner || "agent",
     });
     if (existing) {
@@ -1459,7 +1441,6 @@ function commandInit(args) {
       ...contractFields,
       status,
       sequence: parseSequence(args.sequence ?? existing?.sequence),
-      attempt: 0,
       attempts: [],
       change_sets: [],
       input_artifacts: args["input-artifact"] || existing?.input_artifacts || [],
@@ -1486,7 +1467,7 @@ function commandInit(args) {
     clearTaskMarker(task);
     appendEvent(runtime, taskId, "task-initialized", {
       status: task.status,
-      attempt: task.attempt,
+      attempt_count: task.attempts.length,
       derived_from: task.derived_from,
       supersedes: task.supersedes,
     });
@@ -1557,7 +1538,6 @@ function commandActivate(args) {
       phase.status = "active";
       phase.finished_at = null;
     }
-    task.attempt = attempt.number;
     task.started_at ||= timestamp;
     task.updated_at = timestamp;
     task.finished_at = null;
@@ -1573,7 +1553,7 @@ function commandActivate(args) {
     });
     appendEvent(runtime, taskId, "task-activated", {
       status,
-      attempt: task.attempt,
+      attempt_count: task.attempts.length,
       attempt_id: attempt.attempt_id,
       phase: attempt.phases.at(-1)?.phase || null,
       new_attempt: newAttempt,
@@ -1627,7 +1607,7 @@ function commandUpdate(args, finish = false) {
     writeResume(runtime, task);
     appendEvent(runtime, taskId, finish ? "task-finished" : "task-checkpointed", {
       status,
-      attempt: attempt.number,
+      attempt_number: attempt.number,
       attempt_id: attempt.attempt_id,
       phase: attempt.phases.at(-1)?.phase || null,
     });
@@ -1696,7 +1676,7 @@ function commandArchiveVersion(args) {
       .map((name) => normalizeTask(JSON.parse(fs.readFileSync(path.join(tasksDir, name), "utf8"))))
       .filter((task) => task.iteration_id === iterationId);
     if (!tasks.length) throw new Error(`No tasks found for version: ${iterationId}`);
-    for (const task of tasks) assertNotLegacyDevelopmentNode(task.node);
+    for (const task of tasks) assertCurrentNode(task.node);
     const sharedById = new Map(readSharedTasks(workflowRoot, stateRoot).map((task) => [task.task_id, task]));
     for (const task of tasks) {
       const shared = sharedById.get(task.task_id);
@@ -1795,7 +1775,7 @@ function commandRecover(args) {
   const reportableTasks = selectedTasks
     .filter((task) => !requested || task.task_id === requested)
     .filter((task) => includeClosed || !RECOVERY_COMPLETE_STATUS.has(task.status));
-  for (const task of reportableTasks) assertNotLegacyDevelopmentNode(task.node);
+  for (const task of reportableTasks) assertCurrentNode(task.node);
   for (const task of reportableTasks) {
     if (missingLocalTaskIds.has(task.task_id)) atomicWrite(taskFile(runtime, task.task_id), task);
   }
@@ -1853,7 +1833,7 @@ function commandPublish(args) {
   const checkpointDirectory = path.join(workflowRoot, "control", "checkpoints", taskId);
   if (!fs.existsSync(sharedFile)) throw new Error(`Shared task state not found: ${taskId}`);
   const shared = JSON.parse(fs.readFileSync(sharedFile, "utf8"));
-  assertNotLegacyDevelopmentNode(shared.node);
+  assertCurrentNode(shared.node);
 
   const repository = gitState(stateRoot);
   if (!repository.repository || path.resolve(repository.root).toLowerCase() !== path.resolve(stateRoot).toLowerCase()) {
@@ -1978,7 +1958,7 @@ function assertWritableEvolutionTarget(args, command) {
   if (!new Set(["init", "activate", "checkpoint", "finish", "archive-version"]).has(command)) return;
   if (command === "init") {
     const node = args.node && args.node !== true ? String(args.node) : null;
-    if (node) assertNotLegacyDevelopmentNode(node);
+    if (node) assertCurrentNode(node);
     return;
   }
   const { runtime, workflowRoot, stateRoot } = statePaths(args);
@@ -1990,14 +1970,14 @@ function assertWritableEvolutionTarget(args, command) {
     if (!iterationId || !fs.existsSync(tasksDir)) return;
     for (const name of fs.readdirSync(tasksDir).filter((item) => item.endsWith(".json"))) {
       const task = normalizeTask(JSON.parse(fs.readFileSync(path.join(tasksDir, name), "utf8")));
-      if (task.iteration_id === iterationId) assertNotLegacyDevelopmentNode(task.node);
+      if (task.iteration_id === iterationId) assertCurrentNode(task.node);
     }
     return;
   }
   const taskId = args["task-id"] && args["task-id"] !== true ? sanitizeId(args["task-id"]) : null;
   if (!taskId) return;
   const task = taskSources(runtime, workflowRoot, stateRoot, taskId).task;
-  if (task) assertNotLegacyDevelopmentNode(task.node);
+  if (task) assertCurrentNode(task.node);
 }
 
 function dispatchTaskEvolution(context, phase, result = null, error = null) {

package/skills/ai-delivery-close-version/agents/openai.yaml

@@ -1,4 +1,4 @@
-interface:
-  display_name: "Close Planned Version"
-  short_description: "Freeze a verified version as release-ready"
+interface:
+  display_name: "Close Planned Version"
+  short_description: "Freeze a verified version as release-ready"
   default_prompt: "Use $ai-delivery-close-version to bind code Tag, workflow Tag, and manifest checksum without publishing."

package/skills/ai-delivery-define-product/agents/openai.yaml

@@ -1,4 +1,4 @@
-interface:
-  display_name: "Define Product"
-  short_description: "Discover requirements and produce an approved product baseline"
-  default_prompt: "Use $ai-delivery-define-product to discover and define the product baseline."
+interface:
+  display_name: "Define Product"
+  short_description: "Discover requirements and produce an approved product baseline"
+  default_prompt: "Use $ai-delivery-define-product to discover and define the product baseline."

package/skills/ai-delivery-deploy-production/agents/openai.yaml

@@ -1,4 +1,4 @@
-interface:
-  display_name: "Deploy Production"
-  short_description: "Deploy one approved immutable iteration version to production"
+interface:
+  display_name: "Deploy Production"
+  short_description: "Deploy one approved immutable iteration version to production"
   default_prompt: "Use $ai-delivery-deploy-production to deploy the approved immutable package and record facts in the workflow repository."

package/skills/ai-delivery-design-experience/SKILL.md

@@ -25,7 +25,7 @@ This Skill shares `02-solution-design` with `$ai-delivery-design-architecture`.
 
 Read the approved product baseline, terminal and feature catalogs, initial architecture baseline, major-decision approval receipt or explicit not-required assessment, applicable design standards, and existing experience baseline. Verify all input versions and checksums. Return missing terminal scope or feature behavior to product definition; refuse to prototype from unapproved major architecture decisions.
 
-When `prototype.yaml` has `status: migration-pending-ux-ui` or a `prototype-migration.yaml` exists, apply the Legacy Prototype Migration section of [experience-contract.md](references/experience-contract.md). Treat copied member sources as migration inputs, complete the normalized catalogs and current Review Shell, then freeze and validate a new revision before requesting `UX-UI`; no legacy approval is reusable.
+Require the current `prototype.yaml`, v2 catalogs, isolated source tree, and Review Shell before authoring. A missing current catalog or checksum is a failed preflight; repair the current Prototype package before continuing.
 
 ## Workflow
 
@@ -68,10 +68,10 @@ Tool selection, visual-system/framework approval, formal-UI approval, and final
 - `feature-screen-coverage.csv` mapping feature ID, terminal ID, flow ID, screen ID, and state ID;
 - versioned experience baseline and unresolved technical questions.
 
-Read [experience-contract.md](references/experience-contract.md) for handoff identity and [prototype-management-contract.md](references/prototype-management-contract.md) for tool, terminal, Page, Review Scene, route, UI Mapping, and review rules. Use `assets/experience-template/` for all controlled templates; files explicitly labeled legacy are compatibility inputs, not current-flow outputs.
+Read [experience-contract.md](references/experience-contract.md) for handoff identity and [prototype-management-contract.md](references/prototype-management-contract.md) for tool, terminal, Page, Review Scene, route, UI Mapping, and review rules. Use `assets/experience-template/` for all controlled templates.
 
 ## Handoff
 
 Send the experience baseline, `ui-handoff.yaml`, tool-selection receipt, both experience Gate receipts, product-reconciliation receipt, change sets, interaction/visual/component contracts, exact Prototype revision identity/checksum, source revision, review-bundle checksum, catalog checksums, traceability checksum, and source-confirmation checksum to `$ai-delivery-design-architecture` in reconcile mode. Preserve the same frozen revision for planning and test design; downstream nodes must never edit experience artifacts.
 
-Legacy `prototype-set.yaml` and member manifests are read-only compatibility inputs. A compatibility reader may normalize them in memory when inspecting historical iterations, and the explicit CLI migration may copy their validated bytes into the current isolated source tree. This Skill never creates, updates, or deletes a prototype set, member bundle, member-scoped manifest, closed iteration, archive, legacy Gate, or legacy event.
+Complete when the current Prototype Revision is frozen, validated, approved through `UX-VS` and `UX-UI`, reconciled with product requirements, and handed off with checksums for every source and catalog.

package/skills/ai-delivery-design-experience/agents/openai.yaml

@@ -1,4 +1,4 @@
-interface:
-  display_name: "Design Managed Prototypes"
-  short_description: "Select tools and manage reviewable prototypes"
-  default_prompt: "Use $ai-delivery-design-experience to select a prototype tool, manage pages and canvases, and close review before handoff."
+interface:
+  display_name: "Design Managed Prototypes"
+  short_description: "Select tools and manage reviewable prototypes"
+  default_prompt: "Use $ai-delivery-design-experience to select a prototype tool, manage pages and canvases, and close review before handoff."

package/skills/ai-delivery-design-experience/references/experience-contract.md

@@ -42,17 +42,7 @@ When Review Scenes depend on protocol simulations, keep External Dependency Mock
 
 Each iteration and every approval, source confirmation, architecture receipt, test receipt, plan, development task, and candidate check pin one exact Prototype revision identity and checksum. Later source work creates a new revision of the same Prototype; it never creates a Prototype copy or member bundle.
 
-Legacy `prototype-set.yaml` and member manifests are accepted only as read-only historical inputs. Compatibility readers may normalize their identities for inspection, verification, rebuild, or explicit migration. Current producers never generate or mutate set/member artifacts.
-
-## Legacy Prototype Migration
-
-`upgrade` installs migration capability and reports `prototype_migration.required_follow_up`; it never applies the Prototype migration. `migrate --dry-run` is the authoritative zero-write plan, and `migrate` applies it only when `can_apply: true`.
-
-For the open iteration, validate set/member identity, manifest/source/catalog SHA-256, contained paths, and stable terminal, Page, route, and file identities. A valid zero-member input is `not-required`. A single member migrates automatically only when every identity, checksum, catalog, and target is unambiguous. Multiple members merge equal stable identities and block on differing definitions until one checksum-bound `human:<identity>` decision selects the canonical member. The one migration decision file always contains both `decisions` and `prototype_decisions` lists.
-
-Apply creates only `.workflow/experience/<iteration-id>/prototype.yaml`, `prototype-migration.yaml`, copied `prototype/source/<member-id>/...` bytes, and a current Review Shell. Preserve legacy set/member/source bytes, closed and archived iterations, Gate files, approvals, and events. The new descriptor uses `prototype_id: PROTOTYPE`, `status: migration-pending-ux-ui`, and `current_revision_ref: null`.
-
-Migration approval is never inherited. Complete the current normalized catalogs and Review Shell, freeze a new immutable revision, pass `prototype-revision validate`, then request a new `UX-UI`. The migration Review Shell is only a navigation aid; Workflow Manager may accept decisions only for the new complete frozen revision, and P17 keeps the migration lineage available for audit.
+The current Prototype package contains one `prototype.yaml`, one source tree, one Review Shell, and the normalized v2 catalogs. Freeze each approved iteration as one immutable `prototype-revision.yaml`, validate it with `ai-delivery prototype-revision validate`, and route all Page decisions through Workflow Manager against that exact revision checksum. A missing catalog, source checksum, or review receipt blocks the flow until the current package is repaired.
 
 `prototype-traceability.csv`:
 

package/skills/ai-delivery-design-experience/references/prototype-management-contract.md

@@ -33,7 +33,7 @@ Keep all terminals in the same logical Prototype. `prototype-terminals.csv` decl
 
 The frozen Review Shell entrypoint must consume Workflow Manager's `review_path` query parameter and render the matching active path from `prototype-routes.csv`. Treat an absent, unknown, retired, or cross-terminal path as an explicit not-found state. Relative CSS, JavaScript, font, and media references must remain runnable from the frozen entrypoint; Manager embeds only that checksummed content in a sandbox and never interprets product behavior.
 
-Legacy canvas/file catalogs are read-only compatibility inputs. When inspecting them, One canvas contains exactly one main-page family and stable identities remain immutable. Current authoring records source structure in the Prototype repository and normalized terminal/route catalogs instead of creating member-scoped canvas or file registries.
+The current Prototype package records source structure in the Prototype repository and normalized terminal/route catalogs. One Review Scene belongs to one stable Page family, and stable identities remain immutable across revisions.
 
 ## Production Frontend Scope
 

package/skills/ai-delivery-develop-iteration/agents/openai.yaml

@@ -1,4 +1,4 @@
-interface:
-  display_name: "Develop Iteration"
-  short_description: "Orchestrate dynamic technical work packages with TDD"
+interface:
+  display_name: "Develop Iteration"
+  short_description: "Orchestrate dynamic technical work packages with TDD"
   default_prompt: "Use $ai-delivery-develop-iteration to implement the current vertical slice in the configured code repository."

package/skills/ai-delivery-evolve-workflow/agents/openai.yaml

@@ -1,4 +1,4 @@
-interface:
-  display_name: "自进化工作流"
-  short_description: "持续记录反馈、评估信号并安全演进项目级交付工作流扩展能力"
+interface:
+  display_name: "自进化工作流"
+  short_description: "持续记录反馈、评估信号并安全演进项目级交付工作流扩展能力"
   default_prompt: "使用 $ai-delivery-evolve-workflow 记录当前意见并在安全点评估可验证的项目级扩展。"

package/skills/ai-delivery-execute-test/agents/openai.yaml

@@ -1,4 +1,4 @@
-interface:
-  display_name: "Execute Test Work"
-  short_description: "Execute one risk-based independent test work package"
-  default_prompt: "Use $ai-delivery-execute-test to execute the assigned independent test work package."
+interface:
+  display_name: "Execute Test Work"
+  short_description: "Execute one risk-based independent test work package"
+  default_prompt: "Use $ai-delivery-execute-test to execute the assigned independent test work package."

package/skills/ai-delivery-execute-work-package/agents/openai.yaml

@@ -1,4 +1,4 @@
-interface:
-  display_name: "Execute Technical Work"
-  short_description: "Implement one architecture-constrained technical work package"
-  default_prompt: "Use $ai-delivery-execute-work-package to implement the assigned technical work package."
+interface:
+  display_name: "Execute Technical Work"
+  short_description: "Implement one architecture-constrained technical work package"
+  default_prompt: "Use $ai-delivery-execute-work-package to implement the assigned technical work package."