@livx.cc/agentx 0.99.2 → 0.99.3

package/dist/cli.js

@@ -2028,7 +2028,7 @@ function copyTextToClipboard(text, platform2 = process.platform) {
 
 // cli/cli.ts
 import { join as join14, resolve as resolve3, basename as basename2, extname, dirname as dirname4 } from "path";
-import { AIClient, listModels, listProviders, getProviderFromModel, getModelInfo, resolveModel, isModelSupported, disposeCursorSessions } from "ai.libx.js";
+import { AIClient, listModels, listProviders, getProviderFromModel, getModelInfo, resolveModel, isModelSupported, disposeCursorSessions, disposeClaudeCodeSessions } from "ai.libx.js";
 
 // src/llm.ts
 function contentText(content) {
@@ -3566,6 +3566,7 @@ var Agent = class _Agent {
       let res;
       const sent = this.trimContext();
       const frag = reasoningToChatFragment(o.model, o.reasoning);
+      const sentTools = o.model.startsWith("claude-code/") ? [] : wireTools;
       const isCursorWithTools = o.model.startsWith("cursor/") && wireTools.length > 0;
       const cursorPo = isCursorWithTools ? {
         toolExecutor: async (name, args) => {
@@ -3583,10 +3584,10 @@ var Agent = class _Agent {
         for (let attempt = 0; ; attempt++) {
           try {
             if (useStream) {
-              const r = await o.ai.chat({ model: o.model, messages: sent, tools: wireTools, stream: true, signal: o.signal, ...o.toolChoice ? { toolChoice: o.toolChoice } : {}, ...reasonOpts });
+              const r = await o.ai.chat({ model: o.model, messages: sent, tools: sentTools, stream: true, signal: o.signal, ...o.toolChoice ? { toolChoice: o.toolChoice } : {}, ...reasonOpts });
               res = await this.consumeStream(r);
             } else {
-              const r = await o.ai.chat({ model: o.model, messages: sent, tools: wireTools, stream: false, signal: o.signal, ...o.toolChoice ? { toolChoice: o.toolChoice } : {}, ...reasonOpts });
+              const r = await o.ai.chat({ model: o.model, messages: sent, tools: sentTools, stream: false, signal: o.signal, ...o.toolChoice ? { toolChoice: o.toolChoice } : {}, ...reasonOpts });
               res = r;
             }
             break;
@@ -7348,6 +7349,34 @@ function cursorProviderOptions(model, cwd, mcpServers) {
   if (!(model ?? "").startsWith("cursor/")) return void 0;
   return { cwd, ...toCursorMcp(mcpServers) ?? {}, ...process.env.CURSOR_WARM === "0" ? {} : { cursorSession: randomUUID() } };
 }
+function toClaudeCodeMcp(servers) {
+  if (!servers) return void 0;
+  const out = {};
+  for (const [name, s] of Object.entries(servers)) {
+    if (!s || s.disabled) continue;
+    if (s.command) {
+      out[name] = { type: "stdio", command: s.command, ...s.args ? { args: s.args } : {}, ...s.env ? { env: s.env } : {} };
+    } else if (s.url) {
+      if (s.auth === "oauth" && !s.bearerToken) continue;
+      const headers = { ...s.headers ?? {}, ...s.bearerToken ? { Authorization: `Bearer ${s.bearerToken}` } : {} };
+      out[name] = { type: "http", url: s.url, ...Object.keys(headers).length ? { headers } : {} };
+    }
+  }
+  return Object.keys(out).length ? { mcpServers: out } : void 0;
+}
+function claudeCodeProviderOptions(model, cwd, mcpServers) {
+  if (!(model ?? "").startsWith("claude-code/")) return void 0;
+  const env = (() => {
+    if (process.env.AGENTX_CC_USE_API_KEY) return void 0;
+    const { ANTHROPIC_API_KEY, ANTHROPIC_AUTH_TOKEN, ...rest } = process.env;
+    return rest;
+  })();
+  const warm = process.env.AGENTX_CC_WARM === "0" ? {} : { claudeCodeSession: randomUUID() };
+  return { cwd, ...env ? { env } : {}, ...warm, ...toClaudeCodeMcp(mcpServers) ?? {} };
+}
+function providerOptionsFor(model, cwd, mcpServers) {
+  return cursorProviderOptions(model, cwd, mcpServers) ?? claudeCodeProviderOptions(model, cwd, mcpServers);
+}
 async function buildAgent(o) {
   if (typeof o.sandbox !== "boolean")
     throw new Error(
@@ -7360,9 +7389,11 @@ async function buildAgent(o) {
   jailedDisk.setCwd(cwd);
   const virtual = o.sandbox || !!o.boddb;
   const isCursor = (o.model ?? "").startsWith("cursor/");
-  if (virtual && isCursor)
+  const isClaudeCode = (o.model ?? "").startsWith("claude-code/");
+  const isDelegated = isCursor || isClaudeCode;
+  if (virtual && isDelegated)
     throw new Error(
-      "cursor/* models cannot run in --sandbox/--boddb: the Cursor agent runs its own real-disk tools and bypasses the VFS jail. Use disk mode (default)."
+      `${isCursor ? "cursor" : "claude-code"}/* models cannot run in --sandbox/--boddb: the delegated agent runs its own real-disk tools and bypasses the VFS jail. Use disk mode (default).`
     );
   let fs = jailedDisk;
   if (o.sandbox) {
@@ -7429,7 +7460,7 @@ Reference files in them by their mount path (the left side).`;
   const hooks = o.learnFromMistakes && memoryWriteDir ? composeHooks(o.hooks, lessonCapture({ fs, dir: memoryWriteDir, minRepeats: 2 })) : o.hooks;
   let realShell = [];
   const useRealShell = o.realShell ?? !virtual;
-  if (useRealShell && !virtual) {
+  if (useRealShell && !virtual && !isClaudeCode) {
     const jobs = new ShellJobRegistry({ cwd, killOnExit: true, osSandbox: o.osSandbox });
     realShell = [makeRealShellTool({ cwd, registry: jobs, osSandbox: o.osSandbox }), ...makeShellJobTools(jobs)];
   }
@@ -7448,7 +7479,7 @@ Reference files in them by their mount path (the left side).`;
     // Warm cursor session (default on; CURSOR_WARM=0 to disable): one long-lived agent reused across
     // turns, amortising the ~2s Agent.create + h2 handshake. Keyed per agentx launch.
     ...(() => {
-      const po = cursorProviderOptions(o.model, cwd, o.mcpServers);
+      const po = providerOptionsFor(o.model, cwd, o.mcpServers);
       return po ? { providerOptions: po } : {};
     })(),
     ...(() => {
@@ -7480,6 +7511,7 @@ The filesystem root '/' is the real machine root \u2014 you have full filesystem
       return { systemPrompt: basePrompt + "\n\n" + extra };
     })(),
     tools: (() => {
+      if (isClaudeCode) return [];
       const requested = o.tools ?? DEFAULT_TOOLS;
       const base = toolsByName([...requested, ...autoWebTools()]);
       const tail = [...o.extraTools ?? []];
@@ -12050,7 +12082,7 @@ async function repl(args, ai, cfg, cwd) {
       ...args.voiceModel ?? cfg.reflexModel ? { reflexModel: resolveModelOrNewest(args.voiceModel ?? cfg.reflexModel) } : {},
       actModel: agent.options.model,
       actOptions: workerOptions,
-      providerOptionsFor: (m) => cursorProviderOptions(m, cwd, cfg.mcpServers),
+      providerOptionsFor: (m) => providerOptionsFor(m, cwd, cfg.mcpServers),
       ...(args.thinkModel ?? cfg.thinkModel) !== void 0 ? { thinkModel: (args.thinkModel ?? cfg.thinkModel) === false ? false : resolveModelOrNewest(String(args.thinkModel ?? cfg.thinkModel)) } : {},
       host,
       ...args.voice ? { voiceStyle: "conversational", progressUpdates: true, askRelay: true, emotionTags: emotionsOn } : {},
@@ -12131,7 +12163,7 @@ async function repl(args, ai, cfg, cwd) {
   };
   const setModel = (m) => {
     work.model = m;
-    work.providerOptions = cursorProviderOptions(m, cwd, cfg.mcpServers);
+    work.providerOptions = providerOptionsFor(m, cwd, cfg.mcpServers);
     if (dx) dx.options.actModel = m;
     persistModel(cwd, m);
     err(dim("  model \u2192 " + m + "\n"));
@@ -12211,6 +12243,10 @@ async function repl(args, ai, cfg, cwd) {
       disposeCursorSessions();
     } catch {
     }
+    try {
+      disposeClaudeCodeSessions();
+    } catch {
+    }
     void closeMcp(mounted);
     process.exit(code);
   };
@@ -13956,6 +13992,7 @@ ${out}
         voiceIO?.stop();
         releaseStdin();
         disposeCursorSessions();
+        disposeClaudeCodeSessions();
         await closeMcp(mounted);
         process.exit(130);
       }
@@ -13965,6 +14002,7 @@ ${out}
   }
   releaseStdin();
   disposeCursorSessions();
+  disposeClaudeCodeSessions();
   await closeMcp(mounted);
 }
 function readAllStdin() {