@jingyi0605/codingns 1.0.0-beta.1 → 1.0.0-beta.3

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

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
+import { existsSync, readFileSync, readdirSync, rmSync, statSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { CapabilityService, ClaudeCodeAdapter, CodexAdapter, GeminiAdapter, KimiAdapter, LegnaCodeAdapter, OpenCodeAdapter, ProviderRegistry, SessionSyncService } from "@codingns/session-sync-core";
 import { AppError } from "../../shared/errors/app-error.js";
@@ -302,7 +302,10 @@ export class SessionHistoryService {
                 executionLane: "helper_process",
                 concurrency: WORKSPACE_DISCOVERY_SCAN_CONCURRENCY,
                 helperProcessHandler: "session.workspace_discovery",
-                run: async ({ config, workspacePath, knownSessions, enabledProviders }, context) => await discoverWorkspaceSessionsInRuntime(config, workspacePath, knownSessions, enabledProviders, context.signal)
+                run: async ({ config, workspacePath, knownSessions, enabledProviders, claudeExtraProjectRoots }, context) => await discoverWorkspaceSessionsInRuntime({
+                    ...config,
+                    claudeExtraProjectRoots
+                }, workspacePath, knownSessions, enabledProviders, context.signal)
             });
         }
         if (!this.taskManager.has(HOST_TASK_TYPES.providerCapabilityRefresh)) {
@@ -1398,6 +1401,29 @@ export class SessionHistoryService {
                 field: "sessionId"
             });
         }
+        // 先查出子Agent会话列表，用于级联删除文件和数据库记录
+        const subagentRows = this.db
+            .prepare(`SELECT sb.session_id, sb.provider, sb.provider_session_id, sb.raw_store_ref
+         FROM session_indices si
+         JOIN session_bindings sb ON si.session_id = sb.session_id
+         WHERE si.parent_session_id = ?
+           AND si.is_subagent = 1`)
+            .all(sessionId);
+        // 删除子Agent的 JSONL 文件
+        for (const subagent of subagentRows) {
+            try {
+                await this.providerSessionDeleteCli.deleteSession({
+                    provider: subagent.provider,
+                    providerSessionId: subagent.provider_session_id,
+                    rawStoreRef: subagent.raw_store_ref
+                });
+            }
+            catch (error) {
+                if (!isProviderSessionMissing(error)) {
+                    // 子Agent文件删除失败不阻断父会话删除
+                }
+            }
+        }
         try {
             await this.providerSessionDeleteCli.deleteSession({
                 provider: binding.provider,
@@ -1410,6 +1436,8 @@ export class SessionHistoryService {
                 throw mapSessionProviderError(error);
             }
         }
+        // 保险清理：如果父会话 rawStoreRef 对应目录下有 subagents/ 子目录，直接清掉整个目录
+        this.cleanupSubagentFilesOnDisk(binding.rawStoreRef);
         for (const observer of this.sessionDeletedObservers) {
             await observer({
                 sessionId,
@@ -1418,7 +1446,14 @@ export class SessionHistoryService {
                 remainingWorkspaceSessionCount: this.countOtherWorkspaceSessions(binding.workspaceId, sessionId)
             });
         }
+        const subagentSessionIds = subagentRows.map((row) => row.session_id);
         const deleteTransaction = this.db.transaction((targetSessionId) => {
+            // 级联删除子Agent会话的数据库记录
+            for (const subagentId of subagentSessionIds) {
+                this.detachSessionRelationsBeforeDelete(subagentId);
+                this.deleteSessionById(subagentId);
+                this.removeWorkspaceSessionRelation(subagentId);
+            }
             this.detachSessionRelationsBeforeDelete(targetSessionId);
             this.deleteSessionById(targetSessionId);
         });
@@ -1554,6 +1589,7 @@ export class SessionHistoryService {
                 .map((adapter) => adapter.providerId)
                 .filter((providerId) => this.isProviderEnabled(providerId));
             const knownSessions = this.buildKnownSessionSummaries(existingWorkspaceSessions.filter((session) => enabledProviders.includes(session.provider)), existingWorkspaceSourceIndexes.filter((record) => enabledProviders.includes(record.provider)), workspace.path, activeRepairScope);
+            const claudeExtraProjectRoots = this.collectClaudeDiscoveryProjectRoots(workspaceId, existingWorkspaceSessions);
             const discoveryHandle = this.taskManager.enqueue(HOST_TASK_TYPES.workspaceDiscoveryScan, {
                 key: workspaceId,
                 source: "session_history.workspace_discovery.scan",
@@ -1561,7 +1597,8 @@ export class SessionHistoryService {
                     config: this.providerSessionDiscoveryConfig,
                     workspacePath: workspace.path,
                     knownSessions,
-                    enabledProviders
+                    enabledProviders,
+                    claudeExtraProjectRoots
                 }
             });
             const discovery = await awaitTaskHandleWithSignal(discoveryHandle, signal).catch((error) => {
@@ -1899,11 +1936,12 @@ export class SessionHistoryService {
         return historyTask
             .then(async (page) => {
             const sanitizedPage = await this.sanitizeForkHistoryPage(sessionId, page, cursor, direction);
-            const messagesWithAttachments = this.sessionMessageAttachmentService.enrichMessages(sessionId, sanitizedPage.messages);
+            const orderedPage = this.offsetClaudeNativeForkRuntimePage(sessionId, sanitizedPage);
+            const messagesWithAttachments = this.sessionMessageAttachmentService.enrichMessages(sessionId, orderedPage.messages);
             const messages = this.enrichMessagesWithOrigin(sessionId, messagesWithAttachments);
             this.persistSessionChangedFiles(sessionId, messages);
             return {
-                ...sanitizedPage,
+                ...orderedPage,
                 messages
             };
         })
@@ -1987,6 +2025,44 @@ export class SessionHistoryService {
             total: Math.max(0, page.total - leakedInheritedCount)
         };
     }
+    offsetClaudeNativeForkRuntimePage(sessionId, page) {
+        if (page.messages.length === 0) {
+            return page;
+        }
+        const forkRecord = this.sessionForkRepository.findBySessionId(sessionId);
+        if (!forkRecord
+            || forkRecord.provider !== "claude-code"
+            || (forkRecord.forkMethod !== "native_message_fork"
+                && forkRecord.forkMethod !== "native_session_fork")
+            || typeof forkRecord.inheritedPrefixMessageCount !== "number") {
+            return page;
+        }
+        const inheritedPrefixMessageCount = Math.max(0, forkRecord.inheritedPrefixMessageCount);
+        if (inheritedPrefixMessageCount <= 0) {
+            return page;
+        }
+        const childSession = this.sessionIndexRepository.findIndexRecordBySessionId(sessionId);
+        const childCreatedAt = childSession?.createdAt?.trim() || null;
+        if (!childCreatedAt) {
+            return page;
+        }
+        const containsInheritedMessages = page.messages.some((message) => message.sequence <= inheritedPrefixMessageCount
+            && message.timestamp < childCreatedAt);
+        if (containsInheritedMessages) {
+            return page;
+        }
+        const containsOnlyChildRuntimeMessages = page.messages.every((message) => message.timestamp >= childCreatedAt);
+        if (!containsOnlyChildRuntimeMessages) {
+            return page;
+        }
+        return {
+            ...page,
+            messages: page.messages.map((message) => ({
+                ...message,
+                sequence: message.sequence + inheritedPrefixMessageCount
+            }))
+        };
+    }
     resolveMessageOrigins(sessionId, messages) {
         const originRepository = this.sessionMessageOriginRepository;
         if (!originRepository || messages.length === 0) {
@@ -3252,6 +3328,32 @@ export class SessionHistoryService {
             .get(workspaceId, sessionId);
         return Number(row?.count ?? 0);
     }
+    /**
+     * 清理父会话 rawStoreRef 对应目录下的 subagents/ 子目录。
+     * 这是保险措施：即使子Agent会话没有被数据库记录（如尚未被 provider 发现），
+     * 磁盘上的子Agent JSONL 文件也会被清理掉，避免下次扫描时重新出现为孤儿会话。
+     */
+    cleanupSubagentFilesOnDisk(rawStoreRef) {
+        try {
+            const rawDir = rawStoreRef.replace(/\.jsonl$/i, "");
+            if (!existsSync(rawDir)) {
+                return;
+            }
+            const subagentsDir = join(rawDir, "subagents");
+            if (!existsSync(subagentsDir)) {
+                return;
+            }
+            rmSync(subagentsDir, { recursive: true, force: true });
+            // 如果父目录也空了（只有 subagents 子目录），一并清理
+            const remaining = readdirSync(rawDir);
+            if (remaining.length === 0) {
+                rmSync(rawDir, { recursive: true, force: true });
+            }
+        }
+        catch {
+            // 磁盘清理失败不阻断删除流程
+        }
+    }
     detachSessionRelationsBeforeDelete(sessionId) {
         const controlSessionIds = this.db
             .prepare(`SELECT id
@@ -3420,6 +3522,22 @@ export class SessionHistoryService {
         }
         return [...merged.values()];
     }
+    collectClaudeDiscoveryProjectRoots(workspaceId, sessions) {
+        const roots = new Set();
+        for (const session of sessions) {
+            if (session.provider !== "claude-code") {
+                continue;
+            }
+            const binding = this.sessionBindingRepository.findBySessionId(session.sessionId);
+            if (!binding || binding.workspaceId !== workspaceId) {
+                continue;
+            }
+            for (const root of collectClaudeProjectsRootsNearBinding(binding)) {
+                roots.add(root);
+            }
+        }
+        return Array.from(roots);
+    }
     persistSessionSourceIndexRecords(workspaceId, workspacePath, sessions, existingSourceIndexes, timestamp) {
         const existingByKey = new Map(existingSourceIndexes.map((record) => [record.sourceKey, record]));
         for (const session of sessions) {