@jingyi0605/codingns 0.3.0 → 0.3.6

package/dist/server/modules/sessions/session-live-runtime-service.js

@@ -2,7 +2,7 @@ import { existsSync, readdirSync } from "node:fs";
 import path from "node:path";
 import { performance } from "node:perf_hooks";
 import { ClaudeRuntimeAdapter, CodexRuntimeAdapter, GeminiRuntimeAdapter, KimiRuntimeAdapter, OpenCodeRuntimeAdapter, ProviderRuntimeService } from "@codingns/session-sync-core";
-import { AppError } from "../../shared/errors/app-error.js";
+import { AppError, isAppError } from "../../shared/errors/app-error.js";
 import { createId } from "../../shared/utils/id.js";
 import { isPerfDebugEnabled, logPerformance } from "../../shared/utils/perf-log.js";
 import { logPermissionDebug } from "../../shared/utils/permission-debug-log.js";
@@ -103,7 +103,6 @@ export class SessionLiveRuntimeService {
                 userId: input.userId
             });
             const snapshot = handle.getSnapshot();
-            this.attachRuntimePersistence(handle, sessionId, workspace.id, input.userId);
             this.createRuntimeBackedSession({
                 sessionId,
                 workspaceId: workspace.id,
@@ -116,6 +115,9 @@ export class SessionLiveRuntimeService {
                 initialContent: input.content,
                 snapshot
             });
+            // 先把基础记录建出来，再回放 runtime 缓存事件，避免超快启动时出现
+            // “事件先到、索引还没落库”的竞态窗口。
+            this.attachRuntimePersistence(handle, sessionId, workspace.id, input.userId);
             const startBindingTask = this.waitForResolvedStartBinding(sessionId, workspace.id, input.provider, handle).catch(() => {
                 return;
             });
@@ -143,7 +145,18 @@ export class SessionLiveRuntimeService {
             }
             const acceptedAt = acceptedMessage?.timestamp ?? nowIso();
             const boundAttachments = this.sessionMessageAttachmentService.bindClientRequestToMessage(sessionId, input.clientRequestId, acceptedMessage?.messageId ?? null);
-            const session = this.sessionHistoryService.getSession(sessionId, input.userId);
+            const session = this.resolveStartedSession({
+                sessionId,
+                workspaceId: workspace.id,
+                userId: input.userId,
+                provider: input.provider,
+                parentSessionId: input.parentSessionId ?? null,
+                sessionKind: input.sessionKind ?? "default",
+                annotationSourceMessageId: input.annotationSourceMessageId ?? null,
+                annotationSourceText: input.annotationSourceText ?? null,
+                initialContent: input.content,
+                handle
+            });
             this.markSendDebugResponseReady(debugTrace, {
                 returnedAcceptedMessage: Boolean(acceptedMessage),
                 returnedSyntheticUser: !acceptedMessage,
@@ -428,6 +441,10 @@ export class SessionLiveRuntimeService {
         const runtimeSessionId = this.resolveRuntimeSessionId(sessionId);
         const runtimeSnapshot = this.providerRuntimeService.getSnapshot(runtimeSessionId);
         const externalRuntimeSnapshot = this.externalRuntimeSnapshots.get(runtimeSessionId) ?? null;
+        const runtimeHasActiveRun = runtimeSnapshot ? isActiveRuntimeState(runtimeSnapshot.runningState) : false;
+        const externalHasActiveRun = externalRuntimeSnapshot
+            ? isActiveRuntimeState(externalRuntimeSnapshot.runningState)
+            : false;
         const session = runtimeSnapshot || externalRuntimeSnapshot
             ? this.sessionHistoryService.getSession(sessionId, userId)
             : await this.sessionHistoryService.refreshRuntimeFallbackSession(sessionId, userId);
@@ -445,14 +462,15 @@ export class SessionLiveRuntimeService {
                 provider: session.provider,
                 providerSessionId: runtimeSnapshot.providerSessionId ?? session.providerSessionId,
                 runningState: resolution.runningState,
-                hasActiveRun: true,
-                canAttach: true,
-                canInterrupt: runtimeSnapshot.supportsInterrupt,
+                hasActiveRun: runtimeHasActiveRun,
+                canAttach: runtimeHasActiveRun,
+                canInterrupt: runtimeHasActiveRun && runtimeSnapshot.supportsInterrupt,
                 inRunInputMode: capabilities.inRunInputMode,
                 activityResolutionSource: resolution.activityResolutionSource,
                 activityConfidence: resolution.activityConfidence,
                 runId: resolution.runId,
                 detail: resolution.detail,
+                interruptSource: resolution.interruptSource,
                 errorCode: resolution.runningState === "failed"
                     ? resolution.errorCode ?? session.lastErrorCode
                     : null,
@@ -470,7 +488,7 @@ export class SessionLiveRuntimeService {
                 provider: "claude-code",
                 providerSessionId: externalRuntimeSnapshot.providerSessionId,
                 runningState: resolution.runningState,
-                hasActiveRun: true,
+                hasActiveRun: externalHasActiveRun,
                 canAttach: false,
                 canInterrupt: false,
                 inRunInputMode: capabilities.inRunInputMode,
@@ -478,6 +496,7 @@ export class SessionLiveRuntimeService {
                 activityConfidence: resolution.activityConfidence,
                 runId: resolution.runId,
                 detail: resolution.detail,
+                interruptSource: resolution.interruptSource,
                 errorCode: resolution.runningState === "failed" ? resolution.errorCode ?? session.lastErrorCode : null,
                 errorDetail: resolution.runningState === "failed" ? resolution.detail ?? session.lastErrorDetail : null,
                 updatedAt: resolution.updatedAt,
@@ -500,6 +519,7 @@ export class SessionLiveRuntimeService {
             activityConfidence: resolution.activityConfidence,
             runId: resolution.runId,
             detail: persistedErrorDetail,
+            interruptSource: resolution.interruptSource,
             errorCode: persistedErrorCode,
             errorDetail: persistedErrorDetail,
             updatedAt: resolution.updatedAt,
@@ -573,6 +593,7 @@ export class SessionLiveRuntimeService {
                 sessionId,
                 status: runtimeSnapshot.runningState,
                 detail: runtimeSnapshot.detail,
+                interruptSource: runtimeSnapshot.interruptSource,
                 timestamp: runtimeSnapshot.lastEventAt ?? runtimeSnapshot.startedAt
             });
         }
@@ -582,6 +603,7 @@ export class SessionLiveRuntimeService {
                 sessionId,
                 status: externalRuntimeSnapshot.runningState,
                 detail: externalRuntimeSnapshot.detail,
+                interruptSource: null,
                 timestamp: externalRuntimeSnapshot.updatedAt
             });
         }
@@ -669,8 +691,8 @@ export class SessionLiveRuntimeService {
             const resolution = this.sessionActivityAuthorityService.observe(createRuntimeActivityObservation(runtimeSessionId, runtimeSnapshot));
             return {
                 ...this.mapResolutionToActivityEnvelope(resolution, {
-                    hasActiveRun: true,
-                    canInterrupt: runtimeSnapshot.supportsInterrupt
+                    hasActiveRun: isActiveRuntimeState(runtimeSnapshot.runningState),
+                    canInterrupt: isActiveRuntimeState(runtimeSnapshot.runningState) && runtimeSnapshot.supportsInterrupt
                 }),
                 sessionId
             };
@@ -680,7 +702,7 @@ export class SessionLiveRuntimeService {
             const resolution = this.sessionActivityAuthorityService.observe(createExternalRuntimeActivityObservation(runtimeSessionId, externalRuntimeSnapshot));
             return {
                 ...this.mapResolutionToActivityEnvelope(resolution, {
-                    hasActiveRun: true,
+                    hasActiveRun: isActiveRuntimeState(externalRuntimeSnapshot.runningState),
                     canInterrupt: false
                 }),
                 sessionId
@@ -734,6 +756,7 @@ export class SessionLiveRuntimeService {
             activityConfidence: resolution.activityConfidence,
             runId: resolution.runId,
             detail: resolution.detail,
+            interruptSource: resolution.interruptSource,
             errorCode: resolution.errorCode,
             errorDetail: resolution.detail,
             hasActiveRun: options.hasActiveRun,
@@ -852,6 +875,7 @@ export class SessionLiveRuntimeService {
             source: "authoritative_provider_event",
             confidence: input.runningState === "failed" ? "strong" : "authoritative",
             detail: input.detail,
+            interruptSource: null,
             errorCode: input.runningState === "failed" ? "CLAUDE_HOOK_STOP_FAILURE" : null,
             observedAt: input.timestamp
         });
@@ -882,6 +906,7 @@ export class SessionLiveRuntimeService {
                 sessionId: input.sessionId,
                 status: input.runningState,
                 detail: input.detail,
+                interruptSource: null,
                 timestamp: input.timestamp
             };
         await this.emitExternalRuntimeEnvelope(envelope);
@@ -1171,42 +1196,71 @@ export class SessionLiveRuntimeService {
         });
     }
     createRuntimeBackedSession(input) {
+        this.upsertRuntimeBackedSessionRecords(input);
+    }
+    resolveStartedSession(input) {
+        try {
+            return this.sessionHistoryService.getSession(input.sessionId, input.userId);
+        }
+        catch (error) {
+            if (!isRepairableStartedSessionLookupError(error)) {
+                throw error;
+            }
+            this.upsertRuntimeBackedSessionRecords({
+                sessionId: input.sessionId,
+                workspaceId: input.workspaceId,
+                userId: input.userId,
+                provider: input.provider,
+                parentSessionId: input.parentSessionId,
+                sessionKind: input.sessionKind,
+                annotationSourceMessageId: input.annotationSourceMessageId,
+                annotationSourceText: input.annotationSourceText,
+                initialContent: input.initialContent,
+                snapshot: input.handle.getSnapshot()
+            });
+            return this.sessionHistoryService.getSession(input.sessionId, input.userId);
+        }
+    }
+    upsertRuntimeBackedSessionRecords(input) {
         const timestamp = nowIso();
+        const currentIndex = this.sessionIndexRepository.findIndexRecordBySessionId(input.sessionId);
+        const currentState = this.sessionStateRepository.findBySessionAndUser(input.sessionId, input.userId);
+        const currentSnapshot = this.sessionStatusSnapshotRepository.findBySessionId(input.sessionId);
         this.sessionHistoryService.persistSessionBinding(input.sessionId, input.workspaceId, this.buildBindingSnapshot(input.sessionId, input.snapshot.provider, input.snapshot.providerSessionId, input.snapshot.rawStoreRef));
         this.sessionIndexRepository.upsert({
             sessionId: input.sessionId,
             workspaceId: input.workspaceId,
             provider: input.provider,
-            parentSessionId: input.parentSessionId,
-            sessionKind: input.sessionKind,
-            annotationSourceMessageId: input.annotationSourceMessageId,
-            annotationSourceText: input.annotationSourceText,
-            isSubagent: false,
-            subagentLabel: null,
-            title: buildSessionTitle(input.initialContent),
-            messageCount: 0,
-            isArchived: false,
-            lastMessageAt: input.snapshot.lastEventAt,
-            createdAt: timestamp,
+            parentSessionId: currentIndex?.parentSessionId ?? input.parentSessionId,
+            sessionKind: currentIndex?.sessionKind ?? input.sessionKind,
+            annotationSourceMessageId: currentIndex?.annotationSourceMessageId ?? input.annotationSourceMessageId,
+            annotationSourceText: currentIndex?.annotationSourceText ?? input.annotationSourceText,
+            isSubagent: currentIndex?.isSubagent ?? false,
+            subagentLabel: currentIndex?.subagentLabel ?? null,
+            title: currentIndex?.title?.trim() || buildSessionTitle(input.initialContent),
+            messageCount: currentIndex?.messageCount ?? 0,
+            isArchived: currentIndex?.isArchived ?? false,
+            lastMessageAt: currentIndex?.lastMessageAt ?? input.snapshot.lastEventAt,
+            createdAt: currentIndex?.createdAt ?? timestamp,
             updatedAt: timestamp
         });
         this.upsertSnapshot(input.sessionId, {
-            syncStatus: "idle",
-            syncCursor: null,
-            lastSyncAt: input.snapshot.lastEventAt ?? timestamp,
-            lastErrorCode: null,
-            lastErrorDetail: null,
-            resumedAt: null
+            syncStatus: currentSnapshot?.syncStatus ?? "idle",
+            syncCursor: currentSnapshot?.syncCursor ?? null,
+            lastSyncAt: currentSnapshot?.lastSyncAt ?? input.snapshot.lastEventAt ?? timestamp,
+            lastErrorCode: currentSnapshot?.lastErrorCode ?? null,
+            lastErrorDetail: currentSnapshot?.lastErrorDetail ?? null,
+            resumedAt: currentSnapshot?.resumedAt ?? null
         });
         this.sessionStateRepository.upsert({
             sessionId: input.sessionId,
             userId: input.userId,
             runningState: toStoredRunningState(input.snapshot.runningState),
             activitySource: "runtime",
-            favorite: false,
-            lastEventAt: input.snapshot.lastEventAt,
-            completedAt: input.snapshot.completedAt,
-            lastSeenAt: null,
+            favorite: currentState?.favorite ?? false,
+            lastEventAt: input.snapshot.lastEventAt ?? currentState?.lastEventAt ?? null,
+            completedAt: input.snapshot.completedAt ?? currentState?.completedAt ?? null,
+            lastSeenAt: currentState?.lastSeenAt ?? null,
             updatedAt: timestamp
         });
         this.sessionActivityAuthorityService.observe(createRuntimeActivityObservation(input.sessionId, input.snapshot));
@@ -1489,13 +1543,13 @@ export class SessionLiveRuntimeService {
         return Math.max(maxSequence + 1, 1);
     }
     async waitForResolvedStartBinding(sessionId, workspaceId, provider, handle) {
-        if (provider !== "gemini" && provider !== "kimi") {
+        if (provider !== "gemini" && provider !== "kimi" && provider !== "codex") {
             return;
         }
         const startedAt = Date.now();
         while (Date.now() - startedAt < RUNTIME_START_BINDING_WAIT_TIMEOUT_MS) {
             const snapshot = handle.getSnapshot();
-            if (hasResolvedRuntimeBinding(snapshot.providerSessionId, snapshot.rawStoreRef)) {
+            if (shouldPersistResolvedStartBinding(snapshot.provider, snapshot.providerSessionId, snapshot.rawStoreRef)) {
                 this.sessionHistoryService.persistSessionBinding(sessionId, workspaceId, {
                     provider: snapshot.provider,
                     providerSessionId: snapshot.providerSessionId,
@@ -1513,7 +1567,7 @@ export class SessionLiveRuntimeService {
                 runtimeAttachments: []
             };
         }
-        return this.sessionMessageAttachmentService.persistImageAttachments({
+        return this.sessionMessageAttachmentService.persistAttachments({
             sessionId,
             clientRequestId,
             attachments
@@ -1560,6 +1614,7 @@ export class SessionLiveRuntimeService {
                 type: "session.interrupted",
                 sessionId,
                 detail: event.detail,
+                interruptSource: event.interruptSource,
                 timestamp: event.timestamp
             };
         }
@@ -1568,6 +1623,7 @@ export class SessionLiveRuntimeService {
             sessionId,
             status: event.status,
             detail: event.detail,
+            interruptSource: event.interruptSource,
             timestamp: event.timestamp
         };
     }
@@ -1673,6 +1729,7 @@ function createRuntimeActivityObservation(sessionId, snapshot) {
             ? "strong"
             : "authoritative",
         detail: snapshot.detail,
+        interruptSource: snapshot.interruptSource,
         errorCode: snapshot.runningState === "failed" ? snapshot.errorCode ?? null : null,
         observedAt: snapshot.lastEventAt ?? snapshot.startedAt
     };
@@ -1685,6 +1742,7 @@ function createExternalRuntimeActivityObservation(sessionId, snapshot) {
         source: "authoritative_provider_event",
         confidence: snapshot.runningState === "failed" ? "strong" : "authoritative",
         detail: snapshot.detail,
+        interruptSource: null,
         errorCode: snapshot.runningState === "failed" ? "CLAUDE_HOOK_STOP_FAILURE" : null,
         observedAt: snapshot.updatedAt
     };
@@ -1701,6 +1759,7 @@ function createRuntimeEventObservation(sessionId, event, startedAt) {
         detail: event.type === "message"
             ? "Host 正在接收这一轮运行的实时事件"
             : event.detail,
+        interruptSource: event.interruptSource,
         errorCode: event.type === "error" ? event.errorCode : null,
         observedAt: event.type === "message" ? event.message.timestamp : event.timestamp
     };
@@ -1901,6 +1960,23 @@ function hasResolvedRuntimeBinding(providerSessionId, rawStoreRef) {
     return !providerSessionId.trim().toLowerCase().startsWith("pending://")
         && !rawStoreRef.trim().toLowerCase().startsWith("pending://");
 }
+function shouldPersistResolvedStartBinding(provider, providerSessionId, rawStoreRef) {
+    if (!hasResolvedRuntimeBinding(providerSessionId, rawStoreRef)) {
+        return false;
+    }
+    if (provider === "codex") {
+        return !isSyntheticCodexRuntimeBinding(rawStoreRef);
+    }
+    return true;
+}
+function isSyntheticCodexRuntimeBinding(rawStoreRef) {
+    if (!rawStoreRef?.trim()) {
+        return false;
+    }
+    const normalizedRawStoreRef = rawStoreRef.trim().replaceAll("\\", "/").toLowerCase();
+    return normalizedRawStoreRef.includes("/runtime/codex/")
+        || normalizedRawStoreRef.startsWith("runtime/codex/");
+}
 function waitForRuntimeBindingPoll() {
     return new Promise((resolve) => {
         setTimeout(resolve, START_BINDING_POLL_INTERVAL_MS);
@@ -1912,6 +1988,10 @@ function isGeminiPendingRuntimeAliasBinding(value, targetSessionId) {
 function shouldAwaitAcceptedUserMessage(provider) {
     return provider !== "gemini";
 }
+function isRepairableStartedSessionLookupError(error) {
+    return isAppError(error)
+        && (error.errorCode === "SESSION_INDEX_MISSING" || error.errorCode === "SESSION_NOT_FOUND");
+}
 function shouldAwaitStartBindingBeforeAcceptedUserLookup(provider) {
     return provider === "kimi";
 }