@jingyi0605/codingns 0.2.5 → 0.3.0

package/dist/server/modules/sessions/session-history-service.js

@@ -58,6 +58,7 @@ export class SessionHistoryService {
     workspaceDiscoveryStatuses = new Map();
     workspaceStateRefreshInflight = new Map();
     providerCapabilityCache = new Map();
+    liveActivityObservationResolvers = new Set();
     workspaceSessionRelations = new Map();
     constructor(db, workspaceRepository, sessionBindingRepository, sessionChangedFileService, sessionIndexRepository, sessionMessageAttachmentService, sessionStateRepository, sessionStatusSnapshotRepository, config, sessionActivityAuthorityService = new SessionActivityAuthorityService(), sessionMessageOriginRepository = null, sessionForkRepository = null, adapterOverrides = {}, taskManager = createTaskManager()) {
         this.db = db;
@@ -130,6 +131,19 @@ export class SessionHistoryService {
     observeBackgroundTaskMetrics() {
         return this.taskManager.observe();
     }
+    registerLiveActivityObservationResolver(resolver) {
+        this.liveActivityObservationResolvers.add(resolver);
+        let closed = false;
+        return {
+            close: () => {
+                if (closed) {
+                    return;
+                }
+                closed = true;
+                this.liveActivityObservationResolvers.delete(resolver);
+            }
+        };
+    }
     registerBackgroundTasks() {
         if (!this.taskManager.has(HOST_TASK_TYPES.workspaceDiscovery)) {
             this.taskManager.register({
@@ -1078,11 +1092,11 @@ export class SessionHistoryService {
         });
         const currentBinding = this.sessionBindingRepository.findBySessionId(sessionId);
         const timestamp = nowIso();
-        const duplicateBinding = this.findPendingBindingDuplicate(sessionId, workspaceId, currentBinding, resolvedSnapshot);
+        const duplicateBinding = this.findSameWorkspaceBindingDuplicate(sessionId, workspaceId, resolvedSnapshot);
         this.db.transaction(() => {
             if (duplicateBinding) {
-                // 新建运行时会话会先写入 pending 绑定，后台发现链路可能在真 ID 回填前先落一条重复记录。
-                // 这里保留当前 runtime session，把扫描出的重复会话并回当前会话，避免 provider_session_id 撞唯一键。
+                // 运行时链路显式指定了当前 sessionId，就应该由当前会话接管同工作区里的重复底层会话。
+                // 否则后续事件重放或后台发现补录都会持续撞 UNIQUE(provider, provider_session_id)。
                 this.mergeSessionIntoTarget({
                     workspaceId,
                     targetSessionId: sessionId,
@@ -1705,11 +1719,11 @@ export class SessionHistoryService {
         return this.sessionBindingRepository.findBySessionId(aliasTargetSessionId);
     }
     findPendingSessionAliasTargetSessionId(descriptor) {
-        if (!descriptor || descriptor.provider !== "gemini") {
+        if (!descriptor) {
             return null;
         }
-        const aliasTargetSessionId = extractPendingBindingTargetSessionId(descriptor.providerSessionId)
-            ?? extractPendingBindingTargetSessionId(descriptor.rawStoreRef);
+        const aliasTargetSessionId = extractSessionAliasTargetSessionId(descriptor.providerSessionId)
+            ?? extractSessionAliasTargetSessionId(descriptor.rawStoreRef);
         if (!aliasTargetSessionId || aliasTargetSessionId === descriptor.sessionId) {
             return null;
         }
@@ -1794,10 +1808,7 @@ export class SessionHistoryService {
         });
         await runBatchedTransactions(staleHiddenSessions.map((session) => session.sessionId), WORKSPACE_DISCOVERY_PERSIST_BATCH_SIZE, deleteTransaction);
     }
-    findPendingBindingDuplicate(sessionId, workspaceId, currentBinding, snapshot) {
-        if (!currentBinding || !isPendingBindingValue(currentBinding.providerSessionId)) {
-            return null;
-        }
+    findSameWorkspaceBindingDuplicate(sessionId, workspaceId, snapshot) {
         if (isPendingBindingValue(snapshot.providerSessionId)) {
             return null;
         }
@@ -1889,12 +1900,22 @@ export class SessionHistoryService {
         this.db
             .prepare("DELETE FROM session_forks WHERE session_id = ?")
             .run(input.sourceSessionId);
-        this.db
-            .prepare("DELETE FROM session_indices WHERE session_id = ?")
-            .run(input.sourceSessionId);
-        this.db
-            .prepare("DELETE FROM session_bindings WHERE session_id = ?")
-            .run(input.sourceSessionId);
+        // 保留旧 session_id 作为 alias，避免前端或 Butler 还拿着旧 id 时直接炸成 SESSION_NOT_FOUND。
+        this.sessionBindingRepository.upsert({
+            sessionId: input.sourceSessionId,
+            workspaceId: sourceBinding.workspaceId,
+            provider: sourceBinding.provider,
+            providerSessionId: buildAliasBindingValue(input.provider, input.targetSessionId, input.sourceSessionId),
+            rawStoreRef: buildAliasBindingValue(input.provider, input.targetSessionId, input.sourceSessionId),
+            createdAt: sourceBinding.createdAt,
+            updatedAt: input.timestamp
+        });
+        if (sourceIndex) {
+            this.sessionIndexRepository.upsert({
+                ...sourceIndex,
+                updatedAt: input.timestamp
+            });
+        }
         this.rewriteWorkspaceSessionRelations(input.workspaceId, input.targetSessionId, input.sourceSessionId, targetIndex, sourceIndex);
     }
     listSessionStatesBySessionId(sessionId) {
@@ -2020,6 +2041,7 @@ export class SessionHistoryService {
     }
     buildKnownSessionSummaries(sessions, workspacePath) {
         return sessions
+            .filter((session) => !this.isPendingSessionAlias(session))
             .filter((session) => !shouldSkipClaudePendingBinding(session))
             .map((session) => {
             const stats = safeStat(session.rawStoreRef);
@@ -2039,19 +2061,28 @@ export class SessionHistoryService {
     async refreshSessionState(sessionId, userId) {
         const binding = this.getBindingOrThrow(sessionId);
         const current = this.sessionStateRepository.findBySessionAndUser(sessionId, userId);
-        const inspection = inspectSessionActivity(binding.provider, binding.rawStoreRef);
         const timestamp = nowIso();
-        const nowMs = Date.parse(timestamp);
-        if (shouldClearStaleRuntimeWithoutInspection(current, inspection, nowMs)) {
-            this.sessionActivityAuthorityService.clearSession(sessionId);
-        }
-        if (shouldPreserveRuntimeTerminalState(current, inspection)) {
-            return current;
+        const liveObservation = this.resolveLiveActivityObservation(sessionId);
+        const inspection = liveObservation
+            ? null
+            : inspectSessionActivity(binding.provider, binding.rawStoreRef);
+        if (inspection) {
+            const nowMs = Date.parse(timestamp);
+            if (shouldClearStaleRuntimeWithoutInspection(current, inspection, nowMs)) {
+                this.sessionActivityAuthorityService.clearSession(sessionId);
+            }
+            if (shouldPreserveRuntimeTerminalState(current, inspection)) {
+                return current;
+            }
         }
-        const resolution = this.sessionActivityAuthorityService.observe(buildInspectionActivityObservation(sessionId, inspection, timestamp));
-        const resolvedLastEventAt = hasInspectionEvidence(inspection)
-            ? resolution.lastObservedAt ?? inspection.lastEventAt ?? current?.lastEventAt ?? null
-            : current?.lastEventAt ?? null;
+        const resolution = liveObservation
+            ? this.sessionActivityAuthorityService.observe(liveObservation)
+            : this.sessionActivityAuthorityService.observe(buildInspectionActivityObservation(sessionId, inspection, timestamp));
+        const resolvedLastEventAt = liveObservation
+            ? resolution.lastObservedAt ?? current?.lastEventAt ?? null
+            : inspection && hasInspectionEvidence(inspection)
+                ? resolution.lastObservedAt ?? inspection.lastEventAt ?? current?.lastEventAt ?? null
+                : current?.lastEventAt ?? null;
         const nextRecord = {
             sessionId,
             userId,
@@ -2060,7 +2091,7 @@ export class SessionHistoryService {
             favorite: current?.favorite ?? false,
             lastEventAt: resolvedLastEventAt,
             completedAt: isTerminalResolvedRunningState(resolution.runningState)
-                ? resolution.terminalAt ?? inspection.completedAtCandidate ?? current?.completedAt ?? null
+                ? resolution.terminalAt ?? inspection?.completedAtCandidate ?? current?.completedAt ?? null
                 : null,
             lastSeenAt: current?.lastSeenAt ?? null,
             updatedAt: timestamp
@@ -2078,8 +2109,8 @@ export class SessionHistoryService {
             syncCursor: currentSnapshot?.syncCursor ?? null,
             lastSyncAt: resolution.lastObservedAt
                 ?? resolution.terminalAt
-                ?? inspection.lastEventAt
-                ?? inspection.completedAtCandidate
+                ?? inspection?.lastEventAt
+                ?? inspection?.completedAtCandidate
                 ?? currentSnapshot?.lastSyncAt
                 ?? null,
             lastErrorCode: resolution.runningState === "failed"
@@ -2097,17 +2128,34 @@ export class SessionHistoryService {
         });
         return nextRecord;
     }
+    resolveLiveActivityObservation(sessionId) {
+        for (const resolver of this.liveActivityObservationResolvers) {
+            const observation = resolver(sessionId);
+            if (observation) {
+                return observation;
+            }
+        }
+        return null;
+    }
     upsertSnapshot(sessionId, input) {
+        const resolvedSessionId = this.resolveCanonicalSessionId(sessionId);
+        if (!this.sessionBindingRepository.findBySessionId(resolvedSessionId)) {
+            return;
+        }
         this.sessionStatusSnapshotRepository.upsert({
-            sessionId,
+            sessionId: resolvedSessionId,
             ...input,
             updatedAt: nowIso()
         });
     }
     markSessionError(sessionId, errorCode, error) {
-        const current = this.sessionStatusSnapshotRepository.findBySessionId(sessionId);
+        const resolvedSessionId = this.resolveCanonicalSessionId(sessionId);
+        if (!this.sessionBindingRepository.findBySessionId(resolvedSessionId)) {
+            return;
+        }
+        const current = this.sessionStatusSnapshotRepository.findBySessionId(resolvedSessionId);
         this.sessionStatusSnapshotRepository.upsert({
-            sessionId,
+            sessionId: resolvedSessionId,
             syncStatus: "error",
             syncCursor: current?.syncCursor ?? null,
             lastSyncAt: current?.lastSyncAt ?? null,
@@ -2177,23 +2225,28 @@ function hasInspectionEvidence(inspection) {
         || !!inspection.completedAtCandidate;
 }
 function applySessionActivityResolution(item, resolution) {
-    const runningState = resolution.runningState;
-    const shouldClearResolvedFailure = runningState !== "failed" && item.runningState === "failed";
+    const rawResolvedRunningState = resolution.runningState === "unknown" && item.runningState === null
+        ? null
+        : resolution.runningState;
+    const resolvedRunningState = resolution.activityResolutionSource === "inferred_log" && rawResolvedRunningState === "completed"
+        ? "idle"
+        : rawResolvedRunningState;
+    const shouldClearResolvedFailure = resolvedRunningState !== "failed" && item.runningState === "failed";
     const lastEventAt = resolution.lastObservedAt ?? item.lastEventAt;
-    const completedAt = isTerminalResolvedRunningState(runningState)
+    const completedAt = rawResolvedRunningState && isTerminalResolvedRunningState(rawResolvedRunningState)
         ? resolution.terminalAt ?? item.completedAt
         : null;
-    const lastErrorCode = runningState === "failed"
+    const lastErrorCode = resolvedRunningState === "failed"
         ? resolution.errorCode ?? item.lastErrorCode
         : shouldClearResolvedFailure
             ? null
             : item.lastErrorCode;
-    const lastErrorDetail = runningState === "failed"
+    const lastErrorDetail = resolvedRunningState === "failed"
         ? resolution.detail ?? item.lastErrorDetail
         : shouldClearResolvedFailure
             ? null
             : item.lastErrorDetail;
-    const syncStatus = runningState === "failed"
+    const syncStatus = resolvedRunningState === "failed"
         ? "error"
         : shouldClearResolvedFailure && item.syncStatus === "error"
             ? "idle"
@@ -2201,7 +2254,7 @@ function applySessionActivityResolution(item, resolution) {
     return {
         ...item,
         syncStatus,
-        runningState,
+        runningState: resolvedRunningState,
         activitySource: mapResolutionSourceToCompatibilitySource(resolution.activityResolutionSource),
         activityResolutionSource: resolution.activityResolutionSource,
         activityConfidence: resolution.activityConfidence,
@@ -2211,7 +2264,7 @@ function applySessionActivityResolution(item, resolution) {
         lastErrorCode,
         lastErrorDetail,
         watchdogTriggeredAt: resolution.watchdogTriggeredAt,
-        activityState: resolveActivityState(runningState, completedAt, item.lastSeenAt)
+        activityState: resolveActivityState(resolvedRunningState, completedAt, item.lastSeenAt)
     };
 }
 function clampLimit(limit) {
@@ -2410,6 +2463,9 @@ function isPendingBindingValue(value) {
 function buildPendingBindingValue(provider, sessionId) {
     return `pending://${provider}/${sessionId}`;
 }
+function buildAliasBindingValue(provider, targetSessionId, sourceSessionId) {
+    return `alias://${provider}/${targetSessionId}/${sourceSessionId}`;
+}
 function extractPendingBindingTargetSessionId(value) {
     if (!isPendingBindingValue(value)) {
         return null;
@@ -2418,6 +2474,25 @@ function extractPendingBindingTargetSessionId(value) {
     const targetSessionId = normalizedValue.slice(normalizedValue.indexOf("/", "pending://".length) + 1).trim();
     return targetSessionId || null;
 }
+function extractAliasBindingTargetSessionId(value) {
+    const normalizedValue = value.trim();
+    if (!normalizedValue.toLowerCase().startsWith("alias://")) {
+        return null;
+    }
+    const pathStart = normalizedValue.indexOf("/", "alias://".length);
+    if (pathStart < 0) {
+        return null;
+    }
+    const targetAndSource = normalizedValue.slice(pathStart + 1).trim();
+    if (targetAndSource.length === 0) {
+        return null;
+    }
+    const [targetSessionId] = targetAndSource.split("/", 1);
+    return targetSessionId?.trim() || null;
+}
+function extractSessionAliasTargetSessionId(value) {
+    return extractAliasBindingTargetSessionId(value) ?? extractPendingBindingTargetSessionId(value);
+}
 function isClaudePendingRuntimeRawStoreRef(rawStoreRef) {
     const normalizedRawStoreRef = rawStoreRef.replaceAll("\\", "/").toLowerCase();
     return normalizedRawStoreRef.includes("/.pending-");
@@ -2786,7 +2861,7 @@ function mapResolutionSourceToLegacyActivitySource(source, inspection) {
     if (source === "authoritative_runtime" || source === "authoritative_provider_event") {
         return "runtime";
     }
-    if (inspection.lastEventAt || inspection.completedAtCandidate) {
+    if (inspection && (inspection.lastEventAt || inspection.completedAtCandidate)) {
         return "inferred";
     }
     return "none";