@gobing-ai/spur 0.3.14 → 0.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gobing-ai/spur",
-    "version": "0.3.14",
+    "version": "0.3.16",
     "description": "Spur CLI — local-first harness for mainstream coding agents: constraint checking, workflow orchestration, agent health, and history analytics. Bun-native; exposes the `spur` command.",
     "keywords": [
         "spur",

package/spur.js

@@ -50887,7 +50887,7 @@ class AgentService {
     return results.some((result) => !result.usable && result.tier === 1) ? 1 : 0;
   }
   async run(prompt, flags, deps) {
-    const outcome = await this.executeRun(prompt, flags, deps, false);
+    const outcome = await this.executeRun(prompt, flags, deps, { silent: false });
     if (!outcome.ok) {
       this.ctx.output.error(outcome.message);
       return outcome.exitCode;
@@ -50905,7 +50905,7 @@ class AgentService {
     return 3;
   }
   async runCapture(prompt, flags, deps) {
-    const outcome = await this.executeRun(prompt, flags, deps, true);
+    const outcome = await this.executeRun(prompt, flags, deps, { silent: true });
     if (!outcome.ok) {
       return { exitCode: outcome.exitCode, answer: "" };
     }
@@ -50919,7 +50919,25 @@ class AgentService {
       stderr: result.stderr
     };
   }
-  async executeRun(prompt, flags, deps, silent) {
+  async runTraced(prompt, flags, deps) {
+    const outcome = await this.executeRun(prompt, flags, deps, { silent: true, nonInteractive: true });
+    if (!outcome.ok) {
+      return { exitCode: outcome.exitCode, stdout: "", message: outcome.message };
+    }
+    const result = outcome.result;
+    const exitCode = result.exitCode === 0 ? 0 : 3;
+    return {
+      exitCode,
+      invocation: outcome.invocation,
+      stdout: result.stdout,
+      stderr: result.stderr,
+      durationMs: result.durationMs,
+      ...result.signal !== undefined ? { signal: result.signal } : {}
+    };
+  }
+  async executeRun(prompt, flags, deps, options) {
+    const silent = options.silent;
+    const nonInteractive = options.nonInteractive === true;
     const mode = stringFlag(flags, "mode", "text");
     if (mode !== "text" && mode !== "json") {
       return { ok: false, exitCode: 2, message: `Invalid mode: ${mode} (must be text or json)` };
@@ -50943,7 +50961,9 @@ class AgentService {
       return { ok: false, exitCode: 2, message: "Prompt is required" };
     }
     const jsonOutput = silent || booleanFlag(flags, "json");
-    const outputPolicy = jsonOutput ? { mode: "buffered" } : { mode: "stream", isTTY: isatty3(1) };
+    const forceBuffered = silent || nonInteractive;
+    const outputPolicy = forceBuffered ? { mode: "buffered" } : jsonOutput ? { mode: "buffered" } : { mode: "stream", isTTY: isatty3(1) };
+    const outputMode = outputPolicy.mode;
     const runner = deps?.runner ?? new AiRunner({
       processExecutor: new NodeProcessExecutor3({
         output: outputPolicy,
@@ -50962,7 +50982,8 @@ class AgentService {
     if (!jsonOutput && TIER2_AGENTS.has(agent)) {
       this.ctx.output.error(`Warning: ${agent} is a Tier-2 agent (TUI/gateway only)`);
     }
-    const input = prompt !== undefined && isClaudeStyleSlashCommand(prompt) ? translateSlashCommand(agent, prompt) : prompt;
+    const translated = prompt !== undefined && isClaudeStyleSlashCommand(prompt) ? translateSlashCommand(agent, prompt) : undefined;
+    const input = translated ?? prompt;
     const purpose = stringFlag(flags, "purpose", "") || undefined;
     const tags = parseTagsFlag(flags);
     const systemPrompt = stringFlag(flags, "system-prompt", "") || undefined;
@@ -50979,9 +51000,9 @@ class AgentService {
       ...systemPrompt !== undefined ? { systemPrompt } : {},
       ...taskId !== undefined ? { taskId } : {}
     };
+    let shimCommand;
     try {
-      const shim = getAgentShim(agent);
-      const shimCommand = shim.getPromptCommand(promptOptions);
+      shimCommand = typeof runner.buildPromptCommand === "function" ? runner.buildPromptCommand(agent, promptOptions, { cwd: cwd || undefined }) : getAgentShim(agent).getPromptCommand(promptOptions);
       if (!jsonOutput) {
         const version3 = (await detector.detectOne(agent)).version;
         this.ctx.output.error(`\u2699\uFE0F  ${agent}${version3 !== null ? ` v${version3}` : ""}
@@ -50990,6 +51011,21 @@ class AgentService {
     } catch (error51) {
       return { ok: false, exitCode: 2, message: error51 instanceof Error ? error51.message : String(error51) };
     }
+    const traceInput = input === undefined ? undefined : traceSafePrompt(input);
+    const invocation = {
+      agent,
+      source: resolved.source,
+      command: shimCommand.command,
+      argv: sanitizeInvocationArgv(shimCommand.args, input, traceInput),
+      ...cwd !== "" ? { cwd } : {},
+      mode,
+      outputMode,
+      ...timeoutMs !== undefined ? { timeoutMs } : {},
+      continue: continueFlag,
+      stdinInteractive: false,
+      ...model !== undefined ? { model } : {},
+      ...translated !== undefined && prompt !== undefined ? { translatedFrom: traceSafePrompt(prompt) } : {}
+    };
     let result;
     const controller = new AbortController;
     const onTerminate = () => controller.abort();
@@ -51007,7 +51043,7 @@ class AgentService {
       process.off("SIGTERM", onTerminate);
       process.off("SIGINT", onTerminate);
     }
-    return { ok: true, result };
+    return { ok: true, result, invocation };
   }
   async resolveAgent(prompt, flags, doctorRunner) {
     const raw = stringFlag(flags, "agent", "auto");
@@ -51131,6 +51167,32 @@ class AgentService {
 function toJson(value) {
   return JSON.stringify(value, null, 2);
 }
+function traceSafePrompt(prompt) {
+  const trimmed = prompt.trim();
+  if (!TRACE_SAFE_SLASH_COMMAND.test(trimmed)) {
+    return `[redacted prompt: ${prompt.length} chars]`;
+  }
+  const [command = "", ...tokens] = trimmed.split(/\s+/);
+  const safeTokens = tokens.map((token) => TRACE_SAFE_SLASH_TOKEN.test(token) ? token : "[redacted]");
+  return [command, ...safeTokens].join(" ");
+}
+function sanitizeInvocationArgv(argv, rawInput, traceInput) {
+  let redactNext = false;
+  return argv.map((arg) => {
+    if (redactNext) {
+      redactNext = false;
+      return "[redacted]";
+    }
+    if (SENSITIVE_FLAG.test(arg)) {
+      redactNext = true;
+      return arg;
+    }
+    if (rawInput !== undefined && traceInput !== undefined && arg.includes(rawInput)) {
+      return traceInput;
+    }
+    return arg.replace(SENSITIVE_INLINE_FLAG, "$1[redacted]").replace(/\bBearer\s+\S+/gi, "Bearer [redacted]").replace(/\b(?:sk|ghp|github_pat)-?[A-Za-z0-9_]{12,}\b/g, "[redacted]");
+  });
+}
 function extractPhase(prompt) {
   if (prompt === undefined)
     return;
@@ -51231,9 +51293,14 @@ function parseTagsFlag(flags) {
   const tags = raw.split(",").map((tag) => tag.trim()).filter(Boolean);
   return tags.length > 0 ? tags : undefined;
 }
+var TRACE_SAFE_SLASH_COMMAND, TRACE_SAFE_SLASH_TOKEN, SENSITIVE_FLAG, SENSITIVE_INLINE_FLAG;
 var init_agent_service = __esm(() => {
   init_dist7();
   init_dist5();
+  TRACE_SAFE_SLASH_COMMAND = /^(?:\/skill:(?:sp|rd3)-|\/(?:sp|rd3)[:-]|\$(?:sp|rd3)-)[A-Za-z0-9._-]+(?:\s|$)/;
+  TRACE_SAFE_SLASH_TOKEN = /^(?:\d{4}|--(?:auto|next|force|bdd)|--(?:mode|fix|focus)|implement|test|review|verify|all|none|blockers-first|quick|requirements|background|constraints|acceptance)$/;
+  SENSITIVE_FLAG = /^--?(?:api[-_]?key|authorization|credential|password|secret|token)$/i;
+  SENSITIVE_INLINE_FLAG = /^(--?(?:api[-_]?key|authorization|credential|password|secret|token)=).+$/i;
 });
 
 // ../../packages/domain/src/analytics/models.ts
@@ -61556,6 +61623,10 @@ function isPlaceholderBody(body) {
   const stripped = body.replace(/<!--[\s\S]*?-->/g, "").replace(/^\s*>\s*TBD\s*$/gim, "").trim();
   return stripped.length === 0;
 }
+function isPlaceholderCell(cell) {
+  const c3 = cell.trim();
+  return c3 === "" || /^[\u2014\u2013-]+$/.test(c3) || /^n\/?a$/i.test(c3);
+}
 function hasPopulatedPriorityTable(body) {
   for (const line of body.split(`
 `)) {
@@ -61565,7 +61636,7 @@ function hasPopulatedPriorityTable(body) {
     const severityIdx = cells.findIndex((c3) => /^\s*P[1-4]\s*$/.test(c3));
     if (severityIdx === -1)
       continue;
-    const hasContent = cells.some((c3, i2) => i2 !== severityIdx && c3.trim().length > 0);
+    const hasContent = cells.some((c3, i2) => i2 !== severityIdx && !isPlaceholderCell(c3));
     if (hasContent)
       return true;
   }
@@ -61587,7 +61658,7 @@ function isReviewScaffold(body) {
       continue;
     const cells = line.split("|").map((c3) => c3.trim());
     const isSeparator = cells.every((c3) => c3 === "" || /^:?-+:?$/.test(c3));
-    const isEmptyPRow = cells.every((c3) => c3 === "" || /^P[1-4]$/.test(c3)) && cells.some((c3) => /^P[1-4]$/.test(c3));
+    const isEmptyPRow = cells.every((c3) => isPlaceholderCell(c3) || /^P[1-4]$/.test(c3)) && cells.some((c3) => /^P[1-4]$/.test(c3));
     const isHeader = cells.some((c3) => /severity|file|finding|recommendation/i.test(c3));
     if (isEmptyPRow)
       sawEmptyPRow = true;
@@ -63817,55 +63888,46 @@ class AgentRunActionRunner {
     const expectFile = asOptionalString(options.expectFile);
     const capture = asOptionalBoolean(options.capture) || answerFile !== undefined;
     const agentLabel = agent ?? "<default>";
-    if (capture) {
-      const captured = await this.agentService.runCapture(input, flags);
-      const { exitCode: exitCode2, answer } = captured;
-      const ok2 = exitCode2 === 0;
-      if (answerFile !== undefined) {
-        const target = isAbsolute2(answerFile) ? answerFile : join12(cwd, answerFile);
-        await mkdir(dirname10(target), { recursive: true });
-        await writeFile(target, answer, "utf8");
-      }
-      if (ok2 && expectFile !== undefined) {
-        const target = isAbsolute2(expectFile) ? expectFile : join12(cwd, expectFile);
-        if (!existsSync7(target)) {
-          return {
-            ok: false,
-            data: { exitCode: exitCode2, agent: agentLabel, answer },
-            error: `agent.run (${agentLabel}) exited 0 but expected file is absent: ${expectFile}`
-          };
-        }
-      }
-      if (!ok2) {
-        await writePartialWorkArtifact(context4, agentLabel, model, captured, cwd);
-      }
-      return {
-        ok: ok2,
-        data: { exitCode: exitCode2, agent: agentLabel, answer },
-        error: ok2 ? undefined : `agent.run (${agentLabel}) exited with code ${exitCode2}`,
-        setVars: ok2 ? { __agentSession: "open" } : undefined
-      };
-    }
-    const exitCode = await this.agentService.run(input, flags);
+    const traced = await this.agentService.runTraced(input, flags);
+    const { exitCode, stdout: answer } = traced;
     const ok = exitCode === 0;
+    const invocation = traced.invocation;
+    if (capture && answerFile !== undefined) {
+      const target = isAbsolute2(answerFile) ? answerFile : join12(cwd, answerFile);
+      await mkdir(dirname10(target), { recursive: true });
+      await writeFile(target, answer, "utf8");
+    }
     if (ok && expectFile !== undefined) {
       const target = isAbsolute2(expectFile) ? expectFile : join12(cwd, expectFile);
       if (!existsSync7(target)) {
         return {
           ok: false,
-          data: { exitCode, agent: agentLabel },
+          data: buildResultData(exitCode, agentLabel, capture, answer, invocation),
           error: `agent.run (${agentLabel}) exited 0 but expected file is absent: ${expectFile}`
         };
       }
     }
+    if (!ok) {
+      await writePartialWorkArtifact(context4, agentLabel, model, traced, cwd);
+    }
+    const stepLabel = context4.stateOrNodeId;
+    const error51 = ok ? undefined : traced.signal !== undefined ? timeoutMs !== undefined ? `agent.run '${stepLabel}' (${agentLabel}) terminated by signal ${traced.signal} (configured timeout: ${timeoutMs}ms; timeout or cancellation); see partial-work artifact` : `agent.run '${stepLabel}' (${agentLabel}) was cancelled by signal ${traced.signal}; see partial-work artifact` : traced.message !== undefined ? `agent.run '${stepLabel}' (${agentLabel}) dispatch failed: ${traced.message}` : `agent.run '${stepLabel}' (${agentLabel}) exited with code ${exitCode}`;
     return {
       ok,
-      data: { exitCode, agent: agentLabel },
-      error: ok ? undefined : `agent.run (${agentLabel}) exited with code ${exitCode}`,
+      data: buildResultData(exitCode, agentLabel, capture, answer, invocation),
+      error: error51,
       setVars: ok ? { __agentSession: "open" } : undefined
     };
   }
 }
+function buildResultData(exitCode, agentLabel, capture, answer, invocation) {
+  const data = { exitCode, agent: agentLabel };
+  if (capture)
+    data.answer = answer;
+  if (invocation !== undefined)
+    data.invocation = invocation;
+  return data;
+}
 function asOptionalString(value) {
   if (value === undefined || value === null)
     return;
@@ -63893,13 +63955,16 @@ function asOptionalNumber(value) {
   }
   return;
 }
-async function writePartialWorkArtifact(context4, agentLabel, model, captured, cwd) {
+async function writePartialWorkArtifact(context4, agentLabel, model, traced, cwd) {
   try {
-    const exitReason = captured.signal !== undefined ? `killed by signal ${captured.signal} (likely timeout)` : `exited with code ${captured.exitCode}`;
+    const signal = traced.signal;
+    const exitReason = signal !== undefined ? `killed by signal ${signal} (likely timeout or cancellation)` : traced.message !== undefined ? `dispatch error: ${traced.message}` : `exited with code ${traced.exitCode}`;
     const diffStat = await gitDiffStat(cwd);
-    const stdoutTail = tail(captured.answer, PARTIAL_ARTIFACT_TAIL_CHARS);
-    const stderrTail = tail(captured.stderr ?? "", PARTIAL_ARTIFACT_TAIL_CHARS);
+    const stdoutTail = tail(traced.stdout, PARTIAL_ARTIFACT_TAIL_CHARS);
+    const stderrTail = tail(traced.stderr ?? "", PARTIAL_ARTIFACT_TAIL_CHARS);
     const headerLine = model !== undefined ? `${agentLabel} (model: ${model})` : agentLabel;
+    const inv = traced.invocation;
+    const argvLine = inv ? `${inv.command} ${inv.argv.join(" ")}` : "(invocation not captured)";
     const body = [
       `# Partial-work handoff \u2014 ${headerLine}`,
       "",
@@ -63908,7 +63973,18 @@ async function writePartialWorkArtifact(context4, agentLabel, model, captured, c
       `- agent: ${agentLabel}`,
       `- model: ${model ?? "(default)"}`,
       `- exit reason: ${exitReason}`,
-      `- elapsed: ${captured.durationMs ?? "unknown"}ms`,
+      `- elapsed: ${traced.durationMs ?? "unknown"}ms`,
+      "",
+      "## resolved invocation",
+      "",
+      `- command: ${argvLine}`,
+      `- cwd: ${inv?.cwd ?? "(inherit)"}`,
+      `- mode: ${inv?.mode ?? "unknown"}`,
+      `- timeoutMs: ${inv?.timeoutMs ?? "(none)"}`,
+      `- continue: ${inv?.continue ?? false}`,
+      `- output: ${inv?.outputMode ?? "unknown"}`,
+      `- stdinInteractive: ${inv?.stdinInteractive ?? false}`,
+      `- translatedFrom: ${inv?.translatedFrom ?? "(none)"}`,
       "",
       "## git diff --stat",
       "```",
@@ -73234,7 +73310,7 @@ import { join as join15, resolve as resolve5 } from "path";
 var CLI_CONFIG = {
   binaryName: "spur",
   binaryLabel: "spur",
-  binaryVersion: "0.3.14",
+  binaryVersion: "0.3.16",
   configDir: ".spur",
   configFile: ".spur/config.yaml",
   databaseFile: ".spur/spur.db"