@anthropologies/claudestory 0.1.57 → 0.1.58

package/dist/cli.js

@@ -5667,7 +5667,8 @@ function refreshLease(state) {
     contextPressure: {
       ...state.contextPressure,
       guideCallCount: newCallCount,
-      ticketsCompleted: state.completedTickets?.length ?? 0
+      // ISS-084: Include resolved issues in work count
+      ticketsCompleted: (state.completedTickets?.length ?? 0) + (state.resolvedIssues?.length ?? 0)
     }
   };
 }
@@ -5885,7 +5886,7 @@ var init_state_machine = __esm({
       VERIFY: ["FINALIZE", "IMPLEMENT", "VERIFY"],
       // pass → FINALIZE, fail → IMPLEMENT, retry
       FINALIZE: ["COMPLETE", "PICK_TICKET"],
-      // PICK_TICKET for issue-fix flow (bypass COMPLETE)
+      // ISS-084: issues now route through COMPLETE too; PICK_TICKET kept for in-flight session compat
       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
@@ -5905,7 +5906,7 @@ var init_state_machine = __esm({
 // src/autonomous/context-pressure.ts
 function evaluatePressure(state) {
   const calls = state.contextPressure?.guideCallCount ?? state.guideCallCount ?? 0;
-  const tickets = state.contextPressure?.ticketsCompleted ?? state.completedTickets?.length ?? 0;
+  const tickets = (state.completedTickets?.length ?? 0) + (state.resolvedIssues?.length ?? 0);
   const eventsBytes = state.contextPressure?.eventsLogBytes ?? 0;
   const tier = state.config?.compactThreshold ?? "high";
   const t = THRESHOLDS[tier] ?? THRESHOLDS["high"];
@@ -6448,17 +6449,22 @@ var init_pick_ticket = __esm({
             (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")
-        );
+        const allOpenIssues = projectState.issues.filter((i) => i.status === "open");
+        const highIssues = allOpenIssues.filter((i) => i.severity === "critical" || i.severity === "high");
+        const otherIssues = allOpenIssues.filter((i) => 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");
         }
+        if (otherIssues.length > 0) {
+          issuesText += "\n\n## Open Issues (medium/low)\n\n" + otherIssues.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;
+        const hasIssues = allOpenIssues.length > 0;
         if (!topCandidate && candidates.kind !== "found" && !hasIssues) {
           return { action: "goto", target: "COMPLETE" };
         }
@@ -6479,7 +6485,7 @@ var init_pick_ticket = __esm({
               "",
               "Or to fix an issue:",
               "```json",
-              `{ "sessionId": "${ctx.state.sessionId}", "action": "report", "report": { "completedAction": "issue_picked", "issueId": "${highIssues[0].id}" } }`,
+              `{ "sessionId": "${ctx.state.sessionId}", "action": "report", "report": { "completedAction": "issue_picked", "issueId": "${(highIssues[0] ?? allOpenIssues[0]).id}" } }`,
               "```"
             ] : []
           ].join("\n"),
@@ -7798,7 +7804,7 @@ var init_finalize = __esm({
             }
           });
           ctx.appendEvent("commit", { commitHash: normalizedHash, issueId: currentIssue.id });
-          return { action: "goto", target: "PICK_TICKET" };
+          return { action: "goto", target: "COMPLETE" };
         }
         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({
@@ -7836,6 +7842,8 @@ var init_complete = __esm({
           finalizeCheckpoint: null
         });
         const ticketsDone = ctx.state.completedTickets.length;
+        const issuesDone = (ctx.state.resolvedIssues ?? []).length;
+        const totalWorkDone = ticketsDone + issuesDone;
         const maxTickets = ctx.state.config.maxTicketsPerSession;
         const mode = ctx.state.mode ?? "auto";
         if (mode !== "auto") {
@@ -7856,15 +7864,17 @@ var init_complete = __esm({
           };
         }
         const handoverInterval = ctx.state.config.handoverInterval ?? 5;
-        if (handoverInterval > 0 && ticketsDone > 0 && ticketsDone % handoverInterval === 0) {
+        if (handoverInterval > 0 && totalWorkDone > 0 && totalWorkDone % handoverInterval === 0) {
           try {
             const { handleHandoverCreate: handleHandoverCreate3 } = await Promise.resolve().then(() => (init_handover(), handover_exports));
             const completedIds = ctx.state.completedTickets.map((t) => t.id).join(", ");
+            const resolvedIds = (ctx.state.resolvedIssues ?? []).join(", ");
             const content = [
-              `# Checkpoint \u2014 ${ticketsDone} tickets completed`,
+              `# Checkpoint \u2014 ${totalWorkDone} items completed`,
               "",
               `**Session:** ${ctx.state.sessionId}`,
-              `**Tickets:** ${completedIds}`,
+              ...completedIds ? [`**Tickets:** ${completedIds}`] : [],
+              ...resolvedIds ? [`**Issues resolved:** ${resolvedIds}`] : [],
               "",
               "This is an automatic mid-session checkpoint. The session is still active."
             ].join("\n");
@@ -7878,24 +7888,19 @@ var init_complete = __esm({
             await saveSnapshot2(ctx.root, loadResult);
           } catch {
           }
-          ctx.appendEvent("checkpoint", { ticketsDone, interval: handoverInterval });
+          ctx.appendEvent("checkpoint", { ticketsDone, issuesDone, totalWorkDone, interval: handoverInterval });
         }
+        const { state: projectState } = await ctx.loadProject();
         let nextTarget;
-        if (maxTickets > 0 && ticketsDone >= maxTickets) {
+        if (maxTickets > 0 && totalWorkDone >= maxTickets) {
           nextTarget = "HANDOVER";
         } else {
-          nextTarget = "PICK_TICKET";
-        }
-        const { state: projectState } = await ctx.loadProject();
-        const nextResult = nextTickets(projectState, 1);
-        if (nextResult.kind !== "found") {
-          const highIssues = projectState.issues.filter(
-            (i) => i.status === "open" && (i.severity === "critical" || i.severity === "high")
-          );
-          if (highIssues.length > 0) {
+          const nextResult = nextTickets(projectState, 1);
+          if (nextResult.kind === "found") {
             nextTarget = "PICK_TICKET";
           } else {
-            nextTarget = "HANDOVER";
+            const openIssues = projectState.issues.filter((i) => i.status === "open");
+            nextTarget = openIssues.length > 0 ? "PICK_TICKET" : "HANDOVER";
           }
         }
         if (nextTarget === "HANDOVER") {
@@ -7910,7 +7915,7 @@ var init_complete = __esm({
             target: "HANDOVER",
             result: {
               instruction: [
-                `# Session Complete \u2014 ${ticketsDone} ticket(s) done`,
+                `# Session Complete \u2014 ${ticketsDone} ticket(s) and ${issuesDone} issue(s) done`,
                 "",
                 "Write a session handover summarizing what was accomplished, decisions made, and what's next.",
                 "",
@@ -7979,6 +7984,7 @@ var init_lesson_capture = __esm({
         const planReviews = ctx.state.reviews.plan ?? [];
         const codeReviews = ctx.state.reviews.code ?? [];
         const ticketsDone = ctx.state.completedTickets.length;
+        const issuesDone = (ctx.state.resolvedIssues ?? []).length;
         const planFindings = planReviews.reduce((sum, r) => sum + (r.findingCount ?? 0), 0);
         const planCritical = planReviews.reduce((sum, r) => sum + (r.criticalCount ?? 0), 0);
         const planMajor = planReviews.reduce((sum, r) => sum + (r.majorCount ?? 0), 0);
@@ -8000,7 +8006,7 @@ var init_lesson_capture = __esm({
           instruction: [
             "# Capture Lessons from Review Findings",
             "",
-            `This session completed ${ticketsDone} ticket(s). Review summary:`,
+            `This session completed ${ticketsDone} ticket(s) and ${issuesDone} issue(s). Review summary:`,
             `- **Plan reviews:** ${planReviews.length} round(s), ${planCritical} critical, ${planMajor} major, ${planFindings} total findings`,
             `- **Code reviews:** ${codeReviews.length} round(s), ${codeCritical} critical, ${codeMajor} major, ${codeFindings} total findings`,
             "",
@@ -8231,9 +8237,10 @@ var init_handover2 = __esm({
       id = "HANDOVER";
       async enter(ctx) {
         const ticketsDone = ctx.state.completedTickets.length;
+        const issuesDone = (ctx.state.resolvedIssues ?? []).length;
         return {
           instruction: [
-            `# Session Complete \u2014 ${ticketsDone} ticket(s) done`,
+            `# Session Complete \u2014 ${ticketsDone} ticket(s) and ${issuesDone} issue(s) done`,
             "",
             "Write a session handover summarizing what was accomplished, decisions made, and what's next.",
             "",
@@ -8280,18 +8287,22 @@ var init_handover2 = __esm({
         });
         ctx.appendEvent("session_end", {
           ticketsCompleted: ctx.state.completedTickets.length,
+          issuesResolved: (ctx.state.resolvedIssues ?? []).length,
           handoverFailed
         });
         const ticketsDone = ctx.state.completedTickets.length;
+        const issuesDone = (ctx.state.resolvedIssues ?? []).length;
+        const resolvedList = (ctx.state.resolvedIssues ?? []).map((id) => `- ${id} (resolved)`).join("\n");
         return {
           action: "advance",
           result: {
             instruction: [
               "# Session Complete",
               "",
-              `${ticketsDone} ticket(s) completed.${handoverFailed ? " Handover creation failed \u2014 fallback saved to session directory." : " Handover written."}${stashPopFailed ? " Auto-stash pop failed \u2014 run `git stash pop` manually." : ""} Session ended.`,
+              `${ticketsDone} ticket(s) and ${issuesDone} issue(s) completed.${handoverFailed ? " Handover creation failed \u2014 fallback saved to session directory." : " Handover written."}${stashPopFailed ? " Auto-stash pop failed \u2014 run `git stash pop` manually." : ""} Session ended.`,
               "",
-              ctx.state.completedTickets.map((t) => `- ${t.id}${t.title ? `: ${t.title}` : ""} (${t.commitHash ?? "no commit"})`).join("\n")
+              ctx.state.completedTickets.map((t) => `- ${t.id}${t.title ? `: ${t.title}` : ""} (${t.commitHash ?? "no commit"})`).join("\n"),
+              ...resolvedList ? [resolvedList] : []
             ].join("\n"),
             reminders: [],
             transitionedFrom: "HANDOVER"
@@ -8372,7 +8383,7 @@ function getInstalledVersion() {
   }
 }
 function getRunningVersion() {
-  return "0.1.57";
+  return "0.1.58";
 }
 var init_version_check = __esm({
   "src/autonomous/version-check.ts"() {
@@ -9318,7 +9329,7 @@ ${driftPreamble}Recovered to state: **${mapping.state}**. Continue from here.`,
       instruction: [
         "# Resumed After Compact \u2014 Continue Working",
         "",
-        `${written.completedTickets.length} ticket(s) done so far. Context compacted. Pick the next ticket immediately.`,
+        `${written.completedTickets.length} ticket(s) and ${(written.resolvedIssues ?? []).length} issue(s) done so far. Context compacted. Pick the next ticket or issue immediately.`,
         "",
         candidatesText,
         "",
@@ -9434,7 +9445,8 @@ async function handleCancel(root, args) {
     return guideError(new Error("Session already ended."));
   }
   const isAutoMode = info.state.mode === "auto" || !info.state.mode;
-  const hasTicketsRemaining = info.state.config.maxTicketsPerSession === 0 || info.state.completedTickets.length < info.state.config.maxTicketsPerSession;
+  const totalDone = info.state.completedTickets.length + (info.state.resolvedIssues?.length ?? 0);
+  const hasTicketsRemaining = info.state.config.maxTicketsPerSession === 0 || totalDone < info.state.config.maxTicketsPerSession;
   const isWorkingState = !["SESSION_END", "HANDOVER", "COMPACT"].includes(info.state.state);
   if (isAutoMode && hasTicketsRemaining && isWorkingState) {
     return {
@@ -9443,7 +9455,7 @@ async function handleCancel(root, args) {
         text: [
           "# Cancel Rejected \u2014 Session Still Active",
           "",
-          `You have completed ${info.state.completedTickets.length} ticket(s) with more work remaining.`,
+          `You have completed ${info.state.completedTickets.length} ticket(s) and ${(info.state.resolvedIssues ?? []).length} issue(s) with more work remaining.`,
           "Do NOT cancel an autonomous session due to context size.",
           "If you need to manage context, Claude Code handles compaction automatically.",
           "",
@@ -9511,14 +9523,14 @@ async function handleCancel(root, args) {
   });
   const stashNote = stashPopFailed ? " Auto-stash pop failed \u2014 run `git stash pop` manually." : "";
   return {
-    content: [{ type: "text", text: `Session ${args.sessionId} cancelled. ${written.completedTickets.length} ticket(s) were completed.${stashNote}` }]
+    content: [{ type: "text", text: `Session ${args.sessionId} cancelled. ${written.completedTickets.length} ticket(s) and ${(written.resolvedIssues ?? []).length} issue(s) were completed.${stashNote}` }]
   };
 }
 function guideResult(state, currentState, opts) {
   const summary = {
     ticket: state.ticket ? `${state.ticket.id}: ${state.ticket.title}` : "none",
     risk: state.ticket?.risk ?? "unknown",
-    completed: state.completedTickets.map((t) => t.id),
+    completed: [...state.completedTickets.map((t) => t.id), ...state.resolvedIssues ?? []],
     currentStep: currentState,
     contextPressure: state.contextPressure?.level ?? "low",
     branch: state.git?.branch ?? null
@@ -10969,7 +10981,7 @@ var init_mcp = __esm({
     init_init();
     ENV_VAR2 = "CLAUDESTORY_PROJECT_ROOT";
     CONFIG_PATH2 = ".story/config.json";
-    version = "0.1.57";
+    version = "0.1.58";
     main().catch((err) => {
       process.stderr.write(`Fatal: ${err instanceof Error ? err.message : String(err)}
 `);
@@ -14451,7 +14463,7 @@ async function runCli() {
     registerSessionCommand: registerSessionCommand2,
     registerRepairCommand: registerRepairCommand2
   } = await Promise.resolve().then(() => (init_register(), register_exports));
-  const version2 = "0.1.57";
+  const version2 = "0.1.58";
   class HandledError extends Error {
     constructor() {
       super("HANDLED_ERROR");

package/dist/mcp.js

@@ -3912,7 +3912,8 @@ function refreshLease(state) {
     contextPressure: {
       ...state.contextPressure,
       guideCallCount: newCallCount,
-      ticketsCompleted: state.completedTickets?.length ?? 0
+      // ISS-084: Include resolved issues in work count
+      ticketsCompleted: (state.completedTickets?.length ?? 0) + (state.resolvedIssues?.length ?? 0)
     }
   };
 }
@@ -5469,7 +5470,7 @@ var TRANSITIONS = {
   VERIFY: ["FINALIZE", "IMPLEMENT", "VERIFY"],
   // pass → FINALIZE, fail → IMPLEMENT, retry
   FINALIZE: ["COMPLETE", "PICK_TICKET"],
-  // PICK_TICKET for issue-fix flow (bypass COMPLETE)
+  // ISS-084: issues now route through COMPLETE too; PICK_TICKET kept for in-flight session compat
   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
@@ -5515,7 +5516,7 @@ var THRESHOLDS = {
 };
 function evaluatePressure(state) {
   const calls = state.contextPressure?.guideCallCount ?? state.guideCallCount ?? 0;
-  const tickets = state.contextPressure?.ticketsCompleted ?? state.completedTickets?.length ?? 0;
+  const tickets = (state.completedTickets?.length ?? 0) + (state.resolvedIssues?.length ?? 0);
   const eventsBytes = state.contextPressure?.eventsLogBytes ?? 0;
   const tier = state.config?.compactThreshold ?? "high";
   const t = THRESHOLDS[tier] ?? THRESHOLDS["high"];
@@ -6003,17 +6004,22 @@ 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")
-    );
+    const allOpenIssues = projectState.issues.filter((i) => i.status === "open");
+    const highIssues = allOpenIssues.filter((i) => i.severity === "critical" || i.severity === "high");
+    const otherIssues = allOpenIssues.filter((i) => 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");
     }
+    if (otherIssues.length > 0) {
+      issuesText += "\n\n## Open Issues (medium/low)\n\n" + otherIssues.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;
+    const hasIssues = allOpenIssues.length > 0;
     if (!topCandidate && candidates.kind !== "found" && !hasIssues) {
       return { action: "goto", target: "COMPLETE" };
     }
@@ -6034,7 +6040,7 @@ var PickTicketStage = class {
           "",
           "Or to fix an issue:",
           "```json",
-          `{ "sessionId": "${ctx.state.sessionId}", "action": "report", "report": { "completedAction": "issue_picked", "issueId": "${highIssues[0].id}" } }`,
+          `{ "sessionId": "${ctx.state.sessionId}", "action": "report", "report": { "completedAction": "issue_picked", "issueId": "${(highIssues[0] ?? allOpenIssues[0]).id}" } }`,
           "```"
         ] : []
       ].join("\n"),
@@ -7292,7 +7298,7 @@ var FinalizeStage = class {
         }
       });
       ctx.appendEvent("commit", { commitHash: normalizedHash, issueId: currentIssue.id });
-      return { action: "goto", target: "PICK_TICKET" };
+      return { action: "goto", target: "COMPLETE" };
     }
     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({
@@ -7322,6 +7328,8 @@ var CompleteStage = class {
       finalizeCheckpoint: null
     });
     const ticketsDone = ctx.state.completedTickets.length;
+    const issuesDone = (ctx.state.resolvedIssues ?? []).length;
+    const totalWorkDone = ticketsDone + issuesDone;
     const maxTickets = ctx.state.config.maxTicketsPerSession;
     const mode = ctx.state.mode ?? "auto";
     if (mode !== "auto") {
@@ -7342,15 +7350,17 @@ var CompleteStage = class {
       };
     }
     const handoverInterval = ctx.state.config.handoverInterval ?? 5;
-    if (handoverInterval > 0 && ticketsDone > 0 && ticketsDone % handoverInterval === 0) {
+    if (handoverInterval > 0 && totalWorkDone > 0 && totalWorkDone % handoverInterval === 0) {
       try {
         const { handleHandoverCreate: handleHandoverCreate3 } = await Promise.resolve().then(() => (init_handover(), handover_exports));
         const completedIds = ctx.state.completedTickets.map((t) => t.id).join(", ");
+        const resolvedIds = (ctx.state.resolvedIssues ?? []).join(", ");
         const content = [
-          `# Checkpoint \u2014 ${ticketsDone} tickets completed`,
+          `# Checkpoint \u2014 ${totalWorkDone} items completed`,
           "",
           `**Session:** ${ctx.state.sessionId}`,
-          `**Tickets:** ${completedIds}`,
+          ...completedIds ? [`**Tickets:** ${completedIds}`] : [],
+          ...resolvedIds ? [`**Issues resolved:** ${resolvedIds}`] : [],
           "",
           "This is an automatic mid-session checkpoint. The session is still active."
         ].join("\n");
@@ -7364,24 +7374,19 @@ var CompleteStage = class {
         await saveSnapshot2(ctx.root, loadResult);
       } catch {
       }
-      ctx.appendEvent("checkpoint", { ticketsDone, interval: handoverInterval });
+      ctx.appendEvent("checkpoint", { ticketsDone, issuesDone, totalWorkDone, interval: handoverInterval });
     }
+    const { state: projectState } = await ctx.loadProject();
     let nextTarget;
-    if (maxTickets > 0 && ticketsDone >= maxTickets) {
+    if (maxTickets > 0 && totalWorkDone >= maxTickets) {
       nextTarget = "HANDOVER";
     } else {
-      nextTarget = "PICK_TICKET";
-    }
-    const { state: projectState } = await ctx.loadProject();
-    const nextResult = nextTickets(projectState, 1);
-    if (nextResult.kind !== "found") {
-      const highIssues = projectState.issues.filter(
-        (i) => i.status === "open" && (i.severity === "critical" || i.severity === "high")
-      );
-      if (highIssues.length > 0) {
+      const nextResult = nextTickets(projectState, 1);
+      if (nextResult.kind === "found") {
         nextTarget = "PICK_TICKET";
       } else {
-        nextTarget = "HANDOVER";
+        const openIssues = projectState.issues.filter((i) => i.status === "open");
+        nextTarget = openIssues.length > 0 ? "PICK_TICKET" : "HANDOVER";
       }
     }
     if (nextTarget === "HANDOVER") {
@@ -7396,7 +7401,7 @@ var CompleteStage = class {
         target: "HANDOVER",
         result: {
           instruction: [
-            `# Session Complete \u2014 ${ticketsDone} ticket(s) done`,
+            `# Session Complete \u2014 ${ticketsDone} ticket(s) and ${issuesDone} issue(s) done`,
             "",
             "Write a session handover summarizing what was accomplished, decisions made, and what's next.",
             "",
@@ -7459,6 +7464,7 @@ var LessonCaptureStage = class {
     const planReviews = ctx.state.reviews.plan ?? [];
     const codeReviews = ctx.state.reviews.code ?? [];
     const ticketsDone = ctx.state.completedTickets.length;
+    const issuesDone = (ctx.state.resolvedIssues ?? []).length;
     const planFindings = planReviews.reduce((sum, r) => sum + (r.findingCount ?? 0), 0);
     const planCritical = planReviews.reduce((sum, r) => sum + (r.criticalCount ?? 0), 0);
     const planMajor = planReviews.reduce((sum, r) => sum + (r.majorCount ?? 0), 0);
@@ -7480,7 +7486,7 @@ var LessonCaptureStage = class {
       instruction: [
         "# Capture Lessons from Review Findings",
         "",
-        `This session completed ${ticketsDone} ticket(s). Review summary:`,
+        `This session completed ${ticketsDone} ticket(s) and ${issuesDone} issue(s). Review summary:`,
         `- **Plan reviews:** ${planReviews.length} round(s), ${planCritical} critical, ${planMajor} major, ${planFindings} total findings`,
         `- **Code reviews:** ${codeReviews.length} round(s), ${codeCritical} critical, ${codeMajor} major, ${codeFindings} total findings`,
         "",
@@ -7692,9 +7698,10 @@ var HandoverStage = class {
   id = "HANDOVER";
   async enter(ctx) {
     const ticketsDone = ctx.state.completedTickets.length;
+    const issuesDone = (ctx.state.resolvedIssues ?? []).length;
     return {
       instruction: [
-        `# Session Complete \u2014 ${ticketsDone} ticket(s) done`,
+        `# Session Complete \u2014 ${ticketsDone} ticket(s) and ${issuesDone} issue(s) done`,
         "",
         "Write a session handover summarizing what was accomplished, decisions made, and what's next.",
         "",
@@ -7741,18 +7748,22 @@ var HandoverStage = class {
     });
     ctx.appendEvent("session_end", {
       ticketsCompleted: ctx.state.completedTickets.length,
+      issuesResolved: (ctx.state.resolvedIssues ?? []).length,
       handoverFailed
     });
     const ticketsDone = ctx.state.completedTickets.length;
+    const issuesDone = (ctx.state.resolvedIssues ?? []).length;
+    const resolvedList = (ctx.state.resolvedIssues ?? []).map((id) => `- ${id} (resolved)`).join("\n");
     return {
       action: "advance",
       result: {
         instruction: [
           "# Session Complete",
           "",
-          `${ticketsDone} ticket(s) completed.${handoverFailed ? " Handover creation failed \u2014 fallback saved to session directory." : " Handover written."}${stashPopFailed ? " Auto-stash pop failed \u2014 run `git stash pop` manually." : ""} Session ended.`,
+          `${ticketsDone} ticket(s) and ${issuesDone} issue(s) completed.${handoverFailed ? " Handover creation failed \u2014 fallback saved to session directory." : " Handover written."}${stashPopFailed ? " Auto-stash pop failed \u2014 run `git stash pop` manually." : ""} Session ended.`,
           "",
-          ctx.state.completedTickets.map((t) => `- ${t.id}${t.title ? `: ${t.title}` : ""} (${t.commitHash ?? "no commit"})`).join("\n")
+          ctx.state.completedTickets.map((t) => `- ${t.id}${t.title ? `: ${t.title}` : ""} (${t.commitHash ?? "no commit"})`).join("\n"),
+          ...resolvedList ? [resolvedList] : []
         ].join("\n"),
         reminders: [],
         transitionedFrom: "HANDOVER"
@@ -7816,7 +7827,7 @@ function getInstalledVersion() {
   }
 }
 function getRunningVersion() {
-  return "0.1.57";
+  return "0.1.58";
 }
 
 // src/autonomous/guide.ts
@@ -8779,7 +8790,7 @@ ${driftPreamble}Recovered to state: **${mapping.state}**. Continue from here.`,
       instruction: [
         "# Resumed After Compact \u2014 Continue Working",
         "",
-        `${written.completedTickets.length} ticket(s) done so far. Context compacted. Pick the next ticket immediately.`,
+        `${written.completedTickets.length} ticket(s) and ${(written.resolvedIssues ?? []).length} issue(s) done so far. Context compacted. Pick the next ticket or issue immediately.`,
         "",
         candidatesText,
         "",
@@ -8895,7 +8906,8 @@ async function handleCancel(root, args) {
     return guideError(new Error("Session already ended."));
   }
   const isAutoMode = info.state.mode === "auto" || !info.state.mode;
-  const hasTicketsRemaining = info.state.config.maxTicketsPerSession === 0 || info.state.completedTickets.length < info.state.config.maxTicketsPerSession;
+  const totalDone = info.state.completedTickets.length + (info.state.resolvedIssues?.length ?? 0);
+  const hasTicketsRemaining = info.state.config.maxTicketsPerSession === 0 || totalDone < info.state.config.maxTicketsPerSession;
   const isWorkingState = !["SESSION_END", "HANDOVER", "COMPACT"].includes(info.state.state);
   if (isAutoMode && hasTicketsRemaining && isWorkingState) {
     return {
@@ -8904,7 +8916,7 @@ async function handleCancel(root, args) {
         text: [
           "# Cancel Rejected \u2014 Session Still Active",
           "",
-          `You have completed ${info.state.completedTickets.length} ticket(s) with more work remaining.`,
+          `You have completed ${info.state.completedTickets.length} ticket(s) and ${(info.state.resolvedIssues ?? []).length} issue(s) with more work remaining.`,
           "Do NOT cancel an autonomous session due to context size.",
           "If you need to manage context, Claude Code handles compaction automatically.",
           "",
@@ -8972,14 +8984,14 @@ async function handleCancel(root, args) {
   });
   const stashNote = stashPopFailed ? " Auto-stash pop failed \u2014 run `git stash pop` manually." : "";
   return {
-    content: [{ type: "text", text: `Session ${args.sessionId} cancelled. ${written.completedTickets.length} ticket(s) were completed.${stashNote}` }]
+    content: [{ type: "text", text: `Session ${args.sessionId} cancelled. ${written.completedTickets.length} ticket(s) and ${(written.resolvedIssues ?? []).length} issue(s) were completed.${stashNote}` }]
   };
 }
 function guideResult(state, currentState, opts) {
   const summary = {
     ticket: state.ticket ? `${state.ticket.id}: ${state.ticket.title}` : "none",
     risk: state.ticket?.risk ?? "unknown",
-    completed: state.completedTickets.map((t) => t.id),
+    completed: [...state.completedTickets.map((t) => t.id), ...state.resolvedIssues ?? []],
     currentStep: currentState,
     contextPressure: state.contextPressure?.level ?? "low",
     branch: state.git?.branch ?? null
@@ -10087,7 +10099,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.57";
+var version = "0.1.58";
 function tryDiscoverRoot() {
   const envRoot = process.env[ENV_VAR2];
   if (envRoot) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anthropologies/claudestory",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "license": "PolyForm-Noncommercial-1.0.0",
   "description": "An agentic development framework. Track tickets, issues, and progress for your project so every session builds on the last.",
   "homepage": "https://claudestory.com",