@cjhyy/code-shell 0.1.0-alpha.2 → 0.1.5

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-G76E5FOB.cjs → chunk-A5LCRPDP.cjs}

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkTATCTZSBcjs = require('./chunk-TATCTZSB.cjs');
+var _chunkQRM7IF2Scjs = require('./chunk-QRM7IF2S.cjs');
 
 
-var _chunkIJSHQGMPcjs = require('./chunk-IJSHQGMP.cjs');
+var _chunkKS3RYAYLcjs = require('./chunk-KS3RYAYL.cjs');
 
 // src/data/openrouter-sync.ts
-_chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
+_chunkKS3RYAYLcjs.init_cjs_shims.call(void 0, );
 var ENDPOINT = "https://openrouter.ai/api/v1/models";
 function priceToPerMillion(raw) {
   if (!raw) return 0;
@@ -37,7 +37,7 @@ async function syncOpenRouterCatalog(timeoutMs = 15e3) {
     const payload = await res.json();
     const raw = _nullishCoalesce(payload.data, () => ( []));
     const models = raw.map(slim).sort((a, b) => b.created - a.created);
-    _chunkTATCTZSBcjs.setOpenRouterSnapshot.call(void 0, {
+    _chunkQRM7IF2Scjs.setOpenRouterSnapshot.call(void 0, {
       fetchedAt: (/* @__PURE__ */ new Date()).toISOString(),
       source: ENDPOINT,
       count: models.length,

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