@damian87/omp 0.9.2 → 0.12.0

package/scripts/lib/minify.mjs

@@ -0,0 +1,80 @@
+import { countTokens } from "./cost-ledger.mjs";
+
+const ANSI_RE = /\u001b\[[0-9;]*m/g;
+const DIAGNOSTIC_RE = /\b(fail(?:ed|ure)?|error|exception|assertion|traceback|expected|cannot find|no-undef|TS\d{4})\b/i;
+
+function stripAnsi(text) {
+  return text.replace(ANSI_RE, "");
+}
+
+function dedupConsecutiveLines(lines) {
+  const out = [];
+  let previous = "";
+  let repeated = 0;
+  for (const line of lines) {
+    if (line === previous) {
+      repeated += 1;
+      continue;
+    }
+    if (repeated > 0) out.push(`[omp] repeated previous line ${repeated} time${repeated === 1 ? "" : "s"}`);
+    out.push(line);
+    previous = line;
+    repeated = 0;
+  }
+  if (repeated > 0) out.push(`[omp] repeated previous line ${repeated} time${repeated === 1 ? "" : "s"}`);
+  return out;
+}
+
+export function minifyToolOutput(value, options = {}) {
+  const rawText = value == null ? "" : String(value);
+  const rawTokens = countTokens(rawText);
+  const thresholdTokens = options.thresholdTokens ?? 800;
+  if (rawTokens <= thresholdTokens) {
+    return {
+      changed: false,
+      text: rawText,
+      rawTokens,
+      modelTokens: rawTokens,
+      savedTokens: 0,
+    };
+  }
+
+  const headLines = options.headLines ?? 80;
+  const tailLines = options.tailLines ?? 40;
+  const normalized = dedupConsecutiveLines(stripAnsi(rawText).split("\n"));
+  const omitted = Math.max(0, normalized.length - headLines - tailLines);
+  const head = normalized.slice(0, headLines);
+  const tail = omitted > 0 ? normalized.slice(-tailLines) : [];
+  const tailStart = omitted > 0 ? normalized.length - tailLines : normalized.length;
+  const diagnosticLines = normalized
+    .map((line, index) => ({ line, index }))
+    .filter(({ line, index }) => index >= headLines && index < tailStart && DIAGNOSTIC_RE.test(line))
+    .slice(0, options.maxDiagnosticLines ?? 40)
+    .map(({ line }) => line);
+  const text = [
+    `[omp] output trimmed from ${rawTokens} estimated tokens; full raw output is saved on disk.`,
+    ...head,
+    ...(omitted > 0 ? [`[omp] … omitted ${omitted} middle line${omitted === 1 ? "" : "s"} …`] : []),
+    ...(diagnosticLines.length > 0 ? ["[omp] preserved diagnostic lines from omitted output:", ...diagnosticLines] : []),
+    ...tail,
+  ].join("\n");
+  const modelTokens = countTokens(text);
+
+  if (modelTokens >= rawTokens) {
+    return {
+      changed: false,
+      text: rawText,
+      rawTokens,
+      modelTokens: rawTokens,
+      savedTokens: 0,
+    };
+  }
+
+  return {
+    changed: true,
+    text,
+    rawTokens,
+    modelTokens,
+    savedTokens: rawTokens - modelTokens,
+  };
+}

package/scripts/post-tool-use-failure.mjs

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+import { readStdin } from "./lib/stdin.mjs";
+import { parseHookInput } from "./lib/hook-input.mjs";
+import { appendHookLog, failOpen } from "./lib/hook-output.mjs";
+
+const HOOK_NAME = "postToolUseFailure";
+
+(async () => {
+  try {
+    const input = parseHookInput(await readStdin());
+    appendHookLog(input.cwd, HOOK_NAME, {
+      sessionId: input.sessionId,
+      toolName: input.toolName,
+      error: input.error ?? "unknown",
+    });
+    failOpen();
+  } catch (err) {
+    console.error(`[hook ${HOOK_NAME}] failed: ${err?.message ?? err}`);
+    failOpen();
+  }
+})();

package/scripts/post-tool-use.mjs

@@ -1,31 +1,94 @@
 #!/usr/bin/env node
-import { appendFileSync, mkdirSync } from "node:fs";
+import { appendFileSync, mkdirSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { readStdin } from "./lib/stdin.mjs";
+import { buildModifiedResultOutput, failOpen } from "./lib/hook-output.mjs";
+import { parseHookInput } from "./lib/hook-input.mjs";
+import { appendCostRecord, countTokens } from "./lib/cost-ledger.mjs";
+import { minifyToolOutput } from "./lib/minify.mjs";
 
 const HOOK_NAME = "PostToolUse";
+const NOISY_COMMAND_RE = /\b(npm|pnpm|yarn|bun|vitest|jest|mocha|pytest|cargo|go|tsc|eslint|biome|ruff|mypy|make|gradle|mvn)\b/i;
+
+function safePathPart(value) {
+  return (
+    String(value || "unknown")
+      .replace(/[^a-zA-Z0-9._-]+/g, "-")
+      .replace(/^-+|-+$/g, "") || "unknown"
+  );
+}
+
+function shouldMinify(input) {
+  if (process.env.OMP_MINIFY === "0") return false;
+  const toolName = String(input.toolName || "").toLowerCase();
+  const command = String(input.toolArgs?.command ?? input.toolArgs?.cmd ?? "");
+  return (toolName === "bash" || toolName === "shell" || toolName === "terminal") && NOISY_COMMAND_RE.test(command);
+}
 
 (async () => {
   try {
     const raw = await readStdin();
-    const data = raw ? JSON.parse(raw) : {};
-    const sessionId = data.sessionId ?? data.session_id ?? "unknown";
-    const directory = data.directory ?? process.cwd();
-    const toolName = data.toolName ?? data.tool_name ?? "unknown";
-    const ok = data.toolOutput != null;
+    const input = parseHookInput(raw);
+    const sessionId = input.sessionId;
+    const directory = input.cwd;
+    const toolName = input.toolName;
+    const ok = input.toolResult != null;
+    const rawText = input.toolResult?.textResultForLlm ?? "";
+    const minified = !shouldMinify(input) ? {
+      changed: false,
+      text: rawText,
+      rawTokens: countTokens(rawText),
+      modelTokens: countTokens(rawText),
+      savedTokens: 0,
+    } : minifyToolOutput(rawText);
+    let rawPath;
     const logFile = join(directory, ".omp", "state", "hooks.log");
+    let canModifyResult = minified.changed;
     try {
       mkdirSync(dirname(logFile), { recursive: true });
       appendFileSync(
         logFile,
         `${JSON.stringify({ ts: new Date().toISOString(), hook: HOOK_NAME, sessionId, toolName, ok })}\n`,
       );
+      if (minified.changed) {
+        rawPath = join(
+          directory,
+          ".omp",
+          "state",
+          "cost",
+          "raw",
+          `${safePathPart(sessionId)}-${Date.now()}-${safePathPart(toolName)}.txt`,
+        );
+        mkdirSync(dirname(rawPath), { recursive: true });
+        writeFileSync(rawPath, rawText, "utf8");
+      }
+    } catch {
+      canModifyResult = false;
+    }
+    try {
+      appendCostRecord(directory, {
+        sessionId,
+        event: "postToolUse",
+        toolName,
+        inTokens: countTokens(input.toolArgs),
+        outTokens: canModifyResult ? minified.modelTokens : minified.rawTokens,
+        rawOutTokens: minified.rawTokens,
+        savedTokens: canModifyResult ? minified.savedTokens : 0,
+        rawPath,
+      });
     } catch {
       // best effort
     }
-    console.log(JSON.stringify({ continue: true }));
+    if (canModifyResult) {
+      console.log(JSON.stringify(buildModifiedResultOutput(
+        minified.text,
+        `[omp] output trimmed ${minified.rawTokens}→${minified.modelTokens} tokens; full output at ${rawPath}`,
+      )));
+      return;
+    }
+    failOpen();
   } catch (err) {
     console.error(`[hook ${HOOK_NAME}] failed: ${err?.message ?? err}`);
-    console.log(JSON.stringify({ continue: true }));
+    failOpen();
   }
 })();

package/scripts/pre-tool-use.mjs

@@ -2,16 +2,18 @@
 import { appendFileSync, mkdirSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { readStdin } from "./lib/stdin.mjs";
+import { failOpen } from "./lib/hook-output.mjs";
+import { parseHookInput } from "./lib/hook-input.mjs";
 
 const HOOK_NAME = "PreToolUse";
 
 (async () => {
   try {
     const raw = await readStdin();
-    const data = raw ? JSON.parse(raw) : {};
-    const sessionId = data.sessionId ?? data.session_id ?? "unknown";
-    const directory = data.directory ?? process.cwd();
-    const toolName = data.toolName ?? data.tool_name ?? "unknown";
+    const input = parseHookInput(raw);
+    const sessionId = input.sessionId;
+    const directory = input.cwd;
+    const toolName = input.toolName;
     const logFile = join(directory, ".omp", "state", "hooks.log");
     try {
       mkdirSync(dirname(logFile), { recursive: true });
@@ -22,9 +24,9 @@ const HOOK_NAME = "PreToolUse";
     } catch {
       // best effort
     }
-    console.log(JSON.stringify({ continue: true }));
+    failOpen();
   } catch (err) {
     console.error(`[hook ${HOOK_NAME}] failed: ${err?.message ?? err}`);
-    console.log(JSON.stringify({ continue: true }));
+    failOpen();
   }
 })();

package/scripts/prompt-submit.mjs

@@ -2,8 +2,11 @@
 import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { readStdin } from "./lib/stdin.mjs";
+import { failOpen, printContinue } from "./lib/hook-output.mjs";
 import { recordPrompt } from "./lib/daily-log.mjs";
 import { ompRoot } from "./lib/omp-root.mjs";
+import { parseHookInput } from "./lib/hook-input.mjs";
+import { appendCostRecord, countTokens } from "./lib/cost-ledger.mjs";
 
 const HOOK_NAME = "UserPromptSubmit";
 
@@ -51,11 +54,16 @@ function appendLog(directory, payload) {
 (async () => {
   try {
     const raw = await readStdin();
-    const data = raw ? JSON.parse(raw) : {};
-    const sessionId = data.sessionId ?? data.session_id ?? "unknown";
-    const directory = data.directory ?? process.cwd();
-    const prompt = data.prompt ?? data.message?.content ?? "";
+    const input = parseHookInput(raw);
+    const sessionId = input.sessionId;
+    const directory = input.cwd;
+    const prompt = input.prompt;
     appendLog(directory, { sessionId, promptBytes: String(prompt).length });
+    appendCostRecord(directory, {
+      sessionId,
+      event: "userPromptSubmitted",
+      inTokens: countTokens(prompt),
+    });
     // Count this prompt as session work (signals the SessionEnd nudge logic).
     // Injects nothing — keeps per-turn token cost at zero.
     try {
@@ -67,12 +75,9 @@ function appendLog(directory, payload) {
     const cont = buildContinuationContext(directory);
     if (cont) parts.push(cont);
     const additionalContext = parts.join("\n\n---\n\n");
-    const output = additionalContext
-      ? { continue: true, hookSpecificOutput: { hookEventName: HOOK_NAME, additionalContext } }
-      : { continue: true };
-    console.log(JSON.stringify(output));
+    printContinue(HOOK_NAME, additionalContext);
   } catch (err) {
     console.error(`[hook ${HOOK_NAME}] failed: ${err?.message ?? err}`);
-    console.log(JSON.stringify({ continue: true }));
+    failOpen();
   }
 })();

package/scripts/session-end.mjs

@@ -4,15 +4,17 @@ import { dirname, join } from "node:path";
 import { readStdin } from "./lib/stdin.mjs";
 import { endSession } from "./lib/daily-log.mjs";
 import { ompRoot } from "./lib/omp-root.mjs";
+import { failOpen } from "./lib/hook-output.mjs";
+import { parseHookInput } from "./lib/hook-input.mjs";
 
 const HOOK_NAME = "SessionEnd";
 
 (async () => {
   try {
     const raw = await readStdin();
-    const data = raw ? JSON.parse(raw) : {};
-    const sessionId = data.sessionId ?? data.session_id ?? "unknown";
-    const directory = data.directory ?? process.cwd();
+    const input = parseHookInput(raw);
+    const sessionId = input.sessionId;
+    const directory = input.cwd;
     const logFile = join(ompRoot(directory), ".omp", "state", "hooks.log");
     try {
       mkdirSync(dirname(logFile), { recursive: true });
@@ -26,9 +28,9 @@ const HOOK_NAME = "SessionEnd";
     // Arm a daily-log nudge for the next session if this one did work but
     // logged nothing. endSession never throws.
     endSession(directory);
-    console.log(JSON.stringify({ continue: true }));
+    failOpen();
   } catch (err) {
     console.error(`[hook ${HOOK_NAME}] failed: ${err?.message ?? err}`);
-    console.log(JSON.stringify({ continue: true }));
+    failOpen();
   }
 })();

package/scripts/session-start.mjs

@@ -2,11 +2,13 @@
 import { appendFileSync, mkdirSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { readStdin } from "./lib/stdin.mjs";
+import { failOpen, printContinue } from "./lib/hook-output.mjs";
 import { checkForUpdate, formatUpdateNotice } from "./lib/version-check.mjs";
 import { scanScheduleResults } from "./lib/schedule-results.mjs";
 import { readRepoGoal, readTodayGoal, recentEntryStats, startSession } from "./lib/daily-log.mjs";
 import { readDirectives } from "./lib/project-memory.mjs";
 import { ompRoot } from "./lib/omp-root.mjs";
+import { parseHookInput } from "./lib/hook-input.mjs";
 
 const HOOK_NAME = "SessionStart";
 
@@ -19,7 +21,7 @@ function buildDailyLogBreadcrumb(directory) {
     if (goal) lines.push(`Goal: ${goal}`);
     if (entries > 0)
       lines.push(
-        `${entries} ${entries === 1 ? "entry" : "entries"} logged in the last 7 days — run \`omp daily-log read\` to load if relevant.`,
+        `${entries} ${entries === 1 ? "entry" : "entries"} logged in the last 7 days — run \`omp daily-log read --days 7\` to load if relevant.`,
       );
     return lines.join("\n");
   } catch {
@@ -30,9 +32,9 @@ function buildDailyLogBreadcrumb(directory) {
 (async () => {
   try {
     const raw = await readStdin();
-    const data = raw ? JSON.parse(raw) : {};
-    const sessionId = data.sessionId ?? data.session_id ?? "unknown";
-    const directory = data.directory ?? process.cwd();
+    const input = parseHookInput(raw);
+    const sessionId = input.sessionId;
+    const directory = input.cwd;
     const stateDir = join(ompRoot(directory), ".omp", "state");
     const logFile = join(stateDir, "hooks.log");
     mkdirSync(dirname(logFile), { recursive: true });
@@ -84,14 +86,9 @@ function buildDailyLogBreadcrumb(directory) {
     if (flush) parts.push(`[DAILY LOG] ${flush}`);
     const additionalContext = parts.join("\n\n---\n\n");
 
-    console.log(
-      JSON.stringify({
-        continue: true,
-        hookSpecificOutput: { hookEventName: HOOK_NAME, additionalContext },
-      }),
-    );
+    printContinue(HOOK_NAME, additionalContext);
   } catch (err) {
     console.error(`[hook ${HOOK_NAME}] failed: ${err?.message ?? err}`);
-    console.log(JSON.stringify({ continue: true }));
+    failOpen();
   }
 })();