@xyagent/cli 0.0.1 → 1.1.0

package/src-ext/service/serviceManager.mjs

@@ -12,6 +12,7 @@
 // 所以调用前必须先跑过 `agentlink pair <code> -r <runtime>` —— ensureState 会校验。
 
 import fs from "node:fs";
+import { createHash } from "node:crypto";
 import os from "node:os";
 import path from "node:path";
 import process from "node:process";
@@ -19,7 +20,30 @@ import { spawnSync } from "node:child_process";
 import { readPairState } from "../core/pairCodeClient.mjs";
 import { ensureDefaultWorkspace, defaultWorkspacePath } from "../core/defaultWorkspace.mjs";
 
-const SERVICE_RUNTIMES = new Set(["claude", "codex"]);
+const SERVICE_RUNTIMES = new Set([
+  "claude", "codex", "cursor", "opencode", "qwen", "kimi", "codebuddy",
+]);
+const SERVICE_SCOPE_HASH_LENGTH = 12;
+
+function resolveAgentlinkHome() {
+  const configured = String(process.env.AGENTLINK_HOME ?? "").trim();
+  return configured || path.join(os.homedir(), ".agentlink");
+}
+
+export function serviceScopeSuffixFor(agentlinkHome, defaultAgentlinkHome) {
+  const currentHome = path.resolve(agentlinkHome);
+  const defaultHome = path.resolve(defaultAgentlinkHome);
+  if (currentHome === defaultHome) return "";
+  const digest = createHash("sha256").update(currentHome).digest("hex");
+  return `-${digest.slice(0, SERVICE_SCOPE_HASH_LENGTH)}`;
+}
+
+function serviceScopeSuffix() {
+  return serviceScopeSuffixFor(
+    resolveAgentlinkHome(),
+    path.join(os.homedir(), ".agentlink"),
+  );
+}
 
 /**
  * reload 用的 runtime 清单 —— 比 install 集合更广：也覆盖 openclaw/hermes
@@ -42,6 +66,31 @@ const ALL_RELOAD_TARGETS = {
     linux: "agentlink-agent-codex.service",
     win:   "Agentlink\\Agent-codex",
   },
+  cursor: {
+    mac:   "com.agentlink.agent.cursor",
+    linux: "agentlink-agent-cursor.service",
+    win:   "Agentlink\\Agent-cursor",
+  },
+  opencode: {
+    mac:   "com.agentlink.agent.opencode",
+    linux: "agentlink-agent-opencode.service",
+    win:   "Agentlink\\Agent-opencode",
+  },
+  qwen: {
+    mac:   "com.agentlink.agent.qwen",
+    linux: "agentlink-agent-qwen.service",
+    win:   "Agentlink\\Agent-qwen",
+  },
+  kimi: {
+    mac:   "com.agentlink.agent.kimi",
+    linux: "agentlink-agent-kimi.service",
+    win:   "Agentlink\\Agent-kimi",
+  },
+  codebuddy: {
+    mac:   "com.agentlink.agent.codebuddy",
+    linux: "agentlink-agent-codebuddy.service",
+    win:   "Agentlink\\Agent-codebuddy",
+  },
   openclaw: {
     mac:   "com.agentlink.bridge",
     linux: "agentlink-bridge.service",
@@ -54,6 +103,18 @@ const ALL_RELOAD_TARGETS = {
   },
 };
 
+function reloadTarget(runtime) {
+  const target = ALL_RELOAD_TARGETS[runtime];
+  if (!target) return null;
+  const scope = serviceScopeSuffix();
+  if (!scope) return target;
+  return {
+    mac: `${target.mac}${scope}`,
+    linux: target.linux.replace(/\.service$/, `${scope}.service`),
+    win: `${target.win}${scope}`,
+  };
+}
+
 function ensureRuntime(runtime) {
   if (!SERVICE_RUNTIMES.has(runtime)) {
     throw new Error(`service runtime must be one of: ${[...SERVICE_RUNTIMES].join(", ")}`);
@@ -95,7 +156,7 @@ function agentBinPath() {
 }
 
 // ===== macOS launchd =====
-function macLabel(runtime) { return `com.agentlink.agent.${runtime}`; }
+function macLabel(runtime) { return `com.agentlink.agent.${runtime}${serviceScopeSuffix()}`; }
 function macPlistPath(runtime) {
   return path.join(os.homedir(), "Library", "LaunchAgents", `${macLabel(runtime)}.plist`);
 }
@@ -114,7 +175,7 @@ function macUid() {
  * "进程未运行起来"，反复 pair / 残留旧 plist 更易触发。
  *
  * 健壮序列（与 bin/agentlink 的 installBridgeServiceMac 对齐）：
- *   bootout    —— 现代 unload，先拆掉任何同 label 的旧实例（幂等，未加载也无妨）
+ *   bootout    —— 先按 service target 拆掉任何同 label 的旧实例（幂等，未加载也无妨）
  *   bootstrap  —— 把 job 加载进 GUI domain
  *   enable     —— 清掉上一次 unload -w / disable 留下的 stale "disabled" override
  *   kickstart -k —— 强制真正运行（已在跑则重启），不再靠 RunAtLoad 的运气
@@ -125,6 +186,9 @@ export function buildMacInstallSteps({ uid, label, plistPath }) {
   const domain = `gui/${uid}`;
   const service = `gui/${uid}/${label}`;
   return [
+    // 不能只按 plistPath bootout：同 label 的旧 job 可能来自已删掉的临时 HOME。
+    { cmd: "launchctl", args: ["bootout", service] },
+    // 兼容历史按 plist 加载的实例；上一步未命中时仍尽力清理。
     { cmd: "launchctl", args: ["bootout", domain, plistPath] },
     { cmd: "launchctl", args: ["bootstrap", domain, plistPath] },
     { cmd: "launchctl", args: ["enable", service] },
@@ -132,12 +196,51 @@ export function buildMacInstallSteps({ uid, label, plistPath }) {
   ];
 }
 
+/**
+ * 执行并验证 macOS 安装步骤。注入 spawn 使测试不必触碰真实 gui/<uid> launchd 域。
+ */
+export function runMacInstallSteps({ steps, plistPath, service, spawn = spawnSync, log }) {
+  let bootstrapOk = false;
+  let kickstart = null;
+  for (const step of steps) {
+    const verb = step.args[0];
+    const result = spawn(step.cmd, step.args, { encoding: "utf8" });
+    // bootout 对未加载的 job 必然失败，安装仍应是幂等的。
+    if (verb === "bootout") continue;
+    if (verb === "bootstrap") {
+      bootstrapOk = result.status === 0;
+      continue;
+    }
+    if (verb === "enable") continue;
+    if (verb === "kickstart") kickstart = result;
+  }
+
+  if (!kickstart || kickstart.status !== 0) {
+    log?.warn("service.install", "modern launchctl sequence failed, falling back to load -w", {
+      bootstrap_ok: bootstrapOk,
+    });
+    const fallback = spawn("launchctl", ["load", "-w", plistPath], { encoding: "utf8" });
+    if (fallback.status !== 0) {
+      throw new Error("launchctl bootstrap/kickstart failed");
+    }
+  }
+
+  const printed = spawn("launchctl", ["print", service], { encoding: "utf8" });
+  if (printed.status !== 0) {
+    throw new Error(`launchctl install verification failed for ${service}`);
+  }
+  const loadedPath = parseLaunchctlPrint(printed.stdout).path;
+  if (loadedPath !== plistPath) {
+    throw new Error(`launchctl loaded unexpected plist for ${service}`);
+  }
+}
+
 /**
  * 解析 `launchctl print gui/<uid>/<label>` 的关键字段。纯函数，便于单测。
  * 只有 print 能暴露 `runs`，识破 pid 文件看不出的 "loaded but runs=0" 陷阱。
  */
 export function parseLaunchctlPrint(out) {
-  const h = { state: null, pid: null, runs: null, lastExitCode: null };
+  const h = { state: null, pid: null, runs: null, lastExitCode: null, path: null };
   for (const line of String(out || "").split(/\r?\n/)) {
     const t = line.trim();
     let m;
@@ -145,6 +248,7 @@ export function parseLaunchctlPrint(out) {
     else if ((m = t.match(/^pid\s*=\s*(\d+)$/))) h.pid = Number(m[1]);
     else if ((m = t.match(/^runs\s*=\s*(\d+)$/))) h.runs = Number(m[1]);
     else if ((m = t.match(/^last exit code\s*=\s*(\d+)$/))) h.lastExitCode = Number(m[1]);
+    else if ((m = t.match(/^path\s*=\s*(.+)$/))) h.path = m[1].trim();
   }
   h.running = (h.state || "").toLowerCase() === "running" || (h.pid != null && h.pid > 0);
   return h;
@@ -156,13 +260,13 @@ async function macInstall(runtime, log) {
   const state = ensureStateOrFail(runtime);
   const label = macLabel(runtime);
   const plistPath = macPlistPath(runtime);
-  const logDir = path.join(os.homedir(), ".agentlink", "logs");
+  const logDir = path.join(resolveAgentlinkHome(), "logs");
   fs.mkdirSync(logDir, { recursive: true });
 
-  // align-runtime-default-workspace: 仅 claude/codex 注入 WorkingDirectory
+  // 所有 bridge runtime 都使用自己的默认工作区，避免服务从不确定目录启动。
   // install 前确保目录存在（否则 launchd 因 WorkingDirectory 不存在拒绝启动）
   let workingDirectory = null;
-  if (runtime === "claude" || runtime === "codex") {
+  if (SERVICE_RUNTIMES.has(runtime)) {
     workingDirectory = await ensureDefaultWorkspace(runtime);
   }
   const stdoutLog = path.join(logDir, `service-${runtime}.out.log`);
@@ -203,6 +307,7 @@ async function macInstall(runtime, log) {
   <key>EnvironmentVariables</key>
   <dict>
     <key>AGENTLINK_RELAY_URL</key><string>${escapeXml(state.relay_url)}</string>
+    <key>AGENTLINK_HOME</key><string>${escapeXml(resolveAgentlinkHome())}</string>
     <key>AGENTLINK_AGENT_LOG_LEVEL</key><string>info</string>
     <key>PATH</key><string>${escapeXml(mergedPath)}</string>
     <key>HOME</key><string>${escapeXml(os.homedir())}</string>
@@ -220,35 +325,7 @@ async function macInstall(runtime, log) {
   // 现代序列 bootout→bootstrap→enable→kickstart（见 buildMacInstallSteps 注释）。
   const uid = macUid();
   const steps = buildMacInstallSteps({ uid, label, plistPath });
-  let bootstrapOk = false;
-  let kickstart = null;
-  for (const step of steps) {
-    const verb = step.args[0];
-    const r = spawnSync(step.cmd, step.args, { encoding: "utf8" });
-    // bootout 对未加载的 job 必然失败——幂等忽略。
-    if (verb === "bootout") continue;
-    if (verb === "bootstrap") {
-      bootstrapOk = r.status === 0;
-      // bootstrap 失败常见于 job 已加载（EALREADY/5）；enable+kickstart 仍可救回，
-      // 故不在此抛错，留到最后看 kickstart 结果。
-      continue;
-    }
-    if (verb === "enable") continue; // 清 disabled override，失败无妨
-    if (verb === "kickstart") kickstart = r;
-  }
-
-  if (!kickstart || kickstart.status !== 0) {
-    // 现代序列没能拉起——回退 legacy load -w 兜底（与 bin/agentlink 一致）。
-    log?.warn("service.install", "modern launchctl sequence failed, falling back to load -w", {
-      bootstrap_ok: bootstrapOk,
-      kickstart_err: (kickstart?.stderr || kickstart?.stdout || "").trim(),
-    });
-    const fallback = spawnSync("launchctl", ["load", "-w", plistPath], { encoding: "utf8" });
-    if (fallback.status !== 0) {
-      const msg = (kickstart?.stderr || kickstart?.stdout || fallback.stderr || fallback.stdout || "").trim();
-      throw new Error(`launchctl bootstrap/kickstart failed: ${msg || "unknown"}`);
-    }
-  }
+  runMacInstallSteps({ steps, plistPath, service: `gui/${uid}/${label}`, log });
   return { backend: "launchd", path: plistPath, label, logs: { out: stdoutLog, err: stderrLog } };
 }
 
@@ -285,7 +362,7 @@ function macStatus(runtime) {
 }
 
 // ===== Linux systemd (user) =====
-function sdUnitName(runtime) { return `agentlink-agent-${runtime}.service`; }
+function sdUnitName(runtime) { return `agentlink-agent-${runtime}${serviceScopeSuffix()}.service`; }
 function sdUnitPath(runtime) {
   return path.join(os.homedir(), ".config", "systemd", "user", sdUnitName(runtime));
 }
@@ -305,13 +382,13 @@ async function sdInstall(runtime, log) {
   const node = process.execPath;
   const state = ensureStateOrFail(runtime);
   const unitPath = sdUnitPath(runtime);
-  const logDir = path.join(os.homedir(), ".agentlink", "logs");
+  const logDir = path.join(resolveAgentlinkHome(), "logs");
   fs.mkdirSync(logDir, { recursive: true });
 
   // align-runtime-default-workspace: 仅 claude/codex 注入 WorkingDirectory
   // install 前确保目录存在（否则 systemd 因 WorkingDirectory 不存在拒绝启动）
   let workingDirectoryLine = "";
-  if (runtime === "claude" || runtime === "codex") {
+  if (SERVICE_RUNTIMES.has(runtime)) {
     const wsPath = await ensureDefaultWorkspace(runtime);
     workingDirectoryLine = `WorkingDirectory=${wsPath}`;
   }
@@ -327,6 +404,7 @@ After=network-online.target
 [Service]
 Type=simple
 Environment=AGENTLINK_RELAY_URL=${state.relay_url}
+Environment=AGENTLINK_HOME=${resolveAgentlinkHome()}
 Environment=AGENTLINK_AGENT_LOG_LEVEL=info
 Environment=PATH=${pathEnv}
 Environment=HOME=${os.homedir()}${workingDirectoryLine ? `\n${workingDirectoryLine}` : ""}
@@ -463,7 +541,7 @@ export function serviceReloadAll() {
 
 // macOS reload
 function macReload(runtime) {
-  const label = ALL_RELOAD_TARGETS[runtime].mac;
+  const label = reloadTarget(runtime).mac;
   const uid = typeof process.getuid === "function" ? process.getuid() : 0;
   const ref = `gui/${uid}/${label}`;
   const present = spawnSync("launchctl", ["print", ref], { encoding: "utf8" });
@@ -480,7 +558,7 @@ function macReload(runtime) {
 
 // Linux systemd user reload
 function sdReload(runtime) {
-  const unit = ALL_RELOAD_TARGETS[runtime].linux;
+  const unit = reloadTarget(runtime).linux;
   // list-unit-files 可同时检测 masked/enabled/disabled；exit 0 表示 unit 存在。
   // 另一种探测：`systemctl --user cat <unit>` —— 不存在会返回非 0。
   const probe = spawnSync("systemctl", ["--user", "cat", unit], { encoding: "utf8" });
@@ -497,7 +575,7 @@ function sdReload(runtime) {
 
 // Windows schtasks reload
 function winReload(runtime) {
-  const task = ALL_RELOAD_TARGETS[runtime].win;
+  const task = reloadTarget(runtime).win;
   const probe = spawnSync("schtasks", ["/Query", "/TN", task, "/FO", "LIST"], { encoding: "utf8" });
   if (probe.status !== 0) {
     return { status: "not-installed", backend: "schtasks", task };

package/src-shared/envelope_builder.mjs

@@ -445,7 +445,7 @@ export function translateOpenClawChunkToEnvelope(chunk, runId, blockState) {
     }
     envelopes.push(env);
   } else if (event === "response.function_call_arguments.delta") {
-    // picoclaw legacy event name → maps to tool_use.start + arguments.delta.
+    // legacy event name → maps to tool_use.start + arguments.delta.
     // chunk shape: { call_id, name, arguments } where arguments is a JSON
     // fragment to append. We auto-start a tool_use block on first occurrence.
     const callId = String(chunk.call_id || "");
@@ -537,7 +537,7 @@ export function translateOpenClawChunkToEnvelope(chunk, runId, blockState) {
     envelopes.push(started, completed);
   } else if (event === "response.output_text.done") {
     // No incremental envelope needed — full text already accumulated via deltas.
-    // If runtime carries authoritative full text on .done (e.g. picoclaw), prefer it.
+    // If the runtime carries authoritative full text on .done, prefer it.
     if (typeof chunk.text === "string" && chunk.text.length > 0) {
       text.content = chunk.text;
     }

package/src-ext/runtime/picoclaw/constants.mjs

@@ -1,39 +0,0 @@
-// 巴布(PicoClaw)运行时常量。
-//
-// 部署假设:matelink-cli 与 picoclaw daemon 烧录在同一开发板,
-// cli 默认连本地回环 picoclaw WebSocket。token 烧录时固化,cli 端写死同值。
-//
-// 如需改 token,**两处**(开发板 picoclaw config + 此文件)必须同步,否则连接失败。
-
-import process from "node:process";
-
-// PicoClaw daemon 的 WebSocket 端点(Pico Protocol)。
-// 默认 127.0.0.1:18790/pico/ws,可通过 env 覆盖(开发/调试用)。
-export const PICOCLAW_WS_URL =
-  process.env.PICOCLAW_WS_URL?.trim() || "ws://127.0.0.1:18790/pico/ws";
-
-// PicoClaw Bearer token —— 与开发板 picoclaw config 里 [pico].token 一致。
-// 生产烧录时双方都写死成下面这个固定值;切换值时必须双侧同步。
-export const PICOCLAW_TOKEN =
-  process.env.PICOCLAW_TOKEN?.trim() || "bubu-local-token";
-
-// 巴布配对二维码 PNG 输出路径 —— 屏幕显示模块从这个路径加载图片。
-// 默认写到 /tmp/bubu/pair-qr.png,可通过 env 覆盖。
-export const QR_PNG_OUTPUT_PATH =
-  process.env.BUBU_QR_PNG_PATH?.trim() || "/tmp/bubu/pair-qr.png";
-
-// 配对状态轮询间隔(秒)。服务端建议值在 create 响应里返回,这是兜底。
-export const PAIR_STATUS_POLL_INTERVAL_SEC = 2;
-
-// 配对状态最长等待时间(秒)。超过后 cli 重新生成 QR(配对码已过期)。
-export const PAIR_STATUS_POLL_MAX_SEC = 300;
-
-// 长轮询拉取请求的等待时长(秒)。
-export const LONG_POLL_WAIT_SEC = 30;
-
-// PicoClaw WS 重连退避(毫秒)— 指数退避,上限 30s。
-export const WS_RECONNECT_INITIAL_MS = 1000;
-export const WS_RECONNECT_MAX_MS = 30000;
-
-// runtime 名 — 必须与服务端 RuntimeKindPicoclaw 字符串一致。
-export const RUNTIME_NAME = "picoclaw";

package/src-ext/runtime/picoclaw/handleRequest.mjs

@@ -1,289 +0,0 @@
-/**
- * handleRequest.mjs — D-C2
- *
- * Extracted from picoclaw/index.mjs so it can be unit-tested independently.
- *
- * createPicoHandleRequest({ wsHolder, log, dispatchHandlerOptions })
- *   → async (request, ctx) => void
- *
- * Routing:
- *   1. If request.__kind == "agent.run.dispatch" → unifiedDispatchHandler (returns true) → done
- *   2. Otherwise → original picoclaw ws path (extractUserText + wsHolder.send)
- */
-
-import { createUnifiedDispatchHandler } from "../../core/unifiedDispatchHandler.mjs";
-import { buildMessageSend } from "./wsClient.mjs";
-import { createTurnState, translatePicoMessage, forceFinalize } from "./translator.mjs";
-import { relayObjectToBlock } from "../_shared/relayObjectToBlock.mjs";
-import { openclawChatAbort } from "../../core/openclawGatewayClient.mjs";
-
-// ── multimodal helpers (exported for unit tests) ──────────────────────────────
-
-/**
- * 从 blocks 中筛出 image blocks 和 PDF attachment blocks。
- *
- * Phase 5 (multimodal-attachment-llm-dispatch): この関数は後方互換のために残す。
- * WS dispatch path では relayObjectToBlock を使う（下記 createPicoHandleRequest 内参照）。
- *
- * @param {any[]} blocks
- * @returns {{ imageBlocks: any[], pdfBlocks: any[] }}
- */
-export function extractPicoBlocks(blocks) {
-  if (!Array.isArray(blocks)) return { imageBlocks: [], pdfBlocks: [] };
-  const imageBlocks = blocks.filter(
-    (b) => b?.type === "image" && b?.source?.kind === "url" && b?.source?.url
-  );
-  const pdfBlocks = blocks.filter(
-    (b) =>
-      b?.type === "attachment" &&
-      b?.mime === "application/pdf" &&
-      b?.source?.kind === "url" &&
-      b?.source?.url
-  );
-  return { imageBlocks, pdfBlocks };
-}
-
-/**
- * 构造 media.create 帧（用于发送图片到 picoclaw daemon）。
- *
- * @param {string} sessionId
- * @param {{ source: { url: string, media_type?: string } }} imageBlock
- */
-export function buildMediaCreate(sessionId, imageBlock) {
-  return {
-    type: "media.create",
-    id: randomPicoID(),
-    session_id: sessionId,
-    timestamp: Date.now(),
-    payload: {
-      url: imageBlock.source.url,
-      media_type: imageBlock.source?.media_type || "image/jpeg",
-      kind: "image",
-    },
-  };
-}
-
-/**
- * 构造 message.send 的 content 文本：原始 input + PDF inline 行。
- *
- * @param {string} input 用户输入文本
- * @param {any[]} pdfBlocks PDF attachment blocks
- * @returns {string}
- */
-export function buildPicoMessageContent(input, pdfBlocks) {
-  if (!pdfBlocks || pdfBlocks.length === 0) return input;
-  const pdfLines = pdfBlocks
-    .map((b) => `[file: ${b.name}] ${b.source.url}`)
-    .join("\n");
-  if (!input) return pdfLines;
-  return `${input}\n${pdfLines}`;
-}
-
-function randomPicoID() {
-  return Math.random().toString(36).slice(2, 10) + Date.now().toString(36);
-}
-
-// 延迟读取以允许测试环境通过 process.env 覆盖
-function getTurnTimeoutMs() {
-  return Number(process.env.PICOCLAW_TURN_TIMEOUT_MS || 120000);
-}
-
-/**
- * @param {{
- *   wsHolder: { isOpen(): boolean, connectOnce(): Promise<void>, send(msg): void, onMessage(fn): () => void },
- *   log: { info, warn, error },
- *   activeTurnRef: { current: any },   // shared mutable ref so ws messages can resolve the turn
- *   publishEventFn: (event: any) => Promise<void>,
- *   dispatchHandlerOptions: {
- *     relayUrl: string,
- *     bridgeToken: string,
- *     producerFactory?: Function,
- *     openclawInvoke?: Function,
- *   },
- * }} opts
- *
- * Note: activeTurnRef and publishEventFn are only required when wsHolder is actually used
- * (i.e. non-dispatch requests). Tests for dispatch path can omit them.
- */
-export function createPicoHandleRequest({
-  wsHolder,
-  log,
-  activeTurnRef,
-  dispatchHandlerOptions,
-}) {
-  // 允许测试注入 openclawChatAbort 实现（避免真实 WS 依赖）
-  const _chatAbortFn = dispatchHandlerOptions?._openclawChatAbortFn ?? openclawChatAbort;
-
-  const unifiedHandler = createUnifiedDispatchHandler({
-    ...dispatchHandlerOptions,
-    log,
-  });
-
-  return async function handleRequest(request, ctx) {
-    // Step 0: RPC 分支 — sessions.abort / chat.abort（openclaw gateway WS 直连）
-    if (request?.request?.__relayKind === "rpc") {
-      const method = request.request.method;
-      const params = request.request.params ?? {};
-      let result;
-      try {
-        if (method === "sessions.abort" || method === "chat.abort") {
-          const sessionKey = params.key ?? params.sessionKey ?? "";
-          result = await _chatAbortFn({ sessionKey, log });
-        } else {
-          // 其余 RPC 方法（workspaces.scan 等）picoclaw 不处理，返回 unknown
-          result = { ok: false, error: `unknown rpc method: ${method}` };
-        }
-      } catch (err) {
-        result = { ok: false, error: err?.message ?? String(err) };
-      }
-      const bodyJson = JSON.stringify(result);
-      await ctx.publishEvent({
-        event: "response",
-        statusCode: 200,
-        contentType: "application/json; charset=utf-8",
-        body: bodyJson,
-      });
-      await ctx.publishEvent({ event: "end" });
-      return;
-    }
-
-    // Step 1: Try unified dispatch handler first.
-    const handled = await unifiedHandler(request, ctx);
-    if (handled) return;
-
-    // Step 2: Original picoclaw ws path.
-    // Phase 5 (multimodal-attachment-llm-dispatch): relay_object blocks を
-    // relayObjectToBlock を通して処理する（runtimeHint="picoclaw", modelCaps=null）。
-    // image → url_ref → buildMediaCreate（URL をそのまま picoclaw daemon に送る）
-    // document/text/binary → input_text → メッセージに text として追加
-    const userText = extractUserText(request);
-    const blocks = request?.request?.blocks ?? [];
-
-    // relay_object blocks の処理（attachment_kind ベース）
-    const urlRefBlocks = [];   // image → url_ref blocks
-    const textInlineLines = []; // non-image → input_text の text
-
-    for (const block of blocks) {
-      if (!block?.source?.kind || block.source.kind !== "url" || !block.source.url) continue;
-      // image か attachment のみ relay_object
-      if (block.type !== "image" && block.type !== "attachment") continue;
-
-      const result = await relayObjectToBlock(block, {
-        runtimeHint: "picoclaw",
-        modelCaps: null,  // picoclaw: caps check をスキップ
-        fetchAndBase64Encode: async () => { throw new Error("picoclaw does not fetch bytes"); },
-      });
-
-      if (result.error) {
-        // エラーは text inline に追加
-        textInlineLines.push(`[attachment] (error: ${result.error.message})`);
-      } else if (result.type === "url_ref") {
-        // image → url_ref → buildMediaCreate 用に保存
-        urlRefBlocks.push({ url: result.url, media_type: result.media_type });
-      } else if (result.type === "input_text") {
-        // document / text / binary → inline text
-        textInlineLines.push(result.text);
-      }
-    }
-
-    const hasMedia = urlRefBlocks.length > 0;
-    // buildPicoMessageContent 互換：textInlineLines を userText に追加
-    let messageContent = userText;
-    if (textInlineLines.length > 0) {
-      messageContent = userText
-        ? `${userText}\n${textInlineLines.join("\n")}`
-        : textInlineLines.join("\n");
-    }
-
-    // 纯图片 + 无 PDF + 无文字：只发 media.create，不发 message.send
-    const shouldSendMessage = messageContent.trim().length > 0;
-    const shouldSendAnyMedia = hasMedia;
-
-    if (!shouldSendMessage && !shouldSendAnyMedia) {
-      log.warn("turn.skip", "no user text or blocks", { requestId: ctx.requestId });
-      await ctx.publishEvent({ event: "error", error: "empty user input" });
-      await ctx.publishEvent({ event: "end" });
-      return;
-    }
-
-    if (!wsHolder.isOpen()) {
-      try { await wsHolder.connectOnce(); }
-      catch (err) {
-        await ctx.publishEvent({ event: "error", error: `picoclaw connect failed: ${err?.message || err}` });
-        await ctx.publishEvent({ event: "end" });
-        return;
-      }
-    }
-
-    const translatorState = createTurnState();
-    let resolveTurn;
-    const turnDone = new Promise((r) => { resolveTurn = r; });
-
-    if (activeTurnRef) {
-      activeTurnRef.current = { ctx, translatorState, resolve: resolveTurn };
-    }
-
-    const sessionId = `bubu-${ctx.requestId}`;
-    try {
-      // 先发所有 media.create（图片 url_ref），再发 message.send（如有文本或非 image）
-      for (const urlRef of urlRefBlocks) {
-        // url_ref → buildMediaCreate 互換オブジェクト
-        wsHolder.send(buildMediaCreate(sessionId, {
-          source: { url: urlRef.url, media_type: urlRef.media_type },
-        }));
-      }
-      if (shouldSendMessage) {
-        wsHolder.send(buildMessageSend({
-          sessionId,
-          content: messageContent,
-          requestId: ctx.requestId,
-        }));
-      }
-    } catch (err) {
-      if (activeTurnRef) activeTurnRef.current = null;
-      await ctx.publishEvent({ event: "error", error: `picoclaw send failed: ${err?.message || err}` });
-      await ctx.publishEvent({ event: "end" });
-      return;
-    }
-
-    const turnTimeoutMs = getTurnTimeoutMs();
-    const timeoutP = new Promise((r) => setTimeout(() => r("__timeout__"), turnTimeoutMs));
-    const winner = await Promise.race([turnDone.then(() => "__done__"), timeoutP]);
-    if (winner === "__timeout__") {
-      log.warn("picoclaw.turn.timeout", "turn timed out", { requestId: ctx.requestId, ms: turnTimeoutMs });
-      const events = forceFinalize(translatorState);
-      for (const e of events) {
-        if (e) await ctx.publishEvent(e);
-      }
-      if (activeTurnRef) activeTurnRef.current = null;
-    }
-  };
-}
-
-// ── helpers ──────────────────────────────────────────────────────────────────
-
-function extractUserText(request) {
-  const input = request?.request?.input;
-  if (typeof input === "string") return input.trim();
-  if (Array.isArray(input)) {
-    const parts = [];
-    for (const item of input) {
-      if (typeof item === "string") parts.push(item);
-      else if (item && typeof item === "object") {
-        if (typeof item.text === "string") parts.push(item.text);
-        else if (Array.isArray(item.content)) {
-          for (const c of item.content) {
-            if (c && typeof c === "object" && typeof c.text === "string") parts.push(c.text);
-          }
-        } else if (typeof item.content === "string") parts.push(item.content);
-      }
-    }
-    return parts.join("\n").trim();
-  }
-  if (input && typeof input === "object") {
-    if (typeof input.text === "string") return input.text.trim();
-    if (typeof input.content === "string") return input.content.trim();
-  }
-  if (typeof request?.clientPreviewText === "string") return request.clientPreviewText.trim();
-  return "";
-}