@trim21/personal-pi-extensions 0.0.133 → 0.0.135

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.0.133",
+  "version": "0.0.135",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [

package/src/gh-readonly.ts

@@ -43,11 +43,13 @@ interface GhResult {
   code: number;
   killed: boolean;
   combined: string;
+  /** Why the process was killed, when `killed` is true. */
+  reason?: "timeout" | "abort";
 }
 
 // ── helpers ──────────────────────────────────────────────────────────────────
 
-function runGh(
+export function runGh(
   args: string[],
   ctx: { cwd?: string; signal?: AbortSignal; timeout?: number },
 ): Promise<GhResult> {
@@ -63,11 +65,14 @@ function runGh(
     let stderr = "";
     const combined: string[] = [];
     let killed = false;
+    let killReason: "timeout" | "abort" | undefined;
     let timeoutId: ReturnType<typeof setTimeout> | undefined;
+    let onAbort: (() => void) | undefined;
 
-    const killProcess = () => {
+    const killProcess = (reason: "timeout" | "abort") => {
       if (!killed) {
         killed = true;
+        killReason = reason;
         proc.kill("SIGTERM");
         setTimeout(() => {
           if (!proc.killed) proc.kill("SIGKILL");
@@ -76,16 +81,21 @@ function runGh(
     };
 
     if (ctx.signal) {
+      onAbort = () => killProcess("abort");
       if (ctx.signal.aborted) {
-        killProcess();
+        killProcess("abort");
       } else {
-        ctx.signal.addEventListener("abort", killProcess, { once: true });
+        ctx.signal.addEventListener("abort", onAbort, { once: true });
       }
     }
 
-    const timeout = ctx.timeout ?? 30_000;
+    // Default timeout: 10 minutes. Long operations like downloading a CI job's
+    // full log routinely take well over 30s, so a short default would kill them
+    // mid-transfer; combined with `code ?? 0` that would silently cache a
+    // truncated log as success. A killed process must never look successful.
+    const timeout = ctx.timeout ?? 600_000;
     if (timeout > 0) {
-      timeoutId = setTimeout(killProcess, timeout);
+      timeoutId = setTimeout(() => killProcess("timeout"), timeout);
     }
 
     proc.stdout?.on("data", (data: Buffer) => {
@@ -101,18 +111,29 @@ function runGh(
 
     proc.on("close", (code) => {
       if (timeoutId) clearTimeout(timeoutId);
-      if (ctx.signal) {
-        ctx.signal.removeEventListener("abort", killProcess);
+      if (ctx.signal && onAbort) {
+        ctx.signal.removeEventListener("abort", onAbort);
       }
-      resolve({ stdout, stderr, code: code ?? 0, killed, combined: combined.join("") });
+      resolve({
+        stdout,
+        stderr,
+        // When killed by a signal the close event's code is null; report the
+        // process as failed instead of pretending it succeeded. -1 is a
+        // sentinel for "did not exit normally" — distinct from a real gh
+        // failure exit code (1), which is always in 0-255.
+        code: code ?? (killed ? -1 : 0),
+        killed,
+        combined: combined.join(""),
+        reason: killReason,
+      });
     });
 
     proc.on("error", () => {
       if (timeoutId) clearTimeout(timeoutId);
-      if (ctx.signal) {
-        ctx.signal.removeEventListener("abort", killProcess);
+      if (ctx.signal && onAbort) {
+        ctx.signal.removeEventListener("abort", onAbort);
       }
-      resolve({ stdout, stderr, code: 1, killed, combined: combined.join("") });
+      resolve({ stdout, stderr, code: 1, killed, combined: combined.join(""), reason: killReason });
     });
   });
 }
@@ -131,7 +152,16 @@ export class GhError extends Error {
 
   constructor(args: string[], result: GhResult, input?: unknown) {
     const inputText = input === undefined ? "" : `<input>${JSON.stringify(input)}<input>\n`;
-    super(`${inputText}<output>${result.combined.trim() || `exit code ${result.code}`}<output>`);
+    const killedText = result.killed
+      ? result.reason === "timeout"
+        ? " (command timed out)"
+        : result.reason === "abort"
+          ? " (command aborted)"
+          : ""
+      : "";
+    super(
+      `${inputText}<output>${result.combined.trim() || `exit code ${result.code}`}${killedText}<output>`,
+    );
     this.name = "GhError";
     this.args = args;
     this.code = result.code;
@@ -196,7 +226,7 @@ export async function pollChecksResult<R extends { code: number; stdout: string
 }
 
 /** Run `gh` and return stdout. On non-zero exit, throws a `GhError` carrying the toolcall input and raw command. */
-async function ghExec(
+export async function ghExec(
   args: string[],
   ctx: { cwd?: string; signal?: AbortSignal; input?: unknown },
 ): Promise<string> {
@@ -258,12 +288,18 @@ function truncate(
  * Format a successful gh invocation's stdout into a tool result.
  * Failures are thrown by `ghExec` as `GhError`, so only the success path lives here.
  */
-function toToolResult(stdout: string): {
+function toToolResult(
+  stdout: string,
+  input?: unknown,
+): {
   content: Array<{ type: "text"; text: string }>;
   details: Record<string, unknown>;
 } {
   const { text, truncated } = truncate(stdout);
-  return { content: [{ type: "text", text }], details: { truncated } };
+  return {
+    content: [{ type: "text", text }],
+    details: { ...(input !== undefined ? { input } : {}), truncated },
+  };
 }
 
 interface ListFilters {
@@ -883,6 +919,7 @@ export default function (pi: ExtensionAPI) {
           ],
           { cwd: ctx.cwd, signal, input: params },
         ),
+        params,
       );
     },
   });
@@ -907,6 +944,7 @@ export default function (pi: ExtensionAPI) {
     async execute(_id, params, signal, _onUpdate, ctx) {
       return toToolResult(
         await listGithub("issue", params, { cwd: ctx.cwd, signal, input: params }),
+        params,
       );
     },
   });
@@ -935,6 +973,7 @@ export default function (pi: ExtensionAPI) {
           ],
           { cwd: ctx.cwd, signal, input: params },
         ),
+        params,
       );
     },
   });
@@ -959,7 +998,10 @@ export default function (pi: ExtensionAPI) {
       limit: Type.Optional(Type.Number({ description: "Max results (default 30)" })),
     }),
     async execute(_id, params, signal, _onUpdate, ctx) {
-      return toToolResult(await listGithub("pr", params, { cwd: ctx.cwd, signal, input: params }));
+      return toToolResult(
+        await listGithub("pr", params, { cwd: ctx.cwd, signal, input: params }),
+        params,
+      );
     },
   });
 
@@ -976,7 +1018,7 @@ export default function (pi: ExtensionAPI) {
     async execute(_id, params, signal, _onUpdate, ctx) {
       const { number, repo } = params;
       const args = ["pr", "diff", String(number), ...repoArgs(repo)];
-      return toToolResult(await ghExec(args, { cwd: ctx.cwd, signal, input: params }));
+      return toToolResult(await ghExec(args, { cwd: ctx.cwd, signal, input: params }), params);
     },
   });
 
@@ -1003,7 +1045,7 @@ export default function (pi: ExtensionAPI) {
         // Anything else is a real error (cancelled, auth, network, ...)
         throw new GhError(args, final, params);
       }
-      return toToolResult(final.stdout);
+      return toToolResult(final.stdout, params);
     },
   });
 
@@ -1067,7 +1109,7 @@ export default function (pi: ExtensionAPI) {
       const { text, truncated } = truncate(out);
       return {
         content: [{ type: "text", text }],
-        details: { truncated },
+        details: { input: params, truncated },
       };
     },
   });
@@ -1090,6 +1132,7 @@ export default function (pi: ExtensionAPI) {
           signal,
           input: params,
         }),
+        params,
       );
     },
   });
@@ -1114,7 +1157,7 @@ export default function (pi: ExtensionAPI) {
       if (limit) args.push("--limit", String(limit));
       if (status) args.push("--status", status);
       if (workflow) args.push("--workflow", workflow);
-      return toToolResult(await ghExec(args, { cwd: ctx.cwd, signal, input: params }));
+      return toToolResult(await ghExec(args, { cwd: ctx.cwd, signal, input: params }), params);
     },
   });
 
@@ -1172,12 +1215,13 @@ export default function (pi: ExtensionAPI) {
           content: [{ type: "text", text: `Fetching job list...` }],
           details: {},
         });
-        return renderStepLog(
+        const stepResult = await renderStepLog(
           { runId: String(run_id), job, step, offset, limit },
           jobs,
           fetchJobLog,
           onUpdate,
         );
+        return { ...stepResult, details: { ...stepResult.details, input: params } };
       }
 
       // ── List jobs/steps, with failed step logs expanded ────────────────
@@ -1185,7 +1229,12 @@ export default function (pi: ExtensionAPI) {
         content: [{ type: "text", text: `Fetching job list...` }],
         details: {},
       });
-      return renderJobLogs({ runId: String(run_id), job, offset, limit }, jobs, fetchJobLog);
+      const jobsResult = await renderJobLogs(
+        { runId: String(run_id), job, offset, limit },
+        jobs,
+        fetchJobLog,
+      );
+      return { ...jobsResult, details: { ...jobsResult.details, input: params } };
     },
   });
 
@@ -1209,6 +1258,7 @@ export default function (pi: ExtensionAPI) {
           signal,
           input: params,
         }),
+        params,
       );
     },
   });
@@ -1226,7 +1276,7 @@ export default function (pi: ExtensionAPI) {
       const { repo } = params;
       const args = ["repo", "view"];
       if (repo) args.push(repo);
-      return toToolResult(await ghExec(args, { cwd: ctx.cwd, signal, input: params }));
+      return toToolResult(await ghExec(args, { cwd: ctx.cwd, signal, input: params }), params);
     },
   });
 
@@ -1244,7 +1294,7 @@ export default function (pi: ExtensionAPI) {
       const { repo, limit } = params;
       const args = ["release", "list", ...repoArgs(repo)];
       if (limit) args.push("--limit", String(limit));
-      return toToolResult(await ghExec(args, { cwd: ctx.cwd, signal, input: params }));
+      return toToolResult(await ghExec(args, { cwd: ctx.cwd, signal, input: params }), params);
     },
   });
 
@@ -1266,6 +1316,7 @@ export default function (pi: ExtensionAPI) {
           signal,
           input: params,
         }),
+        params,
       );
     },
   });
@@ -1308,7 +1359,7 @@ export default function (pi: ExtensionAPI) {
           content: [
             { type: "text", text: `## PR #${number} CI Checks - FAILED\n\n${stdout}\n${stderr}` },
           ],
-          details: { status: "failure", exitCode },
+          details: { status: "failure", exitCode, input: params },
         };
       }
 
@@ -1318,7 +1369,7 @@ export default function (pi: ExtensionAPI) {
 
       return {
         content: [{ type: "text", text: `## PR #${number} CI Checks - PASSED\n\n${stdout}` }],
-        details: { status: "success", exitCode: 0 },
+        details: { status: "success", exitCode: 0, input: params },
       };
     },
   });
@@ -1357,7 +1408,7 @@ export default function (pi: ExtensionAPI) {
         content: [
           { type: "text", text: `## Workflow Run ${run_id} Completed\n\n${result.stdout}` },
         ],
-        details: { exitCode: 0 },
+        details: { exitCode: 0, input: params },
       };
     },
   });