@snack-kit/porygon 0.1.0 → 0.3.0

package/dist/index.js

@@ -88,6 +88,10 @@ var BackendConfigSchema = z.object({
   appendSystemPrompt: z.string().optional(),
   proxy: ProxyConfigSchema.optional(),
   cwd: z.string().optional(),
+  serverUrl: z.string().optional(),
+  apiKey: z.string().optional(),
+  interactive: z.boolean().optional(),
+  cliPath: z.string().optional(),
   options: z.record(z.string(), z.unknown()).optional()
 });
 var PorygonConfigSchema = z.object({
@@ -305,12 +309,18 @@ var EphemeralProcess = class {
       throw new Error("Process aborted before start");
     }
     this.aborted = false;
+    const useStdin = options.stdinData !== void 0;
     const child = spawn(options.command, options.args, {
       cwd: options.cwd,
       env: options.env ?? void 0,
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: [useStdin ? "pipe" : "ignore", "pipe", "pipe"]
     });
     this.childProcess = child;
+    if (useStdin && child.stdin) {
+      child.stdin.write(options.stdinData, () => {
+        child.stdin.end();
+      });
+    }
     let timeoutTimer;
     if (options.timeoutMs !== void 0 && options.timeoutMs > 0) {
       timeoutTimer = setTimeout(() => {
@@ -780,15 +790,16 @@ function isResultEvent(event) {
 // src/adapters/claude/message-mapper.ts
 function mapClaudeEvent(event, sessionId) {
   const timestamp = Date.now();
-  const baseFields = { timestamp, sessionId, raw: event };
+  const resolvedSessionId = event.session_id ?? sessionId;
+  const baseFields = { timestamp, sessionId: resolvedSessionId, raw: event };
   if (isSystemEvent(event)) {
-    return {
+    return [{
       ...baseFields,
       type: "system",
       model: event.model,
       tools: event.tools,
       cwd: event.cwd
-    };
+    }];
   }
   if (isAssistantEvent(event)) {
     const content = event.message.content;
@@ -797,16 +808,16 @@ function mapClaudeEvent(event, sessionId) {
   if (isStreamEvent(event)) {
     const delta = event.event.delta;
     if (delta?.type === "text_delta" && delta.text) {
-      return {
+      return [{
         ...baseFields,
         type: "stream_chunk",
         text: delta.text
-      };
+      }];
     }
-    return null;
+    return [];
   }
   if (isResultEvent(event)) {
-    return {
+    return [{
       ...baseFields,
       type: "result",
       text: event.result,
@@ -814,38 +825,52 @@ function mapClaudeEvent(event, sessionId) {
       durationMs: event.duration_ms,
       inputTokens: event.input_tokens,
       outputTokens: event.output_tokens
-    };
+    }];
   }
-  return null;
+  return [];
 }
 function mapAssistantContent(blocks, baseFields) {
-  if (!blocks || blocks.length === 0) return null;
+  if (!blocks || blocks.length === 0) return [];
+  const messages = [];
   const textParts = [];
-  let firstToolUse = null;
   for (const block of blocks) {
     if (block.type === "text" && block.text) {
       textParts.push(block.text);
-    }
-    if (block.type === "tool_use" && !firstToolUse) {
-      firstToolUse = { name: block.name, input: block.input };
+      messages.push({
+        ...baseFields,
+        type: "stream_chunk",
+        text: block.text
+      });
     }
   }
   if (textParts.length > 0) {
-    return {
+    messages.push({
       ...baseFields,
       type: "assistant",
-      text: textParts.join("\n")
-    };
+      text: textParts.join("\n"),
+      turnComplete: true
+    });
   }
-  if (firstToolUse) {
-    return {
-      ...baseFields,
-      type: "tool_use",
-      toolName: firstToolUse.name,
-      input: firstToolUse.input
-    };
+  for (const block of blocks) {
+    if (block.type === "tool_use") {
+      messages.push({
+        ...baseFields,
+        type: "tool_use",
+        toolName: block.name,
+        input: block.input
+      });
+    }
+    if (block.type === "tool_result") {
+      messages.push({
+        ...baseFields,
+        type: "tool_use",
+        toolName: block.tool_use_id,
+        input: {},
+        output: block.content
+      });
+    }
   }
-  return null;
+  return messages;
 }
 
 // src/adapters/claude/index.ts
@@ -857,6 +882,10 @@ var CLAUDE_MODELS = [
 ];
 var ClaudeAdapter = class extends AbstractAgentAdapter {
   backend = "claude";
+  /** CLI 命令名或路径 */
+  get cliCommand() {
+    return this.config?.cliPath ?? "claude";
+  }
   /**
    * 检查 Claude CLI 是否可用
    */
@@ -865,7 +894,7 @@ var ClaudeAdapter = class extends AbstractAgentAdapter {
       const proc = new EphemeralProcess();
       const result = await proc.execute({
         command: "which",
-        args: ["claude"]
+        args: [this.cliCommand]
       });
       return result.exitCode === 0;
     } catch {
@@ -878,7 +907,7 @@ var ClaudeAdapter = class extends AbstractAgentAdapter {
   async getVersion() {
     const proc = new EphemeralProcess();
     const result = await proc.execute({
-      command: "claude",
+      command: this.cliCommand,
       args: ["--version"]
     });
     if (result.exitCode !== 0) {
@@ -903,8 +932,10 @@ var ClaudeAdapter = class extends AbstractAgentAdapter {
         "tool-restriction",
         "mcp",
         "subagents",
-        "worktree"
+        "worktree",
+        "interactive-session"
       ]),
+      streamingMode: "chunked",
       outputFormats: ["text", "json", "stream-json"],
       testedVersionRange: ">=1.0.0"
     };
@@ -935,14 +966,16 @@ var ClaudeAdapter = class extends AbstractAgentAdapter {
           if (v) cleanEnv[k] = v;
         }
       }
+      const stdinData = this.buildStdinData(request);
       const streamOptions = {
-        command: "claude",
+        command: this.cliCommand,
         args,
         ...cwd ? { cwd } : {},
         env: cleanEnv,
-        timeoutMs: request.timeoutMs
+        timeoutMs: request.timeoutMs,
+        stdinData
       };
-      const cmdStr = ["claude", ...args.map((a) => /[\s"']/.test(a) ? JSON.stringify(a) : a)].join(" ");
+      const cmdStr = [this.cliCommand, ...args.map((a) => /[\s"']/.test(a) ? JSON.stringify(a) : a)].join(" ");
       const debugCmd = cwd ? `cd ${JSON.stringify(cwd)} && ${cmdStr}` : cmdStr;
       yield {
         type: "system",
@@ -963,8 +996,8 @@ var ClaudeAdapter = class extends AbstractAgentAdapter {
         } catch {
           continue;
         }
-        const message = mapClaudeEvent(parsed, sessionId);
-        if (message) {
+        const messages = mapClaudeEvent(parsed, sessionId);
+        for (const message of messages) {
           yield message;
         }
       }
@@ -984,7 +1017,7 @@ var ClaudeAdapter = class extends AbstractAgentAdapter {
       args.push("--limit", String(options.limit));
     }
     const result = await proc.execute({
-      command: "claude",
+      command: this.cliCommand,
       args,
       cwd: options?.cwd
     });
@@ -1073,10 +1106,16 @@ var ClaudeAdapter = class extends AbstractAgentAdapter {
       env["NO_PROXY"] = noProxy;
     }
   }
+  /**
+   * 构建通过 stdin 传递给 Claude CLI 的数据。
+   * 使用 stdin 而非 CLI 参数传递 prompt，避免超长参数导致的 403 错误。
+   */
+  buildStdinData(request) {
+    return request.prompt;
+  }
   buildArgs(request) {
     const args = [
-      "-p",
-      request.prompt,
+      "--print",
       "--output-format",
       "stream-json",
       "--verbose"
@@ -1108,6 +1147,11 @@ var ClaudeAdapter = class extends AbstractAgentAdapter {
     if (request.maxTurns !== void 0) {
       args.push("--max-turns", String(request.maxTurns));
     }
+    const interactive = this.config?.interactive;
+    const skipPerms = interactive === false || request.backendOptions?.dangerouslySkipPermissions || this.config?.options?.dangerouslySkipPermissions;
+    if (skipPerms) {
+      args.push("--dangerously-skip-permissions");
+    }
     if (request.mcpServers) {
       for (const [name, config] of Object.entries(request.mcpServers)) {
         const serverSpec = {
@@ -1144,11 +1188,14 @@ var OpenCodeApiError = class extends Error {
 var DEFAULT_TIMEOUT_MS = 3e4;
 var OpenCodeApiClient = class {
   baseUrl;
+  apiKey;
   /**
    * @param baseUrl opencode serve 服务的基础 URL，例如 http://localhost:39393
+   * @param apiKey 可选的 API Key，用于 Basic Auth 认证（username: opencode, password: apiKey）
    */
-  constructor(baseUrl) {
+  constructor(baseUrl, apiKey) {
     this.baseUrl = baseUrl.replace(/\/+$/, "");
+    this.apiKey = apiKey;
   }
   /**
    * 创建新会话
@@ -1206,7 +1253,8 @@ var OpenCodeApiClient = class {
       method: "GET",
       headers: {
         Accept: "text/event-stream",
-        "Cache-Control": "no-cache"
+        "Cache-Control": "no-cache",
+        ...this.buildAuthHeaders()
       },
       signal: abortSignal
     });
@@ -1257,6 +1305,7 @@ var OpenCodeApiClient = class {
       const timer = setTimeout(() => controller.abort(), 5e3);
       const response = await fetch(`${this.baseUrl}/api/sessions`, {
         method: "GET",
+        headers: this.buildAuthHeaders(),
         signal: controller.signal
       });
       clearTimeout(timer);
@@ -1294,6 +1343,17 @@ var OpenCodeApiClient = class {
    * @param init fetch 请求选项
    * @returns 解析后的 JSON 响应
    */
+  /**
+   * 构建包含认证信息的请求 headers
+   */
+  buildAuthHeaders() {
+    const headers = {};
+    if (this.apiKey) {
+      const credentials = Buffer.from(`opencode:${this.apiKey}`).toString("base64");
+      headers["Authorization"] = `Basic ${credentials}`;
+    }
+    return headers;
+  }
   async request(path, init) {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), DEFAULT_TIMEOUT_MS);
@@ -1302,6 +1362,7 @@ var OpenCodeApiClient = class {
         ...init,
         headers: {
           "Content-Type": "application/json",
+          ...this.buildAuthHeaders(),
           ...init.headers
         },
         signal: controller.signal
@@ -1395,18 +1456,36 @@ var OpenCodeAdapter = class extends AbstractAgentAdapter {
   backend = "opencode";
   apiClient = null;
   servePort;
+  /** 远程服务器 URL（提供时跳过自启 serve） */
+  remoteServerUrl;
+  /** API Key（用于 Basic Auth） */
+  apiKey;
   /**
    * @param processManager 进程管理器实例
-   * @param servePort 可选的 serve 服务端口
+   * @param config 可选的后端配置
+   *   - serverUrl: 远程 OpenCode 服务地址，提供时跳过自启 serve
+   *   - apiKey: API Key，用于 Basic Auth 认证
+   *   - options.servePort: 本地 serve 端口（仅自启模式）
    */
-  constructor(processManager, servePort) {
-    super(processManager);
-    this.servePort = servePort ?? DEFAULT_SERVE_PORT;
+  constructor(processManager, config) {
+    super(processManager, config);
+    const opts = config?.options ?? {};
+    this.remoteServerUrl = config?.serverUrl ?? opts.serverUrl;
+    this.apiKey = config?.apiKey ?? opts.apiKey;
+    this.servePort = opts.servePort ?? DEFAULT_SERVE_PORT;
   }
   /**
    * 检查 opencode 命令是否可用
    */
   async isAvailable() {
+    if (this.remoteServerUrl) {
+      try {
+        const client = new OpenCodeApiClient(this.remoteServerUrl, this.apiKey);
+        return await client.healthCheck();
+      } catch {
+        return false;
+      }
+    }
     try {
       const proc = new EphemeralProcess();
       const result = await proc.execute({
@@ -1445,6 +1524,7 @@ var OpenCodeAdapter = class extends AbstractAgentAdapter {
         "system-prompt",
         "serve-mode"
       ]),
+      streamingMode: "delta",
       outputFormats: ["text"],
       testedVersionRange: TESTED_VERSION_RANGE
     };
@@ -1582,8 +1662,20 @@ var OpenCodeAdapter = class extends AbstractAgentAdapter {
       const healthy = await this.apiClient.healthCheck();
       if (healthy) return this.apiClient;
     }
+    if (this.remoteServerUrl) {
+      const client2 = new OpenCodeApiClient(this.remoteServerUrl, this.apiKey);
+      const healthy = await client2.healthCheck();
+      if (!healthy) {
+        throw new Error(
+          `\u65E0\u6CD5\u8FDE\u63A5\u8FDC\u7A0B OpenCode \u670D\u52A1: ${this.remoteServerUrl}`
+        );
+      }
+      this.apiClient = client2;
+      return client2;
+    }
     const client = new OpenCodeApiClient(
-      `http://localhost:${this.servePort}`
+      `http://localhost:${this.servePort}`,
+      this.apiKey
     );
     const alreadyRunning = await client.healthCheck();
     if (alreadyRunning) {
@@ -1635,6 +1727,54 @@ var OpenCodeAdapter = class extends AbstractAgentAdapter {
   }
 };
 
+// src/session/interactive-session.ts
+var InteractiveSession = class {
+  initialSessionId;
+  resolvedSessionId;
+  adapter;
+  baseRequest;
+  firstSent = false;
+  closed = false;
+  constructor(initialSessionId, adapter, baseRequest) {
+    this.initialSessionId = initialSessionId;
+    this.adapter = adapter;
+    this.baseRequest = baseRequest;
+  }
+  /** 当前生效的 sessionId（首次 send 后反映 CLI 返回的真实 ID） */
+  get sessionId() {
+    return this.resolvedSessionId ?? this.initialSessionId;
+  }
+  /** 会话是否仍然活跃 */
+  get isActive() {
+    return !this.closed;
+  }
+  /**
+   * 发送一条消息，返回流式响应。
+   * 首次调用使用 initialSessionId，后续自动附加 resume。
+   */
+  async *send(prompt) {
+    if (this.closed) {
+      throw new SessionNotFoundError(this.sessionId);
+    }
+    const request = {
+      ...this.baseRequest,
+      prompt,
+      ...this.firstSent ? { resume: this.sessionId } : {}
+    };
+    for await (const msg of this.adapter.query(request)) {
+      if (!this.firstSent && msg.sessionId) {
+        this.resolvedSessionId = msg.sessionId;
+      }
+      yield msg;
+    }
+    this.firstSent = true;
+  }
+  /** 关闭会话（仅清理内部状态，无进程需要释放） */
+  close() {
+    this.closed = true;
+  }
+};
+
 // src/porygon.ts
 var Porygon = class extends EventEmitter2 {
   config;
@@ -1661,7 +1801,12 @@ var Porygon = class extends EventEmitter2 {
     };
     const claudeAdapter = new ClaudeAdapter(this.processManager, mergedClaudeConfig);
     this.registerAdapter(claudeAdapter);
-    const opencodeAdapter = new OpenCodeAdapter(this.processManager);
+    const opencodeConfig = this.config.backends?.["opencode"];
+    const mergedOpencodeConfig = {
+      ...opencodeConfig,
+      proxy: opencodeConfig?.proxy ?? this.config.proxy
+    };
+    const opencodeAdapter = new OpenCodeAdapter(this.processManager, mergedOpencodeConfig);
     this.registerAdapter(opencodeAdapter);
   }
   /**
@@ -1729,6 +1874,21 @@ var Porygon = class extends EventEmitter2 {
     }
     return resultText;
   }
+  /**
+   * 创建交互式多轮对话会话。
+   * 自动管理 sessionId 和 resume，对调用方透明。
+   */
+  session(options) {
+    const backend = options?.backend ?? this.config.defaultBackend ?? "claude";
+    const adapter = this.getAdapter(backend);
+    const merged = this.mergeRequest({ ...options, prompt: "" }, backend);
+    const { prompt: _, ...baseRequest } = merged;
+    return new InteractiveSession(
+      crypto.randomUUID(),
+      adapter,
+      baseRequest
+    );
+  }
   /**
    * 注册拦截器
    * @param direction 拦截方向
@@ -1753,29 +1913,45 @@ var Porygon = class extends EventEmitter2 {
     return this.getAdapter(backend).listModels();
   }
   /**
-   * 对所有已注册后端进行健康检查
+   * 检查单个后端的健康状态
+   * @param backend 后端名称
    */
-  async healthCheck() {
-    const entries = Array.from(this.adapters.entries());
-    const checks = entries.map(async ([name, adapter]) => {
-      try {
-        const available = await adapter.isAvailable();
-        let compatibility = null;
-        if (available) {
-          compatibility = await adapter.checkCompatibility();
-          if (!compatibility.supported) {
-            this.emit(
-              "health:degraded",
-              name,
-              compatibility.warnings.join("; ")
-            );
-          }
-        }
-        return [name, { available, compatibility }];
-      } catch (err) {
-        const errorMsg = err instanceof Error ? err.message : String(err);
-        return [name, { available: false, compatibility: null, error: errorMsg }];
+  async checkBackend(backend) {
+    const adapter = this.getAdapter(backend);
+    try {
+      const available = await adapter.isAvailable();
+      if (!available) {
+        return { available: false };
       }
+      const compat = await adapter.checkCompatibility();
+      const result = {
+        available: true,
+        version: compat.version,
+        supported: compat.supported
+      };
+      if (compat.warnings.length > 0) {
+        result.warnings = compat.warnings;
+      }
+      if (!compat.supported) {
+        this.emit("health:degraded", backend, compat.warnings.join("; "));
+      }
+      return result;
+    } catch (err) {
+      return {
+        available: false,
+        error: err instanceof Error ? err.message : String(err)
+      };
+    }
+  }
+  /**
+   * 对所有已注册后端进行健康检查。
+   * 返回扁平化结构，包含 version/supported/warnings 等字段。
+   */
+  async healthCheck() {
+    const entries = Array.from(this.adapters.keys());
+    const checks = entries.map(async (name) => {
+      const result = await this.checkBackend(name);
+      return [name, result];
     });
     const settled = await Promise.allSettled(checks);
     const results = {};
@@ -1831,7 +2007,16 @@ var Porygon = class extends EventEmitter2 {
     this.sessionManager.clearCache();
   }
   /**
-   * 合并请求参数与配置默认值
+   * 合并请求参数与配置默认值。
+   *
+   * 合并策略：
+   * - model: request > backendConfig > 不设置（后端使用自身默认值）
+   * - timeoutMs: request > defaults
+   * - maxTurns: request > defaults
+   * - cwd: request > backendConfig
+   * - appendSystemPrompt: **追加模式** — defaults + backendConfig + request 三层拼接（换行分隔）
+   *   但如果 request.systemPrompt 已设置（替换模式），则忽略所有 appendSystemPrompt
+   *
    * @param request 原始请求
    * @param backend 后端名称
    * @returns 合并后的请求
@@ -1951,6 +2136,7 @@ export {
   AgentTimeoutError,
   ClaudeAdapter,
   ConfigValidationError,
+  InteractiveSession,
   InterceptorRejectedError,
   OpenCodeAdapter,
   Porygon,