@cortexkit/aft 0.36.1 → 0.37.1

package/dist/index.js

@@ -104,6 +104,21 @@ var ACTIVE_LOGGER_SYMBOL;
 var init_active_logger = __esm(() => {
   ACTIVE_LOGGER_SYMBOL = Symbol.for("aft-bridge-active-logger");
 });
+// ../aft-bridge/dist/command-timeouts.js
+var LONG_RUNNING_COMMAND_TIMEOUT_MS;
+var init_command_timeouts = __esm(() => {
+  LONG_RUNNING_COMMAND_TIMEOUT_MS = {
+    callers: 60000,
+    trace_to: 60000,
+    trace_to_symbol: 60000,
+    trace_data: 60000,
+    impact: 60000,
+    grep: 60000,
+    glob: 60000,
+    semantic_search: 60000
+  };
+});
+
 // ../aft-bridge/dist/status-bar.js
 function parseStatusBarCounts(value) {
   if (!value || typeof value !== "object")
@@ -129,6 +144,18 @@ import { spawn } from "node:child_process";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { StringDecoder } from "node:string_decoder";
+function isTerminalBashStatus(status) {
+  return typeof status === "string" && TERMINAL_BASH_STATUSES.has(status);
+}
+function bashTaskIdFrom(response) {
+  const snakeCase = response.task_id;
+  if (typeof snakeCase === "string" && snakeCase.length > 0)
+    return snakeCase;
+  const camelCase = response.taskId;
+  if (typeof camelCase === "string" && camelCase.length > 0)
+    return camelCase;
+  return;
+}
 function tagStderrLine(line) {
   return /^\[aft(-\w+)?\] /.test(line) ? line : `[aft] ${line}`;
 }
@@ -183,11 +210,12 @@ function clampSemanticTimeout(configOverrides, bridgeTimeoutMs) {
   if (typeof timeoutMs !== "number" || !Number.isFinite(timeoutMs)) {
     return configOverrides;
   }
-  const maxSemanticTimeoutMs = bridgeTimeoutMs > SEMANTIC_TIMEOUT_SAFETY_MARGIN_MS ? bridgeTimeoutMs - SEMANTIC_TIMEOUT_SAFETY_MARGIN_MS : Math.max(1, bridgeTimeoutMs - 1);
+  const semanticTransportBudgetMs = Math.max(bridgeTimeoutMs, LONG_RUNNING_COMMAND_TIMEOUT_MS.semantic_search ?? 0);
+  const maxSemanticTimeoutMs = semanticTransportBudgetMs > SEMANTIC_TIMEOUT_SAFETY_MARGIN_MS ? semanticTransportBudgetMs - SEMANTIC_TIMEOUT_SAFETY_MARGIN_MS : Math.max(1, semanticTransportBudgetMs - 1);
   if (timeoutMs <= maxSemanticTimeoutMs) {
     return configOverrides;
   }
-  warn(`semantic.timeout_ms=${timeoutMs} exceeds bridge timeout budget; clamping to ${maxSemanticTimeoutMs}ms (bridge timeout: ${bridgeTimeoutMs}ms)`);
+  warn(`semantic.timeout_ms=${timeoutMs} exceeds the semantic transport budget; clamping to ${maxSemanticTimeoutMs}ms (budget: ${semanticTransportBudgetMs}ms)`);
   return {
     ...configOverrides,
     semantic: {
@@ -196,10 +224,20 @@ function clampSemanticTimeout(configOverrides, bridgeTimeoutMs) {
     }
   };
 }
-var DEFAULT_BRIDGE_TIMEOUT_MS = 30000, BRIDGE_HANG_TIMEOUT_THRESHOLD = 2, SEMANTIC_TIMEOUT_SAFETY_MARGIN_MS = 5000, MAX_STDOUT_BUFFER, BridgeReplacedDuringVersionCheck, BinaryBridge;
+var DEFAULT_BRIDGE_TIMEOUT_MS = 30000, BRIDGE_HANG_TIMEOUT_THRESHOLD = 2, SEMANTIC_TIMEOUT_SAFETY_MARGIN_MS = 5000, MAX_STDOUT_BUFFER, STDOUT_BUFFER_COMPACT_THRESHOLD, TERMINAL_BASH_STATUSES, BridgeReplacedDuringVersionCheck, BinaryBridge;
 var init_bridge = __esm(() => {
   init_active_logger();
+  init_command_timeouts();
   MAX_STDOUT_BUFFER = 64 * 1024 * 1024;
+  STDOUT_BUFFER_COMPACT_THRESHOLD = 64 * 1024;
+  TERMINAL_BASH_STATUSES = new Set([
+    "completed",
+    "failed",
+    "killed",
+    "timed_out",
+    "cancelled",
+    "timeout"
+  ]);
   BridgeReplacedDuringVersionCheck = class BridgeReplacedDuringVersionCheck extends Error {
     newBinaryPath;
     constructor(newBinaryPath) {
@@ -215,8 +253,10 @@ var init_bridge = __esm(() => {
     cwd;
     process = null;
     pending = new Map;
+    outstandingBackgroundTaskIds = new Set;
     nextId = 1;
     stdoutBuffer = "";
+    stdoutReadOffset = 0;
     stderrBuffer = "";
     stderrTail = [];
     _restartCount = 0;
@@ -326,6 +366,9 @@ var init_bridge = __esm(() => {
     hasPendingRequests() {
       return this.pending.size > 0;
     }
+    hasOutstandingBackgroundTasks() {
+      return this.outstandingBackgroundTaskIds.size > 0;
+    }
     getCwd() {
       return this.cwd;
     }
@@ -447,7 +490,7 @@ var init_bridge = __esm(() => {
             entry.reject(new Error(`${this.errorPrefix} Request "${command}" (id=${id}) timed out after ${effectiveTimeoutMs}ms`));
             this.handleTimeout(requestSessionId);
           }, effectiveTimeoutMs);
-          this.pending.set(id, { resolve, reject, timer, onProgress: options?.onProgress });
+          this.pending.set(id, { resolve, reject, timer, onProgress: options?.onProgress, command });
           if (!this.process?.stdin?.writable) {
             this.pending.delete(id);
             clearTimeout(timer);
@@ -708,6 +751,7 @@ var init_bridge = __esm(() => {
       });
       this.process = child;
       this.stdoutBuffer = "";
+      this.stdoutReadOffset = 0;
       this.stderrBuffer = "";
       this.lastChildActivityAt = 0;
       this.consecutiveRequestTimeouts = 0;
@@ -752,24 +796,41 @@ var init_bridge = __esm(() => {
   ${tail}`;
     }
     onStdoutData(data) {
+      if (this.stdoutReadOffset > STDOUT_BUFFER_COMPACT_THRESHOLD) {
+        this.compactStdoutBuffer();
+      }
       this.stdoutBuffer += data;
-      if (this.stdoutBuffer.length > MAX_STDOUT_BUFFER) {
+      if (this.stdoutBuffer.length - this.stdoutReadOffset > MAX_STDOUT_BUFFER) {
         this.handleCrash(new Error(`aft bridge stdout buffer exceeded ${MAX_STDOUT_BUFFER} bytes — killing bridge`));
         return;
       }
       let newlineIdx;
       while ((newlineIdx = this.stdoutBuffer.indexOf(`
-`)) !== -1) {
-        const line = this.stdoutBuffer.slice(0, newlineIdx).trim();
-        this.stdoutBuffer = this.stdoutBuffer.slice(newlineIdx + 1);
-        if (!line)
-          continue;
-        this.processStdoutLine(line);
+`, this.stdoutReadOffset)) !== -1) {
+        const line = this.stdoutBuffer.slice(this.stdoutReadOffset, newlineIdx).trim();
+        this.stdoutReadOffset = newlineIdx + 1;
+        if (line) {
+          this.processStdoutLine(line);
+        }
+        if (this.stdoutReadOffset > STDOUT_BUFFER_COMPACT_THRESHOLD && this.stdoutReadOffset > this.stdoutBuffer.length / 2) {
+          this.compactStdoutBuffer();
+        }
+      }
+      if (this.stdoutReadOffset === this.stdoutBuffer.length) {
+        this.stdoutBuffer = "";
+        this.stdoutReadOffset = 0;
       }
     }
+    compactStdoutBuffer() {
+      if (this.stdoutReadOffset === 0)
+        return;
+      this.stdoutBuffer = this.stdoutBuffer.slice(this.stdoutReadOffset);
+      this.stdoutReadOffset = 0;
+    }
     flushStdoutBuffer() {
-      const line = this.stdoutBuffer.trim();
+      const line = this.stdoutBuffer.slice(this.stdoutReadOffset).trim();
       this.stdoutBuffer = "";
+      this.stdoutReadOffset = 0;
       if (!line)
         return;
       this.processStdoutLine(line);
@@ -802,6 +863,9 @@ var init_bridge = __esm(() => {
           return;
         }
         if (response.type === "bash_completed") {
+          const taskId = bashTaskIdFrom(response);
+          if (taskId)
+            this.outstandingBackgroundTaskIds.delete(taskId);
           this.onBashCompletion?.(response, this);
           return;
         }
@@ -832,6 +896,7 @@ var init_bridge = __esm(() => {
           clearTimeout(entry.timer);
           this.consecutiveRequestTimeouts = 0;
           this.scheduleRestartCountReset();
+          this.accountForBashTaskResponse(entry.command, response);
           this.captureStatusBar(response);
           entry.resolve(response);
         } else if (typeof response.type === "string") {
@@ -841,6 +906,18 @@ var init_bridge = __esm(() => {
         this.warnVia(`Failed to parse stdout line: ${line}`);
       }
     }
+    accountForBashTaskResponse(command, response) {
+      const taskId = bashTaskIdFrom(response);
+      if (!taskId)
+        return;
+      if (isTerminalBashStatus(response.status)) {
+        this.outstandingBackgroundTaskIds.delete(taskId);
+        return;
+      }
+      if (command === "bash" && response.success !== false) {
+        this.outstandingBackgroundTaskIds.add(taskId);
+      }
+    }
     captureStatusBar(response) {
       const parsed = parseStatusBarCounts(response.status_bar);
       if (parsed)
@@ -852,6 +929,7 @@ var init_bridge = __esm(() => {
     handleTimeout(triggeringSessionId) {
       this.consecutiveRequestTimeouts = 0;
       this.rejectAllPending(new Error(`${this.errorPrefix} bridge killed during sibling timeout — request aborted`));
+      this.outstandingBackgroundTaskIds.clear();
       if (this.process) {
         this.process.kill("SIGKILL");
         this.process = null;
@@ -881,6 +959,7 @@ var init_bridge = __esm(() => {
       }
       this.clearRestartResetTimer();
       this.configured = false;
+      this.outstandingBackgroundTaskIds.clear();
       const tail = this.formatStderrTail();
       if (tail) {
         this.errorVia(`Binary crashed (restarts: ${this._restartCount})${cause ? `: ${cause.message}` : ""}.${tail}`);
@@ -1275,7 +1354,7 @@ class BridgePool {
   cleanup() {
     const now = Date.now();
     for (const [dir, entry] of this.bridges) {
-      if (entry.bridge.hasPendingRequests())
+      if (entry.bridge.hasPendingRequests() || entry.bridge.hasOutstandingBackgroundTasks())
         continue;
       if (now - entry.lastUsed > this.idleTimeoutMs) {
         entry.bridge.shutdown().catch((err) => this.error("cleanup shutdown failed:", err));
@@ -1283,7 +1362,7 @@ class BridgePool {
       }
     }
     for (const bridge of this.staleBridges) {
-      if (bridge.hasPendingRequests())
+      if (bridge.hasPendingRequests() || bridge.hasOutstandingBackgroundTasks())
         continue;
       bridge.shutdown().catch((err) => this.error("stale cleanup shutdown failed:", err));
       this.staleBridges.delete(bridge);
@@ -1293,7 +1372,7 @@ class BridgePool {
     let oldestDir = null;
     let oldestTime = Infinity;
     for (const [dir, entry] of this.bridges) {
-      if (entry.bridge.hasPendingRequests())
+      if (entry.bridge.hasPendingRequests() || entry.bridge.hasOutstandingBackgroundTasks())
         continue;
       if (entry.lastUsed < oldestTime) {
         oldestTime = entry.lastUsed;
@@ -1377,16 +1456,18 @@ function normalizeKey(projectRoot) {
     return stripped;
   }
 }
-var DEFAULT_IDLE_TIMEOUT_MS = Infinity, DEFAULT_MAX_POOL_SIZE = 8, CLEANUP_INTERVAL_MS;
+var DEFAULT_IDLE_TIMEOUT_MS, DEFAULT_MAX_POOL_SIZE = 8, CLEANUP_INTERVAL_MS;
 var init_pool = __esm(() => {
   init_active_logger();
   init_bridge();
+  DEFAULT_IDLE_TIMEOUT_MS = 30 * 60 * 1000;
   CLEANUP_INTERVAL_MS = 60 * 1000;
 });
 // ../aft-bridge/dist/index.js
 var init_dist = __esm(() => {
   init_active_logger();
   init_bridge();
+  init_command_timeouts();
   init_downloader();
   init_migration();
   init_npm_resolver();
@@ -9481,7 +9562,7 @@ function ensureAftSchemaUrl(path, format) {
     message: `updated $schema URL in ${path}`
   };
 }
-var import_comment_json, AFT_SCHEMA_URL = "https://raw.githubusercontent.com/cortexkit/aft/master/assets/aft.schema.json";
+var import_comment_json, AFT_SCHEMA_URL = "https://raw.githubusercontent.com/cortexkit/aft/main/assets/aft.schema.json";
 var init_jsonc = __esm(() => {
   import_comment_json = __toESM(require_src2(), 1);
 });
@@ -12591,8 +12672,9 @@ function sanitizeContent(content) {
   }
   sanitized = sanitized.replace(/\/Users\/[^/\s"']+/g, "/Users/<USER>");
   sanitized = sanitized.replace(/\/home\/[^/\s"']+/g, "/home/<USER>");
-  sanitized = sanitized.replace(/C:\\\\Users\\\\[^\\\\"'\s]+/g, "C:\\\\Users\\\\<USER>");
-  sanitized = sanitized.replace(/C:\\Users\\[^\\"'\s]+/g, "C:\\Users\\<USER>");
+  sanitized = sanitized.replace(/([A-Za-z]:\\\\Users\\\\)[^\\\\"'\s]+/g, "$1<USER>");
+  sanitized = sanitized.replace(/([A-Za-z]:\\Users\\)[^\\"'\s]+/g, "$1<USER>");
+  sanitized = sanitized.replace(/([A-Za-z]:\/Users\/)[^/\s"']+/g, "$1<USER>");
   if (username) {
     sanitized = sanitized.replace(new RegExp(escapeRegex(username), "g"), "<USER>");
   }

package/dist/lib/jsonc.d.ts

@@ -17,7 +17,7 @@ export declare function readJsoncFile(path: string): {
  */
 export declare function writeJsoncFile(path: string, value: Record<string, unknown>, format?: JsoncFormat): void;
 /** Canonical URL of the published AFT config schema. */
-export declare const AFT_SCHEMA_URL = "https://raw.githubusercontent.com/cortexkit/aft/master/assets/aft.schema.json";
+export declare const AFT_SCHEMA_URL = "https://raw.githubusercontent.com/cortexkit/aft/main/assets/aft.schema.json";
 export type AftSchemaAction = "added" | "updated" | "unchanged";
 /**
  * Ensure `aft.jsonc` (or `aft.json`) contains a top-level `$schema` field

package/dist/lib/jsonc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonc.d.ts","sourceRoot":"","sources":["../../src/lib/jsonc.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAEpD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,+EAA+E;AAC/E,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAW9E;AAED,8EAA8E;AAC9E,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG;IAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAcA;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,MAAM,GAAE,WAAoB,GAC3B,IAAI,CAKN;AAED,wDAAwD;AACxD,eAAO,MAAM,cAAc,kFACsD,CAAC;AAElF,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC;AAEhE;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,GAClB;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAoC9C"}
+{"version":3,"file":"jsonc.d.ts","sourceRoot":"","sources":["../../src/lib/jsonc.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAEpD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,+EAA+E;AAC/E,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAW9E;AAED,8EAA8E;AAC9E,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG;IAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAcA;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,MAAM,GAAE,WAAoB,GAC3B,IAAI,CAKN;AAED,wDAAwD;AACxD,eAAO,MAAM,cAAc,gFACoD,CAAC;AAEhF,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC;AAEhE;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,GAClB;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAoC9C"}

package/dist/lib/sanitize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../src/lib/sanitize.ts"],"names":[],"mappings":"AAGA,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjD;AAmFD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CA4BvD;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAarD"}
+{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../src/lib/sanitize.ts"],"names":[],"mappings":"AAGA,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjD;AAmFD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAkCvD;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAarD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft",
-  "version": "0.36.1",
+  "version": "0.37.1",
   "type": "module",
   "description": "Unified CLI for Agent File Tools (AFT) — setup, doctor, and diagnostics across supported agent harnesses (OpenCode, Pi)",
   "license": "MIT",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@cortexkit/aft-bridge": "0.36.1",
+    "@cortexkit/aft-bridge": "0.37.1",
     "comment-json": "^4.6.2"
   },
   "devDependencies": {