@ddlqhd/agent-sdk 0.1.0 → 0.1.1

package/dist/{chunk-5QMA2YBY.cjs → chunk-AJD3DTL7.cjs}

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
 'use strict';
 
-var chunkJF5AJQMU_cjs = require('./chunk-JF5AJQMU.cjs');
+var chunkDQFTAD3I_cjs = require('./chunk-DQFTAD3I.cjs');
+var chunkQ3L4GIBG_cjs = require('./chunk-Q3L4GIBG.cjs');
 var fs = require('fs');
 var path = require('path');
+var url = require('url');
 var crypto = require('crypto');
 var os = require('os');
 var index_js = require('@modelcontextprotocol/sdk/client/index.js');
@@ -13,6 +15,10 @@ var zod = require('zod');
 var child_process = require('child_process');
 var util = require('util');
 
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
+var pkgDir = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-AJD3DTL7.cjs', document.baseURI).href))));
+var pkgPath = path.join(pkgDir, "..", "package.json");
+var PACKAGE_VERSION = JSON.parse(fs.readFileSync(pkgPath, "utf-8")).version;
 var JsonlStorage = class {
   basePath;
   constructor(config = {}) {
@@ -569,7 +575,7 @@ var MCPClient = class {
   constructor(config) {
     this._name = config.name;
     this.client = new index_js.Client(
-      { name: "agent-sdk-client", version: "0.1.0" },
+      { name: "agent-sdk-client", version: PACKAGE_VERSION },
       { capabilities: {} }
     );
     if (isStdioConfig(config)) {
@@ -697,7 +703,7 @@ var MCPClient = class {
   }
   convertSchema(schema) {
     if (!schema || !schema.properties) {
-      return zod.z.object({}).passthrough();
+      return zod.z.looseObject({});
     }
     const shape = {};
     for (const [key, value] of Object.entries(schema.properties)) {
@@ -718,7 +724,7 @@ var MCPClient = class {
           zodField = zod.z.array(zod.z.any());
           break;
         case "object":
-          zodField = zod.z.object({}).passthrough();
+          zodField = zod.z.looseObject({});
           break;
         default:
           zodField = zod.z.any();
@@ -1801,7 +1807,7 @@ var ContextManager = class {
 };
 
 // src/core/agent.ts
-function toMCPClientConfig(config) {
+function toMCPClientConfig(config, agentEnv) {
   if (config.transport === "http") {
     return {
       name: config.name,
@@ -1813,7 +1819,7 @@ function toMCPClientConfig(config) {
     name: config.name,
     command: config.command,
     args: config.args,
-    env: config.env
+    env: chunkDQFTAD3I_cjs.mergeMcpStdioEnv(agentEnv, config.env)
   };
 }
 var Agent = class _Agent {
@@ -1833,17 +1839,32 @@ var Agent = class _Agent {
   // inputTokens/outputTokens: 累计消耗
   // totalTokens: 累计总消耗 (inputTokens + outputTokens)
   sessionUsage = _Agent.createEmptySessionUsage();
+  static resolveModel(config) {
+    if (config.model) {
+      if (config.modelConfig) {
+        throw new Error("AgentConfig: pass only one of `model` or `modelConfig`");
+      }
+      return config.model;
+    }
+    if (config.modelConfig) {
+      return chunkDQFTAD3I_cjs.createModel(config.modelConfig, config.env);
+    }
+    throw new Error("AgentConfig: `model` or `modelConfig` is required");
+  }
   constructor(config) {
+    const resolvedModel = _Agent.resolveModel(config);
     this.config = {
       maxIterations: 200,
       streaming: true,
-      ...config
+      ...config,
+      model: resolvedModel,
+      modelConfig: void 0
     };
     this.skillRegistry = createSkillRegistry({
-      cwd: config.cwd,
-      userBasePath: config.userBasePath
+      cwd: this.config.cwd,
+      userBasePath: this.config.userBasePath
     });
-    this.toolRegistry = new chunkJF5AJQMU_cjs.ToolRegistry({
+    this.toolRegistry = new chunkQ3L4GIBG_cjs.ToolRegistry({
       executionPolicy: {
         disallowedTools: this.config.disallowedTools,
         allowedTools: this.config.allowedTools,
@@ -1856,26 +1877,26 @@ var Agent = class _Agent {
       if (this.toolRegistry.has("Agent")) {
         this.toolRegistry.unregister("Agent");
       }
-      this.toolRegistry.register(chunkJF5AJQMU_cjs.createAgentTool({
+      this.toolRegistry.register(chunkQ3L4GIBG_cjs.createAgentTool({
         runner: (request, context) => this.runSubagent(request, context)
       }));
     } else if (this.toolRegistry.has("Agent")) {
       this.toolRegistry.unregister("Agent");
     }
-    if (config.hookManager) {
-      this.toolRegistry.setHookManager(config.hookManager);
-    } else if (config.hookConfigDir !== void 0) {
-      const hm = chunkJF5AJQMU_cjs.HookManager.create();
+    if (this.config.hookManager) {
+      this.toolRegistry.setHookManager(this.config.hookManager);
+    } else if (this.config.hookConfigDir !== void 0) {
+      const hm = chunkQ3L4GIBG_cjs.HookManager.create();
       this.toolRegistry.setHookManager(hm);
-      this.hookDiscoverPromise = hm.discoverAndLoad(config.hookConfigDir);
+      this.hookDiscoverPromise = hm.discoverAndLoad(this.config.hookConfigDir);
     }
     this.sessionManager = new SessionManager({
-      type: config.storage?.type || "jsonl",
-      basePath: getSessionStoragePath(config.userBasePath)
+      type: this.config.storage?.type || "jsonl",
+      basePath: getSessionStoragePath(this.config.userBasePath)
     });
-    if (config.contextManagement !== false) {
-      const cmConfig = config.contextManagement === true ? {} : config.contextManagement ?? {};
-      this.contextManager = new ContextManager(config.model, cmConfig);
+    if (this.config.contextManagement !== false) {
+      const cmConfig = this.config.contextManagement === true ? {} : this.config.contextManagement ?? {};
+      this.contextManager = new ContextManager(this.config.model, cmConfig);
     }
     this.initPromise = this.initializeAsync();
   }
@@ -1892,7 +1913,7 @@ var Agent = class _Agent {
       }
       return;
     }
-    const builtins = chunkJF5AJQMU_cjs.getAllBuiltinTools(this.skillRegistry, {
+    const builtins = chunkQ3L4GIBG_cjs.getAllBuiltinTools(this.skillRegistry, {
       resolve: this.config.askUserQuestion
     }).filter((t) => !this.toolRegistry.isDisallowed(t.name));
     this.toolRegistry.registerMany(builtins);
@@ -1977,8 +1998,8 @@ var Agent = class _Agent {
     let envSection = "";
     if (shouldIncludeEnv) {
       const cwd = this.config.cwd || process.cwd();
-      const envInfo = chunkJF5AJQMU_cjs.getEnvironmentInfo(cwd);
-      envSection = chunkJF5AJQMU_cjs.formatEnvironmentSection(envInfo);
+      const envInfo = chunkQ3L4GIBG_cjs.getEnvironmentInfo(cwd);
+      envSection = chunkQ3L4GIBG_cjs.formatEnvironmentSection(envInfo);
     }
     if (!customPrompt) {
       let basePrompt = DEFAULT_SYSTEM_PROMPT;
@@ -2084,7 +2105,8 @@ ${content}`;
           temperature: this.config.temperature,
           maxTokens: this.config.maxTokens,
           signal,
-          includeRawStreamEvents: options?.includeRawStreamEvents
+          includeRawStreamEvents: options?.includeRawStreamEvents,
+          sessionId: this.sessionManager.sessionId ?? void 0
         };
         const stream = this.config.model.stream(modelParams);
         let hasToolCalls = false;
@@ -2350,6 +2372,12 @@ ${content}`;
   getSkillRegistry() {
     return this.skillRegistry;
   }
+  /**
+   * 解析后的模型适配器（`modelConfig` 已在构造时合并 `env` 并实例化）。
+   */
+  getModel() {
+    return this.config.model;
+  }
   /**
    * 处理用户输入，检测并处理 skill 调用
    * @param input 用户输入
@@ -2435,7 +2463,7 @@ ARGUMENTS: ${args}`;
     if (!this.mcpAdapter) {
       this.mcpAdapter = new MCPAdapter();
     }
-    await this.mcpAdapter.addServer(toMCPClientConfig(config));
+    await this.mcpAdapter.addServer(toMCPClientConfig(config, this.config.env));
     const mcpTools = this.mcpAdapter.getToolDefinitions();
     for (const tool of mcpTools) {
       if (!tool.name.startsWith(`mcp_${config.name}__`)) {
@@ -2858,6 +2886,7 @@ exports.MCPAdapter = MCPAdapter;
 exports.MCPClient = MCPClient;
 exports.MemoryManager = MemoryManager;
 exports.MemoryStorage = MemoryStorage;
+exports.PACKAGE_VERSION = PACKAGE_VERSION;
 exports.SessionManager = SessionManager;
 exports.SkillLoader = SkillLoader;
 exports.SkillRegistry = SkillRegistry;
@@ -2876,5 +2905,5 @@ exports.getSessionStoragePath = getSessionStoragePath;
 exports.loadMCPConfig = loadMCPConfig;
 exports.parseSkillMd = parseSkillMd;
 exports.validateMCPConfig = validateMCPConfig;
-//# sourceMappingURL=chunk-5QMA2YBY.cjs.map
-//# sourceMappingURL=chunk-5QMA2YBY.cjs.map
+//# sourceMappingURL=chunk-AJD3DTL7.cjs.map
+//# sourceMappingURL=chunk-AJD3DTL7.cjs.map