aiwcli 0.15.5 → 0.17.0

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

@@ -1,20 +1,142 @@
 /**
- * CC-native wrapper around shared structured-output parsing.
- * Keeps existing import surface stable for provider implementations.
+ * Unified Claude CLI output parser.
+ * Deduplicates identical logic from orchestrator.py and reviewers/agent.py.
+ * See cc-native-plan-review-spec.md §4.6
  */
 
-import { parseStructuredOutput } from "../../_shared/lib-ts/agent-exec/structured-output.js";
+import { logDebug, logWarn, logError } from "../../_core/lib-ts/runtime/logger.js";
+import { parseJsonMaybe } from "./json-parser.js";
 
 /**
- * Parse CLI JSON output into a structured object.
- * Delegates to shared parser with cc-native logging tag.
+ * Parse Claude CLI JSON output, handling various formats.
+ *
+ * Claude CLI can output in several formats:
+ * - Direct structured_output dict
+ * - Assistant message with StructuredOutput tool use
+ * - List of events with assistant messages
+ * - Raw text with embedded JSON (heuristic fallback)
+ *
+ * @param raw - Raw stdout from Claude CLI
+ * @param requireFields - Optional fields to validate in heuristic fallback
+ * @returns Parsed JSON dict or null if parsing failed
  */
 export function parseCliOutput(
   raw: string,
   requireFields?: string[],
-): null | Record<string, unknown> {
-  return parseStructuredOutput(raw, {
-    requireFields,
-    loggerTag: "cli_parser",
-  });
+): Record<string, unknown> | null {
+  try {
+    const result: unknown = JSON.parse(raw);
+
+    if (result !== null && typeof result === "object" && !Array.isArray(result)) {
+      const dict = result as Record<string, unknown>;
+
+      // Strategy 1: Direct structured_output key
+      if ("structured_output" in dict) {
+        logDebug("cli_parser", "Found structured_output in root dict");
+        return dict.structured_output as Record<string, unknown>;
+      }
+
+      // Strategy 1.5: Session result envelope (type: "result")
+      // When the model fails to call StructuredOutput, the CLI returns a
+      // session metadata object with type/subtype/duration_ms/usage/etc.
+      // but no structured_output key. Check for the `result` text field
+      // (model may have written review as text) and for error states.
+      if (dict.type === "result" || ("duration_ms" in dict && "session_id" in dict)) {
+        if (dict.is_error === true || (Array.isArray(dict.errors) && (dict.errors as unknown[]).length > 0)) {
+          logWarn("cli_parser", `CLI returned error result: ${JSON.stringify(dict.errors ?? "is_error=true")}`);
+          return null;
+        }
+        if (typeof dict.result === "string" && dict.result) {
+          logDebug("cli_parser", "Found result text in session envelope, attempting JSON extraction");
+          const extracted = parseJsonMaybe(dict.result as string, requireFields);
+          if (extracted) return extracted;
+          logWarn("cli_parser", "Session envelope result text contained no extractable JSON");
+        }
+        logDebug("cli_parser", "Session result envelope with no structured_output or extractable result");
+        return null;
+      }
+
+      // Strategy 2: Assistant message with StructuredOutput tool use
+      if (dict.type === "assistant") {
+        const message = dict.message as Record<string, unknown> | undefined;
+        const content = message?.content;
+        if (Array.isArray(content)) {
+          for (const item of content) {
+            if (
+              item !== null &&
+              typeof item === "object" &&
+              (item as Record<string, unknown>).name === "StructuredOutput"
+            ) {
+              logDebug(
+                "cli_parser",
+                "Found StructuredOutput in assistant message content",
+              );
+              return (item as Record<string, unknown>).input as Record<
+                string,
+                unknown
+              >;
+            }
+          }
+        }
+        logDebug(
+          "cli_parser",
+          "Assistant message found but no StructuredOutput tool use in content",
+        );
+      }
+    } else if (Array.isArray(result)) {
+      // Strategy 3: List of events with assistant messages
+      logDebug(
+        "cli_parser",
+        `Received list of ${(result as unknown[]).length} events, searching for assistant message`,
+      );
+      for (let i = 0; i < (result as unknown[]).length; i++) {
+        const event = (result as unknown[])[i];
+        if (event === null || typeof event !== "object") continue;
+
+        const dict = event as Record<string, unknown>;
+        if (dict.type === "assistant") {
+          const message = dict.message as Record<string, unknown> | undefined;
+          const content = message?.content;
+          if (Array.isArray(content)) {
+            for (const item of content) {
+              if (
+                item !== null &&
+                typeof item === "object" &&
+                (item as Record<string, unknown>).name === "StructuredOutput"
+              ) {
+                logDebug(
+                  "cli_parser",
+                  `Found StructuredOutput in event[${i}] assistant message`,
+                );
+                return (item as Record<string, unknown>).input as Record<
+                  string,
+                  unknown
+                >;
+              }
+            }
+          }
+        }
+      }
+      logDebug(
+        "cli_parser",
+        "No StructuredOutput found in any assistant message in event list",
+      );
+    }
+  } catch (e: unknown) {
+    if (e instanceof SyntaxError) {
+      logWarn("cli_parser", `JSON decode error: ${e.message}`);
+    } else {
+      logError(
+        "cli_parser",
+        `Unexpected error during structured parsing: ${e}`,
+      );
+    }
+  }
+
+  // Strategy 4: Heuristic {…} extraction fallback
+  logDebug(
+    "cli_parser",
+    "No structured output found, falling back to heuristic JSON extraction",
+  );
+  return parseJsonMaybe(raw, requireFields);
 }

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

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

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

@@ -3,8 +3,8 @@
  * See cc-native-plan-review-spec.md §4.15
  */
 
-import * as os from "node:os";
 import * as path from "node:path";
+import * as os from "node:os";
 
 // ---------------------------------------------------------------------------
 // Feature Flags
@@ -60,7 +60,7 @@ export function validatePlanPath(planPath: string): string {
     );
   }
 
-  if (planPath.includes("\u0000")) {
+  if (planPath.includes("\x00")) {
     throw new Error("Null bytes not allowed in path");
   }
 
@@ -68,13 +68,13 @@ export function validatePlanPath(planPath: string): string {
   let resolved: string;
   try {
     resolved = path.resolve(planPath);
-  } catch (error: unknown) {
-    throw new Error(`Path resolution failed: ${error}`);
+  } catch (e: unknown) {
+    throw new Error(`Path resolution failed: ${e}`);
   }
 
   // Verify path is within allowed directory (case-insensitive on Windows)
-  const resolvedLower = resolved.toLowerCase().replaceAll('\\', "/");
-  const plansDirLower = PLANS_DIR.toLowerCase().replaceAll('\\', "/");
+  const resolvedLower = resolved.toLowerCase().replace(/\\/g, "/");
+  const plansDirLower = PLANS_DIR.toLowerCase().replace(/\\/g, "/");
   if (!resolvedLower.startsWith(plansDirLower)) {
     throw new Error(`Path outside allowed directory: ${PLANS_DIR}`);
   }

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

@@ -0,0 +1,119 @@
+/**
+ * Corroboration-based verdict computation for plan review.
+ *
+ * Replaces the old per-verdict aggregation with proportional thresholding:
+ * high-severity issues in a dimension only block when the total count
+ * exceeds 2× the number of distinct agents contributing to that dimension.
+ *
+ * **Why proportional thresholding:**
+ * The agent pool has dimensional imbalance (e.g., 10 completeness agents vs
+ * 1 maintainability agent). A fixed "2+ agents agree = block" would mean
+ * any 2 completeness agents always block. Proportional scaling (issues > 2×agents)
+ * sets a fair bar regardless of how many agents focus on each dimension.
+ *
+ * **Convergence problem this solves:**
+ * Agents with opposing philosophies (simplicity-guardian vs completeness-gaps)
+ * produce contradictory high-severity issues. Because the old system treated
+ * every agent's finding as independently authoritative, plans oscillated —
+ * addressing one agent's feedback triggered the opposing agent.
+ *
+ * **Revert path:** Change one line in cc-native-plan-review.ts back to
+ * `computeReviewDecision(allVerdicts)`. Old function kept in verdict.ts.
+ */
+
+import type {
+  ReviewerResult,
+  ReviewIssue,
+  IssueDimension,
+  CorroborationResult,
+  CorroboratedGroup,
+  SoloFinding,
+} from "./types.js";
+
+/**
+ * Compute a corroboration-based review decision from all reviewer results.
+ *
+ * Algorithm:
+ * 1. Collect all high-severity issues with a `dimension` field
+ * 2. Group by dimension, tracking distinct agent names per group
+ * 3. For each dimension: block if `issues.length > 2 × agentCount`
+ * 4. Issues without `dimension` are unclassified (never block)
+ * 5. Non-high issues are ignored (informational only)
+ *
+ * @param allResults - Map of reviewer name → ReviewerResult (CLI + agent)
+ * @returns CorroborationResult with blocking groups, solo findings, and verdict
+ */
+export function computeCorroboratedDecision(
+  allResults: Record<string, ReviewerResult>,
+): CorroborationResult {
+  // Accumulator: dimension → { issues, agentNames }
+  const dimMap = new Map<
+    IssueDimension,
+    {
+      issues: Array<{ agent: string; issue: ReviewIssue }>;
+      agentNames: Set<string>;
+    }
+  >();
+
+  const unclassified: Array<{ agent: string; issue: ReviewIssue }> = [];
+
+  for (const [agentName, result] of Object.entries(allResults)) {
+    if (!result.data) continue;
+    const issues = result.data.issues as ReviewIssue[] | undefined;
+    if (!Array.isArray(issues)) continue;
+
+    for (const issue of issues) {
+      // Only high-severity issues participate in corroboration
+      if (issue.severity !== "high") continue;
+
+      // Issues without dimension are unclassified — cannot block
+      if (!issue.dimension) {
+        unclassified.push({ agent: agentName, issue });
+        continue;
+      }
+
+      let group = dimMap.get(issue.dimension);
+      if (!group) {
+        group = { issues: [], agentNames: new Set() };
+        dimMap.set(issue.dimension, group);
+      }
+      group.issues.push({ agent: agentName, issue });
+      group.agentNames.add(agentName);
+    }
+  }
+
+  const blocking: CorroboratedGroup[] = [];
+  const solo: SoloFinding[] = [];
+
+  for (const [dimension, group] of dimMap) {
+    const agentCount = group.agentNames.size;
+    const threshold = 2 * agentCount;
+
+    if (group.issues.length >= threshold) {
+      blocking.push({
+        dimension,
+        issues: group.issues,
+        agentCount,
+        threshold,
+      });
+    } else {
+      solo.push({
+        dimension,
+        issues: group.issues,
+        agentCount,
+        threshold,
+      });
+    }
+  }
+
+  return {
+    blocking,
+    solo,
+    unclassified,
+    verdict: blocking.length > 0
+      ? "fail"
+      : solo.length > 0
+        ? "warn"
+        : "pass",
+  };
+}

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

@@ -8,8 +8,7 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-
-import { hookLog } from "../../_shared/lib-ts/base/logger.js";
+import { hookLog } from "../../_core/lib-ts/runtime/logger.js";
 
 /** Feature flag — set CCNATIVE_DEBUG_DISABLE=1 to turn off */
 const DEBUG_ENABLED = !["1", "true", "yes"].includes(
@@ -52,7 +51,7 @@ export function debugRaw(
   component: string,
   label: string,
   raw: string,
-  maxLen = 10_000,
+  maxLen = 10000,
 ): void {
   if (!DEBUG_ENABLED) return;
 

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

@@ -1,132 +1,132 @@
-/**
- * Graduation logic: pass eligibility, pass streaks, graduation threshold, iteration advancement.
- * Extracted from cc-native-plan-review.ts.
- */
-
-import type {
-  IterationState,
-  ReviewerResult,
-  CombinedReviewResult,
-  IterationAdvancement,
-} from "../../lib-ts/types.js";
-
-// ---------------------------------------------------------------------------
-// Pass Eligibility
-// ---------------------------------------------------------------------------
-
-/**
- * Determine which agents are pass-eligible this iteration.
- * Criteria: verdict === "pass" OR zero high-severity issues.
- * Agents with "skip"/"error" are NOT eligible (no signal).
- */
-export function computePassEligible(agentResults: Record<string, ReviewerResult>): string[] {
-  const eligible: string[] = [];
-  for (const [name, result] of Object.entries(agentResults)) {
-    if (result.verdict === "skip" || result.verdict === "error") continue;
-    if (result.verdict === "pass") { eligible.push(name); continue; }
-    const issues = Array.isArray(result.data?.issues)
-      ? (result.data.issues as Array<{ severity?: string }>) : [];
-    if (issues.filter(i => i.severity === "high").length === 0) {
-      eligible.push(name);
-    }
-  }
-  return eligible;
-}
-
-// ---------------------------------------------------------------------------
-// Tracker Issue Extraction
-// ---------------------------------------------------------------------------
-
-/**
- * Extract top high-severity issues for the review tracker.
- */
-export function extractTopIssuesForTracker(
-  combined: CombinedReviewResult,
-  maxCount = 5,
-): string[] {
-  const allReviewers = Object.values(combined.agents);
-  const issues: string[] = [];
-  for (const r of allReviewers) {
-    if (!r.data) continue;
-    const issueList = r.data.issues as Array<Record<string, unknown>> | undefined;
-    if (!issueList) continue;
-    for (const issue of issueList) {
-      if (issue.severity === "high") {
-        const text = String(issue.issue ?? "").trim();
-        if (text) {
-          issues.push(`[${r.name}] ${text}`);
-        }
-      }
-    }
-    if (issues.length >= maxCount) break;
-  }
-  return issues.slice(0, maxCount);
-}
-
-// ---------------------------------------------------------------------------
-// Iteration Advancement
-// ---------------------------------------------------------------------------
-
-const GRADUATION_THRESHOLD = 2;
-
-/**
- * Advance iteration state after a review cycle. Returns a new state copy
- * (does not mutate input).
- *
- * - On pass/warrant: sets current past max (stop iterating)
- * - On deny: increments current toward max (safety valve)
- * - Updates pass streaks and graduates agents that reached threshold
- */
-export function advanceIterationState(
-  state: IterationState,
-  planHash: string,
-  planPath: string,
-  verdict: string,
-  shouldDeny: boolean,
-  passEligible: string[],
-  agentResults: Record<string, ReviewerResult>,
-  graduationThreshold = GRADUATION_THRESHOLD,
-): IterationAdvancement {
-  const updated: IterationState = {
-    ...state,
-    history: [...state.history, { hash: planHash, verdict, timestamp: new Date().toISOString() }],
-    lastPlanHash: planHash,
-    lastPlanPath: planPath,
-    graduated: [...state.graduated],
-    passStreaks: { ...state.passStreaks },
-  };
-
-  if (!shouldDeny) {
-    // Pass/warrant: stop iterating
-    updated.current = updated.max + 1;
-  } else {
-    // Deny: advance toward max
-    updated.current = state.current + 1;
-  }
-
-  // Update pass streaks — only for agents that actually ran this iteration
-  const passEligibleSet = new Set(passEligible);
-  const graduatedSet = new Set(updated.graduated);
-
-  for (const name of Object.keys(agentResults)) {
-    if (graduatedSet.has(name)) continue;
-    if (passEligibleSet.has(name)) {
-      updated.passStreaks[name] = (updated.passStreaks[name] ?? 0) + 1;
-    } else {
-      updated.passStreaks[name] = 0;
-    }
-  }
-
-  // Graduate agents that reached threshold
-  const newGraduates: string[] = [];
-  for (const [name, streak] of Object.entries(updated.passStreaks)) {
-    if (streak >= graduationThreshold && !graduatedSet.has(name)) {
-      newGraduates.push(name);
-    }
-  }
-  if (newGraduates.length > 0) {
-    updated.graduated = [...updated.graduated, ...newGraduates];
-  }
-
-  return { updatedState: updated, newGraduates };
-}
+/**
+ * Graduation logic: pass eligibility, pass streaks, graduation threshold, iteration advancement.
+ * Extracted from cc-native-plan-review.ts.
+ */
+
+import type {
+  IterationState,
+  ReviewerResult,
+  CombinedReviewResult,
+  IterationAdvancement,
+} from "./types.js";
+
+// ---------------------------------------------------------------------------
+// Pass Eligibility
+// ---------------------------------------------------------------------------
+
+/**
+ * Determine which agents are pass-eligible this iteration.
+ * Criteria: verdict === "pass" OR zero high-severity issues.
+ * Agents with "skip"/"error" are NOT eligible (no signal).
+ */
+export function computePassEligible(agentResults: Record<string, ReviewerResult>): string[] {
+  const eligible: string[] = [];
+  for (const [name, result] of Object.entries(agentResults)) {
+    if (result.verdict === "skip" || result.verdict === "error") continue;
+    if (result.verdict === "pass") { eligible.push(name); continue; }
+    const issues = Array.isArray(result.data?.issues)
+      ? (result.data.issues as Array<{ severity?: string }>) : [];
+    if (issues.filter(i => i.severity === "high").length === 0) {
+      eligible.push(name);
+    }
+  }
+  return eligible;
+}
+
+// ---------------------------------------------------------------------------
+// Tracker Issue Extraction
+// ---------------------------------------------------------------------------
+
+/**
+ * Extract top high-severity issues for the review tracker.
+ */
+export function extractTopIssuesForTracker(
+  combined: CombinedReviewResult,
+  maxCount = 5,
+): string[] {
+  const allReviewers = Object.values(combined.agents);
+  const issues: string[] = [];
+  for (const r of allReviewers) {
+    if (!r.data) continue;
+    const issueList = r.data.issues as Array<Record<string, unknown>> | undefined;
+    if (!issueList) continue;
+    for (const issue of issueList) {
+      if (issue.severity === "high") {
+        const text = String(issue.issue ?? "").trim();
+        if (text) {
+          issues.push(`[${r.name}] ${text}`);
+        }
+      }
+    }
+    if (issues.length >= maxCount) break;
+  }
+  return issues.slice(0, maxCount);
+}
+
+// ---------------------------------------------------------------------------
+// Iteration Advancement
+// ---------------------------------------------------------------------------
+
+const GRADUATION_THRESHOLD = 2;
+
+/**
+ * Advance iteration state after a review cycle. Returns a new state copy
+ * (does not mutate input).
+ *
+ * - On pass/warrant: sets current past max (stop iterating)
+ * - On deny: increments current toward max (safety valve)
+ * - Updates pass streaks and graduates agents that reached threshold
+ */
+export function advanceIterationState(
+  state: IterationState,
+  planHash: string,
+  planPath: string,
+  verdict: string,
+  shouldDeny: boolean,
+  passEligible: string[],
+  agentResults: Record<string, ReviewerResult>,
+  graduationThreshold = GRADUATION_THRESHOLD,
+): IterationAdvancement {
+  const updated: IterationState = {
+    ...state,
+    history: [...state.history, { hash: planHash, verdict, timestamp: new Date().toISOString() }],
+    lastPlanHash: planHash,
+    lastPlanPath: planPath,
+    graduated: [...state.graduated],
+    passStreaks: { ...(state.passStreaks ?? {}) },
+  };
+
+  if (!shouldDeny) {
+    // Pass/warrant: stop iterating
+    updated.current = updated.max + 1;
+  } else {
+    // Deny: advance toward max
+    updated.current = state.current + 1;
+  }
+
+  // Update pass streaks — only for agents that actually ran this iteration
+  const passEligibleSet = new Set(passEligible);
+  const graduatedSet = new Set(updated.graduated);
+
+  for (const name of Object.keys(agentResults)) {
+    if (graduatedSet.has(name)) continue;
+    if (passEligibleSet.has(name)) {
+      updated.passStreaks[name] = (updated.passStreaks[name] ?? 0) + 1;
+    } else {
+      updated.passStreaks[name] = 0;
+    }
+  }
+
+  // Graduate agents that reached threshold
+  const newGraduates: string[] = [];
+  for (const [name, streak] of Object.entries(updated.passStreaks)) {
+    if (streak >= graduationThreshold && !graduatedSet.has(name)) {
+      newGraduates.push(name);
+    }
+  }
+  if (newGraduates.length > 0) {
+    updated.graduated = [...updated.graduated, ...newGraduates];
+  }
+
+  return { updatedState: updated, newGraduates };
+}