@anthropologies/claudestory 0.1.23 → 0.1.25

package/dist/cli.js

@@ -5798,6 +5798,13 @@ async function gitStashPop(cwd, commitHash) {
   }
   return git(cwd, ["stash", "pop", match.ref], () => void 0);
 }
+async function gitDiffTreeNames(cwd, commitHash) {
+  return git(
+    cwd,
+    ["diff-tree", "--name-only", "--no-commit-id", "-r", commitHash],
+    (out) => out.split("\n").filter((l) => l.trim().length > 0)
+  );
+}
 async function gitLogRange(cwd, from, to, limit = 20) {
   if (from && !SAFE_REF.test(from)) {
     return { ok: false, reason: "invalid_ref", message: `Invalid git ref: ${from}` };
@@ -6372,8 +6379,10 @@ var init_plan_review = __esm({
         const isRevise = verdict === "revise" || verdict === "request_changes";
         const isReject = verdict === "reject";
         let nextAction;
-        if (isReject || isRevise) {
+        if (isReject) {
           nextAction = "PLAN";
+        } else if (isRevise) {
+          nextAction = "PLAN_REVIEW";
         } else if (verdict === "approve" || !hasCriticalOrMajor && roundNum >= minRounds) {
           nextAction = "IMPLEMENT";
         } else if (roundNum >= 5) {
@@ -6383,7 +6392,7 @@ var init_plan_review = __esm({
         }
         const reviewsForWrite = isReject ? { ...ctx.state.reviews, plan: [] } : { ...ctx.state.reviews, plan: planReviews };
         ctx.writeState({
-          reviews: nextAction === "PLAN" ? reviewsForWrite : { ...ctx.state.reviews, plan: planReviews }
+          reviews: reviewsForWrite
         });
         ctx.appendEvent("plan_review", {
           round: roundNum,
@@ -6395,7 +6404,21 @@ var init_plan_review = __esm({
           return {
             action: "back",
             target: "PLAN",
-            reason: isRevise ? "revise" : "reject"
+            reason: "reject"
+          };
+        }
+        if (isRevise) {
+          const findingSummary = findings.length > 0 ? findings.slice(0, 5).map((f) => `- [${f.severity}] ${f.description}`).join("\n") : "Address the reviewer's concerns.";
+          return {
+            action: "retry",
+            instruction: [
+              `# Plan Review \u2014 Round ${roundNum} requested changes`,
+              "",
+              'Update the plan to address these findings, then call me with completedAction: "plan_review_round" and the new review verdict.',
+              "",
+              findingSummary
+            ].join("\n"),
+            reminders: ["Update the plan file, then re-review. Do NOT rewrite from scratch."]
           };
         }
         if (nextAction === "IMPLEMENT") {
@@ -6501,7 +6524,7 @@ function exhaustionAction(ctx) {
   return {
     action: "back",
     target: "PLAN",
-    reason: "no_failing_tests"
+    reason: "TDD exhausted: could not verify new failing tests after 3 attempts. Revise the plan to make the test expectations clearer or simpler."
   };
 }
 var MAX_WRITE_TESTS_RETRIES, EXIT_CODE_REGEX, FAIL_COUNT_REGEX, WriteTestsStage;
@@ -6664,6 +6687,13 @@ var init_test = __esm({
         const retryCount = ctx.state.testRetryCount ?? 0;
         const exitCodeMatch = notes.match(/exit\s*(?:code[:\s]*)?\s*(\d+)/i);
         if (!exitCodeMatch) {
+          const nextRetry = retryCount + 1;
+          if (nextRetry >= MAX_TEST_RETRIES) {
+            ctx.writeState({ testRetryCount: 0 });
+            ctx.appendEvent("tests_parse_exhausted", { retryCount: nextRetry });
+            return { action: "advance" };
+          }
+          ctx.writeState({ testRetryCount: nextRetry });
           return { action: "retry", instruction: 'Could not parse exit code from notes. Include "exit code: 0" (or non-zero) in your notes.' };
         }
         const exitCode = parseInt(exitCodeMatch[1], 10);
@@ -7092,6 +7122,23 @@ var init_finalize = __esm({
       async handleStage(ctx, report) {
         const stagedResult = await gitDiffCachedNames(ctx.root);
         if (!stagedResult.ok || stagedResult.data.length === 0) {
+          const headResult = await gitHead(ctx.root);
+          const previousHead = ctx.state.git.expectedHead ?? ctx.state.git.initHead;
+          if (headResult.ok && previousHead && headResult.data.hash !== previousHead) {
+            const ticketId2 = ctx.state.ticket?.id;
+            if (ticketId2) {
+              const treeResult = await gitDiffTreeNames(ctx.root, headResult.data.hash);
+              const ticketPath = `.story/tickets/${ticketId2}.json`;
+              if (treeResult.ok && !treeResult.data.includes(ticketPath)) {
+                return {
+                  action: "retry",
+                  instruction: `Commit detected (${headResult.data.hash.slice(0, 7)}) but ticket file ${ticketPath} is not in the commit. Amend the commit to include it: \`git add ${ticketPath} && git commit --amend --no-edit\`, then report completedAction: "commit_done" with the new hash.`
+                };
+              }
+            }
+            ctx.writeState({ finalizeCheckpoint: "precommit_passed" });
+            return this.handleCommit(ctx, { ...report, commitHash: headResult.data.hash });
+          }
           return { action: "retry", instruction: 'No files are staged. Stage your changes and call me again with completedAction: "files_staged".' };
         }
         const baselineUntracked = ctx.state.git.baseline?.untrackedPaths ?? [];
@@ -7109,6 +7156,16 @@ var init_finalize = __esm({
             }
           }
         }
+        const ticketId = ctx.state.ticket?.id;
+        if (ticketId) {
+          const ticketPath = `.story/tickets/${ticketId}.json`;
+          if (!stagedResult.data.includes(ticketPath)) {
+            return {
+              action: "retry",
+              instruction: `Ticket file ${ticketPath} is not staged. Run \`git add ${ticketPath}\` and call me again with completedAction: "files_staged".`
+            };
+          }
+        }
         ctx.writeState({
           finalizeCheckpoint: overlapOverridden ? "staged_override" : "staged"
         });
@@ -7169,27 +7226,29 @@ var init_finalize = __esm({
         }
         const headResult = await gitHead(ctx.root);
         const previousHead = ctx.state.git.expectedHead ?? ctx.state.git.initHead;
-        if (!headResult.ok || headResult.data.hash !== commitHash) {
+        const fullHead = headResult.ok ? headResult.data.hash : null;
+        if (!fullHead || !fullHead.startsWith(commitHash) && commitHash !== fullHead) {
           return {
             action: "retry",
-            instruction: `Commit hash mismatch: reported ${commitHash} but HEAD is ${headResult.ok ? headResult.data.hash : "unknown"}. Verify the commit succeeded and report the correct hash.`
+            instruction: `Commit hash mismatch: reported ${commitHash} but HEAD is ${fullHead ?? "unknown"}. Verify the commit succeeded and report the correct hash.`
           };
         }
-        if (previousHead && commitHash === previousHead) {
-          return { action: "retry", instruction: `No new commit detected: HEAD (${commitHash}) has not changed. Create a commit first, then report the new hash.` };
+        const normalizedHash = fullHead;
+        if (previousHead && normalizedHash === previousHead) {
+          return { action: "retry", instruction: `No new commit detected: HEAD (${normalizedHash}) has not changed. Create a commit first, then report the new hash.` };
         }
-        const completedTicket = ctx.state.ticket ? { id: ctx.state.ticket.id, title: ctx.state.ticket.title, commitHash, risk: ctx.state.ticket.risk } : void 0;
+        const completedTicket = ctx.state.ticket ? { id: ctx.state.ticket.id, title: ctx.state.ticket.title, commitHash: normalizedHash, risk: ctx.state.ticket.risk, realizedRisk: ctx.state.ticket.realizedRisk } : void 0;
         ctx.writeState({
           finalizeCheckpoint: "committed",
           completedTickets: completedTicket ? [...ctx.state.completedTickets, completedTicket] : ctx.state.completedTickets,
           ticket: void 0,
           git: {
             ...ctx.state.git,
-            mergeBase: commitHash,
-            expectedHead: commitHash
+            mergeBase: normalizedHash,
+            expectedHead: normalizedHash
           }
         });
-        ctx.appendEvent("commit", { commitHash, ticketId: completedTicket?.id });
+        ctx.appendEvent("commit", { commitHash: normalizedHash, ticketId: completedTicket?.id });
         return { action: "advance" };
       }
     };
@@ -7323,7 +7382,7 @@ var init_complete = __esm({
               "You are in autonomous mode \u2014 continue working until all tickets are done or the session limit is reached."
             ],
             transitionedFrom: "COMPLETE",
-            contextAdvice: advice
+            contextAdvice: "ok"
           }
         };
       }
@@ -8534,11 +8593,15 @@ async function handleCancel(root, args) {
   }
   const info = findSessionById(root, args.sessionId);
   if (!info) return guideError(new Error(`Session ${args.sessionId} not found`));
-  if (info.state.recipe === "coding") {
+  if (info.state.state === "SESSION_END" || info.state.status === "completed") {
+    return guideError(new Error("Session already ended."));
+  }
+  const CANCELLABLE_STATES = /* @__PURE__ */ new Set(["PICK_TICKET", "COMPLETE", "HANDOVER"]);
+  if (info.state.recipe === "coding" && !CANCELLABLE_STATES.has(info.state.state)) {
     const sessionMode = info.state.mode ?? "auto";
     const modeGuidance = sessionMode === "plan" ? "Plan mode sessions end after plan review approval \u2014 continue to that step." : sessionMode === "review" ? "Review mode sessions end after code review approval \u2014 continue to that step." : sessionMode === "guided" ? "Guided mode sessions end after ticket completion \u2014 continue to FINALIZE." : "Complete the current ticket and write a handover to end the session.";
     return guideError(new Error(
-      `Cannot cancel a coding session. ${modeGuidance}`
+      `Cannot cancel a coding session from ${info.state.state}. ${modeGuidance}`
     ));
   }
   await recoverPendingMutation(info.dir, info.state, root);
@@ -10028,7 +10091,7 @@ var init_mcp = __esm({
     init_init();
     ENV_VAR2 = "CLAUDESTORY_PROJECT_ROOT";
     CONFIG_PATH2 = ".story/config.json";
-    version = "0.1.23";
+    version = "0.1.25";
     main().catch((err) => {
       process.stderr.write(`Fatal: ${err instanceof Error ? err.message : String(err)}
 `);
@@ -13306,7 +13369,7 @@ async function runCli() {
     registerConfigCommand: registerConfigCommand2,
     registerSessionCommand: registerSessionCommand2
   } = await Promise.resolve().then(() => (init_register(), register_exports));
-  const version2 = "0.1.23";
+  const version2 = "0.1.25";
   class HandledError extends Error {
     constructor() {
       super("HANDLED_ERROR");

package/dist/mcp.js

@@ -5402,6 +5402,13 @@ async function gitStashPop(cwd, commitHash) {
   }
   return git(cwd, ["stash", "pop", match.ref], () => void 0);
 }
+async function gitDiffTreeNames(cwd, commitHash) {
+  return git(
+    cwd,
+    ["diff-tree", "--name-only", "--no-commit-id", "-r", commitHash],
+    (out) => out.split("\n").filter((l) => l.trim().length > 0)
+  );
+}
 var SAFE_REF = /^[0-9a-f]{4,40}$/i;
 async function gitLogRange(cwd, from, to, limit = 20) {
   if (from && !SAFE_REF.test(from)) {
@@ -5935,8 +5942,10 @@ var PlanReviewStage = class {
     const isRevise = verdict === "revise" || verdict === "request_changes";
     const isReject = verdict === "reject";
     let nextAction;
-    if (isReject || isRevise) {
+    if (isReject) {
       nextAction = "PLAN";
+    } else if (isRevise) {
+      nextAction = "PLAN_REVIEW";
     } else if (verdict === "approve" || !hasCriticalOrMajor && roundNum >= minRounds) {
       nextAction = "IMPLEMENT";
     } else if (roundNum >= 5) {
@@ -5946,7 +5955,7 @@ var PlanReviewStage = class {
     }
     const reviewsForWrite = isReject ? { ...ctx.state.reviews, plan: [] } : { ...ctx.state.reviews, plan: planReviews };
     ctx.writeState({
-      reviews: nextAction === "PLAN" ? reviewsForWrite : { ...ctx.state.reviews, plan: planReviews }
+      reviews: reviewsForWrite
     });
     ctx.appendEvent("plan_review", {
       round: roundNum,
@@ -5958,7 +5967,21 @@ var PlanReviewStage = class {
       return {
         action: "back",
         target: "PLAN",
-        reason: isRevise ? "revise" : "reject"
+        reason: "reject"
+      };
+    }
+    if (isRevise) {
+      const findingSummary = findings.length > 0 ? findings.slice(0, 5).map((f) => `- [${f.severity}] ${f.description}`).join("\n") : "Address the reviewer's concerns.";
+      return {
+        action: "retry",
+        instruction: [
+          `# Plan Review \u2014 Round ${roundNum} requested changes`,
+          "",
+          'Update the plan to address these findings, then call me with completedAction: "plan_review_round" and the new review verdict.',
+          "",
+          findingSummary
+        ].join("\n"),
+        reminders: ["Update the plan file, then re-review. Do NOT rewrite from scratch."]
       };
     }
     if (nextAction === "IMPLEMENT") {
@@ -6168,7 +6191,7 @@ function exhaustionAction(ctx) {
   return {
     action: "back",
     target: "PLAN",
-    reason: "no_failing_tests"
+    reason: "TDD exhausted: could not verify new failing tests after 3 attempts. Revise the plan to make the test expectations clearer or simpler."
   };
 }
 
@@ -6207,6 +6230,13 @@ var TestStage = class {
     const retryCount = ctx.state.testRetryCount ?? 0;
     const exitCodeMatch = notes.match(/exit\s*(?:code[:\s]*)?\s*(\d+)/i);
     if (!exitCodeMatch) {
+      const nextRetry = retryCount + 1;
+      if (nextRetry >= MAX_TEST_RETRIES) {
+        ctx.writeState({ testRetryCount: 0 });
+        ctx.appendEvent("tests_parse_exhausted", { retryCount: nextRetry });
+        return { action: "advance" };
+      }
+      ctx.writeState({ testRetryCount: nextRetry });
       return { action: "retry", instruction: 'Could not parse exit code from notes. Include "exit code: 0" (or non-zero) in your notes.' };
     }
     const exitCode = parseInt(exitCodeMatch[1], 10);
@@ -6614,6 +6644,23 @@ var FinalizeStage = class {
   async handleStage(ctx, report) {
     const stagedResult = await gitDiffCachedNames(ctx.root);
     if (!stagedResult.ok || stagedResult.data.length === 0) {
+      const headResult = await gitHead(ctx.root);
+      const previousHead = ctx.state.git.expectedHead ?? ctx.state.git.initHead;
+      if (headResult.ok && previousHead && headResult.data.hash !== previousHead) {
+        const ticketId2 = ctx.state.ticket?.id;
+        if (ticketId2) {
+          const treeResult = await gitDiffTreeNames(ctx.root, headResult.data.hash);
+          const ticketPath = `.story/tickets/${ticketId2}.json`;
+          if (treeResult.ok && !treeResult.data.includes(ticketPath)) {
+            return {
+              action: "retry",
+              instruction: `Commit detected (${headResult.data.hash.slice(0, 7)}) but ticket file ${ticketPath} is not in the commit. Amend the commit to include it: \`git add ${ticketPath} && git commit --amend --no-edit\`, then report completedAction: "commit_done" with the new hash.`
+            };
+          }
+        }
+        ctx.writeState({ finalizeCheckpoint: "precommit_passed" });
+        return this.handleCommit(ctx, { ...report, commitHash: headResult.data.hash });
+      }
       return { action: "retry", instruction: 'No files are staged. Stage your changes and call me again with completedAction: "files_staged".' };
     }
     const baselineUntracked = ctx.state.git.baseline?.untrackedPaths ?? [];
@@ -6631,6 +6678,16 @@ var FinalizeStage = class {
         }
       }
     }
+    const ticketId = ctx.state.ticket?.id;
+    if (ticketId) {
+      const ticketPath = `.story/tickets/${ticketId}.json`;
+      if (!stagedResult.data.includes(ticketPath)) {
+        return {
+          action: "retry",
+          instruction: `Ticket file ${ticketPath} is not staged. Run \`git add ${ticketPath}\` and call me again with completedAction: "files_staged".`
+        };
+      }
+    }
     ctx.writeState({
       finalizeCheckpoint: overlapOverridden ? "staged_override" : "staged"
     });
@@ -6691,27 +6748,29 @@ var FinalizeStage = class {
     }
     const headResult = await gitHead(ctx.root);
     const previousHead = ctx.state.git.expectedHead ?? ctx.state.git.initHead;
-    if (!headResult.ok || headResult.data.hash !== commitHash) {
+    const fullHead = headResult.ok ? headResult.data.hash : null;
+    if (!fullHead || !fullHead.startsWith(commitHash) && commitHash !== fullHead) {
       return {
         action: "retry",
-        instruction: `Commit hash mismatch: reported ${commitHash} but HEAD is ${headResult.ok ? headResult.data.hash : "unknown"}. Verify the commit succeeded and report the correct hash.`
+        instruction: `Commit hash mismatch: reported ${commitHash} but HEAD is ${fullHead ?? "unknown"}. Verify the commit succeeded and report the correct hash.`
       };
     }
-    if (previousHead && commitHash === previousHead) {
-      return { action: "retry", instruction: `No new commit detected: HEAD (${commitHash}) has not changed. Create a commit first, then report the new hash.` };
+    const normalizedHash = fullHead;
+    if (previousHead && normalizedHash === previousHead) {
+      return { action: "retry", instruction: `No new commit detected: HEAD (${normalizedHash}) has not changed. Create a commit first, then report the new hash.` };
     }
-    const completedTicket = ctx.state.ticket ? { id: ctx.state.ticket.id, title: ctx.state.ticket.title, commitHash, risk: ctx.state.ticket.risk } : void 0;
+    const completedTicket = ctx.state.ticket ? { id: ctx.state.ticket.id, title: ctx.state.ticket.title, commitHash: normalizedHash, risk: ctx.state.ticket.risk, realizedRisk: ctx.state.ticket.realizedRisk } : void 0;
     ctx.writeState({
       finalizeCheckpoint: "committed",
       completedTickets: completedTicket ? [...ctx.state.completedTickets, completedTicket] : ctx.state.completedTickets,
       ticket: void 0,
       git: {
         ...ctx.state.git,
-        mergeBase: commitHash,
-        expectedHead: commitHash
+        mergeBase: normalizedHash,
+        expectedHead: normalizedHash
       }
     });
-    ctx.appendEvent("commit", { commitHash, ticketId: completedTicket?.id });
+    ctx.appendEvent("commit", { commitHash: normalizedHash, ticketId: completedTicket?.id });
     return { action: "advance" };
   }
 };
@@ -6837,7 +6896,7 @@ var CompleteStage = class {
           "You are in autonomous mode \u2014 continue working until all tickets are done or the session limit is reached."
         ],
         transitionedFrom: "COMPLETE",
-        contextAdvice: advice
+        contextAdvice: "ok"
       }
     };
   }
@@ -8024,11 +8083,15 @@ async function handleCancel(root, args) {
   }
   const info = findSessionById(root, args.sessionId);
   if (!info) return guideError(new Error(`Session ${args.sessionId} not found`));
-  if (info.state.recipe === "coding") {
+  if (info.state.state === "SESSION_END" || info.state.status === "completed") {
+    return guideError(new Error("Session already ended."));
+  }
+  const CANCELLABLE_STATES = /* @__PURE__ */ new Set(["PICK_TICKET", "COMPLETE", "HANDOVER"]);
+  if (info.state.recipe === "coding" && !CANCELLABLE_STATES.has(info.state.state)) {
     const sessionMode = info.state.mode ?? "auto";
     const modeGuidance = sessionMode === "plan" ? "Plan mode sessions end after plan review approval \u2014 continue to that step." : sessionMode === "review" ? "Review mode sessions end after code review approval \u2014 continue to that step." : sessionMode === "guided" ? "Guided mode sessions end after ticket completion \u2014 continue to FINALIZE." : "Complete the current ticket and write a handover to end the session.";
     return guideError(new Error(
-      `Cannot cancel a coding session. ${modeGuidance}`
+      `Cannot cancel a coding session from ${info.state.state}. ${modeGuidance}`
     ));
   }
   await recoverPendingMutation(info.dir, info.state, root);
@@ -9193,7 +9256,7 @@ async function ensureGitignoreEntries(gitignorePath, entries) {
 // src/mcp/index.ts
 var ENV_VAR2 = "CLAUDESTORY_PROJECT_ROOT";
 var CONFIG_PATH2 = ".story/config.json";
-var version = "0.1.23";
+var version = "0.1.25";
 function tryDiscoverRoot() {
   const envRoot = process.env[ENV_VAR2];
   if (envRoot) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anthropologies/claudestory",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "license": "UNLICENSED",
   "description": "Cross-session context persistence for AI coding projects. Tracks tickets, issues, roadmap, and handovers so every session builds on the last.",
   "keywords": [