aiwcli 0.11.0 → 0.11.1

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,
-  getHandoffPlanReference,
-  getHandoffTimestamp,
   readHandoffSections,
+  getHandoffTimestamp,
+  getHandoffPlanReference,
 } from "../lib-ts/handoff/handoff-reader.js";
+import { getProjectRoot } from "../lib-ts/base/constants.js";
+import { findActiveContextId } 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
@@ -40,11 +40,9 @@ function formatRelativeAge(date: Date): string {
   if (diffDays === 0) {
     if (diffHours === 0) {
       return diffMin <= 1 ? "just now" : `${diffMin} minutes ago`;
-    }
-
+    }
     return diffHours === 1 ? "1 hour ago" : `${diffHours} hours ago`;
-  }
-
+  }
   if (diffDays === 1) return "yesterday";
   return `${diffDays} days ago`;
 }
@@ -66,14 +64,13 @@ function countPlanProgress(planContent: string): [number, number] | null {
  * Handoff section files typically start with "# Title\n\n..."
  */
 function stripTitle(content: string): string {
-  const lines = content.split("\n");
+  const lines = content.split(/\r?\n/);
   if (lines[0]?.startsWith("# ")) {
     // Remove title and leading blank lines
     let i = 1;
     while (i < lines.length && lines[i]!.trim() === "") i++;
     return lines.slice(i).join("\n").trim();
-  }
-
+  }
   return content.trim();
 }
 
@@ -81,7 +78,7 @@ function stripTitle(content: string): string {
 // Resolution
 // ---------------------------------------------------------------------------
 
-function resolveHandoffFolder(args: string[]): [string, null | string] {
+function resolveHandoffFolder(args: string[]): [string, string | null] {
   const projectRoot = getProjectRoot(process.cwd());
 
   // --context <id>
@@ -92,8 +89,7 @@ function resolveHandoffFolder(args: string[]): [string, null | string] {
     if (!folder) {
       eprint(`No handoff folders found for context: ${contextId}`);
       process.exit(1);
-    }
-
+    }
     return [folder, contextId];
   }
 
@@ -128,8 +124,7 @@ function resolveHandoffFolder(args: string[]): [string, null | string] {
     if (!folder) {
       eprint(`No handoff folders found for context: ${discoveredId} (auto-discovered)`);
       process.exit(1);
-    }
-
+    }
     return [folder, discoveredId];
   }
 
@@ -183,7 +178,7 @@ function main(): void {
     const planRef = getHandoffPlanReference(handoffFolder, resolvedContextId, projectRoot);
     if (planRef) {
       try {
-        const planContent = fs.readFileSync(planRef, "utf8");
+        const planContent = fs.readFileSync(planRef, "utf-8");
         const progress = countPlanProgress(planContent);
         if (progress) {
           const [done, total] = progress;
@@ -204,12 +199,19 @@ function main(): void {
   // Build output
   const out: string[] = [];
 
-  out.push(`## Session Resumed from Handoff`, "");
+  out.push(`## Session Resumed from Handoff`);
+  out.push("");
   out.push(`**Source:** \`${path.basename(handoffFolder)}\` (${ageStr})`);
   if (resolvedContextId) out.push(`**Context:** ${resolvedContextId}`);
   out.push(`**Plan Status:** ${planStatus}`);
   if (staleWarning) out.push(staleWarning);
-  out.push("", "---", "", "### Dead Ends — Do Not Retry", "");
+  out.push("");
+  out.push("---");
+  out.push("");
+
+  // Priority 1: Dead Ends
+  out.push("### Dead Ends — Do Not Retry");
+  out.push("");
   if (sections.deadEnds) {
     const content = stripTitle(sections.deadEnds);
     if (content && content !== "(No content for this section)") {
@@ -219,9 +221,12 @@ function main(): void {
     }
   } else {
     out.push("(No dead-ends.md found)");
-  }
+  }
+  out.push("");
 
-  out.push("", "### Pending Items", "");
+  // Priority 2: Pending
+  out.push("### Pending Items");
+  out.push("");
   if (sections.pending) {
     const content = stripTitle(sections.pending);
     if (content && content !== "(No content for this section)") {
@@ -231,8 +236,7 @@ function main(): void {
     }
   } else {
     out.push("(No pending.md found)");
-  }
-
+  }
   out.push("");
 
   // Priority 3: Plan remaining items (from plan.md in handoff)
@@ -240,21 +244,22 @@ function main(): void {
     const planContent = stripTitle(sections.plan);
     // Extract unchecked items
     const remaining = planContent
-      .split("\n")
+      .split(/\r?\n/)
       .filter(line => /\[ \]/.test(line))
       .map(line => line.trim());
     if (remaining.length > 0) {
-      out.push("### Plan — Remaining Items", "");
+      out.push("### Plan — Remaining Items");
+      out.push("");
       for (const item of remaining) {
         out.push(item);
-      }
-
+      }
       out.push("");
     }
   }
 
   // Priority 4: Decisions
-  out.push("### Settled Decisions", "");
+  out.push("### Settled Decisions");
+  out.push("");
   if (sections.decisions) {
     const content = stripTitle(sections.decisions);
     if (content && content !== "(No content for this section)") {
@@ -264,9 +269,21 @@ function main(): void {
     }
   } else {
     out.push("(No decisions.md found)");
-  }
+  }
+  out.push("");
+
+  // Priority 5: Git Delta
+  out.push("### Git Delta Since Handoff");
+  out.push("");
+  out.push("**Current git status:**");
+  out.push("```");
+  out.push(currentGit);
+  out.push("```");
+  out.push("");
 
-  out.push("", "### Git Delta Since Handoff", "", "**Current git status:**", "```", currentGit, "```", "", "### Completed Work", "");
+  // Priority 6: Completed Work
+  out.push("### Completed Work");
+  out.push("");
   if (sections.completedWork) {
     const content = stripTitle(sections.completedWork);
     if (content && content !== "(No content for this section)") {
@@ -276,9 +293,12 @@ function main(): void {
     }
   } else {
     out.push("(No completed-work.md found)");
-  }
+  }
+  out.push("");
 
-  out.push("", "### Context Notes", "");
+  // Priority 7: Context
+  out.push("### Context Notes");
+  out.push("");
   if (sections.context) {
     const content = stripTitle(sections.context);
     if (content && content !== "(No content for this section)") {
@@ -288,9 +308,13 @@ function main(): void {
     }
   } else {
     out.push("None");
-  }
+  }
+  out.push("");
 
-  out.push("", "---", "", "**Create ISC tasks** from the pending items and remaining plan items above using TaskCreate. Each task should be ~8 words, state a desired end-state (not an action), and be binary testable.");
+  // Footer
+  out.push("---");
+  out.push("");
+  out.push("**Create ISC tasks** from the pending items and remaining plan items above using TaskCreate. Each task should be ~8 words, state a desired end-state (not an action), and be binary testable.");
 
   console.log(out.join("\n"));
 }
@@ -298,14 +322,14 @@ function main(): void {
 /**
  * Try to extract context_id from index.md frontmatter.
  */
-function extractContextIdFromIndex(indexContent: null | string): null | string {
+function extractContextIdFromIndex(indexContent: string | null): string | null {
   if (!indexContent) return null;
   if (!indexContent.startsWith("---")) return null;
 
   const parts = indexContent.split("---", 3);
   if (parts.length < 3) return null;
 
-  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();

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

@@ -22,12 +22,12 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 
-import { atomicWrite } from "../lib-ts/base/atomic-write.js";
+import { getContext, saveState } from "../lib-ts/context/context-store.js";
 import { getHandoffFolderPath, getProjectRoot } from "../lib-ts/base/constants.js";
+import { atomicWrite } from "../lib-ts/base/atomic-write.js";
+import { logInfo, logWarn, logError } from "../lib-ts/base/logger.js";
 import { getGitStatusShort } from "../lib-ts/base/git-state.js";
-import { logError, logInfo, logWarn } from "../lib-ts/base/logger.js";
 import { eprint } from "../lib-ts/base/utils.js";
-import { getContext, saveState } from "../lib-ts/context/context-store.js";
 
 // ---------------------------------------------------------------------------
 // Parsing helpers
@@ -40,15 +40,14 @@ function parseFrontmatter(content: string): [Record<string, string>, string] {
   if (content.startsWith("---")) {
     const parts = content.split("---", 3);
     if (parts.length >= 3) {
-      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();
           const value = line.slice(colonIdx + 1).trim();
           frontmatter[key] = value;
         }
-      }
-
+      }
       remaining = parts[2]!.trim();
     }
   }
@@ -58,16 +57,15 @@ function parseFrontmatter(content: string): [Record<string, string>, string] {
 
 function parseHandoffSections(content: string): Record<string, string> {
   const sections: Record<string, string> = {};
-  let currentSection: null | string = null;
+  let currentSection: string | null = null;
   const currentContent: string[] = [];
 
-  for (const line of content.split("\n")) {
+  for (const line of content.split(/\r?\n/)) {
     const marker = line.trim().match(/<!-- SECTION:\s*(\S+)\s*-->/);
     if (marker) {
       if (currentSection) {
         sections[currentSection] = currentContent.join("\n").trim();
-      }
-
+      }
       currentSection = marker[1]!;
       currentContent.length = 0;
     } else if (currentSection) {
@@ -86,13 +84,12 @@ function parseHandoffSections(content: string): Record<string, string> {
 // Plan helper
 // ---------------------------------------------------------------------------
 
-function getPlanPathFromContext(contextId: string, projectRoot: string): null | string {
+function getPlanPathFromContext(contextId: string, projectRoot: string): string | null {
   const context = getContext(contextId, projectRoot);
   if (!context?.plan_path) return null;
   try {
     if (fs.existsSync(context.plan_path)) return context.plan_path;
-  } catch { /* ignore */ }
-
+  } catch { /* ignore */ }
   return null;
 }
 
@@ -128,7 +125,7 @@ function generateIndex(
   const summary = (sections["summary"] ?? "").trim();
   if (summary) {
     const summaryText = summary
-      .split("\n")
+      .split(/\r?\n/)
       .filter(l => !l.trim().startsWith("##"))
       .join("\n")
       .trim();
@@ -179,8 +176,7 @@ function writeSectionFile(folder: string, filename: string, title: string, conte
   if (!success) {
     logWarn("save_handoff", `Failed to write ${filename}: ${error}`);
     return false;
-  }
-
+  }
   return true;
 }
 
@@ -204,7 +200,7 @@ function main(): void {
   // Read content from stdin
   let content: string;
   try {
-    content = fs.readFileSync(0, "utf8");
+    content = fs.readFileSync(0, "utf-8");
   } catch {
     logError("save_handoff", "Failed to read from stdin");
     process.exit(1);
@@ -247,15 +243,15 @@ function main(): void {
   // Copy plan if exists
   if (planPath) {
     try {
-      const planContent = fs.readFileSync(planPath, "utf8");
+      const planContent = fs.readFileSync(planPath, "utf-8");
       const [success, error] = atomicWrite(path.join(handoffFolder, "plan.md"), planContent);
       if (success) {
         logInfo("save_handoff", `Copied plan from ${planPath}`);
       } else {
         logWarn("save_handoff", `Failed to copy plan: ${error}`);
       }
-    } catch (error) {
-      logWarn("save_handoff", `Failed to read plan: ${error}`);
+    } catch (e) {
+      logWarn("save_handoff", `Failed to read plan: ${e}`);
     }
   }
 
@@ -271,7 +267,7 @@ function main(): void {
   }
 
   // Write section files
-  const sectionMapping: Record<string, [string, null | string]> = {
+  const sectionMapping: Record<string, [string, string | null]> = {
     completed: ["completed-work.md", "Work Completed"],
     "dead-ends": ["dead-ends.md", "Dead Ends - Do Not Retry"],
     decisions: ["decisions.md", "Key Decisions"],
@@ -294,7 +290,11 @@ function main(): void {
       fileContents[filename]!.push(sectionContent);
     } else {
       // Write mode with title
-      fileContents[filename] = fileContents[filename] ? [`# ${title}`, "", ...fileContents[filename]!, "", sectionContent] : [`# ${title}`, "", sectionContent];
+      if (!fileContents[filename]) {
+        fileContents[filename] = [`# ${title}`, "", sectionContent];
+      } else {
+        fileContents[filename] = [`# ${title}`, "", ...fileContents[filename]!, "", sectionContent];
+      }
     }
   }
 
@@ -339,8 +339,8 @@ function main(): void {
     } else {
       logWarn("save_handoff", `Could not load context state for ${contextId}`);
     }
-  } catch (error) {
-    logWarn("save_handoff", `Handoff saved but auto-resume won't work (context update failed): ${error}`);
+  } catch (e) {
+    logWarn("save_handoff", `Handoff saved but auto-resume won't work (context update failed): ${e}`);
   }
 
   // Output success message