aiwcli 0.10.3 → 0.11.1

package/dist/templates/_shared/lib-ts/context/context-selector.ts

@@ -14,29 +14,30 @@
  */
 
 import * as crypto from "node:crypto";
-import {
-  getContext,
-  getAllContexts,
-  getContextBySessionId,
-  createContextFromPrompt,
-  createContext,
-  completeContext,
-  bindSession,
-  updateMode,
-} from "./context-store.js";
+
 import {
   formatActiveContextReminder,
+  formatActiveContinuation as _formatActiveContinuation,
+  formatCommandFeedback,
   formatContextCreated,
   formatContextPickerStderr,
-  formatCommandFeedback,
   formatHandoffContinuation,
   formatPlanContinuation,
-  formatActiveContinuation,
 } from "./context-formatter.js";
+import {
+  bindSession,
+  completeContext,
+  createContext,
+  createContextFromPrompt,
+  getAllContexts,
+  getContext,
+  getContextBySessionId,
+  updateMode,
+} from "./context-store.js";
 import { normalizePlanContent } from "./plan-manager.js";
+import { logDebug, logError, logInfo, logWarn as _logWarn } from "../base/logger.js";
 import { isInternalCall } from "../base/subprocess-utils.js";
-import { logDebug, logInfo, logWarn, logError } from "../base/logger.js";
-import type { ContextState, CaretCommand } from "../types.js";
+import type { CaretCommand, ContextState } from "../types.js";
 
 /** Minimum characters required for new context description. */
 const MIN_NEW_CONTEXT_CHARS = 10;
@@ -65,7 +66,7 @@ export class BlockRequest extends Error {
 export function resolveContextByPrefix(
   query: string,
   contexts: ContextState[],
-): [number | null, string | null] {
+): [null | number, null | string] {
   const q = query.toLowerCase();
   const available = contexts.map(c => c.id).join(", ");
 
@@ -107,7 +108,7 @@ export function resolveContextByPrefix(
 export function parseChainedCaret(
   prompt: string,
   contexts: ContextState[],
-): [CaretCommand | null, string | null] {
+): [CaretCommand | null, null | string] {
   if (!prompt.startsWith("^")) return [null, null];
 
   const match = prompt.match(/^\^(\S+)(?:\s+(.*))?$/s);
@@ -120,7 +121,7 @@ export function parseChainedCaret(
 
   // ^N shorthand
   if (/^\d+$/.test(commandStr)) {
-    const num = parseInt(commandStr, 10);
+    const num = Number.parseInt(commandStr, 10);
     if (num === 0) {
       if (remaining.length < MIN_NEW_CONTEXT_CHARS) {
         return [null,
@@ -130,21 +131,25 @@ export function parseChainedCaret(
           `Example: ^0 implement user authentication with JWT tokens`,
         ];
       }
+
       return [{ ends: [], select: null, new_context_desc: remaining, remaining_prompt: "" }, null];
     }
+
     if (num < 1 || num > contexts.length) {
       if (contexts.length === 0) {
         return [null, "No existing contexts. Use ^0 <description> to create a new one."];
       }
+
       return [null, `Invalid selection. Choose 1-${contexts.length} for existing contexts, or ^0 for new.`];
     }
+
     const ctx = contexts[num - 1]!;
     return [{ ends: [], select: ctx.id, new_context_desc: null, remaining_prompt: remaining }, null];
   }
 
   // Parse chained commands
   const ends: string[] = [];
-  let select: string | null = null;
+  let select: null | string = null;
   let pos = 0;
 
   while (pos < commandStr.length) {
@@ -174,11 +179,13 @@ export function parseChainedCaret(
         if (numStart === pos) {
           return [null, `Expected number, '*', or ':prefix' after 'E' at position ${numStart + 1}`];
         }
-        const num = parseInt(commandStr.slice(numStart, pos), 10);
+
+        const num = Number.parseInt(commandStr.slice(numStart, pos), 10);
         if (num < 1 || num > contexts.length) {
           if (contexts.length === 0) return [null, "No contexts to end."];
           return [null, `Context ^E${num} invalid. Choose 1-${contexts.length}.`];
         }
+
         if (pos < commandStr.length && commandStr[pos] === "+") {
           pos++;
           for (let i = num; i <= contexts.length; i++) {
@@ -208,13 +215,16 @@ export function parseChainedCaret(
         if (numStart === pos) {
           return [null, `Expected number or ':prefix' after 'S' at position ${numStart + 1}`];
         }
-        const num = parseInt(commandStr.slice(numStart, pos), 10);
+
+        const num = Number.parseInt(commandStr.slice(numStart, pos), 10);
         if (num < 1 || num > contexts.length) {
           if (contexts.length === 0) return [null, "No contexts to select."];
           return [null, `Context ^S${num} invalid. Choose 1-${contexts.length}.`];
         }
+
         ctx = contexts[num - 1]!;
       }
+
       if (select === null) select = ctx.id;
     } else {
       return [null,
@@ -274,9 +284,9 @@ function matchPlanContent(prompt: string, hasPlanContexts: ContextState[]): Cont
   }
 
   // Tier 4 (legacy): Signature match
-  const promptHead = prompt.slice(0, 500);
+  const promptHead = new Set(prompt.slice(0, 500));
   for (const ctx of hasPlanContexts) {
-    if (ctx.plan_signature && promptHead.includes(ctx.plan_signature)) {
+    if (ctx.plan_signature && promptHead.has(ctx.plan_signature)) {
       logDebug("context_selector", `Tier 4 legacy signature match: ${ctx.id}`);
       return ctx;
     }
@@ -292,15 +302,15 @@ function matchPlanContent(prompt: string, hasPlanContexts: ContextState[]): Cont
 function createNewContext(
   prompt: string,
   projectRoot?: string,
-): [string | null, string, string | null] {
+): [null | string, string, null | string] {
   try {
     const newCtx = createContextFromPrompt(prompt, projectRoot);
     updateMode(newCtx.id, "active", projectRoot);
     newCtx.mode = "active";
     logInfo("context_selector", `Auto-created context: ${newCtx.id}`);
     return [newCtx.id, "auto_created", formatContextCreated(newCtx)];
-  } catch (e: any) {
-    logError("context_selector", `Primary context creation failed: ${e}`);
+  } catch (error: any) {
+    logError("context_selector", `Primary context creation failed: ${error}`);
     try {
       const now = new Date();
       const yy = String(now.getFullYear()).slice(2);
@@ -320,8 +330,8 @@ function createNewContext(
       newCtx.mode = "active";
       logInfo("context_selector", `Fallback context created: ${newCtx.id}`);
       return [newCtx.id, "auto_created_fallback", formatContextCreated(newCtx)];
-    } catch (e2: any) {
-      logError("context_selector", `ALL context creation failed: ${e2}`);
+    } catch (error: any) {
+      logError("context_selector", `ALL context creation failed: ${error}`);
       return [null, "creation_failed", null];
     }
   }
@@ -335,7 +345,7 @@ function handleCaretCommand(
   prompt: string,
   contexts: ContextState[],
   projectRoot?: string,
-): [string | null, string, string | null] {
+): [null | string, string, null | string] {
   if (contexts.length === 0) {
     const match = prompt.match(/^\^(\S+)(?:\s+(.*))?$/s);
     if (!match) {
@@ -344,14 +354,16 @@ function handleCaretCommand(
         "Example: ^0 implement user authentication system",
       );
     }
+
     const prefixValue = match[1]!;
     const remaining = match[2] ?? "";
-    if (!/^\d+$/.test(prefixValue) || parseInt(prefixValue, 10) !== 0) {
+    if (!/^\d+$/.test(prefixValue) || Number.parseInt(prefixValue, 10) !== 0) {
       throw new BlockRequest(
         "No existing contexts to select. Use ^0 <description> to create a new context.\n" +
         "Example: ^0 implement user authentication system",
       );
     }
+
     const description = remaining.trim();
     if (description.length < MIN_NEW_CONTEXT_CHARS) {
       throw new BlockRequest(
@@ -361,6 +373,7 @@ function handleCaretCommand(
         `Example: ^0 implement user authentication with JWT tokens`,
       );
     }
+
     return createNewContext(description, projectRoot);
   }
 
@@ -374,6 +387,7 @@ function handleCaretCommand(
     if (!ctxToEnd) {
       throw new BlockRequest(`Context '${ctxId}' no longer exists.\n` + formatContextPickerStderr(contexts));
     }
+
     completeContext(ctxToEnd.id, projectRoot);
     endedContexts.push(ctxToEnd);
     logInfo("context_selector", `Ended context: ${ctxToEnd.id}`);
@@ -384,9 +398,10 @@ function handleCaretCommand(
     if (ctxId && endedContexts.length > 0) {
       const newCtx = getContext(ctxId, projectRoot);
       const feedback = formatCommandFeedback(endedContexts, newCtx);
-      return [ctxId, method !== "creation_failed" ? "caret_new" : method, feedback];
+      return [ctxId, method === "creation_failed" ? method : "caret_new", feedback];
     }
-    return [ctxId, method !== "creation_failed" ? "caret_new" : method, output];
+
+    return [ctxId, method === "creation_failed" ? method : "caret_new", output];
   }
 
   if (cmd.select) {
@@ -394,6 +409,7 @@ function handleCaretCommand(
     if (!selectedCtx) {
       throw new BlockRequest(`Context '${cmd.select}' no longer exists.\n` + formatContextPickerStderr(contexts));
     }
+
     logInfo("context_selector", `Caret-selected context: ${selectedCtx.id}`);
     return [selectedCtx.id, "caret_select", formatCommandFeedback(endedContexts, selectedCtx)];
   }
@@ -408,6 +424,7 @@ function handleCaretCommand(
         "Example: implement user authentication system",
       );
     }
+
     throw new BlockRequest(
       feedback + "\nNo context selected.\n\nSelect a context to continue:\n" +
       formatContextPickerStderr(remainingContexts),
@@ -432,7 +449,7 @@ export function determineContext(
   prompt: string,
   sessionId?: string,
   projectRoot?: string,
-): [string | null, string, string | null] {
+): [null | string, string, null | string] {
   if (isInternalCall()) {
     logDebug("context_selector", "Skipping: internal subprocess call");
     return [null, "skip_internal", null];
@@ -460,6 +477,7 @@ export function determineContext(
         "Example: implement user authentication system",
       );
     }
+
     throw new BlockRequest(formatContextPickerStderr(contexts));
   }
 

package/dist/templates/_shared/lib-ts/context/context-store.ts

@@ -9,20 +9,21 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { readStateJson, writeStateJson, toDict, dictToState } from "../base/state-io.js";
+
 import { atomicWrite } from "../base/atomic-write.js";
 import {
+  getArchiveContextDir,
+  getArchiveDir,
+  getArchiveIndexPath,
   getContextDir,
   getContextsDir,
   getIndexPath,
-  getArchiveDir,
-  getArchiveContextDir,
-  getArchiveIndexPath,
   validateContextId,
 } from "../base/constants.js";
-import { logDebug, logInfo, logWarn, logError, setContextPath } from "../base/logger.js";
-import { nowIso, generateContextId } from "../base/utils.js";
-import type { ContextState, IndexFile, IndexEntry, Mode } from "../types.js";
+import { logDebug as _logDebug, logError, logInfo, logWarn, setContextPath } from "../base/logger.js";
+import { dictToState as _dictToState, readStateJson, toDict as _toDict, writeStateJson } from "../base/state-io.js";
+import { generateContextId, nowIso } from "../base/utils.js";
+import type { ContextState, IndexEntry, IndexFile, Mode } from "../types.js";
 
 const INDEX_VERSION = "3.0";
 
@@ -34,12 +35,13 @@ function loadIndex(projectRoot?: string): IndexFile {
   const indexPath = getIndexPath(projectRoot);
   if (fs.existsSync(indexPath)) {
     try {
-      const raw = fs.readFileSync(indexPath, "utf-8");
+      const raw = fs.readFileSync(indexPath, "utf8");
       return JSON.parse(raw) as IndexFile;
-    } catch (e: any) {
-      logWarn("context_store", `Failed to read index, recreating: ${e}`);
+    } catch (error: any) {
+      logWarn("context_store", `Failed to read index, recreating: ${error}`);
     }
   }
+
   return { version: INDEX_VERSION, updated_at: nowIso(), sessions: {}, contexts: {} };
 }
 
@@ -50,6 +52,7 @@ function saveIndex(index: IndexFile, projectRoot?: string): boolean {
   if (!success) {
     logWarn("context_store", `Failed to write index: ${error}`);
   }
+
   return success;
 }
 
@@ -69,7 +72,7 @@ function migrateContextJson(contextId: string, projectRoot?: string): ContextSta
   if (!fs.existsSync(legacyPath)) return null;
 
   try {
-    const data = JSON.parse(fs.readFileSync(legacyPath, "utf-8"));
+    const data = JSON.parse(fs.readFileSync(legacyPath, "utf8"));
     const inFlight = data.in_flight ?? {};
     const oldMode = inFlight.mode ?? "none";
     const MODE_MIGRATION: Record<string, string> = {
@@ -104,8 +107,8 @@ function migrateContextJson(contextId: string, projectRoot?: string): ContextSta
       last_session: null,
       tasks: [],
     };
-  } catch (e: any) {
-    logWarn("context_store", `Failed to migrate context.json for '${contextId}': ${e}`);
+  } catch (error: any) {
+    logWarn("context_store", `Failed to migrate context.json for '${contextId}': ${error}`);
     return null;
   }
 }
@@ -134,7 +137,7 @@ export function saveState(
   contextId: string,
   state: ContextState,
   projectRoot?: string,
-): [boolean, string | null] {
+): [boolean, null | string] {
   // Ensure the state ID matches
   state.id = contextId;
 
@@ -152,10 +155,12 @@ export function saveState(
     if (!index.sessions) index.sessions = {} as Record<string, string>;
     index.sessions[sid] = contextId;
   }
+
   const indexOk = saveIndex(index, projectRoot);
   if (!indexOk) {
     return [true, "state.json saved but index.json update failed"];
   }
+
   return [true, null];
 }
 
@@ -165,7 +170,7 @@ export function saveState(
  * See SPEC.md §7.4
  */
 export function createContext(
-  contextId: string | null,
+  contextId: null | string,
   summary: string,
   method = "",
   projectRoot?: string,
@@ -185,23 +190,8 @@ export function createContext(
         } catch { /* ignore */ }
       }
     }
-    // generateContextId is async but we need sync here — use a simple fallback
-    const now = new Date();
-    const yy = String(now.getFullYear()).slice(2);
-    const mm = String(now.getMonth() + 1).padStart(2, "0");
-    const dd = String(now.getDate()).padStart(2, "0");
-    const hh = String(now.getHours()).padStart(2, "0");
-    const min = String(now.getMinutes()).padStart(2, "0");
-    const timestamp = `${yy}${mm}${dd}-${hh}${min}`;
-    const words = summary.toLowerCase().split(/\s+/).filter(w => w.length > 2).slice(0, 6);
-    const slug = words.length > 0 ? words.join("-").replace(/[^a-z0-9-]/g, "").slice(0, 50) : "context";
-    contextId = `${timestamp}-${slug}`;
-
-    if (existingIds.has(contextId)) {
-      let counter = 2;
-      while (existingIds.has(`${contextId}-${counter}`)) counter++;
-      contextId = `${contextId}-${counter}`;
-    }
+
+    contextId = generateContextId(summary, existingIds);
   }
 
   contextId = validateContextId(contextId);
@@ -251,6 +241,7 @@ export function getContext(contextId: string, projectRoot?: string): ContextStat
   } catch {
     return null;
   }
+
   return loadState(contextId, projectRoot);
 }
 
@@ -288,6 +279,7 @@ export function getAllContexts(
         try {
           if (!fs.statSync(fullPath).isDirectory()) continue;
         } catch { continue; }
+
         const state = loadState(entry, projectRoot);
         if (state && (!status || state.status === status)) {
           results.push(state);
@@ -306,7 +298,7 @@ export function getAllContexts(
  */
 export function updateContext(
   contextId: string,
-  updates: Partial<Pick<ContextState, "summary" | "tags" | "method">>,
+  updates: Partial<Pick<ContextState, "method" | "summary" | "tags">>,
   projectRoot?: string,
 ): ContextState | null {
   const state = getContext(contextId, projectRoot);
@@ -356,6 +348,7 @@ export function getContextBySessionId(
       return state;
     }
   }
+
   return null;
 }
 
@@ -387,6 +380,7 @@ export function bindSession(
   if (!state.session_ids.includes(sessionId)) {
     state.session_ids.push(sessionId);
   }
+
   state.last_active = nowIso();
 
   const [success] = saveState(contextId, state, projectRoot);
@@ -402,13 +396,13 @@ export function updateMode(
   mode: Mode,
   projectRoot?: string,
   opts?: {
-    plan_path?: string;
-    plan_hash?: string;
-    plan_signature?: string;
-    plan_id?: string;
+    handoff_consumed?: boolean;
     plan_anchors?: string[];
     plan_consumed?: boolean;
-    handoff_consumed?: boolean;
+    plan_hash?: string;
+    plan_id?: string;
+    plan_path?: string;
+    plan_signature?: string;
   },
 ): ContextState | null {
   const state = getContext(contextId, projectRoot);
@@ -506,6 +500,7 @@ export function archiveContext(contextId: string, projectRoot?: string): Context
     logWarn("context_store", `Cannot archive: context '${contextId}' not found`);
     return null;
   }
+
   if (state.status !== "completed") {
     logWarn("context_store", `Cannot archive: context '${contextId}' not completed`);
     return null;
@@ -524,8 +519,8 @@ export function archiveContext(contextId: string, projectRoot?: string): Context
 
   try {
     fs.renameSync(sourceDir, archiveDest);
-  } catch (e: any) {
-    logError("context_store", `Failed to move context to archive: ${e}`);
+  } catch (error: any) {
+    logError("context_store", `Failed to move context to archive: ${error}`);
     return null;
   }
 
@@ -536,6 +531,7 @@ export function archiveContext(contextId: string, projectRoot?: string): Context
   for (const [sid, cid] of Object.entries(sessions)) {
     if (cid === contextId) delete sessions[sid];
   }
+
   saveIndex(index, projectRoot);
 
   // Add to archive index
@@ -555,6 +551,7 @@ export function reopenContext(contextId: string, projectRoot?: string): ContextS
   if (!state) {
     state = restoreFromArchive(contextId, projectRoot);
   }
+
   if (!state) return null;
 
   if (state.status === "active") {
@@ -595,6 +592,35 @@ export function createContextFromPrompt(
   );
 }
 
+/**
+ * Find the active context ID programmatically.
+ * Checks CONTEXT_ID env var first, then searches for the single active context.
+ * Returns null if no active context or multiple active contexts found.
+ */
+export function findActiveContextId(projectRoot?: string): null | string {
+  // Env var takes priority
+  const envId = process.env.CONTEXT_ID;
+  if (envId) {
+    const ctx = getContext(envId, projectRoot);
+    if (ctx) return ctx.id;
+  }
+
+  // Search for active contexts
+  const active = getAllContexts("active", projectRoot)
+    .filter(c => c.mode === "active" || c.mode === "has_plan" || c.mode === "has_handoff");
+
+  if (active.length === 1) return active[0]!.id;
+  if (active.length > 1) {
+    // Multiple active — try to find the most recently active
+    const sorted = active.sort((a, b) =>
+      (b.last_active ?? "").localeCompare(a.last_active ?? ""),
+    );
+    return sorted[0]!.id;
+  }
+
+  return null;
+}
+
 // ---------------------------------------------------------------------------
 // Archive helpers
 // ---------------------------------------------------------------------------
@@ -613,9 +639,9 @@ function updateArchiveIndex(state: ContextState, projectRoot?: string): boolean
 
   if (fs.existsSync(archiveIndexPath)) {
     try {
-      archiveIndex = JSON.parse(fs.readFileSync(archiveIndexPath, "utf-8"));
-    } catch (e: any) {
-      logWarn("context_store", `Failed to read archive index, recreating: ${e}`);
+      archiveIndex = JSON.parse(fs.readFileSync(archiveIndexPath, "utf8"));
+    } catch (error_: any) {
+      logWarn("context_store", `Failed to read archive index, recreating: ${error_}`);
     }
   }
 
@@ -627,6 +653,7 @@ function updateArchiveIndex(state: ContextState, projectRoot?: string): boolean
   if (!success) {
     logWarn("context_store", `Failed to write archive index: ${error}`);
   }
+
   return success;
 }
 
@@ -642,8 +669,8 @@ function restoreFromArchive(contextId: string, projectRoot?: string): ContextSta
 
   try {
     fs.renameSync(archiveDir, activeDir);
-  } catch (e: any) {
-    logError("context_store", `Failed to restore context from archive: ${e}`);
+  } catch (error: any) {
+    logError("context_store", `Failed to restore context from archive: ${error}`);
     return null;
   }
 
@@ -660,7 +687,7 @@ function removeFromArchiveIndex(contextId: string, projectRoot?: string): boolea
   if (!fs.existsSync(archiveIndexPath)) return true;
 
   try {
-    const archiveIndex = JSON.parse(fs.readFileSync(archiveIndexPath, "utf-8")) as IndexFile;
+    const archiveIndex = JSON.parse(fs.readFileSync(archiveIndexPath, "utf8")) as IndexFile;
     if (archiveIndex.contexts[contextId]) {
       delete archiveIndex.contexts[contextId];
       archiveIndex.updated_at = nowIso();
@@ -671,9 +698,10 @@ function removeFromArchiveIndex(contextId: string, projectRoot?: string): boolea
         return false;
       }
     }
+
     return true;
-  } catch (e: any) {
-    logWarn("context_store", `Failed to read archive index: ${e}`);
+  } catch (error: any) {
+    logWarn("context_store", `Failed to read archive index: ${error}`);
     return false;
   }
 }

package/dist/templates/_shared/lib-ts/context/plan-manager.ts

@@ -13,8 +13,8 @@ import * as path from "node:path";
 import * as crypto from "node:crypto";
 import { getContextDir, getContextPlansDir, sanitizeTitle } from "../base/constants.js";
 import { atomicWrite } from "../base/atomic-write.js";
-import { readStateJson } from "../base/state-io.js";
 import { logDebug, logInfo, logWarn, logError } from "../base/logger.js";
+import { generateSlug } from "../base/utils.js";
 import type { ContextState } from "../types.js";
 
 // ---------------------------------------------------------------------------
@@ -30,11 +30,11 @@ import type { ContextState } from "../types.js";
  * Returns [archivedPath, planHash, planSignature] on success,
  * or [null, null, null] on error.
  */
-export async function archivePlan(
+export function archivePlan(
   planPath: string,
   contextId: string,
   projectRoot?: string,
-): Promise<[string | null, string | null, string | null]> {
+): [string | null, string | null, string | null] {
   if (!fs.existsSync(planPath)) {
     logWarn("plan_manager", `Plan file not found: ${planPath}`);
     return [null, null, null];
@@ -69,23 +69,12 @@ export async function archivePlan(
     String(now.getMinutes()).padStart(2, "0"),
   ].join("");
 
-  // Try AI inference for a descriptive slug
-  let slug: string | null = null;
-  try {
-    const { generateContextIdSlug } = await import("../base/inference.js");
-    const aiSlug = generateContextIdSlug(content.slice(0, 500), 5);
-    if (aiSlug) {
-      slug = sanitizeTitle(aiSlug, 60);
-    }
-  } catch {
-    // AI inference unavailable — use filename fallback
-  }
-
-  // Fallback: use plan filename
-  if (!slug) {
-    const stem = path.basename(planPath, path.extname(planPath));
-    slug = sanitizeTitle(stem, 30);
-  }
+  // Extract a clean summary from plan content for slug generation.
+  // Headings describe the plan's intent better than raw markdown body.
+  const summary = extractPlanSummary(content);
+  const slug = generateSlug(summary, 60, sanitizeTitle(
+    path.basename(planPath, path.extname(planPath)), 30,
+  ));
 
   let archiveName = `${dateStr}-${slug}.md`;
   let archivePath = path.join(plansDir, archiveName);
@@ -109,6 +98,35 @@ export async function archivePlan(
   return [archivePath, planHash, planSignature];
 }
 
+/**
+ * Extract a human-readable summary from plan markdown content.
+ * Pulls headings and the first substantial paragraph, producing
+ * text suitable for the AI slug generator (which expects conversational input).
+ */
+function extractPlanSummary(content: string): string {
+  const lines = content.split(/\r?\n/);
+  const parts: string[] = [];
+  let firstParagraph = "";
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    // Collect markdown headings (strip # prefix)
+    if (trimmed.startsWith("#")) {
+      const heading = trimmed.replace(/^#+\s*/, "");
+      if (heading.length > 2) parts.push(heading);
+    }
+    // Grab first substantial non-heading line as context
+    if (!firstParagraph && !trimmed.startsWith("#") && trimmed.length > 20) {
+      firstParagraph = trimmed.slice(0, 120);
+    }
+    // Enough material for the AI
+    if (parts.length >= 5) break;
+  }
+
+  if (firstParagraph) parts.push(firstParagraph);
+  return parts.join(" ").slice(0, 500) || content.slice(0, 500);
+}
+
 // ---------------------------------------------------------------------------
 // Plan lookup
 // ---------------------------------------------------------------------------
@@ -124,7 +142,9 @@ export function findLatestPlan(
 ): string | null {
   // 1. Check state.json plan_path first
   try {
-    const state = readStateJson(contextId, projectRoot);
+    // Dynamic import to avoid circular dependency at module level
+    const stateIo = require("../base/state-io.js");
+    const state = stateIo.readStateJson(contextId, projectRoot);
     if (state?.plan_path && fs.existsSync(state.plan_path)) {
       return state.plan_path;
     }
@@ -183,7 +203,7 @@ export function normalizePlanContent(text: string): string {
  */
 export function extractPlanAnchors(content: string, maxAnchors = 5): string[] {
   const anchors: string[] = [];
-  for (const line of content.split("\n")) {
+  for (const line of content.split(/\r?\n/)) {
     const trimmed = line.trim();
     if (trimmed.startsWith("#") && trimmed.length > 3) {
       anchors.push(trimmed.slice(0, 80));
@@ -228,7 +248,7 @@ export function findPlanPathInTranscript(transcriptPath: string): string | null
 
   let lines: string[];
   try {
-    lines = fs.readFileSync(transcriptPath, "utf-8").split("\n");
+    lines = fs.readFileSync(transcriptPath, "utf-8").split(/\r?\n/);
   } catch (e: any) {
     logWarn("plan_manager", `Failed to read transcript: ${e}`);
     return null;