aiwcli 0.12.1 → 0.12.3

package/dist/templates/_shared/.claude/commands/handoff.md

@@ -8,6 +8,20 @@ Generate a handoff document summarizing the current session's work, decisions, a
 - `/handoff path/to/PLAN.md` - with plan document integration
 - Phrases like "write a handoff", "create a session summary", "document what we did", "end session with notes"
 
+## Philosophy
+
+Handoffs exist to minimize the token and time cost of session startup. A precise handoff lets the next session hit the ground running without rediscovering context through Explore agents or file searches.
+
+**Think: "What would I need to continue this work with zero prior context?"**
+
+Key principles:
+- **Absolute paths over vague references** — `C:\project\src\auth\handler.ts:45` not "handler.ts line 45"
+- **Specific locations over general areas** — Name the function/class/section, not just the file
+- **Enough detail to skip discovery** — Include enough context that the next session doesn't need to grep or search
+- **Self-contained decisions** — Capture the "why" and the "why not" so alternatives aren't re-explored
+
+A good handoff pays for itself in the first minute of the next session.
+
 ## Arguments
 
 - `$ARGUMENTS` - Optional path to a plan document. If provided, the handoff will:
@@ -17,19 +31,7 @@ Generate a handoff document summarizing the current session's work, decisions, a
 
 ## Process
 
-### Step 1: Get Context ID
-
-Resolve the active context ID programmatically:
-
-```bash
-bun .aiwcli/_shared/scripts/resolve_context.ts
-```
-
-This prints the active context ID to stdout. Use its output as `{context_id}` in subsequent steps.
-
-If the script exits with an error (no active context found), inform the user and stop — handoffs require an active context.
-
-### Step 2: Gather Information
+### Step 1: Gather Information
 
 1. Review conversation history for:
    - Completed tasks and implementations
@@ -37,21 +39,15 @@ If the script exits with an error (no active context found), inform the user and
    - Failed approaches (to avoid repeating)
    - External context (deadlines, stakeholder requirements)
 
-2. Check git status if available:
-   ```bash
-   git status --short
-   git diff --stat
-   ```
-
-3. Look for TODOs/FIXMEs mentioned in session
+2. Look for TODOs/FIXMEs mentioned in session
 
-4. **If plan document provided**: Read the plan and identify:
+3. **If plan document provided**: Read the plan and identify:
    - Tasks that are now completed
    - Tasks that are partially done
    - Tasks that were attempted but blocked
    - New tasks discovered during implementation
 
-### Step 3: Generate Document
+### Step 2: Generate Document
 
 Use this template. The `<!-- SECTION: name -->` markers are required for the save script to parse sections into sharded files.
 
@@ -61,7 +57,6 @@ title: Session Handoff
 date: {ISO timestamp}
 session_id: {conversation ID if available}
 project: {project name from package.json, Cargo.toml, or directory name}
-context_id: {context_id from Step 1}
 plan_document: {path to plan if provided, or "none"}
 ---
 
@@ -69,11 +64,24 @@ plan_document: {path to plan if provided, or "none"}
 
 <!-- SECTION: summary -->
 ## Summary
-{2-3 sentences: what's different now vs. session start}
+{2-3 sentences covering: (1) session goal, (2) what changed technically, (3) current state}
+
+Example: "Session goal: Implement JWT refresh tokens. Added refresh token generation in `C:\project\src\auth\tokens.ts:145-203` and rotation endpoint. Feature works but needs rate-limiting before production (see Pending Issues)."
 
 <!-- SECTION: completed -->
 ## Work Completed
-{Grouped by category if multiple areas. Specific file:function references.}
+
+**Bad (requires exploration):**
+- Fixed auth bug
+- Updated tests
+
+**Good (exploration-free):**
+- Auth: Fixed JWT validation race condition in `C:\project\src\auth\handler.ts:67-89`
+  - Issue: Token validation happened after user session creation → security gap
+  - Fix: Moved validation to middleware, added async lock
+  - Tests updated: `C:\project\tests\auth\handler.test.ts:45` now covers concurrent validation
+
+{Your work completed here, following the "Good" example format with absolute paths}
 
 <!-- SECTION: dead-ends -->
 ## Dead Ends — Do Not Retry
@@ -94,11 +102,11 @@ These approaches were attempted and failed. Do not retry without addressing the
 
 <!-- SECTION: next-steps -->
 ## Next Steps
-1. {Actionable item with file:line reference if applicable}
+1. {Actionable item with absolute path and line number, e.g., C:\path\to\file.ts:123}
 
 <!-- SECTION: files -->
 ## Files Modified
-{Significant changes only. Skip formatting-only edits.}
+{Absolute paths with line numbers for significant changes. Skip formatting-only edits.}
 
 <!-- SECTION: context -->
 ## Context for Future Sessions
@@ -106,7 +114,7 @@ These approaches were attempted and failed. Do not retry without addressing the
 
 ```
 
-### Step 4: Update Plan Document (if provided)
+### Step 3: Update Plan Document (if provided)
 
 If a plan document path was provided in `$ARGUMENTS`:
 
@@ -146,27 +154,17 @@ If a plan document path was provided in `$ARGUMENTS`:
 5. **If no plan document was provided**:
    - Skip plan creation - the handoff document serves as the session record
 
-### Step 5: Save and Update Status
+### Step 4: Save and Update Status
 
 Instead of writing the file directly, pipe your handoff content to the save script:
 
 ```bash
-bun .aiwcli/_shared/scripts/save_handoff.ts "{context_id}" <<'EOF'
-{Your complete handoff markdown content from Step 3}
+bun .aiwcli/_shared/scripts/save_handoff.ts <<'EOF'
+{Your complete handoff markdown content from Step 2}
 EOF
 ```
 
-This script:
-1. Creates a folder at `_output/contexts/{context_id}/handoffs/{YYYY-MM-DD-HHMM}/`
-2. Parses sections and writes sharded files (index.md, completed-work.md, dead-ends.md, etc.)
-3. Copies the current plan (if any) to plan.md
-4. Sets `handoff_path` to the index.md path and `handoff_consumed = false` in state.json
-5. Mode stays `active` — staging happens later via session_end hook
-
-When the session ends, `session_end.ts` stages `active → has_handoff` (if handoff_path
-exists and handoff_consumed is false). On next `/clear`, `session_start.ts` picks up the
-`has_handoff` state, binds the new session, transitions to `active`, and injects the
-handoff content via `formatHandoffContinuation()`.
+The script will automatically find the active context and create the handoff folder structure.
 
 ## Dead Ends Section Guidelines
 
@@ -194,39 +192,7 @@ This section is critical for preventing context rot across sessions. Be specific
 
 ## Post-Generation Output
 
-After creating file, output:
-
-```
-✓ Created handoff folder: _output/contexts/{context_id}/handoffs/{YYYY-MM-DD-HHMM}/
-  - index.md (entry point with navigation)
-  - completed-work.md, dead-ends.md, decisions.md, pending.md, context.md
-  - plan.md (copy of current plan, if any)
-
-To continue next session:
-  Automatic: Handoff restored on next /clear via session_start hook.
-  Manual: Use /handoff-resume to explicitly load handoff context at any time.
-  Read dead-ends.md first to avoid repeating failed approaches.
-
-⚠️  {N} dead ends documented — avoid re-attempting these approaches
-```
-
-If plan was updated:
-```
-✓ Updated plan document: {path}
-   - {N} items marked complete
-   - {N} items partially complete
-   - {N} new items added
-```
-
-## Success Criteria
-
-- [ ] Handoff folder created at `handoffs/{YYYY-MM-DD-HHMM}/`
-- [ ] index.md contains summary and navigation table
-- [ ] All section files created (completed-work.md, dead-ends.md, etc.)
-- [ ] Dead ends use structured table format for quick scanning
-- [ ] plan.md copied from context if plan exists
-- [ ] Next steps are actionable with file references
-- [ ] Git status included in index.md
-- [ ] If plan provided: checkboxes updated to reflect completion status
-- [ ] If plan provided: Session Progress Log appended
-- [ ] State has handoff_path set and handoff_consumed = false
+After saving, confirm:
+- Handoff folder location
+- Number of dead ends documented (if any)
+- Plan update summary (if plan was provided)

package/dist/templates/_shared/hooks-ts/session_end.ts

@@ -3,20 +3,19 @@
  * SessionEnd hook: Save session state, assign plan fields (fallback),
  * stage has_plan/has_handoff for next session.
  */
-import * as crypto from "node:crypto";
 import * as fs from "node:fs";
-import * as path from "node:path";
-
-import { getProjectRoot, getContextDir } from "../lib-ts/base/constants.js";
-import { getGitState } from "../lib-ts/base/git-state.js";
+import * as crypto from "node:crypto";
+import * as path from "node:path";
 import {
   loadHookInput, runHook, logDebug, logInfo, logWarn, logError, logDiagnostic,
 } from "../lib-ts/base/hook-utils.js";
+import { getProjectRoot, getContextDir } from "../lib-ts/base/constants.js";
 import { nowIso } from "../lib-ts/base/utils.js";
 import { getContextBySessionId, saveState } from "../lib-ts/context/context-store.js";
 import {
   findLatestPlan, normalizePlanContent, generatePlanId, extractPlanAnchors,
 } from "../lib-ts/context/plan-manager.js";
+import { getGitState } from "../lib-ts/base/git-state.js";
 
 /**
  * Archive session transcript to context's session-transcripts/ folder.
@@ -63,8 +62,8 @@ function archiveTranscript(
   try {
     fs.copyFileSync(transcriptPath, archivePath);
     return archivePath;
-  } catch (error) {
-    logError("session_end", `Failed to copy transcript: ${error}`);
+  } catch (e) {
+    logError("session_end", `Failed to copy transcript: ${e}`);
     return null;
   }
 }
@@ -116,8 +115,8 @@ function main(): void {
       if (archived) {
         logInfo("session_end", `Archived transcript: ${path.basename(archived)}`);
       }
-    } catch (error) {
-      logError("session_end", `Transcript archival failed: ${error}`);
+    } catch (e) {
+      logError("session_end", `Transcript archival failed: ${e}`);
     }
   }
 
@@ -146,12 +145,18 @@ function main(): void {
           state.plan_consumed = state.plan_consumed || false;
 
           logInfo("session_end", `Assigned plan fallback: hash=${planHash}, path=${latestPlanPath}`);
-        } catch (error) {
-          logError("session_end", `Failed to read plan: ${error}`);
+        } catch (e) {
+          logError("session_end", `Failed to read plan: ${e}`);
         }
       }
     }
 
+    // NEW PLAN DETECTION: If plan_hash differs from last consumed hash, reset consumed flag
+    if (state.plan_hash && state.plan_hash_consumed && state.plan_hash !== state.plan_hash_consumed) {
+      logInfo("session_end", `New plan detected: ${state.plan_hash} != ${state.plan_hash_consumed}, resetting plan_consumed`);
+      state.plan_consumed = false;
+    }
+
     // Step 2: Stage has_plan if conditions met
     if (state.plan_hash && state.mode === "active" && !state.plan_consumed) {
       state.mode = "has_plan";

package/dist/templates/_shared/hooks-ts/session_start.ts

@@ -3,17 +3,18 @@
  * SessionStart hook: Restore context after /clear (plan/handoff) or compaction.
  * Routes by source field to appropriate handler.
  */
-import { getProjectRoot } from "../lib-ts/base/constants.js";
 import {
   loadHookInput, emitContext, runHook, runHookAsync,
   logDebug, logInfo, logError, logDiagnostic,
 } from "../lib-ts/base/hook-utils.js";
-import {
-  buildRestoreSections, formatHandoffContinuation, getModeDisplay,
-} from "../lib-ts/context/context-formatter.js";
+import { getProjectRoot } from "../lib-ts/base/constants.js";
 import {
   getContextBySessionId, getAllContexts, bindSession, updateMode,
 } from "../lib-ts/context/context-store.js";
+import {
+  buildRestoreSections, formatHandoffContinuation, getModeDisplay,
+  buildContextInventory,
+} from "../lib-ts/context/context-formatter.js";
 import type { ContextState } from "../lib-ts/types.js";
 
 /**
@@ -39,6 +40,9 @@ function handleCompactRestore(sessionId: string, projectRoot: string): void {
   const restore = buildRestoreSections(state, projectRoot, true);
   if (restore) sections.push(restore);
 
+  const inventory = buildContextInventory(state, projectRoot);
+  if (inventory) sections.push("", inventory);
+
   sections.push(
     "",
     "---",
@@ -63,7 +67,10 @@ async function handleClearRestore(sessionId: string, projectRoot: string): Promi
     const ctx = hasPlan[0]!;
 
     bindSession(ctx.id, sessionId, projectRoot);
-    updateMode(ctx.id, "active", projectRoot, { plan_consumed: true });
+    updateMode(ctx.id, "active", projectRoot, {
+      plan_consumed: true,
+      plan_hash_consumed: ctx.plan_hash  // Track which hash was consumed
+    });
 
     logInfo("session_start", `Clear restore: ${ctx.id} has_plan → active (plan_consumed=true)`);
 
@@ -79,6 +86,9 @@ async function handleClearRestore(sessionId: string, projectRoot: string): Promi
     const restore = buildRestoreSections(ctx, projectRoot, false);
     if (restore) sections.push(restore);
 
+    const inventory = buildContextInventory(ctx, projectRoot);
+    if (inventory) sections.push("", inventory);
+
     sections.push(
       "",
       "---",
@@ -100,7 +110,9 @@ async function handleClearRestore(sessionId: string, projectRoot: string): Promi
     logInfo("session_start", `Clear restore: ${ctx.id} has_handoff → active (handoff_consumed=true)`);
 
     const handoffContent = formatHandoffContinuation(ctx, projectRoot);
-    emitContext(handoffContent);
+    const handoffInventory = buildContextInventory(ctx, projectRoot);
+    const combined = handoffInventory ? handoffContent + "\n\n" + handoffInventory : handoffContent;
+    emitContext(combined);
     return;
   }
 
@@ -124,18 +136,15 @@ async function main(): Promise<void> {
   logDiagnostic("session_start", "entry", `source=${source}, session=${sessionId}`);
 
   switch (source) {
-    case "clear": {
-      await handleClearRestore(sessionId, projectRoot);
-      break;
-    }
-    case "compact": {
+    case "compact":
       handleCompactRestore(sessionId, projectRoot);
-      break;
-    }
-    default: {
+      break;
+    case "clear":
+      await handleClearRestore(sessionId, projectRoot);
+      break;
+    default:
       logDebug("session_start", `Unhandled source: ${source}`);
-      break;
-    }
+      break;
   }
 }
 

package/dist/templates/_shared/hooks-ts/user_prompt_submit.ts

@@ -6,14 +6,15 @@
  * Uses emitContext() for output — context text is passed via hookSpecificOutput JSON.
  * Catches BlockRequest and uses emitBlock() to block the prompt.
  */
-import { getProjectRoot } from "../lib-ts/base/constants.js";
 import {
   loadHookInput, runHookAsync, logDebug, logInfo, logWarn, logBlocking, logDiagnostic, hookLog, emitContext, emitBlock,
 } from "../lib-ts/base/hook-utils.js";
-import { determineContext, BlockRequest } from "../lib-ts/context/context-selector.js";
+import { getProjectRoot } from "../lib-ts/base/constants.js";
 import {
   getContextBySessionId, bindSession, maybeActivate, saveState,
 } from "../lib-ts/context/context-store.js";
+import { determineContext, BlockRequest } from "../lib-ts/context/context-selector.js";
+import { buildContextInventory } from "../lib-ts/context/context-formatter.js";
 
 async function asyncMain(): Promise<void> {
   const payload = loadHookInput();
@@ -38,8 +39,8 @@ async function asyncMain(): Promise<void> {
     // Returning user — context already bound (stderr: false to avoid "hook error" display)
     try {
       maybeActivate(existingCtx.id, permissionMode, projectRoot, "user_prompt_submit");
-    } catch (error) {
-      hookLog("warn", "user_prompt_submit", `maybeActivate failed (non-critical): ${error}`, { stderr: false });
+    } catch (e) {
+      hookLog("warn", "user_prompt_submit", `maybeActivate failed (non-critical): ${e}`, { stderr: false });
     }
     hookLog("debug", "user_prompt_submit", `Session bound to ${existingCtx.id}`, { stderr: false });
   } else if (prompt) {
@@ -64,12 +65,23 @@ async function asyncMain(): Promise<void> {
       if (outputText) {
         outputs.push(outputText);
       }
-    } catch (error) {
-      if (error instanceof BlockRequest) {
-        emitBlock((error as Error).message);
+
+      // Append context folder inventory
+      try {
+        const boundState = getContextBySessionId(sessionId, projectRoot);
+        if (boundState) {
+          const inventory = buildContextInventory(boundState, projectRoot);
+          if (inventory) outputs.push(inventory);
+        }
+      } catch (e) {
+        logWarn("user_prompt_submit", `Inventory failed (non-critical): ${e}`);
+      }
+    } catch (e) {
+      if (e instanceof BlockRequest) {
+        emitBlock((e as Error).message);
         return;
       }
-      throw error; // Re-throw unexpected errors
+      throw e; // Re-throw unexpected errors
     }
   }
 

package/dist/templates/_shared/lib-ts/base/inference.ts

@@ -5,11 +5,10 @@
  */
 
 import { execFileSync } from "node:child_process";
-
 import { logDebug, logWarn } from "./logger.js";
 import { STOP_WORDS } from "./stop-words.js";
-import { cleanTextForSlug } from "./utils.js";
 import type { InferenceResult } from "../types.js";
+import { execFileAsync, getInternalSubprocessEnv, shellQuoteWin } from "./subprocess-utils.js";
 
 // Model configurations §6.1
 const MODELS: Record<string, string> = {
@@ -35,8 +34,8 @@ export function inference(
   timeout?: number,
 ): InferenceResult {
   const startTime = Date.now();
-  const model = MODELS[level] ?? MODELS["fast"] ?? "claude-3-haiku-20240307";
-  const timeoutSec = timeout ?? TIMEOUTS[level] ?? 15;
+  const model = MODELS[level] ?? MODELS.fast;
+  const timeoutSec = timeout ?? TIMEOUTS[level] ?? TIMEOUTS.fast;
   const fullPrompt = `${systemPrompt}\n\n${userPrompt}`;
 
   // Remove ANTHROPIC_API_KEY to force subscription auth
@@ -45,6 +44,8 @@ export function inference(
 
   try {
     const isWin = process.platform === "win32";
+    let stdout: string;
+
     // On Windows with shell:true, Node.js sets windowsVerbatimArguments —
     // args are joined with spaces, NOT individually quoted. We must manually
     // wrap multi-word/special-char args in "..." for cmd.exe parsing.
@@ -52,10 +53,10 @@ export function inference(
     const empty = isWin ? '""' : "";
     let promptArg = fullPrompt;
     if (isWin) {
-      promptArg = '"' + fullPrompt.replaceAll(/\r?\n/g, " ").replaceAll('"', '""') + '"';
+      promptArg = '"' + fullPrompt.replace(/\r?\n/g, " ").replace(/"/g, '""') + '"';
     }
 
-    const stdout = execFileSync(
+    stdout = execFileSync(
       "claude",
       ["--model", model, "--print", "--setting-sources", empty, "-p", promptArg],
       {
@@ -73,10 +74,10 @@ export function inference(
       output: stdout.trim(),
       latency_ms: latencyMs,
     };
-  } catch (error: any) {
+  } catch (e: any) {
     const latencyMs = Date.now() - startTime;
 
-    if (error.code === "ETIMEDOUT" || error.killed) {
+    if (e.code === "ETIMEDOUT" || e.killed) {
       return {
         success: false,
         output: "",
@@ -85,7 +86,7 @@ export function inference(
       };
     }
 
-    if (error.code === "ENOENT") {
+    if (e.code === "ENOENT") {
       return {
         success: false,
         output: "",
@@ -95,11 +96,11 @@ export function inference(
     }
 
     // Non-zero exit code
-    if (error.status !== undefined && error.status !== 0) {
+    if (e.status !== undefined && e.status !== 0) {
       return {
         success: false,
-        output: (error.stdout ?? "").toString().trim(),
-        error: (error.stderr ?? "").toString().trim() || `Exit code: ${error.status}`,
+        output: (e.stdout ?? "").toString().trim(),
+        error: (e.stderr ?? "").toString().trim() || `Exit code: ${e.status}`,
         latency_ms: latencyMs,
       };
     }
@@ -107,7 +108,7 @@ export function inference(
     return {
       success: false,
       output: "",
-      error: String(error),
+      error: String(e),
       latency_ms: latencyMs,
     };
   }
@@ -133,13 +134,13 @@ Output ONLY the keywords separated by spaces, nothing else.`;
 export function generateSemanticSummary(
   prompt: string,
   timeout = 15,
-): null | string {
+): string | null {
   const result = inference(CONTEXT_ID_SYSTEM_PROMPT, prompt, "standard", timeout);
 
   if (!result.success || !result.output) return null;
 
   let summary = result.output.trim();
-  summary = summary.replaceAll(/^["']+|["']+$/g, "");
+  summary = summary.replace(/^["']+|["']+$/g, "");
   summary = summary.replace(/[.!?]+$/, "");
 
   // Filter stop words
@@ -194,7 +195,7 @@ Respond with ONLY a JSON object: {"slug": "your 8-12 word phrase here"}`;
 export function generateContextIdSlug(
   prompt: string,
   timeout = 3,
-): null | string {
+): string | null {
   const truncated = prompt.slice(0, 500);
 
   const result = inference(CONTEXT_ID_SLUG_PROMPT, truncated, "fast", timeout);
@@ -207,7 +208,7 @@ export function generateContextIdSlug(
   const raw = result.output.trim();
 
   // Parse JSON response, fall back to raw text
-  let slug: null | string = null;
+  let slug: string | null = null;
   try {
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed === "object" && "slug" in parsed) {
@@ -220,11 +221,11 @@ export function generateContextIdSlug(
   if (!slug) slug = raw;
 
   // Clean up
-  slug = slug.replaceAll(/^["'`]+|["'`]+$/g, "");
+  slug = slug.replace(/^["'`]+|["'`]+$/g, "");
   slug = slug.replace(/[.!?]+$/, "");
-  slug = slug.replaceAll('-', " ");
-  slug = slug.replaceAll(/[^a-zA-Z0-9 ]/g, "");
-  slug = slug.replaceAll(/\s+/g, " ").trim();
+  slug = slug.replace(/-/g, " ");
+  slug = slug.replace(/[^a-zA-Z0-9 ]/g, "");
+  slug = slug.replace(/\s+/g, " ").trim();
 
   const words = slug.split(" ");
 
@@ -239,13 +240,61 @@ export function generateContextIdSlug(
   return resultSlug;
 }
 
+/**
+ * Async version of inference() that does NOT block the event loop.
+ * Use for parallel AI calls (e.g., Stage 3 parallel summarizers).
+ * Uses execFileAsync and getInternalSubprocessEnv for proper subprocess isolation.
+ */
+export async function inferenceAsync(
+  systemPrompt: string,
+  userPrompt: string,
+  level = "fast",
+  timeout?: number,
+): Promise<InferenceResult> {
+  const startTime = Date.now();
+  const model = (level in MODELS ? MODELS[level] : undefined) ?? MODELS.fast;
+  const timeoutSec = timeout ?? (level in TIMEOUTS ? TIMEOUTS[level] : undefined) ?? TIMEOUTS.fast;
+  const timeoutMs = timeoutSec * 1000;
+  const fullPrompt = `${systemPrompt}\n\n${userPrompt}`;
+
+  const env = getInternalSubprocessEnv();
+  delete env.ANTHROPIC_API_KEY;
+
+  const isWin = process.platform === "win32";
+  const empty = isWin ? '""' : "";
+  const promptArg = isWin
+    ? shellQuoteWin(fullPrompt.replace(/\r?\n/g, " "))
+    : fullPrompt;
+
+  const result = await execFileAsync(
+    "claude",
+    ["--model", model, "--print", "--setting-sources", empty, "-p", promptArg],
+    { timeout: timeoutMs, env, shell: isWin },
+  );
+
+  const latencyMs = Date.now() - startTime;
+
+  if (result.killed) {
+    return { success: false, output: "", error: `Timeout after ${timeoutSec}s`, latency_ms: latencyMs };
+  }
+  if (result.exitCode !== 0) {
+    return {
+      success: false,
+      output: result.stdout.trim(),
+      error: result.stderr.trim() || `Exit code: ${result.exitCode}`,
+      latency_ms: latencyMs,
+    };
+  }
+  return { success: true, output: result.stdout.trim(), latency_ms: latencyMs };
+}
+
 /**
  * Filter stop words from text.
  * See SPEC.md §6.4
  */
 function filterStopWords(text: string): string {
-  const cleaned = cleanTextForSlug(text);
-  return cleaned
+  return text
+    .toLowerCase()
     .split(/\s+/)
     .filter((w) => !STOP_WORDS.has(w) && w.length > 1)
     .join(" ");

package/dist/templates/_shared/lib-ts/base/state-io.ts

@@ -6,9 +6,8 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-
-import { atomicWrite } from "./atomic-write.js";
 import { getContextDir } from "./constants.js";
+import { atomicWrite } from "./atomic-write.js";
 import { logWarn } from "./logger.js";
 import type { ContextState, Mode } from "../types.js";
 
@@ -31,7 +30,6 @@ export function toDict(state: ContextState): Record<string, unknown> {
       result[key] = value;
     }
   }
-
   return result;
 }
 
@@ -54,11 +52,11 @@ export function readStateJson(
   if (!fs.existsSync(sp)) return null;
 
   try {
-    const raw = fs.readFileSync(sp, "utf8");
+    const raw = fs.readFileSync(sp, "utf-8");
     const data = JSON.parse(raw) as Record<string, any>;
     return dictToState(data);
-  } catch (error: any) {
-    logWarn("state_io", `Failed to read state.json for '${contextId}': ${error}`);
+  } catch (e: any) {
+    logWarn("state_io", `Failed to read state.json for '${contextId}': ${e}`);
     return null;
   }
 }
@@ -71,7 +69,7 @@ export function writeStateJson(
   contextId: string,
   state: ContextState,
   projectRoot?: string,
-): [boolean, null | string] {
+): [boolean, string | null] {
   const sp = statePath(contextId, projectRoot);
   const dir = path.dirname(sp);
   fs.mkdirSync(dir, { recursive: true });
@@ -112,6 +110,13 @@ export function dictToState(data: Record<string, any>): ContextState {
   if ("handoff_path" in data) state.handoff_path = data.handoff_path;
   if ("last_session" in data) state.last_session = data.last_session;
 
+  // Migration: plan_hash_consumed (added in multi-plan context fix)
+  if ("plan_hash_consumed" in data) {
+    state.plan_hash_consumed = data.plan_hash_consumed;
+  } else {
+    state.plan_hash_consumed = null;  // Default for old contexts
+  }
+
   // Preserve method-specific extension data (e.g., cc_native) that isn't
   // part of the core ContextState interface. Without this, round-trip
   // read→write cycles silently drop extension fields.