@pi-unipi/compactor 2.6.1 → 2.6.2

package/src/types.ts

@@ -8,12 +8,6 @@ import type { Message } from "@earendil-works/pi-ai";
 // Normalized blocks (from pi-vcc)
 // ─────────────────────────────────────────────────────────
 
-export interface FileOps {
-  readFiles?: string[];
-  modifiedFiles?: string[];
-  createdFiles?: string[];
-}
-
 export type NormalizedBlock =
   | { kind: "user"; text: string; sourceIndex?: number }
   | { kind: "assistant"; text: string; sourceIndex?: number }
@@ -21,6 +15,13 @@ export type NormalizedBlock =
   | { kind: "tool_result"; name: string; text: string; isError: boolean; sourceIndex?: number }
   | { kind: "thinking"; text: string; redacted: boolean; sourceIndex?: number };
 
+/** Hook-provided file activity (pi-vcc parity) — structural signal for ranking */
+export interface FileOps {
+  readFiles?: string[];
+  modifiedFiles?: string[];
+  createdFiles?: string[];
+}
+
 // ─────────────────────────────────────────────────────────
 // Section data (from pi-vcc)
 // ─────────────────────────────────────────────────────────
@@ -32,16 +33,6 @@ export interface SectionData {
   outstandingContext: string[];
   userPreferences: string[];
   briefTranscript: string;
-  transcriptEntries: TranscriptEntry[];
-}
-
-export interface TranscriptEntry {
-  role: "user" | "assistant" | "tool_error";
-  text?: string;
-  tool?: string;
-  cmd?: string;
-  ref?: string;
-  count?: number;
 }
 
 export interface BriefLine {
@@ -49,16 +40,6 @@ export interface BriefLine {
   lines: string[];
 }
 
-/** Runtime stats tracked during a live session. */
-export interface RuntimeStats {
-  bytesReturned: Record<string, number>;
-  bytesSandboxed: number;
-  calls: Record<string, number>;
-  sessionStart: number;
-  cacheHits: number;
-  cacheBytesSaved: number;
-}
-
 // ─────────────────────────────────────────────────────────
 // Compaction input / output
 // ─────────────────────────────────────────────────────────
@@ -66,26 +47,48 @@ export interface RuntimeStats {
 export interface CompileInput {
   messages: Message[];
   previousSummary?: string;
-  fileOps?: FileOps;
 }
 
 export interface CompactionStats {
   summarized: number;
   kept: number;
-  totalMessages: number;
+  totalMessages?: number;
   /** Actual token count from Pi's preparation */
-  tokensBefore: number;
+  tokensBefore?: number;
   /** Estimated tokens after compaction (proportional from kept/total chars) */
-  tokensAfterEst: number;
+  tokensAfterEst?: number;
+  keptUserTurns: number;
+  totalUserTurns: number;
+  requestedKeepUserTurns: number;
+  keepUserTurnsExplicit: boolean;
+  keepFallbackToCompactAll: boolean;
+  /** Set when the tail came from a token-budget cut instead of a user-turn cut. */
+  budgetCut?: BudgetCutKind;
+  keptTokensEst: number;
+  /** True when smart-keep boosted the default keep beyond 1. */
+  smartKeepAdjusted?: boolean;
+  /** Base keep before smart adjustment (for toast like "1→3"). */
+  smartFromKeep?: number;
 }
 
+export type BudgetCutKind = "no_anchor" | "oversized_tail";
+
 export type OwnCutCancelReason =
   | "no_live_messages"
-  | "too_few_live_messages"
-  | "no_user_message";
+  | "too_few_live_messages";
 
 export type OwnCutResult =
-  | { ok: true; messages: Message[]; firstKeptEntryId: string; compactAll: boolean }
+  | {
+      ok: true;
+      messages: Message[];
+      firstKeptEntryId: string;
+      compactAll: boolean;
+      keptUserTurns: number;
+      totalUserTurns: number;
+      requestedKeepUserTurns: number;
+      keepFallbackToCompactAll: boolean;
+      budgetCut?: BudgetCutKind;
+    }
   | { ok: false; reason: OwnCutCancelReason };
 
 // ─────────────────────────────────────────────────────────
@@ -125,25 +128,13 @@ export interface CompactorConfig {
     /** @deprecated Category filtering was never implemented; ignored by runtime. */
     eventCategories: string[];
   };
-  /** @deprecated Project indexing moved to @pi-unipi/cocoindex; retained for config compatibility. */
+  /** @deprecated Retained for config compatibility. */
   fts5Index: CompactorStrategyConfig & { mode: "auto" | "manual" | "off"; chunkSize: number; cacheTtlHours: number };
   sandboxExecution: CompactorStrategyConfig & { mode: "all" | "safe-only" | "off"; allowedLanguages: Language[]; outputLimit: number };
-  /** @deprecated Display profiles were never connected to runtime; retained for config compatibility. */
-  toolDisplay: CompactorStrategyConfig & { mode: "opencode" | "balanced" | "verbose" | "custom"; diffLayout: "auto" | "split" | "unified"; diffIndicator: "bars" | "classic" | "none"; showThinkingLabels: boolean; showUserMessageBox: boolean; showBashSpinner: boolean; showPendingPreviews: boolean };
 
   // Pipeline features
   pipeline: {
-    /** @deprecated Reserved compatibility field; ignored by runtime. */
-    ttlCache: boolean;
     autoInjection: boolean;
-    /** @deprecated Reserved compatibility field; ignored by runtime. */
-    proximityReranking: boolean;
-    /** @deprecated Reserved compatibility field; ignored by runtime. */
-    timelineSort: boolean;
-    /** @deprecated Reserved compatibility field; ignored by runtime. */
-    progressiveThrottling: boolean;
-    /** @deprecated Reserved compatibility field; ignored by runtime. */
-    mmapPragma: boolean;
     customNoisePatterns: string[];
   };
 
@@ -152,9 +143,12 @@ export interface CompactorConfig {
 
   // Global settings
   overrideDefaultCompaction: boolean;
+  /** Boost default keep:1 to a larger tail when it is small (≤5k tok, capped 25k). Explicit keep:N always respected. */
+  smartKeepTail: boolean;
+  /** Ask the agent to continue after automatic (threshold/overflow) compaction. */
+  continueAfterThresholdCompact: boolean;
+  /** Write detailed compaction diagnostics to /tmp/compactor-debug.json. */
   debug: boolean;
-  /** @deprecated Truncation hints were never connected to runtime; retained for config compatibility. */
-  showTruncationHints: boolean;
 }
 
 export type CompactorPreset = "precise" | "balanced" | "thorough" | "lean" | "opencode" | "verbose" | "minimal" | "custom";
@@ -236,61 +230,10 @@ export type Language =
   | "elixir";
 
 // ─────────────────────────────────────────────────────────
-// Content store — REMOVED (moved to @pi-unipi/cocoindex)
+// Content store — REMOVED
 // SearchResult, IndexResult, StoreStats types no longer needed.
 // ─────────────────────────────────────────────────────────
 
-// ─────────────────────────────────────────────────────────
-// Security (from context-mode)
-// ─────────────────────────────────────────────────────────
-
-export type PermissionDecision = "allow" | "deny" | "ask";
-
-export interface SecurityPolicy {
-  allow: string[];
-  deny: string[];
-  ask: string[];
-}
-
-// ─────────────────────────────────────────────────────────
-// Display (from pi-tool-display)
-// ─────────────────────────────────────────────────────────
-
-export type DiffLayout = "auto" | "split" | "unified";
-export type DiffIndicator = "bars" | "classic" | "none";
-export type OutputMode = "hidden" | "summary" | "preview" | "count";
-
-export interface ToolDisplayConfig {
-  registerToolOverrides: {
-    read: boolean;
-    grep: boolean;
-    find: boolean;
-    ls: boolean;
-    bash: boolean;
-    edit: boolean;
-    write: boolean;
-  };
-  enableNativeUserMessageBox: boolean;
-  readOutputMode: OutputMode;
-  searchOutputMode: OutputMode;
-  mcpOutputMode: OutputMode;
-  previewLines: number;
-  expandedPreviewMaxLines: number;
-  bashOutputMode: OutputMode;
-  bashCollapsedLines: number;
-  diffViewMode: DiffLayout;
-  diffIndicatorMode: DiffIndicator;
-  diffSplitMinWidth: number;
-  diffCollapsedLines: number;
-  diffWordWrap: boolean;
-  showTruncationHints: boolean;
-  showRtkCompactionHints: boolean;
-}
-
-// ─────────────────────────────────────────────────────────
-// Runtime counters (live session stats)
-// ─────────────────────────────────────────────────────────
-
 export interface RuntimeCounters {
   sandboxRuns: number;
   searchQueries: number;

package/src/display/diff-renderer.ts

@@ -1,281 +0,0 @@
-/**
- * Diff rendering engine — LCS-based diff with 3 layouts, 3 indicators,
- * syntax highlighting, and Nerd Font detection
- */
-
-import { visibleWidth, truncateToWidth } from "@earendil-works/pi-tui";
-
-export type DiffLayout = "auto" | "split" | "unified";
-export type DiffIndicator = "bars" | "classic" | "nerd" | "none";
-
-// --- Nerd Font Detection ---
-
-let nerdFontDetected: boolean | null = null;
-
-/** Detect if terminal supports Nerd Font icons */
-export function detectNerdFont(): boolean {
-  if (nerdFontDetected !== null) return nerdFontDetected;
-  // Check common Nerd Font env vars or terminal emulators
-  const term = process.env.TERM_PROGRAM ?? "";
-  const termFont = process.env.TERM_FONT ?? "";
-  nerdFontDetected =
-    termFont.toLowerCase().includes("nerd") ||
-    process.env.NERD_FONT === "1" ||
-    term === "WezTerm" ||
-    term === "iTerm.app" ||
-    (process.env.TERMINAL_EMULATOR ?? "").includes("JetBrains") ||
-    false;
-  return nerdFontDetected;
-}
-
-/** Nerd Font indicator chars */
-const NERD_INDICATORS = {
-  add: "\uf055 ",   // nf-fa-plus_circle
-  remove: "\uf056 ", // nf-fa-minus_circle
-  same: "  ",
-} as const;
-
-// --- Syntax Highlighting ---
-
-const KEYWORDS: Record<string, Set<string>> = {
-  js: new Set(["const", "let", "var", "function", "return", "if", "else", "for", "while", "class", "import", "export", "from", "async", "await", "try", "catch", "throw", "new", "this", "typeof", "instanceof", "in", "of", "switch", "case", "break", "continue", "default", "yield", "void", "delete", "null", "undefined", "true", "false"]),
-  py: new Set(["def", "class", "import", "from", "return", "if", "elif", "else", "for", "while", "try", "except", "finally", "raise", "with", "as", "yield", "lambda", "pass", "break", "continue", "and", "or", "not", "in", "is", "None", "True", "False", "self", "async", "await"]),
-  ts: new Set(["const", "let", "var", "function", "return", "if", "else", "for", "while", "class", "import", "export", "from", "async", "await", "try", "catch", "throw", "new", "this", "typeof", "instanceof", "interface", "type", "enum", "namespace", "module", "declare", "implements", "extends", "public", "private", "protected", "readonly", "static", "abstract", "override", "keyof", "infer", "never", "unknown", "any", "void", "string", "number", "boolean", "null", "undefined", "true", "false"]),
-  sh: new Set(["if", "then", "else", "elif", "fi", "for", "while", "do", "done", "case", "esac", "function", "return", "local", "export", "readonly", "declare", "unset", "shift", "source", "exit", "echo", "printf", "read", "test", "true", "false"]),
-};
-
-/** Apply basic syntax highlighting to a line */
-function highlightLine(line: string, lang?: string): string {
-  if (!lang) return line;
-  const keywords = KEYWORDS[lang] ?? KEYWORDS.js;
-  // Highlight keywords (simple word boundary match)
-  return line.replace(/\b([a-zA-Z_]\w*)\b/g, (match) => {
-    if (keywords.has(match)) return `\x1b[34m${match}\x1b[0m`; // blue
-    return match;
-  });
-}
-
-/** Detect language from file extension or content */
-function detectLanguage(filePath?: string, content?: string): string | undefined {
-  if (filePath) {
-    const ext = filePath.split(".").pop()?.toLowerCase();
-    const extMap: Record<string, string> = {
-      js: "js", mjs: "js", cjs: "js", jsx: "js",
-      ts: "ts", mts: "ts", cts: "ts", tsx: "ts",
-      py: "py", pyw: "py",
-      sh: "sh", bash: "sh", zsh: "sh",
-    };
-    if (ext && extMap[ext]) return extMap[ext];
-  }
-  if (content) {
-    if (content.includes("def ") || content.includes("import ")) return "py";
-    if (content.includes("function ") || content.includes("const ")) return "js";
-    if (content.includes("#!/bin/")) return "sh";
-  }
-  return undefined;
-}
-
-interface DiffLine {
-  type: "same" | "add" | "remove";
-  text: string;
-}
-
-function lcs<T>(a: T[], b: T[]): T[] {
-  const m = a.length;
-  const n = b.length;
-  const dp: number[][] = Array.from({ length: m + 1 }, () => Array(n + 1).fill(0));
-
-  for (let i = 1; i <= m; i++) {
-    for (let j = 1; j <= n; j++) {
-      if (a[i - 1] === b[j - 1]) {
-        dp[i][j] = dp[i - 1][j - 1] + 1;
-      } else {
-        dp[i][j] = Math.max(dp[i - 1][j], dp[i][j - 1]);
-      }
-    }
-  }
-
-  const result: T[] = [];
-  let i = m, j = n;
-  while (i > 0 && j > 0) {
-    if (a[i - 1] === b[j - 1]) {
-      result.unshift(a[i - 1]);
-      i--;
-      j--;
-    } else if (dp[i - 1][j] > dp[i][j - 1]) {
-      i--;
-    } else {
-      j--;
-    }
-  }
-
-  return result;
-}
-
-function computeDiff(before: string[], after: string[]): DiffLine[] {
-  const common = lcs(before, after);
-  const result: DiffLine[] = [];
-  let i = 0, j = 0, k = 0;
-
-  while (i < before.length || j < after.length) {
-    if (k < common.length && before[i] === common[k] && after[j] === common[k]) {
-      result.push({ type: "same", text: after[j] });
-      i++;
-      j++;
-      k++;
-    } else if (i < before.length && (k >= common.length || before[i] !== common[k])) {
-      result.push({ type: "remove", text: before[i] });
-      i++;
-    } else if (j < after.length && (k >= common.length || after[j] !== common[k])) {
-      result.push({ type: "add", text: after[j] });
-      j++;
-    } else {
-      break;
-    }
-  }
-
-  return result;
-}
-
-function indicatorChar(type: DiffLine["type"], style: DiffIndicator): string {
-  if (style === "none") return "  ";
-  if (style === "nerd") {
-    if (type === "add") return `\x1b[32m${NERD_INDICATORS.add}\x1b[0m`;
-    if (type === "remove") return `\x1b[31m${NERD_INDICATORS.remove}\x1b[0m`;
-    return NERD_INDICATORS.same;
-  }
-  if (style === "bars") {
-    if (type === "add") return `\x1b[32m│ \x1b[0m`;
-    if (type === "remove") return `\x1b[31m│ \x1b[0m`;
-    return "  ";
-  }
-  return type === "add" ? "+ " : type === "remove" ? "- " : "  ";
-}
-
-function renderUnified(
-  diff: DiffLine[],
-  indicator: DiffIndicator,
-  maxWidth?: number,
-): string {
-  return diff.map((line) => {
-    const prefix = indicator === "bars"
-      ? (line.type === "add" ? "│ " : line.type === "remove" ? "│ " : "  ")
-      : indicatorChar(line.type, indicator);
-    const rendered = prefix + line.text;
-    if (maxWidth && visibleWidth(rendered) > maxWidth) {
-      return truncateToWidth(rendered, maxWidth, "…");
-    }
-    return rendered;
-  }).join("\n");
-}
-
-function renderSplit(
-  diff: DiffLine[],
-  indicator: DiffIndicator,
-  maxW?: number,
-): string {
-  const left: string[] = [];
-  const right: string[] = [];
-
-  for (const line of diff) {
-    if (line.type === "same") {
-      left.push("  " + line.text);
-      right.push("  " + line.text);
-    } else if (line.type === "remove") {
-      left.push(indicatorChar("remove", indicator) + line.text);
-      right.push("");
-    } else if (line.type === "add") {
-      left.push("");
-      right.push(indicatorChar("add", indicator) + line.text);
-    }
-  }
-
-  const halfW = maxW ? Math.floor(maxW / 2) - 2 : 40;
-  const colW = Math.max(
-    ...left.map((l) => visibleWidth(l)),
-    ...right.map((l) => visibleWidth(l)),
-    Math.min(halfW, 40),
-  );
-  const result: string[] = [];
-  for (let i = 0; i < left.length; i++) {
-    const lTrunc = visibleWidth(left[i]) > colW
-      ? truncateToWidth(left[i], colW, "…")
-      : left[i].padEnd(colW);
-    const sep = left[i] && right[i] ? " │ " : "   ";
-    let rLine = right[i];
-    if (maxW && visibleWidth(lTrunc + sep + rLine) > maxW) {
-      const rBudget = maxW - visibleWidth(lTrunc + sep);
-      rLine = truncateToWidth(rLine, Math.max(1, rBudget), "…");
-    }
-    result.push(lTrunc + sep + rLine);
-  }
-
-  return result.join("\n");
-}
-
-export function renderDiff(
-  before: string,
-  after: string,
-  opts?: { layout?: DiffLayout; indicator?: DiffIndicator; maxWidth?: number; filePath?: string; highlight?: boolean },
-): string {
-  const layout = opts?.layout ?? "auto";
-  let indicator = opts?.indicator ?? "bars";
-  const maxWidth = opts?.maxWidth ?? 120;
-  const doHighlight = opts?.highlight ?? true;
-
-  // Auto-detect Nerd Font for indicator selection
-  if (indicator === "bars" && detectNerdFont()) {
-    indicator = "nerd";
-  }
-
-  const beforeLines = before.split("\n");
-  const afterLines = after.split("\n");
-  const diff = computeDiff(beforeLines, afterLines);
-
-  const effectiveLayout = layout === "auto"
-    ? (maxWidth >= 100 ? "split" : "unified")
-    : layout;
-
-  let effectiveIndicator = indicator;
-  // Auto mode: use classic indicator for unified to keep output clean
-  if (layout === "auto" && effectiveLayout === "unified" && indicator !== "nerd") {
-    effectiveIndicator = "classic";
-  }
-
-  // Apply syntax highlighting if enabled
-  let highlightedDiff = diff;
-  if (doHighlight) {
-    const lang = detectLanguage(opts?.filePath, after);
-    if (lang) {
-      highlightedDiff = diff.map((line) => ({
-        ...line,
-        text: highlightLine(line.text, lang),
-      }));
-    }
-  }
-
-  if (effectiveLayout === "split") {
-    return renderSplit(highlightedDiff, effectiveIndicator, maxWidth);
-  }
-
-  return renderUnified(highlightedDiff, effectiveIndicator, maxWidth);
-}
-
-export function renderEditDiffResult(
-  previousContent: string,
-  newContent: string,
-  opts?: { layout?: DiffLayout; indicator?: DiffIndicator; maxWidth?: number },
-): string {
-  return renderDiff(previousContent, newContent, opts);
-}
-
-export function renderWriteDiffResult(
-  previousContent: string | undefined,
-  newContent: string,
-  opts?: { layout?: DiffLayout; indicator?: DiffIndicator; maxWidth?: number },
-): string {
-  if (!previousContent) {
-    return "[New file created]\n" + newContent.split("\n").map((l) => "+ " + l).join("\n");
-  }
-  return renderDiff(previousContent, newContent, opts);
-}

package/src/display/line-width-safety.ts

@@ -1,28 +0,0 @@
-/**
- * Line width safety — width clamping with collapsed hints
- *
- * Uses ANSI-aware visibleWidth measurement from pi-tui to properly
- * handle lines containing escape codes. Falls back to raw-length
- * measurement when pi-tui is unavailable.
- */
-
-import { visibleWidth, truncateToWidth } from "@earendil-works/pi-tui";
-
-/**
- * Clamp each line to maxWidth visible columns.
- * Uses pi-tui's visibleWidth() for ANSI-aware measurement and
- * truncateToWidth() for ANSI-safe truncation.
- */
-export function clampLineWidth(lines: string[], maxWidth: number): string[] {
-  return lines.map((line) => {
-    const vw = visibleWidth(line);
-    if (vw <= maxWidth) return line;
-    return truncateToWidth(line, maxWidth, "…");
-  });
-}
-
-export function collapseHint(originalCount: number, shownCount: number): string {
-  const omitted = originalCount - shownCount;
-  if (omitted <= 0) return "";
-  return `...(${omitted} more lines)...`;
-}

package/src/display/render-utils.ts

@@ -1,52 +0,0 @@
-/**
- * Shared display rendering utilities
- */
-
-export function splitLines(text: string): string[] {
-  return text.split(/\r?\n/);
-}
-
-export function countNonEmptyLines(text: string): number {
-  return splitLines(text).filter((l) => l.trim()).length;
-}
-
-export function compactOutputLines(text: string, maxLines: number): string {
-  const lines = splitLines(text);
-  if (lines.length <= maxLines) return text;
-  const omitted = lines.length - maxLines;
-  return `...(${omitted} lines omitted)...\n${lines.slice(-maxLines).join("\n")}`;
-}
-
-export function previewLines(text: string, lines: number): string {
-  const all = splitLines(text);
-  if (all.length <= lines) return text;
-  return all.slice(0, lines).join("\n") + `\n...(${all.length - lines} more lines)`;
-}
-
-export function pluralize(count: number, singular: string, plural?: string): string {
-  return count === 1 ? `${count} ${singular}` : `${count} ${plural ?? singular + "s"}`;
-}
-
-export function shortenPath(path: string, maxLen: number = 60): string {
-  if (path.length <= maxLen) return path;
-  const parts = path.split("/");
-  if (parts.length <= 2) return "..." + path.slice(-(maxLen - 3));
-  return parts[0] + "/.../" + parts.slice(-2).join("/");
-}
-
-export function extractTextOutput(result: any): string {
-  if (typeof result === "string") return result;
-  if (result?.output) return String(result.output);
-  if (result?.stdout) return String(result.stdout);
-  return "";
-}
-
-export function isLikelyQuietCommand(command: string): boolean {
-  const quietPatterns = [/^\s*cd\s/, /^\s*mkdir\s+-p/, /^\s*touch\s/, /^\s*rm\s+/];
-  return quietPatterns.some((re) => re.test(command));
-}
-
-export function sanitizeAnsiForThemedOutput(text: string): string {
-  // Strip ANSI escape sequences for clean themed rendering
-  return text.replace(/\x1b\[[0-9;]*m/g, "");
-}

package/src/display/thinking-label.ts

@@ -1,18 +0,0 @@
-/**
- * Thinking labels during streaming
- */
-
-export function formatThinkingLabel(text: string, opts?: { prefix?: string }): string {
-  const prefix = opts?.prefix ?? "🤔";
-  const lines = text.split("\n");
-  if (lines.length === 1) return `${prefix} ${lines[0]}`;
-  return `${prefix} Thinking...\n${text}`;
-}
-
-export function sanitizeThinkingArtifacts(text: string): string {
-  // Remove thinking blocks from context before LLM turn
-  return text
-    .replace(/<thinking>[\s\S]*?<\/thinking>/g, "")
-    .replace(/\[thinking\][\s\S]*?\[\/thinking\]/g, "")
-    .trim();
-}