@snappedly-tools/shipyard 0.9.2 → 0.10.0

package/dist/sandboxes/docker.js

@@ -1,4 +1,4 @@
-export { defaultImageName, docker } from '../chunk-JZUBT4WG.js';
-import '../chunk-57EEKW3R.js';
+export { defaultImageName, docker } from '../chunk-KSTSHZNH.js';
+import '../chunk-BAP7BWQ2.js';
 //# sourceMappingURL=docker.js.map
 //# sourceMappingURL=docker.js.map

package/dist/templates/parallel-planner/block-scope.sh

@@ -108,6 +108,10 @@ Work was not handed off. To retry, resolve the problem, remove shipyard:blocked,
 fi
 
 if [[ "$branch" == "shipyard/spec-$root" ]]; then
+  if ! remove_issue_status "$root" ready-for-human; then
+    echo "Warning: could not clear spec triage status" >&2
+    status_synced=false
+  fi
   if ! remove_issue_status "$root" shipyard:outstanding-tasks; then
     echo "Warning: could not clear spec status" >&2
     status_synced=false
@@ -122,9 +126,11 @@ else
 fi
 if [[ "$branch" == "shipyard/spec-$root" ]]; then
   for affected_id in "${affected_ids[@]:1}"; do
+    remove_issue_status "$affected_id" ready-for-human || status=75
     remove_issue_status "$affected_id" shipyard:pending || status=75
   done
 else
+  remove_issue_status "$root" ready-for-human || status=75
   remove_issue_status "$root" shipyard:pending || status=75
 fi
 

package/dist/templates/parallel-planner/handoff.sh

@@ -103,6 +103,7 @@ for ((i=1; i<${#scope_ids[@]}; i++)); do
     echo "Could not mark ticket #${scope_ids[i]} complete; retry issue completion when GitHub is available" >&2
     exit 75
   fi
+  remove_issue_label "${scope_ids[i]}" ready-for-human
   remove_issue_label "${scope_ids[i]}" shipyard:blocked
   remove_issue_label "${scope_ids[i]}" shipyard:pending
 done
@@ -128,7 +129,11 @@ if ! gh label create "$status_label" --repo "$repo" --color "$status_color" --de
   echo "Warning: could not create $status_label" >&2
   status_synced=false
 fi
-if ! gh issue edit "$issue" --repo "$repo" --add-label "$status_label"; then
+if gh issue edit "$issue" --repo "$repo" --add-label "$status_label"; then
+  if [[ "$status_label" == shipyard:complete ]]; then
+    remove_issue_label "$issue" ready-for-human
+  fi
+else
   if [[ "$branch" == "shipyard/issue-$issue" ]]; then
     echo "Could not mark ticket #$issue complete; retry issue completion when GitHub is available" >&2
     exit 75
@@ -170,6 +175,6 @@ if [[ "$status_synced" == true ]]; then
     fi
   done
 else
-  echo "Warning: status labels need reconciliation; retaining ticket activation" >&2
+  echo "Warning: status labels need reconciliation; add shipyard to the ticket to retry" >&2
 fi
 printf '%s\n' "$url"

package/dist/templates/parallel-planner/main.mts

@@ -27,24 +27,27 @@ const roleModels = {
   routine: readRoleModel("routine"),
   strong: readRoleModel("strong"),
 };
-const CODEX_REASONING_EFFORTS = shipyard.CODEX_REASONING_EFFORTS;
-type CodexReasoningEffort = shipyard.CodexReasoningEffort;
-const readCodexReasoningEffort = (
+const REASONING_EFFORTS = shipyard.REASONING_EFFORTS;
+type ReasoningEffort = shipyard.ReasoningEffort;
+const readRoleReasoningEffort = (
   role: ModelRole,
-): CodexReasoningEffort | undefined => {
-  if (!CODEX_PROVIDER) return undefined;
-  const envName = `SHIPYARD_CODEX_${role.toUpperCase()}_REASONING_EFFORT`;
-  const effort = process.env[envName]?.trim();
+): ReasoningEffort | undefined => {
+  const envName = `SHIPYARD_${role.toUpperCase()}_REASONING_EFFORT`;
+  const legacyName = `SHIPYARD_CODEX_${role.toUpperCase()}_REASONING_EFFORT`;
+  const sharedEffort = process.env[envName]?.trim();
+  const effort =
+    sharedEffort ||
+    (CODEX_PROVIDER ? process.env[legacyName]?.trim() : undefined);
   if (!effort) return undefined;
-  if (!(CODEX_REASONING_EFFORTS as readonly string[]).includes(effort))
+  if (!(REASONING_EFFORTS as readonly string[]).includes(effort))
     throw new Error(
-      `${envName} must be one of ${CODEX_REASONING_EFFORTS.join(", ")}; received "${effort}"`,
+      `${sharedEffort ? envName : legacyName} must be one of ${REASONING_EFFORTS.join(", ")}; received "${effort}"`,
     );
-  return effort as CodexReasoningEffort;
+  return effort as ReasoningEffort;
 };
 const roleEfforts = {
-  routine: readCodexReasoningEffort("routine"),
-  strong: readCodexReasoningEffort("strong"),
+  routine: readRoleReasoningEffort("routine"),
+  strong: readRoleReasoningEffort("strong"),
 };
 const readCodexRoleModel = (role: ModelRole, defaultModel: AgentModel) => {
   if (!CODEX_PROVIDER || typeof defaultModel === "string") return defaultModel;
@@ -166,6 +169,7 @@ const runWorker = async (scope: Scope, ticket: Ticket) => {
     baseBranch: scope.branch,
     sandbox: sandboxProvider,
     hooks,
+    copyToWorktree: [".shipyard/setup.sh"],
   });
   try {
     await sandbox.run({
@@ -173,7 +177,7 @@ const runWorker = async (scope: Scope, ticket: Ticket) => {
       maxIterations: 1,
       agent: roleAgent("routine", shipyard.CODEX_MODELS.routine),
       promptFile: "./.shipyard/triage-prompt.md",
-      promptArgs: { TASK_ID: ticket.id },
+      promptArgs: { TASK_ID: ticket.id, BASE_BRANCH: targetBranch },
     });
     verifyTriage(ticket.id);
     const implementation = await sandbox.run({
@@ -212,6 +216,7 @@ for (let iteration = 0; iteration < 10; iteration++) {
   const plan = await shipyard.run({
     hooks,
     sandbox: sandboxProvider,
+    copyToWorktree: [".shipyard/setup.sh"],
     name: "planner",
     branchStrategy: { type: "branch", branch: plannerBranch },
     maxIterations: 1,
@@ -257,6 +262,8 @@ for (let iteration = 0; iteration < 10; iteration++) {
             repository,
             "--add-label",
             "shipyard:pending",
+            "--remove-label",
+            "shipyard",
           ]);
         if (
           scope.branch !==
@@ -271,6 +278,7 @@ for (let iteration = 0; iteration < 10; iteration++) {
             branch: scope.branch,
             sandbox: sandboxProvider,
             hooks,
+            copyToWorktree: [".shipyard/setup.sh"],
           });
           await closeClean(seed);
           const tickets = scope.tickets ?? [];
@@ -305,6 +313,7 @@ for (let iteration = 0; iteration < 10; iteration++) {
               branch: scope.branch,
               sandbox: sandboxProvider,
               hooks,
+              copyToWorktree: [".shipyard/setup.sh"],
             });
             try {
               for (const [index, outcome] of settled.entries()) {
@@ -430,6 +439,7 @@ for (let iteration = 0; iteration < 10; iteration++) {
           branch: scope.branch,
           sandbox: sandboxProvider,
           hooks,
+          copyToWorktree: [".shipyard/setup.sh"],
         });
         let handoffEvidence: string;
         try {
@@ -439,7 +449,7 @@ for (let iteration = 0; iteration < 10; iteration++) {
               maxIterations: 1,
               agent: roleAgent("routine", shipyard.CODEX_MODELS.routine),
               promptFile: "./.shipyard/triage-prompt.md",
-              promptArgs: { TASK_ID: id },
+              promptArgs: { TASK_ID: id, BASE_BRANCH: targetBranch },
             });
             verifyTriage(id);
             const standalone = await integration.run({
@@ -477,6 +487,7 @@ for (let iteration = 0; iteration < 10; iteration++) {
         const publication = await shipyard.createSandbox({
           branch: scope.branch,
           sandbox: sandboxProvider,
+          copyToWorktree: [".shipyard/handoff.sh"],
         });
         try {
           const scopeIds = [

package/dist/templates/parallel-planner/setup.sh

@@ -18,7 +18,14 @@ if [[ -f package.json ]]; then
     else manager=npm; fi
   fi
   case "$manager" in
-    npm) npm install ;;
+    npm)
+      if [[ -f package-lock.json ]]; then
+        if ! npm ci; then
+          echo "npm ci failed; installing from package.json without changing package-lock.json" >&2
+          npm install --no-package-lock
+        fi
+      else npm install --no-package-lock
+      fi ;;
     pnpm) corepack pnpm install ;;
     yarn) corepack yarn install ;;
     bun)

package/dist/templates/parallel-planner/triage-prompt.md

@@ -1,5 +1,7 @@
 Triage GitHub issue #{{TASK_ID}} before Shipyard implementation.
 
-Follow `/triage` and the repository's `docs/agents/triage.md` label mapping. Read the full issue and comments, verify its claim against the codebase, then apply the appropriate category and state label and post the brief or triage notes required by the skill. The maintainer has authorized Shipyard to apply an evidence-based recommendation during this unattended intake. If a decision requires maintainer judgment, use `needs-triage` and record the question. Do not implement the issue or start a PR in this phase.
+Follow `/triage` and the repository's triage label mapping. Read the full issue and comments. Verify the reported behavior against `origin/{{BASE_BRANCH}}`, the integration baseline. The checked-out task branch may contain unfinished changes from an earlier attempt. Do not close the issue as already complete based on the task branch or comments about that candidate.
+
+Apply the appropriate category and state label and post the brief or triage notes required by the skill. The maintainer has authorized Shipyard to apply an evidence-based recommendation during this unattended intake. If a decision requires maintainer judgment, use `needs-triage` and record the question. Do not implement the issue or start a PR in this phase.
 
 Report the applied state and evidence. Shipyard will independently re-read GitHub labels and implement only an open issue carrying both `shipyard` and the sole triage state `ready-for-agent`.

package/dist/templates/parallel-planner-with-review/block-scope.sh

@@ -108,6 +108,10 @@ Work was not handed off. To retry, resolve the problem, remove shipyard:blocked,
 fi
 
 if [[ "$branch" == "shipyard/spec-$root" ]]; then
+  if ! remove_issue_status "$root" ready-for-human; then
+    echo "Warning: could not clear spec triage status" >&2
+    status_synced=false
+  fi
   if ! remove_issue_status "$root" shipyard:outstanding-tasks; then
     echo "Warning: could not clear spec status" >&2
     status_synced=false
@@ -122,9 +126,11 @@ else
 fi
 if [[ "$branch" == "shipyard/spec-$root" ]]; then
   for affected_id in "${affected_ids[@]:1}"; do
+    remove_issue_status "$affected_id" ready-for-human || status=75
     remove_issue_status "$affected_id" shipyard:pending || status=75
   done
 else
+  remove_issue_status "$root" ready-for-human || status=75
   remove_issue_status "$root" shipyard:pending || status=75
 fi
 

package/dist/templates/parallel-planner-with-review/handoff.sh

@@ -103,6 +103,7 @@ for ((i=1; i<${#scope_ids[@]}; i++)); do
     echo "Could not mark ticket #${scope_ids[i]} complete; retry issue completion when GitHub is available" >&2
     exit 75
   fi
+  remove_issue_label "${scope_ids[i]}" ready-for-human
   remove_issue_label "${scope_ids[i]}" shipyard:blocked
   remove_issue_label "${scope_ids[i]}" shipyard:pending
 done
@@ -128,7 +129,11 @@ if ! gh label create "$status_label" --repo "$repo" --color "$status_color" --de
   echo "Warning: could not create $status_label" >&2
   status_synced=false
 fi
-if ! gh issue edit "$issue" --repo "$repo" --add-label "$status_label"; then
+if gh issue edit "$issue" --repo "$repo" --add-label "$status_label"; then
+  if [[ "$status_label" == shipyard:complete ]]; then
+    remove_issue_label "$issue" ready-for-human
+  fi
+else
   if [[ "$branch" == "shipyard/issue-$issue" ]]; then
     echo "Could not mark ticket #$issue complete; retry issue completion when GitHub is available" >&2
     exit 75
@@ -170,6 +175,6 @@ if [[ "$status_synced" == true ]]; then
     fi
   done
 else
-  echo "Warning: status labels need reconciliation; retaining ticket activation" >&2
+  echo "Warning: status labels need reconciliation; add shipyard to the ticket to retry" >&2
 fi
 printf '%s\n' "$url"

package/dist/templates/parallel-planner-with-review/main.mts

@@ -27,24 +27,27 @@ const roleModels = {
   routine: readRoleModel("routine"),
   strong: readRoleModel("strong"),
 };
-const CODEX_REASONING_EFFORTS = shipyard.CODEX_REASONING_EFFORTS;
-type CodexReasoningEffort = shipyard.CodexReasoningEffort;
-const readCodexReasoningEffort = (
+const REASONING_EFFORTS = shipyard.REASONING_EFFORTS;
+type ReasoningEffort = shipyard.ReasoningEffort;
+const readRoleReasoningEffort = (
   role: ModelRole,
-): CodexReasoningEffort | undefined => {
-  if (!CODEX_PROVIDER) return undefined;
-  const envName = `SHIPYARD_CODEX_${role.toUpperCase()}_REASONING_EFFORT`;
-  const effort = process.env[envName]?.trim();
+): ReasoningEffort | undefined => {
+  const envName = `SHIPYARD_${role.toUpperCase()}_REASONING_EFFORT`;
+  const legacyName = `SHIPYARD_CODEX_${role.toUpperCase()}_REASONING_EFFORT`;
+  const sharedEffort = process.env[envName]?.trim();
+  const effort =
+    sharedEffort ||
+    (CODEX_PROVIDER ? process.env[legacyName]?.trim() : undefined);
   if (!effort) return undefined;
-  if (!(CODEX_REASONING_EFFORTS as readonly string[]).includes(effort))
+  if (!(REASONING_EFFORTS as readonly string[]).includes(effort))
     throw new Error(
-      `${envName} must be one of ${CODEX_REASONING_EFFORTS.join(", ")}; received "${effort}"`,
+      `${sharedEffort ? envName : legacyName} must be one of ${REASONING_EFFORTS.join(", ")}; received "${effort}"`,
     );
-  return effort as CodexReasoningEffort;
+  return effort as ReasoningEffort;
 };
 const roleEfforts = {
-  routine: readCodexReasoningEffort("routine"),
-  strong: readCodexReasoningEffort("strong"),
+  routine: readRoleReasoningEffort("routine"),
+  strong: readRoleReasoningEffort("strong"),
 };
 const readCodexRoleModel = (role: ModelRole, defaultModel: AgentModel) => {
   if (!CODEX_PROVIDER || typeof defaultModel === "string") return defaultModel;
@@ -144,7 +147,7 @@ const approved = (
     throw new Error(
       `${stage} has unresolved review findings: ${result.stdout.trim().slice(-1200)}`,
     );
-  return complete(result, stage);
+  return `Review: APPROVED\n${complete(result, stage)}`;
 };
 class TicketFailures extends Error {
   constructor(readonly failures: Array<{ id: string; reason: string }>) {
@@ -176,6 +179,7 @@ const runWorker = async (scope: Scope, ticket: Ticket) => {
     baseBranch: scope.branch,
     sandbox: sandboxProvider,
     hooks,
+    copyToWorktree: [".shipyard/setup.sh"],
   });
   try {
     await sandbox.run({
@@ -183,7 +187,7 @@ const runWorker = async (scope: Scope, ticket: Ticket) => {
       maxIterations: 1,
       agent: roleAgent("routine", shipyard.CODEX_MODELS.routine),
       promptFile: "./.shipyard/triage-prompt.md",
-      promptArgs: { TASK_ID: ticket.id },
+      promptArgs: { TASK_ID: ticket.id, BASE_BRANCH: targetBranch },
     });
     verifyTriage(ticket.id);
     const implementation = await sandbox.run({
@@ -235,6 +239,7 @@ for (let iteration = 0; iteration < 10; iteration++) {
   const plan = await shipyard.run({
     hooks,
     sandbox: sandboxProvider,
+    copyToWorktree: [".shipyard/setup.sh"],
     name: "planner",
     branchStrategy: { type: "branch", branch: plannerBranch },
     maxIterations: 1,
@@ -280,6 +285,8 @@ for (let iteration = 0; iteration < 10; iteration++) {
             repository,
             "--add-label",
             "shipyard:pending",
+            "--remove-label",
+            "shipyard",
           ]);
         if (
           scope.branch !==
@@ -294,6 +301,7 @@ for (let iteration = 0; iteration < 10; iteration++) {
             branch: scope.branch,
             sandbox: sandboxProvider,
             hooks,
+            copyToWorktree: [".shipyard/setup.sh"],
           });
           await closeClean(seed);
           const tickets = scope.tickets ?? [];
@@ -328,6 +336,7 @@ for (let iteration = 0; iteration < 10; iteration++) {
               branch: scope.branch,
               sandbox: sandboxProvider,
               hooks,
+              copyToWorktree: [".shipyard/setup.sh"],
             });
             try {
               for (const [index, outcome] of settled.entries()) {
@@ -453,6 +462,7 @@ for (let iteration = 0; iteration < 10; iteration++) {
           branch: scope.branch,
           sandbox: sandboxProvider,
           hooks,
+          copyToWorktree: [".shipyard/setup.sh"],
         });
         let handoffEvidence: string;
         try {
@@ -462,7 +472,7 @@ for (let iteration = 0; iteration < 10; iteration++) {
               maxIterations: 1,
               agent: roleAgent("routine", shipyard.CODEX_MODELS.routine),
               promptFile: "./.shipyard/triage-prompt.md",
-              promptArgs: { TASK_ID: id },
+              promptArgs: { TASK_ID: id, BASE_BRANCH: targetBranch },
             });
             verifyTriage(id);
             const standalone = await integration.run({
@@ -528,6 +538,7 @@ for (let iteration = 0; iteration < 10; iteration++) {
         const publication = await shipyard.createSandbox({
           branch: scope.branch,
           sandbox: sandboxProvider,
+          copyToWorktree: [".shipyard/handoff.sh"],
         });
         try {
           const scopeIds = [

package/dist/templates/parallel-planner-with-review/setup.sh

@@ -18,7 +18,14 @@ if [[ -f package.json ]]; then
     else manager=npm; fi
   fi
   case "$manager" in
-    npm) npm install ;;
+    npm)
+      if [[ -f package-lock.json ]]; then
+        if ! npm ci; then
+          echo "npm ci failed; installing from package.json without changing package-lock.json" >&2
+          npm install --no-package-lock
+        fi
+      else npm install --no-package-lock
+      fi ;;
     pnpm) corepack pnpm install ;;
     yarn) corepack yarn install ;;
     bun)

package/dist/templates/parallel-planner-with-review/triage-prompt.md

@@ -1,5 +1,7 @@
 Triage GitHub issue #{{TASK_ID}} before Shipyard implementation.
 
-Follow `/triage` and the repository's `docs/agents/triage.md` label mapping. Read the full issue and comments, verify its claim against the codebase, then apply the appropriate category and state label and post the brief or triage notes required by the skill. The maintainer has authorized Shipyard to apply an evidence-based recommendation during this unattended intake. If a decision requires maintainer judgment, use `needs-triage` and record the question. Do not implement the issue or start a PR in this phase.
+Follow `/triage` and the repository's triage label mapping. Read the full issue and comments. Verify the reported behavior against `origin/{{BASE_BRANCH}}`, the integration baseline. The checked-out task branch may contain unfinished changes from an earlier attempt. Do not close the issue as already complete based on the task branch or comments about that candidate.
+
+Apply the appropriate category and state label and post the brief or triage notes required by the skill. The maintainer has authorized Shipyard to apply an evidence-based recommendation during this unattended intake. If a decision requires maintainer judgment, use `needs-triage` and record the question. Do not implement the issue or start a PR in this phase.
 
 Report the applied state and evidence. Shipyard will independently re-read GitHub labels and implement only an open issue carrying both `shipyard` and the sole triage state `ready-for-agent`.

package/dist/templates/sequential-reviewer/block-scope.sh

@@ -108,6 +108,10 @@ Work was not handed off. To retry, resolve the problem, remove shipyard:blocked,
 fi
 
 if [[ "$branch" == "shipyard/spec-$root" ]]; then
+  if ! remove_issue_status "$root" ready-for-human; then
+    echo "Warning: could not clear spec triage status" >&2
+    status_synced=false
+  fi
   if ! remove_issue_status "$root" shipyard:outstanding-tasks; then
     echo "Warning: could not clear spec status" >&2
     status_synced=false
@@ -122,9 +126,11 @@ else
 fi
 if [[ "$branch" == "shipyard/spec-$root" ]]; then
   for affected_id in "${affected_ids[@]:1}"; do
+    remove_issue_status "$affected_id" ready-for-human || status=75
     remove_issue_status "$affected_id" shipyard:pending || status=75
   done
 else
+  remove_issue_status "$root" ready-for-human || status=75
   remove_issue_status "$root" shipyard:pending || status=75
 fi
 

package/dist/templates/sequential-reviewer/handoff.sh

@@ -103,6 +103,7 @@ for ((i=1; i<${#scope_ids[@]}; i++)); do
     echo "Could not mark ticket #${scope_ids[i]} complete; retry issue completion when GitHub is available" >&2
     exit 75
   fi
+  remove_issue_label "${scope_ids[i]}" ready-for-human
   remove_issue_label "${scope_ids[i]}" shipyard:blocked
   remove_issue_label "${scope_ids[i]}" shipyard:pending
 done
@@ -128,7 +129,11 @@ if ! gh label create "$status_label" --repo "$repo" --color "$status_color" --de
   echo "Warning: could not create $status_label" >&2
   status_synced=false
 fi
-if ! gh issue edit "$issue" --repo "$repo" --add-label "$status_label"; then
+if gh issue edit "$issue" --repo "$repo" --add-label "$status_label"; then
+  if [[ "$status_label" == shipyard:complete ]]; then
+    remove_issue_label "$issue" ready-for-human
+  fi
+else
   if [[ "$branch" == "shipyard/issue-$issue" ]]; then
     echo "Could not mark ticket #$issue complete; retry issue completion when GitHub is available" >&2
     exit 75
@@ -170,6 +175,6 @@ if [[ "$status_synced" == true ]]; then
     fi
   done
 else
-  echo "Warning: status labels need reconciliation; retaining ticket activation" >&2
+  echo "Warning: status labels need reconciliation; add shipyard to the ticket to retry" >&2
 fi
 printf '%s\n' "$url"

package/dist/templates/sequential-reviewer/main.mts

@@ -22,24 +22,27 @@ const roleModels = {
   routine: readRoleModel("routine"),
   strong: readRoleModel("strong"),
 };
-const CODEX_REASONING_EFFORTS = shipyard.CODEX_REASONING_EFFORTS;
-type CodexReasoningEffort = shipyard.CodexReasoningEffort;
-const readCodexReasoningEffort = (
+const REASONING_EFFORTS = shipyard.REASONING_EFFORTS;
+type ReasoningEffort = shipyard.ReasoningEffort;
+const readRoleReasoningEffort = (
   role: ModelRole,
-): CodexReasoningEffort | undefined => {
-  if (!CODEX_PROVIDER) return undefined;
-  const envName = `SHIPYARD_CODEX_${role.toUpperCase()}_REASONING_EFFORT`;
-  const effort = process.env[envName]?.trim();
+): ReasoningEffort | undefined => {
+  const envName = `SHIPYARD_${role.toUpperCase()}_REASONING_EFFORT`;
+  const legacyName = `SHIPYARD_CODEX_${role.toUpperCase()}_REASONING_EFFORT`;
+  const sharedEffort = process.env[envName]?.trim();
+  const effort =
+    sharedEffort ||
+    (CODEX_PROVIDER ? process.env[legacyName]?.trim() : undefined);
   if (!effort) return undefined;
-  if (!(CODEX_REASONING_EFFORTS as readonly string[]).includes(effort))
+  if (!(REASONING_EFFORTS as readonly string[]).includes(effort))
     throw new Error(
-      `${envName} must be one of ${CODEX_REASONING_EFFORTS.join(", ")}; received "${effort}"`,
+      `${sharedEffort ? envName : legacyName} must be one of ${REASONING_EFFORTS.join(", ")}; received "${effort}"`,
     );
-  return effort as CodexReasoningEffort;
+  return effort as ReasoningEffort;
 };
 const roleEfforts = {
-  routine: readCodexReasoningEffort("routine"),
-  strong: readCodexReasoningEffort("strong"),
+  routine: readRoleReasoningEffort("routine"),
+  strong: readRoleReasoningEffort("strong"),
 };
 const readCodexRoleModel = (role: ModelRole, defaultModel: AgentModel) => {
   if (!CODEX_PROVIDER || typeof defaultModel === "string") return defaultModel;
@@ -176,11 +179,14 @@ for (let iteration = 0; iteration < MAX_ITERATIONS; iteration++) {
         repository,
         "--add-label",
         "shipyard:pending",
+        "--remove-label",
+        "shipyard",
       ]);
     const sandbox = await shipyard.createSandbox({
       branch: issue.branch,
       sandbox: sandboxProvider,
       hooks,
+      copyToWorktree: [".shipyard/setup.sh"],
     });
     let evidence: string;
     try {
@@ -192,7 +198,7 @@ for (let iteration = 0; iteration < MAX_ITERATIONS; iteration++) {
           agent: roleAgent("routine", shipyard.CODEX_MODELS.routine),
           maxIterations: 1,
           promptFile: "./.shipyard/triage-prompt.md",
-          promptArgs: { TASK_ID: ticketId },
+          promptArgs: { TASK_ID: ticketId, BASE_BRANCH: targetBranch },
         });
         verifyTriage(ticketId);
       }
@@ -237,7 +243,7 @@ for (let iteration = 0; iteration < MAX_ITERATIONS; iteration++) {
           `Issue #${issue.id} has unresolved review findings: ${review.stdout.trim().slice(-1200)}`,
         );
       }
-      evidence = `${implementationEvidence}\n\n${reviewEvidence}`;
+      evidence = `${implementationEvidence}\n\nReview: APPROVED\n${reviewEvidence}`;
     } finally {
       await closeClean(sandbox);
     }
@@ -245,6 +251,7 @@ for (let iteration = 0; iteration < MAX_ITERATIONS; iteration++) {
     const publication = await shipyard.createSandbox({
       branch: issue.branch,
       sandbox: sandboxProvider,
+      copyToWorktree: [".shipyard/handoff.sh"],
     });
     try {
       publicationUncertain = true;

package/dist/templates/sequential-reviewer/setup.sh

@@ -18,7 +18,14 @@ if [[ -f package.json ]]; then
     else manager=npm; fi
   fi
   case "$manager" in
-    npm) npm install ;;
+    npm)
+      if [[ -f package-lock.json ]]; then
+        if ! npm ci; then
+          echo "npm ci failed; installing from package.json without changing package-lock.json" >&2
+          npm install --no-package-lock
+        fi
+      else npm install --no-package-lock
+      fi ;;
     pnpm) corepack pnpm install ;;
     yarn) corepack yarn install ;;
     bun)

package/dist/templates/sequential-reviewer/triage-prompt.md

@@ -1,5 +1,7 @@
 Triage GitHub issue #{{TASK_ID}} before Shipyard implementation.
 
-Follow `/triage` and the repository's `docs/agents/triage.md` label mapping. Read the full issue and comments, verify its claim against the codebase, then apply the appropriate category and state label and post the brief or triage notes required by the skill. The maintainer has authorized Shipyard to apply an evidence-based recommendation during this unattended intake. If a decision requires maintainer judgment, use `needs-triage` and record the question. Do not implement the issue or start a PR in this phase.
+Follow `/triage` and the repository's triage label mapping. Read the full issue and comments. Verify the reported behavior against `origin/{{BASE_BRANCH}}`, the integration baseline. The checked-out task branch may contain unfinished changes from an earlier attempt. Do not close the issue as already complete based on the task branch or comments about that candidate.
+
+Apply the appropriate category and state label and post the brief or triage notes required by the skill. The maintainer has authorized Shipyard to apply an evidence-based recommendation during this unattended intake. If a decision requires maintainer judgment, use `needs-triage` and record the question. Do not implement the issue or start a PR in this phase.
 
 Report the applied state and evidence. Shipyard will independently re-read GitHub labels and implement only an open issue carrying both `shipyard` and the sole triage state `ready-for-agent`.

package/dist/templates/shared/block-scope.sh

@@ -108,6 +108,10 @@ Work was not handed off. To retry, resolve the problem, remove shipyard:blocked,
 fi
 
 if [[ "$branch" == "shipyard/spec-$root" ]]; then
+  if ! remove_issue_status "$root" ready-for-human; then
+    echo "Warning: could not clear spec triage status" >&2
+    status_synced=false
+  fi
   if ! remove_issue_status "$root" shipyard:outstanding-tasks; then
     echo "Warning: could not clear spec status" >&2
     status_synced=false
@@ -122,9 +126,11 @@ else
 fi
 if [[ "$branch" == "shipyard/spec-$root" ]]; then
   for affected_id in "${affected_ids[@]:1}"; do
+    remove_issue_status "$affected_id" ready-for-human || status=75
     remove_issue_status "$affected_id" shipyard:pending || status=75
   done
 else
+  remove_issue_status "$root" ready-for-human || status=75
   remove_issue_status "$root" shipyard:pending || status=75
 fi
 

package/dist/templates/shared/handoff.sh

@@ -103,6 +103,7 @@ for ((i=1; i<${#scope_ids[@]}; i++)); do
     echo "Could not mark ticket #${scope_ids[i]} complete; retry issue completion when GitHub is available" >&2
     exit 75
   fi
+  remove_issue_label "${scope_ids[i]}" ready-for-human
   remove_issue_label "${scope_ids[i]}" shipyard:blocked
   remove_issue_label "${scope_ids[i]}" shipyard:pending
 done
@@ -128,7 +129,11 @@ if ! gh label create "$status_label" --repo "$repo" --color "$status_color" --de
   echo "Warning: could not create $status_label" >&2
   status_synced=false
 fi
-if ! gh issue edit "$issue" --repo "$repo" --add-label "$status_label"; then
+if gh issue edit "$issue" --repo "$repo" --add-label "$status_label"; then
+  if [[ "$status_label" == shipyard:complete ]]; then
+    remove_issue_label "$issue" ready-for-human
+  fi
+else
   if [[ "$branch" == "shipyard/issue-$issue" ]]; then
     echo "Could not mark ticket #$issue complete; retry issue completion when GitHub is available" >&2
     exit 75
@@ -170,6 +175,6 @@ if [[ "$status_synced" == true ]]; then
     fi
   done
 else
-  echo "Warning: status labels need reconciliation; retaining ticket activation" >&2
+  echo "Warning: status labels need reconciliation; add shipyard to the ticket to retry" >&2
 fi
 printf '%s\n' "$url"

package/dist/templates/shared/setup.sh

@@ -18,7 +18,14 @@ if [[ -f package.json ]]; then
     else manager=npm; fi
   fi
   case "$manager" in
-    npm) npm install ;;
+    npm)
+      if [[ -f package-lock.json ]]; then
+        if ! npm ci; then
+          echo "npm ci failed; installing from package.json without changing package-lock.json" >&2
+          npm install --no-package-lock
+        fi
+      else npm install --no-package-lock
+      fi ;;
     pnpm) corepack pnpm install ;;
     yarn) corepack yarn install ;;
     bun)

package/dist/templates/shared/triage-prompt.md

@@ -1,5 +1,7 @@
 Triage GitHub issue #{{TASK_ID}} before Shipyard implementation.
 
-Follow `/triage` and the repository's `docs/agents/triage.md` label mapping. Read the full issue and comments, verify its claim against the codebase, then apply the appropriate category and state label and post the brief or triage notes required by the skill. The maintainer has authorized Shipyard to apply an evidence-based recommendation during this unattended intake. If a decision requires maintainer judgment, use `needs-triage` and record the question. Do not implement the issue or start a PR in this phase.
+Follow `/triage` and the repository's triage label mapping. Read the full issue and comments. Verify the reported behavior against `origin/{{BASE_BRANCH}}`, the integration baseline. The checked-out task branch may contain unfinished changes from an earlier attempt. Do not close the issue as already complete based on the task branch or comments about that candidate.
+
+Apply the appropriate category and state label and post the brief or triage notes required by the skill. The maintainer has authorized Shipyard to apply an evidence-based recommendation during this unattended intake. If a decision requires maintainer judgment, use `needs-triage` and record the question. Do not implement the issue or start a PR in this phase.
 
 Report the applied state and evidence. Shipyard will independently re-read GitHub labels and implement only an open issue carrying both `shipyard` and the sole triage state `ready-for-agent`.