aiwcli 0.12.0 → 0.12.1

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

@@ -9,10 +9,10 @@
  *
  * Usage: echo '{"session_id":"...","model":{"display_name":"Opus"},...}' | bun status_line.ts
  */
-import * as fs from "node:fs";
-import * as path from "node:path";
 import { execFileSync } from "node:child_process";
+import * as fs from "node:fs";
 import { homedir } from "node:os";
+import * as path from "node:path";
 
 import { CONTEXT_BASELINE_TOKENS } from "../lib-ts/base/hook-utils.js";
 import { getContextBySessionId, getContext, loadState, saveState } from "../lib-ts/context/context-store.js";
@@ -31,37 +31,37 @@ const STATUSLINE_CACHE = path.join(CACHE_DIR, ".statusline-cache.json");
 // ---------------------------------------------------------------------------
 const NO_COLOR = Boolean(process.env.NO_COLOR);
 
-const RESET = NO_COLOR ? "" : "\x1b[0m";
+const RESET = NO_COLOR ? "" : "\u001B[0m";
 
 // Structural
-const SLATE_300 = NO_COLOR ? "" : "\x1b[38;2;203;213;225m";
-const SLATE_400 = NO_COLOR ? "" : "\x1b[38;2;148;163;184m";
-const SLATE_500 = NO_COLOR ? "" : "\x1b[38;2;100;116;139m";
-const SLATE_600 = NO_COLOR ? "" : "\x1b[38;2;71;85;105m";
+const SLATE_300 = NO_COLOR ? "" : "\u001B[38;2;203;213;225m";
+const SLATE_400 = NO_COLOR ? "" : "\u001B[38;2;148;163;184m";
+const SLATE_500 = NO_COLOR ? "" : "\u001B[38;2;100;116;139m";
+const SLATE_600 = NO_COLOR ? "" : "\u001B[38;2;71;85;105m";
 
 // Semantic
-const EMERALD = NO_COLOR ? "" : "\x1b[38;2;74;222;128m";
-const ROSE = NO_COLOR ? "" : "\x1b[38;2;251;113;133m";
-const AMBER = NO_COLOR ? "" : "\x1b[38;2;251;191;36m";
+const EMERALD = NO_COLOR ? "" : "\u001B[38;2;74;222;128m";
+const ROSE = NO_COLOR ? "" : "\u001B[38;2;251;113;133m";
+const AMBER = NO_COLOR ? "" : "\u001B[38;2;251;191;36m";
 
 // Context colors
-const CTX_PRIMARY = NO_COLOR ? "" : "\x1b[38;2;129;140;248m";
-const CTX_SECONDARY = NO_COLOR ? "" : "\x1b[38;2;165;180;252m";
-const CTX_ACCENT = NO_COLOR ? "" : "\x1b[38;2;139;92;246m";
-const CTX_BUCKET_EMPTY = NO_COLOR ? "" : "\x1b[38;2;75;82;95m";
+const CTX_PRIMARY = NO_COLOR ? "" : "\u001B[38;2;129;140;248m";
+const CTX_SECONDARY = NO_COLOR ? "" : "\u001B[38;2;165;180;252m";
+const CTX_ACCENT = NO_COLOR ? "" : "\u001B[38;2;139;92;246m";
+const CTX_BUCKET_EMPTY = NO_COLOR ? "" : "\u001B[38;2;75;82;95m";
 
 // Git colors
-const GIT_PRIMARY = NO_COLOR ? "" : "\x1b[38;2;56;189;248m";
-const GIT_VALUE = NO_COLOR ? "" : "\x1b[38;2;186;230;253m";
-const GIT_DIR = NO_COLOR ? "" : "\x1b[38;2;147;197;253m";
-const GIT_CLEAN = NO_COLOR ? "" : "\x1b[38;2;125;211;252m";
-const GIT_MODIFIED = NO_COLOR ? "" : "\x1b[38;2;96;165;250m";
-const GIT_ADDED = NO_COLOR ? "" : "\x1b[38;2;59;130;246m";
-const GIT_STASH = NO_COLOR ? "" : "\x1b[38;2;165;180;252m";
-const GIT_AGE_FRESH = NO_COLOR ? "" : "\x1b[38;2;125;211;252m";
-const GIT_AGE_RECENT = NO_COLOR ? "" : "\x1b[38;2;96;165;250m";
-const GIT_AGE_STALE = NO_COLOR ? "" : "\x1b[38;2;59;130;246m";
-const GIT_AGE_OLD = NO_COLOR ? "" : "\x1b[38;2;99;102;241m";
+const GIT_PRIMARY = NO_COLOR ? "" : "\u001B[38;2;56;189;248m";
+const GIT_VALUE = NO_COLOR ? "" : "\u001B[38;2;186;230;253m";
+const GIT_DIR = NO_COLOR ? "" : "\u001B[38;2;147;197;253m";
+const GIT_CLEAN = NO_COLOR ? "" : "\u001B[38;2;125;211;252m";
+const GIT_MODIFIED = NO_COLOR ? "" : "\u001B[38;2;96;165;250m";
+const GIT_ADDED = NO_COLOR ? "" : "\u001B[38;2;59;130;246m";
+const GIT_STASH = NO_COLOR ? "" : "\u001B[38;2;165;180;252m";
+const GIT_AGE_FRESH = NO_COLOR ? "" : "\u001B[38;2;125;211;252m";
+const GIT_AGE_RECENT = NO_COLOR ? "" : "\u001B[38;2;96;165;250m";
+const GIT_AGE_STALE = NO_COLOR ? "" : "\u001B[38;2;59;130;246m";
+const GIT_AGE_OLD = NO_COLOR ? "" : "\u001B[38;2;99;102;241m";
 
 // ---------------------------------------------------------------------------
 // Display modes
@@ -96,7 +96,7 @@ function getBucketColor(pos: number, maxPos: number): string {
   if (NO_COLOR) return "";
   const pct = Math.floor((pos * 100) / maxPos);
 
-  let r: number, g: number, b: number;
+  let b: number; let g: number; let r: number;
 
   if (pct <= 33) {
     r = 74 + Math.floor(((250 - 74) * pct) / 33);
@@ -114,7 +114,7 @@ function getBucketColor(pos: number, maxPos: number): string {
     b = 60 + Math.floor(((68 - 60) * t) / 34);
   }
 
-  return `\x1b[38;2;${r};${g};${b}m`;
+  return `\u001B[38;2;${r};${g};${b}m`;
 }
 
 // ---------------------------------------------------------------------------
@@ -131,9 +131,9 @@ function renderContextBar(width: number, pct: number): [string, string] {
     if (i <= filled) {
       const color = getBucketColor(i, width);
       lastColor = color;
-      parts.push(`${color}\u26c1${RESET}`);
+      parts.push(`${color}\u26C1${RESET}`);
     } else {
-      parts.push(`${CTX_BUCKET_EMPTY}\u26c1${RESET}`);
+      parts.push(`${CTX_BUCKET_EMPTY}\u26C1${RESET}`);
     }
     if (width > 8) {
       parts.push(" ");
@@ -184,40 +184,51 @@ function renderContext(
 
   const shortModel = shortenModel(modelName);
 
-  if (mode === "nano") {
-    const [bar] = renderContextBar(5, contextPct);
-    console.log(
-      `${CTX_PRIMARY}\u25c9${RESET} ${CTX_ACCENT}${shortModel}${RESET} ` +
-      `${bar} ${pctColor}${contextPct}%${RESET} ` +
-      `${CTX_ACCENT}\u23f1${RESET} ${SLATE_300}${timeDisplay}${RESET}`,
-    );
-  } else if (mode === "micro") {
+  switch (mode) {
+  case "micro": {
     const [bar] = renderContextBar(6, contextPct);
     console.log(
-      `${CTX_PRIMARY}\u25c9${RESET} ${CTX_ACCENT}${shortModel}${RESET} ` +
+      `${CTX_PRIMARY}\u25C9${RESET} ${CTX_ACCENT}${shortModel}${RESET} ` +
       `${SLATE_600}\u2502${RESET} ` +
       `${bar} ${pctColor}${contextPct}%${RESET} ${SLATE_500}(${contextK}k)${RESET} ` +
-      `${CTX_ACCENT}\u23f1${RESET} ${SLATE_300}${timeDisplay}${RESET}`,
+      `${CTX_ACCENT}\u23F1${RESET} ${SLATE_300}${timeDisplay}${RESET}`,
     );
-  } else if (mode === "mini") {
+  
+  break;
+  }
+  case "mini": {
     const [bar] = renderContextBar(8, contextPct);
     console.log(
-      `${CTX_PRIMARY}\u25c9${RESET} ${CTX_ACCENT}${shortModel}${RESET} ` +
+      `${CTX_PRIMARY}\u25C9${RESET} ${CTX_ACCENT}${shortModel}${RESET} ` +
       `${SLATE_600}\u2502${RESET} ` +
       `${CTX_SECONDARY}CTX:${RESET} ${bar} ` +
       `${pctColor}${contextPct}%${RESET} ${SLATE_500}(${contextK}k/${maxK}k)${RESET} ` +
-      `${CTX_ACCENT}\u23f1${RESET} ${SLATE_300}${timeDisplay}${RESET}`,
+      `${CTX_ACCENT}\u23F1${RESET} ${SLATE_300}${timeDisplay}${RESET}`,
     );
-  } else {
+  
+  break;
+  }
+  case "nano": {
+    const [bar] = renderContextBar(5, contextPct);
+    console.log(
+      `${CTX_PRIMARY}\u25C9${RESET} ${CTX_ACCENT}${shortModel}${RESET} ` +
+      `${bar} ${pctColor}${contextPct}%${RESET} ` +
+      `${CTX_ACCENT}\u23F1${RESET} ${SLATE_300}${timeDisplay}${RESET}`,
+    );
+  
+  break;
+  }
+  default: {
     const [bar, lastColor] = renderContextBar(16, contextPct);
     console.log(
-      `${CTX_PRIMARY}\u25c9${RESET} ${CTX_SECONDARY}Model:${RESET} ${CTX_ACCENT}${shortModel}${RESET} ` +
+      `${CTX_PRIMARY}\u25C9${RESET} ${CTX_SECONDARY}Model:${RESET} ${CTX_ACCENT}${shortModel}${RESET} ` +
       `${SLATE_600}\u2502${RESET} ` +
       `${CTX_SECONDARY}Context:${RESET} ${bar} ` +
       `${lastColor}${contextPct}%${RESET} ${SLATE_500}(${contextK}k/${maxK}k)${RESET} ` +
       `${SLATE_600}\u2502${RESET} ` +
-      `${CTX_ACCENT}\u23f1${RESET} ${SLATE_300}${timeDisplay}${RESET}`,
+      `${CTX_ACCENT}\u23F1${RESET} ${SLATE_300}${timeDisplay}${RESET}`,
     );
+  }
   }
 
   console.log(SEPARATOR);
@@ -310,7 +321,7 @@ function getGitStatus(cwd: string): GitStatus | null {
       const ageSec = nowEpoch - lastEpoch;
       const ageMin = Math.floor(ageSec / 60);
       const ageHrs = Math.floor(ageSec / 3600);
-      const ageDays = Math.floor(ageSec / 86400);
+      const ageDays = Math.floor(ageSec / 86_400);
 
       if (ageMin < 1) {
         status.age_display = "now";
@@ -338,16 +349,9 @@ function renderGit(mode: string, git: GitStatus, dirName: string): void {
   const totalChanged = git.modified + git.staged;
   const statusIcon = (totalChanged > 0 || git.untracked > 0) ? "*" : "\u2713";
 
-  if (mode === "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}`;
-    }
-    console.log(line);
-  } else if (mode === "micro") {
-    let line = `${GIT_PRIMARY}\u25c8${RESET} ${GIT_DIR}${dirName}${RESET} ${GIT_VALUE}${git.branch}${RESET}`;
+  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}`;
     }
@@ -358,9 +362,12 @@ function renderGit(mode: string, git: GitStatus, dirName: string): void {
       line += `${GIT_MODIFIED}${statusIcon}${totalChanged}${RESET}`;
     }
     console.log(line);
-  } else if (mode === "mini") {
+  
+  break;
+  }
+  case "mini": {
     let line =
-      `${GIT_PRIMARY}\u25c8${RESET} ${GIT_DIR}${dirName}${RESET} ` +
+      `${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}`;
@@ -375,9 +382,23 @@ function renderGit(mode: string, git: GitStatus, dirName: string): void {
       }
     }
     console.log(line);
-  } else {
+  
+  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}`;
+    }
+    console.log(line);
+  
+  break;
+  }
+  default: {
     let line =
-      `${GIT_PRIMARY}\u25c8${RESET} ${GIT_PRIMARY}PWD:${RESET} ${GIT_DIR}${dirName}${RESET} ` +
+      `${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) {
@@ -410,6 +431,7 @@ function renderGit(mode: string, git: GitStatus, dirName: string): void {
       }
     }
     console.log(line);
+  }
   }
 }
 
@@ -493,25 +515,36 @@ function renderContextManager(
     planPart = ` ${SLATE_600}\u2502${RESET} ${CTX_SECONDARY}Plan:${RESET} ${SLATE_300}${truncatedPlan}${RESET}`;
   }
 
-  if (mode === "nano") {
-    console.log(`${CTX_ACCENT}\u25c6${RESET} ${SLATE_400}${truncatedId}${RESET}${modeBadge}`);
-  } else if (mode === "micro") {
-    console.log(`${CTX_ACCENT}\u25c6${RESET} ${SLATE_400}${truncatedId}${RESET}${modeBadge}`);
-  } else if (mode === "mini") {
+  switch (mode) {
+  case "micro": {
+    console.log(`${CTX_ACCENT}\u25C6${RESET} ${SLATE_400}${truncatedId}${RESET}${modeBadge}`);
+  
+  break;
+  }
+  case "mini": {
     console.log(
-      `${CTX_ACCENT}\u25c6${RESET} ${SLATE_400}${truncatedId}${RESET}` +
+      `${CTX_ACCENT}\u25C6${RESET} ${SLATE_400}${truncatedId}${RESET}` +
       `${modeBadge}${planPart}`,
     );
-  } else {
+  
+  break;
+  }
+  case "nano": {
+    console.log(`${CTX_ACCENT}\u25C6${RESET} ${SLATE_400}${truncatedId}${RESET}${modeBadge}`);
+  
+  break;
+  }
+  default: {
     console.log(
-      `${CTX_ACCENT}\u25c6${RESET} ${CTX_SECONDARY}Context:${RESET} ${SLATE_300}${truncatedId}${RESET}` +
+      `${CTX_ACCENT}\u25C6${RESET} ${CTX_SECONDARY}Context:${RESET} ${SLATE_300}${truncatedId}${RESET}` +
       `${modeBadge}${planPart}`,
     );
+  }
   }
 }
 
 function renderNoContext(mode: string): void {
-  const warn = `${ROSE}\u26a0 ${RESET}`;
+  const warn = `${ROSE}\u26A0 ${RESET}`;
   if (mode === "normal") {
     console.log(`${warn} ${ROSE}NO CONTEXT${RESET} ${SLATE_500}\u2014 type ^ for context manager${RESET}`);
   } else {
@@ -620,7 +653,7 @@ function main(): void {
   const inputTokens: number = usage.input_tokens ?? 0;
   const cacheCreation: number = usage.cache_creation_input_tokens ?? 0;
   const outputTokens: number = usage.output_tokens ?? 0;
-  const contextMax: number = ctxWin.context_window_size ?? 200000;
+  const contextMax: number = ctxWin.context_window_size ?? 200_000;
 
   // Calculate context percentage
   const usedPct = ctxWin.used_percentage;

package/dist/templates/cc-native/.claude/settings.json

@@ -123,6 +123,17 @@
             "timeout": 5000
           }
         ]
+      },
+      {
+        "matcher": "^Task$",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bun .aiwcli/_cc-native/hooks/enhance_plan_post_subagent.ts",
+            "timeout": 10000,
+            "blockOnFail": false
+          }
+        ]
       }
     ],
     "PermissionRequest": [
@@ -166,18 +177,6 @@
           }
         ]
       }
-    ],
-    "SubagentStop": [
-      {
-        "matcher": "Plan",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "bun .aiwcli/_cc-native/hooks/enhance_plan_post_subagent.ts",
-            "timeout": 10000
-          }
-        ]
-      }
     ]
   }
 }

package/dist/templates/cc-native/_cc-native/hooks/cc-native-plan-review.ts

@@ -19,11 +19,12 @@
  *   - reviewer-output/{reviewer}.json (individual reviewer results)
  */
 
+import * as crypto from "node:crypto";
 import * as fs from "node:fs";
-import * as path from "node:path";
 import * as os from "node:os";
-import * as crypto from "node:crypto";
+import * as path from "node:path";
 
+import { getProjectRoot, getAiwcliDir, getContextReviewsDir, getContextDir, getReviewFolderPath } from "../../_shared/lib-ts/base/constants.js";
 import {
   loadHookInput,
   runHookAsync,
@@ -36,44 +37,11 @@ import {
   emitContextAndBlock,
 } from "../../_shared/lib-ts/base/hook-utils.js";
 import { isInternalCall, findExecutable } from "../../_shared/lib-ts/base/subprocess-utils.js";
-import { getProjectRoot, getAiwcliDir, getContextReviewsDir, getContextDir, getReviewFolderPath } from "../../_shared/lib-ts/base/constants.js";
 import { eprint } from "../../_shared/lib-ts/base/utils.js";
 import { getContextBySessionId, getAllContexts } from "../../_shared/lib-ts/context/context-store.js";
 import { findPlanPathInTranscript } from "../../_shared/lib-ts/context/plan-manager.js";
-
-import type {
-  AgentConfig,
-  OrchestratorConfig,
-  ProviderConfig,
-  ModelsConfig,
-  ReviewerResult,
-  CombinedReviewResult,
-  OrchestratorResult,
-  Verdict,
-  IterationState,
-} from "../lib-ts/types.js";
 import type { ContextState } from "../../_shared/lib-ts/types.js";
-import {
-  REVIEW_SCHEMA,
-  DEFAULT_DISPLAY,
-  DEFAULT_SANITIZATION,
-} from "../lib-ts/types.js";
-
-import {
-  isPlanAlreadyReviewed,
-  wasPlanPreviouslyDenied,
-  getLastPlanReview,
-  markPlanReviewed,
-  wasQuestionsAsked,
-  markQuestionsAsked,
-} from "../lib-ts/cc-native-state.js";
-
-import { worstVerdict } from "../lib-ts/verdict.js";
-import { computeCorroboratedDecision } from "../lib-ts/corroboration.js";
-import { loadConfig, getDisplaySettings } from "../lib-ts/config.js";
-import { runOrchestrator } from "../lib-ts/orchestrator.js";
 import { aggregateAgents } from "../lib-ts/aggregate-agents.js";
-import { debugLog } from "../lib-ts/debug.js";
 import {
   writeCombinedArtifacts,
   buildInlineReviewSummary,
@@ -83,9 +51,38 @@ import {
   writeReviewTracker,
 } from "../lib-ts/artifacts.js";
 import type { ReviewTrackerEntry } from "../lib-ts/artifacts.js";
+import {
+  isPlanAlreadyReviewed,
+  wasPlanPreviouslyDenied,
+  getLastPlanReview,
+  markPlanReviewed,
+  wasPlanQuestionsAgentAsked,
+  markQuestionsAsked,
+} from "../lib-ts/cc-native-state.js";
+import { loadConfig, getDisplaySettings } from "../lib-ts/config.js";
+import { computeCorroboratedDecision } from "../lib-ts/corroboration.js";
+import { debugLog } from "../lib-ts/debug.js";
+import { runOrchestrator } from "../lib-ts/orchestrator.js";
+import { runPlanQuestions } from "../lib-ts/plan-questions.js";
 import { runAgentReview } from "../lib-ts/reviewers/index.js";
 import { DEFAULT_REVIEW_ITERATIONS } from "../lib-ts/state.js";
-import { runPlanQuestions } from "../lib-ts/plan-questions.js";
+import {
+  REVIEW_SCHEMA,
+  DEFAULT_DISPLAY,
+  DEFAULT_SANITIZATION,
+} from "../lib-ts/types.js";
+import type {
+  AgentConfig,
+  OrchestratorConfig,
+  ProviderConfig,
+  ModelsConfig,
+  ReviewerResult,
+  CombinedReviewResult,
+  OrchestratorResult,
+  Verdict,
+  IterationState,
+} from "../lib-ts/types.js";
+import { worstVerdict } from "../lib-ts/verdict.js";
 
 // ---------------------------------------------------------------------------
 // Hook Name
@@ -226,7 +223,7 @@ function resolveMandatoryAgents(
     return new Set(configValue as string[]);
   }
   if (!configValue || typeof configValue !== "object") {
-    return new Set(["handoff-readiness", "clarity-auditor", "skeptic"]);
+    return new Set(["clarity-auditor", "handoff-readiness", "skeptic"]);
   }
   const cfg = configValue as Record<string, string[]>;
   const names = new Set(cfg.always ?? []);
@@ -276,8 +273,8 @@ function loadIterationState(reviewsDir: string): IterationState | null {
   if (!fs.existsSync(iterationFile)) return null;
   try {
     return JSON.parse(fs.readFileSync(iterationFile, "utf-8")) as IterationState;
-  } catch (e) {
-    logError(HOOK, `Failed to load iteration state: ${e}`);
+  } catch (error) {
+    logError(HOOK, `Failed to load iteration state: ${error}`);
     return null;
   }
 }
@@ -289,8 +286,8 @@ function saveIterationState(reviewsDir: string, state: IterationState & { schema
     state.schema_version = "1.0.0";
     fs.writeFileSync(iterationFile, JSON.stringify(state, null, 2), "utf-8");
     return true;
-  } catch (e) {
-    logError(HOOK, `Failed to save iteration state: ${e}`);
+  } catch (error) {
+    logError(HOOK, `Failed to save iteration state: ${error}`);
     return false;
   }
 }
@@ -335,7 +332,7 @@ function assignModelsToAgents(
       if (!found) {
         logWarn(HOOK, `Provider '${name}' enabled but CLI '${cliName}' not found on PATH — skipping`);
       }
-      return !!found;
+      return Boolean(found);
     });
 
   if (enabledProviders.length === 0) {
@@ -403,11 +400,11 @@ function loadSettings(projDir: string): Record<string, unknown> {
   }
   mergedAgent.display = getDisplaySettings(config, "agentReview");
   const configRecord = config as Record<string, unknown>;
-  mergedAgent.agentSelection = { ...DEFAULT_AGENT_SELECTION, ...((configRecord.agentSelection as Record<string, unknown>) ?? {}) };
-  mergedAgent.agentDefaults = { model: DEFAULT_AGENT_MODEL, ...((configRecord.agentDefaults as Record<string, unknown>) ?? {}) };
+  mergedAgent.agentSelection = { ...DEFAULT_AGENT_SELECTION, ...(configRecord.agentSelection as Record<string, unknown>) };
+  mergedAgent.agentDefaults = { model: DEFAULT_AGENT_MODEL, ...(configRecord.agentDefaults as Record<string, unknown>) };
   mergedAgent.complexityCategories = (configRecord.complexityCategories as string[]) ?? [...DEFAULT_COMPLEXITY_CATEGORIES];
-  mergedAgent.sanitization = { ...DEFAULT_SANITIZATION, ...((configRecord.sanitization as Record<string, unknown>) ?? {}) };
-  mergedAgent.reviewIterations = { ...DEFAULT_REVIEW_ITERATIONS, ...agentReview.reviewIterations ?? {} };
+  mergedAgent.sanitization = { ...DEFAULT_SANITIZATION, ...(configRecord.sanitization as Record<string, unknown>) };
+  mergedAgent.reviewIterations = { ...DEFAULT_REVIEW_ITERATIONS, ...agentReview.reviewIterations };
 
   const modelsRaw = (config as Record<string, unknown>).models ?? {};
   return { planReview: mergedPlan, agentReview: mergedAgent, models: modelsRaw };
@@ -504,8 +501,8 @@ async function main(): Promise<void> {
   let plan: string;
   try {
     plan = fs.readFileSync(planPath, "utf-8").trim();
-  } catch (e) {
-    skipWithInfo(`Failed to read plan file: ${e}`);
+  } catch (error) {
+    skipWithInfo(`Failed to read plan file: ${error}`);
     return;
   }
 
@@ -520,15 +517,15 @@ async function main(): Promise<void> {
   // ============================================
   // Questions Gate: ask user questions before review
   // ============================================
-  if (!wasQuestionsAsked(sessionId, base)) {
-    logInfo(HOOK, "Questions gate: user has not been asked questions yet, running plan-questions agent");
+  if (!wasPlanQuestionsAgentAsked(sessionId, base)) {
+    logInfo(HOOK, "Questions gate (Phase B): plan-questions agent has not run yet, running now");
     const timeout = typeof (settings.agentReview ?? {}).timeout === "number"
       ? (settings.agentReview as Record<string, unknown>).timeout as number : 120;
     const questionsResult = await runPlanQuestions(plan, aiwcliDir, timeout, undefined, sessionId);
 
-    // Mark questions as asked NOW — prevents infinite gate loop if Claude
+    // Mark agent questions as asked NOW — prevents infinite gate loop if Claude
     // doesn't use AskUserQuestion after denial. Gate fires at most once.
-    markQuestionsAsked(sessionId, base);
+    markQuestionsAsked(sessionId, base, "agent");
 
     const hasQuestions = questionsResult && (
       questionsResult.questions.length > 0 ||
@@ -549,9 +546,9 @@ async function main(): Promise<void> {
       return;
     }
 
-    logInfo(HOOK, "Questions gate: no questions generated, proceeding to review");
+    logInfo(HOOK, "Questions gate (Phase B): no questions generated, proceeding to review");
   } else {
-    logInfo(HOOK, "Questions gate: questions already asked, skipping");
+    logInfo(HOOK, "Questions gate (Phase B): agent already ran, skipping");
   }
 
   const planHash = computePlanHash(plan);
@@ -585,19 +582,19 @@ async function main(): Promise<void> {
         "Plan unchanged since denial. Modify the plan to address review findings, then attempt ExitPlanMode again.",
       );
       return;
-    } else {
+    } 
       // Plan already reviewed with PASS or WARN verdict - skip review
       const verdict = lastReview?.iteration?.latest_verdict || "pass";
       const skipMsg = `[Plan Review] Plan already reviewed (verdict: ${verdict}). Skipping re-review.`;
       emitContext(skipMsg);
       logInfo(HOOK, skipMsg);
       return;
-    }
+    
   }
 
   // Single load of iteration state — reused throughout, saved once at end.
   // Default max=1 is safe: first iteration 1>1=false (runs), Edit E updates max from config before save.
-  let iterationState: IterationState = loadIterationState(reviewsDir) ?? {
+  const iterationState: IterationState = loadIterationState(reviewsDir) ?? {
     current: 1, max: 1, complexity: "medium",
     history: [], graduated: [], passStreaks: {}, lastPlanHash: "",
   };
@@ -761,7 +758,7 @@ async function main(): Promise<void> {
     // Update complexity/max on the already-loaded iteration state (no second disk read)
     const reviewIterations: Record<string, number> = {
       ...DEFAULT_REVIEW_ITERATIONS,
-      ...(agentSettings.reviewIterations ?? {}),
+      ...agentSettings.reviewIterations,
     };
     iterationState.complexity = detectedComplexity;
     iterationState.max = reviewIterations[detectedComplexity] ?? iterationState.max;
@@ -844,7 +841,7 @@ async function main(): Promise<void> {
     if (!r.verdict || r.verdict === "skip" || r.verdict === "error") continue;
     const issues = Array.isArray(r.data?.issues) ? r.data.issues as Array<{ severity?: string }> : [];
     const agentHigh = issues.filter(i => i.severity === "high").length;
-    let verdict = r.verdict;
+    let {verdict} = r;
     if (agentHigh >= highIssueThreshold) {
       logInfo(HOOK, `${r.name}: verdict overridden to 'fail' (${agentHigh} high issues >= ${highIssueThreshold})`);
       verdict = "fail";
@@ -883,8 +880,8 @@ async function main(): Promise<void> {
   };
 
   const displaySettings = {
-    ...(planSettings.display ?? {}),
-    ...(agentSettings.display ?? {}),
+    ...planSettings.display,
+    ...agentSettings.display,
   };
   const combinedSettings = { display: displaySettings };
 
@@ -919,8 +916,8 @@ async function main(): Promise<void> {
   try {
     fs.writeFileSync(path.join(reviewFolder, "plan.md"), plan, "utf-8");
     logDebug(HOOK, `Saved plan snapshot: ${path.join(reviewFolder, "plan.md")}`);
-  } catch (e) {
-    logWarn(HOOK, `Failed to save plan snapshot: ${e}`);
+  } catch (error) {
+    logWarn(HOOK, `Failed to save plan snapshot: ${error}`);
   }
 
   // Build inline summary with top issues (always emitted, even on pass)
@@ -933,7 +930,7 @@ async function main(): Promise<void> {
   contextParts.push(`\nFull review: \`${reviewFile}\`\n`);
   const shouldDeny = corroborationResult.blocking.length > 0;
   const denyReason = shouldDeny ? "corroborated_issues" : "no_corroboration";
-  const reviewScore = shouldDeny ? 1.0 : 0.0;
+  const reviewScore = shouldDeny ? 1 : 0;
 
   logInfo(HOOK, `REVIEW_DECISION: verdict=${combinedResult.overall_verdict}, deny=${shouldDeny}, reason=${denyReason}, score=${reviewScore.toFixed(2)}`);
   logDiagnostic(HOOK, "result", `verdict=${combinedResult.overall_verdict}, deny=${shouldDeny}, reason=${denyReason}`, {
@@ -972,7 +969,7 @@ async function main(): Promise<void> {
     }
 
     // Update pass streaks — only for agents that actually ran this iteration
-    const passStreaks = { ...(iterationState.passStreaks ?? {}) };
+    const passStreaks = { ...iterationState.passStreaks };
     const passEligibleSet = new Set(passEligible);
     const graduatedSetCurrent = new Set(iterationState.graduated);
 

package/dist/templates/cc-native/_cc-native/hooks/enhance_plan_post_subagent.ts

@@ -1,21 +1,23 @@
 #!/usr/bin/env bun
 /**
- * SubagentStop Hook: Plan Quality Review Context
+ * PostToolUse:Task Hook: Plan Quality Review Context
  *
- * Fires after Plan subagent completes. Emits plan quality review guidance
+ * Fires after Task tool completes with a Plan subagent. Emits plan quality review guidance
  * as context for the main agent to review the plan before ExitPlanMode.
  *
  * Design:
  * - Never blocks (all errors exit 0)
  * - Emits context via emitContext() — no file mutation
- * - Only fires for Plan subagents
+ * - Only fires for Task tool with subagent_type="Plan"
  */
 
 import {
   loadHookInput,
   runHook,
   logInfo,
+  logDebug,
   emitContext,
+  getToolInput,
 } from "../../_shared/lib-ts/base/hook-utils.js";
 import { isInternalCall } from "../../_shared/lib-ts/base/subprocess-utils.js";
 import { getPlanQualityReviewContext } from "../lib-ts/plan-enhancement.js";
@@ -24,14 +26,28 @@ function main(): void {
   if (isInternalCall()) return;
 
   const payload = loadHookInput();
-  if (!payload) return;
+  if (!payload) {
+    logDebug("enhance_plan_post_subagent", "No payload received");
+    return;
+  }
+
+  // Check if this is a Task tool call
+  if (payload.tool_name !== "Task") {
+    logDebug("enhance_plan_post_subagent", `Skipping: tool_name is "${payload.tool_name}", not "Task"`);
+    return;
+  }
+
+  // Check if the Task is spawning a Plan subagent
+  const toolInput = getToolInput(payload);
+  const subagentType = toolInput?.subagent_type;
+  logDebug("enhance_plan_post_subagent", `subagent_type: ${subagentType ?? "undefined"}`);
 
-  const agentType = payload.agent_type;
-  if (agentType !== "Plan") {
-    return; // Only emit for Plan agents
+  if (subagentType !== "Plan") {
+    logDebug("enhance_plan_post_subagent", `Skipping: subagent_type is "${subagentType}", not "Plan"`);
+    return;
   }
 
-  logInfo("enhance_plan", "Emitting plan quality review context");
+  logInfo("enhance_plan_post_subagent", "Emitting plan quality review context");
   emitContext(getPlanQualityReviewContext());
 }