clawconnect-agent 0.2.12 → 0.2.14

package/dist/openclaw/relay/source-commit-projection.d.ts

@@ -1,6 +1,7 @@
 import { type CanonicalTimelineEvent } from "../../core/relay/timeline-event-log.js";
 import type { HistoryResponse } from "./chat-history.js";
 import type { SourceCommit } from "../../core/relay/source-commit.js";
+import { type SourceRowFingerprints } from "./source-row-fingerprints.js";
 export type SourceCommitProjectionBatch = {
     sourceCommit: SourceCommit;
     events: CanonicalTimelineEvent[];
@@ -10,16 +11,37 @@ export type SourceCommitProjectionBatch = {
  * The cursor only gates visibility; each source row keeps its own canonical
  * identity and source order coordinate.
  */
-export declare function buildSourceCommitTimelineEvents(history: HistoryResponse, sourceCommit: SourceCommit, previousCommittedThroughSeq?: number): CanonicalTimelineEvent[];
+export declare function buildSourceCommitTimelineEvents(history: HistoryResponse, sourceCommit: SourceCommit, previousCommittedThroughSeq?: number, 
+/** 宿主原地改写后重投的行：源 seq → 原始内容指纹，参与事件 ID。 */
+contentRevisions?: ReadonlyMap<number, string>): CanonicalTimelineEvent[];
+export type SourceCommitPageReader = (cursorSeq: number) => Promise<HistoryResponse>;
+export type SourceCommitMediaRelay = (page: HistoryResponse) => Promise<HistoryResponse>;
 /**
- * Walk source-history pages without treating a page size as a source
- * watermark. The caller's page reader must report the raw SQLite sequence it
- * actually covered; visible heartbeat filtering is therefore safe, while a
- * missing page fails before the local observer cursor can advance.
+ * 投影新提交的源行。宿主行在提交时可能已带投递媒体（openclawDelivery /
+ * openclawDisplayContent 中的托管外发图片），必须先经 relayMedia 上传并改写为 Relay
+ * 文件块，否则图片只能等下一次 history 刷新才出现。fingerprints 记录每行原始内容，
+ * 供宿主原地改写后的重投比较。
  */
 export declare function projectSourceCommitHistoryPages(options: {
     sourceCommit: SourceCommit;
     previousCommittedThroughSeq?: number;
-    readPage: (cursorSeq: number) => Promise<HistoryResponse>;
+    readPage: SourceCommitPageReader;
+    relayMedia?: SourceCommitMediaRelay;
+    fingerprints?: SourceRowFingerprints;
+    publish: (batch: SourceCommitProjectionBatch) => void | Promise<void>;
+}): Promise<number>;
+/**
+ * 宿主原地改写后的重投（OpenClaw 先提交最终回复，再把托管图片补写进同一行，seq 水位不变）。
+ *
+ * 只比较本进程投影过的范围：从记录了指纹的最小源 seq 起重读，原始内容指纹变化、或此前
+ * 不可见而现在可见的行才重新发布。重投事件 ID 含内容指纹：同一内容永远得到同一 ID，
+ * Relay 按 eventId 与内容哈希幂等；不同内容得到新 ID，作为同一 canonical 消息的新版本。
+ * 返回重新发布的行数。
+ */
+export declare function projectSourceCommitRewrite(options: {
+    sourceCommit: SourceCommit;
+    readPage: SourceCommitPageReader;
+    relayMedia?: SourceCommitMediaRelay;
+    fingerprints: SourceRowFingerprints;
     publish: (batch: SourceCommitProjectionBatch) => void | Promise<void>;
 }): Promise<number>;

package/dist/openclaw/relay/source-commit-projection.js

@@ -1,11 +1,14 @@
 import { createHash } from "node:crypto";
 import { parseCanonicalTimelineEvent } from "../../core/relay/timeline-event-log.js";
+import { sourceRowFingerprint, } from "./source-row-fingerprints.js";
 /**
  * Turn the authoritative source snapshot into a deterministic append stream.
  * The cursor only gates visibility; each source row keeps its own canonical
  * identity and source order coordinate.
  */
-export function buildSourceCommitTimelineEvents(history, sourceCommit, previousCommittedThroughSeq) {
+export function buildSourceCommitTimelineEvents(history, sourceCommit, previousCommittedThroughSeq, 
+/** 宿主原地改写后重投的行：源 seq → 原始内容指纹，参与事件 ID。 */
+contentRevisions) {
     const messages = history.timelineSnapshot?.messages ?? [];
     return messages.flatMap((message, index) => {
         if (message.projectionVersion !== 3) {
@@ -30,8 +33,12 @@ export function buildSourceCommitTimelineEvents(history, sourceCommit, previousC
             : message.messageState === "failed" || message.messageState === "aborted"
                 ? "run.failed"
                 : "message.completed";
+        const contentRevision = contentRevisions?.get(sourceSeq);
+        const eventIdParts = [sourceCommit.sourceOrderScope, sourceCommit.sourceGeneration, messageId, sourceSeq];
+        if (contentRevision)
+            eventIdParts.push(contentRevision);
         const eventId = `evt_source_commit_${createHash("sha256")
-            .update(JSON.stringify([sourceCommit.sourceOrderScope, sourceCommit.sourceGeneration, messageId, sourceSeq]))
+            .update(JSON.stringify(eventIdParts))
             .digest("hex")
             .slice(0, 32)}`;
         return [parseCanonicalTimelineEvent({
@@ -77,14 +84,32 @@ export function buildSourceCommitTimelineEvents(history, sourceCommit, previousC
             })];
     });
 }
+/** 只保留 (afterSeq, throughSeq] 内、且通过 include 的快照行。 */
+function withSnapshotRows(history, afterSeq, throughSeq, include = () => true) {
+    if (!history.timelineSnapshot)
+        return history;
+    return {
+        ...history,
+        timelineSnapshot: {
+            ...history.timelineSnapshot,
+            messages: history.timelineSnapshot.messages.filter((message) => {
+                const seq = message.sourceOrderSeq;
+                return Number.isSafeInteger(seq)
+                    && seq > afterSeq
+                    && seq <= throughSeq
+                    && include(message);
+            }),
+        },
+    };
+}
 /**
  * Walk source-history pages without treating a page size as a source
  * watermark. The caller's page reader must report the raw SQLite sequence it
  * actually covered; visible heartbeat filtering is therefore safe, while a
  * missing page fails before the local observer cursor can advance.
  */
-export async function projectSourceCommitHistoryPages(options) {
-    let readThroughSeq = options.previousCommittedThroughSeq ?? 0;
+async function walkSourceCommitPages(options) {
+    let readThroughSeq = options.startSeq;
     const targetSeq = options.sourceCommit.committedThroughSeq;
     while (readThroughSeq < targetSeq) {
         const history = await options.readPage(readThroughSeq);
@@ -101,32 +126,17 @@ export async function projectSourceCommitHistoryPages(options) {
             throw new Error(`source commit ${options.sourceCommit.sourceRevision} history page has a source gap`);
         }
         const pageCommittedThroughSeq = Math.min(sourceReadThroughSeq, targetSeq);
-        const pageSourceCommit = {
-            ...options.sourceCommit,
-            committedThroughSeq: pageCommittedThroughSeq,
-            sourceRevision: pageCommittedThroughSeq === targetSeq
-                ? options.sourceCommit.sourceRevision
-                : `seq:${pageCommittedThroughSeq}`,
-        };
-        const pageMessages = history.timelineSnapshot?.messages.filter((message) => {
-            const seq = message.sourceOrderSeq;
-            return Number.isSafeInteger(seq)
-                && seq > readThroughSeq
-                && seq <= pageCommittedThroughSeq;
-        }) ?? [];
-        const pageHistory = history.timelineSnapshot
-            ? {
-                ...history,
-                timelineSnapshot: {
-                    ...history.timelineSnapshot,
-                    messages: pageMessages,
-                },
-            }
-            : history;
-        const events = buildSourceCommitTimelineEvents(pageHistory, pageSourceCommit, readThroughSeq);
-        if (events.length > 0) {
-            await options.publish({ sourceCommit: pageSourceCommit, events });
-        }
+        await options.visit({
+            rawPage: history,
+            afterSeq: readThroughSeq,
+            pageSourceCommit: {
+                ...options.sourceCommit,
+                committedThroughSeq: pageCommittedThroughSeq,
+                sourceRevision: pageCommittedThroughSeq === targetSeq
+                    ? options.sourceCommit.sourceRevision
+                    : `seq:${pageCommittedThroughSeq}`,
+            },
+        });
         readThroughSeq = sourceReadThroughSeq;
         if (readThroughSeq < targetSeq && history.sourceHasMore !== true) {
             throw new Error(`source commit ${options.sourceCommit.sourceRevision} history page ended before source watermark`);
@@ -134,6 +144,72 @@ export async function projectSourceCommitHistoryPages(options) {
     }
     return readThroughSeq;
 }
+/**
+ * 投影新提交的源行。宿主行在提交时可能已带投递媒体（openclawDelivery /
+ * openclawDisplayContent 中的托管外发图片），必须先经 relayMedia 上传并改写为 Relay
+ * 文件块，否则图片只能等下一次 history 刷新才出现。fingerprints 记录每行原始内容，
+ * 供宿主原地改写后的重投比较。
+ */
+export async function projectSourceCommitHistoryPages(options) {
+    const relayMedia = options.relayMedia ?? (async (page) => page);
+    return walkSourceCommitPages({
+        sourceCommit: options.sourceCommit,
+        startSeq: options.previousCommittedThroughSeq ?? 0,
+        readPage: options.readPage,
+        visit: async ({ rawPage, pageSourceCommit, afterSeq }) => {
+            const throughSeq = pageSourceCommit.committedThroughSeq;
+            const rawRows = withSnapshotRows(rawPage, afterSeq, throughSeq).timelineSnapshot?.messages ?? [];
+            const pageHistory = withSnapshotRows(await relayMedia(rawPage), afterSeq, throughSeq);
+            const events = buildSourceCommitTimelineEvents(pageHistory, pageSourceCommit, afterSeq);
+            if (events.length > 0) {
+                await options.publish({ sourceCommit: pageSourceCommit, events });
+            }
+            options.fingerprints?.record(pageSourceCommit, rawRows);
+        },
+    });
+}
+/**
+ * 宿主原地改写后的重投（OpenClaw 先提交最终回复，再把托管图片补写进同一行，seq 水位不变）。
+ *
+ * 只比较本进程投影过的范围：从记录了指纹的最小源 seq 起重读，原始内容指纹变化、或此前
+ * 不可见而现在可见的行才重新发布。重投事件 ID 含内容指纹：同一内容永远得到同一 ID，
+ * Relay 按 eventId 与内容哈希幂等；不同内容得到新 ID，作为同一 canonical 消息的新版本。
+ * 返回重新发布的行数。
+ */
+export async function projectSourceCommitRewrite(options) {
+    const trackedFromSeq = options.fingerprints.trackedFromSeq(options.sourceCommit);
+    if (trackedFromSeq === undefined)
+        return 0;
+    const relayMedia = options.relayMedia ?? (async (page) => page);
+    let republished = 0;
+    await walkSourceCommitPages({
+        sourceCommit: options.sourceCommit,
+        startSeq: trackedFromSeq - 1,
+        readPage: options.readPage,
+        visit: async ({ rawPage, pageSourceCommit, afterSeq }) => {
+            const throughSeq = pageSourceCommit.committedThroughSeq;
+            const revisions = new Map();
+            const rawRows = withSnapshotRows(rawPage, afterSeq, throughSeq, (message) => {
+                const fingerprint = sourceRowFingerprint(message);
+                if (options.fingerprints.matches(pageSourceCommit, message.sourceOrderSeq, fingerprint))
+                    return false;
+                revisions.set(message.sourceOrderSeq, fingerprint);
+                return true;
+            }).timelineSnapshot?.messages ?? [];
+            if (rawRows.length === 0)
+                return;
+            // 媒体处理使用整页（侧车媒体行按源身份归并到父消息），之后只保留变化的行。
+            const pageHistory = withSnapshotRows(await relayMedia(rawPage), afterSeq, throughSeq, (message) => revisions.has(message.sourceOrderSeq));
+            const events = buildSourceCommitTimelineEvents(pageHistory, pageSourceCommit, afterSeq, revisions);
+            if (events.length > 0) {
+                await options.publish({ sourceCommit: pageSourceCommit, events });
+            }
+            options.fingerprints.record(pageSourceCommit, rawRows);
+            republished += events.length;
+        },
+    });
+    return republished;
+}
 /** 源投影必须带会话归属；缺失时显式失败，绝不猜成 main 写错会话。 */
 function requireProjectionSessionKey(value) {
     const sessionKey = typeof value === "string" ? value.trim() : "";

package/dist/openclaw/relay/source-commit-projection.js.map

@@ -1 +1 @@
-{"version":3,"file":"source-commit-projection.js","sourceRoot":"","sources":["../../../src/openclaw/relay/source-commit-projection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"source-commit-projection.js","sourceRoot":"","sources":["../../../src/openclaw/relay/source-commit-projection.ts"],"names":[],"mappings":"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"}

package/dist/openclaw/relay/source-row-fingerprints.d.ts

@@ -0,0 +1,22 @@
+import { type SourceCommit } from "../../core/relay/source-commit.js";
+import type { HistoryResponse } from "./chat-history.js";
+export type SourceSnapshotMessage = NonNullable<HistoryResponse["timelineSnapshot"]>["messages"][number];
+/**
+ * 源行原始内容指纹：对未经媒体处理的投影行整体做 SHA-256。投影是确定的，
+ * 同一源行内容不变时指纹不变；宿主原地补写（如追加托管图片）后指纹变化。
+ */
+export declare function sourceRowFingerprint(message: SourceSnapshotMessage): string;
+/**
+ * 记录本进程已投影过的源行指纹（按源作用域分组，源 seq → 指纹）。
+ *
+ * 只覆盖本进程投影过的范围：进程启动前投影的行没有指纹，不参与原地改写比较，
+ * 那部分由手机 history 刷新兜底。会话切换到新的源作用域时丢弃旧作用域，内存只随
+ * 当前会话增长。
+ */
+export declare class SourceRowFingerprints {
+    private readonly byScope;
+    record(commit: SourceCommit, messages: readonly SourceSnapshotMessage[]): void;
+    matches(commit: SourceCommit, sourceSeq: number, fingerprint: string): boolean;
+    /** 本进程在该作用域记录过指纹的最小源 seq；没有记录时返回 undefined。 */
+    trackedFromSeq(commit: SourceCommit): number | undefined;
+}

package/dist/openclaw/relay/source-row-fingerprints.js

@@ -0,0 +1,48 @@
+import { createHash } from "node:crypto";
+import { sourceCommitScope } from "../../core/relay/source-commit.js";
+/**
+ * 源行原始内容指纹：对未经媒体处理的投影行整体做 SHA-256。投影是确定的，
+ * 同一源行内容不变时指纹不变；宿主原地补写（如追加托管图片）后指纹变化。
+ */
+export function sourceRowFingerprint(message) {
+    return createHash("sha256").update(JSON.stringify(message)).digest("hex").slice(0, 32);
+}
+/**
+ * 记录本进程已投影过的源行指纹（按源作用域分组，源 seq → 指纹）。
+ *
+ * 只覆盖本进程投影过的范围：进程启动前投影的行没有指纹，不参与原地改写比较，
+ * 那部分由手机 history 刷新兜底。会话切换到新的源作用域时丢弃旧作用域，内存只随
+ * 当前会话增长。
+ */
+export class SourceRowFingerprints {
+    byScope = new Map();
+    record(commit, messages) {
+        const scope = sourceCommitScope(commit);
+        let rows = this.byScope.get(scope);
+        if (!rows) {
+            this.byScope.clear();
+            rows = new Map();
+            this.byScope.set(scope, rows);
+        }
+        for (const message of messages) {
+            const seq = message.sourceOrderSeq;
+            if (typeof seq !== "number" || !Number.isSafeInteger(seq))
+                continue;
+            rows.set(seq, sourceRowFingerprint(message));
+        }
+    }
+    matches(commit, sourceSeq, fingerprint) {
+        return this.byScope.get(sourceCommitScope(commit))?.get(sourceSeq) === fingerprint;
+    }
+    /** 本进程在该作用域记录过指纹的最小源 seq；没有记录时返回 undefined。 */
+    trackedFromSeq(commit) {
+        const rows = this.byScope.get(sourceCommitScope(commit));
+        if (!rows || rows.size === 0)
+            return undefined;
+        let minimum;
+        for (const seq of rows.keys())
+            minimum = minimum === undefined ? seq : Math.min(minimum, seq);
+        return minimum;
+    }
+}
+//# sourceMappingURL=source-row-fingerprints.js.map

package/dist/openclaw/relay/source-row-fingerprints.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-row-fingerprints.js","sourceRoot":"","sources":["../../../src/openclaw/relay/source-row-fingerprints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAqB,MAAM,mCAAmC,CAAC;AAKzF;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAA8B;IACjE,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACzF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,OAAO,qBAAqB;IACf,OAAO,GAAG,IAAI,GAAG,EAA+B,CAAC;IAElE,MAAM,CAAC,MAAoB,EAAE,QAA0C;QACrE,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACrB,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAChC,CAAC;QACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC;YACnC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC;gBAAE,SAAS;YACpE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,OAAO,CAAC,MAAoB,EAAE,SAAiB,EAAE,WAAmB;QAClE,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,KAAK,WAAW,CAAC;IACrF,CAAC;IAED,+CAA+C;IAC/C,cAAc,CAAC,MAAoB;QACjC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAC/C,IAAI,OAA2B,CAAC;QAChC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE;YAAE,OAAO,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC9F,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}

package/dist/openclaw/relay-manager.js

@@ -3,14 +3,18 @@ import { bindRelayAbortSignal, buildRelayUrl, createRelayWebSocket, disconnectRe
 import { handleLocalCommand } from "./handlers/local-handlers.js";
 import { createOpenClawContextUsagePublisher } from "./relay/openclaw-context-usage-publisher.js";
 import { handleProviderCommand } from "./handlers/provider-handlers.js";
+import { handleOpenClawThinkingCommand } from "./handlers/thinking-handlers.js";
 import { DEFAULT_GATEWAY_SESSION_DEFAULTS, contextUsageSnapshotFromSessionsList, canonicalizeRelayParams, canonicalizeSessionKey, extractGatewaySessionDefaults, } from "./relay/session-context.js";
 import { appendUniqueSuffix, extractChatRole, extractChatText, normalizeChatEventPayload, normalizeChatState, withMessageText, } from "../core/relay/chat-payload.js";
 import { canonicalizeOpenClawGatewayHistoryResponse, extractHistoryMediaContent, extractExplicitParentMediaContent, extractHistoryOutcome, readOpenClawSourceCommitCursor, readOpenClawTranscriptChatHistory, withTimeout, } from "./relay/chat-history.js";
 import { watchOpenClawSourceCommit } from "./relay/openclaw-source-commit-watcher.js";
 import { createSourceCommitCheckpointClient } from "../core/relay/source-commit-checkpoint-client.js";
-import { projectSourceCommitHistoryPages } from "./relay/source-commit-projection.js";
+import { createSourceCommitPublishFlow, SOURCE_COMMIT_PAGE_LIMIT, sourceCommitDeliveryId, } from "../core/relay/source-commit-publish-flow.js";
+import { projectSourceCommitHistoryPages, projectSourceCommitRewrite, } from "./relay/source-commit-projection.js";
+import { SourceRowFingerprints } from "./relay/source-row-fingerprints.js";
 import { join } from "node:path";
 import { resolveOpenClawStateDir } from "./runtime/openclaw-paths.js";
+import { createSourceCommit } from "../core/relay/source-commit.js";
 import { openClawAgentIdFromSessionKey } from "../core/relay/timeline-projection-v3.js";
 import { OpenClawChatSendDedupeCoordinator, } from "./relay/chat-send-dedupe-coordinator.js";
 import { buildMobileAssistantDeltaPayload, buildMobileAssistantCompletedPayload, buildMobileAssistantErrorPayload, buildMobileAssistantFinalPayload, } from "../core/relay/mobile-chat-run-bridge.js";
@@ -83,6 +87,11 @@ export async function runRelayManager(opts) {
         const sourceCommitCheckpoints = createSourceCommitCheckpointClient({
             send: (query) => sendRelayJson(relayWs, query).status === "sent",
         });
+        // 源投影流控：至多一个投影帧在 Relay 队列中，命令响应不会被补齐流量挤到超时。
+        let relayEventsAcknowledged = false;
+        const sourceCommitPublishFlow = createSourceCommitPublishFlow({
+            isAcknowledged: () => relayEventsAcknowledged,
+        });
         const chatRunContexts = new Map();
         const chatSendDedupe = new OpenClawChatSendDedupeCoordinator(() => sessionDefaults);
         const outgoingMediaUploadCache = new Map();
@@ -249,7 +258,7 @@ export async function runRelayManager(opts) {
                 ? { status: "delivered" }
                 : { status: "retryable", error: result.error ?? new Error(`relay_send_${result.status}`) };
         }
-        async function publishAndSendGatewayEvent(eventName, payload, publishOffice, userMessage, confirmWrite = false) {
+        async function publishAndSendGatewayEvent(eventName, payload, publishOffice, userMessage, confirmWrite = false, deliveryId) {
             let outgoingPayload = payload;
             if (eventName === "chat") {
                 try {
@@ -282,6 +291,7 @@ export async function runRelayManager(opts) {
                 type: "event",
                 event: eventName,
                 payload: outgoingPayload,
+                ...(deliveryId ? { deliveryId } : {}),
             };
             if (confirmWrite)
                 return sendWithWriteConfirmation(message);
@@ -405,36 +415,56 @@ export async function runRelayManager(opts) {
                 return;
             const agentId = openClawAgentIdFromSessionKey(normalizedSessionKey);
             const databasePath = join(resolveOpenClawStateDir(), "agents", agentId, "agent", "openclaw-agent.sqlite");
+            const fingerprints = new SourceRowFingerprints();
+            const readPage = (cursorSeq) => withTimeout(requestChatHistoryFromClawConnect({
+                sessionKey: normalizedSessionKey,
+                limit: SOURCE_COMMIT_PAGE_LIMIT,
+                cursor: `seq:${cursorSeq}`,
+                direction: "newer",
+            }), CHAT_HISTORY_FETCH_TIMEOUT_MS, "source commit history reconciliation");
+            // 与手机拉取 history 走同一媒体处理（共用上传缓存，同一附件得到同一文件）。
+            const relayMedia = async (page) => await relayOutgoingMediaForResponse("chat.history", page);
+            const publish = ({ sourceCommit: pageSourceCommit, events }) => sourceCommitPublishFlow.publish(sourceCommitDeliveryId(pageSourceCommit, events.map((event) => event.eventId)), async (deliveryId) => {
+                await waitForRelaySocketDrain(relayWs, 256 * 1024);
+                const deliveryResult = await publishAndSendGatewayEvent("chat", {
+                    state: "source_commit",
+                    sessionKey: normalizedSessionKey,
+                    sourceCommit: pageSourceCommit,
+                    timelineEvents: events,
+                }, true, undefined, true, deliveryId);
+                if (deliveryResult?.status === "retryable") {
+                    throw deliveryResult.error;
+                }
+            });
             const watcher = watchOpenClawSourceCommit({
                 databasePath,
-                resolveInitialWatermark: (cursor) => sourceCommitCheckpoints.resolveWatermark(cursor),
+                resolveInitialWatermark: (cursor) => sourceCommitCheckpoints.resolveWatermark(createSourceCommit(cursor)),
                 readCursor: () => readOpenClawSourceCommitCursor({
                     sessionKey: normalizedSessionKey,
                     projectionVersion: 3,
                     projectionGatewayId: opts.gatewayId,
                 }, sessionDefaults),
-                onCommit: async (sourceCommit, previousCommittedThroughSeq) => {
+                onCommit: async (cursor, previousCommittedThroughSeq) => {
                     await projectSourceCommitHistoryPages({
-                        sourceCommit,
+                        // 改写代号只用于本地触发重投，不随 sourceCommit 发给 Relay。
+                        sourceCommit: createSourceCommit(cursor),
                         previousCommittedThroughSeq,
-                        readPage: (cursorSeq) => withTimeout(requestChatHistoryFromClawConnect({
-                            sessionKey: normalizedSessionKey,
-                            limit: 200,
-                            cursor: `seq:${cursorSeq}`,
-                            direction: "newer",
-                        }), CHAT_HISTORY_FETCH_TIMEOUT_MS, "source commit history reconciliation"),
-                        publish: async ({ sourceCommit: pageSourceCommit, events }) => {
-                            await waitForRelaySocketDrain(relayWs, 256 * 1024);
-                            const deliveryResult = await publishAndSendGatewayEvent("chat", {
-                                state: "source_commit",
-                                sessionKey: normalizedSessionKey,
-                                sourceCommit: pageSourceCommit,
-                                timelineEvents: events,
-                            }, true, undefined, true);
-                            if (deliveryResult?.status === "retryable") {
-                                throw deliveryResult.error;
-                            }
-                        },
+                        readPage,
+                        relayMedia,
+                        fingerprints,
+                        publish,
+                    });
+                },
+                // OpenClaw 先提交最终回复，再把托管图片原地补写进同一行（seq 不变、改写代号变化）；
+                // 重投内容变化的行，图片无需刷新即可出现。
+                rewriteGenerationOf: (cursor) => cursor.rewriteGeneration,
+                onRewrite: async (cursor) => {
+                    await projectSourceCommitRewrite({
+                        sourceCommit: createSourceCommit(cursor),
+                        readPage,
+                        relayMedia,
+                        fingerprints,
+                        publish,
                     });
                 },
                 onError: (error) => {
@@ -887,6 +917,7 @@ export async function runRelayManager(opts) {
                         relayHelloTimer = undefined;
                     }
                     const deliveryMode = reliableDeliveryModeFromRelayHello(msg);
+                    relayEventsAcknowledged = deliveryMode === "acknowledged";
                     deliveryOutbox.attach(relayWs, deliveryMode);
                     console.log(`[relay] reliable delivery mode=${deliveryMode}`);
                     sourceCommitCheckpoints.markRelayHello(msg.protocolCapabilities);
@@ -894,7 +925,8 @@ export async function runRelayManager(opts) {
                     return;
                 }
                 if (msg.type === "event_ack") {
-                    deliveryOutbox.acknowledge(msg.id);
+                    if (!sourceCommitPublishFlow.acknowledge(msg.id))
+                        deliveryOutbox.acknowledge(msg.id);
                     return;
                 }
                 if (sourceCommitCheckpoints.handleResponse(msg)) {
@@ -924,6 +956,17 @@ export async function runRelayManager(opts) {
                     }
                     return;
                 }
+                // 会话思考等级命令经网关 sessions.list / sessions.patch 读写，需要当前网关连接。
+                const thinkingPromise = handleOpenClawThinkingCommand(msg.method, msg.params, gatewayClient);
+                if (thinkingPromise !== null) {
+                    const result = await thinkingPromise;
+                    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;
+                }
                 // Handle local commands without forwarding to the gateway.
                 const localResult = await handleLocalCommand(msg.method, msg.params, {
                     requestId,
@@ -1152,6 +1195,7 @@ export async function runRelayManager(opts) {
                 watcher.close();
             sourceCommitWatchers.clear();
             sourceCommitCheckpoints.close(`relay closed ${code}`);
+            sourceCommitPublishFlow.close(`relay closed ${code}`);
             chatSendDedupe.clearAll();
             contextUsage.dispose();
             if (relayHelloTimer) {