aiwcli 0.13.7 → 0.14.0

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

@@ -2,97 +2,29 @@
  * Preflight health checks for plan review agents.
  * Validates provider+model combos work before committing agents to them.
  * Runs minimal "ping" requests in parallel per unique provider:model combo.
+ *
+ * Uses shared checkProviderModel() from _shared/lib-ts/base/preflight.ts.
+ * This module provides the batch orchestrator and provider registry specific
+ * to the plan review pipeline.
  */
 
-import { logInfo, logWarn, logDebug } from "../../../_shared/lib-ts/base/logger.js";
-import { findExecutable, execFileAsync, getInternalSubprocessEnv } from "../../../_shared/lib-ts/base/subprocess-utils.js";
+import { preflightCommandConfig } from "../../../_shared/lib-ts/base/cli-args.js";
+import { logInfo, logWarn } from "../../../_shared/lib-ts/base/logger.js";
+import { checkProviderModel, type PreflightCommandConfig } from "../../../_shared/lib-ts/base/preflight.js";
 import type { ModelsConfig, PreflightCheckResult, PreflightReport } from "../../lib-ts/types.js";
-import { claudePreflightArgs, CLAUDE_PREFLIGHT_INPUT } from "./reviewers/providers/claude-agent.js";
-import { codexPreflightArgs, CODEX_PREFLIGHT_INPUT } from "./reviewers/providers/codex-agent.js";
 
 const HOOK = "preflight";
 const DEFAULT_TIMEOUT_MS = 15000;
 
 // ---------------------------------------------------------------------------
-// Provider Registry
+// Provider Registry (built from centralized cli-args)
 // ---------------------------------------------------------------------------
 
-interface PreflightCommandConfig {
-  cliName: string;
-  buildArgs: (model: string) => string[];
-  input: string;
-}
-
 const PREFLIGHT_COMMANDS: Record<string, PreflightCommandConfig> = {
-  claude: { cliName: "claude", buildArgs: claudePreflightArgs, input: CLAUDE_PREFLIGHT_INPUT },
-  codex:  { cliName: "codex",  buildArgs: codexPreflightArgs,  input: CODEX_PREFLIGHT_INPUT },
+  claude: preflightCommandConfig("claude"),
+  codex:  preflightCommandConfig("codex"),
 };
 
-// ---------------------------------------------------------------------------
-// Error Classification
-// ---------------------------------------------------------------------------
-
-function classifyError(stderr: string, exitCode: number | null, killed: boolean, signal: string | null): string {
-  if (killed || signal === "SIGTERM") return "Preflight timed out";
-  if (/model.*not found|not available/i.test(stderr)) return "Model not available for this account";
-  if (/rate limit|429/i.test(stderr)) return "Rate limited";
-  if (/auth|api key|401/i.test(stderr)) return "Authentication failed";
-  if (/quota|billing/i.test(stderr)) return "Quota/billing issue";
-  return `Exit code ${exitCode}`;
-}
-
-// ---------------------------------------------------------------------------
-// Single Check
-// ---------------------------------------------------------------------------
-
-async function checkProviderModel(
-  provider: string,
-  model: string,
-  timeoutMs: number,
-): Promise<PreflightCheckResult> {
-  const config = PREFLIGHT_COMMANDS[provider];
-  if (!config) {
-    return { provider, model, available: false, latencyMs: 0, error: `Unknown provider: ${provider}` };
-  }
-
-  const cliPath = findExecutable(config.cliName);
-  if (!cliPath) {
-    return { provider, model, available: false, latencyMs: 0, error: `CLI '${config.cliName}' not found on PATH` };
-  }
-
-  const start = Date.now();
-  try {
-    const env = getInternalSubprocessEnv();
-    const result = await execFileAsync(cliPath, config.buildArgs(model), {
-      input: config.input,
-      timeout: timeoutMs,
-      env: env as Record<string, string>,
-      maxBuffer: 1 * 1024 * 1024,
-      shell: process.platform === "win32",
-    });
-
-    const latencyMs = Date.now() - start;
-
-    if (result.killed || result.signal === "SIGTERM") {
-      return { provider, model, available: false, latencyMs, error: "Preflight timed out" };
-    }
-
-    if (result.exitCode !== 0) {
-      const error = classifyError(result.stderr, result.exitCode, result.killed, result.signal);
-      logWarn(HOOK, `${provider}:${model} failed: ${error} (stderr: ${result.stderr.slice(-200)})`);
-      return { provider, model, available: false, latencyMs, error };
-    }
-
-    logDebug(HOOK, `${provider}:${model} passed (${latencyMs}ms)`);
-    return { provider, model, available: true, latencyMs };
-  } catch (err) {
-    const latencyMs = Date.now() - start;
-    const error = err instanceof Error ? err.message : String(err);
-    logWarn(HOOK, `${provider}:${model} exception: ${error}`);
-    return { provider, model, available: false, latencyMs, error };
-  }
-}
-
 // ---------------------------------------------------------------------------
 // Run All Checks
 // ---------------------------------------------------------------------------
@@ -130,9 +62,11 @@ export async function runPreflight(
 
   logInfo(HOOK, `Checking ${checks.length} provider:model combo(s): ${checks.map(c => `${c.provider}:${c.model}`).join(", ")}`);
 
-  // Run all checks in parallel
+  // Run all checks in parallel (pass provider-specific config from registry)
   const results = await Promise.all(
-    checks.map(({ provider, model }) => checkProviderModel(provider, model, effectiveTimeout)),
+    checks.map(({ provider, model }) =>
+      checkProviderModel(provider, model, PREFLIGHT_COMMANDS[provider]!, effectiveTimeout, HOOK),
+    ),
   );
 
   // Build available map

package/dist/templates/cc-native/_cc-native/plan-review/lib/reviewers/agent.ts

@@ -4,19 +4,24 @@
  * See cc-native-plan-review-spec.md §4.10
  */
 
+import type { ExecutionBackend } from "../../../../_shared/lib-ts/agent-exec/execution-backend.js";
+import { logWarn } from "../../../../_shared/lib-ts/base/logger.js";
+import { debugLog, debugRaw } from "../../../lib-ts/debug.js";
+import type { AgentConfig, ReviewerResult, ReviewOptions } from "../../../lib-ts/types.js";
 import { ClaudeAgent } from "./providers/claude-agent.js";
 import { CodexAgent } from "./providers/codex-agent.js";
 import { GeminiAgent } from "./providers/gemini-agent.js";
 import type { Reviewer } from "./types.js";
 import { makeResult } from "./types.js";
-import { logWarn } from "../../../../_shared/lib-ts/base/logger.js";
-import type { AgentConfig, ReviewerResult, ReviewOptions } from "../../../lib-ts/types.js";
 
 /**
  * Agent reviewer — runs a CLI instance with a custom persona.
  */
 export class AgentReviewer implements Reviewer {
-  constructor(private agent: AgentConfig) {}
+  constructor(
+    private agent: AgentConfig,
+    private backend?: ExecutionBackend,
+  ) {}
 
   async review(
     plan: string,
@@ -30,6 +35,7 @@ export class AgentReviewer implements Reviewer {
       options.timeout,
       options.context_path,
       options.session_name ?? "unknown",
+      this.backend,
     );
   }
 }
@@ -46,21 +52,27 @@ export async function runAgentReview(
   timeout: number,
   contextPath?: string,
   sessionName = "unknown",
+  backend?: ExecutionBackend,
 ): Promise<ReviewerResult> {
   try {
-    let reviewer;
+    const config = {
+      agent, schema, timeout, contextPath, sessionName,
+      debugLogger: { log: debugLog, raw: debugRaw },
+    };
+
+    let reviewer: ClaudeAgent | CodexAgent | GeminiAgent;
 
     switch (agent.provider) {
       case "codex": {
-        reviewer = new CodexAgent(agent, schema, timeout, contextPath, sessionName);
+        reviewer = new CodexAgent(config, backend);
         break;
       }
       case "gemini": {
-        reviewer = new GeminiAgent(agent, schema, timeout, contextPath, sessionName);
+        reviewer = new GeminiAgent(config, backend);
         break;
       }
       default: {
-        reviewer = new ClaudeAgent(agent, schema, timeout, contextPath, sessionName);
+        reviewer = new ClaudeAgent(config, backend);
         break;
       }
     }

package/dist/templates/cc-native/_cc-native/plan-review/lib/reviewers/base/base-agent.ts

@@ -1,218 +1,7 @@
 /**
- * Abstract base class for CLI-based agent reviewers.
- * Implements template method pattern for subprocess execution flow.
- * Provider-specific implementations (Claude, Codex, Gemini) extend this class.
+ * Re-export shim — BaseCliAgent now lives in _shared/lib-ts/agent-exec/base-agent.ts.
+ * This file preserves all existing import paths for provider implementations.
  */
 
-import { logDebug, logInfo, logWarn, logError } from "../../../../../_shared/lib-ts/base/logger.js";
-import { getInternalSubprocessEnv, findExecutable, execFileAsync, normalizePathForCli } from "../../../../../_shared/lib-ts/base/subprocess-utils.js";
-import { debugLog, debugRaw } from "../../../../lib-ts/debug.js";
-import type { AgentConfig } from "../../../../lib-ts/types.js";
-
-/** Result from execFileAsync */
-export interface ExecResult {
-  stdout: string;
-  stderr: string;
-  exitCode: number | null;
-  signal: string | null;
-  killed: boolean;
-}
-
-/**
- * Abstract base class for all CLI agent subprocess invocations.
- * Parameterized over return type T — ReviewerResult for reviewers,
- * OrchestratorResult for the orchestrator.
- * Subclasses implement provider-specific details.
- */
-export abstract class BaseCliAgent<T> {
-  protected agent: AgentConfig;
-  protected contextPath?: string;
-  protected schema: Record<string, unknown>;
-  protected sessionName: string;
-  protected timeout: number;
-
-  constructor(
-    agent: AgentConfig,
-    schema: Record<string, unknown>,
-    timeout: number,
-    contextPath?: string,
-    sessionName = "unknown",
-  ) {
-    this.agent = agent;
-    this.schema = schema;
-    this.timeout = timeout;
-    this.contextPath = contextPath;
-    this.sessionName = sessionName;
-  }
-
-  /** Build the command-line arguments for the CLI */
-  protected abstract buildCliArgs(): string[];
-
-  // ─── Abstract Methods (Subclass Implements) ────────────────────────────
-
-  /** Build the stdin prompt for the CLI */
-  protected abstract buildPrompt(plan: string): string;
-
-  /** Optional cleanup after subprocess execution */
-  protected async cleanup(): Promise<void> {
-    // Default: no-op. Subclasses override if needed (e.g., Codex temp files).
-  }
-
-  /** Coerce parsed JSON into the result type T */
-  protected abstract coerceResult(obj: Record<string, unknown> | null, raw: string, err: string): T;
-
-  /** Extract stdout/stderr from subprocess result. Override for file-based output (Codex). */
-  protected extractOutput(result: ExecResult): { raw: string; err: string } {
-    return {
-      raw: result.stdout.trim(),
-      err: result.stderr.trim(),
-    };
-  }
-
-  /** Find the CLI executable. Override for custom search logic. */
-  protected findCli(): string | null {
-    return findExecutable(this.getCliName());
-  }
-
-  // ─── Template Methods (Subclass Can Override) ──────────────────────────
-
-  /** Get the CLI executable name (e.g., "claude", "codex") */
-  protected abstract getCliName(): string;
-
-  /** Get default error message for coerceToReview */
-  protected getDefaultErrorMessage(): string {
-    return `Retry or check ${this.getCliName()} configuration.`;
-  }
-
-  /** Handle non-zero exit with no output */
-  protected handleExitError(result: ExecResult): T {
-    const msg = `${this.agent.name} failed to run (exit ${result.exitCode})`;
-    logError(this.agent.name, `Process exited with code ${result.exitCode} and no output`);
-    return this.makeErrorResult("error", msg);
-  }
-
-  /** Handle timeout scenario */
-  protected handleTimeout(): T {
-    const msg = `${this.getCliName()} TIMEOUT after ${this.timeout}s`;
-    logWarn(this.agent.name, msg);
-    return this.makeErrorResult("error", `${this.agent.name} timed out after ${this.timeout}s`);
-  }
-
-  // ─── Shared Infrastructure ──────────────────────────────────────────────
-
-  /** Log parsed JSON result */
-  protected logParsedResult(obj: Record<string, unknown> | null): void {
-    if (this.contextPath && obj) {
-      debugLog(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "parsed_result", {
-        parsed_keys: Object.keys(obj),
-        verdict: obj.verdict ?? null,
-        has_summary: Boolean(obj.summary),
-        issues_count: Array.isArray(obj.issues) ? (obj.issues as unknown[]).length : 0,
-      });
-    }
-
-    if (obj) {
-      logInfo(this.agent.name, `Parsed JSON successfully, verdict: ${obj.verdict ?? "N/A"}`);
-    } else {
-      logWarn(this.agent.name, "Failed to parse JSON from output");
-    }
-  }
-
-  /** Log subprocess execution results */
-  protected logSubprocessResult(result: ExecResult, raw: string, err: string): void {
-    logDebug(this.agent.name, `Exit code: ${result.exitCode}`);
-    logDebug(this.agent.name, `stdout length: ${raw.length} chars`);
-    if (err) logDebug(this.agent.name, `stderr: ${err.slice(0, 500)}`);
-
-    // Debug logging
-    if (this.contextPath) {
-      debugRaw(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "stdout", raw);
-      if (err) {
-        debugRaw(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "stderr", err);
-      }
-      debugLog(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "subprocess_info", {
-        exit_code: result.exitCode,
-        stdout_len: raw.length,
-        stderr_len: err.length,
-        model: this.agent.model,
-        provider: this.agent.provider,
-        timeout: this.timeout,
-      });
-    }
-
-    if (raw) logDebug(this.agent.name, `stdout preview: ${raw.slice(0, 500)}`);
-  }
-
-  /** Construct a T for error/skip/timeout scenarios. Subclasses define shape. */
-  protected abstract makeErrorResult(type: "skip" | "error", message: string): T;
-
-  /** Create skip result when CLI not found */
-  protected makeSkipResult(reason: string): T {
-    logWarn(this.agent.name, reason);
-    return this.makeErrorResult("skip", reason);
-  }
-
-  /** Parse JSON from CLI output */
-  protected abstract parseOutput(raw: string, result: ExecResult): Record<string, unknown> | null;
-
-  /**
-   * Template method - orchestrates the review flow.
-   * Subclasses override abstract methods to customize behavior.
-   */
-  async review(plan: string): Promise<T> {
-    // 1. Find CLI executable
-    const cliPath = this.findCli();
-    if (!cliPath) {
-      return this.makeSkipResult(`${this.getCliName()} CLI not found on PATH`);
-    }
-
-    logDebug(this.agent.name, `Found ${this.getCliName()} CLI at: ${cliPath}`);
-
-    // 2. Build prompt and args (provider-specific)
-    const prompt = this.buildPrompt(plan);
-    const args = this.buildCliArgs();
-
-    logInfo(this.agent.name, `Running ${this.getCliName()} with model: ${this.agent.model}, timeout: ${this.timeout}s`);
-
-    // 3. Execute subprocess
-    const env = getInternalSubprocessEnv();
-    const normalizedCliPath = normalizePathForCli(cliPath);
-    const result = await execFileAsync(normalizedCliPath, args, {
-      input: prompt,
-      timeout: this.timeout * 1000,
-      env: env as Record<string, string>,
-      maxBuffer: 10 * 1024 * 1024,
-      shell: process.platform === "win32",
-    });
-
-    // 4. Handle timeout
-    if (result.killed || result.signal === "SIGTERM") {
-      return this.handleTimeout();
-    }
-
-    // 5. Extract output (provider-specific)
-    const { raw, err } = this.extractOutput(result);
-
-    // 6. Handle exit errors
-    if (!raw && !err && result.exitCode !== 0) {
-      return this.handleExitError(result);
-    }
-
-    // 7. Log subprocess results
-    this.logSubprocessResult(result, raw, err);
-
-    // 8. Parse JSON output (provider-specific)
-    const obj = this.parseOutput(raw, result);
-
-    // 9. Log parsed result
-    this.logParsedResult(obj);
-
-    // 10. Coerce to result type T (provider-specific)
-    const coerced = this.coerceResult(obj, raw, err);
-
-    // 11. Cleanup (optional override)
-    await this.cleanup();
-
-    return coerced;
-  }
-}
+export { BaseCliAgent, type AgentExecutionConfig, type AgentDebugLogger } from "../../../../../_shared/lib-ts/agent-exec/base-agent.js";
+export type { ExecutionResult as ExecResult } from "../../../../../_shared/lib-ts/agent-exec/execution-backend.js";

package/dist/templates/cc-native/_cc-native/plan-review/lib/reviewers/index.ts

@@ -4,7 +4,7 @@
  */
 
 export { AgentReviewer, runAgentReview } from "./agent.js";
-export { BaseCliAgent } from "./base/base-agent.js";
+export { BaseCliAgent, type AgentExecutionConfig, type AgentDebugLogger } from "./base/base-agent.js";
 export { ClaudeAgent } from "./providers/claude-agent.js";
 export { CodexAgent } from "./providers/codex-agent.js";
 export { GeminiAgent } from "./providers/gemini-agent.js";

package/dist/templates/cc-native/_cc-native/plan-review/lib/reviewers/providers/claude-agent.ts

@@ -3,7 +3,8 @@
  * Uses claude CLI with --json-schema and --system-prompt flags.
  */
 
-import { shellQuoteWin } from "../../../../../_shared/lib-ts/base/subprocess-utils.js";
+import { buildCliInvocation, reviewSpec } from "../../../../../_shared/lib-ts/base/cli-args.js";
+import type { ExecutionResult } from "../../../../../_shared/lib-ts/agent-exec/execution-backend.js";
 import { parseCliOutput } from "../../../../lib-ts/cli-output-parser.js";
 import { coerceToReview } from "../../../../lib-ts/json-parser.js";
 import type { ReviewerResult } from "../../../../lib-ts/types.js";
@@ -15,46 +16,15 @@ import { makeResult } from "../types.js";
  * Claude CLI-based agent reviewer.
  * Extends BaseCliAgent with Claude-specific prompt and argument handling.
  */
-// ---------------------------------------------------------------------------
-// Preflight (standalone — no instance needed)
-// ---------------------------------------------------------------------------
-
-export const CLAUDE_PREFLIGHT_INPUT = "Respond with exactly: ok";
-
-export function claudePreflightArgs(model: string): string[] {
-  return [
-    "--model", model,
-    "--max-turns", "1",
-    "--output-format", "json",
-    "--setting-sources", process.platform === "win32" ? '""' : "",
-    "-p",
-    "--no-session-persistence",
-  ];
-}
-
-// ---------------------------------------------------------------------------
-// Agent Class
-// ---------------------------------------------------------------------------
-
 export class ClaudeAgent extends BaseCliAgent<ReviewerResult> {
   protected buildCliArgs(): string[] {
-    const schemaJson = JSON.stringify(this.schema);
-    const cmdArgs = [
-      "--model", this.agent.model,
-      "--output-format", "json",
-      "--json-schema", shellQuoteWin(schemaJson),
-      "--max-turns", "3",
-      "--setting-sources", process.platform === "win32" ? '""' : "",
-      "-p",
-      "--no-session-persistence", // Prevent subprocess from creating session records
-    ];
-
-    if (this.agent.system_prompt) {
-      const fullPrompt = AGENT_REVIEW_PROMPT_PREFIX + "\n\n---\n\n" + this.agent.system_prompt;
-      cmdArgs.push("--system-prompt", shellQuoteWin(fullPrompt));
-    }
+    const fullPrompt = this.agent.system_prompt
+      ? AGENT_REVIEW_PROMPT_PREFIX + "\n\n---\n\n" + this.agent.system_prompt
+      : undefined;
 
-    return cmdArgs;
+    return buildCliInvocation(
+      reviewSpec("claude", this.agent.model, this.schema, fullPrompt),
+    ).args;
   }
 
   protected buildPrompt(plan: string): string {
@@ -81,7 +51,7 @@ ${plan}
     return makeResult(this.agent.name, false, type, {}, "", message);
   }
 
-  protected parseOutput(raw: string, _result: unknown): Record<string, unknown> | null {
+  protected parseOutput(raw: string, _result: ExecutionResult): Record<string, unknown> | null {
     return parseCliOutput(raw, ["verdict", "summary"]);
   }
 }

package/dist/templates/cc-native/_cc-native/plan-review/lib/reviewers/providers/codex-agent.ts

@@ -7,25 +7,17 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 
+import { buildCliInvocation } from "../../../../../_shared/lib-ts/base/cli-args.js";
+import type { ExecutionResult } from "../../../../../_shared/lib-ts/agent-exec/execution-backend.js";
 import { logDebug, logWarn } from "../../../../../_shared/lib-ts/base/logger.js";
-import { getInternalSubprocessEnv, execFileAsync, normalizePathForCli, shellQuoteWin } from "../../../../../_shared/lib-ts/base/subprocess-utils.js";
+import { getInternalSubprocessEnv, normalizePathForCli, shellQuoteWin } from "../../../../../_shared/lib-ts/base/subprocess-utils.js";
 import { debugLog, debugRaw } from "../../../../lib-ts/debug.js";
 import { parseJsonMaybe, coerceToReview } from "../../../../lib-ts/json-parser.js";
 import type { ReviewerResult } from "../../../../lib-ts/types.js";
-import { BaseCliAgent, type ExecResult } from "../base/base-agent.js";
+import { BaseCliAgent } from "../base/base-agent.js";
 import { AGENT_REVIEW_PROMPT_PREFIX } from "../schemas.js";
 import { makeResult } from "../types.js";
 
-// ---------------------------------------------------------------------------
-// Preflight (standalone — no instance needed)
-// ---------------------------------------------------------------------------
-
-export const CODEX_PREFLIGHT_INPUT = "Respond with exactly: ok";
-
-export function codexPreflightArgs(model: string): string[] {
-  return ["exec", "--sandbox", "read-only", "--model", model, "-"];
-}
-
 // ---------------------------------------------------------------------------
 // Agent Class
 // ---------------------------------------------------------------------------
@@ -52,11 +44,14 @@ export class CodexAgent extends BaseCliAgent<ReviewerResult> {
     const normalizedSchema = shellQuoteWin(normalizePathForCli(schemaPath));
     const normalizedOut = shellQuoteWin(normalizePathForCli(outPath));
 
-    const cmdArgs = ["exec", "--sandbox", "read-only"];
-    if (this.agent.model) cmdArgs.push("--model", this.agent.model);
-    cmdArgs.push("--output-schema", normalizedSchema, "-o", normalizedOut, "-");
-
-    return cmdArgs;
+    return buildCliInvocation({
+      provider: "codex",
+      model: this.agent.model,
+      mode: "structured",
+      sandbox: "read-only",
+      outputSchemaPath: normalizedSchema,
+      outputFilePath: normalizedOut,
+    }).args;
   }
 
   protected buildPrompt(plan: string): string {
@@ -91,7 +86,7 @@ export class CodexAgent extends BaseCliAgent<ReviewerResult> {
     return makeResult(this.agent.name, ok, verdict, norm, raw, err);
   }
 
-  protected extractOutput(result: ExecResult): { raw: string; err: string } {
+  protected extractOutput(result: ExecutionResult): { raw: string; err: string } {
     const outPath = this.getOutputPath();
     let raw = "";
     const outExists = fs.existsSync(outPath);
@@ -133,7 +128,7 @@ export class CodexAgent extends BaseCliAgent<ReviewerResult> {
     return makeResult(this.agent.name, false, type, {}, "", message);
   }
 
-  protected parseOutput(raw: string, result: ExecResult): Record<string, unknown> | null {
+  protected parseOutput(raw: string, result: ExecutionResult): Record<string, unknown> | null {
     return parseJsonMaybe(raw) ?? parseJsonMaybe(result.stdout);
   }
 
@@ -156,10 +151,13 @@ export class CodexAgent extends BaseCliAgent<ReviewerResult> {
 
     try {
       const env = getInternalSubprocessEnv();
-      const result = await execFileAsync(cliPath, args, {
+      const normalizedCliPath = normalizePathForCli(cliPath);
+      const result = await this.backend.execute({
+        cliPath: normalizedCliPath,
+        args,
         input: prompt,
-        timeout: this.timeout * 1000,
         env: env as Record<string, string>,
+        timeoutMs: this.timeout * 1000,
         maxBuffer: 10 * 1024 * 1024,
         shell: process.platform === "win32",
       });

package/dist/templates/cc-native/_cc-native/plan-review/lib/reviewers/providers/gemini-agent.ts

@@ -3,6 +3,7 @@
  * Placeholder for future implementation.
  */
 
+import type { ExecutionResult } from "../../../../../_shared/lib-ts/agent-exec/execution-backend.js";
 import type { ReviewerResult } from "../../../../lib-ts/types.js";
 import { BaseCliAgent } from "../base/base-agent.js";
 import { makeResult } from "../types.js";
@@ -33,7 +34,7 @@ export class GeminiAgent extends BaseCliAgent<ReviewerResult> {
     return makeResult(this.agent.name, false, type, {}, "", message);
   }
 
-  protected parseOutput(_raw: string, _result: unknown): Record<string, unknown> | null {
+  protected parseOutput(_raw: string, _result: ExecutionResult): Record<string, unknown> | null {
     throw new Error("GeminiAgent not implemented");
   }
 }

package/dist/templates/cc-native/_cc-native/plan-review/lib/reviewers/providers/orchestrator-claude-agent.ts

@@ -3,8 +3,11 @@
  * Analyzes plan complexity and selects reviewer agents via Claude CLI.
  */
 
+import { buildCliInvocation, reviewSpec } from "../../../../../_shared/lib-ts/base/cli-args.js";
+import type { ExecutionBackend } from "../../../../../_shared/lib-ts/agent-exec/execution-backend.js";
+import type { ExecutionResult } from "../../../../../_shared/lib-ts/agent-exec/execution-backend.js";
 import { logDebug } from "../../../../../_shared/lib-ts/base/logger.js";
-import { shellQuoteWin } from "../../../../../_shared/lib-ts/base/subprocess-utils.js";
+import { debugLog, debugRaw } from "../../../../lib-ts/debug.js";
 import { parseCliOutput } from "../../../../lib-ts/cli-output-parser.js";
 import type { AgentConfig, OrchestratorResult, ComplexityCategory } from "../../../../lib-ts/types.js";
 import { BaseCliAgent } from "../base/base-agent.js";
@@ -51,6 +54,7 @@ export class OrchestratorClaudeAgent extends BaseCliAgent<OrchestratorResult> {
     timeout: number,
     contextPath?: string,
     sessionName?: string,
+    backend?: ExecutionBackend,
   ) {
     // Build schema dynamically based on valid agent names
     const nonMandatory = agentLibrary.filter(
@@ -63,7 +67,10 @@ export class OrchestratorClaudeAgent extends BaseCliAgent<OrchestratorResult> {
       ? buildOrchestratorSchema(validNames, categories)
       : ORCHESTRATOR_SCHEMA;
 
-    super(agent, schema, timeout, contextPath, sessionName);
+    super({
+      agent, schema, timeout, contextPath, sessionName,
+      debugLogger: { log: debugLog, raw: debugRaw },
+    }, backend);
 
     this.nonMandatory = nonMandatory;
     this.validNames = validNames;
@@ -79,8 +86,6 @@ export class OrchestratorClaudeAgent extends BaseCliAgent<OrchestratorResult> {
   }
 
   protected buildCliArgs(): string[] {
-    const schemaJson = JSON.stringify(this.schema);
-
     const systemPrompt = `You are a plan orchestrator for code review. Your job is to analyze plans and select appropriate reviewer agents.
 
 You MUST call StructuredOutput immediately with your analysis. Do NOT ask questions or use any other tools.
@@ -91,16 +96,9 @@ When selecting agents:
 - Only select agents whose categories match the plan category
 - Fewer agents for simple plans, more for complex plans`;
 
-    return [
-      "--model", this.agent.model,
-      "--output-format", "json",
-      "--json-schema", shellQuoteWin(schemaJson),
-      "--max-turns", "3",
-      "--setting-sources", process.platform === "win32" ? '""' : "",
-      "--system-prompt", shellQuoteWin(systemPrompt),
-      "-p",
-      "--no-session-persistence", // Prevent subprocess from creating session records
-    ];
+    return buildCliInvocation(
+      reviewSpec("claude", this.agent.model, this.schema, systemPrompt),
+    ).args;
   }
 
   protected buildPrompt(plan: string): string {
@@ -180,7 +178,7 @@ Call StructuredOutput now with: complexity, category, selectedAgents, reasoning`
     );
   }
 
-  protected parseOutput(raw: string, _result: unknown): Record<string, unknown> | null {
+  protected parseOutput(raw: string, _result: ExecutionResult): Record<string, unknown> | null {
     return parseCliOutput(raw);
   }