@jingyi0605/codingns 0.5.1 → 0.6.0

package/dist/server/ws/ws-server.js

@@ -1,6 +1,7 @@
 import { WebSocketServer } from "ws";
 import { AppError } from "../shared/errors/app-error.js";
 import { hashContent } from "../shared/utils/hash.js";
+import { logPerformance } from "../shared/utils/perf-log.js";
 const MAX_TRACKED_MESSAGES_PER_SUBSCRIPTION = 2_048;
 const MAX_STORED_MESSAGE_PREVIEW_CHARS = 2_048;
 export function createWsServer(server, wsAuthGuard, sessionHistoryService, sessionLiveRuntimeService, terminalWsHub, workbenchWsHub, butlerActionContextService) {
@@ -65,14 +66,33 @@ export function createWsServer(server, wsAuthGuard, sessionHistoryService, sessi
                     return;
                 }
                 try {
+                    const startedAt = Date.now();
+                    const readStartedAt = Date.now();
                     const page = await sessionHistoryService.readSessionHistory(payload.sessionId, payload.cursor ?? null, typeof payload.limit === "number" ? payload.limit : 50, "backward", authContext.user.userId);
-                    await subscription.forwardEnvelope({
+                    const readMs = Date.now() - readStartedAt;
+                    const forwardMetric = await subscription.forwardEnvelopeWithMetric({
                         type: "session.history_older",
                         sessionId: payload.sessionId,
                         cursor: null,
                         olderCursor: page.nextCursor,
                         messages: page.messages
                     });
+                    logPerformance("ws.session.load_older", Date.now() - startedAt, {
+                        sessionId: payload.sessionId,
+                        limit: typeof payload.limit === "number" ? payload.limit : 50,
+                        hasCursor: payload.cursor !== null && payload.cursor !== undefined,
+                        readMs,
+                        forwardMs: forwardMetric?.totalMs ?? 0,
+                        messageCount: page.messages.length,
+                        olderCursor: page.nextCursor,
+                        payloadBytes: forwardMetric?.payloadBytes ?? 0,
+                        stringifyMs: forwardMetric?.stringifyMs ?? 0,
+                        sendMs: forwardMetric?.sendMs ?? 0,
+                        bufferedAmount: forwardMetric?.bufferedAmount ?? 0
+                    }, {
+                        thresholdMs: 0,
+                        force: true
+                    });
                 }
                 catch (error) {
                     const appError = error instanceof AppError
@@ -93,12 +113,19 @@ export function createWsServer(server, wsAuthGuard, sessionHistoryService, sessi
             subscriptions.get(payload.sessionId)?.close();
             butlerActionContextService?.preloadSessionActionContext(payload.sessionId, authContext.user.userId);
             const seenMessages = new Map();
-            const forwardEnvelope = async (envelope) => {
+            const forwardEnvelopeWithMetric = async (envelope) => {
+                const forwardStartedAt = Date.now();
+                const dedupeStartedAt = Date.now();
                 const deduped = dedupeEnvelopeMessages(envelope, seenMessages);
+                const dedupeMs = Date.now() - dedupeStartedAt;
                 if (!deduped) {
-                    return;
+                    return null;
                 }
-                client.send(JSON.stringify(deduped));
+                const serializeStartedAt = Date.now();
+                const payload = JSON.stringify(deduped);
+                const stringifyMs = Date.now() - serializeStartedAt;
+                const sendMetric = sendSerializedPayload(client, payload);
+                let workbenchBroadcastMs = 0;
                 if (deduped.type === "session.backfill" ||
                     deduped.type === "session.delta" ||
                     deduped.type === "session.activity" ||
@@ -106,37 +133,105 @@ export function createWsServer(server, wsAuthGuard, sessionHistoryService, sessi
                     deduped.type === "session.runtime_status" ||
                     deduped.type === "session.runtime_error" ||
                     deduped.type === "session.interrupted") {
+                    const workbenchBroadcastStartedAt = Date.now();
                     await workbenchWsHub.broadcastSnapshot(authContext.user.userId);
+                    workbenchBroadcastMs = Date.now() - workbenchBroadcastStartedAt;
                 }
+                const metric = {
+                    messageType: deduped.type,
+                    messageCount: getEnvelopeMessageCount(deduped),
+                    payloadBytes: sendMetric.payloadBytes,
+                    dedupeMs,
+                    stringifyMs,
+                    sendMs: sendMetric.sendMs,
+                    bufferedAmount: sendMetric.bufferedAmount,
+                    workbenchBroadcastMs,
+                    totalMs: Date.now() - forwardStartedAt
+                };
+                if (deduped.type === "session.backfill" ||
+                    deduped.type === "session.history_older") {
+                    logPerformance("ws.session.forward_envelope", metric.totalMs, {
+                        sessionId: deduped.sessionId,
+                        messageType: deduped.type,
+                        messageCount: metric.messageCount,
+                        payloadBytes: metric.payloadBytes,
+                        dedupeMs: metric.dedupeMs,
+                        stringifyMs: metric.stringifyMs,
+                        sendMs: metric.sendMs,
+                        bufferedAmount: metric.bufferedAmount,
+                        workbenchBroadcastMs: metric.workbenchBroadcastMs
+                    }, {
+                        thresholdMs: 0,
+                        force: true
+                    });
+                }
+                return metric;
+            };
+            const forwardEnvelope = async (envelope) => {
+                await forwardEnvelopeWithMetric(envelope);
             };
             const runtimeSubscription = sessionLiveRuntimeService.subscribeRuntime(payload.sessionId, forwardEnvelope);
             try {
+                const startedAt = Date.now();
                 let currentCursor = payload.cursor ?? null;
                 const safeLimit = typeof payload.limit === "number" ? payload.limit : 50;
+                let backfillReadMs = 0;
+                let backfillForwardMs = 0;
+                let backfillPayloadBytes = 0;
+                let backfillSendMs = 0;
+                let backfillBufferedAmount = 0;
                 if (currentCursor === null) {
+                    const readStartedAt = Date.now();
                     const page = await sessionHistoryService.readSessionHistory(payload.sessionId, null, safeLimit, "backward", authContext.user.userId);
+                    backfillReadMs = Date.now() - readStartedAt;
                     currentCursor = page.cursor;
-                    await forwardEnvelope({
+                    const backfillMetric = await forwardEnvelopeWithMetric({
                         type: "session.backfill",
                         sessionId: payload.sessionId,
                         cursor: page.cursor,
                         olderCursor: page.nextCursor,
                         messages: page.messages
                     });
+                    backfillForwardMs = backfillMetric?.totalMs ?? 0;
+                    backfillPayloadBytes = backfillMetric?.payloadBytes ?? 0;
+                    backfillSendMs = backfillMetric?.sendMs ?? 0;
+                    backfillBufferedAmount = backfillMetric?.bufferedAmount ?? 0;
                 }
+                const subscribeAttachStartedAt = Date.now();
                 const historySubscription = await sessionHistoryService.subscribeSession(payload.sessionId, currentCursor, safeLimit, forwardEnvelope);
+                const subscribeAttachMs = Date.now() - subscribeAttachStartedAt;
                 subscriptions.set(payload.sessionId, {
                     sessionId: payload.sessionId,
-                    forwardEnvelope,
+                    forwardEnvelopeWithMetric,
                     close() {
                         historySubscription.close();
                         runtimeSubscription.close();
                     }
                 });
-                client.send(JSON.stringify({
+                const subscribedMetric = sendJsonPayload(client, {
                     type: "session.subscribed",
                     sessionId: payload.sessionId
-                }));
+                });
+                logPerformance("ws.session.subscribe", Date.now() - startedAt, {
+                    sessionId: payload.sessionId,
+                    limit: safeLimit,
+                    hasCursor: payload.cursor !== null && payload.cursor !== undefined,
+                    currentCursor,
+                    backfillReadMs,
+                    backfillForwardMs,
+                    backfillPayloadBytes,
+                    backfillSendMs,
+                    backfillBufferedAmount,
+                    subscribeAttachMs,
+                    ackPayloadBytes: subscribedMetric.payloadBytes,
+                    ackStringifyMs: subscribedMetric.stringifyMs,
+                    ackSendMs: subscribedMetric.sendMs,
+                    ackBufferedAmount: subscribedMetric.bufferedAmount,
+                    subscribed: true
+                }, {
+                    thresholdMs: 0,
+                    force: true
+                });
             }
             catch (error) {
                 runtimeSubscription.close();
@@ -147,6 +242,15 @@ export function createWsServer(server, wsAuthGuard, sessionHistoryService, sessi
                         errorCode: "INTERNAL_ERROR",
                         detail: "订阅会话失败"
                     });
+                logPerformance("ws.session.subscribe.failed", 0, {
+                    sessionId: payload.sessionId,
+                    limit: typeof payload.limit === "number" ? payload.limit : 50,
+                    hasCursor: payload.cursor !== null && payload.cursor !== undefined,
+                    error: error instanceof Error ? error.message : "unknown"
+                }, {
+                    thresholdMs: 0,
+                    force: true
+                });
                 sendWsError(client, payload.sessionId, appError.errorCode, appError.message);
             }
         });
@@ -298,6 +402,35 @@ function sendWsError(client, sessionId, errorCode, detail) {
         timestamp: new Date().toISOString()
     }));
 }
+function getEnvelopeMessageCount(envelope) {
+    if (envelope.type === "session.backfill" ||
+        envelope.type === "session.delta" ||
+        envelope.type === "session.history_older") {
+        return envelope.messages.length;
+    }
+    return envelope.type === "session.runtime_message" ? 1 : 0;
+}
+function sendJsonPayload(client, payload) {
+    const stringifyStartedAt = Date.now();
+    const serialized = JSON.stringify(payload);
+    const stringifyMs = Date.now() - stringifyStartedAt;
+    const sendMetric = sendSerializedPayload(client, serialized);
+    return {
+        payloadBytes: sendMetric.payloadBytes,
+        stringifyMs,
+        sendMs: sendMetric.sendMs,
+        bufferedAmount: sendMetric.bufferedAmount
+    };
+}
+function sendSerializedPayload(client, payload) {
+    const sendStartedAt = Date.now();
+    client.send(payload);
+    return {
+        payloadBytes: Buffer.byteLength(payload),
+        sendMs: Date.now() - sendStartedAt,
+        bufferedAmount: client.bufferedAmount
+    };
+}
 export const __internal__ = {
     MAX_TRACKED_MESSAGES_PER_SUBSCRIPTION,
     MAX_STORED_MESSAGE_PREVIEW_CHARS,

package/dist/server/ws/ws-server.js.map

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

package/node_modules/@codingns/session-sync-core/dist/providers/codex.d.ts

@@ -61,6 +61,7 @@ export declare class CodexAdapter implements ProviderAdapter {
     private readThreadMetadataIndex;
     private listSessionFiles;
     private listArchivedSessionFiles;
+    private resolveArchivedSessionCandidate;
     private resolveSessionFilePath;
     private findSessionFileByThreadId;
     private readThreadIdFromRawStore;

package/node_modules/@codingns/session-sync-core/dist/providers/codex.js

@@ -893,6 +893,20 @@ export class CodexAdapter {
             }
             archivedFiles.add(metadata.rolloutPath);
         }
+        for (const metadata of threadMetadataIndex.values()) {
+            if (metadata.isArchived === true
+                || !metadata.rolloutPath) {
+                continue;
+            }
+            if (targetPath.length > 0
+                && normalizeWorkspacePath(metadata.cwd ?? "") !== targetPath) {
+                continue;
+            }
+            const archivedCandidate = this.resolveArchivedSessionCandidate(metadata.rolloutPath);
+            if (archivedCandidate) {
+                archivedFiles.add(archivedCandidate);
+            }
+        }
         for (const session of knownSessions) {
             if (session.isArchived !== true
                 || normalizeWorkspacePath(session.workspacePath) !== targetPath
@@ -901,6 +915,16 @@ export class CodexAdapter {
             }
             archivedFiles.add(session.rawStoreRef);
         }
+        for (const session of knownSessions) {
+            if (session.isArchived === true
+                || normalizeWorkspacePath(session.workspacePath) !== targetPath) {
+                continue;
+            }
+            const archivedCandidate = this.resolveArchivedSessionCandidate(session.rawStoreRef);
+            if (archivedCandidate) {
+                archivedFiles.add(archivedCandidate);
+            }
+        }
         if (archivedFiles.size > 0) {
             return [...archivedFiles].filter((filePath) => existsSync(filePath));
         }
@@ -909,6 +933,16 @@ export class CodexAdapter {
         }
         return [];
     }
+    resolveArchivedSessionCandidate(filePath) {
+        if (!filePath || existsSync(filePath)) {
+            return null;
+        }
+        const archivedCandidate = join(this.options.homeDir, "archived_sessions", basename(filePath));
+        if (!existsSync(archivedCandidate)) {
+            return null;
+        }
+        return archivedCandidate;
+    }
     resolveSessionFilePath(rawStoreRef, providerSessionId) {
         const matchedByThreadId = this.findSessionFileByThreadId(providerSessionId);
         if (existsSync(rawStoreRef)) {
@@ -1325,14 +1359,17 @@ export class CodexAdapter {
                 if (!isEquivalentCodexMessage(existing.message, message)) {
                     continue;
                 }
-                // 同一条逻辑消息如果被 event_msg 和 response_item 同时记录，
-                // 优先保留结构更稳定的 response_item，避免时间线重复。
-                if (codexMessageSourcePriority(source) > codexMessageSourcePriority(existing.source)) {
+                const mergedEquivalent = mergeEquivalentCodexMessages(existing.message, existing.source, message, source);
+                if (mergedEquivalent.source !== existing.source
+                    || mergedEquivalent.message.messageId !== existing.message.messageId
+                    || mergedEquivalent.message.rawRef !== existing.message.rawRef
+                    || mergedEquivalent.message.timestamp !== existing.message.timestamp
+                    || JSON.stringify(mergedEquivalent.message.toolCall) !== JSON.stringify(existing.message.toolCall)) {
                     messages[existingIndex] = {
-                        source,
-                        dedupeKey,
+                        source: mergedEquivalent.source,
+                        dedupeKey: buildCodexMessageDedupeKey(mergedEquivalent.message),
                         message: {
-                            ...message,
+                            ...mergedEquivalent.message,
                             sequence: existing.message.sequence
                         }
                     };
@@ -1651,6 +1688,30 @@ function buildCodexMessageDedupeKey(message) {
             : null
     });
 }
+function mergeEquivalentCodexMessages(current, currentSource, incoming, incomingSource) {
+    const preferredBySource = codexMessageSourcePriority(incomingSource) > codexMessageSourcePriority(currentSource)
+        ? incoming
+        : current;
+    const preferredSource = codexMessageSourcePriority(incomingSource) > codexMessageSourcePriority(currentSource)
+        ? incomingSource
+        : currentSource;
+    const preferredStableMessageId = pickPreferredCodexEquivalentMessageId(current, incoming);
+    return {
+        source: preferredSource,
+        message: {
+            ...preferredBySource,
+            messageId: preferredStableMessageId
+        }
+    };
+}
+function pickPreferredCodexEquivalentMessageId(current, incoming) {
+    const currentUsesStableIdentity = current.messageId !== messageIdFromRawRef(current.rawRef);
+    const incomingUsesStableIdentity = incoming.messageId !== messageIdFromRawRef(incoming.rawRef);
+    if (currentUsesStableIdentity !== incomingUsesStableIdentity) {
+        return currentUsesStableIdentity ? current.messageId : incoming.messageId;
+    }
+    return incoming.messageId;
+}
 function resolveCodexFallbackTitle(messages) {
     const preferredMessage = messages.find((message) => message.role === "user" && !looksLikeCodexRulesMessage(message.content));
     if (preferredMessage) {