@botconnector/bccli 0.4.0-beta.43 → 0.4.0-beta.45

package/dist/cli.js

@@ -2,47 +2,63 @@
 import {
   resolveWorktree,
   runPrint
-} from "./chunk-TW5HZOTB.js";
+} from "./chunk-VQ4FJ7R2.js";
 import {
   createRuntime
-} from "./chunk-ZGH4B7OU.js";
-import "./chunk-U6PCNS4B.js";
-import "./chunk-PSRNKKGA.js";
-import "./chunk-NVRNFR4S.js";
+} from "./chunk-FNCDUDOB.js";
+import "./chunk-QZKLZELZ.js";
+import "./chunk-NJ5YDSSP.js";
+import "./chunk-JKRSZHDV.js";
 import "./chunk-PSO7R5AD.js";
 import {
   VERSION
-} from "./chunk-DUSVS3XK.js";
+} from "./chunk-7BQQYDPU.js";
 import {
   helpText,
   parseCliArgs
-} from "./chunk-CYTRCZXI.js";
+} from "./chunk-W2ME7AGN.js";
 import "./chunk-GAFJEQTJ.js";
-import "./chunk-2ON3WIDP.js";
-import "./chunk-25DSN3Y3.js";
+import "./chunk-X5ZJGTWY.js";
+import "./chunk-4BQAIMAM.js";
 import {
   readGlobalConfigFile
-} from "./chunk-VO6MF6JJ.js";
+} from "./chunk-F4XYLKG5.js";
 import {
   defaultLoginDeps,
   runLogin
-} from "./chunk-Y3QKYORR.js";
+} from "./chunk-IU7PB6US.js";
 import "./chunk-7F3IWBPQ.js";
 import {
   pruneSessions
-} from "./chunk-BQHKN7JI.js";
-import "./chunk-RMDW3OQ6.js";
-import "./chunk-ZKMSTD6G.js";
-import "./chunk-PZC2Q6MJ.js";
+} from "./chunk-IA35YV5K.js";
+import "./chunk-ERXWNEVU.js";
+import "./chunk-RFSNTLOW.js";
+import "./chunk-Q7DFEWE7.js";
 import {
   ConfigError,
   setTheme
-} from "./chunk-GIGWZFCY.js";
+} from "./chunk-FNGFR7R6.js";
 import {
   resolveLanguage,
   setLanguage,
   t
-} from "./chunk-QHNWI3OT.js";
+} from "./chunk-JZ5XPSIA.js";
+
+// src/exit.ts
+var EXIT_GRACE_MS = 1e3;
+function settleExit(code, deps) {
+  const d = {
+    setExitCode: (c) => {
+      process.exitCode = c;
+    },
+    exit: (c) => process.exit(c),
+    setTimer: (fn, ms) => setTimeout(fn, ms),
+    ...deps
+  };
+  d.setExitCode(code);
+  const force = d.setTimer(() => d.exit(code), EXIT_GRACE_MS);
+  force.unref();
+}
 
 // src/cli.ts
 function chooseLanguage(argv) {
@@ -68,17 +84,17 @@ async function main() {
   if (args.worktree) cwd = (await resolveWorktree(cwd, args.worktree)).path;
   if (args.command === "login") return runLogin(args.loginProvider ?? "bc-cloud", cwd, args, defaultLoginDeps());
   if (args.command === "mcp") {
-    const { runMcpCommand } = await import("./mcpCli-TXFS3AOJ.js");
-    const { readSecret } = await import("./login-LNF7ZV2S.js");
+    const { runMcpCommand } = await import("./mcpCli-SAJTQGI7.js");
+    const { readSecret } = await import("./login-4CIXDZZ7.js");
     return runMcpCommand(args, { env: process.env, cwd, out: (s) => console.log(s), err: (s) => console.error(s), readSecret });
   }
   if (args.command === "provider") {
-    const { runProviderCommand } = await import("./providerCli-AA3CHCGV.js");
-    const { readSecret } = await import("./login-LNF7ZV2S.js");
+    const { runProviderCommand } = await import("./providerCli-SEAZ5OLH.js");
+    const { readSecret } = await import("./login-4CIXDZZ7.js");
     return runProviderCommand(args, { env: process.env, cwd, out: (s) => console.log(s), err: (s) => console.error(s), readSecret });
   }
   if (args.command === "connect" || args.command === "disconnect" || args.command === "integrations") {
-    const { runIntegrationCommand } = await import("./integrationCli-33KU6GIK.js");
+    const { runIntegrationCommand } = await import("./integrationCli-L7OLA3DG.js");
     return runIntegrationCommand(args, {
       env: process.env,
       cwd,
@@ -88,20 +104,20 @@ async function main() {
     });
   }
   if (args.command === "models") {
-    const { runModelsCommand } = await import("./modelsCli-IZSMIYVB.js");
+    const { runModelsCommand } = await import("./modelsCli-L6VODTVW.js");
     return runModelsCommand(args, { env: process.env, cwd, out: (s) => console.log(s), err: (s) => console.error(s), fetch: globalThis.fetch });
   }
   if (args.command === "update") {
-    const { runUpdateCommand } = await import("./update-7SSREI2O.js");
+    const { runUpdateCommand } = await import("./update-REYFMT5X.js");
     return runUpdateCommand({ env: process.env });
   }
   if (args.command === "acp") {
-    const { runtimeAgent, runAcp } = await import("./acp-U25MNDND.js");
+    const { runtimeAgent, runAcp } = await import("./acp-QUDKQCTK.js");
     await runAcp(process.stdin, process.stdout, { cwd, newAgent: (c) => runtimeAgent(c) });
     return 0;
   }
   if (args.command === "serve") {
-    const { startServe } = await import("./serve-F7BYQ7X6.js");
+    const { startServe } = await import("./serve-ZBCAEE72.js");
     const handle = await startServe({ port: args.port, host: args.host, token: args.token, cwd, env: process.env });
     process.stderr.write(`bccli serve ${handle.url} \u2014 Authorization: Bearer ${handle.token}
 `);
@@ -115,8 +131,8 @@ async function main() {
     return 0;
   }
   if (args.command === "plugins") {
-    const { runPluginsCommand } = await import("./pluginsCli-RD4QW3DX.js");
-    const { readGlobalPlugins, updateGlobalConfig } = await import("./config-LCY27K3L.js");
+    const { runPluginsCommand } = await import("./pluginsCli-LE2IDSST.js");
+    const { readGlobalPlugins, updateGlobalConfig } = await import("./config-2PLBQKNC.js");
     const { runNpmSync } = await import("./npmRunner-LU43GM3W.js");
     return runPluginsCommand(args, {
       out: (s) => console.log(s),
@@ -130,27 +146,30 @@ async function main() {
     });
   }
   if (args.command === "gh-bot") {
-    const { runGhBotCommand } = await import("./ghBotCli-TJMKJU3E.js");
+    const { runGhBotCommand } = await import("./ghBotCli-MB7KATUU.js");
     return runGhBotCommand(args, { env: process.env, cwd, out: (s) => console.log(s), err: (s) => console.error(s) });
   }
   if (args.command === "completion") {
-    const { runCompletionCommand } = await import("./completion-6K4AXKK2.js");
+    const { runCompletionCommand } = await import("./completion-5OLAKCX7.js");
     return runCompletionCommand(args, { out: (s) => console.log(s), err: (s) => console.error(s) });
   }
   if (args.command === "stats") {
-    const { runStatsCommand } = await import("./statsCli-RPCIMT5R.js");
-    const { bccliHome } = await import("./config-LCY27K3L.js");
-    return runStatsCommand({ subArgs: args.subArgs, home: bccliHome(process.env) }, { out: (s) => console.log(s), err: (s) => console.error(s) });
+    const { runStatsCommand } = await import("./statsCli-AJG3IJTX.js");
+    const { bccliHome } = await import("./config-2PLBQKNC.js");
+    return runStatsCommand(
+      { subArgs: args.subArgs, home: bccliHome(process.env), cwd, days: args.days, tools: args.tools, models: args.models, project: args.project },
+      { out: (s) => console.log(s), err: (s) => console.error(s) }
+    );
   }
   if (args.command === "export" || args.command === "import") {
-    const { runExportCommand, runImportCommand } = await import("./transferCli-RQBB6RVY.js");
-    const { bccliHome } = await import("./config-LCY27K3L.js");
+    const { runExportCommand, runImportCommand } = await import("./transferCli-HNJMZYLV.js");
+    const { bccliHome } = await import("./config-2PLBQKNC.js");
     const deps = { subArgs: args.subArgs, home: bccliHome(process.env), cwd };
     const io = { out: (s) => console.log(s), err: (s) => console.error(s) };
     return args.command === "export" ? runExportCommand(deps, io) : runImportCommand(deps, io);
   }
   if (args.command === "pr") {
-    const { runPrCommand } = await import("./prCli-NR3ZQMST.js");
+    const { runPrCommand } = await import("./prCli-PQJDEF7H.js");
     return runPrCommand({ subArgs: args.subArgs, cwd }, { out: (s) => console.log(s), err: (s) => console.error(s) });
   }
   const rt = createRuntime({ cwd, args });
@@ -161,7 +180,7 @@ async function main() {
   }
   if (args.print) {
     if (!args.prompt) throw new ConfigError(t('-p mode needs a task, e.g. bccli -p "explain this repo"'));
-    const { serversToStart } = await import("./config-Z4HSA435.js");
+    const { serversToStart } = await import("./config-LSB274W4.js");
     const plan = serversToStart(rt.home, cwd);
     for (const s of plan.needTrust) {
       console.error(t('Project MCP server "{name}" skipped (not approved yet; run interactive bccli once to approve it).', { name: s.name }));
@@ -176,19 +195,19 @@ async function main() {
   if (!process.stdin.isTTY) throw new ConfigError(t('Interactive mode needs a terminal. For scripts/CI use: bccli -p "task"'));
   if (rt.config.updateCheck !== "off" && !process.env.BCCLI_NO_UPDATE_CHECK) {
     try {
-      const { checkForUpdate } = await import("./update-7SSREI2O.js");
+      const { checkForUpdate } = await import("./update-REYFMT5X.js");
       const update = await checkForUpdate({ home: rt.home, fetch: globalThis.fetch, now: /* @__PURE__ */ new Date() });
       if (update) console.error(update);
     } catch {
     }
   }
-  const { startInteractive } = await import("./ui-4ZTUMTYM.js");
+  const { startInteractive } = await import("./ui-ORZ5ZNIC.js");
   return startInteractive(rt, { initialPrompt: args.prompt, resume: args.resume, version: VERSION });
 }
 main().then(
-  (code) => process.exit(code),
+  (code) => settleExit(code),
   (error) => {
     console.error(error instanceof ConfigError || error?.code === "ERR_PARSE_ARGS_UNKNOWN_OPTION" ? error.message : error);
-    process.exit(1);
+    settleExit(1);
   }
 );

package/dist/{completion-6K4AXKK2.js → completion-5OLAKCX7.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   t
-} from "./chunk-QHNWI3OT.js";
+} from "./chunk-JZ5XPSIA.js";
 
 // src/completion.ts
 var SHELLS = ["bash", "zsh", "fish", "powershell"];

package/dist/{config-LCY27K3L.js → config-2PLBQKNC.js}

@@ -12,8 +12,8 @@ import {
   resolveModel,
   saveCredential,
   updateGlobalConfig
-} from "./chunk-GIGWZFCY.js";
-import "./chunk-QHNWI3OT.js";
+} from "./chunk-FNGFR7R6.js";
+import "./chunk-JZ5XPSIA.js";
 export {
   ConfigError,
   DEFAULT_MAX_STEPS,

package/dist/{config-Z4HSA435.js → config-LSB274W4.js}

@@ -9,9 +9,9 @@ import {
   removeGlobalServer,
   serversToStart,
   setProjectTrust
-} from "./chunk-PZC2Q6MJ.js";
-import "./chunk-GIGWZFCY.js";
-import "./chunk-QHNWI3OT.js";
+} from "./chunk-Q7DFEWE7.js";
+import "./chunk-FNGFR7R6.js";
+import "./chunk-JZ5XPSIA.js";
 export {
   addGlobalServer,
   expandEnvVars,

package/dist/{ghBotCli-TJMKJU3E.js → ghBotCli-MB7KATUU.js}

@@ -1,32 +1,32 @@
 #!/usr/bin/env node
 import {
   createRuntime
-} from "./chunk-ZGH4B7OU.js";
-import "./chunk-U6PCNS4B.js";
-import "./chunk-PSRNKKGA.js";
-import "./chunk-NVRNFR4S.js";
+} from "./chunk-FNCDUDOB.js";
+import "./chunk-QZKLZELZ.js";
+import "./chunk-NJ5YDSSP.js";
+import "./chunk-JKRSZHDV.js";
 import "./chunk-PSO7R5AD.js";
 import {
   LOOPBACK_BIND,
   parseCliArgs
-} from "./chunk-CYTRCZXI.js";
+} from "./chunk-W2ME7AGN.js";
 import "./chunk-GAFJEQTJ.js";
-import "./chunk-2ON3WIDP.js";
-import "./chunk-25DSN3Y3.js";
-import "./chunk-VO6MF6JJ.js";
+import "./chunk-X5ZJGTWY.js";
+import "./chunk-4BQAIMAM.js";
+import "./chunk-F4XYLKG5.js";
 import "./chunk-7F3IWBPQ.js";
-import "./chunk-BQHKN7JI.js";
-import "./chunk-RMDW3OQ6.js";
-import "./chunk-ZKMSTD6G.js";
-import "./chunk-PZC2Q6MJ.js";
+import "./chunk-IA35YV5K.js";
+import "./chunk-ERXWNEVU.js";
+import "./chunk-RFSNTLOW.js";
+import "./chunk-Q7DFEWE7.js";
 import {
   ConfigError,
   globalConfigPath,
   readJsonConfig
-} from "./chunk-GIGWZFCY.js";
+} from "./chunk-FNGFR7R6.js";
 import {
   t
-} from "./chunk-QHNWI3OT.js";
+} from "./chunk-JZ5XPSIA.js";
 
 // src/ghBotWebhook.ts
 import { createHmac, timingSafeEqual } from "crypto";

package/dist/{integrationCli-33KU6GIK.js → integrationCli-L7OLA3DG.js}

@@ -5,10 +5,10 @@ import {
   loadConfig,
   readCredentials,
   resolveModel
-} from "./chunk-GIGWZFCY.js";
+} from "./chunk-FNGFR7R6.js";
 import {
   t
-} from "./chunk-QHNWI3OT.js";
+} from "./chunk-JZ5XPSIA.js";
 
 // src/integrationCli.ts
 import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "fs";

package/dist/{login-LNF7ZV2S.js → login-4CIXDZZ7.js}

@@ -4,10 +4,10 @@ import {
   readLine,
   readSecret,
   runLogin
-} from "./chunk-Y3QKYORR.js";
+} from "./chunk-IU7PB6US.js";
 import "./chunk-7F3IWBPQ.js";
-import "./chunk-GIGWZFCY.js";
-import "./chunk-QHNWI3OT.js";
+import "./chunk-FNGFR7R6.js";
+import "./chunk-JZ5XPSIA.js";
 export {
   defaultLoginDeps,
   readLine,

package/dist/{mcpCli-TXFS3AOJ.js → mcpCli-SAJTQGI7.js}

@@ -2,7 +2,7 @@
 import {
   CATALOG,
   fillTemplate
-} from "./chunk-I7GXIJCY.js";
+} from "./chunk-O33VFLLL.js";
 import {
   authorizeMcpServer,
   clearTokens
@@ -12,20 +12,20 @@ import {
   globalMcpPath,
   readMcpFile,
   removeGlobalServer
-} from "./chunk-PZC2Q6MJ.js";
+} from "./chunk-Q7DFEWE7.js";
 import {
   bccliHome
-} from "./chunk-GIGWZFCY.js";
+} from "./chunk-FNGFR7R6.js";
 import {
   t
-} from "./chunk-QHNWI3OT.js";
+} from "./chunk-JZ5XPSIA.js";
 
 // src/mcpCli.ts
 async function runMcpCommand(args, deps) {
   const home = bccliHome(deps.env);
   const [action = "list", name] = args.subArgs;
   if (action === "serve") {
-    const { runMcpServe } = await import("./serve-YNKE332Z.js");
+    const { runMcpServe } = await import("./serve-QAVMAYEU.js");
     return runMcpServe(args, deps);
   }
   const installed = readMcpFile(globalMcpPath(home));

package/dist/{modelsCli-IZSMIYVB.js → modelsCli-L6VODTVW.js}

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
 import {
   listAllModels
-} from "./chunk-25DSN3Y3.js";
-import "./chunk-VO6MF6JJ.js";
-import "./chunk-RMDW3OQ6.js";
-import "./chunk-ZKMSTD6G.js";
+} from "./chunk-4BQAIMAM.js";
+import "./chunk-F4XYLKG5.js";
+import "./chunk-ERXWNEVU.js";
+import "./chunk-RFSNTLOW.js";
 import {
   loadConfig,
   resolveModel
-} from "./chunk-GIGWZFCY.js";
+} from "./chunk-FNGFR7R6.js";
 import {
   t
-} from "./chunk-QHNWI3OT.js";
+} from "./chunk-JZ5XPSIA.js";
 
 // src/modelsCli.ts
 async function runModelsCommand(args, deps) {

package/dist/{oauthLogin-QGDYTOW7.js → oauthLogin-6TP475PO.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   t
-} from "./chunk-QHNWI3OT.js";
+} from "./chunk-JZ5XPSIA.js";
 
 // src/oauthLogin.ts
 import { createHash, randomBytes } from "crypto";

package/dist/{pluginsCli-RD4QW3DX.js → pluginsCli-LE2IDSST.js}

@@ -2,10 +2,10 @@
 import {
   bccliHome,
   globalConfigPath
-} from "./chunk-GIGWZFCY.js";
+} from "./chunk-FNGFR7R6.js";
 import {
   t
-} from "./chunk-QHNWI3OT.js";
+} from "./chunk-JZ5XPSIA.js";
 
 // src/pluginsCli.ts
 import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "fs";

package/dist/{prCli-NR3ZQMST.js → prCli-PQJDEF7H.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   t
-} from "./chunk-QHNWI3OT.js";
+} from "./chunk-JZ5XPSIA.js";
 
 // src/prCli.ts
 import { spawn } from "child_process";
@@ -21,9 +21,9 @@ function defaultGh(argv) {
   });
 }
 async function defaultRunTask(opts) {
-  const argv = process.execPath ? [new URL("../cli.js", import.meta.url).pathname, ...opts.prompt ? ["-p", opts.prompt] : [], "--allow-all"] : [];
+  const entry = process.argv[1];
+  if (!entry) return 1;
   return new Promise((resolve) => {
-    const entry = new URL("../cli.js", import.meta.url).pathname.replace(/^\/([A-Za-z]:)/, "$1");
     const child = spawn(process.execPath, [entry, ...opts.prompt ? ["-p", opts.prompt] : [], "--allow-all"], {
       shell: false,
       stdio: "inherit",
@@ -31,7 +31,6 @@ async function defaultRunTask(opts) {
     });
     child.on("error", () => resolve(1));
     child.on("close", (code) => resolve(code ?? 1));
-    void argv;
   });
 }
 async function runPrCommand(args, deps) {

package/dist/providerCli-SEAZ5OLH.js

@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+import {
+  addProviderKey,
+  runProviderCommand
+} from "./chunk-X5ZJGTWY.js";
+import "./chunk-4BQAIMAM.js";
+import "./chunk-F4XYLKG5.js";
+import "./chunk-ERXWNEVU.js";
+import "./chunk-RFSNTLOW.js";
+import "./chunk-FNGFR7R6.js";
+import "./chunk-JZ5XPSIA.js";
+export {
+  addProviderKey,
+  runProviderCommand
+};

package/dist/sdk.js

@@ -155,7 +155,8 @@ Usage:
   bccli provider list|add <id>|remove <id>   manage providers (custom: --url <url> [--name N] [--key-env ENV])
   bccli mcp list|add <name>|remove <name>|auth <name>|logout <name>|serve [--base-url <url>]    manage MCP servers, or serve this account's tools over stdio
   bccli completion <shell>     print a shell completion script (bash, zsh, fish, powershell)
-  bccli stats [--days N]       show token usage from local sessions (default: last 7 days)
+  bccli stats [--days N] [--tools N] [--models [N|all]] [--project slug]
+                                     show token usage from local sessions (default: last 7 days)
   bccli export [session] [file]  copy a session JSONL to a file (default: last session here)
   bccli import <file>          import a session JSONL into the current project
   bccli pr <number> [--repo owner/name] [task]   check out a GitHub PR and run a task on it
@@ -483,11 +484,12 @@ Opsi:
   "Blocked: {host} resolves to a private address ({addr}). Fetching an internal host through a public DNS name is not allowed.": "Diblokir: {host} mengarah ke alamat privat ({addr}). Mengambil host internal lewat nama DNS publik tidak diizinkan.",
   "usage: bccli completion <{shells}>": "pakai: bccli completion <{shells}>",
   "--days must be a positive integer": "--days harus bilangan bulat positif",
+  "--tools must be a positive integer": "--tools harus bilangan bulat positif",
+  '--models must be a positive integer or "all"': '--models harus bilangan bulat positif atau "all"',
   "no sessions in the last {days} day(s)": "tidak ada sesi dalam {days} hari terakhir",
   "sessions (last {days} day(s)):": "sesi ({days} hari terakhir):",
   "session(s)": "sesi",
   "message(s)": "pesan",
-  "recorded": "tercatat",
   "no session to export in this folder": "tidak ada sesi untuk diekspor di folder ini",
   "exported {file}": "diekspor ke {file}",
   "file not found: {file}": "file tidak ditemukan: {file}",
@@ -876,8 +878,11 @@ var LOOPBACK_BIND = /* @__PURE__ */ new Set(["127.0.0.1", "localhost", "::1"]);
 
 // src/args.ts
 function parseCliArgs(argv) {
+  const expanded = argv.map(
+    (a, i) => a === "--models" && (i + 1 >= argv.length || argv[i + 1].startsWith("-")) ? "--models=all" : a
+  );
   const { values, positionals } = parseArgs({
-    args: argv,
+    args: expanded,
     allowPositionals: true,
     options: {
       print: { type: "boolean", short: "p" },
@@ -904,6 +909,9 @@ function parseCliArgs(argv) {
       token: { type: "string" },
       "base-url": { type: "string" },
       days: { type: "string" },
+      tools: { type: "string" },
+      models: { type: "string" },
+      project: { type: "string" },
       repo: { type: "string" }
     }
   });
@@ -932,6 +940,17 @@ function parseCliArgs(argv) {
   if (days !== void 0 && (!Number.isInteger(days) || days < 1)) {
     throw new ConfigError(t("--days must be a positive integer"));
   }
+  const tools = values.tools !== void 0 ? Number(values.tools) : void 0;
+  if (tools !== void 0 && (!Number.isInteger(tools) || tools < 1)) {
+    throw new ConfigError(t("--tools must be a positive integer"));
+  }
+  let models;
+  if (values.models !== void 0) {
+    models = values.models === "" || values.models === "all" ? "all" : values.models;
+    if (models !== "all" && (!Number.isInteger(Number(models)) || Number(models) < 1)) {
+      throw new ConfigError(t('--models must be a positive integer or "all"'));
+    }
+  }
   if (values.host !== void 0 && !LOOPBACK_BIND.has(values.host)) {
     throw new ConfigError(t("serve only accepts loopback --host (127.0.0.1, localhost, ::1)"));
   }
@@ -964,6 +983,9 @@ function parseCliArgs(argv) {
     token: values.token,
     baseUrl: values["base-url"],
     days,
+    tools,
+    models,
+    project: values.project,
     repo: values.repo
   };
 }
@@ -3231,6 +3253,48 @@ function trimToFit(messages, maxTokens) {
   }
   return out;
 }
+function splitKeepRecent(messages, keepTokens) {
+  if (messages.length === 0) return [[], []];
+  let start = messages.length;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (i > 0 && messages[i].role !== "user") continue;
+    if (estimateMessages(messages.slice(i)) <= keepTokens) start = i;
+    else break;
+  }
+  if (start === messages.length) {
+    for (let i = messages.length - 1; i >= 0; i--) {
+      if (messages[i].role === "user") {
+        start = i;
+        break;
+      }
+    }
+  }
+  return [messages.slice(0, start), messages.slice(start)];
+}
+var TOOL_STUB = "[Old tool result content cleared]";
+var TOOL_PRUNE_KEEP_TOKENS = 4e4;
+var TOOL_PRUNE_MIN_TOKENS = 2e4;
+var isToolStub = (content) => content.startsWith(TOOL_STUB);
+function pruneOldToolOutputs(messages) {
+  let kept = 0;
+  let oldTokens = 0;
+  const old = [];
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const m = messages[i];
+    if (m.role !== "tool" || isToolStub(m.content)) continue;
+    kept += estimateTokens(m.content);
+    if (kept > TOOL_PRUNE_KEEP_TOKENS) {
+      old.push(i);
+      oldTokens += estimateTokens(m.content);
+    }
+  }
+  if (oldTokens <= TOOL_PRUNE_MIN_TOKENS) return false;
+  for (const i of old) {
+    const m = messages[i];
+    messages[i] = { ...m, content: TOOL_STUB };
+  }
+  return true;
+}
 
 // src/agent.ts
 var CANCELLED = "Cancelled by the user.";
@@ -3310,7 +3374,10 @@ var Agent2 = class {
     this.opts.onReset?.();
   }
   async compact(signal) {
-    const history = trimToFit(this.messages, Math.floor(this.contextWindow * 0.8));
+    pruneOldToolOutputs(this.messages);
+    const keepTokens = Math.min(15e3, Math.floor(this.contextWindow * 0.1));
+    const [older, keep] = splitKeepRecent(this.messages, keepTokens);
+    const history = trimToFit(older, Math.floor(this.contextWindow * 0.8));
     const completion = await this.provider.chat({
       messages: [{ role: "system", content: this.systemPrompt }, ...history, { role: "user", content: COMPACT_PROMPT }],
       // Some gateways reject tool_calls in history when no tools are declared.
@@ -3322,6 +3389,7 @@ var Agent2 = class {
     this.push({ role: "user", content: `Summary of the previous conversation:
 ${completion.text}` });
     this.push({ role: "assistant", content: "OK, I will continue from this summary." });
+    for (const m of keep) this.push(m);
     this.onEvent({ type: "compacted" });
   }
   /**
@@ -3384,6 +3452,7 @@ ${completion.text}` });
         this.totalUsage.cacheWriteTokens = (this.totalUsage.cacheWriteTokens ?? 0) + (usage.cacheWriteTokens ?? 0);
         this.lastInputTokens = usage.inputTokens;
         this.onEvent({ type: "usage", ...this.totalUsage });
+        this.opts.onUsage?.(usage);
         this.push(completionAssistantMessage(completion));
         if (completion.finishReason === "repetition") {
           this.onEvent({ type: "textReplace", text: completion.text });
@@ -3531,6 +3600,7 @@ ${t("This model may not support tool calling. Try another model with /model.")}`
         this.totalUsage.cachedInputTokens = (this.totalUsage.cachedInputTokens ?? 0) + (u.cachedInputTokens ?? 0);
         this.totalUsage.cacheWriteTokens = (this.totalUsage.cacheWriteTokens ?? 0) + (u.cacheWriteTokens ?? 0);
         this.onEvent({ type: "usage", ...this.totalUsage });
+        this.opts.onUsage?.(u);
       }
     };
     emit({ type: "toolStart", id: call.id, tool: tool.name, target });
@@ -4299,6 +4369,9 @@ var Session = class _Session {
   append(message) {
     this.write({ t: "msg", m: message });
   }
+  appendUsage(usage) {
+    this.write({ t: "usage", ...usage });
+  }
   reset() {
     this.write({ t: "reset" });
   }
@@ -5066,6 +5139,7 @@ function createRuntime(opts) {
     budgetModel: modelRef,
     contextWindow: contextWindowFor(modelRef, env),
     onMessage: (m) => session.append(m),
+    onUsage: (u) => session.appendUsage({ ...u, model: modelRef }),
     onReset: () => session.reset(),
     onTurnStart: () => {
       for (let i = turnMarks.length - 1; i >= 0 && turnMarks[i] > agent.messages.length; i--) {

package/dist/{serve-YNKE332Z.js → serve-QAVMAYEU.js}

@@ -3,15 +3,15 @@ import {
   createFetchTool,
   createWebSearchTool,
   isPrivateHost
-} from "./chunk-NVRNFR4S.js";
+} from "./chunk-JKRSZHDV.js";
 import "./chunk-PSO7R5AD.js";
 import {
   loadConfig,
   readCredentials
-} from "./chunk-GIGWZFCY.js";
+} from "./chunk-FNGFR7R6.js";
 import {
   t
-} from "./chunk-QHNWI3OT.js";
+} from "./chunk-JZ5XPSIA.js";
 
 // src/mcpServer/serve.ts
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";