@anthropologies/claudestory 0.1.35 → 0.1.37

package/dist/mcp.js

@@ -1560,7 +1560,7 @@ function fencedBlock(content, lang) {
 ${content}
 ${fence}`;
 }
-function formatStatus(state, format) {
+function formatStatus(state, format, activeSessions = []) {
   const phases = phasesWithStatus(state);
   const data = {
     project: state.config.project,
@@ -1580,7 +1580,8 @@ function formatStatus(state, format) {
       name: p.phase.name,
       status: p.status,
       leafCount: p.leafCount
-    }))
+    })),
+    ...activeSessions.length > 0 ? { activeSessions } : {}
   };
   if (format === "json") {
     return JSON.stringify(successEnvelope(data), null, 2);
@@ -1602,6 +1603,15 @@ function formatStatus(state, format) {
     const summary = p.phase.summary ?? truncate(p.phase.description, 80);
     lines.push(`${indicator} **${escapeMarkdownInline(p.phase.name)}** (${p.leafCount} tickets) \u2014 ${escapeMarkdownInline(summary)}`);
   }
+  if (activeSessions.length > 0) {
+    lines.push("");
+    lines.push("## Active Sessions");
+    lines.push("");
+    for (const s of activeSessions) {
+      const ticket = s.ticketId ? `${s.ticketId}: ${escapeMarkdownInline(s.ticketTitle ?? "")}` : "no ticket";
+      lines.push(`- ${s.sessionId.slice(0, 8)}: ${s.state} -- ${ticket} (${s.mode} mode)`);
+    }
+  }
   if (state.isEmptyScaffold) {
     lines.push("");
     lines.push(EMPTY_SCAFFOLD_HEADING);
@@ -2501,6 +2511,7 @@ function validateProject(state) {
       }
     }
   }
+  detectSupersedesCycles(state, findings);
   const phaseIDCounts = /* @__PURE__ */ new Map();
   for (const p of state.roadmap.phases) {
     phaseIDCounts.set(p.id, (phaseIDCounts.get(p.id) ?? 0) + 1);
@@ -2705,6 +2716,33 @@ function dfsBlocked(id, state, visited, inStack, findings) {
   inStack.delete(id);
   visited.add(id);
 }
+function detectSupersedesCycles(state, findings) {
+  const visited = /* @__PURE__ */ new Set();
+  const inStack = /* @__PURE__ */ new Set();
+  for (const l of state.lessons) {
+    if (l.supersedes == null || visited.has(l.id)) continue;
+    dfsSupersedesChain(l.id, state, visited, inStack, findings);
+  }
+}
+function dfsSupersedesChain(id, state, visited, inStack, findings) {
+  if (inStack.has(id)) {
+    findings.push({
+      level: "error",
+      code: "supersedes_cycle",
+      message: `Cycle detected in supersedes chain involving ${id}.`,
+      entity: id
+    });
+    return;
+  }
+  if (visited.has(id)) return;
+  inStack.add(id);
+  const lesson = state.lessonByID(id);
+  if (lesson?.supersedes && lesson.supersedes !== id) {
+    dfsSupersedesChain(lesson.supersedes, state, visited, inStack, findings);
+  }
+  inStack.delete(id);
+  visited.add(id);
+}
 var init_validation = __esm({
   "src/core/validation.ts"() {
     "use strict";
@@ -2723,7 +2761,7 @@ __export(handover_exports, {
 });
 import { existsSync as existsSync4 } from "fs";
 import { mkdir as mkdir2 } from "fs/promises";
-import { join as join4, resolve as resolve4 } from "path";
+import { join as join5, resolve as resolve4 } from "path";
 function handleHandoverList(ctx) {
   return { output: formatHandoverList(ctx.state.handoverFilenames, ctx.format) };
 }
@@ -2808,15 +2846,15 @@ async function handleHandoverCreate(content, slugRaw, format, root) {
   let filename;
   await withProjectLock(root, { strict: false }, async () => {
     const absRoot = resolve4(root);
-    const handoversDir = join4(absRoot, ".story", "handovers");
+    const handoversDir = join5(absRoot, ".story", "handovers");
     await mkdir2(handoversDir, { recursive: true });
-    const wrapDir = join4(absRoot, ".story");
+    const wrapDir = join5(absRoot, ".story");
     const datePrefix = `${date}-`;
     const seqRegex = new RegExp(`^${date}-(\\d{2})-`);
     let maxSeq = 0;
-    const { readdirSync: readdirSync2 } = await import("fs");
+    const { readdirSync: readdirSync5 } = await import("fs");
     try {
-      for (const f of readdirSync2(handoversDir)) {
+      for (const f of readdirSync5(handoversDir)) {
         const m = f.match(seqRegex);
         if (m) {
           const n = parseInt(m[1], 10);
@@ -2833,7 +2871,7 @@ async function handleHandoverCreate(content, slugRaw, format, root) {
       );
     }
     let candidate = `${date}-${String(nextSeq).padStart(2, "0")}-${slug}.md`;
-    let candidatePath = join4(handoversDir, candidate);
+    let candidatePath = join5(handoversDir, candidate);
     while (existsSync4(candidatePath)) {
       nextSeq++;
       if (nextSeq > 99) {
@@ -2843,7 +2881,7 @@ async function handleHandoverCreate(content, slugRaw, format, root) {
         );
       }
       candidate = `${date}-${String(nextSeq).padStart(2, "0")}-${slug}.md`;
-      candidatePath = join4(handoversDir, candidate);
+      candidatePath = join5(handoversDir, candidate);
     }
     await parseHandoverFilename(candidate, handoversDir);
     await guardPath(candidatePath, wrapDir);
@@ -3158,11 +3196,11 @@ __export(snapshot_exports, {
 });
 import { readdir as readdir3, readFile as readFile3, mkdir as mkdir3, unlink as unlink2 } from "fs/promises";
 import { existsSync as existsSync5 } from "fs";
-import { join as join5, resolve as resolve5 } from "path";
+import { join as join6, resolve as resolve5 } from "path";
 import { z as z8 } from "zod";
 async function saveSnapshot(root, loadResult) {
   const absRoot = resolve5(root);
-  const snapshotsDir = join5(absRoot, ".story", "snapshots");
+  const snapshotsDir = join6(absRoot, ".story", "snapshots");
   await mkdir3(snapshotsDir, { recursive: true });
   const { state, warnings } = loadResult;
   const now = /* @__PURE__ */ new Date();
@@ -3187,8 +3225,8 @@ async function saveSnapshot(root, loadResult) {
     } : {}
   };
   const json = JSON.stringify(snapshot, null, 2) + "\n";
-  const targetPath = join5(snapshotsDir, filename);
-  const wrapDir = join5(absRoot, ".story");
+  const targetPath = join6(snapshotsDir, filename);
+  const wrapDir = join6(absRoot, ".story");
   await guardPath(targetPath, wrapDir);
   await atomicWrite(targetPath, json);
   const pruned = await pruneSnapshots(snapshotsDir);
@@ -3196,13 +3234,13 @@ async function saveSnapshot(root, loadResult) {
   return { filename, retained: entries.length, pruned };
 }
 async function loadLatestSnapshot(root) {
-  const snapshotsDir = join5(resolve5(root), ".story", "snapshots");
+  const snapshotsDir = join6(resolve5(root), ".story", "snapshots");
   if (!existsSync5(snapshotsDir)) return null;
   const files = await listSnapshotFiles(snapshotsDir);
   if (files.length === 0) return null;
   for (const filename of files) {
     try {
-      const content = await readFile3(join5(snapshotsDir, filename), "utf-8");
+      const content = await readFile3(join6(snapshotsDir, filename), "utf-8");
       const parsed = JSON.parse(content);
       const snapshot = SnapshotV1Schema.parse(parsed);
       return { snapshot, filename };
@@ -3446,7 +3484,7 @@ async function pruneSnapshots(dir) {
   const toRemove = files.slice(MAX_SNAPSHOTS);
   for (const f of toRemove) {
     try {
-      await unlink2(join5(dir, f));
+      await unlink2(join6(dir, f));
     } catch {
     }
   }
@@ -3516,6 +3554,7 @@ var init_session_types = __esm({
       "HANDOVER",
       "COMPLETE",
       "LESSON_CAPTURE",
+      "ISSUE_FIX",
       "ISSUE_SWEEP",
       "SESSION_END"
     ];
@@ -3564,6 +3603,14 @@ var init_session_types = __esm({
           timestamp: z9.string()
         })).default([])
       }).default({ plan: [], code: [] }),
+      // T-153: Current issue being fixed (null when working on a ticket)
+      currentIssue: z9.object({
+        id: z9.string(),
+        title: z9.string(),
+        severity: z9.string()
+      }).nullable().default(null),
+      // T-153: Issues resolved this session
+      resolvedIssues: z9.array(z9.string()).default([]),
       // Completed tickets this session
       completedTickets: z9.array(z9.object({
         id: z9.string(),
@@ -3702,27 +3749,27 @@ __export(session_exports, {
 import { randomUUID } from "crypto";
 import {
   mkdirSync,
-  readdirSync,
-  readFileSync,
+  readdirSync as readdirSync3,
+  readFileSync as readFileSync3,
   writeFileSync,
   renameSync,
   unlinkSync,
   existsSync as existsSync6,
   rmSync
 } from "fs";
-import { join as join6 } from "path";
+import { join as join8 } from "path";
 import lockfile2 from "proper-lockfile";
 function sessionsRoot(root) {
-  return join6(root, ".story", SESSIONS_DIR);
+  return join8(root, ".story", SESSIONS_DIR);
 }
 function sessionDir(root, sessionId) {
-  return join6(sessionsRoot(root), sessionId);
+  return join8(sessionsRoot(root), sessionId);
 }
 function statePath(dir) {
-  return join6(dir, "state.json");
+  return join8(dir, "state.json");
 }
 function eventsPath(dir) {
-  return join6(dir, "events.log");
+  return join8(dir, "events.log");
 }
 function createSession(root, recipe, workspaceId, configOverrides) {
   const id = randomUUID();
@@ -3778,7 +3825,7 @@ function readSession(dir) {
   const path2 = statePath(dir);
   let raw;
   try {
-    raw = readFileSync(path2, "utf-8");
+    raw = readFileSync3(path2, "utf-8");
   } catch {
     return null;
   }
@@ -3821,7 +3868,7 @@ function readEvents(dir) {
   const path2 = eventsPath(dir);
   let raw;
   try {
-    raw = readFileSync(path2, "utf-8");
+    raw = readFileSync3(path2, "utf-8");
   } catch {
     return { events: [], malformedCount: 0 };
   }
@@ -3878,7 +3925,7 @@ function findActiveSessionFull(root) {
   const sessDir = sessionsRoot(root);
   let entries;
   try {
-    entries = readdirSync(sessDir, { withFileTypes: true });
+    entries = readdirSync3(sessDir, { withFileTypes: true });
   } catch {
     return null;
   }
@@ -3892,7 +3939,7 @@ function findActiveSessionFull(root) {
   let bestGuideCall = 0;
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
-    const dir = join6(sessDir, entry.name);
+    const dir = join8(sessDir, entry.name);
     const session = readSession(dir);
     if (!session) continue;
     if (session.status !== "active") continue;
@@ -3915,7 +3962,7 @@ function findStaleSessions(root) {
   const sessDir = sessionsRoot(root);
   let entries;
   try {
-    entries = readdirSync(sessDir, { withFileTypes: true });
+    entries = readdirSync3(sessDir, { withFileTypes: true });
   } catch {
     return [];
   }
@@ -3928,7 +3975,7 @@ function findStaleSessions(root) {
   const results = [];
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
-    const dir = join6(sessDir, entry.name);
+    const dir = join8(sessDir, entry.name);
     const session = readSession(dir);
     if (!session) continue;
     if (session.status !== "active") continue;
@@ -3984,7 +4031,7 @@ function findResumableSession(root) {
   const sessDir = sessionsRoot(root);
   let entries;
   try {
-    entries = readdirSync(sessDir, { withFileTypes: true });
+    entries = readdirSync3(sessDir, { withFileTypes: true });
   } catch {
     return null;
   }
@@ -3999,7 +4046,7 @@ function findResumableSession(root) {
   let bestPreparedAt = 0;
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
-    const dir = join6(sessDir, entry.name);
+    const dir = join8(sessDir, entry.name);
     const session = readSession(dir);
     if (!session) continue;
     if (session.status !== "active") continue;
@@ -4023,7 +4070,7 @@ async function withSessionLock(root, fn) {
     release = await lockfile2.lock(sessDir, {
       retries: { retries: 3, minTimeout: 100, maxTimeout: 1e3 },
       stale: 3e4,
-      lockfilePath: join6(sessDir, ".lock")
+      lockfilePath: join8(sessDir, ".lock")
     });
     return await fn();
   } finally {
@@ -4049,7 +4096,7 @@ var init_session = __esm({
 // src/mcp/index.ts
 init_esm_shims();
 import { realpathSync as realpathSync2, existsSync as existsSync11 } from "fs";
-import { resolve as resolve8, join as join16, isAbsolute } from "path";
+import { resolve as resolve8, join as join18, isAbsolute } from "path";
 import { z as z11 } from "zod";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
@@ -4102,13 +4149,65 @@ init_errors();
 init_helpers();
 init_types();
 import { z as z10 } from "zod";
-import { join as join14 } from "path";
+import { join as join16 } from "path";
 
 // src/cli/commands/status.ts
 init_esm_shims();
 init_output_formatter();
+
+// src/core/session-scan.ts
+init_esm_shims();
+import { readdirSync, readFileSync } from "fs";
+import { join as join4 } from "path";
+function scanActiveSessions(root) {
+  const sessDir = join4(root, ".story", "sessions");
+  let entries;
+  try {
+    entries = readdirSync(sessDir, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  const results = [];
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    const statePath2 = join4(sessDir, entry.name, "state.json");
+    let raw;
+    try {
+      raw = readFileSync(statePath2, "utf-8");
+    } catch {
+      continue;
+    }
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      continue;
+    }
+    if (parsed.status !== "active") continue;
+    if (parsed.state === "SESSION_END") continue;
+    const lease = parsed.lease;
+    if (lease?.expiresAt) {
+      const expires = new Date(lease.expiresAt).getTime();
+      if (!Number.isNaN(expires) && expires <= Date.now()) continue;
+    } else {
+      continue;
+    }
+    const ticket = parsed.ticket;
+    results.push({
+      sessionId: parsed.sessionId ?? entry.name,
+      state: parsed.state ?? "unknown",
+      mode: parsed.mode ?? "auto",
+      ticketId: ticket?.id ?? null,
+      ticketTitle: ticket?.title ?? null
+    });
+  }
+  return results;
+}
+
+// src/cli/commands/status.ts
 function handleStatus(ctx) {
-  return { output: formatStatus(ctx.state, ctx.format) };
+  const sessions = scanActiveSessions(ctx.root);
+  return { output: formatStatus(ctx.state, ctx.format, sessions) };
 }
 
 // src/cli/commands/validate.ts
@@ -4708,6 +4807,8 @@ async function handleLessonReinforce(id, format, root) {
 
 // src/cli/commands/recommend.ts
 init_esm_shims();
+import { readFileSync as readFileSync2, readdirSync as readdirSync2 } from "fs";
+import { join as join7 } from "path";
 
 // src/core/recommend.ts
 init_esm_shims();
@@ -4728,10 +4829,12 @@ var CATEGORY_PRIORITY = {
   high_impact_unblock: 4,
   near_complete_umbrella: 5,
   phase_momentum: 6,
-  quick_win: 7,
-  open_issue: 8
+  debt_trend: 7,
+  quick_win: 8,
+  handover_context: 9,
+  open_issue: 10
 };
-function recommend(state, count) {
+function recommend(state, count, options) {
   const effectiveCount = Math.max(1, Math.min(10, count));
   const dedup = /* @__PURE__ */ new Map();
   const phaseIndex = buildPhaseIndex(state);
@@ -4743,7 +4846,8 @@ function recommend(state, count) {
     () => generateNearCompleteUmbrellas(state, phaseIndex),
     () => generatePhaseMomentum(state),
     () => generateQuickWins(state, phaseIndex),
-    () => generateOpenIssues(state)
+    () => generateOpenIssues(state),
+    () => generateDebtTrend(state, options)
   ];
   for (const gen of generators) {
     for (const rec of gen()) {
@@ -4753,6 +4857,7 @@ function recommend(state, count) {
       }
     }
   }
+  applyHandoverBoost(state, dedup, options);
   const curPhase = currentPhase(state);
   const curPhaseIdx = curPhase ? phaseIndex.get(curPhase.id) ?? 0 : 0;
   for (const [id, rec] of dedup) {
@@ -4942,13 +5047,113 @@ function sortByPhaseAndOrder(tickets, phaseIndex) {
     return a.order - b.order;
   });
 }
+var TICKET_ID_RE = /\bT-\d{3}[a-z]?\b/g;
+var ACTIONABLE_HEADING_RE = /^#+\s.*(next|open|remaining|todo|blocked)/im;
+var HANDOVER_BOOST = 50;
+var HANDOVER_BASE_SCORE = 350;
+function applyHandoverBoost(state, dedup, options) {
+  if (!options?.latestHandoverContent) return;
+  const content = options.latestHandoverContent;
+  let actionableIds = extractTicketIdsFromActionableSections(content);
+  if (actionableIds.size === 0) {
+    const allIds = new Set(content.match(TICKET_ID_RE) ?? []);
+    for (const id of allIds) {
+      const ticket = state.ticketByID(id);
+      if (ticket && ticket.status !== "complete" && ticket.status !== "inprogress") {
+        actionableIds.add(id);
+      }
+    }
+  }
+  for (const id of actionableIds) {
+    const ticket = state.ticketByID(id);
+    if (!ticket || ticket.status === "complete") continue;
+    const existing = dedup.get(id);
+    if (existing) {
+      dedup.set(id, {
+        ...existing,
+        score: existing.score + HANDOVER_BOOST,
+        reason: existing.reason + " (handover context)"
+      });
+    } else {
+      dedup.set(id, {
+        id,
+        kind: "ticket",
+        title: ticket.title,
+        category: "handover_context",
+        reason: "Referenced in latest handover",
+        score: HANDOVER_BASE_SCORE
+      });
+    }
+  }
+}
+function extractTicketIdsFromActionableSections(content) {
+  const ids = /* @__PURE__ */ new Set();
+  const lines = content.split("\n");
+  let inActionable = false;
+  for (const line of lines) {
+    if (/^#+\s/.test(line)) {
+      inActionable = ACTIONABLE_HEADING_RE.test(line);
+    }
+    if (inActionable) {
+      const matches = line.match(TICKET_ID_RE);
+      if (matches) for (const m of matches) ids.add(m);
+    }
+  }
+  return ids;
+}
+var DEBT_TREND_SCORE = 450;
+var DEBT_GROWTH_THRESHOLD = 0.25;
+var DEBT_ABSOLUTE_MINIMUM = 2;
+function generateDebtTrend(state, options) {
+  if (options?.previousOpenIssueCount == null) return [];
+  const currentOpen = state.issues.filter((i) => i.status !== "resolved").length;
+  const previous = options.previousOpenIssueCount;
+  if (previous <= 0) return [];
+  const growth = (currentOpen - previous) / previous;
+  const absolute = currentOpen - previous;
+  if (growth > DEBT_GROWTH_THRESHOLD && absolute >= DEBT_ABSOLUTE_MINIMUM) {
+    return [{
+      id: "DEBT_TREND",
+      kind: "action",
+      title: "Issue debt growing",
+      category: "debt_trend",
+      reason: `Open issues grew from ${previous} to ${currentOpen} (+${Math.round(growth * 100)}%). Consider triaging or resolving issues before adding features.`,
+      score: DEBT_TREND_SCORE
+    }];
+  }
+  return [];
+}
 
 // src/cli/commands/recommend.ts
 init_output_formatter();
 function handleRecommend(ctx, count) {
-  const result = recommend(ctx.state, count);
+  const options = buildRecommendOptions(ctx);
+  const result = recommend(ctx.state, count, options);
   return { output: formatRecommendations(result, ctx.state, ctx.format) };
 }
+function buildRecommendOptions(ctx) {
+  const opts = {};
+  try {
+    const files = readdirSync2(ctx.handoversDir).filter((f) => f.endsWith(".md")).sort();
+    if (files.length > 0) {
+      opts.latestHandoverContent = readFileSync2(join7(ctx.handoversDir, files[files.length - 1]), "utf-8");
+    }
+  } catch {
+  }
+  try {
+    const snapshotsDir = join7(ctx.root, ".story", "snapshots");
+    const snapFiles = readdirSync2(snapshotsDir).filter((f) => f.endsWith(".json")).sort();
+    if (snapFiles.length > 0) {
+      const raw = readFileSync2(join7(snapshotsDir, snapFiles[snapFiles.length - 1]), "utf-8");
+      const snap = JSON.parse(raw);
+      if (snap.issues) {
+        opts.previousOpenIssueCount = snap.issues.filter((i) => i.status !== "resolved").length;
+      }
+    }
+  } catch {
+  }
+  return opts;
+}
 
 // src/cli/commands/snapshot.ts
 init_esm_shims();
@@ -5238,8 +5443,8 @@ init_handover();
 init_esm_shims();
 init_session_types();
 init_session();
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
-import { join as join11 } from "path";
+import { readFileSync as readFileSync6, writeFileSync as writeFileSync3, readdirSync as readdirSync4 } from "fs";
+import { join as join13 } from "path";
 
 // src/autonomous/state-machine.ts
 init_esm_shims();
@@ -5248,7 +5453,7 @@ var TRANSITIONS = {
   // start does INIT + LOAD_CONTEXT internally
   LOAD_CONTEXT: ["PICK_TICKET"],
   // internal (never seen by Claude)
-  PICK_TICKET: ["PLAN", "SESSION_END"],
+  PICK_TICKET: ["PLAN", "ISSUE_FIX", "SESSION_END"],
   PLAN: ["PLAN_REVIEW"],
   PLAN_REVIEW: ["IMPLEMENT", "WRITE_TESTS", "PLAN", "PLAN_REVIEW", "SESSION_END"],
   // approve → IMPLEMENT/WRITE_TESTS, reject → PLAN, stay for next round; SESSION_END for tiered exit
@@ -5262,8 +5467,11 @@ var TRANSITIONS = {
   // approve → VERIFY/FINALIZE, reject → IMPLEMENT/PLAN, stay for next round; SESSION_END for tiered exit
   VERIFY: ["FINALIZE", "IMPLEMENT", "VERIFY"],
   // pass → FINALIZE, fail → IMPLEMENT, retry
-  FINALIZE: ["COMPLETE"],
+  FINALIZE: ["COMPLETE", "PICK_TICKET"],
+  // PICK_TICKET for issue-fix flow (bypass COMPLETE)
   COMPLETE: ["PICK_TICKET", "HANDOVER", "ISSUE_SWEEP", "SESSION_END"],
+  ISSUE_FIX: ["FINALIZE", "PICK_TICKET", "ISSUE_FIX"],
+  // T-153: fix done → FINALIZE, cancel → PICK_TICKET, retry self
   LESSON_CAPTURE: ["ISSUE_SWEEP", "HANDOVER", "LESSON_CAPTURE"],
   // advance → ISSUE_SWEEP, retry self, done → HANDOVER
   ISSUE_SWEEP: ["ISSUE_SWEEP", "HANDOVER", "PICK_TICKET"],
@@ -5511,8 +5719,8 @@ function parseDiffNumstat(out) {
 
 // src/autonomous/recipes/loader.ts
 init_esm_shims();
-import { readFileSync as readFileSync2 } from "fs";
-import { join as join7, dirname as dirname3 } from "path";
+import { readFileSync as readFileSync4 } from "fs";
+import { join as join9, dirname as dirname3 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var DEFAULT_PIPELINE = [
   "PICK_TICKET",
@@ -5532,9 +5740,9 @@ function loadRecipe(recipeName) {
   if (!/^[A-Za-z0-9_-]+$/.test(recipeName)) {
     throw new Error(`Invalid recipe name: ${recipeName}`);
   }
-  const recipesDir = join7(dirname3(fileURLToPath2(import.meta.url)), "..", "recipes");
-  const path2 = join7(recipesDir, `${recipeName}.json`);
-  const raw = readFileSync2(path2, "utf-8");
+  const recipesDir = join9(dirname3(fileURLToPath2(import.meta.url)), "..", "recipes");
+  const path2 = join9(recipesDir, `${recipeName}.json`);
+  const raw = readFileSync4(path2, "utf-8");
   return JSON.parse(raw);
 }
 function resolveRecipe(recipeName, projectOverrides) {
@@ -5781,7 +5989,7 @@ init_esm_shims();
 // src/autonomous/stages/pick-ticket.ts
 init_esm_shims();
 import { existsSync as existsSync7, unlinkSync as unlinkSync2 } from "fs";
-import { join as join8 } from "path";
+import { join as join10 } from "path";
 var PickTicketStage = class {
   id = "PICK_TICKET";
   async enter(ctx) {
@@ -5794,28 +6002,52 @@ var PickTicketStage = class {
         (c, i) => `${i + 1}. **${c.ticket.id}: ${c.ticket.title}** (${c.ticket.type})`
       ).join("\n");
     }
+    const highIssues = projectState.issues.filter(
+      (i) => i.status === "open" && (i.severity === "critical" || i.severity === "high")
+    );
+    let issuesText = "";
+    if (highIssues.length > 0) {
+      issuesText = "\n\n## Open Issues (high+ severity)\n\n" + highIssues.map(
+        (i, idx) => `${idx + 1}. **${i.id}: ${i.title}** (${i.severity})`
+      ).join("\n");
+    }
     const topCandidate = candidates.kind === "found" ? candidates.candidates[0] : null;
+    const hasIssues = highIssues.length > 0;
     return {
       instruction: [
-        "# Pick a Ticket",
+        "# Pick a Ticket or Issue",
+        "",
+        "## Ticket Candidates",
         "",
         candidatesText || "No ticket candidates found.",
+        issuesText,
         "",
-        topCandidate ? `Pick **${topCandidate.ticket.id}** (highest priority) by calling \`claudestory_autonomous_guide\` now:` : "Pick a ticket by calling `claudestory_autonomous_guide` now:",
+        topCandidate ? `Pick **${topCandidate.ticket.id}** (highest priority) or an open issue by calling \`claudestory_autonomous_guide\` now:` : hasIssues ? `Pick an issue to fix by calling \`claudestory_autonomous_guide\` now:` : "Pick a ticket by calling `claudestory_autonomous_guide` now:",
         "```json",
         topCandidate ? `{ "sessionId": "${ctx.state.sessionId}", "action": "report", "report": { "completedAction": "ticket_picked", "ticketId": "${topCandidate.ticket.id}" } }` : `{ "sessionId": "${ctx.state.sessionId}", "action": "report", "report": { "completedAction": "ticket_picked", "ticketId": "T-XXX" } }`,
-        "```"
+        "```",
+        ...hasIssues ? [
+          "",
+          "Or to fix an issue:",
+          "```json",
+          `{ "sessionId": "${ctx.state.sessionId}", "action": "report", "report": { "completedAction": "issue_picked", "issueId": "${highIssues[0].id}" } }`,
+          "```"
+        ] : []
       ].join("\n"),
       reminders: [
-        "Do NOT stop or summarize. Call autonomous_guide IMMEDIATELY to pick a ticket.",
+        "Do NOT stop or summarize. Call autonomous_guide IMMEDIATELY to pick a ticket or issue.",
         "Do NOT ask the user for confirmation."
       ]
     };
   }
   async report(ctx, report) {
+    const issueId = report.issueId;
+    if (issueId) {
+      return this.handleIssuePick(ctx, issueId);
+    }
     const ticketId = report.ticketId;
     if (!ticketId) {
-      return { action: "retry", instruction: "report.ticketId is required when picking a ticket." };
+      return { action: "retry", instruction: "report.ticketId or report.issueId is required." };
     }
     const { state: projectState } = await ctx.loadProject();
     const ticket = projectState.ticketByID(ticketId);
@@ -5831,7 +6063,7 @@ var PickTicketStage = class {
         return { action: "retry", instruction: `Ticket ${ticketId} is ${ticket.status} \u2014 pick an open ticket.` };
       }
     }
-    const planPath = join8(ctx.dir, "plan.md");
+    const planPath = join10(ctx.dir, "plan.md");
     try {
       if (existsSync7(planPath)) unlinkSync2(planPath);
     } catch {
@@ -5866,15 +6098,33 @@ ${ticket.description}` : "",
       }
     };
   }
+  // T-153: Handle issue pick -- validate and route to ISSUE_FIX
+  async handleIssuePick(ctx, issueId) {
+    const { state: projectState } = await ctx.loadProject();
+    const issue = projectState.issues.find((i) => i.id === issueId);
+    if (!issue) {
+      return { action: "retry", instruction: `Issue ${issueId} not found. Pick a valid issue or ticket.` };
+    }
+    if (issue.status !== "open") {
+      return { action: "retry", instruction: `Issue ${issueId} is ${issue.status}. Pick an open issue.` };
+    }
+    ctx.updateDraft({
+      currentIssue: { id: issue.id, title: issue.title, severity: issue.severity },
+      ticket: void 0,
+      reviews: { plan: [], code: [] },
+      finalizeCheckpoint: null
+    });
+    return { action: "goto", target: "ISSUE_FIX" };
+  }
 };
 
 // src/autonomous/stages/plan.ts
 init_esm_shims();
-import { existsSync as existsSync8, readFileSync as readFileSync3 } from "fs";
-import { join as join9 } from "path";
+import { existsSync as existsSync8, readFileSync as readFileSync5 } from "fs";
+import { join as join11 } from "path";
 function readFileSafe(path2) {
   try {
-    return readFileSync3(path2, "utf-8");
+    return readFileSync5(path2, "utf-8");
   } catch {
     return "";
   }
@@ -5909,7 +6159,7 @@ var PlanStage = class {
     };
   }
   async report(ctx, _report) {
-    const planPath = join9(ctx.dir, "plan.md");
+    const planPath = join11(ctx.dir, "plan.md");
     if (!existsSync8(planPath)) {
       return { action: "retry", instruction: `Plan file not found at ${planPath}. Write your plan there and call me again.`, reminders: ["Save plan to .story/sessions/<id>/plan.md"] };
     }
@@ -6140,7 +6390,8 @@ var ImplementStage = class {
       reminders: [
         "Follow the plan exactly. Do NOT deviate without re-planning.",
         "Do NOT ask the user for confirmation.",
-        "If you discover pre-existing bugs, failing tests not caused by your changes, or other out-of-scope problems, file them as issues using claudestory_issue_create. Do not fix them inline."
+        "If you discover pre-existing bugs, failing tests not caused by your changes, or other out-of-scope problems, file them as issues using claudestory_issue_create. Do not fix them inline.",
+        "Track which files you create or modify. Only these files should be staged at commit time."
       ],
       transitionedFrom: ctx.state.previousState ?? void 0
     };
@@ -6798,10 +7049,13 @@ var FinalizeStage = class {
         "Code review passed. Time to commit.",
         "",
         ctx.state.ticket ? `1. Update ticket ${ctx.state.ticket.id} status to "complete" in .story/` : "",
-        "2. Stage all changed files (code + .story/ changes)",
+        ctx.state.currentIssue ? `1. Ensure issue ${ctx.state.currentIssue.id} status is "resolved" in .story/issues/` : "",
+        "2. Stage only the files you created or modified for this work (code + .story/ changes). Do NOT use `git add -A` or `git add .`",
         '3. Call me with completedAction: "files_staged"'
       ].filter(Boolean).join("\n"),
-      reminders: ["Stage both code changes and .story/ ticket update in the same commit."],
+      reminders: [
+        ctx.state.currentIssue ? "Stage both code changes and .story/ issue update in the same commit. Only stage files related to this fix." : "Stage both code changes and .story/ ticket update in the same commit. Only stage files related to this ticket."
+      ],
       transitionedFrom: ctx.state.previousState ?? void 0
     };
   }
@@ -6844,9 +7098,9 @@ var FinalizeStage = class {
       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 treeResult = await gitDiffTreeNames(ctx.root, headResult.data.hash);
         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 {
@@ -6855,6 +7109,16 @@ var FinalizeStage = class {
             };
           }
         }
+        const earlyIssueId = ctx.state.currentIssue?.id;
+        if (earlyIssueId) {
+          const issuePath = `.story/issues/${earlyIssueId}.json`;
+          if (treeResult.ok && !treeResult.data.includes(issuePath)) {
+            return {
+              action: "retry",
+              instruction: `Commit detected (${headResult.data.hash.slice(0, 7)}) but issue file ${issuePath} is not in the commit. Amend the commit to include it: \`git add ${issuePath} && 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 });
       }
@@ -6888,6 +7152,16 @@ var FinalizeStage = class {
         };
       }
     }
+    const issueId = ctx.state.currentIssue?.id;
+    if (issueId) {
+      const issuePath = `.story/issues/${issueId}.json`;
+      if (!stagedResult.data.includes(issuePath)) {
+        return {
+          action: "retry",
+          instruction: `Issue file ${issuePath} is not staged. Run \`git add ${issuePath}\` and call me again with completedAction: "files_staged".`
+        };
+      }
+    }
     ctx.writeState({
       finalizeCheckpoint: overlapOverridden ? "staged_override" : "staged"
     });
@@ -6935,6 +7209,16 @@ var FinalizeStage = class {
         };
       }
     }
+    const precommitIssueId = ctx.state.currentIssue?.id;
+    if (precommitIssueId) {
+      const issuePath = `.story/issues/${precommitIssueId}.json`;
+      if (!stagedResult.data.includes(issuePath)) {
+        return {
+          action: "retry",
+          instruction: `Pre-commit hooks may have modified the staged set. Issue file ${issuePath} is no longer staged. Run \`git add ${issuePath}\` and call me again with completedAction: "files_staged".`
+        };
+      }
+    }
     ctx.writeState({ finalizeCheckpoint: "precommit_passed" });
     return {
       action: "retry",
@@ -6972,6 +7256,21 @@ var FinalizeStage = class {
     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 currentIssue = ctx.state.currentIssue;
+    if (currentIssue) {
+      ctx.writeState({
+        finalizeCheckpoint: "committed",
+        resolvedIssues: [...ctx.state.resolvedIssues ?? [], currentIssue.id],
+        currentIssue: null,
+        git: {
+          ...ctx.state.git,
+          mergeBase: normalizedHash,
+          expectedHead: normalizedHash
+        }
+      });
+      ctx.appendEvent("commit", { commitHash: normalizedHash, issueId: currentIssue.id });
+      return { action: "goto", target: "PICK_TICKET" };
+    }
     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",
@@ -7180,6 +7479,79 @@ var LessonCaptureStage = class {
   }
 };
 
+// src/autonomous/stages/issue-fix.ts
+init_esm_shims();
+var IssueFixStage = class {
+  id = "ISSUE_FIX";
+  async enter(ctx) {
+    const issue = ctx.state.currentIssue;
+    if (!issue) {
+      return { action: "goto", target: "PICK_TICKET" };
+    }
+    const { state: projectState } = await ctx.loadProject();
+    const fullIssue = projectState.issues.find((i) => i.id === issue.id);
+    const details = fullIssue ? [
+      `**${fullIssue.id}**: ${fullIssue.title}`,
+      "",
+      `Severity: ${fullIssue.severity}`,
+      fullIssue.impact ? `Impact: ${fullIssue.impact}` : "",
+      fullIssue.components.length > 0 ? `Components: ${fullIssue.components.join(", ")}` : "",
+      fullIssue.location.length > 0 ? `Location: ${fullIssue.location.join(", ")}` : ""
+    ].filter(Boolean).join("\n") : `**${issue.id}**: ${issue.title} (severity: ${issue.severity})`;
+    return {
+      instruction: [
+        "# Fix Issue",
+        "",
+        details,
+        "",
+        'Fix this issue, then update its status to "resolved" in `.story/issues/`.',
+        "Add a resolution description explaining the fix.",
+        "",
+        "When done, call `claudestory_autonomous_guide` with:",
+        "```json",
+        `{ "sessionId": "${ctx.state.sessionId}", "action": "report", "report": { "completedAction": "issue_fixed" } }`,
+        "```"
+      ].join("\n"),
+      reminders: [
+        'Update the issue JSON: set status to "resolved", add resolution text, set resolvedDate.',
+        "Do NOT ask the user for confirmation."
+      ]
+    };
+  }
+  async report(ctx, _report) {
+    const issue = ctx.state.currentIssue;
+    if (!issue) {
+      return { action: "goto", target: "PICK_TICKET" };
+    }
+    const { state: projectState } = await ctx.loadProject();
+    const current = projectState.issues.find((i) => i.id === issue.id);
+    if (!current || current.status !== "resolved") {
+      return {
+        action: "retry",
+        instruction: `Issue ${issue.id} is still ${current?.status ?? "missing"}. Update its status to "resolved" in .story/issues/${issue.id}.json with a resolution description and resolvedDate, then report again.`,
+        reminders: ["Set status to 'resolved', add resolution text, set resolvedDate."]
+      };
+    }
+    return {
+      action: "goto",
+      target: "FINALIZE",
+      result: {
+        instruction: [
+          "# Finalize Issue Fix",
+          "",
+          `Issue ${issue.id} resolved. Time to commit.`,
+          "",
+          `1. Ensure .story/issues/${issue.id}.json is updated with status: "resolved"`,
+          "2. Stage only the files you modified for this fix (code + .story/ changes). Do NOT use `git add -A` or `git add .`",
+          '3. Call me with completedAction: "files_staged"'
+        ].join("\n"),
+        reminders: ["Stage both code changes and .story/ issue update in the same commit. Only stage files related to this fix."],
+        transitionedFrom: "ISSUE_FIX"
+      }
+    };
+  }
+};
+
 // src/autonomous/stages/issue-sweep.ts
 init_esm_shims();
 var IssueSweepStage = class {
@@ -7285,7 +7657,7 @@ Impact: ${nextIssue.impact}` : ""}` : `Fix issue ${next}.`,
 init_esm_shims();
 init_handover();
 import { writeFileSync as writeFileSync2 } from "fs";
-import { join as join10 } from "path";
+import { join as join12 } from "path";
 var HandoverStage = class {
   id = "HANDOVER";
   async enter(ctx) {
@@ -7315,7 +7687,7 @@ var HandoverStage = class {
     } catch {
       handoverFailed = true;
       try {
-        const fallbackPath = join10(ctx.dir, "handover-fallback.md");
+        const fallbackPath = join12(ctx.dir, "handover-fallback.md");
         writeFileSync2(fallbackPath, content, "utf-8");
       } catch {
       }
@@ -7372,6 +7744,7 @@ registerStage(new VerifyStage());
 registerStage(new FinalizeStage());
 registerStage(new CompleteStage());
 registerStage(new LessonCaptureStage());
+registerStage(new IssueFixStage());
 registerStage(new IssueSweepStage());
 registerStage(new HandoverStage());
 
@@ -7381,6 +7754,47 @@ init_snapshot();
 init_snapshot();
 init_queries();
 init_handover();
+var RECOVERY_MAPPING = {
+  PICK_TICKET: { state: "PICK_TICKET", resetPlan: false, resetCode: false },
+  COMPLETE: { state: "PICK_TICKET", resetPlan: false, resetCode: false },
+  HANDOVER: { state: "PICK_TICKET", resetPlan: false, resetCode: false },
+  PLAN: { state: "PLAN", resetPlan: true, resetCode: false },
+  IMPLEMENT: { state: "PLAN", resetPlan: true, resetCode: false },
+  WRITE_TESTS: { state: "PLAN", resetPlan: true, resetCode: false },
+  BUILD: { state: "IMPLEMENT", resetPlan: false, resetCode: true },
+  VERIFY: { state: "IMPLEMENT", resetPlan: false, resetCode: true },
+  PLAN_REVIEW: { state: "PLAN", resetPlan: true, resetCode: true },
+  TEST: { state: "IMPLEMENT", resetPlan: false, resetCode: true },
+  CODE_REVIEW: { state: "PLAN", resetPlan: true, resetCode: true },
+  FINALIZE: { state: "IMPLEMENT", resetPlan: false, resetCode: true },
+  LESSON_CAPTURE: { state: "PICK_TICKET", resetPlan: false, resetCode: false },
+  ISSUE_FIX: { state: "PICK_TICKET", resetPlan: false, resetCode: false },
+  ISSUE_SWEEP: { state: "PICK_TICKET", resetPlan: false, resetCode: false }
+};
+function buildGuideRecommendOptions(root) {
+  const opts = {};
+  try {
+    const handoversDir = join13(root, ".story", "handovers");
+    const files = readdirSync4(handoversDir, "utf-8").filter((f) => f.endsWith(".md")).sort();
+    if (files.length > 0) {
+      opts.latestHandoverContent = readFileSync6(join13(handoversDir, files[files.length - 1]), "utf-8");
+    }
+  } catch {
+  }
+  try {
+    const snapshotsDir = join13(root, ".story", "snapshots");
+    const snapFiles = readdirSync4(snapshotsDir, "utf-8").filter((f) => f.endsWith(".json")).sort();
+    if (snapFiles.length > 0) {
+      const raw = readFileSync6(join13(snapshotsDir, snapFiles[snapFiles.length - 1]), "utf-8");
+      const snap = JSON.parse(raw);
+      if (snap.issues) {
+        opts.previousOpenIssueCount = snap.issues.filter((i) => i.status !== "resolved").length;
+      }
+    }
+  } catch {
+  }
+  return opts;
+}
 async function recoverPendingMutation(dir, state, root) {
   const mutation = state.pendingProjectMutation;
   if (!mutation || typeof mutation !== "object") return state;
@@ -7758,7 +8172,7 @@ Staged: ${stagedResult.data.join(", ")}`
       }
     }
     const { state: projectState, warnings } = await loadProject(root);
-    const handoversDir = join11(root, ".story", "handovers");
+    const handoversDir = join13(root, ".story", "handovers");
     const ctx = { state: projectState, warnings, root, handoversDir, format: "md" };
     let handoverText = "";
     try {
@@ -7775,7 +8189,7 @@ Staged: ${stagedResult.data.join(", ")}`
       }
     } catch {
     }
-    const rulesText = readFileSafe2(join11(root, "RULES.md"));
+    const rulesText = readFileSafe2(join13(root, "RULES.md"));
     const lessonDigest = buildLessonDigest(projectState.lessons);
     const digestParts = [
       handoverText ? `## Recent Handovers
@@ -7791,7 +8205,7 @@ ${rulesText}` : "",
     ].filter(Boolean);
     const digest = digestParts.join("\n\n---\n\n");
     try {
-      writeFileSync3(join11(dir, "context-digest.md"), digest, "utf-8");
+      writeFileSync3(join13(dir, "context-digest.md"), digest, "utf-8");
     } catch {
     }
     if (mode !== "auto" && args.ticketId) {
@@ -7810,6 +8224,18 @@ ${rulesText}` : "",
           return guideError(new Error(`Ticket ${args.ticketId} is blocked by: ${ticket.blockedBy.join(", ")}.`));
         }
       }
+      if (mode !== "review") {
+        const claimId = ticket.claimedBySession;
+        if (claimId && typeof claimId === "string" && claimId !== session.sessionId) {
+          const claimingSession = findSessionById(root, claimId);
+          if (claimingSession && claimingSession.state.status === "active" && !isLeaseExpired(claimingSession.state)) {
+            deleteSession(root, session.sessionId);
+            return guideError(new Error(
+              `Ticket ${args.ticketId} is claimed by active session ${claimId}. Wait for it to finish or stop it with "claudestory session stop ${claimId}".`
+            ));
+          }
+        }
+      }
       let entryState;
       if (mode === "review") {
         entryState = "CODE_REVIEW";
@@ -7905,12 +8331,22 @@ ${ticket.description}` : "",
     } else {
       candidatesText = "No tickets found.";
     }
-    const recResult = recommend(projectState, 5);
+    const highIssues = projectState.issues.filter(
+      (i) => i.status === "open" && (i.severity === "critical" || i.severity === "high")
+    );
+    let issuesText = "";
+    if (highIssues.length > 0) {
+      issuesText = "\n\n## Open Issues (high+ severity)\n\n" + highIssues.map(
+        (i, idx) => `${idx + 1}. **${i.id}: ${i.title}** (${i.severity})`
+      ).join("\n");
+    }
+    const guideRecOptions = buildGuideRecommendOptions(root);
+    const recResult = recommend(projectState, 5, guideRecOptions);
     let recsText = "";
     if (recResult.recommendations.length > 0) {
-      const ticketRecs = recResult.recommendations.filter((r) => r.kind === "ticket");
-      if (ticketRecs.length > 0) {
-        recsText = "\n\n**Recommended:**\n" + ticketRecs.map(
+      const actionableRecs = recResult.recommendations.filter((r) => r.kind === "ticket" || r.kind === "issue");
+      if (actionableRecs.length > 0) {
+        recsText = "\n\n**Recommended:**\n" + actionableRecs.map(
           (r) => `- ${r.id}: ${r.title} (${r.reason})`
         ).join("\n");
       }
@@ -7930,21 +8366,30 @@ ${ticket.description}` : "",
     const interval = updated.config.handoverInterval ?? 3;
     const sessionDesc = maxTickets > 0 ? `Work continuously until all tickets are done or you reach ${maxTickets} tickets.` : "Work continuously until all tickets are done.";
     const checkpointDesc = interval > 0 ? ` A checkpoint handover will be saved every ${interval} tickets.` : "";
+    const hasHighIssues = highIssues.length > 0;
     const instruction = [
       "# Autonomous Session Started",
       "",
       `You are now in autonomous mode. ${sessionDesc}${checkpointDesc}`,
-      "Do NOT stop to summarize. Do NOT ask the user. Pick a ticket and start working immediately.",
+      "Do NOT stop to summarize. Do NOT ask the user. Pick a ticket or issue and start working immediately.",
       "",
       "## Ticket Candidates",
       "",
       candidatesText,
+      issuesText,
       recsText,
       "",
-      topCandidate ? `Pick **${topCandidate.ticket.id}** (highest priority) by calling \`claudestory_autonomous_guide\` now:` : "Pick a ticket by calling `claudestory_autonomous_guide` now:",
+      topCandidate ? `Pick **${topCandidate.ticket.id}** (highest priority) or an open issue by calling \`claudestory_autonomous_guide\` now:` : hasHighIssues ? "Pick an issue to fix by calling `claudestory_autonomous_guide` now:" : "Pick a ticket by calling `claudestory_autonomous_guide` now:",
       "```json",
       topCandidate ? `{ "sessionId": "${updated.sessionId}", "action": "report", "report": { "completedAction": "ticket_picked", "ticketId": "${topCandidate.ticket.id}" } }` : `{ "sessionId": "${updated.sessionId}", "action": "report", "report": { "completedAction": "ticket_picked", "ticketId": "T-XXX" } }`,
-      "```"
+      "```",
+      ...hasHighIssues ? [
+        "",
+        "Or to fix an issue:",
+        "```json",
+        `{ "sessionId": "${updated.sessionId}", "action": "report", "report": { "completedAction": "issue_picked", "issueId": "${highIssues[0].id}" } }`,
+        "```"
+      ] : []
     ].join("\n");
     return guideResult(updated, "PICK_TICKET", {
       instruction,
@@ -8131,26 +8576,7 @@ async function handleResume(root, args) {
     ));
   }
   if (expectedHead && headResult.data.hash !== expectedHead) {
-    const recoveryMapping = {
-      PICK_TICKET: { state: "PICK_TICKET", resetPlan: false, resetCode: false },
-      COMPLETE: { state: "PICK_TICKET", resetPlan: false, resetCode: false },
-      HANDOVER: { state: "PICK_TICKET", resetPlan: false, resetCode: false },
-      PLAN: { state: "PLAN", resetPlan: true, resetCode: false },
-      IMPLEMENT: { state: "PLAN", resetPlan: true, resetCode: false },
-      WRITE_TESTS: { state: "PLAN", resetPlan: true, resetCode: false },
-      // T-139: baseline stale after HEAD change
-      VERIFY: { state: "IMPLEMENT", resetPlan: false, resetCode: true },
-      // T-131: reviewed code stale after HEAD drift
-      PLAN_REVIEW: { state: "PLAN", resetPlan: true, resetCode: true },
-      TEST: { state: "IMPLEMENT", resetPlan: false, resetCode: true },
-      // T-128: tests invalidated by HEAD change
-      CODE_REVIEW: { state: "PLAN", resetPlan: true, resetCode: true },
-      FINALIZE: { state: "IMPLEMENT", resetPlan: false, resetCode: true },
-      LESSON_CAPTURE: { state: "PICK_TICKET", resetPlan: false, resetCode: false },
-      ISSUE_SWEEP: { state: "PICK_TICKET", resetPlan: false, resetCode: false }
-      // T-128: post-complete, restart sweep
-    };
-    const mapping = recoveryMapping[resumeState] ?? { state: "PICK_TICKET", resetPlan: false, resetCode: false };
+    const mapping = RECOVERY_MAPPING[resumeState] ?? { state: "PICK_TICKET", resetPlan: false, resetCode: false };
     const recoveryReviews = {
       plan: mapping.resetPlan ? [] : info.state.reviews.plan,
       code: mapping.resetCode ? [] : info.state.reviews.code
@@ -8498,7 +8924,7 @@ function guideError(err) {
 }
 function readFileSafe2(path2) {
   try {
-    return readFileSync4(path2, "utf-8");
+    return readFileSync6(path2, "utf-8");
   } catch {
     return "";
   }
@@ -8508,8 +8934,8 @@ function readFileSafe2(path2) {
 init_esm_shims();
 init_session();
 init_session_types();
-import { readFileSync as readFileSync5, existsSync as existsSync10 } from "fs";
-import { join as join12 } from "path";
+import { readFileSync as readFileSync7, existsSync as existsSync10 } from "fs";
+import { join as join14 } from "path";
 
 // src/core/session-report-formatter.ts
 init_esm_shims();
@@ -8723,7 +9149,7 @@ async function handleSessionReport(sessionId, root, format = "md") {
       isError: true
     };
   }
-  const statePath2 = join12(dir, "state.json");
+  const statePath2 = join14(dir, "state.json");
   if (!existsSync10(statePath2)) {
     return {
       output: `Error: Session ${sessionId} corrupt \u2014 state.json missing.`,
@@ -8733,7 +9159,7 @@ async function handleSessionReport(sessionId, root, format = "md") {
     };
   }
   try {
-    const rawJson = JSON.parse(readFileSync5(statePath2, "utf-8"));
+    const rawJson = JSON.parse(readFileSync7(statePath2, "utf-8"));
     if (rawJson && typeof rawJson === "object" && "schemaVersion" in rawJson && rawJson.schemaVersion !== CURRENT_SESSION_SCHEMA_VERSION) {
       return {
         output: `Error: Session ${sessionId} \u2014 unsupported session schema version ${rawJson.schemaVersion}.`,
@@ -8762,7 +9188,7 @@ async function handleSessionReport(sessionId, root, format = "md") {
   const events = readEvents(dir);
   let planContent = null;
   try {
-    planContent = readFileSync5(join12(dir, "plan.md"), "utf-8");
+    planContent = readFileSync7(join14(dir, "plan.md"), "utf-8");
   } catch {
   }
   let gitLog = null;
@@ -8787,7 +9213,7 @@ init_issue();
 init_roadmap();
 init_output_formatter();
 init_helpers();
-import { join as join13, resolve as resolve6 } from "path";
+import { join as join15, resolve as resolve6 } from "path";
 var PHASE_ID_REGEX = /^[a-z0-9]+(-[a-z0-9]+)*$/;
 var PHASE_ID_MAX_LENGTH = 40;
 function validatePhaseId(id) {
@@ -8896,7 +9322,7 @@ function formatMcpError(code, message) {
 async function runMcpReadTool(pinnedRoot, handler) {
   try {
     const { state, warnings } = await loadProject(pinnedRoot);
-    const handoversDir = join14(pinnedRoot, ".story", "handovers");
+    const handoversDir = join16(pinnedRoot, ".story", "handovers");
     const ctx = { state, warnings, root: pinnedRoot, handoversDir, format: "md" };
     const result = await handler(ctx);
     if (result.errorCode && INFRASTRUCTURE_ERROR_CODES.includes(result.errorCode)) {
@@ -9453,10 +9879,10 @@ init_esm_shims();
 init_project_loader();
 init_errors();
 import { mkdir as mkdir4, stat as stat2, readFile as readFile4, writeFile as writeFile2 } from "fs/promises";
-import { join as join15, resolve as resolve7 } from "path";
+import { join as join17, resolve as resolve7 } from "path";
 async function initProject(root, options) {
   const absRoot = resolve7(root);
-  const wrapDir = join15(absRoot, ".story");
+  const wrapDir = join17(absRoot, ".story");
   let exists = false;
   try {
     const s = await stat2(wrapDir);
@@ -9476,11 +9902,11 @@ async function initProject(root, options) {
       ".story/ already exists. Use --force to overwrite config and roadmap."
     );
   }
-  await mkdir4(join15(wrapDir, "tickets"), { recursive: true });
-  await mkdir4(join15(wrapDir, "issues"), { recursive: true });
-  await mkdir4(join15(wrapDir, "handovers"), { recursive: true });
-  await mkdir4(join15(wrapDir, "notes"), { recursive: true });
-  await mkdir4(join15(wrapDir, "lessons"), { recursive: true });
+  await mkdir4(join17(wrapDir, "tickets"), { recursive: true });
+  await mkdir4(join17(wrapDir, "issues"), { recursive: true });
+  await mkdir4(join17(wrapDir, "handovers"), { recursive: true });
+  await mkdir4(join17(wrapDir, "notes"), { recursive: true });
+  await mkdir4(join17(wrapDir, "lessons"), { recursive: true });
   const created = [
     ".story/config.json",
     ".story/roadmap.json",
@@ -9520,7 +9946,7 @@ async function initProject(root, options) {
   };
   await writeConfig(config, absRoot);
   await writeRoadmap(roadmap, absRoot);
-  const gitignorePath = join15(wrapDir, ".gitignore");
+  const gitignorePath = join17(wrapDir, ".gitignore");
   await ensureGitignoreEntries(gitignorePath, STORY_GITIGNORE_ENTRIES);
   const warnings = [];
   if (options.force && exists) {
@@ -9559,7 +9985,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.35";
+var version = "0.1.37";
 function tryDiscoverRoot() {
   const envRoot = process.env[ENV_VAR2];
   if (envRoot) {
@@ -9571,7 +9997,7 @@ function tryDiscoverRoot() {
     const resolved = resolve8(envRoot);
     try {
       const canonical = realpathSync2(resolved);
-      if (existsSync11(join16(canonical, CONFIG_PATH2))) {
+      if (existsSync11(join18(canonical, CONFIG_PATH2))) {
         return canonical;
       }
       process.stderr.write(`Warning: No .story/config.json at ${canonical}