@cjhyy/code-shell 0.1.0-alpha.3 → 0.1.6

package/dist/{chunk-GZBD6QRS.cjs → chunk-7EG3V4JY.cjs}

@@ -2,16 +2,16 @@
 
 
 
-var _chunkEL2RL5DGcjs = require('./chunk-EL2RL5DG.cjs');
+var _chunk2YW4FPFGcjs = require('./chunk-2YW4FPFG.cjs');
 
 
-var _chunkJHNCK7JPcjs = require('./chunk-JHNCK7JP.cjs');
+var _chunkIK4EWJBPcjs = require('./chunk-IK4EWJBP.cjs');
 
 
-var _chunkIJSHQGMPcjs = require('./chunk-IJSHQGMP.cjs');
+var _chunkKS3RYAYLcjs = require('./chunk-KS3RYAYL.cjs');
 
 // src/llm/client-base.ts
-_chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
+_chunkKS3RYAYLcjs.init_cjs_shims.call(void 0, );
 var LLMClientBase = (_class = class _LLMClientBase {
   constructor(config) {;_class.prototype.__init.call(this);
     this.config = config;
@@ -45,13 +45,14 @@ var LLMClientBase = (_class = class _LLMClientBase {
     totalTokens: 0,
     requestCount: 0
   }}
-  recordUsage(usage) {
+  recordUsage(usage, options) {
+    if (_optionalChain([options, 'optionalAccess', _ => _.recordUsage]) === false) return;
     this.usage.records.push(usage);
     this.usage.totalPromptTokens += usage.promptTokens;
     this.usage.totalCompletionTokens += usage.completionTokens;
     this.usage.totalTokens += usage.totalTokens;
     this.usage.requestCount++;
-    _optionalChain([_LLMClientBase, 'access', _ => _.onUsage, 'optionalCall', _2 => _2(this.model, usage)]);
+    _optionalChain([_LLMClientBase, 'access', _2 => _2.onUsage, 'optionalCall', _3 => _3(this.model, usage)]);
   }
   getUsage() {
     return { ...this.usage };
@@ -64,10 +65,10 @@ var LLMClientBase = (_class = class _LLMClientBase {
         return await fn();
       } catch (err) {
         lastError = err;
-        if (err instanceof _chunkEL2RL5DGcjs.ContextLimitError) throw err;
-        if (err instanceof _chunkEL2RL5DGcjs.LLMRateLimitError) {
+        if (err instanceof _chunk2YW4FPFGcjs.ContextLimitError) throw err;
+        if (err instanceof _chunk2YW4FPFGcjs.LLMRateLimitError) {
           const waitMs = (_nullishCoalesce(err.retryAfter, () => ( attempt * 2))) * 1e3;
-          _chunkJHNCK7JPcjs.logger.warn("llm.retry", {
+          _chunkIK4EWJBPcjs.logger.warn("llm.retry", {
             cat: "llm",
             provider: this.provider,
             model: this.model,
@@ -80,7 +81,7 @@ var LLMClientBase = (_class = class _LLMClientBase {
           continue;
         }
         if (attempt === attempts) {
-          _chunkJHNCK7JPcjs.logger.error("llm.exhausted", {
+          _chunkIK4EWJBPcjs.logger.error("llm.exhausted", {
             cat: "llm",
             provider: this.provider,
             model: this.model,
@@ -90,7 +91,7 @@ var LLMClientBase = (_class = class _LLMClientBase {
           break;
         }
         const backoff = Math.min(1e3 * Math.pow(2, attempt - 1), 3e4);
-        _chunkJHNCK7JPcjs.logger.warn("llm.retry", {
+        _chunkIK4EWJBPcjs.logger.warn("llm.retry", {
           cat: "llm",
           provider: this.provider,
           model: this.model,
@@ -103,7 +104,7 @@ var LLMClientBase = (_class = class _LLMClientBase {
         await new Promise((r) => setTimeout(r, backoff));
       }
     }
-    throw _nullishCoalesce(lastError, () => ( new (0, _chunkEL2RL5DGcjs.LLMError)("Unknown LLM error")));
+    throw _nullishCoalesce(lastError, () => ( new (0, _chunk2YW4FPFGcjs.LLMError)("Unknown LLM error")));
   }
 }, _class);
 

package/dist/{chunk-LMEKCQX4.js → chunk-7JVTYEEC.js}

@@ -1,17 +1,17 @@
 import {
   LLMClientBase
-} from "./chunk-SCDKLTN3.js";
+} from "./chunk-6S4BJ65N.js";
 import {
   ContextLimitError,
   LLMError,
   LLMRateLimitError
-} from "./chunk-FUOKLKR2.js";
+} from "./chunk-SFXHZSRF.js";
 import {
   logger
-} from "./chunk-ZRVPCXI7.js";
+} from "./chunk-BXCY2FSE.js";
 import {
   init_esm_shims
-} from "./chunk-DI7RDLOS.js";
+} from "./chunk-MD32R22I.js";
 
 // src/llm/providers/openai.ts
 init_esm_shims();
@@ -80,7 +80,7 @@ var OpenAIClient = class extends LLMClientBase {
         completionTokens: response.usage?.completion_tokens ?? 0,
         totalTokens: response.usage?.total_tokens ?? 0
       };
-      this.recordUsage(usage);
+      this.recordUsage(usage, options);
       return this.processChoice(choice, usage);
     } catch (err) {
       this.handleApiError(err);
@@ -176,7 +176,7 @@ var OpenAIClient = class extends LLMClientBase {
         completionTokens: streamUsage?.completion_tokens ?? 0,
         totalTokens: streamUsage?.total_tokens ?? 0
       };
-      this.recordUsage(usage);
+      this.recordUsage(usage, options);
       return {
         text,
         toolCalls,

package/dist/{chunk-SW3L7HIM.js → chunk-7QIM3BKD.js}

@@ -1,10 +1,10 @@
 import {
   FileRunStore,
   RunManager
-} from "./chunk-ID6EJUHP.js";
+} from "./chunk-PKGRTCCY.js";
 import {
   init_esm_shims
-} from "./chunk-DI7RDLOS.js";
+} from "./chunk-MD32R22I.js";
 
 // src/run/index.ts
 init_esm_shims();

package/dist/{chunk-5C5HIOML.js → chunk-7Y6S3OCX.js}

@@ -2,7 +2,7 @@ import {
   __esm,
   __export,
   init_esm_shims
-} from "./chunk-DI7RDLOS.js";
+} from "./chunk-MD32R22I.js";
 
 // src/context/token-counter.ts
 function estimateStringTokens(text) {
@@ -70,6 +70,7 @@ var init_token_counter = __esm({
 // src/context/compaction.ts
 var compaction_exports = {};
 __export(compaction_exports, {
+  COMPACTABLE_TOOL_NAMES: () => COMPACTABLE_TOOL_NAMES,
   adjustIndexToPreserveAPIInvariants: () => adjustIndexToPreserveAPIInvariants,
   applySummaryCompaction: () => applySummaryCompaction,
   applyToolResultBudget: () => applyToolResultBudget,
@@ -143,35 +144,108 @@ function windowCompact(messages, keepLastN) {
   if (startIndex <= 1) return messages;
   return [messages[0], ...messages.slice(startIndex)];
 }
-function microcompact(messages, keepRecentN = 3) {
-  let toolResultCount = 0;
-  const indices = [];
+function buildToolUseIdToNameMap(messages) {
+  const map = /* @__PURE__ */ new Map();
+  for (const msg of messages) {
+    if (!Array.isArray(msg.content)) continue;
+    for (const block of msg.content) {
+      if (block.type === "tool_use" && block.id && block.name) {
+        map.set(block.id, block.name);
+      }
+    }
+  }
+  return map;
+}
+function summarizeToolCallArgs(toolName, input) {
+  if (!input || typeof input !== "object") return "";
+  const pick = (keys) => {
+    const parts = [];
+    for (const key of keys) {
+      const v = input[key];
+      if (typeof v === "string" && v.length > 0) {
+        parts.push(`${key}=${v.length > 80 ? v.slice(0, 77) + "..." : v}`);
+      }
+    }
+    return parts.join(" ");
+  };
+  switch (toolName) {
+    case "Read":
+    case "Write":
+    case "Edit":
+    case "NotebookEdit":
+      return pick(["file_path", "path", "notebook_path"]);
+    case "Glob":
+    case "Grep":
+      return pick(["pattern", "path", "glob"]);
+    case "Bash":
+    case "PowerShell":
+    case "REPL":
+      return pick(["command"]);
+    case "WebFetch":
+    case "WebSearch":
+      return pick(["url", "query"]);
+    default: {
+      const json = JSON.stringify(input);
+      return json.length > 100 ? json.slice(0, 97) + "..." : json;
+    }
+  }
+}
+function microcompact(messages, options = {}) {
+  const keepRecentN = options.keepRecentN ?? 5;
+  const compactable = options.compactableTools ?? COMPACTABLE_TOOL_NAMES;
+  const idToName = buildToolUseIdToNameMap(messages);
+  const idToInput = /* @__PURE__ */ new Map();
+  for (const msg of messages) {
+    if (!Array.isArray(msg.content)) continue;
+    for (const block of msg.content) {
+      if (block.type === "tool_use" && block.id) {
+        idToInput.set(block.id, block.input);
+      }
+    }
+  }
+  let compactableRoundCount = 0;
+  const indicesToTouch = [];
   for (let i = messages.length - 1; i >= 0; i--) {
     const msg = messages[i];
-    if (Array.isArray(msg.content)) {
-      const hasToolResult = msg.content.some((b) => b.type === "tool_result");
-      if (hasToolResult) {
-        toolResultCount++;
-        if (toolResultCount > keepRecentN) {
-          indices.push(i);
-        }
-      }
+    if (!Array.isArray(msg.content)) continue;
+    const hasEligible = msg.content.some(
+      (b) => b.type === "tool_result" && b.tool_use_id != null && compactable.has(idToName.get(b.tool_use_id) ?? "") && typeof b.content === "string" && !b.content.startsWith("[Old tool result cleared")
+    );
+    if (!hasEligible) continue;
+    compactableRoundCount++;
+    if (compactableRoundCount > keepRecentN) {
+      indicesToTouch.push(i);
     }
   }
-  if (indices.length === 0) return messages;
-  return messages.map((msg, i) => {
-    if (!indices.includes(i)) return msg;
-    if (!Array.isArray(msg.content)) return msg;
+  if (indicesToTouch.length === 0) return messages;
+  const touchSet = new Set(indicesToTouch);
+  const clearedToolNames = /* @__PURE__ */ new Set();
+  let clearedBlocks = 0;
+  const result = messages.map((msg, i) => {
+    if (!touchSet.has(i) || !Array.isArray(msg.content)) return msg;
     return {
       ...msg,
       content: msg.content.map((block) => {
-        if (block.type === "tool_result") {
-          return { ...block, content: "[Old tool result content cleared]" };
-        }
-        return block;
+        if (block.type !== "tool_result" || !block.tool_use_id) return block;
+        const toolName = idToName.get(block.tool_use_id);
+        if (!toolName || !compactable.has(toolName)) return block;
+        if (typeof block.content !== "string") return block;
+        if (block.content.startsWith("[Old tool result cleared")) return block;
+        const argsSummary = summarizeToolCallArgs(toolName, idToInput.get(block.tool_use_id));
+        const fingerprint = argsSummary ? `[Old tool result cleared \u2014 ${toolName} ${argsSummary}]` : `[Old tool result cleared \u2014 ${toolName}]`;
+        clearedToolNames.add(toolName);
+        clearedBlocks++;
+        return { ...block, content: fingerprint };
       })
     };
   });
+  if (clearedBlocks > 0) {
+    options.onClear?.({
+      clearedRounds: indicesToTouch.length,
+      toolNames: [...clearedToolNames].sort()
+    });
+  }
+  return result;
 }
 function applyToolResultBudget(messages, maxTotalChars = 1e5) {
   return messages.map((msg) => {
@@ -200,9 +274,10 @@ function applyToolResultBudget(messages, maxTotalChars = 1e5) {
     const newContent = msg.content.map((block, i) => {
       if (!toTruncate.has(i)) return block;
       const preview = typeof block.content === "string" ? block.content.slice(0, 500) : "";
+      const sizeKb = (block.content.length / 1e3).toFixed(0);
       return {
         ...block,
-        content: `Output too large (${(block.content.length / 1e3).toFixed(0)}KB). Full output saved to session transcript. Use Read tool to view the source file if needed.
+        content: `Output too large (${sizeKb}KB) \u2014 truncated to fit the per-message budget. Re-run the originating tool if you need the full output.
 
 Preview (first 500 chars):
 ${preview}`
@@ -325,10 +400,22 @@ function extractReferencedFilePaths(messages) {
   }
   return [...paths];
 }
+var COMPACTABLE_TOOL_NAMES;
 var init_compaction = __esm({
   "src/context/compaction.ts"() {
     init_esm_shims();
     init_token_counter();
+    COMPACTABLE_TOOL_NAMES = /* @__PURE__ */ new Set([
+      "Read",
+      "Glob",
+      "Grep",
+      "Bash",
+      "PowerShell",
+      "NotebookEdit",
+      "WebFetch",
+      "WebSearch",
+      "REPL"
+    ]);
   }
 });
 
@@ -337,6 +424,7 @@ export {
   adjustIndexToPreserveAPIInvariants,
   snipCompact,
   windowCompact,
+  COMPACTABLE_TOOL_NAMES,
   microcompact,
   applyToolResultBudget,
   truncateToolResult,

package/dist/{chunk-REFCCVDM.js → chunk-ABRRONJ7.js}

@@ -4,10 +4,10 @@ import {
   NoopEvaluator,
   RunManager,
   registerPreset
-} from "./chunk-ID6EJUHP.js";
+} from "./chunk-PKGRTCCY.js";
 import {
   init_esm_shims
-} from "./chunk-DI7RDLOS.js";
+} from "./chunk-MD32R22I.js";
 
 // src/product/index.ts
 init_esm_shims();

package/dist/{chunk-F5BS3GUC.js → chunk-BSW22MPA.js}

@@ -1,6 +1,9 @@
+import {
+  readCache
+} from "./chunk-3OA5G4TM.js";
 import {
   init_esm_shims
-} from "./chunk-DI7RDLOS.js";
+} from "./chunk-MD32R22I.js";
 
 // src/llm/model-pool.ts
 init_esm_shims();
@@ -18,6 +21,32 @@ function lookupBuiltinContextWindow(model) {
 var ModelPool = class {
   models = /* @__PURE__ */ new Map();
   activeKey;
+  providerCatalog;
+  cacheDir;
+  setProviderCatalog(cat) {
+    this.providerCatalog = cat;
+  }
+  setCacheDir(dir) {
+    this.cacheDir = dir;
+  }
+  /**
+   * For each entry in the pool that lacks an explicit maxContextTokens
+   * but has a providerKey, look up the contextLength from the cached
+   * model list and patch it in.
+   */
+  reloadCachedContextWindows() {
+    if (!this.cacheDir) return;
+    for (const [key, entry] of this.models) {
+      if (entry.maxContextTokens != null) continue;
+      if (!entry.providerKey) continue;
+      const file = readCache(this.cacheDir, entry.providerKey);
+      if (!file) continue;
+      const match = file.models.find((m) => m.id === entry.model);
+      if (match?.contextLength) {
+        this.models.set(key, { ...entry, maxContextTokens: match.contextLength });
+      }
+    }
+  }
   /**
    * Build a pool from an array of model entries.
    * The first entry (or the one matching `defaultKey`) becomes active.
@@ -85,11 +114,17 @@ var ModelPool = class {
    * (inherits apiKey, baseUrl, etc. from the base if not set on the entry).
    */
   toLLMConfig(entry, base) {
+    const fromCat = entry.providerKey && this.providerCatalog ? this.providerCatalog.get(entry.providerKey) : void 0;
+    const kindToClientProvider = (kind) => {
+      if (!kind) return "openai";
+      if (kind === "anthropic") return "anthropic";
+      return "openai";
+    };
     return {
-      provider: entry.provider,
+      provider: entry.provider || kindToClientProvider(fromCat?.kind) || "openai",
       model: entry.model,
-      apiKey: entry.apiKey ?? base?.apiKey,
-      baseUrl: entry.baseUrl ?? base?.baseUrl,
+      apiKey: entry.apiKey ?? fromCat?.apiKey ?? base?.apiKey,
+      baseUrl: entry.baseUrl ?? fromCat?.baseUrl ?? base?.baseUrl,
       temperature: base?.temperature ?? 0.3,
       maxTokens: entry.maxOutputTokens ?? base?.maxTokens ?? 8192,
       enableStreaming: base?.enableStreaming ?? true

package/dist/{chunk-ZRVPCXI7.js → chunk-BXCY2FSE.js}

@@ -1,6 +1,6 @@
 import {
   init_esm_shims
-} from "./chunk-DI7RDLOS.js";
+} from "./chunk-MD32R22I.js";
 
 // src/logging/logger.ts
 init_esm_shims();
@@ -197,6 +197,7 @@ function rotateLogs() {
 }
 
 export {
+  getCurrentSid,
   logger,
   rotateLogs
 };