@jingyi0605/codingns 0.9.0 → 0.9.6

package/dist/server/modules/sessions/session-history-service.d.ts

@@ -156,7 +156,7 @@ export declare class SessionHistoryService {
     listWorkspaceSessions(workspaceId: string, userId: string): SessionListItem[];
     getProviderCapabilitiesSnapshot(provider: string): ProviderCapabilities;
     getProviderCapabilities(provider: string, workspaceId?: string | null): Promise<ProviderCapabilities>;
-    getSessionCapabilities(sessionId: string): Promise<ProviderCapabilities>;
+    getSessionCapabilities(sessionId: string, userId: string): Promise<ProviderCapabilities>;
     private enrichProviderCapabilities;
     private resolveProviderCapabilitiesImmediate;
     private scheduleProviderCapabilityRefresh;
@@ -167,7 +167,7 @@ export declare class SessionHistoryService {
     private assertProviderCapabilityEnabled;
     private assertProviderSendEnabled;
     getSessionContextUsage(sessionId: string): Promise<ContextUsageSnapshot | null>;
-    resumeSession(sessionId: string): Promise<{
+    resumeSession(sessionId: string, userId: string): Promise<{
         sessionId: string;
         provider: string;
         providerSessionId: string;
@@ -182,7 +182,7 @@ export declare class SessionHistoryService {
     private readForkSourceMessages;
     private assertForkDepthWithinLimit;
     private getSessionForkDepth;
-    sendMessage(sessionId: string, content: string, clientRequestId: string | null, permissionMode?: string | null): Promise<SendMessageResult & {
+    sendMessage(sessionId: string, userId: string, content: string, clientRequestId: string | null, permissionMode?: string | null): Promise<SendMessageResult & {
         sessionId: string;
     }>;
     subscribeSession(sessionId: string, cursor: string | null, limit: number, onEnvelope: (envelope: SessionHistoryEnvelope) => Promise<void> | void, userId?: string | null): Promise<ProviderSubscription>;
@@ -198,6 +198,7 @@ export declare class SessionHistoryService {
         provider: string;
         providerSessionId: string | null;
         rawStoreRef: string | null;
+        userId?: string | null;
     }): void;
     private runDiscoverWorkspaceSessions;
     private readPage;
@@ -220,6 +221,9 @@ export declare class SessionHistoryService {
     private ensureSessionChangedFilesIndexed;
     private persistSessionChangedFiles;
     private getWorkspaceOrThrow;
+    private getWorkspaceForUserOrThrow;
+    private getBindingForUserOrThrow;
+    private resolveWorkspaceOwnerUserId;
     private getSessionListItemOrThrow;
     private findSessionListItem;
     private repairMissingSessionListItem;
@@ -250,6 +254,7 @@ export declare class SessionHistoryService {
     private refreshSessionState;
     private inspectGeminiHistoryActivity;
     private repairCodexDirtyBindingBeforeHistoryRead;
+    private repairClaudeEmptyBindingBeforeHistoryRead;
     private resolveLiveActivityObservation;
     private upsertSnapshot;
     private markSessionError;

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

@@ -1,4 +1,5 @@
-import { existsSync, readFileSync, statSync } from "node:fs";
+import { existsSync, readFileSync, readdirSync, 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";
 import { hashContent } from "../../shared/utils/hash.js";
@@ -314,6 +315,7 @@ export class SessionHistoryService {
             binding = await this.repairCodexDirtyBindingBeforeHistoryRead(resolvedSessionId, userId, binding);
             repairBindingMs = Date.now() - repairStartedAt;
         }
+        binding = this.repairClaudeEmptyBindingBeforeHistoryRead(resolvedSessionId, binding);
         const current = this.sessionStatusSnapshotRepository.findBySessionId(resolvedSessionId);
         const safeLimit = clampLimit(limit);
         const knownTotalLookupStartedAt = Date.now();
@@ -495,8 +497,8 @@ export class SessionHistoryService {
             throw mapSessionProviderError(error);
         }
     }
-    async getSessionCapabilities(sessionId) {
-        const binding = this.getBindingOrThrow(sessionId);
+    async getSessionCapabilities(sessionId, userId) {
+        const binding = this.getBindingForUserOrThrow(sessionId, userId);
         const workspace = this.getWorkspaceOrThrow(binding.workspaceId);
         const workspacePath = workspace.path;
         return this.capabilityService
@@ -632,8 +634,8 @@ export class SessionHistoryService {
             throw mapSessionProviderError(error);
         }
     }
-    async resumeSession(sessionId) {
-        const binding = this.getBindingOrThrow(sessionId);
+    async resumeSession(sessionId, userId) {
+        const binding = this.getBindingForUserOrThrow(sessionId, userId);
         this.assertProviderCapabilityEnabled(binding.provider, "canResumeSession", "当前 provider 不支持继续会话");
         try {
             const result = await this.sessionSyncService.resumeSession(binding.provider, binding.providerSessionId, binding.rawStoreRef);
@@ -670,7 +672,7 @@ export class SessionHistoryService {
         return this.startSessionDirect(input);
     }
     async startSessionDirect(input) {
-        const workspace = this.getWorkspaceOrThrow(input.workspaceId);
+        const workspace = this.getWorkspaceForUserOrThrow(input.workspaceId, input.userId);
         this.assertProviderCapabilityEnabled(input.provider, "canStartSession", "当前 provider 不支持创建会话");
         const sessionId = createId();
         const providerBinding = this.prepareDirectSessionBinding({
@@ -687,6 +689,7 @@ export class SessionHistoryService {
             const persist = this.db.transaction(() => {
                 this.sessionBindingRepository.upsert({
                     sessionId,
+                    userId: input.userId,
                     workspaceId: workspace.id,
                     provider: result.session.provider,
                     providerSessionId: result.session.providerSessionId,
@@ -745,9 +748,9 @@ export class SessionHistoryService {
         }
     }
     async forkSession(input) {
-        const binding = this.getBindingOrThrow(input.sessionId);
+        const binding = this.getBindingForUserOrThrow(input.sessionId, input.userId);
         const targetWorkspaceId = input.targetWorkspaceId?.trim() || binding.workspaceId;
-        const workspace = this.getWorkspaceOrThrow(targetWorkspaceId);
+        const workspace = this.getWorkspaceForUserOrThrow(targetWorkspaceId, input.userId);
         const targetProvider = input.targetProvider?.trim() || binding.provider;
         this.assertProviderCapabilityEnabled(targetProvider, "canStartSession", "当前 provider 不支持 fork 创建会话");
         const sourceMessageId = input.sourceType === "message"
@@ -789,6 +792,7 @@ export class SessionHistoryService {
             this.db.transaction(() => {
                 this.sessionBindingRepository.upsert({
                     sessionId,
+                    userId: input.userId,
                     workspaceId: workspace.id,
                     provider: result.session.provider,
                     providerSessionId: result.session.providerSessionId,
@@ -1037,8 +1041,8 @@ export class SessionHistoryService {
         }
         return depth;
     }
-    async sendMessage(sessionId, content, clientRequestId, permissionMode = null) {
-        const binding = this.getBindingOrThrow(sessionId);
+    async sendMessage(sessionId, userId, content, clientRequestId, permissionMode = null) {
+        const binding = this.getBindingForUserOrThrow(sessionId, userId);
         this.assertProviderSendEnabled(binding.provider, "sessionId", "当前 provider 不支持继续发送消息");
         const result = await this.sessionSyncService
             .sendMessage(binding.provider, binding.providerSessionId, binding.rawStoreRef, content, clientRequestId, permissionMode)
@@ -1235,6 +1239,7 @@ export class SessionHistoryService {
             });
             this.sessionBindingRepository.upsert({
                 ...binding,
+                userId: input.userId,
                 rawStoreRef: result.rawStoreRef,
                 updatedAt: timestamp
             });
@@ -1365,6 +1370,10 @@ export class SessionHistoryService {
                     const currentIndex = this.sessionIndexRepository.findIndexRecordBySessionId(sessionId);
                     this.sessionBindingRepository.upsert({
                         sessionId,
+                        userId: snapshot.userId
+                            ?? currentBinding?.userId
+                            ?? duplicateBinding?.userId
+                            ?? this.resolveWorkspaceOwnerUserId(workspaceId),
                         workspaceId,
                         provider: resolvedSnapshot.provider,
                         providerSessionId: resolvedSnapshot.providerSessionId,
@@ -1402,7 +1411,7 @@ export class SessionHistoryService {
     async runDiscoverWorkspaceSessions(workspaceId, userId, refreshStateMode = "inline", signal) {
         const startedAt = Date.now();
         const debugStartedAtMs = terminalDebugNowMs();
-        const workspace = this.getWorkspaceOrThrow(workspaceId);
+        const workspace = this.getWorkspaceForUserOrThrow(workspaceId, userId);
         let discoverDurationMs = 0;
         let persistDurationMs = 0;
         let persistPass1DurationMs = 0;
@@ -1470,6 +1479,7 @@ export class SessionHistoryService {
                         : null;
                     const nextBinding = {
                         sessionId,
+                        userId,
                         workspaceId: workspace.id,
                         provider: session.provider,
                         providerSessionId: session.providerSessionId,
@@ -2241,6 +2251,31 @@ export class SessionHistoryService {
         }
         return workspace;
     }
+    getWorkspaceForUserOrThrow(workspaceId, userId) {
+        const workspace = this.getWorkspaceOrThrow(workspaceId);
+        if (workspace.ownerUserId !== userId) {
+            throw new AppError({
+                statusCode: 404,
+                errorCode: "WORKSPACE_NOT_FOUND",
+                detail: "工作区不存在"
+            });
+        }
+        return workspace;
+    }
+    getBindingForUserOrThrow(sessionId, userId) {
+        const binding = this.sessionBindingRepository.findBySessionIdForUser(sessionId, userId);
+        if (!binding) {
+            throw new AppError({
+                statusCode: 404,
+                errorCode: "SESSION_NOT_FOUND",
+                detail: "session 不存在"
+            });
+        }
+        return this.resolvePendingSessionAliasBinding(binding) ?? binding;
+    }
+    resolveWorkspaceOwnerUserId(workspaceId) {
+        return this.workspaceRepository.findById(workspaceId)?.ownerUserId ?? null;
+    }
     getSessionListItemOrThrow(sessionId, userId) {
         const canonicalSessionId = this.resolveCanonicalSessionId(sessionId, userId);
         const item = this.findSessionListItem(canonicalSessionId, sessionId, userId)
@@ -2614,6 +2649,7 @@ export class SessionHistoryService {
         if (!targetBinding) {
             this.sessionBindingRepository.upsert({
                 sessionId: input.targetSessionId,
+                userId: sourceBinding.userId ?? this.resolveWorkspaceOwnerUserId(input.workspaceId),
                 workspaceId: input.workspaceId,
                 provider: input.provider,
                 providerSessionId: buildPendingBindingValue(input.provider, input.targetSessionId),
@@ -2698,6 +2734,7 @@ export class SessionHistoryService {
         // 保留旧 session_id 作为 alias，避免前端或 Butler 还拿着旧 id 时直接炸成 SESSION_NOT_FOUND。
         this.sessionBindingRepository.upsert({
             sessionId: input.sourceSessionId,
+            userId: sourceBinding.userId ?? this.resolveWorkspaceOwnerUserId(sourceBinding.workspaceId),
             workspaceId: sourceBinding.workspaceId,
             provider: sourceBinding.provider,
             providerSessionId: buildAliasBindingValue(input.provider, input.targetSessionId, input.sourceSessionId),
@@ -3101,6 +3138,21 @@ export class SessionHistoryService {
             this.codexDirtyBindingRepairStates.set(sessionId, currentState);
         });
     }
+    repairClaudeEmptyBindingBeforeHistoryRead(sessionId, binding) {
+        if (!shouldRepairClaudeEmptyHistoryBinding(binding)) {
+            return binding;
+        }
+        const repairedRawStoreRef = findBestClaudeHistoryFileNearBinding(binding);
+        if (!repairedRawStoreRef || repairedRawStoreRef === binding.rawStoreRef) {
+            return binding;
+        }
+        this.persistSessionBinding(sessionId, binding.workspaceId, {
+            provider: binding.provider,
+            providerSessionId: binding.providerSessionId,
+            rawStoreRef: repairedRawStoreRef
+        });
+        return this.getBindingOrThrow(sessionId);
+    }
     resolveLiveActivityObservation(sessionId) {
         for (const resolver of this.liveActivityObservationResolvers) {
             const observation = resolver(sessionId);
@@ -3596,6 +3648,69 @@ function shouldSkipClaudePendingBinding(binding) {
 function isPendingBindingValue(value) {
     return value.trim().toLowerCase().startsWith("pending://");
 }
+function shouldRepairClaudeEmptyHistoryBinding(binding) {
+    if (binding.provider !== "claude-code") {
+        return false;
+    }
+    if (isPendingBindingValue(binding.providerSessionId) || isPendingBindingValue(binding.rawStoreRef)) {
+        return false;
+    }
+    const currentStats = safeStat(binding.rawStoreRef);
+    return !currentStats || currentStats.size === 0;
+}
+function findBestClaudeHistoryFileNearBinding(binding) {
+    const providerSessionId = binding.providerSessionId.trim();
+    if (!providerSessionId || isPendingBindingValue(providerSessionId)) {
+        return null;
+    }
+    const candidates = new Set();
+    for (const projectsRoot of collectClaudeProjectsRootsNearBinding(binding)) {
+        for (const candidate of listClaudeSessionCandidates(projectsRoot, providerSessionId)) {
+            candidates.add(candidate);
+        }
+    }
+    const nonEmptyCandidates = Array.from(candidates)
+        .map((filePath) => ({
+        filePath,
+        stats: safeStat(filePath)
+    }))
+        .filter((candidate) => Boolean(candidate.stats && candidate.stats.size > 0))
+        .sort((left, right) => {
+        if (right.stats.size !== left.stats.size) {
+            return right.stats.size - left.stats.size;
+        }
+        return right.stats.mtimeMs - left.stats.mtimeMs;
+    });
+    return nonEmptyCandidates[0]?.filePath ?? null;
+}
+function collectClaudeProjectsRootsNearBinding(binding) {
+    const roots = new Set();
+    const rawStoreRef = binding.rawStoreRef.trim();
+    if (rawStoreRef && !isPendingBindingValue(rawStoreRef)) {
+        // rawStoreRef 通常是 <home>/projects/<workspace-slug>/<session>.jsonl。
+        // 即使 <workspace-slug> 算错了，向上两级仍然能拿到正确的 projects 根。
+        roots.add(dirname(dirname(rawStoreRef)));
+    }
+    const runtimeHomeDir = binding.runtimeHomeDir?.trim() ?? "";
+    if (runtimeHomeDir) {
+        roots.add(join(runtimeHomeDir, "projects"));
+    }
+    return Array.from(roots);
+}
+function listClaudeSessionCandidates(projectsRoot, providerSessionId) {
+    if (!projectsRoot || !existsSync(projectsRoot)) {
+        return [];
+    }
+    try {
+        return readdirSync(projectsRoot, { withFileTypes: true })
+            .filter((entry) => entry.isDirectory())
+            .map((entry) => join(projectsRoot, entry.name, `${providerSessionId}.jsonl`))
+            .filter((filePath) => existsSync(filePath));
+    }
+    catch {
+        return [];
+    }
+}
 function isSessionBindingProviderUniqueConflict(error) {
     if (!(error instanceof Error)) {
         return false;