aiwcli 0.12.7 → 0.12.8

package/dist/templates/cc-native/_cc-native/hooks/validate_task_prompt.ts

@@ -0,0 +1,76 @@
+#!/usr/bin/env bun
+/**
+ * PreToolUse:Task Hook: Prompt Validation Gate
+ *
+ * Validates that Task tool calls have self-contained, goal-oriented prompts.
+ * Short-circuits immediately for resume calls (no prompt to validate).
+ *
+ * Design:
+ * - Resume calls (tool_input.resume present) → allow through, no inference
+ * - Missing/empty prompt → allow through (fail open)
+ * - Non-empty prompt → run AI validation via inference(), block if ok:false
+ */
+
+import {
+  loadHookInput,
+  runHook,
+  logInfo,
+  logDebug,
+  logWarn,
+  emitContextAndBlock,
+  getToolInput,
+} from "../../_shared/lib-ts/base/hook-utils.js";
+import { isInternalCall } from "../../_shared/lib-ts/base/subprocess-utils.js";
+import { inference } from "../../_shared/lib-ts/base/inference.js";
+
+const VALIDATION_SYSTEM_PROMPT = `The sub-agent receives ONLY the prompt text — no conversation history, no prior context.
+
+Check 1 — Dangling References: Does the prompt use pronouns or demonstratives that ONLY make sense with prior conversation? Violations: 'the file we looked at', 'as discussed above', 'that approach we chose', 'the error from earlier', 'fix the issue mentioned above'. NOT violations: relative paths ('_output/', 'src/lib/'), search terms ('context-manager', 'auth module'), directory exploration ('find files matching X'), tool names, or any concrete noun — even if imprecise. Only flag references that are truly UNRESOLVABLE without conversation history.
+
+Check 2 — Implicit Contract: Does the prompt have ANY discernible goal? 'Explore the _output directory and find context files' IS a clear goal. 'Search for hooks that handle Task events' IS a clear goal. 'Read and summarize all files in X' IS a clear goal. Only flag if the prompt is truly goalless — e.g., a sentence fragment with no verb, or pure context with no request.
+
+If both checks pass, return ok:true. When in doubt, pass — false negatives (letting a vague prompt through) are far less costly than false positives (blocking legitimate work).
+
+When returning ok:false, end your response with: 'Retry: Re-invoke the Task tool with a revised prompt that resolves the issues above.'`;
+
+function main(): void {
+  if (isInternalCall()) return;
+
+  const payload = loadHookInput();
+  if (!payload) return;
+
+  const toolInput = getToolInput(payload);
+
+  // Resume calls: tool_input contains `resume: "<agent-id>"` (may also have prompt/description).
+  // The resume field being present is the authoritative discriminator — skip all validation.
+  if (toolInput?.resume) {
+    logInfo("validate_task_prompt", `Resume call detected (agent: ${toolInput.resume}) — skipping validation`);
+    return;
+  }
+
+  const prompt: string = toolInput?.prompt ?? "";
+  if (!prompt.trim()) {
+    logDebug("validate_task_prompt", "No prompt field — allowing through (fail open)");
+    return;
+  }
+
+  logInfo("validate_task_prompt", `Validating Task prompt (${prompt.length} chars)`);
+  const result = inference(VALIDATION_SYSTEM_PROMPT, prompt, "fast");
+
+  if (!result.success) {
+    logWarn("validate_task_prompt", `inference() failed (${result.error}) — failing open`);
+    return;
+  }
+
+  const output = result.output;
+  if (output.includes("ok:false")) {
+    // Extract the Retry line if present; fall back to full output
+    const retryMatch = output.match(/Retry:.*$/m);
+    const retryMessage = retryMatch ? retryMatch[0] : "Retry: Re-invoke the Task tool with a revised, self-contained prompt.";
+    logInfo("validate_task_prompt", "Blocking Task — prompt failed validation");
+    emitContextAndBlock(output, retryMessage);
+  }
+  // ok:true or anything else → allow through (no output = no block)
+}
+
+runHook(main, "validate_task_prompt");

package/dist/templates/cc-native/_cc-native/lib-ts/aggregate-agents.ts

@@ -1,156 +1,163 @@
-/**
- * Agent frontmatter parser — discovers and loads agent configs from markdown files.
- * See cc-native-plan-review-spec.md §4.14
- */
-
-import * as fs from "node:fs";
-import * as path from "node:path";
-
-import type { AgentConfig } from "./types.js";
-import { logDebug, logInfo, logWarn } from "../../_shared/lib-ts/base/logger.js";
-
-/**
- * Extract simple YAML frontmatter from markdown content.
- * Only handles flat key: value pairs (no nested YAML).
- */
-export function extractFrontmatter(
-  content: string,
-): Record<string, unknown> | null {
-  const lines = content.split(/\r?\n/);
-  if (lines[0]?.trim() !== "---") return null;
-
-  const frontmatterLines: string[] = [];
-  let endIndex = -1;
-
-  for (let i = 1; i < lines.length; i++) {
-    if (lines[i]?.trim() === "---") {
-      endIndex = i;
-      break;
-    }
-    const line = lines[i];
-    if (line !== undefined) {
-      frontmatterLines.push(line);
-    }
-  }
-
-  if (endIndex === -1) return null;
-
-  const result: Record<string, unknown> = {};
-  for (const line of frontmatterLines) {
-    const colonIdx = line.indexOf(":");
-    if (colonIdx === -1) continue;
-
-    const key = line.slice(0, colonIdx).trim();
-    let value: unknown = line.slice(colonIdx + 1).trim();
-
-    // Handle arrays: [item1, item2]
-    if (typeof value === "string" && value.startsWith("[") && value.endsWith("]")) {
-      value = value
-        .slice(1, -1)
-        .split(",")
-        .map((s) => s.trim().replaceAll(/^["']|["']$/g, ""))
-        .filter(Boolean);
-    }
-    // Handle booleans
-    else if (value === "true") value = true;
-    else if (value === "false") value = false;
-    // Handle quoted strings
-    else if (
-      typeof value === "string" &&
-      ((value.startsWith('"') && value.endsWith('"')) ||
-        (value.startsWith("'") && value.endsWith("'")))
-    ) {
-      value = value.slice(1, -1);
-    }
-
-    if (key) result[key] = value;
-  }
-
-  return result;
-}
-
-/**
- * Extract markdown body after frontmatter.
- */
-export function extractBody(content: string): string {
-  const lines = content.split(/\r?\n/);
-  if (lines[0]?.trim() !== "---") return content;
-
-  for (let i = 1; i < lines.length; i++) {
-    if (lines[i]?.trim() === "---") {
-      return lines
-        .slice(i + 1)
-        .join("\n")
-        .trim();
-    }
-  }
-
-  return content;
-}
-
-/**
- * Discover and load all agent configs from a directory of markdown files.
- * Skips the plan-orchestrator agent. Defaults categories to ["code"].
- *
- * @param agentsDir - Path to agents directory (default: _cc-native/agents/)
- * @returns Array of AgentConfig objects
- */
-export function aggregateAgents(agentsDir?: string): AgentConfig[] {
-  const dir = agentsDir ?? path.join("_cc-native", "agents");
-
-  if (!fs.existsSync(dir)) {
-    logWarn("aggregate", `Agents directory not found: ${dir}`);
-    return [];
-  }
-
-  const files = fs
-    .readdirSync(dir)
-    .filter((f) => f.endsWith(".md"))
-    .sort();
-
-  const agents: AgentConfig[] = [];
-
-  for (const file of files) {
-    const filePath = path.join(dir, file);
-    let content: string;
-    try {
-      content = fs.readFileSync(filePath, "utf-8");
-    } catch (error: unknown) {
-      logWarn("aggregate", `Failed to read ${file}: ${error}`);
-      continue;
-    }
-
-    const fm = extractFrontmatter(content);
-    if (!fm) {
-      logDebug("aggregate", `No frontmatter in ${file}, skipping`);
-      continue;
-    }
-
-    const name = (fm.name as string) ?? path.basename(file, ".md");
-
-    // Skip the plan orchestrator — it's not a reviewer
-    if (name === "plan-orchestrator") {
-      logDebug("aggregate", `Skipping plan-orchestrator agent`);
-      continue;
-    }
-
-    const agent: AgentConfig = {
-      name,
-      model: (fm.model as string) ?? "sonnet",
-      provider: "claude", // Default; overwritten by assignModelsToAgents() at runtime
-      focus: (fm.focus as string) ?? "",
-      categories: Array.isArray(fm.categories)
-        ? (fm.categories as string[])
-        : ["code"],
-      description: (fm.description as string) ?? "",
-      system_prompt: extractBody(content),
-    };
-
-    agents.push(agent);
-    logDebug("aggregate", `Loaded agent: ${agent.name} [${agent.categories.join(", ")}]`);
-  }
-
-  logInfo("aggregate", `Loaded ${agents.length} agents from ${dir}`);
-  return agents;
-}
-
+/**
+ * Agent frontmatter parser — discovers and loads agent configs from markdown files.
+ * See cc-native-plan-review-spec.md §4.14
+ *
+ * NOTE: This file intentionally stays in lib-ts/ rather than plan-review/lib/.
+ * Both settings.ts (shared cc-native infra) and plan-questions.ts (plan-review) import it.
+ * Moving it to plan-review/ would create a forbidden backward dependency: lib-ts → plan-review.
+ * Do not move this file without first moving settings.ts out of lib-ts/.
+ */
+
+import * as fs from "node:fs";
+import * as path from "node:path";
+
+import type { AgentConfig } from "./types.js";
+import { logDebug, logInfo, logWarn } from "../../_shared/lib-ts/base/logger.js";
+
+/**
+ * Extract simple YAML frontmatter from markdown content.
+ * Only handles flat key: value pairs (no nested YAML).
+ */
+export function extractFrontmatter(
+  content: string,
+): Record<string, unknown> | null {
+  const lines = content.split(/\r?\n/);
+  if (lines[0]?.trim() !== "---") return null;
+
+  const frontmatterLines: string[] = [];
+  let endIndex = -1;
+
+  for (let i = 1; i < lines.length; i++) {
+    if (lines[i]?.trim() === "---") {
+      endIndex = i;
+      break;
+    }
+    const line = lines[i];
+    if (line !== undefined) {
+      frontmatterLines.push(line);
+    }
+  }
+
+  if (endIndex === -1) return null;
+
+  const result: Record<string, unknown> = {};
+  for (const line of frontmatterLines) {
+    const colonIdx = line.indexOf(":");
+    if (colonIdx === -1) continue;
+
+    const key = line.slice(0, colonIdx).trim();
+    let value: unknown = line.slice(colonIdx + 1).trim();
+
+    // Handle arrays: [item1, item2]
+    if (typeof value === "string" && value.startsWith("[") && value.endsWith("]")) {
+      value = value
+        .slice(1, -1)
+        .split(",")
+        .map((s) => s.trim().replaceAll(/^["']|["']$/g, ""))
+        .filter(Boolean);
+    }
+    // Handle booleans
+    else if (value === "true") value = true;
+    else if (value === "false") value = false;
+    // Handle quoted strings
+    else if (
+      typeof value === "string" &&
+      ((value.startsWith('"') && value.endsWith('"')) ||
+        (value.startsWith("'") && value.endsWith("'")))
+    ) {
+      value = value.slice(1, -1);
+    }
+
+    if (key) result[key] = value;
+  }
+
+  return result;
+}
+
+/**
+ * Extract markdown body after frontmatter.
+ */
+export function extractBody(content: string): string {
+  const lines = content.split(/\r?\n/);
+  if (lines[0]?.trim() !== "---") return content;
+
+  for (let i = 1; i < lines.length; i++) {
+    if (lines[i]?.trim() === "---") {
+      return lines
+        .slice(i + 1)
+        .join("\n")
+        .trim();
+    }
+  }
+
+  return content;
+}
+
+/**
+ * Discover and load all agent configs from a directory of markdown files.
+ * Skips the plan-orchestrator agent. Defaults categories to ["code"].
+ *
+ * @param agentsDir - Path to agents directory. Callers must pass an explicit path.
+ *   Known call sites: settings.ts → plan-review/agents/plan-review,
+ *   plan-questions.ts → plan-review/agents/plan-questions
+ * @returns Array of AgentConfig objects
+ */
+export function aggregateAgents(agentsDir?: string): AgentConfig[] {
+  const dir = agentsDir ?? path.join("_cc-native", "plan-review", "agents");
+
+  if (!fs.existsSync(dir)) {
+    logWarn("aggregate", `Agents directory not found: ${dir}`);
+    return [];
+  }
+
+  const files = fs
+    .readdirSync(dir)
+    .filter((f) => f.endsWith(".md"))
+    .sort();
+
+  const agents: AgentConfig[] = [];
+
+  for (const file of files) {
+    const filePath = path.join(dir, file);
+    let content: string;
+    try {
+      content = fs.readFileSync(filePath, "utf-8");
+    } catch (error: unknown) {
+      logWarn("aggregate", `Failed to read ${file}: ${error}`);
+      continue;
+    }
+
+    const fm = extractFrontmatter(content);
+    if (!fm) {
+      logDebug("aggregate", `No frontmatter in ${file}, skipping`);
+      continue;
+    }
+
+    const name = (fm.name as string) ?? path.basename(file, ".md");
+
+    // Skip the plan orchestrator — it's not a reviewer
+    if (name === "plan-orchestrator") {
+      logDebug("aggregate", `Skipping plan-orchestrator agent`);
+      continue;
+    }
+
+    const agent: AgentConfig = {
+      name,
+      model: (fm.model as string) ?? "sonnet",
+      provider: "claude", // Default; overwritten by assignModelsToAgents() at runtime
+      focus: (fm.focus as string) ?? "",
+      categories: Array.isArray(fm.categories)
+        ? (fm.categories as string[])
+        : ["code"],
+      description: (fm.description as string) ?? "",
+      system_prompt: extractBody(content),
+    };
+
+    agents.push(agent);
+    logDebug("aggregate", `Loaded agent: ${agent.name} [${agent.categories.join(", ")}]`);
+  }
+
+  logInfo("aggregate", `Loaded ${agents.length} agents from ${dir}`);
+  return agents;
+}
+

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

@@ -1,116 +1,116 @@
-/**
- * CC-Native plan review library — package entry point.
- * Re-exports the public API from all modules.
- */
-
-// Agent aggregation
-export {
-  aggregateAgents,
-  extractBody,
-  extractFrontmatter,
-} from "./aggregate-agents.js";
-
-// Artifacts
-export {
-  buildCombinedJson,
-  buildHighIssuesDocument,
-  buildInlineReviewSummary,
-  extractTopIssuesText,
-  formatCombinedMarkdown,
-  formatReviewMarkdown,
-  generateReviewIndex,
-  writeCombinedArtifacts,
-} from "./artifacts.js";
-
-// CC-native state
-export {
-  getCcNativeState,
-  isPlanAlreadyReviewed,
-  markPlanReviewed,
-  markQuestionsAsked,
-  saveCcNativeState,
-  wasPlanPreviouslyDenied,
-  wasQuestionsAsked,
-} from "./cc-native-state.js";
-
-// CLI output parsing
-export { parseCliOutput } from "./cli-output-parser.js";
-
-// Configuration
-export { getDisplaySettings, loadConfig } from "./config.js";
-
-// Constants & security
-export {
-  ENABLE_PLAN_NOTIFICATIONS,
-  ENABLE_ROBUST_PLAN_WRITES,
-  MAX_ERROR_FILE_SIZE,
-  MAX_PLAN_PATH_LENGTH,
-  MAX_RETRY_ATTEMPTS,
-  MAX_TOTAL_RETRY_TIME_MS,
-  PLANS_DIR,
-  RETRY_BACKOFF_MS,
-  validatePlanPath,
-} from "./constants.js";
-
-// Debug logging
-export { cleanupDebugFolder, debugLog, debugRaw, getDebugDir } from "./debug.js";
-
-// JSON parsing
-export { coerceToReview, parseJsonMaybe } from "./json-parser.js";
-
-// Orchestrator
-export { buildOrchestratorSchema, runOrchestrator } from "./orchestrator.js";
-
-// Reviewers
-export {
-  AgentReviewer,
-  runAgentReview,
-} from "./reviewers/index.js";
-
-// Iteration state
-export {
-  DEFAULT_REVIEW_ITERATIONS,
-  deleteState,
-  getIterationState,
-  getStateFilePath,
-  loadState,
-  saveStateToPlan,
-  shouldContinueIterating,
-  updateIterationState,
-} from "./state.js";
-
-// Types & schemas
-export type {
-  AgentConfig,
-  CcNativeState,
-  CombinedReviewResult,
-  ComplexityCategory,
-  DisplaySettings,
-  IterationEntry,
-  IterationState,
-  OrchestratorConfig,
-  OrchestratorResult,
-  PlanReviewConfig,
-  PlanReviewState,
-  QuestionsAskedState,
-  ReviewData,
-  ReviewDecision,
-  ReviewDecisionResult,
-  Reviewer,
-  ReviewerResult,
-  ReviewIssue,
-  ReviewOptions,
-  Verdict,
-} from "./types.js";
-
-export {
-  AGENT_REVIEW_PROMPT_PREFIX,
-  DEFAULT_DISPLAY,
-  DEFAULT_SANITIZATION,
-  ORCHESTRATOR_SCHEMA,
-  REVIEW_PROMPT_PREFIX,
-  REVIEW_SCHEMA,
-} from "./types.js";
-
-// Verdict aggregation
-export { computeReviewDecision, worstVerdict } from "./verdict.js";
+/**
+ * CC-Native plan review library — package entry point.
+ * Re-exports the public API from all modules.
+ */
+
+// Agent aggregation
+export {
+  aggregateAgents,
+  extractBody,
+  extractFrontmatter,
+} from "./aggregate-agents.js";
+
+// Artifacts
+export {
+  buildCombinedJson,
+  buildHighIssuesDocument,
+  buildInlineReviewSummary,
+  extractTopIssuesText,
+  formatCombinedMarkdown,
+  formatReviewMarkdown,
+  generateReviewIndex,
+  writeCombinedArtifacts,
+} from "../artifacts/lib/index.js";
+
+// CC-native state
+export {
+  getCcNativeState,
+  isPlanAlreadyReviewed,
+  markPlanReviewed,
+  markQuestionsAsked,
+  saveCcNativeState,
+  wasPlanPreviouslyDenied,
+  wasQuestionsAsked,
+} from "./cc-native-state.js";
+
+// CLI output parsing
+export { parseCliOutput } from "./cli-output-parser.js";
+
+// Configuration
+export { getDisplaySettings, loadConfig } from "./config.js";
+
+// Constants & security
+export {
+  ENABLE_PLAN_NOTIFICATIONS,
+  ENABLE_ROBUST_PLAN_WRITES,
+  MAX_ERROR_FILE_SIZE,
+  MAX_PLAN_PATH_LENGTH,
+  MAX_RETRY_ATTEMPTS,
+  MAX_TOTAL_RETRY_TIME_MS,
+  PLANS_DIR,
+  RETRY_BACKOFF_MS,
+  validatePlanPath,
+} from "./constants.js";
+
+// Debug logging
+export { cleanupDebugFolder, debugLog, debugRaw, getDebugDir } from "./debug.js";
+
+// JSON parsing
+export { coerceToReview, parseJsonMaybe } from "./json-parser.js";
+
+// Orchestrator
+export { buildOrchestratorSchema, runOrchestrator } from "../plan-review/lib/orchestrator.js";
+
+// Reviewers
+export {
+  AgentReviewer,
+  runAgentReview,
+} from "../plan-review/lib/reviewers/index.js";
+
+// Iteration state
+export {
+  DEFAULT_REVIEW_ITERATIONS,
+  deleteState,
+  getIterationState,
+  getStateFilePath,
+  loadState,
+  saveStateToPlan,
+  shouldContinueIterating,
+  updateIterationState,
+} from "./state.js";
+
+// Types & schemas
+export type {
+  AgentConfig,
+  CcNativeState,
+  CombinedReviewResult,
+  ComplexityCategory,
+  DisplaySettings,
+  IterationEntry,
+  IterationState,
+  OrchestratorConfig,
+  OrchestratorResult,
+  PlanReviewConfig,
+  PlanReviewState,
+  QuestionsAskedState,
+  ReviewData,
+  ReviewDecision,
+  ReviewDecisionResult,
+  Reviewer,
+  ReviewerResult,
+  ReviewIssue,
+  ReviewOptions,
+  Verdict,
+} from "./types.js";
+
+export {
+  AGENT_REVIEW_PROMPT_PREFIX,
+  DEFAULT_DISPLAY,
+  DEFAULT_SANITIZATION,
+  ORCHESTRATOR_SCHEMA,
+  REVIEW_PROMPT_PREFIX,
+  REVIEW_SCHEMA,
+} from "./types.js";
+
+// Verdict aggregation
+export { computeReviewDecision, worstVerdict } from "../plan-review/lib/verdict.js";

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

@@ -163,7 +163,7 @@ export function loadAgentLibrary(
   projDir: string,
   settings?: Record<string, unknown>,
 ): AgentConfig[] {
-  const agentsData = aggregateAgents(path.join(projDir, "_cc-native", "agents", "plan-review"));
+  const agentsData = aggregateAgents(path.join(projDir, "_cc-native", "plan-review", "agents", "plan-review"));
   const defaultModel = settings?.agentDefaults?.model ?? DEFAULT_AGENT_MODEL;
 
   if (!agentsData || agentsData.length === 0) {