@pi-unipi/compactor 2.6.0 → 2.6.2

package/src/compaction/touched-files.ts

@@ -0,0 +1,35 @@
+/**
+ * Touched-file aggregation (pi-vcc parity, mode:"touched") — files worked on
+ * with their entry indices, aggregated across the searched window.
+ */
+
+import type { NormalizedBlock } from "../types.js";
+import { extractPath } from "./extract/files.js";
+
+/** A file touched in one block — used by mode:touched aggregation. */
+export interface FileTouch {
+  index: number;
+  toolName: string;
+}
+
+/** Aggregated view of a file touched across multiple blocks. */
+export interface TouchedFile {
+  path: string;
+  entries: FileTouch[];
+}
+
+/** Aggregate file operations across tool_call blocks. */
+export function getTouchedFiles(blocks: NormalizedBlock[]): TouchedFile[] {
+  const map = new Map<string, TouchedFile>();
+  for (const b of blocks) {
+    if (b.kind !== "tool_call") continue;
+    const path = extractPath(b.args);
+    if (!path) continue;
+    const index = b.sourceIndex ?? 0;
+    if (!map.has(path)) {
+      map.set(path, { path, entries: [] });
+    }
+    map.get(path)!.entries.push({ index, toolName: b.name });
+  }
+  return Array.from(map.values());
+}

package/src/config/manager.ts

@@ -91,36 +91,11 @@ export function saveConfig(config: CompactorConfig, opts?: { perProject?: boolea
 
 /**
  * Migrate partial config to full schema, filling missing keys from defaults.
+ * Uses deepMerge so nested strategy objects merge recursively.
  */
 export function migrateConfig(partial: Partial<CompactorConfig>): CompactorConfig {
   const defaults = structuredClone(DEFAULT_COMPACTOR_CONFIG);
-
-  function mergeStrategy<K extends keyof CompactorConfig>(
-    key: K,
-    defaultVal: CompactorConfig[K],
-    partialVal: CompactorConfig[K] | undefined,
-  ): CompactorConfig[K] {
-    if (!partialVal || typeof partialVal !== "object") return defaultVal;
-    return { ...(defaultVal as any), ...(partialVal as any) };
-  }
-
-  return {
-    sessionGoals: mergeStrategy("sessionGoals", defaults.sessionGoals, partial.sessionGoals),
-    filesAndChanges: mergeStrategy("filesAndChanges", defaults.filesAndChanges, partial.filesAndChanges),
-    commits: mergeStrategy("commits", defaults.commits, partial.commits),
-    outstandingContext: mergeStrategy("outstandingContext", defaults.outstandingContext, partial.outstandingContext),
-    userPreferences: mergeStrategy("userPreferences", defaults.userPreferences, partial.userPreferences),
-    briefTranscript: mergeStrategy("briefTranscript", defaults.briefTranscript, partial.briefTranscript),
-    sessionContinuity: mergeStrategy("sessionContinuity", defaults.sessionContinuity, partial.sessionContinuity),
-    fts5Index: mergeStrategy("fts5Index", defaults.fts5Index, partial.fts5Index),
-    sandboxExecution: mergeStrategy("sandboxExecution", defaults.sandboxExecution, partial.sandboxExecution),
-    toolDisplay: mergeStrategy("toolDisplay", defaults.toolDisplay, partial.toolDisplay),
-    pipeline: mergeStrategy("pipeline", defaults.pipeline, (partial as any).pipeline) as any,
-    autoCompaction: mergeStrategy("autoCompaction", defaults.autoCompaction, partial.autoCompaction),
-    overrideDefaultCompaction: partial.overrideDefaultCompaction ?? defaults.overrideDefaultCompaction,
-    debug: partial.debug ?? defaults.debug,
-    showTruncationHints: partial.showTruncationHints ?? defaults.showTruncationHints,
-  };
+  return deepMerge(defaults, partial);
 }
 
 /**

package/src/config/presets.ts

@@ -34,8 +34,6 @@ const preset = (
   // Legacy compatibility data only; presets never advertise or alter it.
   fts5Index: { ...DEFAULT_COMPACTOR_CONFIG.fts5Index },
   sandboxExecution: { ...DEFAULT_COMPACTOR_CONFIG.sandboxExecution, ...(overrides.sandboxExecution ?? {}) },
-  // Legacy compatibility data only; presets never advertise or alter it.
-  toolDisplay: { ...DEFAULT_COMPACTOR_CONFIG.toolDisplay },
   pipeline: pipeline(overrides.pipeline),
   autoCompaction: { ...DEFAULT_COMPACTOR_CONFIG.autoCompaction, ...(overrides.autoCompaction ?? {}) },
 });

package/src/config/schema.ts

@@ -39,23 +39,8 @@ export const DEFAULT_COMPACTOR_CONFIG: CompactorConfig = {
     allowedLanguages: ["javascript", "typescript", "python", "shell"],
     outputLimit: 100 * 1024 * 1024,
   },
-  toolDisplay: {
-    ...strategy(true, "opencode"),
-    mode: "opencode",
-    diffLayout: "auto",
-    diffIndicator: "bars",
-    showThinkingLabels: true,
-    showUserMessageBox: true,
-    showBashSpinner: true,
-    showPendingPreviews: true,
-  },
   pipeline: {
-    ttlCache: false,
     autoInjection: false,
-    proximityReranking: false,
-    timelineSort: false,
-    progressiveThrottling: false,
-    mmapPragma: false,
     customNoisePatterns: [],
   },
   autoCompaction: {
@@ -66,6 +51,7 @@ export const DEFAULT_COMPACTOR_CONFIG: CompactorConfig = {
     notify: true,
   },
   overrideDefaultCompaction: true,
+  smartKeepTail: true,
+  continueAfterThresholdCompact: true,
   debug: false,
-  showTruncationHints: true,
 };

package/src/executor/executor.ts

@@ -2,7 +2,7 @@
  * PolyglotExecutor — sandboxed code execution for 11 languages
  */
 
-import { spawn, execSync, execFileSync } from "node:child_process";
+import { spawn, execSync } from "node:child_process";
 import { mkdtempSync, writeFileSync, rmSync, existsSync } from "node:fs";
 import { join, resolve } from "node:path";
 import { tmpdir } from "node:os";
@@ -11,19 +11,7 @@ import type { ExecResult } from "../types.js";
 
 const isWin = process.platform === "win32";
 
-const OS_TMPDIR = (() => {
-  if (isWin) return process.env.TEMP ?? process.env.TMP ?? tmpdir();
-  try {
-    const result = execFileSync(
-      process.platform === "darwin" ? "getconf" : "mktemp",
-      process.platform === "darwin" ? ["DARWIN_USER_TEMP_DIR"] : ["-u", "-d"],
-      { env: { ...process.env, TMPDIR: undefined as unknown as string }, encoding: "utf-8" },
-    ).trim();
-    const dir = process.platform === "darwin" ? result : resolve(result, "..");
-    if (dir && dir !== process.cwd()) return dir;
-  } catch { /* fall through */ }
-  return "/tmp";
-})();
+const OS_TMPDIR = isWin ? (process.env.TEMP ?? process.env.TMP ?? tmpdir()) : tmpdir();
 
 function killTree(proc: ReturnType<typeof spawn>): void {
   if (isWin && proc.pid) {
@@ -73,8 +61,11 @@ interface ExecuteOptions {
   background?: boolean;
 }
 
-interface ExecuteFileOptions extends ExecuteOptions {
+interface ExecuteFileOptions {
+  language: Language;
   path: string;
+  timeout?: number;
+  background?: boolean;
 }
 
 export class PolyglotExecutor {

package/src/executor/runtime.ts

@@ -2,18 +2,8 @@
  * Runtime detection for sandbox executor
  */
 
-export type Language =
-  | "javascript"
-  | "typescript"
-  | "python"
-  | "shell"
-  | "ruby"
-  | "go"
-  | "rust"
-  | "php"
-  | "perl"
-  | "r"
-  | "elixir";
+import type { Language } from "../types.js";
+export type { Language };
 
 export interface RuntimeMap {
   javascript: string;

package/src/index.ts

@@ -3,7 +3,7 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { MODULES, UNIPI_EVENTS, COMPACTOR_COMMANDS, COMPACTOR_TOOLS, COMPACTOR_INSTRUCTION, emitEvent } from "@pi-unipi/core";
+import { MODULES, UNIPI_EVENTS, COMPACTOR_COMMANDS, COMPACTOR_TOOLS, COMPACTOR_INSTRUCTION, emitEvent, formatTokens } from "@pi-unipi/core";
 import { scaffoldConfig, loadConfig } from "./config/manager.js";
 import { registerCompactionHooks } from "./compaction/hooks.js";
 import {
@@ -22,45 +22,13 @@ import { registerCompactorTools } from "./tools/register.js";
 import { normalizeMessages } from "./compaction/normalize.js";
 import { filterNoise } from "./compaction/filter-noise.js";
 import { recallBlocksFromContext } from "./session/recall-blocks.js";
-import type { NormalizedBlock, CompactorStrategyConfig, RuntimeCounters, RuntimeStats } from "./types.js";
+import type { NormalizedBlock, CompactorStrategyConfig, RuntimeCounters } from "./types.js";
 
-/** Debug logger — only logs when config.debug === true */
-function createDebugLogger(getConfig: () => { debug: boolean }) {
-  return (_event: string, _data?: Record<string, unknown>) => {
-    // Debug logging disabled — was writing to stdout causing TUI rendering issues.
-    return;
-  };
-}
 
-const formatTokenCount = (n: number): string => {
-  if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`;
-  if (n >= 1_000) return `${(n / 1_000).toFixed(1)}k`;
-  return String(n);
-};
 
 /** Measure byte size of a tool_result event's response content. */
-function measureResponseBytes(event: any): number {
-  try {
-    const content = event.content;
-    if (typeof content === "string") return Buffer.byteLength(content, "utf-8");
-    if (Array.isArray(content)) {
-      return content.reduce((sum: number, block: any) => {
-        if (typeof block?.text === "string") return sum + Buffer.byteLength(block.text, "utf-8");
-        if (typeof block === "string") return sum + Buffer.byteLength(block, "utf-8");
-        return sum;
-      }, 0);
-    }
-    if (event.output && typeof event.output === "string") return Buffer.byteLength(event.output, "utf-8");
-  } catch {
-    // Non-blocking: byte measurement errors silently skipped
-  }
-  return 0;
-}
 
 /** Check if a tool is a sandbox tool (output stays in sandbox, not context). */
-function isSandboxTool(name: string): boolean {
-  return name === "bash" || name === "Bash";
-}
 
 export default function compactorExtension(pi: ExtensionAPI): void {
   let sessionDB: SessionDB | null = null;
@@ -78,17 +46,6 @@ export default function compactorExtension(pi: ExtensionAPI): void {
   };
   const getCounters = () => counters;
 
-  const runtimeStats: RuntimeStats = {
-    bytesReturned: {},
-    bytesSandboxed: 0,
-    calls: {},
-    sessionStart: Date.now(),
-    cacheHits: 0,
-    cacheBytesSaved: 0,
-  };
-
-  const debug = createDebugLogger(() => config);
-
   const init = async () => {
     scaffoldConfig();
     config = loadConfig();
@@ -134,8 +91,6 @@ export default function compactorExtension(pi: ExtensionAPI): void {
     const fullSessionId = `${sessionId}${suffix}`;
     currentSessionId = fullSessionId;
 
-    debug("session_start", { sessionId: fullSessionId, projectDir });
-
     // Seed runtime counters from DB so they reflect prior usage
     if (sessionDB) {
       try {
@@ -148,12 +103,6 @@ export default function compactorExtension(pi: ExtensionAPI): void {
     }
 
     // Reset runtime stats for new session
-    runtimeStats.bytesReturned = {};
-    runtimeStats.bytesSandboxed = 0;
-    runtimeStats.calls = {};
-    runtimeStats.sessionStart = Date.now();
-    runtimeStats.cacheHits = 0;
-    runtimeStats.cacheBytesSaved = 0;
     autoCompactionState = createAutoCompactionState();
 
     sessionDB?.ensureSession(fullSessionId, projectDir);
@@ -226,8 +175,6 @@ export default function compactorExtension(pi: ExtensionAPI): void {
       tools: Object.values(COMPACTOR_TOOLS),
     });
 
-    debug("MODULE_READY", { commands: Object.values(COMPACTOR_COMMANDS), tools: Object.values(COMPACTOR_TOOLS) });
-
     ctx.ui.notify("🗜️  Compactor ready", "info");
   });
 
@@ -235,7 +182,6 @@ export default function compactorExtension(pi: ExtensionAPI): void {
     const cwd = (ctx as any).cwd ?? process.cwd();
     config = loadConfig(cwd);
     currentSessionId = `${(ctx as any).sessionId ?? "default"}${getWorktreeSuffix()}`;
-    debug("before_agent_start", { sessionId: currentSessionId, configDebug: config.debug });
 
     // Evaluate autoDetect conditions for strategies
     try {
@@ -248,7 +194,6 @@ export default function compactorExtension(pi: ExtensionAPI): void {
         if ((strat as any).autoDetect === "git") {
           const gitDir = join(cwd, ".git");
           if (!existsSync(gitDir)) {
-            debug("autoDetect_disable", { strategy: key, reason: "no .git dir" });
             // Non-destructive: temporarily disable at runtime, don't modify config file
             strat.enabled = false;
           }
@@ -280,12 +225,18 @@ export default function compactorExtension(pi: ExtensionAPI): void {
     const continuityEnabled = isSessionContinuityEnabled(config);
     if (sessionDB && continuityEnabled) {
       const resumeContext = await buildResumeContextMessage(sessionDB, currentSessionId);
-      debug("resume_snapshot", { injected: !!resumeContext });
       return resumeContext;
     }
   });
 
-  pi.on("turn_end", async (_event, ctx) => {
+  // Trigger percentage auto-compaction at agent_end, NOT turn_end.
+  // Pi's ctx.compact() aborts the active agent operation first
+  // (AgentSession.compact() -> await this.abort()). turn_end fires between
+  // turns of a still-running agent loop, so compacting there kills the next
+  // in-flight provider request ("This operation was aborted" stopReason=error
+  // turns). agent_end fires only after the run has fully settled, matching
+  // Pi core's own native auto-compaction check point ("checked on agent_end").
+  pi.on("agent_end", async (_event, ctx) => {
     const cwd = (ctx as any).cwd ?? process.cwd();
     config = loadConfig(cwd);
 
@@ -297,23 +248,12 @@ export default function compactorExtension(pi: ExtensionAPI): void {
     });
     autoCompactionState = decision.state;
 
-    debug("auto_compaction_decision", {
-      enabled: config.autoCompaction.enabled,
-      reason: decision.reason,
-      shouldTrigger: decision.shouldTrigger,
-      percent: decision.usage?.percent,
-      tokens: decision.usage?.tokens,
-      thresholdPercent: decision.thresholdPercent,
-      cooldownRemainingMs: decision.cooldownRemainingMs,
-      tokenGrowth: decision.tokenGrowth,
-    });
-
     if (!decision.shouldTrigger) return;
 
     const notify = config.autoCompaction.notify;
     if (notify && decision.usage) {
       ctx.ui.notify(
-        `Auto-compacting at ${decision.usage.percent.toFixed(1)}% context (~${formatTokenCount(decision.usage.tokens)} tokens; threshold ${decision.thresholdPercent}%).`,
+        `Auto-compacting at ${decision.usage.percent.toFixed(1)}% context (~${formatTokens(decision.usage.tokens)} tokens; threshold ${decision.thresholdPercent}%).`,
         "info",
       );
     }
@@ -351,7 +291,6 @@ export default function compactorExtension(pi: ExtensionAPI): void {
       const sessionId = currentSessionId;
       const events = sessionDB.getEvents(sessionId, { limit: 1000 });
       const stats = sessionDB.getSessionStats(sessionId);
-      debug("session_before_compact", { sessionId, eventCount: events.length, compactCount: stats?.compact_count ?? 0 });
       const { buildResumeSnapshot } = await import("./session/snapshot.js");
       const snapshot = buildResumeSnapshot(events, {
         compactCount: stats?.compact_count ?? 1,
@@ -419,12 +358,10 @@ export default function compactorExtension(pi: ExtensionAPI): void {
         tokensSaved,
         compressionRatio: kept > 0 ? `${Math.round(totalEstimated / kept)}:1` : "0:1",
       });
-      debug("session_compact", { sessionId, tokensBefore, hasCompactionEntry: !!compactionEntry });
     }
   });
 
   pi.on("session_shutdown", async (_event, _ctx) => {
-    debug("session_shutdown");
     if (sessionDB) {
       sessionDB.cleanupOldSessions(7);
     }
@@ -435,7 +372,6 @@ export default function compactorExtension(pi: ExtensionAPI): void {
   pi.on("input", async (event, _ctx) => {
     const toolName = (event as any).toolName ?? "";
     const args = (event as any).args ?? {};
-    debug("input", { toolName, args: JSON.stringify(args).slice(0, 200) });
 
     // Existing network tool guard
     if (toolName === "bash" || toolName === "Bash") {
@@ -447,7 +383,7 @@ export default function compactorExtension(pi: ExtensionAPI): void {
 
     // Security scanner/evaluator wiring (fail-open pattern)
     try {
-      const { evaluateCommand, evaluateFilePath, loadProjectPermissions } = await import("./security/evaluator.js");
+      const { evaluateCommand, evaluateFilePath } = await import("./security/evaluator.js");
       const { hasShellEscapes, scanForShellEscapes } = await import("./security/scanner.js");
       const { readsOrCreatesPolicy } = await import("./security/policy.js");
 
@@ -461,7 +397,6 @@ export default function compactorExtension(pi: ExtensionAPI): void {
         if (cmd) {
           const decision = evaluateCommand(cmd, denyPolicy);
           if (decision === "deny") {
-            debug("security_deny", { toolName, cmd: cmd.slice(0, 100) });
             return {
               content: [{ type: "text", text: `Command blocked by security policy: ${cmd.slice(0, 80)}` }],
               isError: true,
@@ -478,7 +413,6 @@ export default function compactorExtension(pi: ExtensionAPI): void {
         if (language && language !== "shell" && code) {
           if (hasShellEscapes(code, language)) {
             const findings = scanForShellEscapes(code, language);
-            debug("security_shell_escapes", { toolName, language, findings });
             // Fail-open: log but don't block (the hooks system is enforcement)
           }
         }
@@ -491,14 +425,12 @@ export default function compactorExtension(pi: ExtensionAPI): void {
         if (filePath) {
           const decision = evaluateFilePath(filePath, denyPolicy, cwd);
           if (decision === "deny") {
-            debug("security_deny_file", { toolName, filePath });
             // Non-fatal: log warning but allow through (fail-open)
           }
         }
       }
     } catch (err) {
       // Fail-open: security checks are advisory, never block on errors
-      debug("security_check_error", { error: String(err) });
     }
 
     return undefined;
@@ -511,8 +443,6 @@ export default function compactorExtension(pi: ExtensionAPI): void {
     const toolNameRaw = (event as any).toolName ?? "";
     const isError = (event as any).isError ?? false;
 
-    debug("tool_result", { toolName: toolNameRaw, isError, sessionId });
-
     // Extract and store session events
     const toolEvents = extractEventsFromToolResult({
       toolName: (event as any).toolName ?? "",
@@ -523,22 +453,6 @@ export default function compactorExtension(pi: ExtensionAPI): void {
 
     for (const ev of toolEvents) {
       sessionDB.insertEvent(sessionId, ev, "PostToolUse");
-      debug("event_stored", { category: ev.category, type: ev.type });
-    }
-
-    // Track byte consumption per tool for analytics
-    try {
-      const responseBytes = measureResponseBytes(event);
-      if (responseBytes > 0) {
-        const tName = (event as any).toolName ?? "unknown";
-        runtimeStats.calls[tName] = (runtimeStats.calls[tName] || 0) + 1;
-        runtimeStats.bytesReturned[tName] = (runtimeStats.bytesReturned[tName] || 0) + responseBytes;
-        if (isSandboxTool(tName)) {
-          runtimeStats.bytesSandboxed += responseBytes;
-        }
-      }
-    } catch {
-      // Non-blocking: byte tracking errors silently skipped
     }
 
     const toolName = (event as any).toolName ?? "";
@@ -558,36 +472,12 @@ export default function compactorExtension(pi: ExtensionAPI): void {
           );
           const clamped = clampDiffToWidth(details.diff);
           if (clamped !== details.diff) {
-            debug("diff_width_clamped", { toolName });
             return { details: { ...details, diff: clamped } } as any;
           }
         }
       } catch (err) {
-        debug("diff_width_clamp_error", { error: String(err) });
       }
     }
   });
 
-  pi.on("message_update", async (event, _ctx) => {
-    const msg = (event as any).message;
-    if (msg?.thinking) {
-      debug("message_update", { thinking: true, length: String(msg.thinking).length });
-    }
-  });
-
-  pi.on("message_end", async (_event, _ctx) => {
-    debug("message_end");
-  });
-
-  pi.on("context", async (event, _ctx) => {
-    const { sanitizeThinkingArtifacts } = await import("./display/thinking-label.js");
-    const ctxStr = (event as any).context;
-    if (typeof ctxStr === "string") {
-      const sanitized = sanitizeThinkingArtifacts(ctxStr);
-      if (sanitized !== ctxStr) {
-        debug("context", { sanitized: true, beforeLen: ctxStr.length, afterLen: sanitized.length });
-      }
-      (event as any).context = sanitized;
-    }
-  });
 }

package/src/info-screen.ts

@@ -1,3 +1,4 @@
+import { formatTokens } from "@pi-unipi/core";
 /**
  * Info-screen integration for @pi-unipi/compactor
  *
@@ -11,7 +12,7 @@
  */
 
 import type { SessionDB } from "./session/db.js";
-import { getLastCompactionStats } from "./compaction/hooks.js";
+import { getLastCompactionStats, formatCompactionStats } from "./compaction/hooks.js";
 import { parseUsageStatsAsync } from "@pi-unipi/info-screen/usage-parser.js";
 import type { RuntimeCounters } from "./types.js";
 
@@ -25,14 +26,6 @@ export interface CompactorInfoData {
 }
 
 /** Format token count for display (e.g., "12.4k", "1.2M"). */
-function formatTokens(n: number): string {
-  if (n < 1000) return String(n);
-  if (n < 10_000) return `${(n / 1000).toFixed(1)}k`;
-  if (n < 1_000_000) return `${Math.round(n / 1000)}k`;
-  if (n < 10_000_000) return `${(n / 1_000_000).toFixed(1)}M`;
-  return `${Math.round(n / 1_000_000)}M`;
-}
-
 /** Format cost for display (e.g., "$0.34", "<$0.01"). */
 function formatCost(n: number): string {
   if (n === 0) return "$0.00";
@@ -184,7 +177,7 @@ export async function getInfoScreenData(
       compactions: {
         value: String(compactionCount),
         detail: compactStats
-          ? `Last: ${compactStats.totalMessages} messages (~${formatTokens(compactStats.tokensBefore)} tokens) → ${compactStats.kept} messages (~${formatTokens(compactStats.tokensAfterEst)} tokens)`
+          ? `Last: ${formatCompactionStats(compactStats)}`
           : compactionCount > 0
             ? `${compactionCount} compaction(s) across all sessions`
             : "No compactions yet",

package/src/security/evaluator.ts

@@ -14,28 +14,6 @@ import { parseBashPattern, parseToolPattern, globToRegex, fileGlobToRegex } from
  * Load permission patterns from .pi/settings.json in the given directory.
  * Returns a SecurityPolicy merged with the provided policy.
  */
-export function loadProjectPermissions(
-  cwd: string,
-  basePolicy: SecurityPolicy,
-): SecurityPolicy {
-  const settingsPath = join(cwd, ".pi", "settings.json");
-  if (!existsSync(settingsPath)) return basePolicy;
-
-  try {
-    const raw = readFileSync(settingsPath, "utf-8");
-    const settings = JSON.parse(raw);
-    const permissions = settings.permissions ?? settings.security ?? {};
-
-    return {
-      deny: [...basePolicy.deny, ...(permissions.deny ?? [])],
-      ask: [...basePolicy.ask, ...(permissions.ask ?? [])],
-      allow: [...basePolicy.allow, ...(permissions.allow ?? [])],
-    };
-  } catch {
-    return basePolicy;
-  }
-}
-
 export function evaluateCommand(
   command: string,
   policy: SecurityPolicy,
@@ -73,37 +51,6 @@ export function evaluateCommand(
   return "allow";
 }
 
-export function splitChainedCommands(command: string): string[] {
-  const commands: string[] = [];
-  let current = "";
-  let inQuotes = false;
-  let quoteChar = "";
-
-  for (let i = 0; i < command.length; i++) {
-    const char = command[i];
-
-    if (!inQuotes && (char === '"' || char === "'" || char === "`")) {
-      inQuotes = true;
-      quoteChar = char;
-      current += char;
-    } else if (inQuotes && char === quoteChar) {
-      inQuotes = false;
-      quoteChar = "";
-      current += char;
-    } else if (!inQuotes && (char === "&" || char === "|" || char === ";")) {
-      if (current.trim()) commands.push(current.trim());
-      current = "";
-      // Skip the next char if it's part of && or ||
-      if ((char === "&" || char === "|") && command[i + 1] === char) i++;
-    } else {
-      current += char;
-    }
-  }
-
-  if (current.trim()) commands.push(current.trim());
-  return commands;
-}
-
 export function evaluateFilePath(
   filePath: string,
   policy: SecurityPolicy,

package/src/security/policy.ts

@@ -23,14 +23,13 @@ export function parseToolPattern(pattern: string): { tool: string; glob: string
   return match ? { tool: match[1], glob: match[2] } : null;
 }
 
-function escapeRegex(str: string): string {
-  return str.replace(/[.*+?^${}()|[\]\\/\-]/g, "\\$&");
-}
-
 function convertGlobPart(glob: string): string {
+  // Replace wildcards FIRST, then escape the literal remainder — escaping first
+  // would turn `*` into `\*` and the wildcard replace would never fire.
   return glob
-    .replace(/[.+?^${}()|[\]\\/\-]/g, "\\$&")
-    .replace(/\*/g, ".*");
+    .split("*")
+    .map((part) => RegExp.escape(part))
+    .join(".*");
 }
 
 export function globToRegex(glob: string, caseInsensitive: boolean = false): RegExp {
@@ -39,7 +38,7 @@ export function globToRegex(glob: string, caseInsensitive: boolean = false): Reg
   if (colonIdx !== -1) {
     const command = glob.slice(0, colonIdx);
     const argsGlob = glob.slice(colonIdx + 1);
-    const escapedCmd = escapeRegex(command);
+    const escapedCmd = RegExp.escape(command);
     const argsRegex = convertGlobPart(argsGlob);
     regexStr = `^${escapedCmd}(\\s${argsRegex})?$`;
   } else {
@@ -68,7 +67,7 @@ export function fileGlobToRegex(glob: string, caseInsensitive: boolean = false):
       regexStr += "[^/]";
       i++;
     } else {
-      regexStr += escapeRegex(glob[i]);
+      regexStr += RegExp.escape(glob[i]);
       i++;
     }
   }

package/src/session/db.ts

@@ -191,7 +191,6 @@ export class SessionDB {
     p("addCompactionStats", `UPDATE session_meta SET total_chars_before = total_chars_before + ?, total_chars_kept = total_chars_kept + ?, total_messages_summarized = total_messages_summarized + ? WHERE session_id = ?`);
     p("getAllTimeStats", `SELECT COALESCE(SUM(total_chars_before), 0) AS all_chars_before, COALESCE(SUM(total_chars_kept), 0) AS all_chars_kept, COALESCE(SUM(total_messages_summarized), 0) AS all_messages_summarized, COALESCE(SUM(compact_count), 0) AS all_compactions, COALESCE(SUM(sandbox_runs), 0) AS all_sandbox_runs, COALESCE(SUM(search_queries), 0) AS all_search_queries FROM session_meta`);
     p("incrementSandboxRuns", `UPDATE session_meta SET sandbox_runs = sandbox_runs + 1 WHERE session_id = ?`);
-    p("incrementSearchQueries", `UPDATE session_meta SET search_queries = search_queries + 1 WHERE session_id = ?`);
     p("upsertResume", `INSERT INTO session_resume (session_id, snapshot, event_count) VALUES (?, ?, ?) ON CONFLICT(session_id) DO UPDATE SET snapshot = excluded.snapshot, event_count = excluded.event_count, created_at = datetime('now'), consumed = 0`);
     p("getResume", `SELECT snapshot, event_count, consumed FROM session_resume WHERE session_id = ?`);
     p("markResumeConsumed", `UPDATE session_resume SET consumed = 1 WHERE session_id = ?`);
@@ -283,11 +282,6 @@ export class SessionDB {
     this.stmt("incrementSandboxRuns").run(sessionId);
   }
 
-  incrementSearchQueries(sessionId: string): void {
-    if (!this.stmts) return;
-    this.stmt("incrementSearchQueries").run(sessionId);
-  }
-
   upsertResume(sessionId: string, snapshot: string, eventCount?: number): void {
     if (!this.stmts) return;
     this.stmt("upsertResume").run(sessionId, snapshot, eventCount ?? 0);

package/src/tools/ctx-execute-file.ts

@@ -4,7 +4,6 @@
 
 import { PolyglotExecutor } from "../executor/executor.js";
 import type { Language, ExecResult } from "../types.js";
-import { readFileSync } from "node:fs";
 
 export interface CtxExecuteFileInput {
   language: Language;
@@ -16,13 +15,9 @@ export async function ctxExecuteFile(
   input: CtxExecuteFileInput,
   executor = new PolyglotExecutor(),
 ): Promise<ExecResult> {
-  const content = readFileSync(input.path, "utf-8");
-  const code = `const FILE_CONTENT = ${JSON.stringify(content)};\n// User script follows:\n`;
-  
   return executor.executeFile({
     language: input.language,
     path: input.path,
-    code,
     timeout: input.timeout ?? 30000,
   });
 }