aiwcli 0.12.2 → 0.12.3

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

@@ -9,21 +9,20 @@
 
 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 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";
+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";
 
 const INDEX_VERSION = "3.0";
 
@@ -35,13 +34,12 @@ function loadIndex(projectRoot?: string): IndexFile {
   const indexPath = getIndexPath(projectRoot);
   if (fs.existsSync(indexPath)) {
     try {
-      const raw = fs.readFileSync(indexPath, "utf8");
+      const raw = fs.readFileSync(indexPath, "utf-8");
       return JSON.parse(raw) as IndexFile;
-    } catch (error: any) {
-      logWarn("context_store", `Failed to read index, recreating: ${error}`);
+    } catch (e: any) {
+      logWarn("context_store", `Failed to read index, recreating: ${e}`);
     }
   }
-
   return { version: INDEX_VERSION, updated_at: nowIso(), sessions: {}, contexts: {} };
 }
 
@@ -52,7 +50,6 @@ function saveIndex(index: IndexFile, projectRoot?: string): boolean {
   if (!success) {
     logWarn("context_store", `Failed to write index: ${error}`);
   }
-
   return success;
 }
 
@@ -72,7 +69,7 @@ function migrateContextJson(contextId: string, projectRoot?: string): ContextSta
   if (!fs.existsSync(legacyPath)) return null;
 
   try {
-    const data = JSON.parse(fs.readFileSync(legacyPath, "utf8"));
+    const data = JSON.parse(fs.readFileSync(legacyPath, "utf-8"));
     const inFlight = data.in_flight ?? {};
     const oldMode = inFlight.mode ?? "none";
     const MODE_MIGRATION: Record<string, string> = {
@@ -107,8 +104,8 @@ function migrateContextJson(contextId: string, projectRoot?: string): ContextSta
       last_session: null,
       tasks: [],
     };
-  } catch (error: any) {
-    logWarn("context_store", `Failed to migrate context.json for '${contextId}': ${error}`);
+  } catch (e: any) {
+    logWarn("context_store", `Failed to migrate context.json for '${contextId}': ${e}`);
     return null;
   }
 }
@@ -137,7 +134,7 @@ export function saveState(
   contextId: string,
   state: ContextState,
   projectRoot?: string,
-): [boolean, null | string] {
+): [boolean, string | null] {
   // Ensure the state ID matches
   state.id = contextId;
 
@@ -155,12 +152,10 @@ 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];
 }
 
@@ -170,7 +165,7 @@ export function saveState(
  * See SPEC.md §7.4
  */
 export function createContext(
-  contextId: null | string,
+  contextId: string | null,
   summary: string,
   method = "",
   projectRoot?: string,
@@ -190,7 +185,6 @@ export function createContext(
         } catch { /* ignore */ }
       }
     }
-
     contextId = generateContextId(summary, existingIds);
   }
 
@@ -219,6 +213,7 @@ export function createContext(
     plan_id: null,
     plan_anchors: [],
     plan_consumed: false,
+    plan_hash_consumed: null,
     handoff_path: null,
     handoff_consumed: false,
     session_ids: [],
@@ -241,7 +236,6 @@ export function getContext(contextId: string, projectRoot?: string): ContextStat
   } catch {
     return null;
   }
-
   return loadState(contextId, projectRoot);
 }
 
@@ -279,7 +273,6 @@ 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);
@@ -298,7 +291,7 @@ export function getAllContexts(
  */
 export function updateContext(
   contextId: string,
-  updates: Partial<Pick<ContextState, "method" | "summary" | "tags">>,
+  updates: Partial<Pick<ContextState, "summary" | "tags" | "method">>,
   projectRoot?: string,
 ): ContextState | null {
   const state = getContext(contextId, projectRoot);
@@ -348,7 +341,6 @@ export function getContextBySessionId(
       return state;
     }
   }
-
   return null;
 }
 
@@ -380,7 +372,6 @@ export function bindSession(
   if (!state.session_ids.includes(sessionId)) {
     state.session_ids.push(sessionId);
   }
-
   state.last_active = nowIso();
 
   const [success] = saveState(contextId, state, projectRoot);
@@ -396,13 +387,14 @@ export function updateMode(
   mode: Mode,
   projectRoot?: string,
   opts?: {
-    handoff_consumed?: boolean;
-    plan_anchors?: string[];
-    plan_consumed?: boolean;
-    plan_hash?: string;
-    plan_id?: string;
     plan_path?: string;
+    plan_hash?: string;
     plan_signature?: string;
+    plan_id?: string;
+    plan_anchors?: string[];
+    plan_consumed?: boolean;
+    plan_hash_consumed?: string;
+    handoff_consumed?: boolean;
   },
 ): ContextState | null {
   const state = getContext(contextId, projectRoot);
@@ -418,6 +410,7 @@ export function updateMode(
     if (opts.plan_id !== undefined) state.plan_id = opts.plan_id;
     if (opts.plan_anchors !== undefined) state.plan_anchors = opts.plan_anchors;
     if (opts.plan_consumed !== undefined) state.plan_consumed = opts.plan_consumed;
+    if (opts.plan_hash_consumed !== undefined) state.plan_hash_consumed = opts.plan_hash_consumed;
     if (opts.handoff_consumed !== undefined) state.handoff_consumed = opts.handoff_consumed;
   }
 
@@ -429,6 +422,7 @@ export function updateMode(
     state.plan_id = null;
     state.plan_anchors = [];
     state.plan_consumed = false;
+    state.plan_hash_consumed = null;
     state.handoff_consumed = false;
   }
 
@@ -500,7 +494,6 @@ 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;
@@ -519,8 +512,8 @@ export function archiveContext(contextId: string, projectRoot?: string): Context
 
   try {
     fs.renameSync(sourceDir, archiveDest);
-  } catch (error: any) {
-    logError("context_store", `Failed to move context to archive: ${error}`);
+  } catch (e: any) {
+    logError("context_store", `Failed to move context to archive: ${e}`);
     return null;
   }
 
@@ -531,7 +524,6 @@ 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
@@ -551,7 +543,6 @@ export function reopenContext(contextId: string, projectRoot?: string): ContextS
   if (!state) {
     state = restoreFromArchive(contextId, projectRoot);
   }
-
   if (!state) return null;
 
   if (state.status === "active") {
@@ -592,34 +583,6 @@ 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
@@ -639,9 +602,9 @@ function updateArchiveIndex(state: ContextState, projectRoot?: string): boolean
 
   if (fs.existsSync(archiveIndexPath)) {
     try {
-      archiveIndex = JSON.parse(fs.readFileSync(archiveIndexPath, "utf8"));
-    } catch (error_: any) {
-      logWarn("context_store", `Failed to read archive index, recreating: ${error_}`);
+      archiveIndex = JSON.parse(fs.readFileSync(archiveIndexPath, "utf-8"));
+    } catch (e: any) {
+      logWarn("context_store", `Failed to read archive index, recreating: ${e}`);
     }
   }
 
@@ -653,7 +616,6 @@ function updateArchiveIndex(state: ContextState, projectRoot?: string): boolean
   if (!success) {
     logWarn("context_store", `Failed to write archive index: ${error}`);
   }
-
   return success;
 }
 
@@ -669,8 +631,8 @@ function restoreFromArchive(contextId: string, projectRoot?: string): ContextSta
 
   try {
     fs.renameSync(archiveDir, activeDir);
-  } catch (error: any) {
-    logError("context_store", `Failed to restore context from archive: ${error}`);
+  } catch (e: any) {
+    logError("context_store", `Failed to restore context from archive: ${e}`);
     return null;
   }
 
@@ -687,7 +649,7 @@ function removeFromArchiveIndex(contextId: string, projectRoot?: string): boolea
   if (!fs.existsSync(archiveIndexPath)) return true;
 
   try {
-    const archiveIndex = JSON.parse(fs.readFileSync(archiveIndexPath, "utf8")) as IndexFile;
+    const archiveIndex = JSON.parse(fs.readFileSync(archiveIndexPath, "utf-8")) as IndexFile;
     if (archiveIndex.contexts[contextId]) {
       delete archiveIndex.contexts[contextId];
       archiveIndex.updated_at = nowIso();
@@ -698,10 +660,9 @@ function removeFromArchiveIndex(contextId: string, projectRoot?: string): boolea
         return false;
       }
     }
-
     return true;
-  } catch (error: any) {
-    logWarn("context_store", `Failed to read archive index: ${error}`);
+  } catch (e: any) {
+    logWarn("context_store", `Failed to read archive index: ${e}`);
     return false;
   }
 }

package/dist/templates/_shared/lib-ts/types.ts

@@ -5,115 +5,116 @@
  */
 
 // §1.1
-export type Mode = "active" | "has_handoff" | "has_plan" | "idle";
+export type Mode = "idle" | "has_plan" | "has_handoff" | "active";
 
 export interface ContextState {
-  created_at: string;
-  handoff_consumed: boolean;
-  handoff_path: null | string;
   id: string;
-  last_active: string;
-  last_session: LastSession | null;
+  status: "active" | "completed";
+  summary: string;
   method: string;
+  tags: string[];
+  created_at: string;
+  last_active: string;
   mode: Mode;
+  plan_path: string | null;
+  plan_hash: string | null;
+  plan_signature: string | null;
+  plan_id: string | null;
   plan_anchors: string[];
   plan_consumed: boolean;
-  plan_hash: null | string;
-  plan_id: null | string;
-  plan_path: null | string;
-  plan_signature: null | string;
+  plan_hash_consumed: string | null;
+  handoff_path: string | null;
+  handoff_consumed: boolean;
   session_ids: string[];
-  status: "active" | "completed";
-  summary: string;
-  tags: string[];
+  last_session: LastSession | null;
   tasks: Task[];
 }
 
 // §1.2
 export interface GitState {
   branch?: string;
-  last_commit_short?: string;
   uncommitted_files?: string[];
+  last_commit_short?: string;
 }
 
 export interface LastSession {
+  session_id?: string;
+  saved_at?: string;
+  save_reason?: string;
+  transcript_path?: string;
   context_remaining_pct?: number;
   context_warnings_fired?: number[];
   git_state?: GitState;
-  save_reason?: string;
-  saved_at?: string;
-  session_id?: string;
-  transcript_path?: string;
 }
 
 // §1.3
 export interface Task {
+  id: string;
+  subject: string;
+  description: string;
   active_form: string;
-  completed_at: null | string;
+  status: "pending" | "in_progress" | "completed" | "blocked";
   created_at: string;
-  description: string;
+  completed_at: string | null;
   evidence: string;
+  work_summary: string;
   files_changed: string[];
-  id: string;
   session_id?: string;
-  status: "blocked" | "completed" | "in_progress" | "pending";
-  subject: string;
-  work_summary: string;
 }
 
 // §1.4
 export interface IndexEntry {
-  last_active: string;
-  mode: string;
   summary: string;
+  mode: string;
+  last_active: string;
 }
 
 export interface IndexFile {
-  contexts: Record<string, IndexEntry>;
-  sessions: Record<string, string>;
-  updated_at: string;
   version: "3.0";
+  updated_at: string;
+  sessions: Record<string, string>;
+  contexts: Record<string, IndexEntry>;
 }
 
 // §1.5
 export interface LogEntry {
-  component?: string;
-  data?: any;
+  ts: string;
+  level: "debug" | "info" | "warn" | "error";
   hook: string;
-  level: "debug" | "error" | "info" | "warn";
   msg: string;
+  component?: string;
+  data?: any;
   tb?: string;
-  ts: string;
 }
 
 // §1.6
 export interface HookInput {
+  hook_event_name: string;
+  tool_name?: string;
+  tool_input?: Record<string, any>;
+  tool_result?: string;
+  session_id?: string;
+  cwd?: string;
+  transcript_path?: string;
   context_window?: {
-    context_window_size?: number;
     current_usage?: {
-      cache_creation_input_tokens?: number;
       cache_read_input_tokens?: number;
       input_tokens?: number;
+      cache_creation_input_tokens?: number;
       output_tokens?: number;
     };
+    context_window_size?: number;
   };
-  cwd?: string;
-  hook_event_name: string;
   permission_mode?: string;
-  session_id?: string;
   source?: string;
-  tool_input?: Record<string, any>;
-  tool_name?: string;
-  tool_result?: string;
-  transcript_path?: string;
 }
 
 // §1.7 — Three hook output patterns (see hook-utils.ts for emit functions)
 export interface HookOutput {
   // Pattern 1: hookSpecificOutput (PreToolUse, PostToolUse, UserPromptSubmit, etc.)
   hookSpecificOutput?: {
-    additionalContext?: string;
     hookEventName?: string;
+    additionalContext?: string;
     permissionDecision?: "allow" | "deny" | "ask";
     permissionDecisionReason?: string;
     updatedInput?: Record<string, unknown>;
@@ -135,45 +136,45 @@ export interface PermissionRequestOutput {
 
 // §1.8
 export interface InferenceResult {
+  success: boolean;
+  output: string;
   error?: string;
   latency_ms: number;
-  output: string;
-  success: boolean;
 }
 
 // §1.9
 export interface HandoffDocument {
-  active_tasks: Task[];
-  completed_tasks_this_session: Array<{ subject: string }>;
-  context_folder: string;
   context_id: string;
   context_summary: string;
+  session_id: string;
+  reason: string;
   created_at: string;
+  plan_path: string | null;
+  context_folder: string;
   events_log_path: string;
-  file_path: null | string;
-  important_notes: string[];
-  next_steps: string[];
-  plan_path: null | string;
-  reason: string;
-  session_id: string;
+  active_tasks: Task[];
+  completed_tasks_this_session: Array<{ subject: string }>;
   work_summary: string;
+  next_steps: string[];
+  important_notes: string[];
+  file_path: string | null;
 }
 
 // §1.10
 export interface HandoffSections {
-  completedWork: null | string;
-  context: null | string;
-  deadEnds: null | string;
-  decisions: null | string;
-  index: null | string;
-  pending: null | string;
-  plan: null | string;
+  index: string | null;
+  deadEnds: string | null;
+  pending: string | null;
+  plan: string | null;
+  decisions: string | null;
+  completedWork: string | null;
+  context: string | null;
 }
 
 // §1.11
 export interface CaretCommand {
   ends: string[];
-  new_context_desc: null | string;
+  select: string | null;
+  new_context_desc: string | null;
   remaining_prompt: string;
-  select: null | string;
 }

package/dist/templates/_shared/scripts/resolve_context.ts

@@ -8,17 +8,26 @@
  * Prints the context ID to stdout. Exits 1 if no active context found.
  * Used by command templates (/handoff, /handoff-resume) to programmatically
  * get the context ID instead of parsing system reminders.
+ *
+ * Requires CLAUDE_SESSION_ID environment variable (set by Claude Code).
  */
+import { getContextBySessionId } from "../lib-ts/context/context-store.js";
 import { getProjectRoot } from "../lib-ts/base/constants.js";
 import { eprint } from "../lib-ts/base/utils.js";
-import { findActiveContextId } from "../lib-ts/context/context-store.js";
 
 const projectRoot = getProjectRoot(process.cwd());
-const contextId = findActiveContextId(projectRoot);
+const sessionId = process.env.CLAUDE_SESSION_ID;
+
+if (!sessionId) {
+  eprint("CLAUDE_SESSION_ID not set. This script must be run from within a Claude Code session.");
+  process.exit(1);
+}
+
+const context = getContextBySessionId(sessionId, projectRoot);
 
-if (!contextId) {
-  eprint("No active context found. Handoffs require an active context.");
+if (!context) {
+  eprint(`No context found for session: ${sessionId}`);
   process.exit(1);
 }
 
-console.log(contextId);
+console.log(context.id);

package/dist/templates/_shared/scripts/resume_handoff.ts

@@ -15,16 +15,16 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 
-import { getProjectRoot } from "../lib-ts/base/constants.js";
-import { getGitStatusShort } from "../lib-ts/base/git-state.js";
-import { eprint } from "../lib-ts/base/utils.js";
-import { findActiveContextId } from "../lib-ts/context/context-store.js";
 import {
   findLatestHandoff,
   readHandoffSections,
   getHandoffTimestamp,
   getHandoffPlanReference,
 } from "../lib-ts/handoff/handoff-reader.js";
+import { getProjectRoot } from "../lib-ts/base/constants.js";
+import { getContextBySessionId } from "../lib-ts/context/context-store.js";
+import { getGitStatusShort } from "../lib-ts/base/git-state.js";
+import { eprint } from "../lib-ts/base/utils.js";
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -117,19 +117,22 @@ function resolveHandoffFolder(args: string[]): [string, string | null] {
     return [target, null];
   }
 
-  // Auto-discover active context
-  const discoveredId = findActiveContextId(projectRoot);
-  if (discoveredId) {
-    const folder = findLatestHandoff(discoveredId, projectRoot);
-    if (!folder) {
-      eprint(`No handoff folders found for context: ${discoveredId} (auto-discovered)`);
-      process.exit(1);
+  // Auto-discover via session ID (when running from Claude Code)
+  const sessionId = process.env.CLAUDE_SESSION_ID;
+  if (sessionId) {
+    const context = getContextBySessionId(sessionId, projectRoot);
+    if (context) {
+      const folder = findLatestHandoff(context.id, projectRoot);
+      if (!folder) {
+        eprint(`No handoff folders found for context: ${context.id} (from session ${sessionId})`);
+        process.exit(1);
+      }
+      return [folder, context.id];
     }
-    return [folder, discoveredId];
   }
 
   eprint(
-    "No active context found.\n\n" +
+    "No context found for current session.\n\n" +
     "Usage: bun resume_handoff.ts <handoff_folder_or_index>\n" +
     "       bun resume_handoff.ts --context <context_id>",
   );