@ddlqhd/agent-sdk 0.1.0 → 0.1.1

package/dist/{types-C0aX_Qdp.d.cts → types-BLf9IqRs.d.cts}

@@ -128,52 +128,10 @@ declare const questionsSchema: z.ZodObject<{
         options: z.ZodArray<z.ZodObject<{
             label: z.ZodString;
             description: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            description: string;
-            label: string;
-        }, {
-            description: string;
-            label: string;
-        }>, "many">;
+        }, z.core.$strip>>;
         multiSelect: z.ZodDefault<z.ZodBoolean>;
-    }, "strip", z.ZodTypeAny, {
-        options: {
-            description: string;
-            label: string;
-        }[];
-        question: string;
-        header: string;
-        multiSelect: boolean;
-    }, {
-        options: {
-            description: string;
-            label: string;
-        }[];
-        question: string;
-        header: string;
-        multiSelect?: boolean | undefined;
-    }>, "many">;
-}, "strip", z.ZodTypeAny, {
-    questions: {
-        options: {
-            description: string;
-            label: string;
-        }[];
-        question: string;
-        header: string;
-        multiSelect: boolean;
-    }[];
-}, {
-    questions: {
-        options: {
-            description: string;
-            label: string;
-        }[];
-        question: string;
-        header: string;
-        multiSelect?: boolean | undefined;
-    }[];
-}>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
 type AskUserQuestionItem = z.infer<typeof questionsSchema>['questions'][number];
 type AskUserQuestionAnswer = {
     questionIndex: number;
@@ -314,6 +272,8 @@ interface ModelParams {
      * When true, adapters may attach `providerRaw` on each {@link StreamChunk} (e.g. Anthropic SSE JSON object).
      */
     includeRawStreamEvents?: boolean;
+    /** 会话标识；Agent 会在每次模型请求中填入，各适配器自行决定是否映射到 HTTP 请求。 */
+    sessionId?: string;
 }
 /**
  * 流式块类型
@@ -450,7 +410,7 @@ interface ToolDefinition {
     /** 工具描述 */
     description: string;
     /** 参数 Schema (Zod) */
-    parameters: z.ZodSchema;
+    parameters: z.ZodType;
     /** 处理函数 */
     handler: ToolHandler;
     /** 是否危险操作 */
@@ -710,12 +670,30 @@ interface ToolExecutionPolicy {
     allowedTools?: string[];
     canUseTool?: CanUseToolCallback;
 }
+/**
+ * 与 `createModel` 参数对齐，供 `AgentConfig.modelConfig` 使用（避免 `types` 依赖 `models`）。
+ */
+interface AgentModelConfig {
+    provider: 'openai' | 'anthropic' | 'ollama';
+    apiKey?: string;
+    baseUrl?: string;
+    model?: string;
+    /** Ollama：对应 `/api/chat` 的 `think` */
+    think?: boolean | 'low' | 'medium' | 'high';
+}
 /**
  * Agent 配置
  */
 interface AgentConfig {
-    /** 模型适配器 */
-    model: ModelAdapter;
+    /**
+     * 模型适配器；与 {@link modelConfig} 二选一。
+     * 若需让 {@link env} 参与 API Key 等解析，请使用 `modelConfig`，由 Agent 内部调用 {@link mergeProcessEnv} 后构造适配器。
+     */
+    model?: ModelAdapter;
+    /**
+     * 由 Agent 在内部通过 `createModel(modelConfig, env)` 构造适配器；与 `model` 二选一。
+     */
+    modelConfig?: AgentModelConfig;
     /** 系统提示 (字符串或配置对象) */
     systemPrompt?: SystemPrompt;
     /**
@@ -751,6 +729,13 @@ interface AgentConfig {
     skills?: string[];
     /** MCP 服务器配置 */
     mcpServers?: MCPServerConfig[];
+    /**
+     * 对当前进程环境的补充与覆盖（合并到 stdio MCP 子进程；键与 `process.env` 冲突时以本字段为准）。
+     * 与 {@link includeEnvironment}（往 system prompt 注入工作区描述）无关。
+     * 使用 `modelConfig` 时，`env` 会一并用于构造模型适配器；若传入现成 `model`，请自行用 `mergeProcessEnv` 解析密钥等。
+     * 完整继承会将 `process.env` 中的敏感变量一并带入 MCP 子进程，由调用方控制。
+     */
+    env?: Record<string, string>;
     /** 用户级基础路径，默认 ~ (homedir)，用于定位 .claude/ 目录 */
     userBasePath?: string;
     /** 存储配置 */
@@ -914,4 +899,4 @@ interface SkillOptions {
     path?: string;
 }
 
-export { type StreamEventAnnotations as $, type AgentConfig as A, HookManager as B, type CLIConfig as C, type HookResult as D, type HooksSettings as E, type FlatCommandHookEntry as F, type HooksSettingsFile as G, type HookContext as H, type ImageContent as I, type MCPOptions as J, type MCPPromptArgument as K, type MCPResourceContent as L, type Message as M, type MessageRole as N, type ModelAdapter as O, type ParsedSkill as P, type ModelCapabilities as Q, type ModelParams as R, type StorageConfig as S, type ToolResult as T, type RunOptions as U, type SessionListOptions as V, type SkillConfig as W, type SkillDefinition as X, type SkillMetadata as Y, type SkillOptions as Z, type StreamChunkType as _, type SessionInfo as a, type StreamEventType as a0, type SystemMessage as a1, type SystemPromptConfig as a2, type TextContent as a3, type ThinkingContent as a4, type ToolCall as a5, type ToolExecutionContext as a6, type ToolExecutionPolicy as a7, type ToolHandler as a8, type ToolListOptions as a9, type ToolMessage as aa, type ToolResultMetadata as ab, type ToolSchema as ac, type UserMessage as ad, buildHookEnv as ae, createAskUserQuestionTool as af, createFunctionHook as ag, formatAnswerSummary as ah, formatAskUserQuestionPrompt as ai, getInteractionTools as aj, matchTool as ak, mergeCommandHookLayers as al, questionTool as am, type StorageAdapter as b, type ToolDefinition as c, type SystemPrompt as d, type StreamEvent as e, type AgentResult as f, type MCPServerConfig as g, type SessionTokenUsage as h, type TokenUsage as i, type StreamChunk as j, type MemoryConfig as k, type AgentCallbacks as l, type AskUserQuestionAnswer as m, type AskUserQuestionItem as n, type AskUserQuestionResolver as o, type AssistantMessage as p, type CanUseToolCallback as q, type ChatOptions as r, type CommandHookConfig as s, type CompletionResult as t, type ContentPart as u, type ContextManagerConfig as v, type CreateAskUserQuestionToolOptions as w, type FunctionHook as x, type HookEventType as y, type HookGroupConfig as z };
+export { type StreamChunkType as $, type AgentConfig as A, type HookEventType as B, type CLIConfig as C, type HookGroupConfig as D, HookManager as E, type FlatCommandHookEntry as F, type HookResult as G, type HookContext as H, type HooksSettings as I, type HooksSettingsFile as J, type ImageContent as K, type MCPOptions as L, type Message as M, type MCPPromptArgument as N, type MCPResourceContent as O, type ParsedSkill as P, type MessageRole as Q, type ModelCapabilities as R, type StorageConfig as S, type ToolResult as T, type ModelParams as U, type RunOptions as V, type SessionListOptions as W, type SkillConfig as X, type SkillDefinition as Y, type SkillMetadata as Z, type SkillOptions as _, type SessionInfo as a, type StreamEventAnnotations as a0, type StreamEventType as a1, type SystemMessage as a2, type SystemPromptConfig as a3, type TextContent as a4, type ThinkingContent as a5, type ToolCall as a6, type ToolExecutionContext as a7, type ToolExecutionPolicy as a8, type ToolHandler as a9, type ToolListOptions as aa, type ToolMessage as ab, type ToolResultMetadata as ac, type ToolSchema as ad, type UserMessage as ae, buildHookEnv as af, createAskUserQuestionTool as ag, createFunctionHook as ah, formatAnswerSummary as ai, formatAskUserQuestionPrompt as aj, getInteractionTools as ak, matchTool as al, mergeCommandHookLayers as am, questionTool as an, type StorageAdapter as b, type ToolDefinition as c, type SystemPrompt as d, type StreamEvent as e, type AgentResult as f, type ModelAdapter as g, type MCPServerConfig as h, type SessionTokenUsage as i, type TokenUsage as j, type StreamChunk as k, type MemoryConfig as l, type AgentCallbacks as m, type AgentModelConfig as n, type AskUserQuestionAnswer as o, type AskUserQuestionItem as p, type AskUserQuestionResolver as q, type AssistantMessage as r, type CanUseToolCallback as s, type ChatOptions as t, type CommandHookConfig as u, type CompletionResult as v, type ContentPart as w, type ContextManagerConfig as x, type CreateAskUserQuestionToolOptions as y, type FunctionHook as z };

package/dist/{types-C0aX_Qdp.d.ts → types-BLf9IqRs.d.ts}

@@ -128,52 +128,10 @@ declare const questionsSchema: z.ZodObject<{
         options: z.ZodArray<z.ZodObject<{
             label: z.ZodString;
             description: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            description: string;
-            label: string;
-        }, {
-            description: string;
-            label: string;
-        }>, "many">;
+        }, z.core.$strip>>;
         multiSelect: z.ZodDefault<z.ZodBoolean>;
-    }, "strip", z.ZodTypeAny, {
-        options: {
-            description: string;
-            label: string;
-        }[];
-        question: string;
-        header: string;
-        multiSelect: boolean;
-    }, {
-        options: {
-            description: string;
-            label: string;
-        }[];
-        question: string;
-        header: string;
-        multiSelect?: boolean | undefined;
-    }>, "many">;
-}, "strip", z.ZodTypeAny, {
-    questions: {
-        options: {
-            description: string;
-            label: string;
-        }[];
-        question: string;
-        header: string;
-        multiSelect: boolean;
-    }[];
-}, {
-    questions: {
-        options: {
-            description: string;
-            label: string;
-        }[];
-        question: string;
-        header: string;
-        multiSelect?: boolean | undefined;
-    }[];
-}>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
 type AskUserQuestionItem = z.infer<typeof questionsSchema>['questions'][number];
 type AskUserQuestionAnswer = {
     questionIndex: number;
@@ -314,6 +272,8 @@ interface ModelParams {
      * When true, adapters may attach `providerRaw` on each {@link StreamChunk} (e.g. Anthropic SSE JSON object).
      */
     includeRawStreamEvents?: boolean;
+    /** 会话标识；Agent 会在每次模型请求中填入，各适配器自行决定是否映射到 HTTP 请求。 */
+    sessionId?: string;
 }
 /**
  * 流式块类型
@@ -450,7 +410,7 @@ interface ToolDefinition {
     /** 工具描述 */
     description: string;
     /** 参数 Schema (Zod) */
-    parameters: z.ZodSchema;
+    parameters: z.ZodType;
     /** 处理函数 */
     handler: ToolHandler;
     /** 是否危险操作 */
@@ -710,12 +670,30 @@ interface ToolExecutionPolicy {
     allowedTools?: string[];
     canUseTool?: CanUseToolCallback;
 }
+/**
+ * 与 `createModel` 参数对齐，供 `AgentConfig.modelConfig` 使用（避免 `types` 依赖 `models`）。
+ */
+interface AgentModelConfig {
+    provider: 'openai' | 'anthropic' | 'ollama';
+    apiKey?: string;
+    baseUrl?: string;
+    model?: string;
+    /** Ollama：对应 `/api/chat` 的 `think` */
+    think?: boolean | 'low' | 'medium' | 'high';
+}
 /**
  * Agent 配置
  */
 interface AgentConfig {
-    /** 模型适配器 */
-    model: ModelAdapter;
+    /**
+     * 模型适配器；与 {@link modelConfig} 二选一。
+     * 若需让 {@link env} 参与 API Key 等解析，请使用 `modelConfig`，由 Agent 内部调用 {@link mergeProcessEnv} 后构造适配器。
+     */
+    model?: ModelAdapter;
+    /**
+     * 由 Agent 在内部通过 `createModel(modelConfig, env)` 构造适配器；与 `model` 二选一。
+     */
+    modelConfig?: AgentModelConfig;
     /** 系统提示 (字符串或配置对象) */
     systemPrompt?: SystemPrompt;
     /**
@@ -751,6 +729,13 @@ interface AgentConfig {
     skills?: string[];
     /** MCP 服务器配置 */
     mcpServers?: MCPServerConfig[];
+    /**
+     * 对当前进程环境的补充与覆盖（合并到 stdio MCP 子进程；键与 `process.env` 冲突时以本字段为准）。
+     * 与 {@link includeEnvironment}（往 system prompt 注入工作区描述）无关。
+     * 使用 `modelConfig` 时，`env` 会一并用于构造模型适配器；若传入现成 `model`，请自行用 `mergeProcessEnv` 解析密钥等。
+     * 完整继承会将 `process.env` 中的敏感变量一并带入 MCP 子进程，由调用方控制。
+     */
+    env?: Record<string, string>;
     /** 用户级基础路径，默认 ~ (homedir)，用于定位 .claude/ 目录 */
     userBasePath?: string;
     /** 存储配置 */
@@ -914,4 +899,4 @@ interface SkillOptions {
     path?: string;
 }
 
-export { type StreamEventAnnotations as $, type AgentConfig as A, HookManager as B, type CLIConfig as C, type HookResult as D, type HooksSettings as E, type FlatCommandHookEntry as F, type HooksSettingsFile as G, type HookContext as H, type ImageContent as I, type MCPOptions as J, type MCPPromptArgument as K, type MCPResourceContent as L, type Message as M, type MessageRole as N, type ModelAdapter as O, type ParsedSkill as P, type ModelCapabilities as Q, type ModelParams as R, type StorageConfig as S, type ToolResult as T, type RunOptions as U, type SessionListOptions as V, type SkillConfig as W, type SkillDefinition as X, type SkillMetadata as Y, type SkillOptions as Z, type StreamChunkType as _, type SessionInfo as a, type StreamEventType as a0, type SystemMessage as a1, type SystemPromptConfig as a2, type TextContent as a3, type ThinkingContent as a4, type ToolCall as a5, type ToolExecutionContext as a6, type ToolExecutionPolicy as a7, type ToolHandler as a8, type ToolListOptions as a9, type ToolMessage as aa, type ToolResultMetadata as ab, type ToolSchema as ac, type UserMessage as ad, buildHookEnv as ae, createAskUserQuestionTool as af, createFunctionHook as ag, formatAnswerSummary as ah, formatAskUserQuestionPrompt as ai, getInteractionTools as aj, matchTool as ak, mergeCommandHookLayers as al, questionTool as am, type StorageAdapter as b, type ToolDefinition as c, type SystemPrompt as d, type StreamEvent as e, type AgentResult as f, type MCPServerConfig as g, type SessionTokenUsage as h, type TokenUsage as i, type StreamChunk as j, type MemoryConfig as k, type AgentCallbacks as l, type AskUserQuestionAnswer as m, type AskUserQuestionItem as n, type AskUserQuestionResolver as o, type AssistantMessage as p, type CanUseToolCallback as q, type ChatOptions as r, type CommandHookConfig as s, type CompletionResult as t, type ContentPart as u, type ContextManagerConfig as v, type CreateAskUserQuestionToolOptions as w, type FunctionHook as x, type HookEventType as y, type HookGroupConfig as z };
+export { type StreamChunkType as $, type AgentConfig as A, type HookEventType as B, type CLIConfig as C, type HookGroupConfig as D, HookManager as E, type FlatCommandHookEntry as F, type HookResult as G, type HookContext as H, type HooksSettings as I, type HooksSettingsFile as J, type ImageContent as K, type MCPOptions as L, type Message as M, type MCPPromptArgument as N, type MCPResourceContent as O, type ParsedSkill as P, type MessageRole as Q, type ModelCapabilities as R, type StorageConfig as S, type ToolResult as T, type ModelParams as U, type RunOptions as V, type SessionListOptions as W, type SkillConfig as X, type SkillDefinition as Y, type SkillMetadata as Z, type SkillOptions as _, type SessionInfo as a, type StreamEventAnnotations as a0, type StreamEventType as a1, type SystemMessage as a2, type SystemPromptConfig as a3, type TextContent as a4, type ThinkingContent as a5, type ToolCall as a6, type ToolExecutionContext as a7, type ToolExecutionPolicy as a8, type ToolHandler as a9, type ToolListOptions as aa, type ToolMessage as ab, type ToolResultMetadata as ac, type ToolSchema as ad, type UserMessage as ae, buildHookEnv as af, createAskUserQuestionTool as ag, createFunctionHook as ah, formatAnswerSummary as ai, formatAskUserQuestionPrompt as aj, getInteractionTools as ak, matchTool as al, mergeCommandHookLayers as am, questionTool as an, type StorageAdapter as b, type ToolDefinition as c, type SystemPrompt as d, type StreamEvent as e, type AgentResult as f, type ModelAdapter as g, type MCPServerConfig as h, type SessionTokenUsage as i, type TokenUsage as j, type StreamChunk as k, type MemoryConfig as l, type AgentCallbacks as m, type AgentModelConfig as n, type AskUserQuestionAnswer as o, type AskUserQuestionItem as p, type AskUserQuestionResolver as q, type AssistantMessage as r, type CanUseToolCallback as s, type ChatOptions as t, type CommandHookConfig as u, type CompletionResult as v, type ContentPart as w, type ContextManagerConfig as x, type CreateAskUserQuestionToolOptions as y, type FunctionHook as z };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A TypeScript Agent SDK with multi-model support, MCP integration, skill system, and streaming",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -51,6 +51,14 @@
   ],
   "author": "",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ddlqhd/agent-sdk.git"
+  },
+  "homepage": "https://github.com/ddlqhd/agent-sdk#readme",
+  "bugs": {
+    "url": "https://github.com/ddlqhd/agent-sdk/issues"
+  },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.27.0",
     "@mozilla/readability": "^0.6.0",
@@ -63,8 +71,10 @@
     "ipaddr.js": "^2.3.0",
     "linkedom": "^0.18.12",
     "micromatch": "^4.0.8",
-    "turndown": "^7.2.3",
-    "zod": "^3.23.0"
+    "turndown": "^7.2.3"
+  },
+  "peerDependencies": {
+    "zod": "^4.0.0"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.10",
@@ -72,7 +82,8 @@
     "@types/turndown": "^5.0.6",
     "tsup": "^8.0.0",
     "typescript": "^5.4.0",
-    "vitest": "^1.6.0"
+    "vitest": "^1.6.0",
+    "zod": "^4.0.0"
   },
   "engines": {
     "node": ">=18.0.0"