aiwcli 0.15.5 → 0.15.7

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

@@ -17,20 +17,20 @@
 
 ---
 
-## Shared Infrastructure (`_shared/lib-ts/`)
+## Shared Infrastructure (`_core/lib-ts/`)
 
-CC-native code depends heavily on shared infrastructure. Full API details: `_shared/lib-ts/CLAUDE.md`.
+CC-native code depends heavily on shared infrastructure. Full API details: `_core/lib-ts/CLAUDE.md`.
 
 | Module | Capability | Use When |
 |--------|-----------|----------|
-| `base/hook-utils` | Hook lifecycle (load input, run, emit context) | Writing hooks |
-| `base/logger` | Structured logging (debug/info/warn/error) | Any hook or lib module |
-| `base/constants` | Project paths, context dirs, sanitization | Resolving file locations |
-| `base/subprocess-utils` | Find executables, exec with env, shell quoting | Spawning agent CLIs |
-| `base/cli-args` | CLI invocation builder, review spec construction | Launching review agents |
-| `base/atomic-write` | Crash-safe file writes | Writing state or artifacts |
-| `base/state-io` | State read/write helpers | Context state persistence |
-| `base/inference` | Claude CLI subprocess calls | AI inference from hooks |
+| `hooks/hook-utils` | Hook lifecycle (load input, run, emit context) | Writing hooks |
+| `runtime/logger` | Structured logging (debug/info/warn/error) | Any hook or lib module |
+| `runtime/constants` | Project paths, context dirs, sanitization | Resolving file locations |
+| `runtime/subprocess-utils` | Find executables, exec with env, shell quoting | Spawning agent CLIs |
+| `runtime/cli-args` | CLI invocation builder, review spec construction | Launching review agents |
+| `runtime/atomic-write` | Crash-safe file writes | Writing state or artifacts |
+| `runtime/state-io` | State read/write helpers | Context state persistence |
+| `runtime/inference` | Claude CLI subprocess calls | AI inference from hooks |
 | `context/context-store` | Context CRUD (get by session, list all) | Session/context binding |
 | `context/plan-manager` | Plan lifecycle (archive, hash, sign) | Plan discovery and hashing |
 | `types` | Shared type definitions (`ContextState`, etc.) | Type imports |
@@ -39,19 +39,19 @@ CC-native code depends heavily on shared infrastructure. Full API details: `_sha
 
 ## Import Patterns
 
-**Import direction:** `hooks/` → `lib-ts/` → `_shared/lib-ts/`. Never the reverse.
+**Import direction:** `hooks/` → `lib-ts/` → `_core/lib-ts/`. Never the reverse.
 
 ```typescript
-// From hooks/ (2 levels up to _shared):
-import { runHook, logInfo } from "../../_shared/lib-ts/base/hook-utils.js";
+// From hooks/ (2 levels up to _core):
+import { runHook, logInfo } from "../../_core/lib-ts/hooks/hook-utils.js";
 import { loadConfig } from "../lib-ts/config.js";
 
-// From lib-ts/ (2 levels up to _shared):
-import { logDebug } from "../../_shared/lib-ts/base/logger.js";
-import { atomicWrite } from "../../_shared/lib-ts/base/atomic-write.js";
+// From lib-ts/ (2 levels up to _core):
+import { logDebug } from "../../_core/lib-ts/runtime/logger.js";
+import { atomicWrite } from "../../_core/lib-ts/runtime/atomic-write.js";
 
-// From plan-review/lib/ (3 levels up to _shared):
-import { logInfo } from "../../../_shared/lib-ts/base/logger.js";
+// From plan-review/lib/ (3 levels up to _core):
+import { logInfo } from "../../../_core/lib-ts/runtime/logger.js";
 ```
 
 ---

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

@@ -41,9 +41,9 @@ artifacts/
 
 - `../../lib-ts/types.ts` — `CombinedReviewResult`, `CorroborationResult` types
 - `../../lib-ts/constants.ts` — `ENABLE_ROBUST_PLAN_WRITES` feature flag
-- `../../../_shared/lib-ts/base/atomic-write.ts` — atomic file I/O
-- `../../../_shared/lib-ts/base/constants.ts` — `sanitizeFilename`
-- `../../../_shared/lib-ts/base/logger.ts` — logging
+- `../../../_core/lib-ts/runtime/atomic-write.ts` — atomic file I/O
+- `../../../_core/lib-ts/runtime/constants.ts` — `sanitizeFilename`
+- `../../../_core/lib-ts/runtime/logger.ts` — logging
 
 ## Hooks
 

package/dist/templates/cc-native/_cc-native/artifacts/lib/format.ts

@@ -3,7 +3,7 @@
  * Extracted from artifacts.ts — no file I/O.
  */
 
-import { sanitizeFilename } from "../../../_shared/lib-ts/base/constants.js";
+import { sanitizeFilename } from "../../../_core/lib-ts/runtime/constants.js";
 import { DEFAULT_DISPLAY } from "../../lib-ts/types.js";
 import type {
   CombinedReviewResult,
@@ -75,14 +75,14 @@ export function formatCombinedMarkdown(
     if (corroboration.blocking.length > 0) {
       lines.push("### Blocking Dimensions\n");
       for (const group of corroboration.blocking) {
-        lines.push(`- **${group.dimension}**: ${group.agentCount} agents agree (threshold: ≥${group.threshold} agents, ${group.issues.length} issues)`);
+        lines.push(`- **${group.dimension}**: ${group.issues.length} issues from ${group.agentCount} agents (threshold: ≥${group.threshold})`);
       }
       lines.push("");
     }
     if (corroboration.solo.length > 0) {
       lines.push("### Solo Dimensions (informational)\n");
       for (const s of corroboration.solo) {
-        lines.push(`- **${s.dimension}**: ${s.agentCount} agent${s.agentCount !== 1 ? "s" : ""} (threshold: ≥${s.threshold} agents, not met)`);
+        lines.push(`- **${s.dimension}**: ${s.issues.length} issues from ${s.agentCount} agents (threshold: >${s.threshold}, not exceeded)`);
       }
       lines.push("");
     }
@@ -192,7 +192,7 @@ export function buildInlineReviewSummary(
     if (corroboration && dim) {
       const group = corroboration.blocking.find(g => g.dimension === dim);
       if (group) {
-        annotation = ` [CORROBORATED — ${group.agentCount} agents agree, threshold ≥${group.threshold}]`;
+        annotation = ` [CORROBORATED — ${group.issues.length} issues from ${group.agentCount} agents exceeds threshold ${group.threshold}]`;
       } else {
         annotation = " [perspective]";
       }
@@ -259,10 +259,10 @@ export function buildHighIssuesDocument(
 ): string {
   if (corroboration && corroboration.blocking.length > 0) {
     const lines = ["# Corroborated High-Severity Issues\n"];
-    lines.push("> Only issues from dimensions where enough distinct agents independently agreed are shown.\n");
+    lines.push("> Only issues from dimensions where the total count exceeded the proportional threshold are shown.\n");
 
     for (const group of corroboration.blocking) {
-      lines.push(`## ${group.dimension} (${group.agentCount} agents agree, threshold: ≥${group.threshold} agents, ${group.issues.length} issues)\n`);
+      lines.push(`## ${group.dimension} (${group.issues.length} issues from ${group.agentCount} agents, threshold: ${group.threshold})\n`);
       for (const { agent, issue } of group.issues) {
         const cat = issue.category ?? "general";
         const text = String(issue.issue ?? "").trim();
@@ -275,7 +275,7 @@ export function buildHighIssuesDocument(
 
     if (corroboration.solo.length > 0) {
       lines.push("---\n");
-      lines.push(`> ${corroboration.solo.length} dimension${corroboration.solo.length !== 1 ? "s" : ""} had insufficient agent agreement (not blocking): ${corroboration.solo.map(s => `${s.dimension} (${s.agentCount}/${s.threshold} agents)`).join(", ")}\n`);
+      lines.push(`> ${corroboration.solo.length} dimension${corroboration.solo.length !== 1 ? "s" : ""} had issues below threshold (not blocking): ${corroboration.solo.map(s => `${s.dimension} (${s.issues.length}/${s.threshold})`).join(", ")}\n`);
     }
 
     return lines.join("\n");
@@ -332,18 +332,18 @@ export function buildCorroborationReport(
   if (corroborationResult.blocking.length > 0) {
     lines.push("## Blocking Issues (Corroborated)");
     lines.push("");
-    lines.push("| Dimension | Agents Agreeing | Threshold | Issues | Status |");
-    lines.push("|-----------|----------------|-----------|--------|--------|");
+    lines.push("| Dimension | Issues | Agents | Threshold | Status |");
+    lines.push("|-----------|--------|--------|-----------|--------|");
 
     for (const group of corroborationResult.blocking) {
       lines.push(
-        `| ${group.dimension} | ${group.agentCount} | ≥${group.threshold} | ${group.issues.length} | ⛔ CORROBORATED |`
+        `| ${group.dimension} | ${group.issues.length} | ${group.agentCount} | ${group.threshold} | ⛔ EXCEEDED |`
       );
     }
     lines.push("");
 
     for (const group of corroborationResult.blocking) {
-      lines.push(`### ${group.dimension} (${group.agentCount} agents, ${group.issues.length} issues)`);
+      lines.push(`### ${group.dimension} (${group.issues.length} issues)`);
       lines.push("");
       for (const {agent, issue} of group.issues) {
         lines.push(`- **[${agent}]** ${issue.issue || "No description"}`);
@@ -355,12 +355,12 @@ export function buildCorroborationReport(
   if (corroborationResult.solo.length > 0) {
     lines.push("## Solo Findings (Below Threshold)");
     lines.push("");
-    lines.push("| Dimension | Agents Agreeing | Threshold | Issues | Status |");
-    lines.push("|-----------|----------------|-----------|--------|--------|");
+    lines.push("| Dimension | Issues | Agents | Threshold | Status |");
+    lines.push("|-----------|--------|--------|-----------|--------|");
 
     for (const group of corroborationResult.solo) {
       lines.push(
-        `| ${group.dimension} | ${group.agentCount} | ≥${group.threshold} | ${group.issues.length} | ℹ️ SOLO |`
+        `| ${group.dimension} | ${group.issues.length} | ${group.agentCount} | ${group.threshold} | ℹ️ SOLO |`
       );
     }
     lines.push("");

package/dist/templates/cc-native/_cc-native/artifacts/lib/tracker.ts

@@ -6,7 +6,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 
-import { logWarn } from "../../../_shared/lib-ts/base/logger.js";
+import { logWarn } from "../../../_core/lib-ts/runtime/logger.js";
 
 // ---------------------------------------------------------------------------
 // Types

package/dist/templates/cc-native/_cc-native/artifacts/lib/write.ts

@@ -11,9 +11,9 @@ import {
   buildCombinedJson,
   generateReviewIndex,
 } from "./format.js";
-import { atomicWrite } from "../../../_shared/lib-ts/base/atomic-write.js";
-import { sanitizeFilename } from "../../../_shared/lib-ts/base/constants.js";
-import { logDebug, logWarn, logError } from "../../../_shared/lib-ts/base/logger.js";
+import { atomicWrite } from "../../../_core/lib-ts/runtime/atomic-write.js";
+import { sanitizeFilename } from "../../../_core/lib-ts/runtime/constants.js";
+import { logDebug, logWarn, logError } from "../../../_core/lib-ts/runtime/logger.js";
 import { ENABLE_ROBUST_PLAN_WRITES } from "../../lib-ts/constants.js";
 import type { CombinedReviewResult, CorroborationResult } from "../../lib-ts/types.js";
 

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

@@ -7,8 +7,7 @@
       },
       "codex": {
         "enabled": true,
-        "models": ["gpt-5.3-codex"],
-        "reasoningEffort": "low"
+        "models": ["gpt-5.3-codex"]
       }
     }
   },
@@ -27,7 +26,8 @@
     "maxIssuesPerAgent": 3,
     "orchestrator": {
       "enabled": true,
-      "model": "opus",
+      "model": "gpt-5.3-codex",
+      "provider": "codex",
       "timeout": 60
     },
     "preflight": {

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

@@ -21,6 +21,7 @@ The hook is a thin coordinator (~70 lines) that delegates to `plan-review/lib/re
 
 | Module | Location | Responsibility |
 |--------|----------|----------------|
+| `cli-args.ts` | `_core/lib-ts/runtime/` | Centralized CLI arg construction for Claude/Codex agents — all providers delegate here |
 | `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 |
@@ -42,10 +43,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 +56,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 +65,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 +88,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 +106,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 +116,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,8 +130,8 @@ 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);
@@ -160,7 +161,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 +174,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 +189,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
@@ -264,4 +265,4 @@ is stale — update or regenerate before relying on it.
 - 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 -->
+<!-- context-layer: generated=2026-02-10 | last-audited=2026-03-01 | version=3 | dir-commits-at-audit=58 -->

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,8 +18,9 @@ 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 { getProjectRoot, getAiwcliDir } from "../../_core/lib-ts/runtime/constants.js";
+import { isInternalCall } from "../../_core/lib-ts/runtime/subprocess-utils.js";
 import type { PipelineResult } from "../lib-ts/types.js";
 import { runReviewPipeline } from "../plan-review/lib/review-pipeline.js";
 

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

@@ -20,8 +20,8 @@ import {
   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";
 
 function main(): void {

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 { getProjectRoot } from "../../_core/lib-ts/runtime/constants.js";
+import { isInternalCall } from "../../_core/lib-ts/runtime/subprocess-utils.js";
 import { markQuestionsAsked } from "../lib-ts/cc-native-state.js";
 
 function main(): void {

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

@@ -9,8 +9,8 @@
  * 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.

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

@@ -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.
 

package/dist/templates/cc-native/_cc-native/lib-ts/CLAUDE.md

@@ -2,7 +2,7 @@
 
 **Location:** `_cc-native/lib-ts/` — TypeScript modules for plan review, state, and agent orchestration.
 
-**Import direction:** `hooks/` → `lib-ts/` → `_shared/lib-ts/`. Never the reverse.
+**Import direction:** `hooks/` → `lib-ts/` → `_core/lib-ts/`. Never the reverse.
 
 ---
 
@@ -32,13 +32,13 @@ The barrel `index.ts` re-exports most modules. Three files are **not** re-export
 
 ## Shared Dependencies
 
-These `_shared/lib-ts` modules are used across cc-native lib-ts:
+These `_core/lib-ts` modules are used across cc-native lib-ts:
 
 | Shared Module | Used By |
 |--------------|---------|
-| `base/logger` | All modules (logging) |
-| `base/atomic-write` | `state.ts` (crash-safe writes) |
-| `base/utils` | `cc-native-state.ts` (`nowIso`) |
+| `runtime/logger` | All modules (logging) |
+| `runtime/atomic-write` | `state.ts` (crash-safe writes) |
+| `runtime/utils` | `cc-native-state.ts` (`nowIso`) |
 | `context/context-store` | `cc-native-state.ts` (state access) |
 | `context/plan-manager` | `plan-discovery.ts` (plan path lookup) |
 | `types` | `types.ts` (re-exports `ContextState`, `HookInput`, `HookOutput`) |
@@ -48,11 +48,11 @@ These `_shared/lib-ts` modules are used across cc-native lib-ts:
 ## Import Direction
 
 ```
-hooks/                    (entry points — import from lib-ts/ and _shared/)
+hooks/                    (entry points — import from lib-ts/ and _core/)
   ↓
-lib-ts/                   (this directory — import from _shared/ only)
+lib-ts/                   (this directory — import from _core/ only)
   ↓
-_shared/lib-ts/           (cross-method infrastructure — no reverse imports)
+_core/lib-ts/           (cross-method infrastructure — no reverse imports)
 ```
 
 Never import from `hooks/` or `plan-review/` into `lib-ts/`. The one exception noted in `aggregate-agents.ts`: it stays in `lib-ts/` because both `settings.ts` and `plan-review/` depend on it.

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

@@ -12,7 +12,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 
 import type { AgentConfig } from "./types.js";
-import { logDebug, logInfo, logWarn } from "../../_shared/lib-ts/base/logger.js";
+import { logDebug, logInfo, logWarn } from "../../_core/lib-ts/runtime/logger.js";
 
 /**
  * Extract simple YAML frontmatter from markdown content.

package/dist/templates/cc-native/_cc-native/lib-ts/cc-native-state.ts

@@ -10,10 +10,10 @@ import type {
   IterationState,
   StuckDetectionState,
 } from "./types.js";
-import { logInfo, logWarn } from "../../_shared/lib-ts/base/logger.js";
-import { nowIso } from "../../_shared/lib-ts/base/utils.js";
-import { getContextBySessionId, saveState } from "../../_shared/lib-ts/context/context-store.js";
-import type { ContextState } from "../../_shared/lib-ts/types.js";
+import { getContextBySessionId, saveState } from "../../_core/lib-ts/context/context-store.js";
+import { logInfo, logWarn } from "../../_core/lib-ts/runtime/logger.js";
+import { nowIso } from "../../_core/lib-ts/runtime/utils.js";
+import type { ContextState } from "../../_core/lib-ts/types.js";
 
 /**
  * ContextState extended with the cc_native method-specific data.

package/dist/templates/cc-native/_cc-native/lib-ts/cli-output-parser.ts

@@ -3,7 +3,7 @@
  * Keeps existing import surface stable for provider implementations.
  */
 
-import { parseStructuredOutput } from "../../_shared/lib-ts/agent-exec/structured-output.js";
+import { parseStructuredOutput } from "../../_core/lib-ts/agent-exec/structured-output.js";
 
 /**
  * Parse CLI JSON output into a structured object.

package/dist/templates/cc-native/_cc-native/lib-ts/config.ts

@@ -8,7 +8,7 @@ import * as path from "node:path";
 
 import type { DisplaySettings, PlanReviewConfig } from "./types.js";
 import { DEFAULT_DISPLAY } from "./types.js";
-import { logWarn } from "../../_shared/lib-ts/base/logger.js";
+import { logWarn } from "../../_core/lib-ts/runtime/logger.js";
 
 /**
  * Load full CC-Native config from _cc-native/cc-native.config.json.

package/dist/templates/cc-native/_cc-native/lib-ts/debug.ts

@@ -9,7 +9,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 
-import { hookLog } from "../../_shared/lib-ts/base/logger.js";
+import { hookLog } from "../../_core/lib-ts/runtime/logger.js";
 
 /** Feature flag — set CCNATIVE_DEBUG_DISABLE=1 to turn off */
 const DEBUG_ENABLED = !["1", "true", "yes"].includes(

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

@@ -4,7 +4,7 @@
  */
 
 import type { ReviewData, Verdict } from "./types.js";
-import { logDebug, logWarn } from "../../_shared/lib-ts/base/logger.js";
+import { logDebug, logWarn } from "../../_core/lib-ts/runtime/logger.js";
 
 /**
  * Try strict JSON parse. If that fails, attempt to extract the first {...} block.

package/dist/templates/cc-native/_cc-native/lib-ts/plan-discovery.ts

@@ -9,8 +9,8 @@ import * as os from "node:os";
 import * as path from "node:path";
 
 import type { DiscoveredPlan } from "./types.js";
-import { logInfo, logDebug } from "../../_shared/lib-ts/base/logger.js";
-import { findPlanPathInTranscript } from "../../_shared/lib-ts/context/plan-manager.js";
+import { findPlanPathInTranscript } from "../../_core/lib-ts/context/plan-manager.js";
+import { logInfo, logDebug } from "../../_core/lib-ts/runtime/logger.js";
 
 
 const HOOK = "plan-discovery";

package/dist/templates/cc-native/_cc-native/lib-ts/rlm/logger.ts

@@ -18,7 +18,7 @@ let logDebug: (hookName: string, message: string, opts?: Record<string, unknown>
 
 try {
   // Try shared logger (works when imported as part of the hook pipeline)
-  const mod = await import("../../../../_shared/lib-ts/base/logger.js");
+  const mod = await import("../../../../_core/lib-ts/runtime/logger.js");
   logInfo = mod.logInfo;
   logWarn = mod.logWarn;
   logError = mod.logError;

package/dist/templates/cc-native/_cc-native/lib-ts/rlm/retrieval-pipeline.ts

@@ -36,10 +36,10 @@ import { openVectorDb, searchKnn } from "./vector-store.js";
 const HOOK_NAME = "rlm_retrieve";
 
 // Dynamic import for inference (crosses package boundary)
-let inferenceAsync: typeof import("../../../../_shared/lib-ts/base/inference.js").inferenceAsync;
+let inferenceAsync: typeof import("../../../../_core/lib-ts/runtime/inference.js").inferenceAsync;
 
 try {
-  const mod = await import("../../../../_shared/lib-ts/base/inference.js");
+  const mod = await import("../../../../_core/lib-ts/runtime/inference.js");
   inferenceAsync = mod.inferenceAsync;
 } catch {
   // Fallback: warn and provide a stub that always fails

package/dist/templates/cc-native/_cc-native/lib-ts/rlm/types.ts

@@ -8,7 +8,7 @@
 import { homedir } from "node:os";
 import { join } from "node:path";
 
-import { getProjectRoot } from "../../../_shared/lib-ts/base/constants.js";
+import { getProjectRoot } from "../../../_core/lib-ts/runtime/constants.js";
 import { loadConfig } from "../config.js";
 
 // ---------------------------------------------------------------------------

package/dist/templates/cc-native/_cc-native/lib-ts/settings.ts

@@ -19,8 +19,8 @@ import type {
   ProviderConfig,
 } from "./types.js";
 import { DEFAULT_DISPLAY, DEFAULT_SANITIZATION } from "./types.js";
-import { logInfo } from "../../_shared/lib-ts/base/logger.js";
-import { CODEX_MODELS } from "../../_shared/lib-ts/base/models.js";
+import { logInfo } from "../../_core/lib-ts/runtime/logger.js";
+import { CODEX_MODELS } from "../../_core/lib-ts/runtime/models.js";
 
 const HOOK = "settings";
 
@@ -180,8 +180,8 @@ export function loadSettings(projDir: string): LoadedSettings {
   const topLevelFallbackByComplexity = asRecord(raw.fallbackByComplexity) as Record<string, number> | undefined;
   if (nestedFallbackByComplexity || topLevelFallbackByComplexity) {
     mergedAgent.fallbackByComplexity = {
-      ...(nestedFallbackByComplexity ?? {}),
-      ...(topLevelFallbackByComplexity ?? {}),
+      ...nestedFallbackByComplexity,
+      ...topLevelFallbackByComplexity,
     };
   }
 
@@ -195,8 +195,8 @@ export function loadSettings(projDir: string): LoadedSettings {
   const topLevelPreflight = asRecord(raw.preflight);
   if (nestedPreflight || topLevelPreflight) {
     mergedAgent.preflight = {
-      ...(nestedPreflight ?? {}),
-      ...(topLevelPreflight ?? {}),
+      ...nestedPreflight,
+      ...topLevelPreflight,
     };
   }
 
@@ -204,8 +204,8 @@ export function loadSettings(projDir: string): LoadedSettings {
   const topLevelReviewIterations = asRecord(raw.reviewIterations) as Record<string, number> | undefined;
   mergedAgent.reviewIterations = {
     ...DEFAULT_REVIEW_ITERATIONS,
-    ...(nestedReviewIterations ?? {}),
-    ...(topLevelReviewIterations ?? {}),
+    ...nestedReviewIterations,
+    ...topLevelReviewIterations,
   };
 
   const modelsRaw = (raw.models ?? {}) as Record<string, unknown>;