aiwcli 0.12.8 → 0.13.0

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

@@ -9,7 +9,7 @@
 
 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 {
   getContextDir,
@@ -20,7 +20,8 @@ import {
   getArchiveIndexPath,
   validateContextId,
 } from "../base/constants.js";
-import { logDebug, logInfo, logWarn, logError, setContextPath } from "../base/logger.js";
+import { logInfo, logWarn, logError, setContextPath } from "../base/logger.js";
+import { readStateJson, writeStateJson } from "../base/state-io.js";
 import { nowIso, generateContextId } from "../base/utils.js";
 import type { ContextState, IndexFile, IndexEntry, Mode } from "../types.js";
 
@@ -77,8 +78,8 @@ function loadIndex(projectRoot?: string): IndexFile {
     try {
       const raw = fs.readFileSync(indexPath, "utf-8");
       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: {} };
@@ -145,8 +146,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;
   }
 }
@@ -556,8 +557,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;
   }
 
@@ -647,8 +648,8 @@ 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}`);
+    } catch (error_: any) {
+      logWarn("context_store", `Failed to read archive index, recreating: ${error_}`);
     }
   }
 
@@ -675,8 +676,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;
   }
 
@@ -705,8 +706,8 @@ function removeFromArchiveIndex(contextId: string, projectRoot?: string): boolea
       }
     }
     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,10 +13,9 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 
 import { atomicWrite } from "../base/atomic-write.js";
-import { getContextDir, getContextPlansDir, sanitizeTitle } from "../base/constants.js";
+import { getContextPlansDir, sanitizeTitle } from "../base/constants.js";
 import { logDebug, logInfo, logWarn, logError } from "../base/logger.js";
 import { generateSlug } from "../base/utils.js";
-import type { ContextState } from "../types.js";
 
 // ---------------------------------------------------------------------------
 // Plan archival
@@ -144,6 +143,7 @@ export function findLatestPlan(
   // 1. Check state.json plan_path first
   try {
     // Dynamic import to avoid circular dependency at module level
+    // eslint-disable-next-line @typescript-eslint/no-require-imports, no-undef -- dynamic require to avoid circular dependency
     const stateIo = require("../base/state-io.js");
     const state = stateIo.readStateJson(contextId, projectRoot);
     if (state?.plan_path && fs.existsSync(state.plan_path)) {

package/dist/templates/_shared/scripts/resolve-run.ts

@@ -0,0 +1,61 @@
+#!/usr/bin/env bun
+/**
+ * Cross-platform project root resolver for hook and status line commands.
+ *
+ * Finds the project root (via git or .aiwcli/ anchor walk-up), then spawns
+ * the target script with cwd set to the root. stdin/stdout/stderr pass through.
+ *
+ * Install:  ~/.aiwcli/bin/resolve-run.ts  (global, always findable via ~)
+ * Usage:    bun ~/.aiwcli/bin/resolve-run.ts .aiwcli/_shared/scripts/status_line.ts
+ *
+ * Works on: bash, zsh, PowerShell, cmd (anywhere bun + ~ expansion works)
+ */
+import { execSync } from "node:child_process";
+import * as fs from "node:fs";
+import * as path from "node:path";
+
+function findProjectRoot(): string {
+  // 1. git (works from any subdirectory of a repo)
+  try {
+    const root = execSync("git rev-parse --show-toplevel", {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 2000,
+    }).trim();
+    if (root && fs.existsSync(path.join(root, ".aiwcli"))) return root;
+  } catch { /* not a git repo or git not available */ }
+
+  // 2. Walk up from cwd to find .aiwcli/ anchor
+  let dir = process.cwd();
+  while (true) {
+    if (fs.existsSync(path.join(dir, ".aiwcli"))) return dir;
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+
+  return process.cwd(); // last resort
+}
+
+const target = process.argv[2];
+if (!target) {
+  process.stderr.write("resolve-run: missing script path argument\n");
+  process.exit(1);
+}
+
+const root = findProjectRoot();
+const fullPath = path.resolve(root, target);
+
+if (!fs.existsSync(fullPath)) {
+  process.stderr.write(`resolve-run: script not found: ${fullPath}\n`);
+  process.exit(1);
+}
+
+const result = Bun.spawnSync(["bun", fullPath], {
+  stdin: "inherit",
+  stdout: "inherit",
+  stderr: "inherit",
+  cwd: root,
+});
+
+process.exit(result.exitCode);

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

@@ -11,9 +11,9 @@
  *
  * 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 { getContextBySessionId } from "../lib-ts/context/context-store.js";
 
 const projectRoot = getProjectRoot(process.cwd());
 const sessionId = process.env.CLAUDE_SESSION_ID;

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

@@ -22,7 +22,10 @@ import { findLatestPlan } from "../lib-ts/context/plan-manager.js";
 // Path setup
 // ---------------------------------------------------------------------------
 const SCRIPT_DIR = path.dirname(new URL(import.meta.url).pathname);
-const OUTPUT_DIR = path.join(".", "_output");
+// Resolve project root from script location (.aiwcli/_shared/scripts/) so paths
+// work even when cwd has drifted via `cd` in a Bash tool call.
+const PROJECT_ROOT = path.resolve(SCRIPT_DIR, "..", "..", "..");
+const OUTPUT_DIR = path.join(PROJECT_ROOT, "_output");
 const CACHE_DIR = path.join(OUTPUT_DIR, "cache");
 const STATUSLINE_CACHE = path.join(CACHE_DIR, ".statusline-cache.json");
 
@@ -342,89 +345,97 @@ function getGitStatus(cwd: string): GitStatus | null {
   return status;
 }
 
-function renderGit(mode: string, git: GitStatus, dirName: string): void {
-  const totalChanged = git.modified + git.staged;
-  const statusIcon = (totalChanged > 0 || git.untracked > 0) ? "*" : "\u2713";
+function renderGit(mode: string, git: GitStatus | null, dirName: string): void {
+  const totalChanged = git ? git.modified + git.staged : 0;
+  const statusIcon = git && (totalChanged > 0 || git.untracked > 0) ? "*" : "\u2713";
 
   switch (mode) {
   case "micro": {
-    let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET} ${GIT_VALUE}${git.branch}${RESET}`;
-    if (git.age_display) {
-      line += ` ${git.age_color}${git.age_display}${RESET}`;
-    }
-    line += " ";
-    if (statusIcon === "\u2713") {
-      line += `${GIT_CLEAN}${statusIcon}${RESET}`;
-    } else {
-      line += `${GIT_MODIFIED}${statusIcon}${totalChanged}${RESET}`;
+    let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET}`;
+    if (git) {
+      line += ` ${GIT_VALUE}${git.branch}${RESET}`;
+      if (git.age_display) {
+        line += ` ${git.age_color}${git.age_display}${RESET}`;
+      }
+      line += " ";
+      if (statusIcon === "\u2713") {
+        line += `${GIT_CLEAN}${statusIcon}${RESET}`;
+      } else {
+        line += `${GIT_MODIFIED}${statusIcon}${totalChanged}${RESET}`;
+      }
     }
     console.log(line);
-  
+
   break;
   }
   case "mini": {
-    let line =
-      `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET} ` +
-      `${SLATE_600}\u2502${RESET} ${GIT_VALUE}${git.branch}${RESET}`;
-    if (git.age_display) {
-      line += ` ${SLATE_600}\u2502${RESET} ${git.age_color}${git.age_display}${RESET}`;
-    }
-    line += ` ${SLATE_600}\u2502${RESET} `;
-    if (statusIcon === "\u2713") {
-      line += `${GIT_CLEAN}${statusIcon}${RESET}`;
-    } else {
-      line += `${GIT_MODIFIED}${statusIcon}${totalChanged}${RESET}`;
-      if (git.untracked > 0) {
-        line += ` ${GIT_ADDED}+${git.untracked}${RESET}`;
+    let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET}`;
+    if (git) {
+      line += ` ${SLATE_600}\u2502${RESET} ${GIT_VALUE}${git.branch}${RESET}`;
+      if (git.age_display) {
+        line += ` ${SLATE_600}\u2502${RESET} ${git.age_color}${git.age_display}${RESET}`;
+      }
+      line += ` ${SLATE_600}\u2502${RESET} `;
+      if (statusIcon === "\u2713") {
+        line += `${GIT_CLEAN}${statusIcon}${RESET}`;
+      } else {
+        line += `${GIT_MODIFIED}${statusIcon}${totalChanged}${RESET}`;
+        if (git.untracked > 0) {
+          line += ` ${GIT_ADDED}+${git.untracked}${RESET}`;
+        }
       }
     }
     console.log(line);
-  
+
   break;
   }
   case "nano": {
-    let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET} ${GIT_VALUE}${git.branch}${RESET} `;
-    if (statusIcon === "\u2713") {
-      line += `${GIT_CLEAN}\u2713${RESET}`;
-    } else {
-      line += `${GIT_MODIFIED}*${totalChanged}${RESET}`;
+    let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET}`;
+    if (git) {
+      line += ` ${GIT_VALUE}${git.branch}${RESET} `;
+      if (statusIcon === "\u2713") {
+        line += `${GIT_CLEAN}\u2713${RESET}`;
+      } else {
+        line += `${GIT_MODIFIED}*${totalChanged}${RESET}`;
+      }
     }
     console.log(line);
-  
+
   break;
   }
   default: {
-    let line =
-      `${GIT_PRIMARY}\u25C8${RESET} ${GIT_PRIMARY}PWD:${RESET} ${GIT_DIR}${dirName}${RESET} ` +
-      `${SLATE_600}\u2502${RESET} ` +
-      `${GIT_PRIMARY}Branch:${RESET} ${GIT_VALUE}${git.branch}${RESET}`;
-    if (git.age_display) {
-      line += ` ${SLATE_600}\u2502${RESET} ${GIT_PRIMARY}Age:${RESET} ${git.age_color}${git.age_display}${RESET}`;
-    }
-    if (git.stash_count > 0) {
-      line += ` ${SLATE_600}\u2502${RESET} ${GIT_PRIMARY}Stash:${RESET} ${GIT_STASH}${git.stash_count}${RESET}`;
-    }
-
-    if (totalChanged > 0 || git.untracked > 0) {
-      line += ` ${SLATE_600}\u2502${RESET} `;
-      if (totalChanged > 0) {
-        line += `${GIT_PRIMARY}Mod:${RESET} ${GIT_MODIFIED}${totalChanged}${RESET}`;
+    let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_PRIMARY}PWD:${RESET} ${GIT_DIR}${dirName}${RESET}`;
+    if (git) {
+      line += ` ${SLATE_600}\u2502${RESET} ` +
+        `${GIT_PRIMARY}Branch:${RESET} ${GIT_VALUE}${git.branch}${RESET}`;
+      if (git.age_display) {
+        line += ` ${SLATE_600}\u2502${RESET} ${GIT_PRIMARY}Age:${RESET} ${git.age_color}${git.age_display}${RESET}`;
       }
-      if (git.untracked > 0) {
-        if (totalChanged > 0) line += " ";
-        line += `${GIT_PRIMARY}New:${RESET} ${GIT_ADDED}${git.untracked}${RESET}`;
+      if (git.stash_count > 0) {
+        line += ` ${SLATE_600}\u2502${RESET} ${GIT_PRIMARY}Stash:${RESET} ${GIT_STASH}${git.stash_count}${RESET}`;
       }
-    } else {
-      line += ` ${SLATE_600}\u2502${RESET} ${GIT_CLEAN}\u2713 clean${RESET}`;
-    }
 
-    if (git.ahead > 0 || git.behind > 0) {
-      line += ` ${SLATE_600}\u2502${RESET} ${GIT_PRIMARY}Sync:${RESET} `;
-      if (git.ahead > 0) {
-        line += `${GIT_CLEAN}\u2191${git.ahead}${RESET}`;
+      if (totalChanged > 0 || git.untracked > 0) {
+        line += ` ${SLATE_600}\u2502${RESET} `;
+        if (totalChanged > 0) {
+          line += `${GIT_PRIMARY}Mod:${RESET} ${GIT_MODIFIED}${totalChanged}${RESET}`;
+        }
+        if (git.untracked > 0) {
+          if (totalChanged > 0) line += " ";
+          line += `${GIT_PRIMARY}New:${RESET} ${GIT_ADDED}${git.untracked}${RESET}`;
+        }
+      } else {
+        line += ` ${SLATE_600}\u2502${RESET} ${GIT_CLEAN}\u2713 clean${RESET}`;
       }
-      if (git.behind > 0) {
-        line += `${GIT_STASH}\u2193${git.behind}${RESET}`;
+
+      if (git.ahead > 0 || git.behind > 0) {
+        line += ` ${SLATE_600}\u2502${RESET} ${GIT_PRIMARY}Sync:${RESET} `;
+        if (git.ahead > 0) {
+          line += `${GIT_CLEAN}\u2191${git.ahead}${RESET}`;
+        }
+        if (git.behind > 0) {
+          line += `${GIT_STASH}\u2193${git.behind}${RESET}`;
+        }
       }
     }
     console.log(line);
@@ -684,11 +695,9 @@ function main(): void {
   // Render context section
   renderContext(mode, contextPct, contextK, maxK, timeDisplay, modelName);
 
-  // Render git section
+  // Render PWD + git section (PWD always shown, git stats only when in a repo)
   const git = getGitStatus(currentDir);
-  if (git) {
-    renderGit(mode, git, dirName);
-  }
+  renderGit(mode, git, dirName);
 
   // Render context manager line (line 3) with separator
   console.log(SEPARATOR);

package/dist/templates/_shared/{handoff-system → skills/handoff-system}/CLAUDE.md

@@ -173,7 +173,7 @@ If `plan_hash` differs from `plan_hash_consumed`, new plan detected:
 
 **Usage:**
 ```bash
-bun .aiwcli/_shared/handoff-system/scripts/save_handoff.ts [--context-id ID] [--session-id SID] < handoff.md
+bun .aiwcli/_shared/skills/handoff-system/scripts/save_handoff.ts [--context-id ID] [--session-id SID] < handoff.md
 ```
 
 **Stdin format:**
@@ -209,13 +209,13 @@ If timestamp folder exists, appends `-2`, `-3`, etc.
 **Usage:**
 ```bash
 # Auto-discover from current session
-bun .aiwcli/_shared/handoff-system/scripts/resume_handoff.ts
+bun .aiwcli/_shared/skills/handoff-system/scripts/resume_handoff.ts
 
 # Explicit handoff path
-bun .aiwcli/_shared/handoff-system/scripts/resume_handoff.ts path/to/handoff/index.md
+bun .aiwcli/_shared/skills/handoff-system/scripts/resume_handoff.ts path/to/handoff/index.md
 
 # Explicit context
-bun .aiwcli/_shared/handoff-system/scripts/resume_handoff.ts --context context-id
+bun .aiwcli/_shared/skills/handoff-system/scripts/resume_handoff.ts --context context-id
 ```
 
 **Output format (to stdout):**
@@ -257,7 +257,7 @@ Uses `CLAUDE_SESSION_ID` env var → lookup context → find latest handoff in `
 
 ### handoff-reader.ts
 
-**Location:** `_shared/handoff-system/lib/handoff-reader.ts`
+**Location:** `_shared/skills/handoff-system/lib/handoff-reader.ts`
 
 **Exports:**
 
@@ -292,7 +292,7 @@ const SECTION_FILES = {
 
 ### document-generator.ts
 
-**Location:** `_shared/handoff-system/lib/document-generator.ts`
+**Location:** `_shared/skills/handoff-system/lib/document-generator.ts`
 
 **Exports:**
 
@@ -316,7 +316,7 @@ function buildDeadEndsSection(deadEnds: DeadEnd[]): string
 **Thin pointer pattern:**
 
 `.claude/skills/handoff/SKILL.md` (user-facing, discoverable via `/`, `user-invocable: true`)
-→ References `.aiwcli/_shared/handoff-system/workflows/handoff.md` (detailed procedural steps)
+→ References `.aiwcli/_shared/skills/handoff-system/workflows/handoff.md` (detailed procedural steps)
 
 **Benefits:**
 - Skill files stay concise (easy to scan in `/` menu)
@@ -325,7 +325,7 @@ function buildDeadEndsSection(deadEnds: DeadEnd[]): string
 
 **Example reference format:**
 ```markdown
-See `.aiwcli/_shared/handoff-system/workflows/handoff.md` for complete process documentation.
+See `.aiwcli/_shared/skills/handoff-system/workflows/handoff.md` for complete process documentation.
 ```
 
 ## Testing
@@ -406,7 +406,7 @@ Expected: No import errors, clean execution.
 ## Gotchas
 
 **Template sync is mandatory:**
-Both `.aiwcli/_shared/handoff-system/` (working copy) and `packages/cli/src/templates/_shared/handoff-system/` (template source) must stay in sync per CLAUDE.md template sync rules.
+Both `.aiwcli/_shared/skills/handoff-system/` (working copy) and `packages/cli/src/templates/_shared/skills/handoff-system/` (template source) must stay in sync per CLAUDE.md template sync rules.
 
 **Import paths after move:**
 - From `scripts/resume_handoff.ts` → `lib/handoff-reader.ts`: `../lib/handoff-reader.js`
@@ -418,7 +418,7 @@ Both `.aiwcli/_shared/handoff-system/` (working copy) and `packages/cli/src/temp
 - No direct handoff-reader dependency in hooks
 
 **Command file script paths are absolute:**
-- Reference from project root: `.aiwcli/_shared/handoff-system/scripts/save_handoff.ts`
+- Reference from project root: `.aiwcli/_shared/skills/handoff-system/scripts/save_handoff.ts`
 - NOT relative to command file location
 
 **Section markers must be HTML comments:**

package/dist/templates/_shared/{handoff-system → skills/handoff-system}/lib/document-generator.ts

@@ -6,17 +6,18 @@
  * work to a new session (typically due to context window limits).
  */
 
+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 { getContextHandoffsDir, getContextDir } from "../base/constants.js";
+
 import { atomicWrite } from "../base/atomic-write.js";
+import { getContextHandoffsDir, getContextDir } from "../base/constants.js";
 import { logInfo, logError } from "../base/logger.js";
 import { nowIso } from "../base/utils.js";
-import { getContext, saveState } from "../context/context-store.js";
+import { getContext } from "../context/context-store.js";
 import { getTasks } from "../context/task-tracker.js";
 import { renderTaskList, formatContinuationHeader, formatReason } from "../templates/formatters.js";
-import type { HandoffDocument, Task } from "../types.js";
+import type { HandoffDocument } from "../types.js";
 
 /**
  * Generate and save a handoff document for a context.

package/dist/templates/_shared/{handoff-system → skills/handoff-system}/lib/handoff-reader.ts

@@ -8,6 +8,7 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
+
 import { getContextHandoffsDir } from "../../lib-ts/base/constants.js";
 import { getContext } from "../../lib-ts/context/context-store.js";
 import type { HandoffSections } from "../../lib-ts/types.js";
@@ -29,7 +30,7 @@ export function findLatestHandoff(contextId: string, projectRoot?: string): stri
       .sort();
 
     if (entries.length === 0) return null;
-    return path.join(handoffsDir, entries[entries.length - 1]!);
+    return path.join(handoffsDir, entries.at(-1)!);
   } catch {
     return null;
   }

package/dist/templates/_shared/{handoff-system → skills/handoff-system}/scripts/resume_handoff.ts

@@ -4,8 +4,8 @@
  * a structured briefing to stdout.
  *
  * Usage:
- *   bun .aiwcli/_shared/handoff-system/scripts/resume_handoff.ts <handoff_folder_or_index>
- *   bun .aiwcli/_shared/handoff-system/scripts/resume_handoff.ts --context <context_id>
+ *   bun .aiwcli/_shared/skills/handoff-system/scripts/resume_handoff.ts <handoff_folder_or_index>
+ *   bun .aiwcli/_shared/skills/handoff-system/scripts/resume_handoff.ts --context <context_id>
  *
  * If no args, auto-discovers the active context and finds the latest handoff.
  *
@@ -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 { getContextBySessionId } from "../../lib-ts/context/context-store.js";
 import {
   findLatestHandoff,
   readHandoffSections,
   getHandoffTimestamp,
   getHandoffPlanReference,
 } from "../lib/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

package/dist/templates/_shared/{handoff-system → skills/handoff-system}/scripts/save_handoff.ts

@@ -3,12 +3,12 @@
  * Save a handoff document with folder-based sharding.
  *
  * Usage:
- *   bun .aiwcli/_shared/handoff-system/scripts/save_handoff.ts <<'EOF'
+ *   bun .aiwcli/_shared/skills/handoff-system/scripts/save_handoff.ts <<'EOF'
  *   # Your handoff markdown content here (with <!-- SECTION: name --> markers)
  *   EOF
  *
  * Or with a file:
- *   bun .aiwcli/_shared/handoff-system/scripts/save_handoff.ts < handoff.md
+ *   bun .aiwcli/_shared/skills/handoff-system/scripts/save_handoff.ts < handoff.md
  *
  * This script:
  * 1. Auto-resolves the active context ID
@@ -23,12 +23,12 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 
-import { getContext, saveState, getContextBySessionId, getAllContexts } 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 { getHandoffFolderPath, getProjectRoot } from "../../lib-ts/base/constants.js";
 import { getGitStatusShort } from "../../lib-ts/base/git-state.js";
+import { logInfo, logWarn, logError } from "../../lib-ts/base/logger.js";
 import { eprint } from "../../lib-ts/base/utils.js";
+import { getContext, saveState, getContextBySessionId, getAllContexts } from "../../lib-ts/context/context-store.js";
 
 // ---------------------------------------------------------------------------
 // Parsing helpers
@@ -333,8 +333,8 @@ function main(): void {
       } else {
         logWarn("save_handoff", `Failed to copy plan to handoff: ${error}`);
       }
-    } catch (e) {
-      logWarn("save_handoff", `Plan update failed (non-critical): ${e}`);
+    } catch (error) {
+      logWarn("save_handoff", `Plan update failed (non-critical): ${error}`);
     }
   } else if (planPath) {
     // Fallback: copy unchanged plan if Claude didn't provide an update
@@ -346,8 +346,8 @@ function main(): void {
       } else {
         logWarn("save_handoff", `Failed to copy plan: ${error}`);
       }
-    } catch (e) {
-      logWarn("save_handoff", `Failed to read plan: ${e}`);
+    } catch (error) {
+      logWarn("save_handoff", `Failed to read plan: ${error}`);
     }
   }
 
@@ -384,13 +384,12 @@ function main(): void {
       // Append mode
       if (!fileContents[filename]) fileContents[filename] = [];
       fileContents[filename]!.push(sectionContent);
+    } else if (!fileContents[filename]) {
+      // Write mode with title — new file
+      fileContents[filename] = [`# ${title}`, "", sectionContent];
     } else {
-      // Write mode with title
-      if (!fileContents[filename]) {
-        fileContents[filename] = [`# ${title}`, "", sectionContent];
-      } else {
-        fileContents[filename] = [`# ${title}`, "", ...fileContents[filename]!, "", sectionContent];
-      }
+      // Write mode with title — prepend to existing
+      fileContents[filename] = [`# ${title}`, "", ...fileContents[filename]!, "", sectionContent];
     }
   }
 
@@ -449,8 +448,8 @@ function main(): void {
     } else {
       logWarn("save_handoff", `Could not load context state for ${contextId}`);
     }
-  } catch (e) {
-    logWarn("save_handoff", `Handoff saved but auto-resume won't work: ${e}`);
+  } catch (error) {
+    logWarn("save_handoff", `Handoff saved but auto-resume won't work: ${error}`);
   }
 
   // Output success message

package/dist/templates/_shared/{handoff-system → skills/handoff-system}/workflows/handoff-resume.md

@@ -16,13 +16,13 @@ Run the resume script to collect and format all handoff sections:
 
 **If `$ARGUMENTS` is provided:**
 ```bash
-bun .aiwcli/_shared/handoff-system/scripts/resume_handoff.ts "$ARGUMENTS"
+bun .aiwcli/_shared/skills/handoff-system/scripts/resume_handoff.ts "$ARGUMENTS"
 ```
 
 **If `$ARGUMENTS` is empty:**
 The script auto-discovers the active context ID programmatically — no manual lookup needed:
 ```bash
-bun .aiwcli/_shared/handoff-system/scripts/resume_handoff.ts
+bun .aiwcli/_shared/skills/handoff-system/scripts/resume_handoff.ts
 ```
 
 Present the script's output to the conversation. The output is already structured in priority order (dead ends first, then pending items, decisions, git delta, completed work, context notes).

package/dist/templates/_shared/{handoff-system → skills/handoff-system}/workflows/handoff.md

@@ -153,7 +153,7 @@ The closing `EOF` delimiter **MUST** be at column 0 (no leading spaces or tabs).
 
 **Correct Example:**
 ```bash
-bun .aiwcli/_shared/handoff-system/scripts/save_handoff.ts <<'EOF'
+bun .aiwcli/_shared/skills/handoff-system/scripts/save_handoff.ts <<'EOF'
 content here
 EOF
 ```
@@ -161,7 +161,7 @@ EOF
 
 **Wrong Example (will fail):**
 ```bash
-bun .aiwcli/_shared/handoff-system/scripts/save_handoff.ts <<'EOF'
+bun .aiwcli/_shared/skills/handoff-system/scripts/save_handoff.ts <<'EOF'
 content here
   EOF
 ```
@@ -172,7 +172,7 @@ content here
 Instead of writing the file directly, pipe your handoff content to the save script:
 
 ```bash
-bun .aiwcli/_shared/handoff-system/scripts/save_handoff.ts <<'EOF'
+bun .aiwcli/_shared/skills/handoff-system/scripts/save_handoff.ts <<'EOF'
 {Your complete handoff markdown content from Step 3}
 EOF
 ```