aiwcli 0.15.5 → 0.17.0

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

@@ -5,10 +5,9 @@
  * Claude Code session transcripts across all projects.
  */
 
-import { homedir } from "node:os";
-import { join } from "node:path";
-
-import { getProjectRoot } from "../../../_shared/lib-ts/base/constants.js";
+import { homedir } from "os";
+import { join } from "path";
+import { getProjectRoot } from "../../../_core/lib-ts/runtime/constants.js";
 import { loadConfig } from "../config.js";
 
 // ---------------------------------------------------------------------------
@@ -35,12 +34,12 @@ export const TOP_N_HEAP = 50;
 // ---------------------------------------------------------------------------
 
 export const WEIGHT = {
-  summary: 3,
-  segmentTopic: 3,
-  keywords: 2,
-  filesTouched: 2,
+  summary: 3.0,
+  segmentTopic: 3.0,
+  keywords: 2.0,
+  filesTouched: 2.0,
   commandsRun: 1.5,
-  toolCalls: 1,
+  toolCalls: 1.0,
 } as const;
 
 // ---------------------------------------------------------------------------
@@ -142,7 +141,7 @@ export const HYDE_NUM_RESPONSES = _ccNativeConfig.numResponses ?? 5;
 export const HYDE_MAX_TOKENS = _ccNativeConfig.maxTokens ?? 200;
 
 /** Per-response generation timeout in milliseconds. Local models usually respond in 500-1500ms. */
-export const HYDE_TIMEOUT_MS = _ccNativeConfig.timeoutMs ?? 10_000;
+export const HYDE_TIMEOUT_MS = _ccNativeConfig.timeoutMs ?? 10000;
 
 /** Fallback to direct query embedding if HyDE fails? true = graceful degradation (recommended). */
 export const HYDE_FALLBACK_TO_QUERY = _ccNativeConfig.fallbackToQuery ?? true;

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

@@ -7,9 +7,8 @@
 
 import { Database } from "bun:sqlite";
 import * as sqliteVec from "sqlite-vec";
-
-import { logDebug } from "./logger.js";
 import { RLM_VECTOR_DB_PATH, EMBED_DIMENSIONS, type VectorSearchResult } from "./types.js";
+import { logDebug, logInfo } from "./logger.js";
 
 const HOOK_NAME = "rlm_vector";
 
@@ -155,7 +154,7 @@ export function deleteSessionChunks(
     `SELECT rowid FROM chunks WHERE session_id = ? AND project = ?`,
   ).all(sessionId, project);
 
-  const rows = (Array.isArray(rawRows) ? rawRows : []).filter((row) => isRowidResult(row));
+  const rows = (Array.isArray(rawRows) ? rawRows : []).filter(isRowidResult);
 
   if (rows.length > 0) {
     const tx = db.transaction(() => {
@@ -238,7 +237,7 @@ export function searchKnn(
   }
 
   const rawRows = db.query(sql).all(...params);
-  const rows = (Array.isArray(rawRows) ? rawRows : []).filter((row) => isSearchResultRow(row));
+  const rows = (Array.isArray(rawRows) ? rawRows : []).filter(isSearchResultRow);
 
   return rows.map((r) => ({
     chunk_id: r.rowid,

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

@@ -5,22 +5,18 @@
 
 import * as path from "node:path";
 
+import { logInfo } from "../../_core/lib-ts/runtime/logger.js";
 
-import { aggregateAgents } from "./aggregate-agents.js";
-import { loadConfig, getDisplaySettings } from "./config.js";
-import { DEFAULT_REVIEW_ITERATIONS } from "./state.js";
 import type {
   AgentConfig,
-  AgentReviewSettings,
-  AgentSelectionConfig,
-  LoadedSettings,
-  ModelsConfig,
-  PlanReviewSettings,
+  OrchestratorConfig,
   ProviderConfig,
+  ModelsConfig,
 } 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 { loadConfig, getDisplaySettings } from "./config.js";
+import { aggregateAgents } from "./aggregate-agents.js";
+import { DEFAULT_REVIEW_ITERATIONS } from "./state.js";
 
 const HOOK = "settings";
 
@@ -61,10 +57,10 @@ export const DEFAULT_AGENTS: Array<{ name: string; model: string; provider: stri
   { ...AGENT_DEFAULTS, name: "constraint-validator", focus: "constraint identification and satisfaction", categories: ALL_CATEGORIES },
 ];
 
-export const DEFAULT_ORCHESTRATOR = { enabled: true, model: CODEX_MODELS.codex, provider: "codex", timeout: 60 } as const;
+export const DEFAULT_ORCHESTRATOR: { enabled: boolean; model: string; timeout: number } = { enabled: true, model: "opus", timeout: 60 };
 export const DEFAULT_AGENT_MODEL = "sonnet";
 
-export const DEFAULT_AGENT_SELECTION: AgentSelectionConfig = {
+export const DEFAULT_AGENT_SELECTION: Record<string, unknown> = {
   simple: { min: 3, max: 3 },
   medium: { min: 5, max: 5 },
   high: { min: 7, max: 7 },
@@ -75,8 +71,8 @@ export const DEFAULT_COMPLEXITY_CATEGORIES = ["code", "infrastructure", "documen
 
 export const DEFAULT_MODELS_CONFIG: ModelsConfig = {
   providers: {
-    claude: { enabled: false, models: ["sonnet"] },
-    codex: { enabled: true, models: [CODEX_MODELS.codex] },
+    claude: { enabled: true, models: ["sonnet"] },
+    codex: { enabled: true, models: ["gpt-5.4"], reasoning_effort: "low" },
   },
 };
 
@@ -84,131 +80,58 @@ export const DEFAULT_MODELS_CONFIG: ModelsConfig = {
 // Settings Loading
 // ---------------------------------------------------------------------------
 
-function asRecord(value: unknown): Record<string, unknown> | undefined {
-  return value && typeof value === "object" && !Array.isArray(value)
-    ? value as Record<string, unknown>
-    : undefined;
-}
-
-function asStringArray(value: unknown): string[] | undefined {
-  if (!Array.isArray(value)) return undefined;
-  const filtered = value.filter((item): item is string => typeof item === "string" && item.trim().length > 0);
-  return filtered.length > 0 ? filtered : undefined;
-}
-
-export function loadSettings(projDir: string): LoadedSettings {
-  const defaultPlan: PlanReviewSettings = {
-    enabled: true,
-    reviewers: {
-      codex: { enabled: true, model: "", timeout: 120 },
-      gemini: { enabled: false, model: "", timeout: 120 },
+export function loadSettings(projDir: string): Record<string, unknown> {
+  const defaults: Record<string, unknown> = {
+    planReview: {
+      enabled: true,
+      reviewers: {
+        codex: { enabled: true, model: "", timeout: 120 },
+        gemini: { enabled: false, model: "", timeout: 120 },
+      },
+      display: { ...DEFAULT_DISPLAY },
+    },
+    agentReview: {
+      enabled: true,
+      orchestrator: { ...DEFAULT_ORCHESTRATOR },
+      timeout: 180,
+      highIssueThreshold: 3,
+      legacyMode: false,
+      display: { ...DEFAULT_DISPLAY },
+      agentSelection: { ...DEFAULT_AGENT_SELECTION },
+      agentDefaults: { model: DEFAULT_AGENT_MODEL },
+      complexityCategories: [...DEFAULT_COMPLEXITY_CATEGORIES],
+      sanitization: { ...DEFAULT_SANITIZATION },
     },
-    display: { ...DEFAULT_DISPLAY },
-  };
-
-  const defaultAgent: AgentReviewSettings = {
-    enabled: true,
-    orchestrator: { ...DEFAULT_ORCHESTRATOR },
-    timeout: 180,
-    highIssueThreshold: 3,
-    legacyMode: false,
-    display: { ...DEFAULT_DISPLAY },
-    agentSelection: { ...DEFAULT_AGENT_SELECTION },
-    agentDefaults: { model: DEFAULT_AGENT_MODEL },
-    complexityCategories: [...DEFAULT_COMPLEXITY_CATEGORIES],
-    sanitization: { ...DEFAULT_SANITIZATION },
   };
 
   const config = loadConfig(projDir);
-  if (!config || Object.keys(config).length === 0) {
-    return { planReview: defaultPlan, agentReview: defaultAgent, models: {} };
-  }
-
-  // Cast raw config to access arbitrary keys from JSON
-  const raw = config as Record<string, unknown>;
+  if (!config || Object.keys(config).length === 0) return { ...defaults, models: {} };
 
   // Merge planReview
-  const planReviewRaw = (asRecord(raw.planReview) ?? {}) as Partial<PlanReviewSettings>;
-  const mergedPlan: PlanReviewSettings = { ...defaultPlan, ...planReviewRaw };
-  if (planReviewRaw.reviewers) {
-    mergedPlan.reviewers = { ...defaultPlan.reviewers, ...planReviewRaw.reviewers };
+  const planReview = config.planReview ?? {};
+  const mergedPlan = { ...defaults.planReview, ...planReview };
+  if (planReview.reviewers) {
+    mergedPlan.reviewers = { ...defaults.planReview.reviewers, ...planReview.reviewers };
   }
   mergedPlan.display = getDisplaySettings(config, "planReview");
 
   // Merge agentReview
-  const agentReviewRawRecord = asRecord(raw.agentReview);
-  const agentReviewRaw = (agentReviewRawRecord ?? {}) as Partial<AgentReviewSettings>;
-  const mergedAgent: AgentReviewSettings = { ...defaultAgent, ...agentReviewRaw };
+  const agentReview = (config as Record<string, unknown>).agentReview ?? {};
+  const mergedAgent = { ...defaults.agentReview, ...agentReview };
   if (!mergedAgent.orchestrator || typeof mergedAgent.orchestrator !== "object") {
     mergedAgent.orchestrator = { ...DEFAULT_ORCHESTRATOR };
   } else {
     mergedAgent.orchestrator = { ...DEFAULT_ORCHESTRATOR, ...mergedAgent.orchestrator };
   }
   mergedAgent.display = getDisplaySettings(config, "agentReview");
-
-  const nestedAgentSelection = asRecord(agentReviewRawRecord?.agentSelection) as AgentSelectionConfig | undefined;
-  const topLevelAgentSelection = asRecord(raw.agentSelection) as AgentSelectionConfig | undefined;
-  mergedAgent.agentSelection = {
-    ...DEFAULT_AGENT_SELECTION,
-    ...nestedAgentSelection,
-    ...topLevelAgentSelection,
-  };
-
-  const nestedAgentDefaults = asRecord(agentReviewRawRecord?.agentDefaults) as { model?: string } | undefined;
-  const topLevelAgentDefaults = asRecord(raw.agentDefaults) as { model?: string } | undefined;
-  mergedAgent.agentDefaults = {
-    model: DEFAULT_AGENT_MODEL,
-    ...nestedAgentDefaults,
-    ...topLevelAgentDefaults,
-  };
-
-  const nestedComplexityCategories = asStringArray(agentReviewRawRecord?.complexityCategories);
-  const topLevelComplexityCategories = asStringArray(raw.complexityCategories);
-  mergedAgent.complexityCategories = topLevelComplexityCategories
-    ?? nestedComplexityCategories
-    ?? [...DEFAULT_COMPLEXITY_CATEGORIES];
-
-  const nestedSanitization = asRecord(agentReviewRawRecord?.sanitization);
-  const topLevelSanitization = asRecord(raw.sanitization);
-  mergedAgent.sanitization = {
-    ...DEFAULT_SANITIZATION,
-    ...nestedSanitization,
-    ...topLevelSanitization,
-  };
-
-  const nestedFallbackByComplexity = asRecord(agentReviewRawRecord?.fallbackByComplexity) as Record<string, number> | undefined;
-  const topLevelFallbackByComplexity = asRecord(raw.fallbackByComplexity) as Record<string, number> | undefined;
-  if (nestedFallbackByComplexity || topLevelFallbackByComplexity) {
-    mergedAgent.fallbackByComplexity = {
-      ...(nestedFallbackByComplexity ?? {}),
-      ...(topLevelFallbackByComplexity ?? {}),
-    };
-  }
-
-  const nestedMandatoryAgents = agentReviewRawRecord?.mandatoryAgents as AgentReviewSettings["mandatoryAgents"] | undefined;
-  const topLevelMandatoryAgents = raw.mandatoryAgents as AgentReviewSettings["mandatoryAgents"] | undefined;
-  if (nestedMandatoryAgents !== undefined || topLevelMandatoryAgents !== undefined) {
-    mergedAgent.mandatoryAgents = topLevelMandatoryAgents ?? nestedMandatoryAgents;
-  }
-
-  const nestedPreflight = asRecord(agentReviewRawRecord?.preflight);
-  const topLevelPreflight = asRecord(raw.preflight);
-  if (nestedPreflight || topLevelPreflight) {
-    mergedAgent.preflight = {
-      ...(nestedPreflight ?? {}),
-      ...(topLevelPreflight ?? {}),
-    };
-  }
-
-  const nestedReviewIterations = asRecord(agentReviewRawRecord?.reviewIterations) as Record<string, number> | undefined;
-  const topLevelReviewIterations = asRecord(raw.reviewIterations) as Record<string, number> | undefined;
-  mergedAgent.reviewIterations = {
-    ...DEFAULT_REVIEW_ITERATIONS,
-    ...(nestedReviewIterations ?? {}),
-    ...(topLevelReviewIterations ?? {}),
-  };
-
-  const modelsRaw = (raw.models ?? {}) as Record<string, unknown>;
+  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.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 ?? {} };
+
+  const modelsRaw = (config as Record<string, unknown>).models ?? {};
   return { planReview: mergedPlan, agentReview: mergedAgent, models: modelsRaw };
 }
 
@@ -216,7 +139,7 @@ export function loadSettings(projDir: string): LoadedSettings {
 // Models Config
 // ---------------------------------------------------------------------------
 
-export function loadModelsConfig(settings: LoadedSettings): ModelsConfig {
+export function loadModelsConfig(settings: Record<string, unknown>): ModelsConfig {
   const raw = settings.models as Record<string, unknown> | undefined;
   if (!raw?.providers || typeof raw.providers !== "object") {
     return DEFAULT_MODELS_CONFIG;
@@ -227,6 +150,7 @@ export function loadModelsConfig(settings: LoadedSettings): ModelsConfig {
     providers[name] = {
       enabled: c.enabled !== false,
       models: Array.isArray(c.models) ? (c.models as string[]).filter(Boolean) : [],
+      ...(typeof c.reasoning_effort === "string" ? { reasoning_effort: c.reasoning_effort } : {}),
     };
   }
   return { providers };
@@ -238,9 +162,9 @@ export function loadModelsConfig(settings: LoadedSettings): ModelsConfig {
 
 export function loadAgentLibrary(
   projDir: string,
-  settings?: AgentReviewSettings,
+  settings?: Record<string, unknown>,
 ): AgentConfig[] {
-  const agentsData = aggregateAgents(path.join(projDir, "_cc-native", "plan-review", "agents", "plan-review"));
+  const agentsData = aggregateAgents(path.join(projDir, "_cc-native", "agents", "plan-review"));
   const defaultModel = settings?.agentDefaults?.model ?? DEFAULT_AGENT_MODEL;
 
   if (!agentsData || agentsData.length === 0) {

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

@@ -6,12 +6,11 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-
+import { atomicWrite } from "../../_core/lib-ts/runtime/atomic-write.js";
+import { logInfo, logWarn, logError } from "../../_core/lib-ts/runtime/logger.js";
+import { nowIso } from "../../_core/lib-ts/runtime/utils.js";
 import { validatePlanPath } from "./constants.js";
 import type { IterationState, IterationEntry } from "./types.js";
-import { atomicWrite } from "../../_shared/lib-ts/base/atomic-write.js";
-import { logInfo, logWarn, logError } from "../../_shared/lib-ts/base/logger.js";
-import { nowIso } from "../../_shared/lib-ts/base/utils.js";
 
 // ---------------------------------------------------------------------------
 // Constants
@@ -73,11 +72,11 @@ export function loadState(planPath: string): Record<string, unknown> | null {
     }
 
     return state;
-  } catch (error: unknown) {
-    if (error instanceof Error && error.message.includes("Invalid plan path")) {
-      logError("state", `SECURITY: Invalid plan path: ${error}`);
+  } catch (e: unknown) {
+    if (e instanceof Error && e.message.includes("Invalid plan path")) {
+      logError("state", `SECURITY: Invalid plan path: ${e}`);
     } else {
-      logError("state", `Failed to load state: ${error}`);
+      logError("state", `Failed to load state: ${e}`);
     }
     return null;
   }
@@ -110,11 +109,11 @@ export function saveStateToPlan(
     }
 
     return true;
-  } catch (error: unknown) {
-    if (error instanceof Error && error.message.includes("Invalid plan path")) {
-      logError("state", `SECURITY: Invalid plan path: ${error}`);
+  } catch (e: unknown) {
+    if (e instanceof Error && e.message.includes("Invalid plan path")) {
+      logError("state", `SECURITY: Invalid plan path: ${e}`);
     } else {
-      logError("state", String(error));
+      logError("state", String(e));
     }
     return false;
   }
@@ -132,12 +131,12 @@ export function deleteState(planPath: string): boolean {
       logInfo("state", `Deleted state file: ${stateFile}`);
     }
     return true;
-  } catch (error: unknown) {
-    if (error instanceof Error && error.message.includes("Invalid plan path")) {
-      logError("state", `SECURITY: Invalid plan path in delete: ${error}`);
+  } catch (e: unknown) {
+    if (e instanceof Error && e.message.includes("Invalid plan path")) {
+      logError("state", `SECURITY: Invalid plan path in delete: ${e}`);
       return false;
     }
-    logWarn("state", `Failed to delete state file: ${error}`);
+    logWarn("state", `Failed to delete state file: ${e}`);
     return false;
   }
 }
@@ -178,7 +177,6 @@ export function getIterationState(
     passStreaks: {},
     lastPlanHash: "",
     lastPlanPath: "",
-    sessionId: "",
   };
 }
 
@@ -210,7 +208,7 @@ export function shouldContinueIterating(
   verdict: string,
   config?: Record<string, unknown>,
 ): boolean {
-  const {current} = iteration;
+  const current = iteration.current;
   const maxIter = iteration.max;
 
   // At or past max iterations
@@ -254,8 +252,8 @@ export function loadIterationState(reviewsDir: string): IterationState | null {
   if (!fs.existsSync(iterationFile)) return null;
   try {
     return JSON.parse(fs.readFileSync(iterationFile, "utf-8")) as IterationState;
-  } catch (error) {
-    logError("state", `Failed to load iteration state: ${error}`);
+  } catch (e) {
+    logError("state", `Failed to load iteration state: ${e}`);
     return null;
   }
 }
@@ -270,8 +268,8 @@ export function saveIterationState(reviewsDir: string, state: IterationState): b
     const toWrite = { ...state, schema_version: "1.0.0" };
     fs.writeFileSync(iterationFile, JSON.stringify(toWrite, null, 2), "utf-8");
     return true;
-  } catch (error) {
-    logError("state", `Failed to save iteration state: ${error}`);
+  } catch (e) {
+    logError("state", `Failed to save iteration state: ${e}`);
     return false;
   }
 }

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

@@ -13,6 +13,6 @@
     "types": ["bun-types"],
     "skipLibCheck": true
   },
-  "include": ["./**/*.ts", "../../_shared/lib-ts/**/*.ts"],
-  "exclude": ["../../_shared/lib-ts/__tests__/**"]
+  "include": ["./**/*.ts", "../../_core/lib-ts/**/*.ts"],
+  "exclude": ["../../_core/lib-ts/__tests__/**"]
 }

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

@@ -5,11 +5,7 @@
  */
 
 // Re-export shared types used by cc-native consumers
-export type { ContextState, HookInput, HookOutput } from "../../_shared/lib-ts/types.js";
-
-// Import AgentConfig for local use and re-export
-import type { AgentConfig as _AgentConfig } from "../../_shared/lib-ts/types.js";
-export type AgentConfig = _AgentConfig;
+export type { ContextState, HookInput, HookOutput } from "../../_core/lib-ts/types.js";
 
 // ---------------------------------------------------------------------------
 // Verdict & Decision Types
@@ -122,13 +118,22 @@ export interface ReviewDecisionResult {
 // Agent & Orchestrator Configuration
 // ---------------------------------------------------------------------------
 
-// AgentConfig re-exported from _shared/lib-ts/types.ts above
+/** Configuration for a Claude Code review agent */
+export interface AgentConfig {
+  name: string;
+  model: string;
+  provider: string; // e.g. "claude" | "codex" — assigned at runtime by assignModelsToAgents()
+  focus: string;
+  categories: string[];
+  description: string;
+  system_prompt: string; // Markdown body content for --system-prompt
+  reasoning_effort?: string; // e.g. "low" | "medium" | "high" — passed from ProviderConfig
+}
 
 /** Configuration for the plan orchestrator */
 export interface OrchestratorConfig {
   enabled: boolean;
   model: string;
-  provider?: string;
   timeout: number;
 }
 
@@ -136,6 +141,7 @@ export interface OrchestratorConfig {
 export interface ProviderConfig {
   enabled: boolean;
   models: string[];
+  reasoning_effort?: string; // e.g. "low" | "medium" | "high" — applied to all models in this provider
 }
 
 /** Model provider pool configuration */
@@ -143,66 +149,6 @@ export interface ModelsConfig {
   providers: Record<string, ProviderConfig>;
 }
 
-// ---------------------------------------------------------------------------
-// Settings Interfaces (typed output of loadSettings())
-// ---------------------------------------------------------------------------
-
-/** Agent selection count range for a single complexity tier */
-export interface AgentSelectionRange {
-  min: number;
-  max: number;
-}
-
-/** Agent selection configuration (per-tier ranges + fallback) */
-export interface AgentSelectionConfig {
-  simple?: AgentSelectionRange;
-  medium?: AgentSelectionRange;
-  high?: AgentSelectionRange;
-  fallbackCount?: number;
-}
-
-/** Preflight health-check configuration */
-export interface PreflightSettings {
-  enabled?: boolean;
-  timeoutMs?: number;
-}
-
-/** Plan review section of merged settings (the "planReview" key) */
-export interface PlanReviewSettings {
-  enabled?: boolean;
-  reviewers?: {
-    codex?: { enabled?: boolean; model?: string; timeout?: number };
-    gemini?: { enabled?: boolean; model?: string; timeout?: number };
-  };
-  display?: Partial<DisplaySettings>;
-}
-
-/** Agent review section of merged settings (the "agentReview" key) */
-export interface AgentReviewSettings {
-  enabled?: boolean;
-  timeout?: number;
-  orchestrator?: OrchestratorConfig;
-  legacyMode?: boolean;
-  highIssueThreshold?: number;
-  maxIssuesPerAgent?: number;
-  mandatoryAgents?: string[] | Record<string, string[]>;
-  agentSelection?: AgentSelectionConfig;
-  agentDefaults?: { model?: string };
-  complexityCategories?: string[];
-  sanitization?: { maxSessionIdLength?: number; maxTitleLength?: number };
-  reviewIterations?: Record<string, number>;
-  display?: Partial<DisplaySettings>;
-  preflight?: PreflightSettings;
-  fallbackByComplexity?: Record<string, number>;
-}
-
-/** Top-level settings object returned by loadSettings() */
-export interface LoadedSettings {
-  planReview: PlanReviewSettings;
-  agentReview: AgentReviewSettings;
-  models: Record<string, unknown>;
-}
-
 // ---------------------------------------------------------------------------
 // State Interfaces
 // ---------------------------------------------------------------------------
@@ -329,7 +275,7 @@ export interface Reviewer {
 // JSON Schemas (moved to reviewers/schemas.ts)
 // ---------------------------------------------------------------------------
 // Re-export for backwards compatibility
-export { AGENT_REVIEW_PROMPT_PREFIX, ORCHESTRATOR_SCHEMA, REVIEW_PROMPT_PREFIX, REVIEW_SCHEMA } from "../plan-review/lib/reviewers/schemas.js";
+export { REVIEW_SCHEMA, ORCHESTRATOR_SCHEMA, REVIEW_PROMPT_PREFIX, AGENT_REVIEW_PROMPT_PREFIX } from "./reviewers/schemas.js";
 
 // ---------------------------------------------------------------------------
 // Display Defaults
@@ -383,24 +329,3 @@ export interface IterationAdvancement {
   updatedState: IterationState;
   newGraduates: string[];
 }
-
-// ---------------------------------------------------------------------------
-// Preflight Types
-// ---------------------------------------------------------------------------
-
-/** Result from a single provider+model preflight check */
-export interface PreflightCheckResult {
-  provider: string;
-  model: string;
-  available: boolean;
-  latencyMs: number;
-  error?: string;
-}
-
-/** Aggregated preflight report across all provider+model combos */
-export interface PreflightReport {
-  checks: PreflightCheckResult[];
-  available: Map<string, Set<string>>;  // provider → set of working models
-  allFailed: boolean;
-  totalMs: number;
-}