@winmatrix/supervisor 1.0.5 → 1.0.7

package/src/run-engine.mjs

@@ -6,6 +6,7 @@
  *        --engine <claude-code|codex|hermes|openclaw> \
  *        [--model <model>] [--permission-mode <mode>] \
  *        [--allowed-tools <tool1,tool2>] [--resume <sessionId>|--fork <sessionId>] \
+ *        [--context-budget <json>] \
  *        [--timeout <seconds>] [--work-dir <dir>] \
  *        <prompt>
  *
@@ -13,11 +14,76 @@
  * 输出到 stdout，供 run-agent-engine.mjs 解析并写入 events.jsonl。
  */
 import { createRequire } from 'node:module';
+import { isSdkFailureSubtype } from './engine-run-success.mjs';
+import { createWorkstationOpenClawAdapterConfig } from './openclaw-device-store.mjs';
 
 const require = createRequire(import.meta.url);
 
 const SDK_PATH = process.env.WINMATRIX_AGENT_SDK_PATH
   || '/home/node/.local/lib/node_modules/@winmatrix/agent-sdk';
+const MAX_PRIVATE_BINDINGS_BYTES = 64 * 1024;
+const MCP_DYNAMIC_SECRET_KEYS = new Set([
+  'WINMATRIX_TOOL_PROXY_URL',
+  'WINMATRIX_TOOL_PROXY_TOKEN',
+  'WINMATRIX_TOOL_PROXY_PROJECT_ID',
+]);
+
+function normalizeEventText(value) {
+  if (typeof value === 'string') return value;
+  if (value === null || value === undefined) return '';
+  if (Array.isArray(value)) {
+    return value.map(normalizeEventText).filter(Boolean).join('\n');
+  }
+  if (typeof value === 'object') {
+    if (typeof value.text === 'string') return value.text;
+    try {
+      return JSON.stringify(value);
+    } catch {
+      return '';
+    }
+  }
+  return String(value);
+}
+
+async function readMcpBinding() {
+  const chunks = [];
+  let size = 0;
+  for await (const chunk of process.stdin) {
+    size += chunk.length;
+    if (size > MAX_PRIVATE_BINDINGS_BYTES) {
+      return { error: 'MCP_BINDING_REQUIRED: 私有控制绑定超过允许大小。' };
+    }
+    chunks.push(chunk);
+  }
+  if (chunks.length === 0) return {};
+
+  try {
+    const raw = JSON.parse(Buffer.concat(chunks).toString('utf8'));
+    if (!raw || raw.hostKind !== 'workstation') {
+      return { error: 'MCP_BINDING_REQUIRED: 私有控制绑定 hostKind 无效。' };
+    }
+    const dynamicSecrets = raw.dynamicSecrets;
+    if (dynamicSecrets === undefined) {
+      return { error: 'MCP_BINDING_REQUIRED: 工作站缺少 MCP 绑定。' };
+    }
+    if (!dynamicSecrets || typeof dynamicSecrets !== 'object' || Array.isArray(dynamicSecrets)) {
+      return { error: 'MCP_BINDING_REQUIRED: MCP 绑定格式无效。' };
+    }
+    for (const [key, value] of Object.entries(dynamicSecrets)) {
+      if (!MCP_DYNAMIC_SECRET_KEYS.has(key) || typeof value !== 'string') {
+        return { error: 'MCP_BINDING_REQUIRED: MCP 绑定包含不允许字段。' };
+      }
+    }
+    const url = dynamicSecrets.WINMATRIX_TOOL_PROXY_URL?.trim();
+    const token = dynamicSecrets.WINMATRIX_TOOL_PROXY_TOKEN?.trim();
+    if (!url || !token) {
+      return { error: 'MCP_BINDING_REQUIRED: MCP 绑定不完整。' };
+    }
+    return { binding: { url, token } };
+  } catch {
+    return { error: 'MCP_BINDING_REQUIRED: 私有控制绑定不是有效 JSON。' };
+  }
+}
 
 function parseArgs(argv) {
   const options = {
@@ -29,6 +95,7 @@ function parseArgs(argv) {
     fork: undefined,
     timeoutSec: undefined,
     workDir: undefined,
+    contextBudget: undefined,
   };
   const positionals = [];
 
@@ -50,6 +117,18 @@ function parseArgs(argv) {
       options.timeoutSec = argv[++i];
     } else if (arg === '--work-dir') {
       options.workDir = argv[++i];
+    } else if (arg === '--context-budget') {
+      const raw = argv[++i];
+      try {
+        const parsed = JSON.parse(raw);
+        if (parsed && typeof parsed === 'object') {
+          options.contextBudget = parsed;
+        } else {
+          console.error('[run-engine] --context-budget 不是有效 JSON 对象, 已忽略');
+        }
+      } catch {
+        console.error('[run-engine] --context-budget JSON 解析失败, 已忽略');
+      }
     } else if (arg.startsWith('--')) {
       // 忽略未来可能透传的 engine-specific 选项；后续可按 engineId 路由
       console.error(`[run-engine] 忽略未知选项: ${arg}`);
@@ -78,6 +157,13 @@ async function main() {
     process.exit(1);
   }
 
+  const mcpBinding = await readMcpBinding();
+  if (mcpBinding.error) {
+    writeEvent({ type: 'error', error: mcpBinding.error, code: 'MCP_CONNECTION_FAILED' });
+    process.exitCode = 1;
+    return;
+  }
+
   let sdk;
   try {
     sdk = require(SDK_PATH);
@@ -92,8 +178,19 @@ async function main() {
     CodexAdapter,
     HermesAdapter,
     OpenClawAdapter,
+    validateMcpBridgeUrl,
   } = sdk;
 
+  if (mcpBinding.binding) {
+    try {
+      validateMcpBridgeUrl(mcpBinding.binding.url);
+    } catch (err) {
+      writeEvent({ type: 'error', error: `MCP_BINDING_REQUIRED: MCP URL 无效: ${err.message}`, code: 'MCP_CONNECTION_FAILED' });
+      process.exitCode = 1;
+      return;
+    }
+  }
+
   const registry = new AdapterRegistry();
   registry.register('claude-code', ClaudeAdapter);
   registry.register('codex', CodexAdapter);
@@ -105,7 +202,12 @@ async function main() {
     process.exit(1);
   }
 
-  const adapterConfig = {};
+  const adapterConfig = options.engineId === 'openclaw'
+    ? {
+        ...createWorkstationOpenClawAdapterConfig(),
+        ...(mcpBinding.binding ? { mcpBridgeUrl: mcpBinding.binding.url } : {}),
+      }
+    : (mcpBinding.binding ? { mcpBridgeUrl: mcpBinding.binding.url } : {});
   const adapter = registry.create(options.engineId, adapterConfig);
 
   /** @type {import('@winmatrix/agent-sdk').AgentTaskContext} */
@@ -116,9 +218,13 @@ async function main() {
     engineId: options.engineId,
     workDir: options.workDir,
   };
+  if (mcpBinding.binding) task.mcpToken = mcpBinding.binding.token;
+  if (options.contextBudget) task.contextBudget = options.contextBudget;
 
   if (options.engineId === 'claude-code') {
-    task.claude = {};
+    // Coding workstation 使用 Agent SDK 路径：任务 MCP 仅随 query() 显式传入，
+    // 不落盘到 artifact，也不改写 Pod 注入的持久 agent-home。
+    task.claude = { useAgentSdk: true };
     if (options.permissionMode) task.claude.permissionMode = options.permissionMode;
     if (options.allowedTools) task.claude.tools = options.allowedTools.split(',').map((s) => s.trim());
   } else if (options.engineId === 'hermes') {
@@ -150,28 +256,53 @@ async function main() {
   }
 
   try {
+    const startedAt = Date.now();
+    // 链路日志走 stderr：stdout 是 JSONL 协议通道
+    console.error(`[run-engine] pid=${process.pid} adapter.execute 开始: engineId=${options.engineId} workDir=${options.workDir ?? '(cwd)'} resume=${options.resume ?? 'none'} fork=${options.fork ?? 'none'} timeoutSec=${options.timeoutSec ?? 'none'}`);
+    let eventCount = 0;
     for await (const event of adapter.execute(task, abortController?.signal)) {
+      eventCount += 1;
       switch (event.type) {
         case 'delta':
-          writeEvent({ type: 'content_delta', text: event.content });
+          if (event.engineEvent) {
+            writeEvent(event.engineEvent);
+          } else {
+            writeEvent({ type: 'content_delta', text: normalizeEventText(event.content) });
+          }
           break;
         case 'thinking':
-          writeEvent({ type: 'thinking_delta', text: event.content });
+          if (event.engineEvent) {
+            writeEvent(event.engineEvent);
+          } else {
+            writeEvent({ type: 'thinking_delta', text: normalizeEventText(event.content) });
+          }
           break;
         case 'tool_call':
           writeEvent({ type: 'tool_call', name: event.name, input: event.args });
           break;
-        case 'result':
+        case 'result': {
+          const isError = event.isError === true;
+          const subtype = typeof event.sdkSubtype === 'string' ? event.sdkSubtype : undefined;
+          const sdkFailed = isError || isSdkFailureSubtype(subtype);
+          const text = normalizeEventText(event.content);
+          const error = sdkFailed
+            ? (text.trim() || (subtype ? `SDK result subtype=${subtype}` : 'SDK result is_error=true'))
+            : undefined;
+          console.error(`[run-engine] pid=${process.pid} adapter.execute 结束: engineId=${options.engineId} events=${eventCount} durationMs=${Date.now() - startedAt} sessionId=${event.sessionId ?? 'none'} success=${!sdkFailed} subtype=${subtype ?? 'none'}`);
           writeEvent({
             type: 'result',
             result: {
-              success: true,
-              text: event.content,
+              success: !sdkFailed,
+              text,
               ...(event.sessionId ? { sessionId: event.sessionId } : {}),
               ...(event.usage ? { usage: event.usage } : {}),
+              ...(isError ? { is_error: true } : {}),
+              ...(subtype ? { subtype } : {}),
+              ...(error ? { error } : {}),
             },
           });
           break;
+        }
         case 'error':
           writeEvent({ type: 'error', error: event.message, code: event.code });
           break;
@@ -182,6 +313,7 @@ async function main() {
     }
     process.exit(0);
   } catch (e) {
+    console.error(`[run-engine] pid=${process.pid} adapter.execute 异常: engineId=${options.engineId} error=${e instanceof Error ? e.message : String(e)}`);
     writeEvent({ type: 'error', error: e instanceof Error ? e.message : String(e) });
     process.exit(1);
   } finally {