@jmylchreest/aide-plugin 0.1.1 → 0.1.3

package/src/core/session-summary-logic.ts

@@ -7,6 +7,7 @@
 
 import { execFileSync } from "child_process";
 import { readFileSync, existsSync } from "fs";
+import { renderBulletSection } from "./session-text.js";
 
 /**
  * Get git commits made during this session.
@@ -84,8 +85,7 @@ function parseTranscript(lines: string[]): TranscriptData {
   const userMessages: string[] = [];
 
   for (const entry of entries) {
-    const contentObj =
-      typeof entry.content === "object" ? entry.content : null;
+    const contentObj = typeof entry.content === "object" ? entry.content : null;
     if (
       entry.type === "tool_use" ||
       (entry.type === "assistant" && contentObj?.tool_use)
@@ -145,33 +145,15 @@ export function buildSessionSummary(
       return null;
     }
 
-    const summaryParts: string[] = [];
-
-    if (userMessages.length > 0) {
-      summaryParts.push(
-        `## Tasks\n${userMessages
-          .slice(0, 3)
-          .map((m) => `- ${m}`)
-          .join("\n")}`,
-      );
-    }
-
-    if (filesModified.size > 0) {
-      const files = Array.from(filesModified).slice(0, 10);
-      summaryParts.push(
-        `## Files Modified\n${files.map((f) => `- ${f}`).join("\n")}`,
-      );
-    }
-
-    if (commits.length > 0) {
-      summaryParts.push(
-        `## Commits\n${commits.map((c) => `- ${c}`).join("\n")}`,
-      );
-    }
-
-    if (toolsUsed.size > 0) {
-      summaryParts.push(`## Tools Used\n${Array.from(toolsUsed).join(", ")}`);
-    }
+    const summaryParts = [
+      renderBulletSection("Tasks", userMessages, 3),
+      renderBulletSection("Files Modified", Array.from(filesModified), 10),
+      renderBulletSection("Commits", commits),
+      // Tools Used is a comma-joined line, not a bullet list.
+      toolsUsed.size > 0
+        ? `## Tools Used\n${Array.from(toolsUsed).join(", ")}`
+        : null,
+    ].filter((s): s is string => s !== null);
 
     const summary = summaryParts.join("\n\n");
     return summary.length >= 50 ? summary : null;
@@ -193,9 +175,8 @@ export function buildSessionSummaryFromState(
 
   const summaryParts: string[] = [];
 
-  if (commits.length > 0) {
-    summaryParts.push(`## Commits\n${commits.map((c) => `- ${c}`).join("\n")}`);
-  }
+  const commitsSection = renderBulletSection("Commits", commits);
+  if (commitsSection) summaryParts.push(commitsSection);
 
   // Check for modified files via git
   try {
@@ -211,15 +192,9 @@ export function buildSessionSummaryFromState(
     ).trim();
 
     if (diff) {
-      const files = diff
-        .split("\n")
-        .filter((f) => f.trim())
-        .slice(0, 10);
-      if (files.length > 0) {
-        summaryParts.push(
-          `## Files Modified\n${files.map((f) => `- ${f}`).join("\n")}`,
-        );
-      }
+      const files = diff.split("\n").filter((f) => f.trim());
+      const filesSection = renderBulletSection("Files Modified", files, 10);
+      if (filesSection) summaryParts.push(filesSection);
     }
   } catch {
     // Ignore

package/src/core/session-text.ts

@@ -0,0 +1,60 @@
+/**
+ * Session text helpers — platform-agnostic.
+ *
+ * Shared building blocks for the session summary / checkpoint builders. These
+ * were duplicated across partial-memory.ts, session-summary-logic.ts, and
+ * session-checkpoint-logic.ts; centralising them keeps the section formatting
+ * and the partial-classification rules in one place.
+ */
+
+/** Partials grouped by the kind of action they record. */
+export interface CategorizedPartials {
+  /** Files created or edited, de-duplicated, first-seen order preserved. */
+  files: string[];
+  /** Shell commands run. */
+  commands: string[];
+  /** Completed (sub)task descriptions. */
+  tasks: string[];
+  /** Anything that didn't match a known prefix. */
+  other: string[];
+}
+
+/**
+ * Classify raw partial-memory content strings (as produced by
+ * buildPartialContent) into files / commands / tasks / other.
+ */
+export function categorizePartials(partials: string[]): CategorizedPartials {
+  const files = new Set<string>();
+  const commands: string[] = [];
+  const tasks: string[] = [];
+  const other: string[] = [];
+
+  for (const p of partials) {
+    if (p.startsWith("Created file: ") || p.startsWith("Edited file: ")) {
+      files.add(p.replace(/^(Created|Edited) file: /, ""));
+    } else if (p.startsWith("Ran command: ")) {
+      commands.push(p.replace("Ran command: ", ""));
+    } else if (p.startsWith("Completed task: ")) {
+      tasks.push(p.replace("Completed task: ", ""));
+    } else {
+      other.push(p);
+    }
+  }
+
+  return { files: Array.from(files), commands, tasks, other };
+}
+
+/**
+ * Render a markdown bullet section: `## <heading>` followed by `- <item>`
+ * lines. Returns null when there are no items (so callers can omit the
+ * section). When `cap` is given, only the first `cap` items are rendered.
+ */
+export function renderBulletSection(
+  heading: string,
+  items: string[],
+  cap?: number,
+): string | null {
+  if (items.length === 0) return null;
+  const list = cap !== undefined ? items.slice(0, cap) : items;
+  return `## ${heading}\n${list.map((i) => `- ${i}`).join("\n")}`;
+}

package/src/core/tool-observe.ts

@@ -118,6 +118,41 @@ function extractOutputText(payload: unknown): string {
   return "";
 }
 
+/**
+ * Decide whether a tool call failed and, if so, return the error text to
+ * attach to the observe event (drives the friction detector). Returns "" when
+ * the call succeeded.
+ *
+ * The meaningful friction signal is a *tool-level* failure — an Edit whose
+ * target string wasn't found, a Read of a missing file, a command the shell
+ * couldn't run — not every non-zero shell exit (a failing test mid-TDD is
+ * expected, not friction). We treat as failed: an explicit success===false,
+ * or a tool_response carrying an is_error / error / failed marker (how Claude
+ * Code flags tool-level errors). When failed but no text is recoverable, a
+ * generic marker still lets the detector count the recurrence.
+ */
+export function toolFailureText(
+  success: boolean | undefined,
+  toolResponse: unknown,
+): string {
+  let failed = success === false;
+  let errorField = "";
+  if (toolResponse && typeof toolResponse === "object") {
+    const r = toolResponse as Record<string, unknown>;
+    if (r.is_error === true || r.isError === true) failed = true;
+    if (r.status === "error" || r.status === "failed") failed = true;
+    if (typeof r.error === "string" && r.error.length > 0) {
+      failed = true;
+      errorField = r.error;
+    }
+  }
+  if (!failed) return "";
+  // Prefer an explicit error field, then any rendered output, then a marker so
+  // the detector can still count the recurrence even with no text.
+  const text = errorField || extractOutputText(toolResponse);
+  return (text || "tool reported failure").slice(0, 500);
+}
+
 export interface ToolObserveInput {
   toolName: string;
   toolInput?: {
@@ -138,6 +173,14 @@ export interface ToolObserveInput {
    */
   toolResponse?: unknown;
   success?: boolean;
+  /**
+   * Explicit error text from a harness failure event (Claude Code's
+   * PostToolUseFailure, OpenCode tool errors). When set, it's used verbatim as
+   * the event's error rather than inferring failure from toolResponse — the
+   * harness already told us it failed. Empty/undefined means "use the
+   * heuristic in toolFailureText".
+   */
+  errorText?: string;
   sessionId?: string;
 }
 
@@ -161,20 +204,6 @@ function lookupTool(name: string): ToolTax | null {
   return null;
 }
 
-/**
- * Resolve to the canonical tool name (Edit/Read/Write/...) so observe
- * events from different harnesses aggregate into the same bucket on the
- * dashboard. Falls back to the original name when no alias matches.
- */
-function canonicalToolName(name: string): string {
-  if (NATIVE_TOOL_TAXONOMY[name]) return name;
-  const lower = name.toLowerCase();
-  for (const k of Object.keys(NATIVE_TOOL_TAXONOMY)) {
-    if (k.toLowerCase() === lower) return k;
-  }
-  return TOOL_ALIASES[lower] ?? name;
-}
-
 /**
  * Estimate tokens for the Read tool. If offset/limit are present, scale by
  * the portion actually read. Returns 0 on stat failure (caller still records
@@ -281,6 +310,16 @@ export function recordToolEvent(
     if (typeof pattern === "string" && pattern.length > 0) {
       args.push(`--attr=pattern=${pattern.slice(0, 200)}`);
     }
+    // Mark tool-level failures so the friction detector can spot a recurring
+    // obstacle (the same tool failing on the same target). An explicit
+    // errorText from a harness failure event wins; otherwise we infer from the
+    // response. Empty when the call succeeded, so successes record as before.
+    const errText =
+      (input.errorText && input.errorText.slice(0, 500)) ||
+      toolFailureText(input.success, input.toolResponse);
+    if (errText) {
+      args.push(`--error=${errText}`);
+    }
     execFileSync(binary, args, {
       cwd,
       timeout: 3000,

package/src/hooks/agent-cleanup.ts

@@ -10,8 +10,12 @@
 
 import { existsSync, appendFileSync } from "fs";
 import { join } from "path";
-import { readStdin } from "../lib/hook-utils.js";
-import { findAideBinary } from "../core/aide-client.js";
+import {
+  readStdin,
+  emitHookResult,
+  installHookSafetyNet,
+  findAideBinary,
+} from "../lib/hook-utils.js";
 import { cleanupAgent } from "../core/cleanup.js";
 import { debug } from "../lib/logger.js";
 import { findProjectRoot } from "../lib/project-root.js";
@@ -31,7 +35,7 @@ async function main(): Promise<void> {
   try {
     const input = await readStdin();
     if (!input.trim()) {
-      console.log(JSON.stringify({ continue: true }));
+      emitHookResult({ continue: true });
       return;
     }
 
@@ -41,11 +45,7 @@ async function main(): Promise<void> {
 
     // Clean up agent-specific state — delegates to core
     if (agentId) {
-      const binary = findAideBinary({
-        cwd,
-        pluginRoot:
-          process.env.AIDE_PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT,
-      });
+      const binary = findAideBinary(cwd);
       if (binary) {
         const cleared = cleanupAgent(binary, cwd, agentId);
         if (cleared) {
@@ -64,30 +64,13 @@ async function main(): Promise<void> {
     }
 
     // Always continue - cleanup is best-effort
-    console.log(JSON.stringify({ continue: true }));
+    emitHookResult({ continue: true });
   } catch (error) {
     debug(SOURCE, `Hook error: ${error}`);
-    console.log(JSON.stringify({ continue: true }));
+    emitHookResult({ continue: true });
   }
 }
 
-process.on("uncaughtException", (err) => {
-  debug(SOURCE, `UNCAUGHT EXCEPTION: ${err}`);
-  try {
-    console.log(JSON.stringify({ continue: true }));
-  } catch {
-    console.log('{"continue":true}');
-  }
-  process.exit(0);
-});
-process.on("unhandledRejection", (reason) => {
-  debug(SOURCE, `UNHANDLED REJECTION: ${reason}`);
-  try {
-    console.log(JSON.stringify({ continue: true }));
-  } catch {
-    console.log('{"continue":true}');
-  }
-  process.exit(0);
-});
+installHookSafetyNet(SOURCE);
 
 main();

package/src/hooks/agent-signals.ts

@@ -13,8 +13,12 @@
 
 import { execFileSync } from "child_process";
 import { Logger } from "../lib/logger.js";
-import { readStdin } from "../lib/hook-utils.js";
-import { findAideBinary } from "../core/aide-client.js";
+import {
+  readStdin,
+  emitHookResult,
+  installHookSafetyNet,
+  findAideBinary,
+} from "../lib/hook-utils.js";
 import { emitInjectionEvent } from "../core/read-tracking.js";
 
 const SOURCE = "agent-signals";
@@ -53,12 +57,12 @@ interface SignalsResponse {
 let log: Logger | null = null;
 
 function passThrough(): void {
-  console.log(JSON.stringify({ continue: true }));
+  emitHookResult({ continue: true });
 }
 
 function block(message: string): void {
   const out: HookOutput = { continue: false, message };
-  console.log(JSON.stringify(out));
+  emitHookResult(out);
 }
 
 function injectContext(context: string): void {
@@ -69,7 +73,7 @@ function injectContext(context: string): void {
       additionalContext: context,
     },
   };
-  console.log(JSON.stringify(out));
+  emitHookResult(out);
 }
 
 function runAide(binary: string, cwd: string, args: string[]): string | null {
@@ -105,11 +109,7 @@ async function main(): Promise<void> {
     const cwd = data.cwd || process.cwd();
     log = new Logger("agent-signals", cwd);
 
-    const binary = findAideBinary({
-      cwd,
-      pluginRoot:
-        process.env.AIDE_PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT,
-    });
+    const binary = findAideBinary(cwd);
     if (!binary) {
       passThrough();
       return;
@@ -237,13 +237,6 @@ async function main(): Promise<void> {
   }
 }
 
-process.on("uncaughtException", () => {
-  passThrough();
-  process.exit(0);
-});
-process.on("unhandledRejection", () => {
-  passThrough();
-  process.exit(0);
-});
+installHookSafetyNet(SOURCE);
 
 main();

package/src/hooks/comment-checker.ts

@@ -9,14 +9,18 @@
  * Core logic is in src/core/comment-checker.ts for cross-platform reuse.
  */
 
-import { readStdin } from "../lib/hook-utils.js";
+import {
+  readStdin,
+  emitHookResult,
+  installHookSafetyNet,
+  findAideBinary,
+} from "../lib/hook-utils.js";
 import { debug } from "../lib/logger.js";
 import {
   checkComments,
   getCheckableFilePath,
   getContentToCheck,
 } from "../core/comment-checker.js";
-import { findAideBinary } from "../core/aide-client.js";
 import { emitInjectionEvent } from "../core/read-tracking.js";
 
 const SOURCE = "comment-checker";
@@ -48,7 +52,7 @@ async function main(): Promise<void> {
   try {
     const input = await readStdin();
     if (!input.trim()) {
-      console.log(JSON.stringify({ continue: true }));
+      emitHookResult({ continue: true });
       return;
     }
 
@@ -61,14 +65,14 @@ async function main(): Promise<void> {
     // Only check Write/Edit/MultiEdit tool calls
     const filePath = getCheckableFilePath(toolName, toolInput);
     if (!filePath) {
-      console.log(JSON.stringify({ continue: true }));
+      emitHookResult({ continue: true });
       return;
     }
 
     // Get the content to analyze
     const contentResult = getContentToCheck(toolName, toolInput);
     if (!contentResult) {
-      console.log(JSON.stringify({ continue: true }));
+      emitHookResult({ continue: true });
       return;
     }
 
@@ -81,11 +85,7 @@ async function main(): Promise<void> {
         `Detected ${result.suspiciousCount} suspicious comments in ${filePath}`,
       );
       try {
-        const binary = findAideBinary({
-          cwd,
-          pluginRoot:
-            process.env.AIDE_PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT,
-        });
+        const binary = findAideBinary(cwd);
         if (binary && result.warning) {
           emitInjectionEvent(binary, cwd, {
             source: SOURCE,
@@ -109,33 +109,16 @@ async function main(): Promise<void> {
           additionalContext: result.warning,
         },
       };
-      console.log(JSON.stringify(output));
+      emitHookResult(output);
     } else {
-      console.log(JSON.stringify({ continue: true }));
+      emitHookResult({ continue: true });
     }
   } catch (error) {
     debug(SOURCE, `Hook error: ${error}`);
-    console.log(JSON.stringify({ continue: true }));
+    emitHookResult({ continue: true });
   }
 }
 
-process.on("uncaughtException", (err) => {
-  debug(SOURCE, `UNCAUGHT EXCEPTION: ${err}`);
-  try {
-    console.log(JSON.stringify({ continue: true }));
-  } catch {
-    console.log('{"continue":true}');
-  }
-  process.exit(0);
-});
-process.on("unhandledRejection", (reason) => {
-  debug(SOURCE, `UNHANDLED REJECTION: ${reason}`);
-  try {
-    console.log(JSON.stringify({ continue: true }));
-  } catch {
-    console.log('{"continue":true}');
-  }
-  process.exit(0);
-});
+installHookSafetyNet(SOURCE);
 
 main();

package/src/hooks/context-guard.ts

@@ -11,10 +11,17 @@
  * Core logic is in src/core/context-guard.ts for cross-platform reuse.
  */
 
-import { readStdin } from "../lib/hook-utils.js";
+import {
+  readStdin,
+  emitHookResult,
+  installHookSafetyNet,
+  findAideBinary,
+} from "../lib/hook-utils.js";
 import { debug } from "../lib/logger.js";
-import { checkContextGuard, checkSmartReadHint } from "../core/context-guard.js";
-import { findAideBinary } from "../core/aide-client.js";
+import {
+  checkContextGuard,
+  checkSmartReadHint,
+} from "../core/context-guard.js";
 import { emitInjectionEvent } from "../core/read-tracking.js";
 
 const SOURCE = "context-guard";
@@ -44,7 +51,7 @@ async function main(): Promise<void> {
   try {
     const input = await readStdin();
     if (!input.trim()) {
-      console.log(JSON.stringify({ continue: true }));
+      emitHookResult({ continue: true });
       return;
     }
 
@@ -55,11 +62,7 @@ async function main(): Promise<void> {
     const sessionId = data.session_id || "unknown";
 
     const result = checkContextGuard(toolName, toolInput, cwd, sessionId);
-    const binary = findAideBinary({
-      cwd,
-      pluginRoot:
-        process.env.AIDE_PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT,
-    });
+    const binary = findAideBinary(cwd);
 
     if (result.shouldAdvise && result.advisory) {
       debug(SOURCE, `Advising on large file read`);
@@ -84,7 +87,7 @@ async function main(): Promise<void> {
           additionalContext: result.advisory,
         },
       };
-      console.log(JSON.stringify(output));
+      emitHookResult(output);
     } else {
       // Smart read hint: suggest code index for re-reads of unchanged files
       const hintResult = checkSmartReadHint(toolName, toolInput, cwd, binary);
@@ -111,34 +114,17 @@ async function main(): Promise<void> {
             additionalContext: hintResult.hint,
           },
         };
-        console.log(JSON.stringify(output));
+        emitHookResult(output);
       } else {
-        console.log(JSON.stringify({ continue: true }));
+        emitHookResult({ continue: true });
       }
     }
   } catch (error) {
     debug(SOURCE, `Hook error: ${error}`);
-    console.log(JSON.stringify({ continue: true }));
+    emitHookResult({ continue: true });
   }
 }
 
-process.on("uncaughtException", (err) => {
-  debug(SOURCE, `UNCAUGHT EXCEPTION: ${err}`);
-  try {
-    console.log(JSON.stringify({ continue: true }));
-  } catch {
-    console.log('{"continue":true}');
-  }
-  process.exit(0);
-});
-process.on("unhandledRejection", (reason) => {
-  debug(SOURCE, `UNHANDLED REJECTION: ${reason}`);
-  try {
-    console.log(JSON.stringify({ continue: true }));
-  } catch {
-    console.log('{"continue":true}');
-  }
-  process.exit(0);
-});
+installHookSafetyNet(SOURCE);
 
 main();

package/src/hooks/context-pruning.ts

@@ -14,14 +14,18 @@
  * Core logic is in src/core/context-pruning/ for cross-platform reuse.
  */
 
-import { readStdin } from "../lib/hook-utils.js";
+import {
+  readStdin,
+  emitHookResult,
+  installHookSafetyNet,
+  findAideBinary,
+} from "../lib/hook-utils.js";
 import { debug } from "../lib/logger.js";
 import { ContextPruningTracker } from "../core/context-pruning/index.js";
 import type { ToolRecord } from "../core/context-pruning/types.js";
 import { tmpdir } from "os";
 import { join } from "path";
 import { existsSync, readFileSync, writeFileSync } from "fs";
-import { findAideBinary } from "../core/aide-client.js";
 import { emitInjectionEvent } from "../core/read-tracking.js";
 
 const SOURCE = "context-pruning";
@@ -103,7 +107,7 @@ async function main(): Promise<void> {
   try {
     const input = await readStdin();
     if (!input.trim()) {
-      console.log(JSON.stringify({ continue: true }));
+      emitHookResult({ continue: true });
       return;
     }
 
@@ -116,7 +120,7 @@ async function main(): Promise<void> {
 
     // Skip if no tool output to prune
     if (!toolOutput || toolOutput.length < 50) {
-      console.log(JSON.stringify({ continue: true }));
+      emitHookResult({ continue: true });
       return;
     }
 
@@ -187,11 +191,7 @@ async function main(): Promise<void> {
       }
 
       try {
-        const binary = findAideBinary({
-          cwd,
-          pluginRoot:
-            process.env.AIDE_PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT,
-        });
+        const binary = findAideBinary(cwd);
         const injected = output.hookSpecificOutput?.additionalContext;
         if (binary && injected) {
           emitInjectionEvent(binary, cwd, {
@@ -211,33 +211,16 @@ async function main(): Promise<void> {
         // Non-fatal
       }
 
-      console.log(JSON.stringify(output));
+      emitHookResult(output);
     } else {
-      console.log(JSON.stringify({ continue: true }));
+      emitHookResult({ continue: true });
     }
   } catch (error) {
     debug(SOURCE, `Hook error: ${error}`);
-    console.log(JSON.stringify({ continue: true }));
+    emitHookResult({ continue: true });
   }
 }
 
-process.on("uncaughtException", (err) => {
-  debug(SOURCE, `UNCAUGHT EXCEPTION: ${err}`);
-  try {
-    console.log(JSON.stringify({ continue: true }));
-  } catch {
-    console.log('{"continue":true}');
-  }
-  process.exit(0);
-});
-process.on("unhandledRejection", (reason) => {
-  debug(SOURCE, `UNHANDLED REJECTION: ${reason}`);
-  try {
-    console.log(JSON.stringify({ continue: true }));
-  } catch {
-    console.log('{"continue":true}');
-  }
-  process.exit(0);
-});
+installHookSafetyNet(SOURCE);
 
 main();