@ddlqhd/agent-sdk 0.1.0 → 0.1.1

package/dist/{chunk-Q3SOMX26.js → chunk-DXMVWGLJ.js}

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
-import { ToolRegistry, createAgentTool, HookManager, getAllBuiltinTools, getEnvironmentInfo, formatEnvironmentSection } from './chunk-OHXW2YM6.js';
-import { promises, existsSync, readFileSync } from 'fs';
-import { join, resolve } from 'path';
+import { createModel, mergeMcpStdioEnv } from './chunk-742JTNYI.js';
+import { ToolRegistry, createAgentTool, HookManager, getAllBuiltinTools, getEnvironmentInfo, formatEnvironmentSection } from './chunk-THKEF32L.js';
+import { readFileSync, promises, existsSync } from 'fs';
+import { dirname, join, resolve } from 'path';
+import { fileURLToPath } from 'url';
 import { randomUUID } from 'crypto';
 import { homedir } from 'os';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
@@ -11,6 +13,9 @@ import { z } from 'zod';
 import { exec } from 'child_process';
 import { promisify } from 'util';
 
+var pkgDir = dirname(fileURLToPath(import.meta.url));
+var pkgPath = join(pkgDir, "..", "package.json");
+var PACKAGE_VERSION = JSON.parse(readFileSync(pkgPath, "utf-8")).version;
 var JsonlStorage = class {
   basePath;
   constructor(config = {}) {
@@ -567,7 +572,7 @@ var MCPClient = class {
   constructor(config) {
     this._name = config.name;
     this.client = new Client(
-      { name: "agent-sdk-client", version: "0.1.0" },
+      { name: "agent-sdk-client", version: PACKAGE_VERSION },
       { capabilities: {} }
     );
     if (isStdioConfig(config)) {
@@ -695,7 +700,7 @@ var MCPClient = class {
   }
   convertSchema(schema) {
     if (!schema || !schema.properties) {
-      return z.object({}).passthrough();
+      return z.looseObject({});
     }
     const shape = {};
     for (const [key, value] of Object.entries(schema.properties)) {
@@ -716,7 +721,7 @@ var MCPClient = class {
           zodField = z.array(z.any());
           break;
         case "object":
-          zodField = z.object({}).passthrough();
+          zodField = z.looseObject({});
           break;
         default:
           zodField = z.any();
@@ -1799,7 +1804,7 @@ var ContextManager = class {
 };
 
 // src/core/agent.ts
-function toMCPClientConfig(config) {
+function toMCPClientConfig(config, agentEnv) {
   if (config.transport === "http") {
     return {
       name: config.name,
@@ -1811,7 +1816,7 @@ function toMCPClientConfig(config) {
     name: config.name,
     command: config.command,
     args: config.args,
-    env: config.env
+    env: mergeMcpStdioEnv(agentEnv, config.env)
   };
 }
 var Agent = class _Agent {
@@ -1831,15 +1836,30 @@ 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 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 ToolRegistry({
       executionPolicy: {
@@ -1860,20 +1880,20 @@ var Agent = class _Agent {
     } else if (this.toolRegistry.has("Agent")) {
       this.toolRegistry.unregister("Agent");
     }
-    if (config.hookManager) {
-      this.toolRegistry.setHookManager(config.hookManager);
-    } else if (config.hookConfigDir !== void 0) {
+    if (this.config.hookManager) {
+      this.toolRegistry.setHookManager(this.config.hookManager);
+    } else if (this.config.hookConfigDir !== void 0) {
       const hm = 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();
   }
@@ -2082,7 +2102,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;
@@ -2348,6 +2369,12 @@ ${content}`;
   getSkillRegistry() {
     return this.skillRegistry;
   }
+  /**
+   * 解析后的模型适配器（`modelConfig` 已在构造时合并 `env` 并实例化）。
+   */
+  getModel() {
+    return this.config.model;
+  }
   /**
    * 处理用户输入，检测并处理 skill 调用
    * @param input 用户输入
@@ -2433,7 +2460,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}__`)) {
@@ -2849,6 +2876,6 @@ function validateMCPConfig(config) {
   return errors;
 }
 
-export { Agent, DEFAULT_SYSTEM_PROMPT, JsonlStorage, MCPAdapter, MCPClient, MemoryManager, MemoryStorage, SessionManager, SkillLoader, SkillRegistry, StreamChunkProcessor, createAgent, createJsonlStorage, createMCPAdapter, createMCPClient, createMemoryStorage, createSessionManager, createSkillLoader, createSkillRegistry, createStorage, getLatestSessionId, getSessionStoragePath, loadMCPConfig, parseSkillMd, validateMCPConfig };
-//# sourceMappingURL=chunk-Q3SOMX26.js.map
-//# sourceMappingURL=chunk-Q3SOMX26.js.map
+export { Agent, DEFAULT_SYSTEM_PROMPT, JsonlStorage, MCPAdapter, MCPClient, MemoryManager, MemoryStorage, PACKAGE_VERSION, SessionManager, SkillLoader, SkillRegistry, StreamChunkProcessor, createAgent, createJsonlStorage, createMCPAdapter, createMCPClient, createMemoryStorage, createSessionManager, createSkillLoader, createSkillRegistry, createStorage, getLatestSessionId, getSessionStoragePath, loadMCPConfig, parseSkillMd, validateMCPConfig };
+//# sourceMappingURL=chunk-DXMVWGLJ.js.map
+//# sourceMappingURL=chunk-DXMVWGLJ.js.map