mustard-claude 3.1.8 → 3.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mustard-claude",
-  "version": "3.1.8",
+  "version": "3.1.11",
   "description": "Framework-agnostic CLI for Claude Code project setup",
   "type": "module",
   "bin": {

package/templates/CLAUDE.md

@@ -55,7 +55,7 @@ node scripts/sync-registry.js --force
 - PreToolUse hooks use `permissionDecision` response format
 - PostToolUse hooks use `decision` response format
 - Every new hook must be registered in `settings.json` with a timeout
-- Task dispatch failures (API overload) are logged to `pipeline-state.lastDispatchFailure`; `/resume` auto-recovers within 10 min
+- Task dispatch failures (API overload, HTTP 5xx, tool result missing) are logged to `pipeline-state.lastDispatchFailure`; `/resume` auto-recovers within 10 min
 - Generated files must start with `<!-- mustard:generated -->` header
 - Skills must have YAML frontmatter BEFORE the `<!-- mustard:generated -->` line
 

package/templates/commands/mustard/resume/SKILL.md

@@ -69,8 +69,8 @@ Before the normal detect-and-confirm flow, scan the newest pipeline state for a
    ## Context
    - Branch: {from git}
    - Files changed: {run `node .claude/scripts/diff-context.js`}
-   - Last agent: {from `.claude/.agent-memory/_index.json` last entry}
-   - Last action: {summary from last agent memory entry}
+   - Last agent: {Read `.claude/.agent-memory/_index.json` and pick the last entry's `agent_type`. If the file or `.agent-memory/` directory is missing, print literal `(none)` — do NOT probe with `ls`/`grep`, it surfaces noisy exit codes}
+   - Last action: {from the same last entry's `summary` field. If missing, print literal `(no prior memory)`}
    - Decisions: {decisions[] from pipeline state, if any}
 
    ## Next Action

package/templates/hooks/__tests__/hooks.test.js

@@ -554,7 +554,7 @@ describe("subagent-tracker.js overload detection", () => {
       assert.equal(r.code, 0);
       const state = JSON.parse(fs.readFileSync(pipelinePath, "utf8"));
       assert.ok(state.lastDispatchFailure, "flag must be set");
-      assert.equal(state.lastDispatchFailure.reason, "api_overload");
+      assert.equal(state.lastDispatchFailure.reason, "dispatch_failure");
       assert.equal(state.lastDispatchFailure.agentType, "general-purpose");
       assert.equal(state.lastDispatchFailure.description, "test dispatch");
     } finally {
@@ -562,6 +562,40 @@ describe("subagent-tracker.js overload detection", () => {
     }
   });
 
+  it("should flag lastDispatchFailure on tool result missing infrastructure error", async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "infra-missing-"));
+    const pipelinePath = setupPipelineState(tmpDir);
+    try {
+      const r = await dispatchTaskResult(tmpDir, {
+        is_error: true,
+        content: "Tool result missing due to internal error",
+      });
+      assert.equal(r.code, 0);
+      const state = JSON.parse(fs.readFileSync(pipelinePath, "utf8"));
+      assert.ok(state.lastDispatchFailure, "flag must be set on infra failure");
+      assert.equal(state.lastDispatchFailure.reason, "dispatch_failure");
+    } finally {
+      fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+  });
+
+  it("should flag lastDispatchFailure on HTTP 503 service unavailable", async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "infra-503-"));
+    const pipelinePath = setupPipelineState(tmpDir);
+    try {
+      const r = await dispatchTaskResult(tmpDir, {
+        is_error: true,
+        content: "Error 503: service unavailable",
+      });
+      assert.equal(r.code, 0);
+      const state = JSON.parse(fs.readFileSync(pipelinePath, "utf8"));
+      assert.ok(state.lastDispatchFailure, "flag must be set on 5xx");
+      assert.equal(state.lastDispatchFailure.reason, "dispatch_failure");
+    } finally {
+      fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+  });
+
   it("should NOT flag on happy-path agent that merely documents rate limiting", async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "overload-docs-"));
     const pipelinePath = setupPipelineState(tmpDir);

package/templates/hooks/rtk-rewrite.js

@@ -72,9 +72,10 @@ function isRtkAvailable() {
  */
 function rtkRewrite(cmd) {
   try {
-    // rtk rewrite expects the raw command as args
-    // On Windows, shell: true is needed for proper quoting
-    const result = execSync(`rtk rewrite ${cmd}`, {
+    // rtk rewrite expects the raw command as a single argv element.
+    // Using execFileSync avoids shell re-parsing, which would strip quotes
+    // and corrupt regex patterns containing brackets (e.g. grep '[x]').
+    const result = execFileSync('rtk', ['rewrite', cmd], {
       encoding: 'utf8',
       stdio: ['pipe', 'pipe', 'ignore'], // ignore stderr
       timeout: 3000,

package/templates/hooks/subagent-tracker.js

@@ -195,15 +195,18 @@ function handlePostToolUse(data, stateDir) {
 
     const toolResponse = data.tool_response || {};
     const responseText = JSON.stringify(toolResponse).toLowerCase();
-    // Detect overload conservatively: require is_error=true (Claude Code sets
-    // this on Task tool failures) AND at least one overload keyword. This
-    // avoids false positives on agents that merely *document* rate limiting
-    // or error handling in their returned content.
-    const isOverload =
+    // Detect dispatch failures conservatively: require is_error=true (Claude
+    // Code sets this on Task tool failures) AND at least one failure keyword.
+    // Covers:
+    //   - API overload / rate limiting (429, 529, throttle, too many requests)
+    //   - Infrastructure errors (tool result missing, HTTP 5xx, service unavailable)
+    // The regex avoids false positives on agents that merely *document* error
+    // handling in their returned content (see "unrelated error" test below).
+    const isDispatchFailure =
       toolResponse.is_error === true &&
-      /overload|rate.?limit|\b429\b|\b529\b|throttl|too many requests/.test(responseText);
+      /overload|rate.?limit|\b429\b|\b529\b|throttl|too many requests|tool result missing|\b50[0-4]\b|service unavailable/.test(responseText);
 
-    if (!isOverload) return;
+    if (!isDispatchFailure) return;
 
     const projectDir = path.resolve(stateDir, '..', '..');
     const statesDir = path.join(projectDir, '.claude', '.pipeline-states');
@@ -231,7 +234,7 @@ function handlePostToolUse(data, stateDir) {
     const state = JSON.parse(fs.readFileSync(newest, 'utf8'));
     state.lastDispatchFailure = {
       at: new Date().toISOString(),
-      reason: 'api_overload',
+      reason: 'dispatch_failure',
       agentType: toolInput.subagent_type || 'unknown',
       description: toolInput.description || '',
       prompt: (toolInput.prompt || '').slice(0, 2000),