@snappedly-tools/shipyard 0.11.1 → 0.11.2

package/dist/main.js

@@ -2400,7 +2400,7 @@ var runnerCommand = Command.make(
     purgeRunnerCommand
   ])
 );
-var VERSION = "0.11.1" ;
+var VERSION = "0.11.2" ;
 var SHIPYARD_PACKAGE_NAME = "@snappedly-tools/shipyard";
 var isMissingPath = (error) => error !== null && typeof error === "object" && "code" in error && error.code === "ENOENT";
 var lstatIfPresent = async (path) => {

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

@@ -96,7 +96,7 @@ const closeClean = async (sandbox: {
   if (preservedWorktreePath)
     throw new Error(`Sandbox has uncommitted work at ${preservedWorktreePath}`);
 };
-const verifyTriage = (ticketId: string) => {
+const verifyTriage = (ticketId: string, triageOutput?: string) => {
   try {
     execFileSync("bash", [".shipyard/verify-triage.sh", ticketId, repository], {
       encoding: "utf8",
@@ -105,9 +105,31 @@ const verifyTriage = (ticketId: string) => {
     const detail = (error as { stderr?: string | Buffer }).stderr
       ?.toString()
       .trim();
-    throw new Error(detail || `Could not verify triage for #${ticketId}`);
+    const reason = detail || `Could not verify triage for #${ticketId}`;
+    const output = triageOutput?.trim();
+    throw new Error(
+      output ? `${reason}; triage output: ${output.slice(-1200)}` : reason,
+    );
   }
 };
+const verifyTriageAccess = async (
+  sandbox: {
+    exec: (
+      command: string,
+    ) => Promise<{ exitCode: number; stdout: string; stderr: string }>;
+  },
+  ticketId: string,
+) => {
+  if (!/^\d+$/.test(ticketId))
+    throw new Error(`Invalid issue number: ${ticketId}`);
+  const result = await sandbox.exec(
+    `gh issue view ${ticketId} --repo ${repository} --json number --jq .number`,
+  );
+  if (result.exitCode !== 0)
+    throw new Error(
+      `Cannot triage issue #${ticketId}: GitHub access failed in the sandbox: ${result.stderr.trim() || result.stdout.trim() || `exit ${result.exitCode}`}`,
+    );
+};
 const planSchema = z.object({ issues: z.array(z.object({ id: z.string() })) });
 type Ticket = {
   id: string;
@@ -174,15 +196,19 @@ const runWorker = async (scope: Scope, ticket: Ticket) => {
     copyToWorktree: [".shipyard/setup.sh"],
   });
   try {
-    if (!ticket.triageReady)
-      await sandbox.run({
+    let triageOutput: string | undefined;
+    if (!ticket.triageReady) {
+      await verifyTriageAccess(sandbox, ticket.id);
+      const triage = await sandbox.run({
         name: `triage #${ticket.id}`,
         maxIterations: 1,
         agent: roleAgent("routine", shipyard.CODEX_MODELS.routine),
         promptFile: "./.shipyard/triage-prompt.md",
         promptArgs: { TASK_ID: ticket.id, BASE_BRANCH: targetBranch },
       });
-    verifyTriage(ticket.id);
+      triageOutput = triage.stdout;
+    }
+    verifyTriage(ticket.id, triageOutput);
     const implementation = await sandbox.run({
       name: "implementer",
       maxIterations: 100,
@@ -447,15 +473,19 @@ for (let iteration = 0; iteration < 10; iteration++) {
         let handoffEvidence: string;
         try {
           if (scope.kind === "standalone") {
-            if (!scope.triageReady)
-              await integration.run({
+            let triageOutput: string | undefined;
+            if (!scope.triageReady) {
+              await verifyTriageAccess(integration, id);
+              const triage = await integration.run({
                 name: `triage #${id}`,
                 maxIterations: 1,
                 agent: roleAgent("routine", shipyard.CODEX_MODELS.routine),
                 promptFile: "./.shipyard/triage-prompt.md",
                 promptArgs: { TASK_ID: id, BASE_BRANCH: targetBranch },
               });
-            verifyTriage(id);
+              triageOutput = triage.stdout;
+            }
+            verifyTriage(id, triageOutput);
             const standalone = await integration.run({
               name: "implementer",
               maxIterations: 100,

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

@@ -96,7 +96,7 @@ const closeClean = async (sandbox: {
   if (preservedWorktreePath)
     throw new Error(`Sandbox has uncommitted work at ${preservedWorktreePath}`);
 };
-const verifyTriage = (ticketId: string) => {
+const verifyTriage = (ticketId: string, triageOutput?: string) => {
   try {
     execFileSync("bash", [".shipyard/verify-triage.sh", ticketId, repository], {
       encoding: "utf8",
@@ -105,9 +105,31 @@ const verifyTriage = (ticketId: string) => {
     const detail = (error as { stderr?: string | Buffer }).stderr
       ?.toString()
       .trim();
-    throw new Error(detail || `Could not verify triage for #${ticketId}`);
+    const reason = detail || `Could not verify triage for #${ticketId}`;
+    const output = triageOutput?.trim();
+    throw new Error(
+      output ? `${reason}; triage output: ${output.slice(-1200)}` : reason,
+    );
   }
 };
+const verifyTriageAccess = async (
+  sandbox: {
+    exec: (
+      command: string,
+    ) => Promise<{ exitCode: number; stdout: string; stderr: string }>;
+  },
+  ticketId: string,
+) => {
+  if (!/^\d+$/.test(ticketId))
+    throw new Error(`Invalid issue number: ${ticketId}`);
+  const result = await sandbox.exec(
+    `gh issue view ${ticketId} --repo ${repository} --json number --jq .number`,
+  );
+  if (result.exitCode !== 0)
+    throw new Error(
+      `Cannot triage issue #${ticketId}: GitHub access failed in the sandbox: ${result.stderr.trim() || result.stdout.trim() || `exit ${result.exitCode}`}`,
+    );
+};
 const planSchema = z.object({ issues: z.array(z.object({ id: z.string() })) });
 type Ticket = {
   id: string;
@@ -184,15 +206,19 @@ const runWorker = async (scope: Scope, ticket: Ticket) => {
     copyToWorktree: [".shipyard/setup.sh"],
   });
   try {
-    if (!ticket.triageReady)
-      await sandbox.run({
+    let triageOutput: string | undefined;
+    if (!ticket.triageReady) {
+      await verifyTriageAccess(sandbox, ticket.id);
+      const triage = await sandbox.run({
         name: `triage #${ticket.id}`,
         maxIterations: 1,
         agent: roleAgent("routine", shipyard.CODEX_MODELS.routine),
         promptFile: "./.shipyard/triage-prompt.md",
         promptArgs: { TASK_ID: ticket.id, BASE_BRANCH: targetBranch },
       });
-    verifyTriage(ticket.id);
+      triageOutput = triage.stdout;
+    }
+    verifyTriage(ticket.id, triageOutput);
     const implementation = await sandbox.run({
       name: "implementer",
       maxIterations: 100,
@@ -470,15 +496,19 @@ for (let iteration = 0; iteration < 10; iteration++) {
         let handoffEvidence: string;
         try {
           if (scope.kind === "standalone") {
-            if (!scope.triageReady)
-              await integration.run({
+            let triageOutput: string | undefined;
+            if (!scope.triageReady) {
+              await verifyTriageAccess(integration, id);
+              const triage = await integration.run({
                 name: `triage #${id}`,
                 maxIterations: 1,
                 agent: roleAgent("routine", shipyard.CODEX_MODELS.routine),
                 promptFile: "./.shipyard/triage-prompt.md",
                 promptArgs: { TASK_ID: id, BASE_BRANCH: targetBranch },
               });
-            verifyTriage(id);
+              triageOutput = triage.stdout;
+            }
+            verifyTriage(id, triageOutput);
             const standalone = await integration.run({
               name: "implementer",
               maxIterations: 100,

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

@@ -93,7 +93,7 @@ const closeClean = async (sandbox: {
   if (preservedWorktreePath)
     throw new Error(`Sandbox has uncommitted work at ${preservedWorktreePath}`);
 };
-const verifyTriage = (ticketId: string) => {
+const verifyTriage = (ticketId: string, triageOutput?: string) => {
   try {
     execFileSync("bash", [".shipyard/verify-triage.sh", ticketId, repository], {
       encoding: "utf8",
@@ -102,9 +102,31 @@ const verifyTriage = (ticketId: string) => {
     const detail = (error as { stderr?: string | Buffer }).stderr
       ?.toString()
       .trim();
-    throw new Error(detail || `Could not verify triage for #${ticketId}`);
+    const reason = detail || `Could not verify triage for #${ticketId}`;
+    const output = triageOutput?.trim();
+    throw new Error(
+      output ? `${reason}; triage output: ${output.slice(-1200)}` : reason,
+    );
   }
 };
+const verifyTriageAccess = async (
+  sandbox: {
+    exec: (
+      command: string,
+    ) => Promise<{ exitCode: number; stdout: string; stderr: string }>;
+  },
+  ticketId: string,
+) => {
+  if (!/^\d+$/.test(ticketId))
+    throw new Error(`Invalid issue number: ${ticketId}`);
+  const result = await sandbox.exec(
+    `gh issue view ${ticketId} --repo ${repository} --json number --jq .number`,
+  );
+  if (result.exitCode !== 0)
+    throw new Error(
+      `Cannot triage issue #${ticketId}: GitHub access failed in the sandbox: ${result.stderr.trim() || result.stdout.trim() || `exit ${result.exitCode}`}`,
+    );
+};
 
 const handoffEvidence = (stdout: string): string | undefined =>
   [...stdout.matchAll(/<handoff>([\s\S]*?)<\/handoff>/g)].at(-1)?.[1]?.trim();
@@ -200,15 +222,19 @@ for (let iteration = 0; iteration < MAX_ITERATIONS; iteration++) {
             ? issue.tickets?.find((ticket) => ticket.id === ticketId)
                 ?.triageReady
             : issue.triageReady;
-        if (!ready)
-          await sandbox.run({
+        let triageOutput: string | undefined;
+        if (!ready) {
+          await verifyTriageAccess(sandbox, ticketId);
+          const triage = await sandbox.run({
             name: `triage #${ticketId}`,
             agent: roleAgent("routine", shipyard.CODEX_MODELS.routine),
             maxIterations: 1,
             promptFile: "./.shipyard/triage-prompt.md",
             promptArgs: { TASK_ID: ticketId, BASE_BRANCH: targetBranch },
           });
-        verifyTriage(ticketId);
+          triageOutput = triage.stdout;
+        }
+        verifyTriage(ticketId, triageOutput);
       }
       const implement = await sandbox.run({
         name: "implementer",

package/dist/templates/simple-loop/main.mts

@@ -92,7 +92,7 @@ const closeClean = async (sandbox: {
   if (preservedWorktreePath)
     throw new Error(`Sandbox has uncommitted work at ${preservedWorktreePath}`);
 };
-const verifyTriage = (ticketId: string) => {
+const verifyTriage = (ticketId: string, triageOutput?: string) => {
   try {
     execFileSync("bash", [".shipyard/verify-triage.sh", ticketId, repository], {
       encoding: "utf8",
@@ -101,9 +101,31 @@ const verifyTriage = (ticketId: string) => {
     const detail = (error as { stderr?: string | Buffer }).stderr
       ?.toString()
       .trim();
-    throw new Error(detail || `Could not verify triage for #${ticketId}`);
+    const reason = detail || `Could not verify triage for #${ticketId}`;
+    const output = triageOutput?.trim();
+    throw new Error(
+      output ? `${reason}; triage output: ${output.slice(-1200)}` : reason,
+    );
   }
 };
+const verifyTriageAccess = async (
+  sandbox: {
+    exec: (
+      command: string,
+    ) => Promise<{ exitCode: number; stdout: string; stderr: string }>;
+  },
+  ticketId: string,
+) => {
+  if (!/^\d+$/.test(ticketId))
+    throw new Error(`Invalid issue number: ${ticketId}`);
+  const result = await sandbox.exec(
+    `gh issue view ${ticketId} --repo ${repository} --json number --jq .number`,
+  );
+  if (result.exitCode !== 0)
+    throw new Error(
+      `Cannot triage issue #${ticketId}: GitHub access failed in the sandbox: ${result.stderr.trim() || result.stdout.trim() || `exit ${result.exitCode}`}`,
+    );
+};
 
 const blockScope = (
   scope: { id: string; branch: string; tickets?: Array<{ id: string }> },
@@ -197,15 +219,19 @@ for (let iteration = 0; iteration < 3; iteration++) {
             ? issue.tickets?.find((ticket) => ticket.id === ticketId)
                 ?.triageReady
             : issue.triageReady;
-        if (!ready)
-          await sandbox.run({
+        let triageOutput: string | undefined;
+        if (!ready) {
+          await verifyTriageAccess(sandbox, ticketId);
+          const triage = await sandbox.run({
             name: `triage #${ticketId}`,
             agent: roleAgent("routine", shipyard.CODEX_MODELS.routine),
             maxIterations: 1,
             promptFile: "./.shipyard/triage-prompt.md",
             promptArgs: { TASK_ID: ticketId, BASE_BRANCH: targetBranch },
           });
-        verifyTriage(ticketId);
+          triageOutput = triage.stdout;
+        }
+        verifyTriage(ticketId, triageOutput);
       }
       const result = await sandbox.run({
         name: "implementer",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snappedly-tools/shipyard",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Run AI coding agents in isolated sandboxes",
   "type": "module",
   "main": "./dist/index.js",