aiwcli 0.15.5 → 0.17.0

package/dist/templates/{_shared/lib-ts/agent-exec → cc-native/_cc-native/lib-ts/reviewers/base}/base-agent.ts

@@ -1,29 +1,21 @@
 /**
- * Abstract base class for CLI-based agent subprocess invocations.
- * Lives in _shared so all templates can use it. Provider-specific
- * implementations (Claude, Codex, Gemini) extend this class.
- *
- * Execution strategy is injected via ExecutionBackend (default: HeadlessBackend).
- * Debug logging is injectable via AgentDebugLogger (default: no-op).
+ * 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.
  */
 
-import { logDebug, logInfo, logWarn, logError } from "../base/logger.js";
-import { getInternalSubprocessEnv, findExecutable, normalizePathForCli } from "../base/subprocess-utils.js";
-import { HeadlessBackend } from "./backends/headless.js";
-import type { ExecutionBackend, ExecutionResult, AgentDebugLogger } from "./execution-backend.js";
-import type { AgentConfig } from "../types.js";
-
-// Re-export for consumers
-export type { ExecutionResult, AgentDebugLogger };
-
-/** Configuration object for BaseCliAgent construction. */
-export interface AgentExecutionConfig {
-  agent: AgentConfig;
-  schema: Record<string, unknown>;
-  timeout: number;
-  contextPath?: string;
-  sessionName?: string;
-  debugLogger?: AgentDebugLogger;
+import { logDebug, logInfo, logWarn, logError } from "../../../../_core/lib-ts/runtime/logger.js";
+import { getInternalSubprocessEnv, findExecutable, execFileAsync } from "../../../../_core/lib-ts/runtime/subprocess-utils.js";
+import { debugLog, debugRaw } from "../../debug.js";
+import type { AgentConfig } from "../../types.js";
+
+/** Result from execFileAsync */
+export interface ExecResult {
+  stdout: string;
+  stderr: string;
+  exitCode: number | null;
+  signal: string | null;
+  killed: boolean;
 }
 
 /**
@@ -34,70 +26,133 @@ export interface AgentExecutionConfig {
  */
 export abstract class BaseCliAgent<T> {
   protected agent: AgentConfig;
-  protected backend: ExecutionBackend;
-  protected contextPath?: string;
-  protected debugLogger?: AgentDebugLogger;
   protected schema: Record<string, unknown>;
-  protected sessionName: string;
   protected timeout: number;
+  protected contextPath?: string;
+  protected sessionName: string;
 
   constructor(
-    config: AgentExecutionConfig,
-    backend?: ExecutionBackend,
+    agent: AgentConfig,
+    schema: Record<string, unknown>,
+    timeout: number,
+    contextPath?: string,
+    sessionName = "unknown",
   ) {
-    this.agent = config.agent;
-    this.schema = config.schema;
-    this.timeout = config.timeout;
-    this.contextPath = config.contextPath;
-    this.sessionName = config.sessionName ?? "unknown";
-    this.debugLogger = config.debugLogger;
-    this.backend = backend ?? new HeadlessBackend();
+    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[];
+  /**
+   * 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 result = await execFileAsync(cliPath, 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;
+  }
 
   // ─── Abstract Methods (Subclass Implements) ────────────────────────────
 
+  /** Get the CLI executable name (e.g., "claude", "codex") */
+  protected abstract getCliName(): string;
+
   /** 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).
-  }
+  /** Build the command-line arguments for the CLI */
+  protected abstract buildCliArgs(): string[];
+
+  /** Parse JSON from CLI output */
+  protected abstract parseOutput(raw: string, result: ExecResult): Record<string, unknown> | null;
 
   /** 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: ExecutionResult): { raw: string; err: string } {
-    return {
-      raw: result.stdout.trim(),
-      err: result.stderr.trim(),
-    };
-  }
+  // ─── Template Methods (Subclass Can Override) ──────────────────────────
 
   /** 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;
+  /** 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(),
+    };
+  }
 
   /** 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: ExecutionResult): 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);
+  /** Optional cleanup after subprocess execution */
+  protected async cleanup(): Promise<void> {
+    // Default: no-op. Subclasses override if needed (e.g., Codex temp files).
+  }
+
+  // ─── Shared Infrastructure ──────────────────────────────────────────────
+
+  /** Create skip result when CLI not found */
+  protected makeSkipResult(reason: string): T {
+    logWarn(this.agent.name, reason);
+    return this.makeErrorResult("skip", reason);
   }
 
   /** Handle timeout scenario */
@@ -107,39 +162,29 @@ export abstract class BaseCliAgent<T> {
     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) {
-      this.debugLogger?.log(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");
-    }
+  /** 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);
   }
 
+  /** Construct a T for error/skip/timeout scenarios. Subclasses define shape. */
+  protected abstract makeErrorResult(type: "skip" | "error", message: string): T;
+
   /** Log subprocess execution results */
-  protected logSubprocessResult(result: ExecutionResult, raw: string, err: string): void {
+  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) {
-      this.debugLogger?.raw(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "stdout", raw);
+      debugRaw(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "stdout", raw);
       if (err) {
-        this.debugLogger?.raw(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "stderr", err);
+        debugRaw(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "stderr", err);
       }
-      this.debugLogger?.log(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "subprocess_info", {
+      debugLog(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "subprocess_info", {
         exit_code: result.exitCode,
         stdout_len: raw.length,
         stderr_len: err.length,
@@ -152,78 +197,21 @@ export abstract class BaseCliAgent<T> {
     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: ExecutionResult): 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 via backend
-    const env = getInternalSubprocessEnv();
-    const normalizedCliPath = normalizePathForCli(cliPath);
-    const result = await this.backend.execute({
-      cliPath: normalizedCliPath,
-      args,
-      input: prompt,
-      env: env as Record<string, string>,
-      timeoutMs: this.timeout * 1000,
-      maxBuffer: 10 * 1024 * 1024,
-      shell: process.platform === "win32",
-    });
-
-    // 4. Handle timeout
-    if (result.killed || result.signal === "SIGTERM") {
-      return this.handleTimeout();
+  /** 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,
+      });
     }
 
-    // 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);
+    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");
     }
-
-    // 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;
   }
 }

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

@@ -1,12 +1,12 @@
-/**
- * Reviewers package — re-exports all reviewer implementations.
- * See cc-native-plan-review-spec.md §4.9
- */
-
-export { AgentReviewer, runAgentReview } from "./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";
-export type { Reviewer, ReviewerResult, ReviewOptions } from "./types.js";
-export { makeResult } from "./types.js";
+/**
+ * Reviewers package — re-exports all reviewer implementations.
+ * See cc-native-plan-review-spec.md §4.9
+ */
+
+export type { Reviewer, ReviewerResult, ReviewOptions } from "./types.js";
+export { makeResult } from "./types.js";
+export { AgentReviewer, runAgentReview } from "./agent.js";
+export { BaseCliAgent } 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 → lib-ts}/reviewers/providers/claude-agent.ts

@@ -1,57 +1,66 @@
-/**
- * Claude CLI agent reviewer implementation.
- * Uses claude CLI with --json-schema and --system-prompt flags.
- */
-
-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";
-import { BaseCliAgent } from "../base/base-agent.js";
-import { AGENT_REVIEW_PROMPT_PREFIX } from "../schemas.js";
-import { makeResult } from "../types.js";
-
-/**
- * Claude CLI-based agent reviewer.
- * Extends BaseCliAgent with Claude-specific prompt and argument handling.
- */
-export class ClaudeAgent extends BaseCliAgent<ReviewerResult> {
-  protected buildCliArgs(): string[] {
-    const fullPrompt = this.agent.system_prompt
-      ? AGENT_REVIEW_PROMPT_PREFIX + "\n\n---\n\n" + this.agent.system_prompt
-      : undefined;
-
-    return buildCliInvocation(
-      reviewSpec("claude", this.agent.model, this.schema, fullPrompt),
-    ).args;
-  }
-
-  protected buildPrompt(plan: string): string {
-    return `IMMEDIATELY call StructuredOutput with your review of the plan below.
-Do NOT output any text before calling StructuredOutput.
-
-PLAN:
-<<<
-${plan}
->>>
-`;
-  }
-
-  protected coerceResult(obj: Record<string, unknown> | null, raw: string, err: string): ReviewerResult {
-    const [ok, verdict, norm] = coerceToReview(obj, this.getDefaultErrorMessage());
-    return makeResult(this.agent.name, ok, verdict, norm, raw, err);
-  }
-
-  protected getCliName(): string {
-    return "claude";
-  }
-
-  protected makeErrorResult(type: "skip" | "error", message: string): ReviewerResult {
-    return makeResult(this.agent.name, false, type, {}, "", message);
-  }
-
-  protected parseOutput(raw: string, _result: ExecutionResult): Record<string, unknown> | null {
-    return parseCliOutput(raw, ["verdict", "summary"]);
-  }
-}
+/**
+ * Claude CLI agent reviewer implementation.
+ * Uses claude CLI with --json-schema and --system-prompt flags.
+ */
+
+import { shellQuoteWin } from "../../../../_core/lib-ts/runtime/subprocess-utils.js";
+import { parseCliOutput } from "../../cli-output-parser.js";
+import { coerceToReview } from "../../json-parser.js";
+import type { ReviewerResult } from "../../types.js";
+import { AGENT_REVIEW_PROMPT_PREFIX } from "../schemas.js";
+import { makeResult } from "../types.js";
+import { BaseCliAgent } from "../base/base-agent.js";
+
+/**
+ * Claude CLI-based agent reviewer.
+ * Extends BaseCliAgent with Claude-specific prompt and argument handling.
+ */
+export class ClaudeAgent extends BaseCliAgent<ReviewerResult> {
+  protected getCliName(): string {
+    return "claude";
+  }
+
+  protected buildPrompt(plan: string): string {
+    return `IMMEDIATELY call StructuredOutput with your review of the plan below.
+Do NOT output any text before calling StructuredOutput.
+
+PLAN:
+<<<
+${plan}
+>>>
+`;
+  }
+
+  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));
+    }
+
+    return cmdArgs;
+  }
+
+  protected parseOutput(raw: string, _result: unknown): Record<string, unknown> | null {
+    return parseCliOutput(raw, ["verdict", "summary"]);
+  }
+
+  protected coerceResult(obj: Record<string, unknown> | null, raw: string, err: string): ReviewerResult {
+    const [ok, verdict, norm] = coerceToReview(obj, this.getDefaultErrorMessage());
+    return makeResult(this.agent.name, ok, verdict, norm, raw, err);
+  }
+
+  protected makeErrorResult(type: "skip" | "error", message: string): ReviewerResult {
+    return makeResult(this.agent.name, false, type, {}, "", message);
+  }
+}