@jingyi0605/codingns 0.5.5 → 0.6.0

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

@@ -11,6 +11,7 @@ import { inspectSessionActivity } from "./session-activity-inspector.js";
 import { SessionActivityAuthorityService } from "./session-activity-authority-service.js";
 import { mapSessionProviderError } from "./session-provider-error-mapper.js";
 import { SessionForkRepository } from "../../storage/repositories/session-fork-repository.js";
+import { buildParallelGroupColorToken, resolveParallelDisplayParentSessionId } from "../parallel-sessions/parallel-session-group-service.js";
 import { enrichClaudeCapabilities } from "../provider/claude-model-options.js";
 import { CodexModelOptionsService, createFallbackCodexModelOptions, enrichCodexCapabilities } from "../provider/codex-model-options.js";
 import { OpenCodeModelOptionsService, createFallbackOpenCodeModelOptions, enrichOpenCodeCapabilities } from "../provider/opencode-model-options.js";
@@ -31,6 +32,13 @@ const SESSION_START_DEFERRED_PROVIDERS = new Set([
     "gemini",
     "kimi"
 ]);
+const MUTABLE_HISTORY_TAIL_PROVIDERS = new Set([
+    "claude-code",
+    "codex",
+    "gemini",
+    "kimi",
+    "opencode"
+]);
 const MUTABLE_HISTORY_TAIL_REFRESH_INTERVAL_MS = 1_200;
 const WORKSPACE_DISCOVERY_BACKGROUND_MAX_AGE_MS = 15_000;
 const WORKSPACE_DISCOVERY_SCAN_CONCURRENCY = 2;
@@ -62,6 +70,9 @@ export class SessionHistoryService {
     openCodeModelOptionsService;
     providerCliCommandPaths;
     providerCliAvailability;
+    parallelSessionGroupRepository;
+    parallelSessionMemberRepository;
+    sessionIsolatedWorkspaceRepository;
     providerDiscoveryHelperClient = getSharedProviderDiscoveryHelperClient();
     providerSessionDiscoveryConfig;
     taskManager;
@@ -73,7 +84,7 @@ export class SessionHistoryService {
     sessionDeletedObservers = new Set();
     workspaceSessionRelations = new Map();
     workspaceStateRefreshTaskSequence = 0;
-    constructor(db, workspaceRepository, sessionBindingRepository, sessionChangedFileService, sessionIndexRepository, sessionMessageAttachmentService, sessionStateRepository, sessionStatusSnapshotRepository, config, sessionActivityAuthorityService = new SessionActivityAuthorityService(), sessionMessageOriginRepository = null, sessionForkRepository = null, adapterOverrides = {}, taskManager = createTaskManager()) {
+    constructor(db, workspaceRepository, sessionBindingRepository, sessionChangedFileService, sessionIndexRepository, sessionMessageAttachmentService, sessionStateRepository, sessionStatusSnapshotRepository, config, sessionActivityAuthorityService = new SessionActivityAuthorityService(), sessionMessageOriginRepository = null, sessionForkRepository = null, adapterOverrides = {}, taskManager = createTaskManager(), parallelSessionGroupRepository = null, parallelSessionMemberRepository = null, sessionIsolatedWorkspaceRepository = null) {
         this.db = db;
         this.workspaceRepository = workspaceRepository;
         this.sessionBindingRepository = sessionBindingRepository;
@@ -88,6 +99,9 @@ export class SessionHistoryService {
         this.providerSessionDeleteCli =
             adapterOverrides.providerSessionDeleteCli ?? new CodingnsProviderSessionDeleteCli(config);
         this.taskManager = taskManager;
+        this.parallelSessionGroupRepository = parallelSessionGroupRepository;
+        this.parallelSessionMemberRepository = parallelSessionMemberRepository;
+        this.sessionIsolatedWorkspaceRepository = sessionIsolatedWorkspaceRepository;
         this.claudeCodeHomeDir = config.claudeCodeHomeDir;
         this.providerCliCommandPaths = {
             "claude-code": process.platform === "win32" ? "claude.cmd" : "claude",
@@ -423,9 +437,11 @@ export class SessionHistoryService {
         return this.sessionChangedFileService.listBySessionId(sessionId);
     }
     listWorkspaceSessions(workspaceId, userId) {
-        return this.enrichSessionItems(workspaceId, this.sessionIndexRepository
+        const directItems = this.sessionIndexRepository
             .listByWorkspace(workspaceId, userId)
-            .filter((item) => !this.isPendingSessionAlias(item)));
+            .filter((item) => !this.isPendingSessionAlias(item));
+        const projectedItems = this.listProjectedIsolatedWorkspaceSessions(workspaceId, userId);
+        return this.enrichSessionItems(workspaceId, sortSessionListItemsByRecentActivity(mergeSessionListItemsBySessionId([...directItems, ...projectedItems])));
     }
     getProviderCapabilitiesSnapshot(provider) {
         try {
@@ -658,7 +674,8 @@ export class SessionHistoryService {
     }
     async forkSession(input) {
         const binding = this.getBindingOrThrow(input.sessionId);
-        const workspace = this.getWorkspaceOrThrow(binding.workspaceId);
+        const targetWorkspaceId = input.targetWorkspaceId?.trim() || binding.workspaceId;
+        const workspace = this.getWorkspaceOrThrow(targetWorkspaceId);
         const targetProvider = input.targetProvider?.trim() || binding.provider;
         this.assertProviderCapabilityEnabled(targetProvider, "canStartSession", "当前 provider 不支持 fork 创建会话");
         const sourceMessageId = input.sourceType === "message"
@@ -786,7 +803,7 @@ export class SessionHistoryService {
             messages: reconstructedMessages
         });
         const startedSession = await this.startSessionDirect({
-            workspaceId: sourceBinding.workspaceId,
+            workspaceId: input.targetWorkspaceId?.trim() || sourceBinding.workspaceId,
             userId: input.userId,
             provider: input.targetProvider,
             initialPrompt: inheritedPrompt,
@@ -824,7 +841,7 @@ export class SessionHistoryService {
                 createdAt: timestamp
             });
         })();
-        const relationMap = this.workspaceSessionRelations.get(sourceBinding.workspaceId)
+        const relationMap = this.workspaceSessionRelations.get(input.targetWorkspaceId?.trim() || sourceBinding.workspaceId)
             ?? new Map();
         relationMap.set(startedSession.sessionId, {
             parentSessionId: input.sessionId,
@@ -834,7 +851,7 @@ export class SessionHistoryService {
             isSubagent: startedSession.isSubagent ?? false,
             subagentLabel: startedSession.subagentLabel ?? null
         });
-        this.workspaceSessionRelations.set(sourceBinding.workspaceId, relationMap);
+        this.workspaceSessionRelations.set(input.targetWorkspaceId?.trim() || sourceBinding.workspaceId, relationMap);
         return this.getSessionListItemOrThrow(startedSession.sessionId, input.userId);
     }
     async readForkSourceMessages(sessionId, binding, sourceType, sourceMessageId, sourceMessageSnapshot = null) {
@@ -1125,7 +1142,10 @@ export class SessionHistoryService {
     async deleteSession(sessionId, userId) {
         const binding = this.getBindingOrThrow(sessionId);
         const existing = this.getSessionListItemOrThrow(sessionId, userId);
-        if (existing.runningState === "starting" || existing.runningState === "running") {
+        const resolvedExisting = existing.runningState === "starting" || existing.runningState === "running"
+            ? await this.refreshRuntimeFallbackSession(sessionId, userId).catch(() => existing)
+            : existing;
+        if (resolvedExisting.runningState === "starting" || resolvedExisting.runningState === "running") {
             throw new AppError({
                 statusCode: 409,
                 errorCode: "SESSION_DELETE_RUNNING",
@@ -1715,13 +1735,14 @@ export class SessionHistoryService {
     }
     enrichSessionItems(workspaceId, items) {
         const relationMap = this.workspaceSessionRelations.get(workspaceId);
+        const projectionBySessionId = this.buildParallelProjectionBySessionId(items);
         if (!relationMap) {
-            return items.map((item) => this.enrichSessionItem(item));
+            return items.map((item) => this.enrichSessionItem(item, projectionBySessionId.get(item.sessionId)));
         }
         return items.map((item) => {
             const relation = relationMap.get(item.sessionId);
             if (!relation) {
-                return this.enrichSessionItem(item);
+                return this.enrichSessionItem(item, projectionBySessionId.get(item.sessionId));
             }
             return this.enrichSessionItem({
                 ...item,
@@ -1731,10 +1752,12 @@ export class SessionHistoryService {
                 annotationSourceText: relation.annotationSourceText,
                 isSubagent: relation.isSubagent,
                 subagentLabel: relation.subagentLabel
-            });
+            }, projectionBySessionId.get(item.sessionId));
         });
     }
-    enrichSessionItem(item) {
+    enrichSessionItem(item, projection) {
+        const resolvedProjection = projection
+            ?? this.buildParallelProjectionBySessionId([item]).get(item.sessionId);
         const relation = this.workspaceSessionRelations.get(item.workspaceId)?.get(item.sessionId);
         const nextItem = relation
             ? {
@@ -1756,7 +1779,90 @@ export class SessionHistoryService {
                 subagentLabel: item.subagentLabel ?? null
             };
         const resolution = this.sessionActivityAuthorityService.resolvePersistedSession(nextItem);
-        return applySessionActivityResolution(nextItem, resolution);
+        return applySessionActivityResolution({
+            ...nextItem,
+            parallelGroup: resolvedProjection?.parallelGroup ?? null,
+            displayParentSessionId: resolvedProjection?.displayParentSessionId ?? null,
+            sessionIsolatedWorkspace: resolvedProjection?.sessionIsolatedWorkspace ?? null
+        }, resolution);
+    }
+    buildParallelProjectionBySessionId(items) {
+        const projectionBySessionId = new Map();
+        if (!this.parallelSessionGroupRepository
+            || !this.parallelSessionMemberRepository
+            || !this.sessionIsolatedWorkspaceRepository
+            || items.length === 0) {
+            return projectionBySessionId;
+        }
+        const sessionIds = items.map((item) => item.sessionId);
+        const members = this.parallelSessionMemberRepository
+            .listBySessionIds(sessionIds)
+            .filter((member) => member.deletedAt === null);
+        if (members.length === 0) {
+            return projectionBySessionId;
+        }
+        const groupIds = [...new Set(members.map((member) => member.groupId))];
+        const groups = this.parallelSessionGroupRepository
+            .listByIds(groupIds)
+            .filter((group) => group.status !== "deleted");
+        const groupById = new Map(groups.map((group) => [group.id, group]));
+        const activeMembersByGroupId = new Map();
+        for (const member of this.parallelSessionMemberRepository.listByGroupIds(groupIds)) {
+            if (member.deletedAt !== null) {
+                continue;
+            }
+            const groupMembers = activeMembersByGroupId.get(member.groupId) ?? [];
+            groupMembers.push(member);
+            activeMembersByGroupId.set(member.groupId, groupMembers);
+        }
+        const isolatedWorkspaceBySessionId = new Map(this.sessionIsolatedWorkspaceRepository
+            .listByOwnerSessionIds(sessionIds)
+            .map((record) => [record.ownerSessionId, record]));
+        for (const member of members) {
+            const group = groupById.get(member.groupId);
+            if (!group) {
+                continue;
+            }
+            const activeMembers = activeMembersByGroupId.get(member.groupId) ?? [member];
+            const isolatedWorkspace = isolatedWorkspaceBySessionId.get(member.sessionId) ?? null;
+            projectionBySessionId.set(member.sessionId, {
+                parallelGroup: {
+                    groupId: group.id,
+                    role: member.sessionId === group.anchorSessionId ? "anchor" : "member",
+                    memberCount: activeMembers.length,
+                    sourceType: group.sourceType,
+                    sourceSessionId: group.sourceSessionId,
+                    anchorSessionId: group.anchorSessionId,
+                    colorToken: buildParallelGroupColorToken(group.id)
+                },
+                displayParentSessionId: resolveParallelDisplayParentSessionId(group, member),
+                sessionIsolatedWorkspace: isolatedWorkspace
+                    ? {
+                        id: isolatedWorkspace.id,
+                        workspaceId: isolatedWorkspace.workspaceId,
+                        sourceWorkspaceId: isolatedWorkspace.sourceWorkspaceId,
+                        branchName: isolatedWorkspace.branchName,
+                        lifecycleStatus: isolatedWorkspace.lifecycleStatus,
+                        promotedAt: isolatedWorkspace.promotedAt,
+                        createdAt: isolatedWorkspace.createdAt,
+                        updatedAt: isolatedWorkspace.updatedAt
+                    }
+                    : null
+            });
+        }
+        return projectionBySessionId;
+    }
+    listProjectedIsolatedWorkspaceSessions(workspaceId, userId) {
+        if (!this.sessionIsolatedWorkspaceRepository) {
+            return [];
+        }
+        return this.sessionIsolatedWorkspaceRepository
+            .listBySourceWorkspaceId(workspaceId)
+            .filter((record) => record.lifecycleStatus === "active"
+            || record.lifecycleStatus === "removing")
+            .map((record) => this.sessionIndexRepository.findBySessionId(record.ownerSessionId, userId))
+            .filter((item) => Boolean(item))
+            .filter((item) => !this.isPendingSessionAlias(item));
     }
     async pullSessionHistory(sessionId, cursor, limit, deliveredMessages, onEnvelope, envelopeType, isClosed = () => false) {
         let currentCursor = cursor;
@@ -3289,7 +3395,7 @@ function createDeliveredHistoryMessageState() {
     };
 }
 function shouldRefreshMutableHistoryTail(provider, page, cursor, deliveredMessages) {
-    if (provider !== "kimi" || cursor === null || page.messages.length > 0) {
+    if (!MUTABLE_HISTORY_TAIL_PROVIDERS.has(provider) || cursor === null || page.messages.length > 0) {
         return false;
     }
     return Date.now() - deliveredMessages.lastMutableTailRefreshAtMs >= MUTABLE_HISTORY_TAIL_REFRESH_INTERVAL_MS;
@@ -3545,6 +3651,11 @@ function shouldPreserveRuntimeTerminalState(current, inspection) {
         return inspection.lastEventAt.localeCompare(current.lastEventAt) <= 0;
     }
     if (current.runningState === "starting" || current.runningState === "running") {
+        if (inspection.completedAtCandidate
+            || inspection.errorCode
+            || inspection.runningState === "interrupted") {
+            return false;
+        }
         return inspection.lastEventAt.localeCompare(current.lastEventAt) <= 0;
     }
     return false;
@@ -3772,6 +3883,23 @@ async function runBatchedTransactions(items, batchSize, transaction, logOptions)
         maxBatchMs
     };
 }
+function mergeSessionListItemsBySessionId(items) {
+    const itemBySessionId = new Map();
+    for (const item of items) {
+        itemBySessionId.set(item.sessionId, item);
+    }
+    return [...itemBySessionId.values()];
+}
+function sortSessionListItemsByRecentActivity(items) {
+    return [...items].sort((left, right) => {
+        const leftPrimary = left.lastMessageAt ?? left.updatedAt;
+        const rightPrimary = right.lastMessageAt ?? right.updatedAt;
+        if (leftPrimary !== rightPrimary) {
+            return rightPrimary.localeCompare(leftPrimary);
+        }
+        return right.updatedAt.localeCompare(left.updatedAt);
+    });
+}
 function applyImmediateModelOptionFallbacks(capabilities, codexSnapshot, openCodeSnapshot) {
     if (capabilities.provider === "codex") {
         return {