@jingyi0605/codingns 0.3.5 → 0.4.0

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";
@@ -33,6 +33,7 @@ export class SessionLiveRuntimeService {
     externalRuntimeSnapshots = new Map();
     runtimeListeners = new Map();
     terminalStateListeners = new Set();
+    deadRuntimeReconciliationSessions = new Set();
     runtimeMessageSeenSessions = new Set();
     runtimeHistoryFallbackSentSessions = new Set();
     queueDispatchSessions = new Set();
@@ -78,6 +79,7 @@ export class SessionLiveRuntimeService {
             this.ensurePendingSessionBinding(sessionId, workspace.id, input.provider);
             const persistedAttachments = this.persistMessageAttachments(sessionId, input.clientRequestId, input.runtimeOptions?.attachments ?? []);
             const providerPrompt = this.sessionMessageAttachmentService.buildProviderPrompt(input.provider, input.content, persistedAttachments.runtimeAttachments);
+            const providerInstructionFilePath = resolveRuntimeInstructionFilePath(input.provider, workspace.path, input.runtimeOptions?.providerInstructionFilePath ?? null);
             this.ensureCapability(capabilities.canStartSession, "provider", "provider 不支持 start-live");
             this.ensureCapability(capabilities.canSendMessage, "provider", "provider 不支持实时对话");
             const launchRuntimeStartedAtMs = performance.now();
@@ -96,6 +98,7 @@ export class SessionLiveRuntimeService {
                     reasoningLevel: input.runtimeOptions?.reasoningLevel ?? null,
                     permissionMode: input.runtimeOptions?.permissionMode ?? null,
                     providerPrompt,
+                    providerInstructionFilePath,
                     attachments: persistedAttachments.runtimeAttachments
                 }
             }, "start");
@@ -145,7 +148,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,
@@ -228,7 +242,7 @@ export class SessionLiveRuntimeService {
             });
         }
         const runtimeSessionId = this.resolveRuntimeSessionId(sessionId);
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(runtimeSessionId);
         if (!runtimeSnapshot || !isActiveRuntimeState(runtimeSnapshot.runningState)) {
             throw new AppError({
                 statusCode: 409,
@@ -428,7 +442,7 @@ export class SessionLiveRuntimeService {
     }
     async getSessionRuntime(sessionId, userId) {
         const runtimeSessionId = this.resolveRuntimeSessionId(sessionId);
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(runtimeSessionId);
         const externalRuntimeSnapshot = this.externalRuntimeSnapshots.get(runtimeSessionId) ?? null;
         const runtimeHasActiveRun = runtimeSnapshot ? isActiveRuntimeState(runtimeSnapshot.runningState) : false;
         const externalHasActiveRun = externalRuntimeSnapshot
@@ -518,7 +532,7 @@ export class SessionLiveRuntimeService {
     }
     resolveLiveActivityObservation(sessionId) {
         const runtimeSessionId = this.resolveRuntimeSessionId(sessionId);
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(runtimeSessionId);
         if (runtimeSnapshot) {
             return createRuntimeActivityObservation(runtimeSessionId, runtimeSnapshot);
         }
@@ -531,7 +545,7 @@ export class SessionLiveRuntimeService {
     async interruptSession(sessionId, userId) {
         this.sessionHistoryService.getSession(sessionId, userId);
         const runtimeSessionId = this.resolveRuntimeSessionId(sessionId);
-        const runtime = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+        const runtime = this.getLiveRuntimeSnapshot(runtimeSessionId);
         if (!runtime || (runtime.runningState !== "running" && runtime.runningState !== "starting")) {
             throw new AppError({
                 statusCode: 409,
@@ -573,7 +587,7 @@ export class SessionLiveRuntimeService {
     }
     subscribeRuntime(sessionId, onEnvelope) {
         const runtimeSessionId = this.resolveRuntimeSessionId(sessionId);
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(runtimeSessionId);
         const externalRuntimeSnapshot = this.externalRuntimeSnapshots.get(runtimeSessionId) ?? null;
         const initialActivityEnvelope = this.buildSessionActivityEnvelope(sessionId, runtimeSessionId);
         if (runtimeSnapshot) {
@@ -674,8 +688,74 @@ export class SessionLiveRuntimeService {
             await listener(envelope);
         }));
     }
+    getLiveRuntimeSnapshot(sessionId) {
+        const snapshot = this.providerRuntimeService.getSnapshot(sessionId);
+        if (!snapshot) {
+            return null;
+        }
+        if (!isActiveRuntimeState(snapshot.runningState)) {
+            return snapshot;
+        }
+        if (this.providerRuntimeService.isRunHealthy(sessionId) === false) {
+            this.demoteDeadRuntimeSnapshot(snapshot);
+            this.scheduleDeadRuntimeReconciliation(snapshot);
+            return null;
+        }
+        return snapshot;
+    }
+    demoteDeadRuntimeSnapshot(snapshot) {
+        const updatedAt = nowIso();
+        for (const userId of this.authUserRepository.listIds()) {
+            const current = this.sessionStateRepository.findBySessionAndUser(snapshot.sessionId, userId);
+            if (!current || !isPendingSessionRunningState(current.runningState) || current.activitySource !== "runtime") {
+                continue;
+            }
+            this.sessionStateRepository.upsert({
+                ...current,
+                runningState: "interrupted",
+                activitySource: "runtime",
+                completedAt: updatedAt,
+                updatedAt
+            });
+        }
+        this.sessionActivityAuthorityService.observe({
+            sessionId: snapshot.sessionId,
+            runId: buildRuntimeRunId(snapshot.sessionId, snapshot.startedAt),
+            runningState: "interrupted",
+            source: "authoritative_runtime",
+            confidence: "strong",
+            detail: "Host 检测到这轮运行已经异常结束，已自动回收残留运行态",
+            interruptSource: "runtime",
+            errorCode: null,
+            observedAt: updatedAt
+        });
+    }
+    scheduleDeadRuntimeReconciliation(snapshot) {
+        if (this.deadRuntimeReconciliationSessions.has(snapshot.sessionId)) {
+            return;
+        }
+        this.deadRuntimeReconciliationSessions.add(snapshot.sessionId);
+        void this.reconcileDeadRuntimeSession(snapshot).finally(() => {
+            this.deadRuntimeReconciliationSessions.delete(snapshot.sessionId);
+        });
+    }
+    async reconcileDeadRuntimeSession(snapshot) {
+        await this.providerRuntimeService.abandonRun(snapshot.sessionId).catch(() => {
+            return;
+        });
+        for (const userId of this.authUserRepository.listIds()) {
+            await this.sessionHistoryService.refreshRuntimeFallbackSession(snapshot.sessionId, userId).catch(() => {
+                return;
+            });
+        }
+        const envelope = this.buildSessionActivityEnvelope(snapshot.sessionId, snapshot.sessionId);
+        if (envelope) {
+            await this.emitExternalRuntimeEnvelope(envelope);
+        }
+        void this.dispatchNextQueuedMessage(snapshot.sessionId);
+    }
     buildSessionActivityEnvelope(sessionId, runtimeSessionId = sessionId) {
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(runtimeSessionId);
         if (runtimeSnapshot) {
             const resolution = this.sessionActivityAuthorityService.observe(createRuntimeActivityObservation(runtimeSessionId, runtimeSnapshot));
             return {
@@ -957,6 +1037,7 @@ export class SessionLiveRuntimeService {
             const resolvedAttachments = persistedAttachments
                 ?? this.persistMessageAttachments(input.sessionId, input.clientRequestId, input.runtimeOptions?.attachments ?? []);
             const providerPrompt = this.sessionMessageAttachmentService.buildProviderPrompt(session.provider, input.content, resolvedAttachments.runtimeAttachments);
+            const providerInstructionFilePath = resolveRuntimeInstructionFilePath(session.provider, workspace.path, input.runtimeOptions?.providerInstructionFilePath ?? null);
             this.ensureCapability(capabilities.canSendMessage, "sessionId", "provider 不支持实时对话");
             const runtimeRequest = {
                 sessionId: input.sessionId,
@@ -973,11 +1054,12 @@ export class SessionLiveRuntimeService {
                     reasoningLevel: input.runtimeOptions?.reasoningLevel ?? null,
                     permissionMode: input.runtimeOptions?.permissionMode ?? null,
                     providerPrompt,
+                    providerInstructionFilePath,
                     attachments: resolvedAttachments.runtimeAttachments
                 }
             };
             const runtimeSessionId = this.resolveRuntimeSessionId(input.sessionId);
-            const activeRun = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+            const activeRun = this.getLiveRuntimeSnapshot(runtimeSessionId);
             const externalRuntimeSnapshot = this.externalRuntimeSnapshots.get(runtimeSessionId);
             if (activeRun &&
                 activeRun.provider === "claude-code" &&
@@ -1020,6 +1102,7 @@ export class SessionLiveRuntimeService {
                 matched: Boolean(acceptedMessage)
             });
             const acceptedAt = acceptedMessage?.timestamp ?? nowIso();
+            this.sessionHistoryService.resolveMessageOriginByClientRequestId(input.sessionId, input.clientRequestId, acceptedMessage?.messageId ?? null, acceptedAt);
             const boundAttachments = this.sessionMessageAttachmentService.bindClientRequestToMessage(input.sessionId, input.clientRequestId, acceptedMessage?.messageId ?? null);
             this.refreshSyntheticSessionTitle(session, input.content, input.userId);
             this.markSendDebugResponseReady(debugTrace, {
@@ -1056,7 +1139,7 @@ export class SessionLiveRuntimeService {
         }
         this.queueDispatchSessions.add(sessionId);
         try {
-            const runtimeSnapshot = this.providerRuntimeService.getSnapshot(sessionId);
+            const runtimeSnapshot = this.getLiveRuntimeSnapshot(sessionId);
             const externalRuntimeSnapshot = this.externalRuntimeSnapshots.get(sessionId);
             if ((runtimeSnapshot && isActiveRuntimeState(runtimeSnapshot.runningState))
                 || (externalRuntimeSnapshot && isActiveRuntimeState(externalRuntimeSnapshot.runningState))) {
@@ -1119,7 +1202,7 @@ export class SessionLiveRuntimeService {
         void this.dispatchNextQueuedMessage(session.sessionId);
     }
     shouldBlockQueueDispatch(session) {
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(session.sessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(session.sessionId);
         if (runtimeSnapshot && isActiveRuntimeState(runtimeSnapshot.runningState)) {
             return true;
         }
@@ -1159,7 +1242,7 @@ export class SessionLiveRuntimeService {
             || !isPendingSessionRunningState(session.runningState)) {
             return session;
         }
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(sessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(sessionId);
         const externalRuntimeSnapshot = this.externalRuntimeSnapshots.get(sessionId);
         if ((runtimeSnapshot && isActiveRuntimeState(runtimeSnapshot.runningState))
             || (externalRuntimeSnapshot && isActiveRuntimeState(externalRuntimeSnapshot.runningState))) {
@@ -1185,42 +1268,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));
@@ -1628,7 +1740,7 @@ export class SessionLiveRuntimeService {
         });
     }
     shouldIgnoreClaudeExternalRuntimeUpdate(sessionId) {
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(sessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(sessionId);
         return Boolean(runtimeSnapshot &&
             runtimeSnapshot.provider === "claude-code" &&
             isActiveRuntimeState(runtimeSnapshot.runningState));
@@ -1948,6 +2060,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";
 }
@@ -2012,6 +2128,20 @@ function createProviderRuntimeAdapters(config, options = {}) {
         disposables
     };
 }
+function resolveRuntimeInstructionFilePath(provider, workspacePath, explicitFilePath) {
+    const normalizedExplicit = explicitFilePath?.trim();
+    if (normalizedExplicit) {
+        const resolvedExplicit = path.resolve(normalizedExplicit);
+        return existsSync(resolvedExplicit) ? resolvedExplicit : null;
+    }
+    if (provider !== "claude-code") {
+        return null;
+    }
+    const defaultClaudeInstructionPath = path.join(workspacePath, "CLAUDE.md");
+    return existsSync(defaultClaudeInstructionPath)
+        ? path.resolve(defaultClaudeInstructionPath)
+        : null;
+}
 function buildClaudeHookBridgeConfig(config) {
     const bridgeUrl = `http://127.0.0.1:${config.port}/api/providers/claude-code/hook-bridge/events`;
     const scriptPath = resolveClaudeHookBridgeScriptPath();