@jingyi0605/codingns 0.6.5 → 0.7.1

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

@@ -6,7 +6,6 @@ import { createId } from "../../shared/utils/id.js";
 import { logPerformance } from "../../shared/utils/perf-log.js";
 import { isTerminalDebugEnabled, logTerminalDebug, terminalDebugNowMs } from "../../shared/utils/terminal-debug-log.js";
 import { nowIso } from "../../shared/utils/time.js";
-import { isCommandAvailable } from "../../shared/utils/command-availability.js";
 import { inspectSessionActivity } from "./session-activity-inspector.js";
 import { SessionActivityAuthorityService } from "./session-activity-authority-service.js";
 import { mapSessionProviderError } from "./session-provider-error-mapper.js";
@@ -18,6 +17,7 @@ import { OpenCodeModelOptionsService, createFallbackOpenCodeModelOptions, enrich
 import { getSharedProviderDiscoveryHelperClient } from "../provider/provider-discovery-helper-client.js";
 import { discoverWorkspaceSessionsInRuntime } from "../provider/provider-discovery-runtime.js";
 import { applyProviderDisabledState, createProviderCapabilityBlockedError } from "../provider/provider-disabled.js";
+import { ProviderRuntimeStateService } from "../provider/provider-runtime-state-service.js";
 import { createTaskManager } from "../tasks/task-manager.js";
 import { HOST_TASK_TYPES } from "../tasks/task-types.js";
 import { CodexAppServerHelperClient } from "./codex-app-server-helper-client.js";
@@ -72,13 +72,12 @@ export class SessionHistoryService {
     claudeCodeHomeDir;
     codexModelOptionsService;
     openCodeModelOptionsService;
-    providerCliCommandPaths;
-    providerCliAvailability;
     parallelSessionGroupRepository;
     parallelSessionMemberRepository;
     sessionIsolatedWorkspaceRepository;
     providerDiscoveryHelperClient = getSharedProviderDiscoveryHelperClient();
     providerSessionDiscoveryConfig;
+    providerRuntimeStateService;
     sessionProviderConfigService;
     providerControlRepository;
     taskManager;
@@ -90,7 +89,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(), parallelSessionGroupRepository = null, parallelSessionMemberRepository = null, sessionIsolatedWorkspaceRepository = null, sessionProviderConfigService = null, providerControlRepository = null) {
+    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, sessionProviderConfigService = null, providerControlRepository = null, providerRuntimeStateService = null) {
         this.db = db;
         this.workspaceRepository = workspaceRepository;
         this.sessionBindingRepository = sessionBindingRepository;
@@ -109,6 +108,8 @@ export class SessionHistoryService {
         this.parallelSessionMemberRepository = parallelSessionMemberRepository;
         this.sessionIsolatedWorkspaceRepository = sessionIsolatedWorkspaceRepository;
         this.sessionProviderConfigService = sessionProviderConfigService;
+        this.providerRuntimeStateService = providerRuntimeStateService
+            ?? new ProviderRuntimeStateService(config);
         this.providerControlRepository = providerControlRepository ?? {
             get: (providerId) => ({
                 providerId: providerId.trim(),
@@ -117,15 +118,6 @@ export class SessionHistoryService {
             })
         };
         this.claudeCodeHomeDir = config.claudeCodeHomeDir;
-        this.providerCliCommandPaths = {
-            "claude-code": process.platform === "win32" ? "claude.cmd" : "claude",
-            "legna-code": config.legnaCodeCliPath,
-            codex: config.codexCliPath,
-            gemini: config.geminiCliPath,
-            kimi: config.kimiCliPath
-        };
-        // CLI 是否可用只在 Host 启动时探测一次；后续统一读缓存，更新 CLI 后重启 Host 生效。
-        this.providerCliAvailability = buildProviderCliAvailabilitySnapshot(this.providerCliCommandPaths);
         this.providerSessionDiscoveryConfig = {
             claudeCodeHomeDir: config.claudeCodeHomeDir,
             legnaCodeHomeDir: config.legnaCodeHomeDir,
@@ -575,7 +567,7 @@ export class SessionHistoryService {
         if (!isProviderCliBacked(capabilities.provider)) {
             return capabilities;
         }
-        if (this.providerCliAvailability[capabilities.provider]) {
+        if (this.providerRuntimeStateService.isProviderCliAvailable(capabilities.provider)) {
             return capabilities;
         }
         const limitation = buildProviderCliUnavailableMessage(capabilities.provider);
@@ -1565,12 +1557,15 @@ export class SessionHistoryService {
                         annotationSourceText: relation?.annotationSourceText
                             ?? persistedSession.existingIndex?.annotationSourceText
                             ?? null,
-                        isSubagent: relation?.isSubagent
-                            ?? persistedSession.existingIndex?.isSubagent
-                            ?? false,
-                        subagentLabel: relation?.subagentLabel
-                            ?? persistedSession.existingIndex?.subagentLabel
-                            ?? null,
+                        isSubagent: resolvePersistedSubagentState({
+                            discoveredIsSubagent: relation?.isSubagent,
+                            existingIsSubagent: persistedSession.existingIndex?.isSubagent
+                        }),
+                        subagentLabel: resolvePersistedSubagentLabel({
+                            discoveredIsSubagent: relation?.isSubagent,
+                            discoveredSubagentLabel: relation?.subagentLabel ?? null,
+                            existingSubagentLabel: persistedSession.existingIndex?.subagentLabel ?? null
+                        }),
                         title: resolvePersistedSessionTitle(persistedSession.session.provider, persistedSession.session.title, persistedSession.existingIndex?.title ?? null, resolvedParentTitle),
                         messageCount: persistedSession.session.messageCount,
                         isArchived: resolveDiscoveredArchiveState(persistedSession.session.provider, persistedSession.existingIndex?.isArchived ?? false, persistedSession.session.isArchived),
@@ -1863,6 +1858,7 @@ export class SessionHistoryService {
             if (!sessionId) {
                 continue;
             }
+            const existingIndex = this.sessionIndexRepository.findIndexRecordBySessionId(sessionId);
             const parentSessionId = session.parentProviderSessionId
                 ? discoveredSessionIds.get(buildProviderSessionKey(session.provider, session.parentProviderSessionId)) ??
                     this.sessionBindingRepository.findByProviderSession(session.provider, session.parentProviderSessionId)?.sessionId ??
@@ -1870,14 +1866,18 @@ export class SessionHistoryService {
                 : this.resolvePersistedParentSessionId(sessionId);
             relationMap.set(sessionId, {
                 parentSessionId,
-                sessionKind: this.sessionIndexRepository.findIndexRecordBySessionId(sessionId)?.sessionKind ?? "default",
-                annotationSourceMessageId: this.sessionIndexRepository.findIndexRecordBySessionId(sessionId)?.annotationSourceMessageId ?? null,
-                annotationSourceText: this.sessionIndexRepository.findIndexRecordBySessionId(sessionId)?.annotationSourceText ?? null,
-                isSubagent: session.isSubagent === true
-                    || this.sessionIndexRepository.findIndexRecordBySessionId(sessionId)?.isSubagent === true,
-                subagentLabel: session.subagentLabel?.trim()
-                    || this.sessionIndexRepository.findIndexRecordBySessionId(sessionId)?.subagentLabel
-                    || null
+                sessionKind: existingIndex?.sessionKind ?? "default",
+                annotationSourceMessageId: existingIndex?.annotationSourceMessageId ?? null,
+                annotationSourceText: existingIndex?.annotationSourceText ?? null,
+                isSubagent: resolvePersistedSubagentState({
+                    discoveredIsSubagent: session.isSubagent,
+                    existingIsSubagent: existingIndex?.isSubagent
+                }),
+                subagentLabel: resolvePersistedSubagentLabel({
+                    discoveredIsSubagent: session.isSubagent,
+                    discoveredSubagentLabel: session.subagentLabel ?? null,
+                    existingSubagentLabel: existingIndex?.subagentLabel ?? null
+                })
             });
         }
         return relationMap;
@@ -2009,8 +2009,13 @@ export class SessionHistoryService {
             .listBySourceWorkspaceId(workspaceId)
             .filter((record) => record.lifecycleStatus === "active"
             || record.lifecycleStatus === "removing")
-            .map((record) => this.sessionIndexRepository.findBySessionId(record.ownerSessionId, userId))
-            .filter((item) => Boolean(item))
+            .flatMap((record) => {
+            const isolatedWorkspaceItems = this.sessionIndexRepository.listByWorkspace(record.workspaceId, userId);
+            if (isolatedWorkspaceItems.length === 0) {
+                return [];
+            }
+            return filterProjectedIsolatedWorkspaceSessionTree(isolatedWorkspaceItems, record.ownerSessionId);
+        })
             .filter((item) => !this.isPendingSessionAlias(item));
     }
     async pullSessionHistory(sessionId, cursor, limit, deliveredMessages, onEnvelope, envelopeType, isClosed = () => false) {
@@ -2701,15 +2706,15 @@ export class SessionHistoryService {
                 ?? targetIndex?.annotationSourceText
                 ?? sourceIndex?.annotationSourceText
                 ?? null,
-            isSubagent: Boolean(targetRelation?.isSubagent
-                || sourceRelation?.isSubagent
-                || targetIndex?.isSubagent
-                || sourceIndex?.isSubagent),
-            subagentLabel: targetRelation?.subagentLabel
-                ?? sourceRelation?.subagentLabel
-                ?? targetIndex?.subagentLabel
-                ?? sourceIndex?.subagentLabel
-                ?? null
+            isSubagent: resolvePersistedSubagentState({
+                discoveredIsSubagent: targetRelation?.isSubagent ?? sourceRelation?.isSubagent,
+                existingIsSubagent: targetIndex?.isSubagent ?? sourceIndex?.isSubagent
+            }),
+            subagentLabel: resolvePersistedSubagentLabel({
+                discoveredIsSubagent: targetRelation?.isSubagent ?? sourceRelation?.isSubagent,
+                discoveredSubagentLabel: targetRelation?.subagentLabel ?? sourceRelation?.subagentLabel ?? null,
+                existingSubagentLabel: targetIndex?.subagentLabel ?? sourceIndex?.subagentLabel ?? null
+            })
         });
         for (const relation of relationMap.values()) {
             if (relation.parentSessionId === sourceSessionId) {
@@ -2758,6 +2763,12 @@ export class SessionHistoryService {
         return Number(row?.count ?? 0);
     }
     detachSessionRelationsBeforeDelete(sessionId) {
+        const controlSessionIds = this.db
+            .prepare(`SELECT id
+         FROM butler_control_sessions
+         WHERE session_id = ?`)
+            .all(sessionId)
+            .map((row) => String(row.id));
         this.db
             .prepare(`UPDATE session_indices
          SET parent_session_id = NULL
@@ -2768,6 +2779,47 @@ export class SessionHistoryService {
          WHERE parent_session_id = ?
             OR fork_source_session_id = ?`)
             .run(sessionId, sessionId);
+        if (controlSessionIds.length > 0) {
+            const controlSessionPlaceholders = controlSessionIds.map(() => "?").join(", ");
+            this.db
+                .prepare(`UPDATE channel_threads
+           SET control_session_id = NULL,
+               session_id = NULL
+           WHERE session_id = ?
+              OR control_session_id IN (${controlSessionPlaceholders})`)
+                .run(sessionId, ...controlSessionIds);
+            this.db
+                .prepare(`UPDATE channel_inbound_events
+           SET control_session_id = NULL,
+               session_id = NULL
+           WHERE session_id = ?
+              OR control_session_id IN (${controlSessionPlaceholders})`)
+                .run(sessionId, ...controlSessionIds);
+            this.db
+                .prepare(`UPDATE channel_deliveries
+           SET control_session_id = NULL,
+               session_id = NULL
+           WHERE session_id = ?
+              OR control_session_id IN (${controlSessionPlaceholders})`)
+                .run(sessionId, ...controlSessionIds);
+        }
+        else {
+            this.db
+                .prepare(`UPDATE channel_threads
+           SET session_id = NULL
+           WHERE session_id = ?`)
+                .run(sessionId);
+            this.db
+                .prepare(`UPDATE channel_inbound_events
+           SET session_id = NULL
+           WHERE session_id = ?`)
+                .run(sessionId);
+            this.db
+                .prepare(`UPDATE channel_deliveries
+           SET session_id = NULL
+           WHERE session_id = ?`)
+                .run(sessionId);
+        }
         this.db
             .prepare("DELETE FROM butler_control_sessions WHERE session_id = ?")
             .run(sessionId);
@@ -2999,6 +3051,42 @@ export class SessionHistoryService {
         });
     }
 }
+function filterProjectedIsolatedWorkspaceSessionTree(items, ownerSessionId) {
+    const normalizedOwnerSessionId = ownerSessionId.trim();
+    if (!normalizedOwnerSessionId) {
+        return [];
+    }
+    const itemBySessionId = new Map(items.map((item) => [item.sessionId, item]));
+    const ownerItem = itemBySessionId.get(normalizedOwnerSessionId);
+    if (!ownerItem) {
+        return [];
+    }
+    const childSessionIdsByParentId = new Map();
+    for (const item of items) {
+        const parentSessionId = item.parentSessionId?.trim();
+        if (!parentSessionId) {
+            continue;
+        }
+        const sessionIds = childSessionIdsByParentId.get(parentSessionId) ?? [];
+        sessionIds.push(item.sessionId);
+        childSessionIdsByParentId.set(parentSessionId, sessionIds);
+    }
+    const projectedSessionIds = new Set();
+    const queue = [normalizedOwnerSessionId];
+    while (queue.length > 0) {
+        const currentSessionId = queue.shift();
+        if (!currentSessionId || projectedSessionIds.has(currentSessionId)) {
+            continue;
+        }
+        projectedSessionIds.add(currentSessionId);
+        for (const childSessionId of childSessionIdsByParentId.get(currentSessionId) ?? []) {
+            if (!projectedSessionIds.has(childSessionId)) {
+                queue.push(childSessionId);
+            }
+        }
+    }
+    return items.filter((item) => projectedSessionIds.has(item.sessionId));
+}
 function isProviderCliBacked(provider) {
     return provider === "claude-code"
         || provider === "legna-code"
@@ -3006,12 +3094,6 @@ function isProviderCliBacked(provider) {
         || provider === "gemini"
         || provider === "kimi";
 }
-function buildProviderCliAvailabilitySnapshot(commandPaths) {
-    return Object.freeze(Object.fromEntries(Object.entries(commandPaths).map(([provider, commandPath]) => [
-        provider,
-        isCommandAvailable(commandPath)
-    ])));
-}
 function buildProviderCliUnavailableMessage(provider) {
     switch (provider) {
         case "claude-code":
@@ -3253,8 +3335,13 @@ function mergeSessionIndexRecord(input) {
         sessionKind: input.target?.sessionKind ?? input.source?.sessionKind ?? "default",
         annotationSourceMessageId: input.target?.annotationSourceMessageId ?? input.source?.annotationSourceMessageId ?? null,
         annotationSourceText: input.target?.annotationSourceText ?? input.source?.annotationSourceText ?? null,
-        isSubagent: Boolean(input.target?.isSubagent || input.source?.isSubagent),
-        subagentLabel: input.target?.subagentLabel ?? input.source?.subagentLabel ?? null,
+        isSubagent: resolvePersistedSubagentState({
+            discoveredIsSubagent: input.target?.isSubagent ?? input.source?.isSubagent
+        }),
+        subagentLabel: resolvePersistedSubagentLabel({
+            discoveredIsSubagent: input.target?.isSubagent ?? input.source?.isSubagent,
+            discoveredSubagentLabel: input.target?.subagentLabel ?? input.source?.subagentLabel ?? null
+        }),
         title: pickPreferredSessionTitle(input.target?.title ?? null, input.source?.title ?? null),
         messageCount: Math.max(input.target?.messageCount ?? 0, input.source?.messageCount ?? 0),
         isArchived: mergePersistedArchiveState(input.provider, input.target?.isArchived, input.source?.isArchived),
@@ -3271,6 +3358,22 @@ function mergePersistedArchiveState(provider, targetArchived, sourceArchived) {
     }
     return targetArchived ?? sourceArchived ?? false;
 }
+function resolvePersistedSubagentState(input) {
+    if (typeof input.discoveredIsSubagent === "boolean") {
+        return input.discoveredIsSubagent;
+    }
+    return input.existingIsSubagent === true;
+}
+function resolvePersistedSubagentLabel(input) {
+    if (input.discoveredIsSubagent === false) {
+        return null;
+    }
+    const discoveredSubagentLabel = input.discoveredSubagentLabel?.trim() || null;
+    if (discoveredSubagentLabel) {
+        return discoveredSubagentLabel;
+    }
+    return input.existingSubagentLabel ?? null;
+}
 function mergeSessionStatusSnapshot(input) {
     if (!input.target && !input.source) {
         return null;