aiwcli 0.11.0 → 0.11.1

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

@@ -69,7 +69,10 @@ function main(): void {
           state.plan_signature = content.slice(0, 200);
           state.plan_id = generatePlanId();
           state.plan_anchors = extractPlanAnchors(content);
-          state.plan_consumed = false;
+          // Preserve plan_consumed if already true (plan was implemented) —
+          // resetting it would re-stage the plan and block handoff staging.
+          // Only set to false when no prior consumption has occurred.
+          state.plan_consumed = state.plan_consumed || false;
 
           logInfo("session_end", `Assigned plan fallback: hash=${planHash}, path=${latestPlanPath}`);
         } catch (error) {

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

@@ -23,7 +23,7 @@ export function getGitState(projectRoot: string): Record<string, any> {
   try {
     const status = execFileSync("git", ["status", "--short"], opts);
     if (status) {
-      const files = status.trim().split("\n")
+      const files = status.trim().split(/\r?\n/)
         .filter(Boolean)
         .slice(0, 10)
         .map(line => line.trimStart().split(/\s+/).slice(1).join(" "));

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

@@ -32,32 +32,31 @@ const LEVELS: Record<string, number> = {
 const MAX_LOG_LINES = 10_000; // Max lines in global log before pruning
 
 // Module-level session ID cache
-let _cachedSessionId: null | string = null;
+let _cachedSessionId: string | null = null;
 
 // Module-level context path cache (kept for external callers)
-let _cachedContextPath: null | string = null;
+let _cachedContextPath: string | null = null;
 let _contextResolved = false;
 
 /**
  * Set the session ID for this process. All subsequent log calls include it.
  */
-export function setSessionId(sessionId: null | string): void {
+export function setSessionId(sessionId: string | null): void {
   _cachedSessionId = sessionId;
 }
 
 /**
  * Set the context path for this process. Kept for external callers.
  */
-export function setContextPath(contextPath: null | string): void {
+export function setContextPath(contextPath: string | null): void {
   _cachedContextPath = contextPath;
   _contextResolved = true;
 }
 
-export function getContextPath(): null | string {
+export function getContextPath(): string | null {
   if (!_contextResolved) {
     _contextResolved = true; // Don't retry
-  }
-
+  }
   return _cachedContextPath;
 }
 
@@ -91,8 +90,8 @@ export function hookLog(
   opts?: {
     component?: string;
     data?: any;
-    stderr?: boolean;
     traceback_str?: string;
+    stderr?: boolean;
   },
 ): void {
   try {
@@ -137,8 +136,7 @@ export function hookLog(
       } catch {
         entry.data = String(opts.data);
       }
-    }
-
+    }
     if (tracebackStr) entry.tb = tracebackStr.trimEnd();
 
     const line = JSON.stringify(entry) + "\n";
@@ -153,8 +151,8 @@ export function hookLog(
     // Line-count guard: prune to last MAX_LOG_LINES
     try {
       if (fs.existsSync(logPath)) {
-        const content = fs.readFileSync(logPath, "utf8");
-        const lines = content.split("\n");
+        const content = fs.readFileSync(logPath, "utf-8");
+        const lines = content.split(/\r?\n/);
         if (lines.length > MAX_LOG_LINES) {
           fs.writeFileSync(
             logPath,
@@ -206,11 +204,11 @@ export function logDiagnostic(
   phase: string,
   summary: string,
   opts?: {
-    component?: string;
-    data?: any;
-    decision?: any;
     inputs?: any;
+    decision?: any;
     reasoning?: any;
+    component?: string;
+    data?: any;
   },
 ): void {
   const diagData: Record<string, any> = { phase };
@@ -219,8 +217,7 @@ export function logDiagnostic(
   if (opts?.reasoning !== undefined) diagData.reasoning = opts.reasoning;
   if (opts?.data && typeof opts.data === "object") {
     Object.assign(diagData, opts.data);
-  }
-
+  }
   hookLog("debug", hookName, `[DIAG:${phase}] ${summary}`, {
     component: opts?.component ?? "diag",
     data: diagData,
@@ -238,7 +235,7 @@ export function logHookError(
   tracebackStr = "",
 ): void {
   const errStr = typeof error === "string" ? error : String(error);
-  const msg = errStr.replaceAll(/[\n\r]/g, " ").slice(0, 200);
+  const msg = errStr.replace(/[\n\r]/g, " ").slice(0, 200);
   const errType =
     typeof error === "object" && error !== null
       ? error.constructor.name

package/dist/templates/_shared/lib-ts/base/subprocess-utils.ts

@@ -3,7 +3,7 @@
  * See SPEC.md §5.10
  */
 
-import { execFile, execSync } from "node:child_process";
+import { execSync, execFile } from "node:child_process";
 
 /**
  * Check if this is an internal subprocess call.
@@ -31,10 +31,10 @@ export function getInternalSubprocessEnv(): Record<string, string | undefined> {
  * execFileSync cannot spawn extensionless shell scripts.
  * Returns the first match or null if not found.
  */
-export function findExecutable(name: string): null | string {
+export function findExecutable(name: string): string | null {
   try {
     const cmd = process.platform === "win32" ? `where ${name}` : `which ${name}`;
-    const lines = execSync(cmd, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] })
+    const lines = execSync(cmd, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"], shell: true })
       .trim()
       .split(/\r?\n/)
       .map((l) => l.trim())
@@ -62,11 +62,11 @@ export function findExecutable(name: string): null | string {
  */
 export interface ExecSyncError {
   killed: boolean;
-  message: string;
-  signal: null | string;
-  status: null | number;
-  stderr: Buffer | string;
+  signal: string | null;
   stdout: Buffer | string;
+  stderr: Buffer | string;
+  status: number | null;
+  message: string;
 }
 
 /** Check if an unknown error is an ExecSync error with process info. */
@@ -88,23 +88,25 @@ export function isExecSyncError(e: unknown): e is ExecSyncError {
  * Never throws — callers inspect fields to determine outcome.
  */
 export interface ExecResult {
+  stdout: string;
+  stderr: string;
   exitCode: number;
   killed: boolean;
-  signal: null | string;
-  stderr: string;
-  stdout: string;
+  signal: string | null;
 }
 
 /** Options for execFileAsync. */
 export interface ExecAsyncOptions {
-  /** Environment variables for the child process. */
-  env?: Record<string, string | undefined>;
   /** Data piped to the child's stdin. */
   input?: string;
-  /** Maximum bytes on stdout/stderr. Default: 10 MB. */
-  maxBuffer?: number;
   /** Timeout in milliseconds (not seconds). */
   timeout?: number;
+  /** Environment variables for the child process. */
+  env?: Record<string, string | undefined>;
+  /** Maximum bytes on stdout/stderr. Default: 10 MB. */
+  maxBuffer?: number;
+  /** Use shell for execution. Required on Windows for .cmd files. */
+  shell?: boolean;
 }
 
 /**
@@ -129,6 +131,7 @@ export function execFileAsync(
         timeout: options?.timeout ?? 0,
         env: options?.env as NodeJS.ProcessEnv,
         maxBuffer: options?.maxBuffer ?? 10 * 1024 * 1024,
+        shell: options?.shell,
       },
       (error, stdout, stderr) => {
         if (error) {
@@ -154,7 +157,7 @@ export function execFileAsync(
     );
 
     // Pipe input to stdin if provided
-    if (options?.input !== null && options?.input !== undefined && child.stdin) {
+    if (options?.input != null && child.stdin) {
       child.stdin.write(options.input);
       child.stdin.end();
     }

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

@@ -8,16 +8,14 @@
  * - extractPlanPathFromResult: parse plan path from ExitPlanMode output
  */
 
-import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 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 { getContextDir as _getContextDir, getContextPlansDir, sanitizeTitle } from "../base/constants.js";
-import { logDebug, logError, logInfo, logWarn } from "../base/logger.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 as _ContextState } from "../types.js";
+import type { ContextState } from "../types.js";
 
 // ---------------------------------------------------------------------------
 // Plan archival
@@ -32,11 +30,11 @@ import type { ContextState as _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<[null | string, null | string, null | string]> {
+): [string | null, string | null, string | null] {
   if (!fs.existsSync(planPath)) {
     logWarn("plan_manager", `Plan file not found: ${planPath}`);
     return [null, null, null];
@@ -44,9 +42,9 @@ export async function archivePlan(
 
   let content: string;
   try {
-    content = fs.readFileSync(planPath, "utf8");
-  } catch (error_: any) {
-    logError("plan_manager", `Failed to read plan: ${error_}`);
+    content = fs.readFileSync(planPath, "utf-8");
+  } catch (e: any) {
+    logError("plan_manager", `Failed to read plan: ${e}`);
     return [null, null, null];
   }
 
@@ -106,7 +104,7 @@ export async function archivePlan(
  * text suitable for the AI slug generator (which expects conversational input).
  */
 function extractPlanSummary(content: string): string {
-  const lines = content.split("\n");
+  const lines = content.split(/\r?\n/);
   const parts: string[] = [];
   let firstParagraph = "";
 
@@ -117,12 +115,10 @@ function extractPlanSummary(content: string): string {
       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;
   }
@@ -143,15 +139,17 @@ function extractPlanSummary(content: string): string {
 export function findLatestPlan(
   contextId: string,
   projectRoot?: string,
-): null | string {
+): 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;
     }
-  } catch (error: any) {
-    logWarn("plan_manager", `Failed to check state.json plan_path: ${error}`);
+  } catch (e: any) {
+    logWarn("plan_manager", `Failed to check state.json plan_path: ${e}`);
   }
 
   // 2. Fall back to most recent .md in plans/ dir
@@ -184,7 +182,7 @@ export function findLatestPlan(
  * See SPEC.md §9.4
  */
 export function generatePlanId(): string {
-  return crypto.randomUUID().replaceAll('-', "").slice(0, 8);
+  return crypto.randomUUID().replace(/-/g, "").slice(0, 8);
 }
 
 /**
@@ -193,8 +191,8 @@ export function generatePlanId(): string {
  * See SPEC.md §9.5
  */
 export function normalizePlanContent(text: string): string {
-  let result = text.replaceAll(/<[^>]+>/g, "");
-  result = result.replaceAll(/\s+/g, " ").trim();
+  let result = text.replace(/<[^>]+>/g, "");
+  result = result.replace(/\s+/g, " ").trim();
   return result;
 }
 
@@ -205,17 +203,15 @@ 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));
     } else if (anchors.length === 0 && trimmed.length > 20) {
       anchors.push(trimmed.slice(0, 80));
     }
-
     if (anchors.length >= maxAnchors) break;
   }
-
   return anchors;
 }
 
@@ -230,7 +226,7 @@ const MAX_TRANSCRIPT_SIZE = 50 * 1024 * 1024; // 50 MB
  * Searches in reverse for the most recent Write tool call targeting .claude/plans/.
  * See SPEC.md §9.7
  */
-export function findPlanPathInTranscript(transcriptPath: string): null | string {
+export function findPlanPathInTranscript(transcriptPath: string): string | null {
   if (!transcriptPath) return null;
 
   if (!fs.existsSync(transcriptPath)) {
@@ -252,9 +248,9 @@ export function findPlanPathInTranscript(transcriptPath: string): null | string
 
   let lines: string[];
   try {
-    lines = fs.readFileSync(transcriptPath, "utf8").split("\n");
-  } catch (error: any) {
-    logWarn("plan_manager", `Failed to read transcript: ${error}`);
+    lines = fs.readFileSync(transcriptPath, "utf-8").split(/\r?\n/);
+  } catch (e: any) {
+    logWarn("plan_manager", `Failed to read transcript: ${e}`);
     return null;
   }
 
@@ -286,7 +282,7 @@ export function findPlanPathInTranscript(transcriptPath: string): null | string
       if (!filePath) continue;
 
       // Check if path contains .claude/plans/ as consecutive parts
-      const parts = filePath.replaceAll('\\', "/").split("/");
+      const parts = filePath.replace(/\\/g, "/").split("/");
       for (let j = 0; j < parts.length - 1; j++) {
         if (parts[j] === ".claude" && parts[j + 1] === "plans") {
           logInfo("plan_manager", `Extracted plan path from transcript: ${filePath}`);
@@ -309,7 +305,7 @@ export function findPlanPathInTranscript(transcriptPath: string): null | string
  * Parses the pattern: "Your plan has been saved to: <path>"
  * See SPEC.md §9.8
  */
-export function extractPlanPathFromResult(toolResult: string): null | string {
+export function extractPlanPathFromResult(toolResult: string): string | null {
   if (!toolResult) return null;
   const match = toolResult.match(/Your plan has been saved to:\s*(.+\.md)/);
   return match ? match[1]!.trim() : null;

package/dist/templates/_shared/lib-ts/handoff/handoff-reader.ts

@@ -7,8 +7,7 @@
  */
 
 import * as fs from "node:fs";
-import * as path from "node:path";
-
+import * as path from "node:path";
 import { getContextHandoffsDir } from "../base/constants.js";
 import { getContext } from "../context/context-store.js";
 import type { HandoffSections } from "../types.js";
@@ -19,7 +18,7 @@ import type { HandoffSections } from "../types.js";
  * (YYYY-MM-DD-HHMM format ensures lexicographic = chronological).
  * Returns full path to most recent folder, or null.
  */
-export function findLatestHandoff(contextId: string, projectRoot?: string): null | string {
+export function findLatestHandoff(contextId: string, projectRoot?: string): string | null {
   const handoffsDir = getContextHandoffsDir(contextId, projectRoot);
 
   try {
@@ -30,7 +29,7 @@ export function findLatestHandoff(contextId: string, projectRoot?: string): null
       .sort();
 
     if (entries.length === 0) return null;
-    return path.join(handoffsDir, entries.at(-1)!);
+    return path.join(handoffsDir, entries[entries.length - 1]!);
   } catch {
     return null;
   }
@@ -65,7 +64,7 @@ export function readHandoffSections(handoffFolder: string): HandoffSections {
     const filePath = path.join(handoffFolder, filename);
     try {
       if (fs.existsSync(filePath)) {
-        sections[key as keyof HandoffSections] = fs.readFileSync(filePath, "utf8");
+        sections[key as keyof HandoffSections] = fs.readFileSync(filePath, "utf-8");
       }
     } catch {
       // graceful — leave as null
@@ -87,11 +86,11 @@ export function getHandoffTimestamp(handoffFolder: string): Date | null {
 
   const [, year, month, day, hour, minute] = match;
   const date = new Date(
-    Number.parseInt(year!, 10),
-    Number.parseInt(month!, 10) - 1,
-    Number.parseInt(day!, 10),
-    Number.parseInt(hour!, 10),
-    Number.parseInt(minute!, 10),
+    parseInt(year!, 10),
+    parseInt(month!, 10) - 1,
+    parseInt(day!, 10),
+    parseInt(hour!, 10),
+    parseInt(minute!, 10),
   );
 
   return isNaN(date.getTime()) ? null : date;
@@ -106,12 +105,12 @@ export function getHandoffPlanReference(
   handoffFolder: string,
   contextId: string,
   projectRoot?: string,
-): null | string {
+): string | null {
   // Try plan.md frontmatter
   const planMdPath = path.join(handoffFolder, "plan.md");
   try {
     if (fs.existsSync(planMdPath)) {
-      const content = fs.readFileSync(planMdPath, "utf8");
+      const content = fs.readFileSync(planMdPath, "utf-8");
       const frontmatter = parseFrontmatter(content);
       if (frontmatter["plan_path"]) {
         const pp = frontmatter["plan_path"];
@@ -146,7 +145,7 @@ function parseFrontmatter(content: string): Record<string, string> {
   const parts = content.split("---", 3);
   if (parts.length < 3) return frontmatter;
 
-  for (const line of parts[1]!.trim().split("\n")) {
+  for (const line of parts[1]!.trim().split(/\r?\n/)) {
     const colonIdx = line.indexOf(":");
     if (colonIdx !== -1) {
       const key = line.slice(0, colonIdx).trim();