aiwcli 0.12.0 → 0.12.2

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

@@ -26,10 +26,10 @@ export interface ExecResult {
  */
 export abstract class BaseCliAgent<T> {
   protected agent: AgentConfig;
-  protected schema: Record<string, unknown>;
-  protected timeout: number;
   protected contextPath?: string;
+  protected schema: Record<string, unknown>;
   protected sessionName: string;
+  protected timeout: number;
 
   constructor(
     agent: AgentConfig,
@@ -45,90 +45,22 @@ export abstract class BaseCliAgent<T> {
     this.sessionName = sessionName;
   }
 
-  /**
-   * 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;
-  }
+  /** Build the command-line arguments for the CLI */
+  protected abstract buildCliArgs(): string[];
 
   // ─── 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;
 
-  /** 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;
+  /** 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;
 
-  // ─── Template Methods (Subclass Can Override) ──────────────────────────
-
-  /** Find the CLI executable. Override for custom search logic. */
-  protected findCli(): string | null {
-    return findExecutable(this.getCliName());
-  }
-
   /** Extract stdout/stderr from subprocess result. Override for file-based output (Codex). */
   protected extractOutput(result: ExecResult): { raw: string; err: string } {
     return {
@@ -137,22 +69,26 @@ export abstract class BaseCliAgent<T> {
     };
   }
 
+  /** 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.`;
   }
 
-  /** 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 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 */
@@ -162,15 +98,25 @@ export abstract class BaseCliAgent<T> {
     return this.makeErrorResult("error", `${this.agent.name} timed out after ${this.timeout}s`);
   }
 
-  /** 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);
-  }
+  // ─── Shared Infrastructure ──────────────────────────────────────────────
 
-  /** Construct a T for error/skip/timeout scenarios. Subclasses define shape. */
-  protected abstract makeErrorResult(type: "skip" | "error", message: string): T;
+  /** 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 {
@@ -197,21 +143,75 @@ export abstract class BaseCliAgent<T> {
     if (raw) logDebug(this.agent.name, `stdout preview: ${raw.slice(0, 500)}`);
   }
 
-  /** 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,
-      });
+  /** 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`);
     }
 
-    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");
+    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;
   }
 }

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

@@ -3,10 +3,10 @@
  * 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";
+export type { Reviewer, ReviewerResult, ReviewOptions } from "./types.js";
+export { makeResult } from "./types.js";

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

@@ -7,30 +7,15 @@ import { shellQuoteWin } from "../../../../_shared/lib-ts/base/subprocess-utils.
 import { parseCliOutput } from "../../cli-output-parser.js";
 import { coerceToReview } from "../../json-parser.js";
 import type { ReviewerResult } from "../../types.js";
+import { BaseCliAgent } from "../base/base-agent.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 = [
@@ -50,8 +35,15 @@ ${plan}
     return cmdArgs;
   }
 
-  protected parseOutput(raw: string, _result: unknown): Record<string, unknown> | null {
-    return parseCliOutput(raw, ["verdict", "summary"]);
+  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 {
@@ -59,7 +51,15 @@ ${plan}
     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: unknown): Record<string, unknown> | null {
+    return parseCliOutput(raw, ["verdict", "summary"]);
+  }
 }

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

@@ -5,18 +5,19 @@
 
 import * as fs from "node:fs";
 import * as os from "node:os";
-import * as path from "node:path";
+import * as path from "node:path";
+
 import { logDebug, logWarn } from "../../../../_shared/lib-ts/base/logger.js";
 import { getInternalSubprocessEnv, execFileAsync } from "../../../../_shared/lib-ts/base/subprocess-utils.js";
-import { parseJsonMaybe, coerceToReview } from "../../json-parser.js";
 import { debugLog, debugRaw } from "../../debug.js";
+import { parseJsonMaybe, coerceToReview } from "../../json-parser.js";
 import type { ReviewerResult } from "../../types.js";
+import { BaseCliAgent, type ExecResult } from "../base/base-agent.js";
 import { AGENT_REVIEW_PROMPT_PREFIX } from "../schemas.js";
 import { makeResult } from "../types.js";
-import { BaseCliAgent, type ExecResult } from "../base/base-agent.js";
 
 /** Temp directory for Codex schema/output files */
-let tmpDir: string | null = null;
+const tmpDir: string | null = null;
 
 /**
  * Codex CLI-based agent reviewer.
@@ -26,8 +27,19 @@ let tmpDir: string | null = null;
 export class CodexAgent extends BaseCliAgent<ReviewerResult> {
   private tempDir: string | null = null;
 
-  protected getCliName(): string {
-    return "codex";
+  protected buildCliArgs(): string[] {
+    // Create temp directory for schema and output files
+    this.tempDir = fs.mkdtempSync(path.join(os.tmpdir(), `codex-agent-${this.agent.name}-`));
+
+    const schemaPath = path.join(this.tempDir, "schema.json");
+    const outPath = path.join(this.tempDir, "output.json");
+    fs.writeFileSync(schemaPath, JSON.stringify(this.schema, null, 2), "utf-8");
+
+    const cmdArgs = ["exec", "--sandbox", "read-only"];
+    if (this.agent.model) cmdArgs.push("--model", this.agent.model);
+    cmdArgs.push("--output-schema", schemaPath, "-o", outPath, "-");
+
+    return cmdArgs;
   }
 
   protected buildPrompt(plan: string): string {
@@ -46,19 +58,66 @@ export class CodexAgent extends BaseCliAgent<ReviewerResult> {
     ].join("\n\n");
   }
 
-  protected buildCliArgs(): string[] {
-    // Create temp directory for schema and output files
-    this.tempDir = fs.mkdtempSync(path.join(os.tmpdir(), `codex-agent-${this.agent.name}-`));
+  protected async cleanup(): Promise<void> {
+    if (this.tempDir) {
+      try {
+        fs.rmSync(this.tempDir, { recursive: true, force: true });
+      } catch (error) {
+        logDebug(this.agent.name, `Failed to cleanup temp dir ${this.tempDir}: ${error}`);
+      }
+      this.tempDir = null;
+    }
+  }
 
-    const schemaPath = path.join(this.tempDir, "schema.json");
-    const outPath = path.join(this.tempDir, "output.json");
-    fs.writeFileSync(schemaPath, JSON.stringify(this.schema, null, 2), "utf-8");
+  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);
+  }
 
-    const cmdArgs = ["exec", "--sandbox", "read-only"];
-    if (this.agent.model) cmdArgs.push("--model", this.agent.model);
-    cmdArgs.push("--output-schema", schemaPath, "-o", outPath, "-");
+  protected extractOutput(result: ExecResult): { raw: string; err: string } {
+    const outPath = this.getOutputPath();
+    let raw = "";
+    const outExists = fs.existsSync(outPath);
 
-    return cmdArgs;
+    if (outExists) {
+      raw = fs.readFileSync(outPath, "utf-8");
+    }
+
+    logDebug(this.agent.name, `Codex output: exit=${result.exitCode}, outFile=${outExists} (${raw.length} chars), stdout=${result.stdout.length} chars`);
+
+    // Debug logging (override to include out_file_exists)
+    if (this.contextPath) {
+      debugRaw(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "stdout", raw || result.stdout);
+      if (result.stderr) {
+        debugRaw(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "stderr", result.stderr);
+      }
+      debugLog(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "subprocess_info", {
+        exit_code: result.exitCode,
+        stdout_len: (raw || result.stdout).length,
+        stderr_len: result.stderr.length,
+        out_file_exists: outExists,
+        model: this.agent.model,
+        provider: "codex",
+        timeout: this.timeout,
+      });
+    }
+
+    return {
+      raw: raw || result.stdout,
+      err: result.stderr.trim(),
+    };
+  }
+
+  protected getCliName(): string {
+    return "codex";
+  }
+
+  protected makeErrorResult(type: "skip" | "error", message: string): ReviewerResult {
+    return makeResult(this.agent.name, false, type, {}, "", message);
+  }
+
+  protected parseOutput(raw: string, result: ExecResult): Record<string, unknown> | null {
+    return parseJsonMaybe(raw) ?? parseJsonMaybe(result.stdout);
   }
 
   /**
@@ -116,64 +175,6 @@ export class CodexAgent extends BaseCliAgent<ReviewerResult> {
     }
   }
 
-  protected extractOutput(result: ExecResult): { raw: string; err: string } {
-    const outPath = this.getOutputPath();
-    let raw = "";
-    const outExists = fs.existsSync(outPath);
-
-    if (outExists) {
-      raw = fs.readFileSync(outPath, "utf-8");
-    }
-
-    logDebug(this.agent.name, `Codex output: exit=${result.exitCode}, outFile=${outExists} (${raw.length} chars), stdout=${result.stdout.length} chars`);
-
-    // Debug logging (override to include out_file_exists)
-    if (this.contextPath) {
-      debugRaw(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "stdout", raw || result.stdout);
-      if (result.stderr) {
-        debugRaw(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "stderr", result.stderr);
-      }
-      debugLog(this.contextPath, this.sessionName, `agent:${this.agent.name}`, "subprocess_info", {
-        exit_code: result.exitCode,
-        stdout_len: (raw || result.stdout).length,
-        stderr_len: result.stderr.length,
-        out_file_exists: outExists,
-        model: this.agent.model,
-        provider: "codex",
-        timeout: this.timeout,
-      });
-    }
-
-    return {
-      raw: raw || result.stdout,
-      err: result.stderr.trim(),
-    };
-  }
-
-  protected parseOutput(raw: string, result: ExecResult): Record<string, unknown> | null {
-    return parseJsonMaybe(raw) ?? parseJsonMaybe(result.stdout);
-  }
-
-  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);
-  }
-
-  protected async cleanup(): Promise<void> {
-    if (this.tempDir) {
-      try {
-        fs.rmSync(this.tempDir, { recursive: true, force: true });
-      } catch (e) {
-        logDebug(this.agent.name, `Failed to cleanup temp dir ${this.tempDir}: ${e}`);
-      }
-      this.tempDir = null;
-    }
-  }
-
   private getOutputPath(): string {
     return path.join(this.tempDir!, "output.json");
   }

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

@@ -4,8 +4,8 @@
  */
 
 import type { ReviewerResult } from "../../types.js";
-import { makeResult } from "../types.js";
 import { BaseCliAgent } from "../base/base-agent.js";
+import { makeResult } from "../types.js";
 
 /**
  * Gemini CLI-based agent reviewer (NOT IMPLEMENTED).
@@ -13,7 +13,7 @@ import { BaseCliAgent } from "../base/base-agent.js";
  * This is a placeholder for future development.
  */
 export class GeminiAgent extends BaseCliAgent<ReviewerResult> {
-  protected getCliName(): string {
+  protected buildCliArgs(): string[] {
     throw new Error("GeminiAgent not implemented");
   }
 
@@ -21,19 +21,19 @@ export class GeminiAgent extends BaseCliAgent<ReviewerResult> {
     throw new Error("GeminiAgent not implemented");
   }
 
-  protected buildCliArgs(): string[] {
-    throw new Error("GeminiAgent not implemented");
-  }
-
-  protected parseOutput(_raw: string, _result: unknown): Record<string, unknown> | null {
+  protected coerceResult(_obj: Record<string, unknown> | null, _raw: string, _err: string): ReviewerResult {
     throw new Error("GeminiAgent not implemented");
   }
 
-  protected coerceResult(_obj: Record<string, unknown> | null, _raw: string, _err: string): ReviewerResult {
+  protected getCliName(): string {
     throw new Error("GeminiAgent not implemented");
   }
 
   protected makeErrorResult(type: "skip" | "error", message: string): ReviewerResult {
     return makeResult(this.agent.name, false, type, {}, "", message);
   }
+
+  protected parseOutput(_raw: string, _result: unknown): Record<string, unknown> | null {
+    throw new Error("GeminiAgent not implemented");
+  }
 }