aiwcli 0.15.5 → 0.17.0

package/dist/templates/cc-native/TEMPLATE-SCHEMA.md

@@ -4,6 +4,8 @@
 
 CC-Native uses Claude Code's native tools with minimal workflow overhead. Plan review runs automatically via external CLIs (Codex/Gemini) and parallel Claude Code agents when exiting plan mode.
 
+This directory is the canonical source for the packaged CC-Native template. Build/package steps copy it directly; they do not mirror from a repo-root `.aiwcli/_cc-native`.
+
 ---
 
 ## Directory Structure
@@ -14,8 +16,11 @@ packages/cli/src/templates/cc-native/
 │   ├── workflows/*.md        # Workflow definitions
 │   ├── hooks/                # Hook scripts (TypeScript, run via bun)
 │   │   ├── cc-native-plan-review.ts   # Unified plan review (CLI + agents)
-│   │   ├── add_plan_context.ts        # Clarifying questions offer
-│   │   └── plan_questions_early.ts    # Phase A clarification prompt
+│   │   ├── plan_questions_early.ts    # Phase A clarification prompt
+│   │   ├── mark_questions_asked.ts    # Tracks whether clarification happened
+│   │   ├── enhance_plan_post_write.ts # Post-write plan enhancement
+│   │   ├── enhance_plan_post_subagent.ts # Post-subagent plan enhancement
+│   │   └── validate_task_prompt.ts    # Task prompt validation gate
 │   ├── lib-ts/               # CC-Native specific TypeScript libraries
 │   │   ├── cc-native-state.ts # State management
 │   │   ├── config.ts          # Configuration loading
@@ -103,9 +108,9 @@ CC-Native settings are stored in `_cc-native/cc-native.config.json`:
       "timeout": 30
     },
     "agentSelection": {
-      "simple": { "min": 0, "max": 0 },
-      "medium": { "min": 1, "max": 2 },
-      "high": { "min": 2, "max": 4 },
+      "simple": { "min": 3, "max": 3 },
+      "medium": { "min": 5, "max": 5 },
+      "high": { "min": 7, "max": 7 },
       "fallbackCount": 2
     }
   }
@@ -129,12 +134,12 @@ CC-Native settings are stored in `_cc-native/cc-native.config.json`:
 |---------|---------|---------|
 | `agentReview.enabled` | Master switch for agent review | `true` |
 | `agentReview.timeout` | Seconds per agent before timeout | `120` |
-| `agentReview.blockOnFail` | Block Claude if any agent fails | `true` |
+| `agentReview.blockOnFail` | Block Claude if unknown agent fails | `true` |
 | `agentReview.orchestrator.enabled` | Use orchestrator for complexity analysis | `true` |
 | `agentReview.orchestrator.model` | Model for orchestrator | `haiku` |
-| `agentReview.agentSelection.simple` | Agent count for simple plans | `0-0` |
-| `agentReview.agentSelection.medium` | Agent count for medium plans | `1-2` |
-| `agentReview.agentSelection.high` | Agent count for complex plans | `2-4` |
+| `agentReview.agentSelection.simple` | Agent count for simple plans | `3-3` |
+| `agentReview.agentSelection.medium` | Agent count for medium plans | `5-5` |
+| `agentReview.agentSelection.high` | Agent count for complex plans | `7-7` |
 
 ### Environment Variables
 
@@ -233,8 +238,11 @@ Hook scripts live in `_cc-native/hooks/`. IDE-specific wiring in `.claude/settin
 | Hook | Trigger | Purpose |
 |------|---------|---------|
 | `cc-native-plan-review.ts` | ExitPlanMode | Unified review: CLI + orchestrator + agents |
-| `add_plan_context.ts` | PostToolUse:AskUserQuestion, PreToolUse:Task | Mark questions asked; nudge Plan subagent |
+| `mark_questions_asked.ts` | PostToolUse:AskUserQuestion | Mark that clarification questions were asked |
+| `enhance_plan_post_write.ts` | PostToolUse:Write | Nudge plan improvement after write-heavy work |
+| `enhance_plan_post_subagent.ts` | PostToolUse:Task | Nudge plan improvement after subagent work |
 | `plan_questions_early.ts` | UserPromptSubmit | Injects Phase A clarification in plan mode |
+| `validate_task_prompt.ts` | PreToolUse:Task | Blocks vague or non-self-contained Task prompts |
 
 ### Claude Feedback Mechanism
 
@@ -268,7 +276,7 @@ The orchestrator uses a fast model (Haiku) to:
 - Categorize the plan (code/infrastructure/documentation/life/business/design/research)
 - Select appropriate agents based on complexity and category
 
-Simple plans skip agent review entirely. Medium/high complexity plans get 1-4 agents based on configuration.
+Plans run a complexity-tiered reviewer set: simple plans use 3 agents, medium plans use 5, and high-complexity plans use 7 (including mandatory reviewers).
 
 #### Agent Execution
 
@@ -297,7 +305,7 @@ Each selected agent:
 
 | Version | Changes |
 |---------|---------|
-| 1.4.0 | **Phase 1 Shared Infrastructure**: Event-sourced context management in `_shared/`, contexts in `_output/contexts/`, atomic writes. **BREAKING**: Renamed config.json → cc-native.config.json |
+| 1.4.0 | **Phase 1 Shared Infrastructure**: Event-sourced context management in `core/`, contexts in `_output/contexts/`, atomic writes. **BREAKING**: Renamed config.json → cc-native.config.json |
 | 1.3.0 | Consolidated CLI + agent review into single unified hook with combined output |
 | 1.2.0 | Added multi-agent plan review via Claude Code agents, reordered hooks (archive last) |
 | 1.1.0 | Added plan review via Codex/Gemini with Claude feedback, config.json |

package/dist/templates/cc-native/_cc-native/cc-native.config.json

@@ -7,8 +7,8 @@
       },
       "codex": {
         "enabled": true,
-        "models": ["gpt-5.3-codex"],
-        "reasoningEffort": "low"
+        "models": ["gpt-5.4"],
+        "reasoning_effort": "low"
       }
     }
   },
@@ -30,10 +30,6 @@
       "model": "opus",
       "timeout": 60
     },
-    "preflight": {
-      "enabled": true,
-      "timeoutMs": 15000
-    },
     "legacyMode": false,
     "mandatoryAgents": {
       "always": ["handoff-readiness", "clarity-auditor", "skeptic"],

package/dist/templates/cc-native/_cc-native/hooks/CLAUDE.md

@@ -9,27 +9,24 @@
 | Hook | Trigger | Purpose |
 |------|---------|---------|
 | `cc-native-plan-review.ts` | PreToolUse: ExitPlanMode | Questions gate + plan review before user approval |
-| `mark_questions_asked.ts` | PostToolUse: AskUserQuestion | Marks questions-asked state after user answers |
-| `enhance_plan_post_subagent.ts` | PostToolUse: Task | Post-subagent plan enhancement |
-| `enhance_plan_post_write.ts` | PostToolUse: Write | Post-write plan enhancement |
+| `add_plan_context.ts` | PostToolUse: AskUserQuestion, PreToolUse: Task | Mark questions asked; nudge Plan subagent to ask questions first |
 | `plan_questions_early.ts` | UserPromptSubmit | Inject Phase A clarification prompt in plan mode |
-| `validate_task_prompt.ts` | PreToolUse: TaskCreate | Validates task creation prompts |
 
 ### Plan Review Architecture
 
-The hook is a thin coordinator (~70 lines) that delegates to `plan-review/lib/review-pipeline.ts`. The pipeline wires together focused modules:
+The hook is a thin coordinator (~70 lines) that delegates to `lib-ts/review-pipeline.ts`. The pipeline wires together focused modules:
 
-| Module | Location | Responsibility |
-|--------|----------|----------------|
-| `plan-discovery.ts` | `lib-ts/` | Find plan file, read content, compute hash |
-| `settings.ts` | `lib-ts/` | Load + merge config with defaults, load agent library |
-| `agent-selection.ts` | `plan-review/lib/` | Mandatory agent resolution, orchestrator-based selection, model assignment |
-| `graduation.ts` | `plan-review/lib/` | Pass eligibility, pass streaks, graduation threshold, iteration advancement |
-| `output-builder.ts` | `plan-review/lib/` | Issue truncation, verdict override, context/block message construction |
-| `review-pipeline.ts` | `plan-review/lib/` | Pipeline orchestrator wiring all modules together |
-| `artifacts/lib/format.ts` | `artifacts/` | Pure formatting (markdown, JSON, inline summaries) |
-| `artifacts/lib/write.ts` | `artifacts/` | File I/O for review artifacts |
-| `artifacts/lib/tracker.ts` | `artifacts/` | Review tracker management |
+| Module | Responsibility |
+|--------|----------------|
+| `plan-discovery.ts` | Find plan file, read content, compute hash |
+| `settings.ts` | Load + merge config with defaults, load agent library |
+| `agent-selection.ts` | Mandatory agent resolution, orchestrator-based selection, model assignment |
+| `graduation.ts` | Pass eligibility, pass streaks, graduation threshold, iteration advancement |
+| `output-builder.ts` | Issue truncation, verdict override, context/block message construction |
+| `review-pipeline.ts` | Pipeline orchestrator wiring all modules together |
+| `artifacts/format.ts` | Pure formatting (markdown, JSON, inline summaries) |
+| `artifacts/write.ts` | File I/O for review artifacts |
+| `artifacts/tracker.ts` | Review tracker management |
 
 ### Questions Gate (in review-pipeline.ts)
 
@@ -42,10 +39,10 @@ Before running plan review agents, the pipeline checks `wasQuestionsAsked()`. If
 CC-native hooks are TypeScript, run via `bun`. Use relative imports from the hook file location.
 
 ```typescript
-// Shared library imports (via _shared/lib-ts/)
-import { loadHookInput, runHook, logInfo, emitContext } from "../../_shared/lib-ts/base/hook-utils.js";
-import { isInternalCall } from "../../_shared/lib-ts/base/subprocess-utils.js";
-import { getProjectRoot } from "../../_shared/lib-ts/base/constants.js";
+// Shared library imports (via _core/lib-ts/)
+import { loadHookInput, runHook, logInfo, emitContext } from "../../_core/lib-ts/hooks/hook-utils.js";
+import { isInternalCall } from "../../_core/lib-ts/runtime/subprocess-utils.js";
+import { getProjectRoot } from "../../_core/lib-ts/runtime/constants.js";
 
 // CC-native library imports (via ../lib-ts/)
 import { wasQuestionsAsked, markQuestionsAsked } from "../lib-ts/cc-native-state.js";
@@ -55,7 +52,7 @@ import type { AgentConfig } from "../lib-ts/types.js";
 
 **Important:** Always use `.js` extensions in import paths — Bun resolves `.ts` files from `.js` imports.
 
-**Import direction:** Hooks → `_cc-native/lib-ts/` → `_shared/lib-ts/`. Never reverse.
+**Import direction:** Hooks → `_cc-native/lib-ts/` → `_core/lib-ts/`. Never reverse.
 
 ---
 
@@ -64,7 +61,7 @@ import type { AgentConfig } from "../lib-ts/types.js";
 Hooks can be invoked recursively when spawning subprocesses (agents, orchestrator). Always check and skip:
 
 ```typescript
-import { isInternalCall } from "../../_shared/lib-ts/base/subprocess-utils.js";
+import { isInternalCall } from "../../_core/lib-ts/runtime/subprocess-utils.js";
 
 function main(): void {
   // FIRST LINE of main - before any other logic
@@ -87,7 +84,7 @@ Claude Code hooks return JSON to stdout. The format is specific to each hook typ
 Use the shared hook utilities — never construct JSON manually:
 
 ```typescript
-import { emitContext, emitContextAndBlock } from "../../_shared/lib-ts/base/hook-utils.js";
+import { emitContext, emitContextAndBlock } from "../../_core/lib-ts/hooks/hook-utils.js";
 
 // Inject context without blocking:
 emitContext("Information for Claude to see...");
@@ -105,7 +102,7 @@ emitContextAndBlock(
 
 ## Debugging Output
 
-For logging tiers, visibility rules, and stderr behavior, see **`_shared/lib-ts/CLAUDE.md`** (the shared library guide). The key rules:
+For logging tiers, visibility rules, and stderr behavior, see **`_core/lib-ts/CLAUDE.md`** (the shared library guide). The key rules:
 
 - **stderr is opt-in.** `log_debug/log_info/log_warn/log_error` write to file only (no UI noise)
 - **`logBlocking()` / `log_hook_error()`** for problems that must be visible
@@ -115,7 +112,7 @@ For logging tiers, visibility rules, and stderr behavior, see **`_shared/lib-ts/
 TypeScript hooks use re-exported logger functions from `hook-utils.ts`:
 
 ```typescript
-import { logDebug, logInfo, logWarn, logError } from "../../_shared/lib-ts/base/hook-utils.js";
+import { logDebug, logInfo, logWarn, logError } from "../../_core/lib-ts/hooks/hook-utils.js";
 
 logDebug("hook-name", `Found ${items.length} items`);  // file only
 logInfo("hook-name", "Starting hook...");                // file only
@@ -129,15 +126,15 @@ logError("hook-name", `Failed: ${e}`);                   // file only
 Plan review hooks integrate with the shared context system for state management:
 
 ```typescript
-import { getContextBySessionId, getAllContexts } from "../../_shared/lib-ts/context/context-store.js";
-import { getContextReviewsDir } from "../../_shared/lib-ts/base/constants.js";
+import { getContextBySessionId, getAllContexts } from "../../_core/lib-ts/context/context-store.js";
+import { getContextReviewsDir } from "../../_core/lib-ts/runtime/constants.js";
 
 // Find active context
 const context = getContextBySessionId(sessionId, projectRoot);
 if (!context) {
   // Fallback: find single planning context
   const allActive = getAllContexts("active", projectRoot);
-  const planning = allActive.filter((c: any) => c.mode === "active" || c.mode === "has_staged_work");
+  const planning = allActive.filter((c: any) => c.mode === "active" || c.mode === "has_plan");
   if (planning.length === 1) {
     context = planning[0];
   }
@@ -160,7 +157,7 @@ import { isPlanAlreadyReviewed, markPlanReviewed, wasQuestionsAsked } from "../l
 Hooks should fail gracefully — a broken hook shouldn't break the user's workflow. `runHook()` and `runHookAsync()` handle this automatically: uncaught errors log to file and exit 0 (non-blocking).
 
 ```typescript
-import { runHook, logInfo } from "../../_shared/lib-ts/base/hook-utils.js";
+import { runHook, logInfo } from "../../_core/lib-ts/hooks/hook-utils.js";
 
 function main(): void {
   // Hook logic — uncaught errors are handled by runHook
@@ -173,7 +170,7 @@ runHook(main, "hook_name");
 For async hooks (plan review with parallel agents):
 
 ```typescript
-import { runHookAsync } from "../../_shared/lib-ts/base/hook-utils.js";
+import { runHookAsync } from "../../_core/lib-ts/hooks/hook-utils.js";
 
 async function main(): Promise<void> {
   // Async hook logic with Promise.all() etc.
@@ -188,7 +185,7 @@ Use `emitContextAndBlock()` for intentional blocking (e.g., plan review denial).
 
 ## Error Handling: Non-Critical Operations
 
-Wrap non-critical shared library calls in try/catch to prevent false "hook error" UI display. See **`_shared/lib-ts/CLAUDE.md`** > Context Store for the pattern and rationale.
+Wrap non-critical shared library calls in try/catch to prevent false "hook error" UI display. See **`_core/lib-ts/CLAUDE.md`** > Context Store for the pattern and rationale.
 
 **When to catch locally vs let bubble:**
 - **Catch locally:** Side effects like mode transitions, state saves — the hook's primary purpose can still succeed without them
@@ -220,7 +217,7 @@ Validate TypeScript syntax after editing hooks:
 bun --print "import('.aiwcli/_cc-native/hooks/cc-native-plan-review.ts')" 2>&1 | head -5
 
 # Or check imports resolve (dry run)
-bun build --no-bundle .aiwcli/_cc-native/hooks/mark_questions_asked.ts --outdir /dev/null 2>&1
+bun build --no-bundle .aiwcli/_cc-native/hooks/add_plan_context.ts --outdir /dev/null 2>&1
 ```
 
 Hooks fail silently on import errors — verify after any import path changes.
@@ -238,30 +235,13 @@ Hooks fail silently on import errors — verify after any import path changes.
 | 2026-02-10 | **Migrated cc-native hooks from Python to TypeScript.** `cc-native-plan-review.ts` (async, parallel agent reviews via `Promise.all()`), `add_plan_context.ts`, `plan_questions_early.ts`. All hooks use `runHook()`/`runHookAsync()` entry points. Library code in `_cc-native/lib-ts/` (18 files). Settings.json updated to use `bun` runner. Python `.py` files kept as fallback until TS hooks verified. |
 | 2026-02-10 | Flipped TS logger stderr default to opt-in (`opts?.stderr === true`). Added `logBlocking()` for intentional stderr visibility. Removed redundant `{stderr: false}` from hook-utils.ts, user_prompt_submit.ts, context_monitor.ts. Added "Hook Error Visibility" section documenting visibility tiers and exit code behavior. |
 | 2026-02-10 | Fixed `debug.py` `context_path` crash. Added local try/catch around `maybeActivate` in `user_prompt_submit.ts` and `context_monitor.ts` to prevent stderr error display on non-critical I/O failures. Removed dead `context_path` from `_emitHookEnd` in `hook-utils.ts`. Added "Error Handling" section to CLAUDE.md. |
-| 2026-02-21 | **Coding standards nudge injected in plan mode.** `plan_questions_early.ts` now emits `CODING_STANDARDS_NUDGE` after Phase A prompt — covers test-first design, file structure fit, and extensibility analysis. Standards reference doc at `plan-review/CODING-STANDARDS-CHECKLIST.md`. Post-write self-check added to `plan-enhancement.ts` `getPlanQualityReviewContext()`. |
-| 2026-02-21 | **ContextLayer Audit:** Updated hook roster — removed stale `add_plan_context.ts`, added `mark_questions_asked.ts`, `enhance_plan_post_subagent.ts`, `enhance_plan_post_write.ts`, `validate_task_prompt.ts`. |
-
----
-## Context Maintenance
-
-**After modifying files in this directory:** scan the entries above — if any claim is now
-false or incomplete, update this file before ending the task. Do not defer.
-
-**Add** an entry only if an agent would fail without knowing it, it is not obvious from
-the code, and it belongs at this scope (project-wide rule → root CLAUDE.md; WHY decision
-→ inline comment or ADR; inferable from code → nowhere).
-
-**Remove** any entry that fails the falsifiability test: if removing it would not change
-how an agent acts here, remove it. If a convention here conflicts with the codebase,
-the codebase wins — update this file, do not work around it. Prune aggressively.
-
-**Staleness anchor:** This file assumes `cc-native-plan-review.ts` exists. If it doesn't, this file
-is stale — update or regenerate before relying on it.
-
-**Trigger Audit or Generate:**
-- Rename/move files or dirs → Audit
-- >20% of files changed → Generate
-- 30+ days without touching this file → Audit
-- Agent mistake caused by this file → fix immediately, then Audit
-
-<!-- context-layer: generated=2026-02-10 | last-audited=2026-02-21 | version=2 | dir-commits-at-audit=58 -->
+| 2026-02-07 | Handoff staging lifecycle: `has_handoff` mode + `handoff_consumed` flag mirrors plan lifecycle. `save_handoff.py` no longer transitions to idle — stays active for session_end staging. `session_end.py` stages `active→has_handoff` when handoff_path set and not consumed. `session_start.py` restores `has_handoff→active` on /clear. `context_selector.py` has fallback Case 3b for has_handoff. PostToolUse context_monitor matcher simplified from specific tool list to `*`. |
+| 2026-02-07 | Removed PreToolUse:Write matcher from `add_plan_context.py`. Write-time plan nudges were redundant after consolidating enforcement to PreToolUse:Task. Removed `is_plan_file_write()`, `load_plan_context_config()`, `PHASE_B_ENFORCEMENT`, `nudge_write_questions()`, and `project_dir` import. |
+| 2026-02-07 | Question enforcement is now advisory-only (never blocks). `add_plan_context.py` uses `emit_context()` for all question nudges — no `permissionDecision:deny` anywhere. Removed `emit_context_and_block` import and `TASK_ENFORCEMENT_REASON` constant. |
+| 2026-02-07 | Moved question enforcement to PreToolUse:Task (Plan subagent gate). `add_plan_context.py` now handles three events: PostToolUse:AskUserQuestion, PreToolUse:Task (primary gate), PreToolUse:Write (fallback). Added `is_plan_task()`, `is_internal_call()` guard, `TASK_ENFORCEMENT_CONTEXT` constant. Registered `^Task$` command hook in settings.json. |
+| 2026-02-07 | Deleted `plan_accepted.py` (dead code — PostToolUse:ExitPlanMode never fires due to /clear race). Plan field assignment handled by `session_end.py` fallback. Added `plan_consumed` flag to prevent infinite plan re-staging. |
+| 2026-02-07 | Hook lifecycle diagnostics: all hooks now use `run_hook(main, "hook_name")` entry point. Logs HOOK_START/HOOK_END with template origin, event type, duration_ms, and status. Millisecond timestamps in logger. |
+| 2026-02-07 | Unified logger: all diagnostic logging uses `log_debug/log_info/log_warn/log_error` from `_shared/lib/base/logger.py` instead of eprint/print-to-stderr. Updated debugging and error handling docs. |
+| 2026-02-06 | Merged mark_questions_asked.py into add_plan_context.py. Hook now handles both PostToolUse:AskUserQuestion and PreToolUse:Write. Deleted standalone mark_questions_asked.py. |
+| 2026-02-06 | Fixed add_plan_context.py trigger docs (was PostToolUse: EnterPlanMode, is PreToolUse: Write). Added emit_context/emit_context_and_block utility docs. |
+| 2026-02-03 | Initial creation |

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

@@ -10,7 +10,6 @@
  * Output: _output/cc-native/plans/{YYYY-MM-DD}/{slug}/reviews/
  */
 
-import { getProjectRoot, getAiwcliDir } from "../../_shared/lib-ts/base/constants.js";
 import {
   loadHookInput,
   runHookAsync,
@@ -19,10 +18,11 @@ import {
   logWarn,
   emitContext,
   emitContextAndBlock,
-} from "../../_shared/lib-ts/base/hook-utils.js";
-import { isInternalCall } from "../../_shared/lib-ts/base/subprocess-utils.js";
+} from "../../_core/lib-ts/hooks/hook-utils.js";
+import { isInternalCall } from "../../_core/lib-ts/runtime/subprocess-utils.js";
+import { getProjectRoot, getAiwcliDir } from "../../_core/lib-ts/runtime/constants.js";
+import { runReviewPipeline } from "../lib-ts/review-pipeline.js";
 import type { PipelineResult } from "../lib-ts/types.js";
-import { runReviewPipeline } from "../plan-review/lib/review-pipeline.js";
 
 const HOOK = "cc-native-plan-review";
 
@@ -59,15 +59,13 @@ async function main(): Promise<void> {
   });
 
   switch (result.action) {
-    case "block": {
-      emitContextAndBlock(result.contextText, result.blockReason);
-      break;
-    }
-    case "skip": {
+    case "skip":
       logInfo(HOOK, `Skipping: ${result.reason}`);
       emitContext(`[Plan Review Skipped] ${result.reason}`);
-      break;
-    }
+      break;
+    case "block":
+      emitContextAndBlock(result.contextText, result.blockReason);
+      break;
     default: {
       const _exhaustive: never = result;
       logWarn(HOOK, `Unhandled pipeline action: ${(_exhaustive as { action: string }).action}`);

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

@@ -18,8 +18,8 @@ import {
   logDebug,
   emitContext,
   getToolInput,
-} from "../../_shared/lib-ts/base/hook-utils.js";
-import { isInternalCall } from "../../_shared/lib-ts/base/subprocess-utils.js";
+} from "../../_core/lib-ts/hooks/hook-utils.js";
+import { isInternalCall } from "../../_core/lib-ts/runtime/subprocess-utils.js";
 import { getPlanQualityReviewContext } from "../lib-ts/plan-enhancement.js";
 
 function main(): void {

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

@@ -12,17 +12,16 @@
  * - Emits context via emitContext() — no file mutation
  */
 
-import * as os from "node:os";
-import * as path from "node:path";
-
 import {
   loadHookInput,
   runHook,
   logInfo,
   emitContext,
-} from "../../_shared/lib-ts/base/hook-utils.js";
-import { isInternalCall } from "../../_shared/lib-ts/base/subprocess-utils.js";
+} from "../../_core/lib-ts/hooks/hook-utils.js";
+import { isInternalCall } from "../../_core/lib-ts/runtime/subprocess-utils.js";
 import { getPlanQualityReviewContext } from "../lib-ts/plan-enhancement.js";
+import * as path from "path";
+import * as os from "os";
 
 function main(): void {
   if (isInternalCall()) return;

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

@@ -11,14 +11,14 @@
  * Fail-safe: Any error exits 0 (non-blocking).
  */
 
-import { getProjectRoot } from "../../_shared/lib-ts/base/constants.js";
 import {
   loadHookInput,
   runHook,
   logInfo,
   logDiagnostic,
-} from "../../_shared/lib-ts/base/hook-utils.js";
-import { isInternalCall } from "../../_shared/lib-ts/base/subprocess-utils.js";
+} from "../../_core/lib-ts/hooks/hook-utils.js";
+import { isInternalCall } from "../../_core/lib-ts/runtime/subprocess-utils.js";
+import { getProjectRoot } from "../../_core/lib-ts/runtime/constants.js";
 import { markQuestionsAsked } from "../lib-ts/cc-native-state.js";
 
 function main(): void {
@@ -46,7 +46,7 @@ function main(): void {
       markQuestionsAsked(sessionId, projectRoot, "early");
       logInfo("add_plan_context", `Marked early questions asked for session ${sessionId.slice(0, 8)}...`);
     }
-    
+    return;
   }
 }
 

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

@@ -9,34 +9,10 @@
  * Skips if questions were already asked this session.
  */
 
-import { getProjectRoot } from "../../_shared/lib-ts/base/constants.js";
-import { loadHookInput, runHook, logDebug, logInfo, emitContext } from "../../_shared/lib-ts/base/hook-utils.js";
+import { loadHookInput, runHook, logDebug, logInfo, emitContext } from "../../_core/lib-ts/hooks/hook-utils.js";
+import { getProjectRoot } from "../../_core/lib-ts/runtime/constants.js";
 import { wasEarlyQuestionsAsked } from "../lib-ts/cc-native-state.js";
 
-// Unconditional injection by design — no code-detection gate.
-// "When this plan involves code" is self-selecting; non-code plans ignore it.
-// Soft framing per Anthropic Claude 4.x best practices (avoid MUST/MANDATORY overtriggering).
-// Motivation per standard enables generalization better than threats.
-// Generalizability disclaimer: not all codebases need all standards.
-const CODING_STANDARDS_NUDGE = `## Coding Standards for Code Changes
-
-When this plan creates or modifies production code, apply these standards — they address the
-most common plan review failure modes:
-
-1. **Test-First Design** — Design interfaces from the test perspective first. Plans that
-   describe "implement then test" consistently fail review. Structure tests before implementation.
-2. **File Structure Fit** — Verify where similar things already live in this project before
-   proposing new files. Agents commonly pick plausible-but-wrong locations that don't match
-   existing conventions.
-3. **Extensibility Analysis** — Identify what features most commonly follow this one. Designs
-   that resist extension require expensive rewrites later.
-
-These standards apply to production code in established codebases. For prototypes, scripts,
-or exploratory work, use judgment on which apply.
-
-**Full checklist:** \`.aiwcli/_cc-native/plan-review/CODING-STANDARDS-CHECKLIST.md\`
-Read this file for detailed guidance on each standard.`;
-
 const PHASE_A_PROMPT = `## Plan Mode: Narrow the Approach After Exploration
 
 After exploring the codebase, use AskUserQuestion — one call, 3-4 questions — before drafting the plan.
@@ -80,7 +56,6 @@ function main(): void {
 
   logInfo("plan_questions_early", "Plan mode detected, injecting Phase A prompt");
   emitContext(PHASE_A_PROMPT);
-  emitContext(CODING_STANDARDS_NUDGE);
 }
 
 runHook(main, "plan_questions_early");

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

@@ -6,9 +6,9 @@
  * Short-circuits immediately for resume calls (no prompt to validate).
  *
  * Design:
- * - Resume calls (tool_input.resume present) → allow through, no inference
- * - Missing/empty prompt → allow through (fail open)
- * - Non-empty prompt → run AI validation via inference(), block if ok:false
+ * - Resume calls (tool_input.resume present) -> allow through, no inference
+ * - Missing/empty prompt -> allow through (fail open)
+ * - Non-empty prompt -> run AI validation via inference(), block if ok:false
  */
 
 import {
@@ -19,9 +19,9 @@ import {
   logWarn,
   emitContextAndBlock,
   getToolInput,
-} from "../../_shared/lib-ts/base/hook-utils.js";
-import { inference } from "../../_shared/lib-ts/base/inference.js";
-import { isInternalCall } from "../../_shared/lib-ts/base/subprocess-utils.js";
+} from "../../_core/lib-ts/hooks/hook-utils.js";
+import { inference } from "../../_core/lib-ts/runtime/inference.js";
+import { isInternalCall } from "../../_core/lib-ts/runtime/subprocess-utils.js";
 
 const VALIDATION_SYSTEM_PROMPT = `The sub-agent receives ONLY the prompt text — no conversation history, no prior context.
 
@@ -70,7 +70,7 @@ function main(): void {
     logInfo("validate_task_prompt", "Blocking Task — prompt failed validation");
     emitContextAndBlock(output, retryMessage);
   }
-  // ok:true or anything else → allow through (no output = no block)
+  // ok:true or anything else -> allow through (no output = no block)
 }
 
 runHook(main, "validate_task_prompt");

package/dist/templates/cc-native/_cc-native/lib-ts/.mocharc.json

@@ -0,0 +1,9 @@
+{
+  "require": ["tsx"],
+  "spec": "__tests__/**/*.test.ts",
+  "recursive": true,
+  "reporter": "spec",
+  "timeout": 10000,
+  "parallel": true,
+  "jobs": 4
+}

package/dist/templates/cc-native/_cc-native/lib-ts/__tests__/aggregate-agents.test.ts

@@ -0,0 +1,118 @@
+import { expect } from "chai";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { extractFrontmatter, extractBody, aggregateAgents } from "../aggregate-agents.js";
+import { createTempDir, cleanupTempDir } from "./helpers.js";
+
+describe("aggregate-agents", () => {
+  describe("extractFrontmatter", () => {
+    it("extracts key-value pairs from frontmatter", () => {
+      const content = "---\nname: test-agent\nmodel: sonnet\nenabled: true\n---\nBody";
+      const result = extractFrontmatter(content);
+      expect(result).to.not.be.null;
+      expect(result!.name).to.equal("test-agent");
+      expect(result!.model).to.equal("sonnet");
+      expect(result!.enabled).to.equal(true);
+    });
+
+    it("returns null when no frontmatter", () => {
+      expect(extractFrontmatter("No frontmatter here")).to.be.null;
+    });
+
+    it("returns null when frontmatter not closed", () => {
+      expect(extractFrontmatter("---\nname: test\nno closing")).to.be.null;
+    });
+
+    it("handles arrays in frontmatter", () => {
+      const content = "---\ncategories: [code, security]\n---\nBody";
+      const result = extractFrontmatter(content);
+      expect(result!.categories).to.deep.equal(["code", "security"]);
+    });
+
+    it("handles boolean false", () => {
+      const content = "---\nenabled: false\n---\nBody";
+      const result = extractFrontmatter(content);
+      expect(result!.enabled).to.equal(false);
+    });
+
+    it("handles quoted strings", () => {
+      const content = '---\nname: "quoted agent"\n---\nBody';
+      const result = extractFrontmatter(content);
+      expect(result!.name).to.equal("quoted agent");
+    });
+  });
+
+  describe("extractBody", () => {
+    it("extracts content after frontmatter", () => {
+      const content = "---\nname: test\n---\n\nBody content here.";
+      const result = extractBody(content);
+      expect(result).to.equal("Body content here.");
+    });
+
+    it("returns full content when no frontmatter", () => {
+      const content = "Just body content.";
+      expect(extractBody(content)).to.equal("Just body content.");
+    });
+
+    it("returns full content when frontmatter not closed", () => {
+      const content = "---\nname: test\nno closing";
+      expect(extractBody(content)).to.equal(content);
+    });
+  });
+
+  describe("aggregateAgents", () => {
+    let tmpDir: string;
+
+    beforeEach(() => { tmpDir = createTempDir("agents-test-"); });
+    afterEach(() => cleanupTempDir(tmpDir));
+
+    it("returns empty array when directory does not exist", () => {
+      const result = aggregateAgents(path.join(tmpDir, "nonexistent"));
+      expect(result).to.deep.equal([]);
+    });
+
+    it("loads agents from markdown files", () => {
+      fs.mkdirSync(tmpDir, { recursive: true });
+      fs.writeFileSync(
+        path.join(tmpDir, "test-agent.md"),
+        "---\nname: test-agent\nmodel: sonnet\nfocus: testing\ncategories: [code]\n---\nYou are a test agent.",
+      );
+      const result = aggregateAgents(tmpDir);
+      expect(result).to.have.length(1);
+      expect(result[0]!.name).to.equal("test-agent");
+      expect(result[0]!.system_prompt).to.equal("You are a test agent.");
+    });
+
+    it("skips plan-orchestrator agent", () => {
+      fs.mkdirSync(tmpDir, { recursive: true });
+      fs.writeFileSync(
+        path.join(tmpDir, "plan-orchestrator.md"),
+        "---\nname: plan-orchestrator\n---\nOrchestrator prompt.",
+      );
+      fs.writeFileSync(
+        path.join(tmpDir, "real-agent.md"),
+        "---\nname: real-agent\n---\nReal agent prompt.",
+      );
+      const result = aggregateAgents(tmpDir);
+      expect(result).to.have.length(1);
+      expect(result[0]!.name).to.equal("real-agent");
+    });
+
+    it("skips files without frontmatter", () => {
+      fs.mkdirSync(tmpDir, { recursive: true });
+      fs.writeFileSync(path.join(tmpDir, "no-fm.md"), "Just a readme.");
+      const result = aggregateAgents(tmpDir);
+      expect(result).to.have.length(0);
+    });
+
+    it("defaults categories to [code]", () => {
+      fs.mkdirSync(tmpDir, { recursive: true });
+      fs.writeFileSync(
+        path.join(tmpDir, "simple.md"),
+        "---\nname: simple\n---\nPrompt.",
+      );
+      const result = aggregateAgents(tmpDir);
+      expect(result[0]!.categories).to.deep.equal(["code"]);
+    });
+  });
+});