@rethinkingstudio/clawpilot 2.1.7-internal.8 → 2.1.7

package/dist/relay/ccconnect-relay-manager.js

@@ -1,11 +1,12 @@
 import { randomUUID } from "crypto";
 import { WebSocket } from "ws";
-import { handleLocalCommand } from "../commands/local-handlers.js";
-import { handleProviderCommand } from "../commands/provider-handlers.js";
 import { getServicePlatform } from "../platform/service-manager.js";
 import { CCConnectManagementClient, decodeCCConnectSessionKey, encodeCCConnectSessionKey, timestampMs, } from "../ccconnect/api-client.js";
 import { createCCConnectProject, discoverCCConnectProjects, restartCCConnect } from "../ccconnect/project-config.js";
 import { uploadMediaBlocks } from "../media/assistant-attachments.js";
+import { installRelayWatchdog } from "./relay-watchdog.js";
+import { dispatchCommonRelayCommand } from "./relay-command-dispatcher.js";
+import { relayMethodSupport } from "./relay-method-registry.js";
 const DEFAULT_CONTEXT_TOKENS = 200_000;
 export async function runCCConnectRelayManager(opts) {
     const wsUrl = buildRelayUrl(opts.relayServerUrl, opts.gatewayId, opts.relaySecret);
@@ -21,7 +22,10 @@ export async function runCCConnectRelayManager(opts) {
         let bridgePingTimer = null;
         let bridgeReconnectAttempts = 0;
         const rawToEncoded = new Map();
+        const rawToProject = new Map();
         const activeRunByEncoded = new Map();
+        const previewHandleToRun = new Map();
+        const pendingInteractiveReplyByEncoded = new Set();
         try {
             relayWs = new WebSocket(wsUrl);
         }
@@ -30,6 +34,7 @@ export async function runCCConnectRelayManager(opts) {
             resolve(true);
             return;
         }
+        const uninstallWatchdog = installRelayWatchdog(relayWs, `ccconnect:${opts.gatewayId}`);
         function send(msg) {
             if (relayWs.readyState === WebSocket.OPEN) {
                 relayWs.send(JSON.stringify(msg));
@@ -121,7 +126,12 @@ export async function runCCConnectRelayManager(opts) {
                         "file",
                         "audio",
                     ],
-                    metadata: { version: "1.0.0", description: "PocketClaw relay adapter" },
+                    metadata: {
+                        version: "1.0.0",
+                        description: "PocketClaw relay adapter",
+                        progress_style: "card",
+                        supports_progress_card_payload: true,
+                    },
                 }));
             });
             ws.on("message", (raw) => {
@@ -177,10 +187,12 @@ export async function runCCConnectRelayManager(opts) {
             if (msg.type === "pong")
                 return;
             const rawSessionKey = stringValue(record.session_key) ?? "";
-            const encodedSessionKey = rawSessionKey ? rawToEncoded.get(rawSessionKey) : undefined;
+            const encodedSessionKey = await resolveEncodedBridgeSession(record);
             if (!encodedSessionKey)
                 return;
-            const runId = ensureRunId(encodedSessionKey);
+            const previewHandle = stringValue(record.preview_handle);
+            const runInfo = resolveRunForBridgeMessage(encodedSessionKey, previewHandle);
+            let runId = runInfo.runId;
             if (msg.type === "typing_start") {
                 emitChat(runId, encodedSessionKey, "delta", undefined, true);
                 return;
@@ -189,57 +201,93 @@ export async function runCCConnectRelayManager(opts) {
                 return;
             }
             if (msg.type === "preview_start") {
-                emitChat(runId, encodedSessionKey, "delta", stringValue(record.content) ?? "", false);
+                const content = stringValue(record.content) ?? "";
+                const sideChannel = isProgressContent(content);
+                if (sideChannel) {
+                    runId = randomUUID();
+                }
+                emitContentChat(runId, encodedSessionKey, "delta", normalizeBridgeContent(content), false, sideChannel);
                 const refId = stringValue(record.ref_id);
+                const handle = `pocketclaw-${runId}`;
+                previewHandleToRun.set(handle, { encodedSessionKey, runId, sideChannel });
                 if (refId) {
                     bridgeWs?.send(JSON.stringify({
                         type: "preview_ack",
                         ref_id: refId,
-                        preview_handle: `pocketclaw-${runId}`,
+                        preview_handle: handle,
                     }));
                 }
                 return;
             }
             if (msg.type === "update_message") {
-                emitChat(runId, encodedSessionKey, "delta", stringValue(record.content) ?? "", false);
+                const content = stringValue(record.content) ?? "";
+                const normalized = normalizeBridgeContent(content);
+                const state = runInfo.sideChannel && progressContentIsCompleted(content) ? "final" : "delta";
+                emitContentChat(runId, encodedSessionKey, state, normalized, false, runInfo.sideChannel);
+                if (state === "final" && previewHandle)
+                    previewHandleToRun.delete(previewHandle);
                 return;
             }
             if (msg.type === "delete_message") {
+                if (previewHandle)
+                    previewHandleToRun.delete(previewHandle);
                 send({
                     type: "event",
                     event: "message.delete",
                     payload: {
                         runId,
                         sessionKey: encodedSessionKey,
-                        previewHandle: stringValue(record.preview_handle),
+                        previewHandle,
+                        keepTurn: true,
+                        sideChannel: runInfo.sideChannel,
                     },
                 });
-                activeRunByEncoded.delete(encodedSessionKey);
                 return;
             }
             if (msg.type === "reply_stream") {
                 const text = stringValue(record.full_text) ?? stringValue(record.delta) ?? "";
                 const done = Boolean(record.done);
-                emitChat(runId, encodedSessionKey, done ? "final" : "delta", text, false);
-                if (done)
-                    activeRunByEncoded.delete(encodedSessionKey);
+                const hasProgressPreview = hasActiveSideChannelPreview(encodedSessionKey);
+                const state = done && !isIntermediateReply(text) && !hasProgressPreview ? "final" : "delta";
+                emitChat(runId, encodedSessionKey, state, text, false);
+                if (state === "final")
+                    clearActiveBridgeRun(encodedSessionKey, runId);
                 return;
             }
             if (msg.type === "reply") {
-                emitChat(runId, encodedSessionKey, "final", stringValue(record.content) ?? "", false);
+                const content = stringValue(record.content) ?? "";
+                const permissionFallback = permissionHintActions(content, rawSessionKey, stringValue(record.reply_ctx) ?? rawSessionKey);
+                const keepTurnOpen = consumeInteractiveReply(encodedSessionKey) ||
+                    isIntermediateReply(content) ||
+                    hasActiveSideChannelPreview(encodedSessionKey);
+                const state = keepTurnOpen ? "delta" : "final";
+                if (permissionFallback) {
+                    emitStructuredChat(runId, encodedSessionKey, state, {
+                        text: content,
+                        blocks: [textBlock(content), permissionFallback].filter(Boolean),
+                    });
+                }
+                else {
+                    emitChat(runId, encodedSessionKey, state, content, false);
+                }
+                if (state === "final")
+                    clearActiveBridgeRun(encodedSessionKey, runId);
                 return;
             }
             if (msg.type === "buttons") {
+                const actions = normalizeBridgeButtons(record.buttons);
+                console.log(`[runtime:ccconnect] bridge buttons session=${rawSessionKey} actions=${actions.length}`);
                 emitStructuredChat(runId, encodedSessionKey, "delta", {
                     text: stringValue(record.content) ?? "",
                     blocks: [
                         textBlock(stringValue(record.content) ?? ""),
-                        actionsBlock(normalizeBridgeButtons(record.buttons), rawSessionKey, stringValue(record.reply_ctx) ?? rawSessionKey),
+                        actionsBlock(actions, rawSessionKey, stringValue(record.reply_ctx) ?? rawSessionKey),
                     ].filter(Boolean),
                 });
                 return;
             }
             if (msg.type === "card") {
+                console.log(`[runtime:ccconnect] bridge card session=${rawSessionKey}`);
                 emitStructuredChat(runId, encodedSessionKey, "delta", normalizeBridgeCard(record.card, rawSessionKey, stringValue(record.reply_ctx) ?? rawSessionKey));
                 return;
             }
@@ -250,13 +298,45 @@ export async function runCCConnectRelayManager(opts) {
                     attachments: attachment.attachments,
                     blocks: attachment.text ? [textBlock(attachment.text)] : [],
                 });
+                clearActiveBridgeRun(encodedSessionKey, runId);
                 return;
             }
             if (msg.type === "error") {
                 emitChat(runId, encodedSessionKey, "error", stringValue(record.message) ?? "cc-connect bridge error", false);
-                activeRunByEncoded.delete(encodedSessionKey);
+                clearActiveBridgeRun(encodedSessionKey, runId);
             }
         }
+        async function resolveEncodedBridgeSession(record) {
+            const rawSessionKey = stringValue(record.session_key);
+            if (!rawSessionKey) {
+                if (activeRunByEncoded.size === 1) {
+                    return activeRunByEncoded.keys().next().value;
+                }
+                console.warn(`[runtime:ccconnect] dropped bridge ${String(record.type)} without session_key`);
+                return undefined;
+            }
+            const existing = rawToEncoded.get(rawSessionKey);
+            if (existing)
+                return existing;
+            const explicitProject = stringValue(record.project) ?? rawToProject.get(rawSessionKey);
+            if (explicitProject) {
+                const encoded = encodeCCConnectSessionKey(explicitProject, rawSessionKey, rawSessionKey);
+                rawToEncoded.set(rawSessionKey, encoded);
+                rawToProject.set(rawSessionKey, explicitProject);
+                console.warn(`[runtime:ccconnect] recovered bridge session mapping project=${explicitProject} rawSessionKey=${rawSessionKey}`);
+                return encoded;
+            }
+            if (activeRunByEncoded.size === 1) {
+                const encoded = activeRunByEncoded.keys().next().value;
+                if (encoded) {
+                    rawToEncoded.set(rawSessionKey, encoded);
+                    console.warn(`[runtime:ccconnect] inferred bridge session mapping rawSessionKey=${rawSessionKey}`);
+                    return encoded;
+                }
+            }
+            console.warn(`[runtime:ccconnect] dropped bridge ${String(record.type)} for unmapped session_key=${rawSessionKey}`);
+            return undefined;
+        }
         function ensureRunId(encodedSessionKey, preferred) {
             const existing = activeRunByEncoded.get(encodedSessionKey);
             if (existing)
@@ -265,6 +345,39 @@ export async function runCCConnectRelayManager(opts) {
             activeRunByEncoded.set(encodedSessionKey, runId);
             return runId;
         }
+        function resolveRunForBridgeMessage(encodedSessionKey, previewHandle) {
+            if (previewHandle) {
+                const preview = previewHandleToRun.get(previewHandle);
+                if (preview) {
+                    return { runId: preview.runId, sideChannel: preview.sideChannel };
+                }
+            }
+            return { runId: ensureRunId(encodedSessionKey) };
+        }
+        function clearActiveBridgeRun(encodedSessionKey, runId) {
+            if (activeRunByEncoded.get(encodedSessionKey) === runId) {
+                activeRunByEncoded.delete(encodedSessionKey);
+            }
+            pendingInteractiveReplyByEncoded.delete(encodedSessionKey);
+            for (const [handle, preview] of previewHandleToRun) {
+                if (preview.runId === runId)
+                    previewHandleToRun.delete(handle);
+            }
+        }
+        function hasActiveSideChannelPreview(encodedSessionKey) {
+            for (const preview of previewHandleToRun.values()) {
+                if (preview.encodedSessionKey === encodedSessionKey && preview.sideChannel) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        function consumeInteractiveReply(encodedSessionKey) {
+            if (!pendingInteractiveReplyByEncoded.has(encodedSessionKey))
+                return false;
+            pendingInteractiveReplyByEncoded.delete(encodedSessionKey);
+            return true;
+        }
         function emitChat(runId, sessionKey, state, text, loading) {
             const payload = { runId, sessionKey, state };
             if (loading)
@@ -276,6 +389,17 @@ export async function runCCConnectRelayManager(opts) {
                 payload.errorMessage = text ?? "cc-connect error";
             send({ type: "event", event: "chat", payload });
         }
+        function emitContentChat(runId, sessionKey, state, content, loading, sideChannel) {
+            const payload = { runId, sessionKey, state };
+            if (loading)
+                payload.loading = true;
+            if (sideChannel)
+                payload.sideChannel = true;
+            payload.message = { content: content.blocks?.length ? content.blocks : [{ type: "text", text: content.text }] };
+            if (state === "error")
+                payload.errorMessage = content.text || "cc-connect error";
+            send({ type: "event", event: "chat", payload });
+        }
         function emitStructuredChat(runId, sessionKey, state, data) {
             const blocks = data.blocks?.length ? data.blocks : data.text !== undefined ? [textBlock(data.text)] : undefined;
             const payload = { runId, sessionKey, state };
@@ -410,7 +534,7 @@ export async function runCCConnectRelayManager(opts) {
             if (!project)
                 throw new Error("cc-connect has no configured projects");
             const title = p.title?.trim() || "New Session";
-            const rawSessionKey = `pocketclaw:${opts.gatewayId}:default`;
+            const rawSessionKey = `pocketclaw:${opts.gatewayId}:${randomUUID()}`;
             const created = await client.createSession(project, rawSessionKey, title);
             const session = {
                 ...created,
@@ -431,7 +555,9 @@ export async function runCCConnectRelayManager(opts) {
                 throw new Error("message required");
             const decoded = await resolveCCConnectSendTarget(p.sessionKey);
             rawToEncoded.set(decoded.sessionKey, p.sessionKey);
+            rawToProject.set(decoded.sessionKey, decoded.project);
             activeRunByEncoded.delete(p.sessionKey);
+            pendingInteractiveReplyByEncoded.delete(p.sessionKey);
             const runId = ensureRunId(p.sessionKey, p.idempotencyKey);
             emitChat(runId, p.sessionKey, "delta", undefined, true);
             if (bridgeReady && bridgeWs?.readyState === WebSocket.OPEN) {
@@ -463,6 +589,9 @@ export async function runCCConnectRelayManager(opts) {
                 throw new Error("cc-connect bridge not ready");
             }
             const decoded = await resolveCCConnectSendTarget(p.sessionKey);
+            if (isInteractiveAction(p.action)) {
+                pendingInteractiveReplyByEncoded.add(p.sessionKey);
+            }
             bridgeWs.send(JSON.stringify({
                 type: "card_action",
                 session_key: decoded.sessionKey,
@@ -493,8 +622,12 @@ export async function runCCConnectRelayManager(opts) {
             }
         }
         function rememberSession(project, session) {
-            const encoded = encodeCCConnectSessionKey(project, session.session_key, session.session_key);
-            rawToEncoded.set(session.session_key, encoded);
+            const sessionId = session.id || session.session_key;
+            const encoded = encodeCCConnectSessionKey(project, session.session_key, sessionId);
+            if (!rawToEncoded.has(session.session_key)) {
+                rawToEncoded.set(session.session_key, encoded);
+                rawToProject.set(session.session_key, project);
+            }
             return encoded;
         }
         async function resolveCCConnectSessionId(project, sessionKey, sessionId) {
@@ -548,24 +681,9 @@ export async function runCCConnectRelayManager(opts) {
             if (msg.type !== "cmd" || !msg.method)
                 return;
             const requestId = msg.id;
-            console.log(`[relay:ccconnect] cmd received method=${msg.method} id=${requestId ?? "(no-id)"}`);
-            const providerPromise = handleProviderCommand(msg.method, msg.params);
-            if (providerPromise !== null) {
-                const result = await providerPromise;
-                if (requestId) {
-                    send(result.ok
-                        ? { type: "res", id: requestId, ok: true, payload: result.payload }
-                        : { type: "res", id: requestId, ok: false, error: { message: result.error } });
-                }
-                return;
-            }
-            const localResult = handleLocalCommand(msg.method, msg.params);
-            if (localResult !== null) {
-                if (requestId) {
-                    send(localResult.ok
-                        ? { type: "res", id: requestId, ok: true, payload: localResult.payload }
-                        : { type: "res", id: requestId, ok: false, error: { message: localResult.error } });
-                }
+            const support = relayMethodSupport(msg.method, "ccconnect") ?? "unsupported";
+            console.log(`[relay:ccconnect] cmd received method=${msg.method} support=${support} id=${requestId ?? "(no-id)"}`);
+            if (await dispatchCommonRelayCommand(msg.method, msg.params, requestId, send)) {
                 return;
             }
             try {
@@ -630,6 +748,7 @@ export async function runCCConnectRelayManager(opts) {
             }
         });
         relayWs.on("close", (code, reason) => {
+            uninstallWatchdog();
             console.log(`cc-connect relay connection closed: ${code} ${reason.toString()}`);
             opts.onDisconnected?.();
             clearBridgeTimers();
@@ -652,6 +771,83 @@ function stringValue(value) {
 function textBlock(text) {
     return text ? { type: "text", text } : undefined;
 }
+const PROGRESS_CARD_PREFIX = "__cc_connect_progress_card_v1__:";
+function isProgressContent(content) {
+    return content.startsWith(PROGRESS_CARD_PREFIX) || content.trimStart().startsWith("⏳ **Progress**");
+}
+function progressContentIsCompleted(content) {
+    const payload = parseProgressPayload(content);
+    return payload?.state === "completed" || payload?.state === "failed";
+}
+function normalizeBridgeContent(content) {
+    const progress = parseProgressPayload(content);
+    if (!progress)
+        return { text: content };
+    const text = renderProgressPayload(progress);
+    return {
+        text,
+        blocks: [
+            {
+                type: "markdown",
+                text,
+            },
+        ],
+    };
+}
+function parseProgressPayload(content) {
+    if (!content.startsWith(PROGRESS_CARD_PREFIX))
+        return undefined;
+    try {
+        const parsed = JSON.parse(content.slice(PROGRESS_CARD_PREFIX.length));
+        const items = Array.isArray(parsed.items)
+            ? parsed.items.map((item) => ({
+                kind: stringValue(item.kind),
+                text: stringValue(item.text)?.trim() ?? "",
+                tool: stringValue(item.tool),
+                status: stringValue(item.status),
+            })).filter((item) => item.text)
+            : [];
+        const entries = items.length > 0
+            ? items
+            : (Array.isArray(parsed.entries) ? parsed.entries.map((entry) => ({
+                kind: undefined,
+                text: typeof entry === "string" ? entry.trim() : "",
+            })).filter((entry) => entry.text) : []);
+        if (entries.length === 0)
+            return undefined;
+        return {
+            state: stringValue(parsed.state),
+            truncated: Boolean(parsed.truncated),
+            entries,
+        };
+    }
+    catch {
+        return undefined;
+    }
+}
+function renderProgressPayload(payload) {
+    const icon = payload.state === "completed" ? "✅" : payload.state === "failed" ? "❌" : "⏳";
+    const lines = [`${icon} **Progress**`];
+    if (payload.truncated)
+        lines.push("_Showing latest updates only._");
+    for (const [index, entry] of payload.entries.entries()) {
+        const prefix = progressEntryPrefix(entry.kind, entry.tool);
+        const text = entry.text.replace(/\n/g, "\n   ");
+        lines.push(`\n${index + 1}. ${prefix}${text}`);
+    }
+    return lines.join("\n");
+}
+function progressEntryPrefix(kind, tool) {
+    if (kind === "thinking")
+        return "💭 ";
+    if (kind === "tool_use")
+        return tool ? `🔧 **工具: ${tool}**\n   ` : "🔧 ";
+    if (kind === "tool_result")
+        return tool ? `🧾 **结果: ${tool}**\n   ` : "🧾 ";
+    if (kind === "error")
+        return "❌ ";
+    return "";
+}
 function actionsBlock(buttons, sessionKey, replyCtx) {
     if (buttons.length === 0)
         return undefined;
@@ -666,22 +862,13 @@ function normalizeBridgeButtons(buttons) {
     if (!Array.isArray(buttons))
         return [];
     const actions = [];
-    for (const row of buttons) {
-        if (!Array.isArray(row))
-            continue;
-        for (const button of row) {
-            if (!isRecord(button))
-                continue;
-            const label = stringValue(button.text);
-            const value = stringValue(button.data) ?? stringValue(button.value);
-            if (!label || !value)
-                continue;
-            actions.push({
-                id: value,
-                label,
-                value,
-                style: actionStyle(value, stringValue(button.btn_type)),
-            });
+    const rows = buttons.some(Array.isArray) ? buttons : [buttons];
+    for (const row of rows) {
+        const buttonRow = Array.isArray(row) ? row : [row];
+        for (const button of buttonRow) {
+            const action = normalizeBridgeAction(button);
+            if (action)
+                actions.push(action);
         }
     }
     return actions;
@@ -768,26 +955,90 @@ function normalizeBridgeCard(card, sessionKey, replyCtx) {
     }
     return { text: textParts.join("\n\n"), blocks };
 }
+function isInteractiveAction(action) {
+    const normalized = action.toLowerCase();
+    return (normalized.startsWith("perm:")
+        || normalized.startsWith("askq:")
+        || normalized === "allow"
+        || normalized === "deny"
+        || normalized === "allow all");
+}
 function normalizeCardActionButtons(buttons) {
     if (!Array.isArray(buttons))
         return [];
     const actions = [];
     for (const button of buttons) {
-        if (!isRecord(button))
-            continue;
-        const label = stringValue(button.text);
-        const value = stringValue(button.value) ?? stringValue(button.data);
-        if (!label || !value)
-            continue;
-        actions.push({
-            id: value,
-            label,
-            value,
-            style: actionStyle(value, stringValue(button.btn_type)),
-        });
+        const action = normalizeBridgeAction(button);
+        if (action)
+            actions.push(action);
     }
     return actions;
 }
+function normalizeBridgeAction(button) {
+    if (!isRecord(button))
+        return undefined;
+    const label = stringValue(button.text)
+        ?? stringValue(button.label)
+        ?? stringValue(button.title);
+    const value = stringValue(button.data)
+        ?? stringValue(button.value)
+        ?? stringValue(button.id)
+        ?? inferActionValue(label);
+    if (!label || !value)
+        return undefined;
+    return {
+        id: value,
+        label,
+        value,
+        style: actionStyle(value, stringValue(button.btn_type) ?? stringValue(button.style)),
+    };
+}
+function permissionHintActions(content, sessionKey, replyCtx) {
+    if (!isPermissionHint(content))
+        return undefined;
+    return actionsBlock([
+        { id: "perm:allow", label: "允许", value: "perm:allow", style: "primary" },
+        { id: "perm:deny", label: "拒绝", value: "perm:deny", style: "danger" },
+        { id: "perm:allow_all", label: "允许所有", value: "perm:allow_all", style: "default" },
+    ], sessionKey, replyCtx);
+}
+function isPermissionHint(content) {
+    const normalized = content.toLowerCase();
+    return (normalized.includes("等待权限响应") || normalized.includes("permission"))
+        && (normalized.includes("允许所有") || normalized.includes("allow all"))
+        && (normalized.includes("拒绝") || normalized.includes("deny"));
+}
+function isIntermediateReply(content) {
+    const normalized = content.toLowerCase().trim();
+    if (!normalized)
+        return false;
+    if (isPermissionHint(content))
+        return true;
+    return (normalized.includes("继续执行")
+        || normalized.includes("继续处理中")
+        || normalized.includes("continuing")
+        || normalized.includes("continue execution")
+        || normalized.includes("permission granted")
+        || normalized.includes("已允许")
+        || normalized.includes("已开启自动批准")
+        || normalized.includes("自动批准")
+        || normalized.includes("权限请求将自动允许"));
+}
+function inferActionValue(label) {
+    if (!label)
+        return undefined;
+    const normalized = label.toLowerCase().replace(/\s+/g, "");
+    if (normalized.includes("允许所有") || normalized.includes("全部允许") || normalized.includes("allowall")) {
+        return "perm:allow_all";
+    }
+    if (normalized.includes("拒绝") || normalized.includes("deny") || normalized.includes("reject")) {
+        return "perm:deny";
+    }
+    if (normalized.includes("允许") || normalized.includes("同意") || normalized.includes("allow") || normalized.includes("approve")) {
+        return "perm:allow";
+    }
+    return undefined;
+}
 function actionStyle(value, explicit) {
     if (explicit === "primary" || explicit === "danger")
         return explicit;