@jingyi0605/codingns 0.7.4 → 0.8.0

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

@@ -17,6 +17,7 @@ import type { SessionHistoryEnvelope, SessionHistoryMessageWithOrigin, SessionHi
 import { type ClaudeCompatibleProviderId } from "./claude-compatible-provider-registry.js";
 import { SessionProviderConfigService } from "./session-provider-config-service.js";
 import type { OpenCliSessionPromptService } from "../opencli/opencli-session-prompt-service.js";
+import type { WorkspaceSessionRuntimeContextService } from "./workspace-session-runtime-context-service.js";
 interface RuntimeSendOptions {
     model?: string | null;
     reasoningLevel?: string | null;
@@ -191,6 +192,7 @@ export declare class SessionLiveRuntimeService {
     private readonly sessionProviderConfigService;
     private readonly config;
     private readonly openCliSessionPromptService;
+    private readonly workspaceSessionRuntimeContextService;
     private readonly providerRuntimeService;
     private readonly sessionActivityAuthorityService;
     private readonly sessionPermissionRequestService;
@@ -205,7 +207,7 @@ export declare class SessionLiveRuntimeService {
     private readonly queueDispatchSessions;
     private readonly queueRetryTimers;
     private readonly pendingSendDebugTracesBySessionId;
-    constructor(sessionHistoryService: SessionHistoryService, sessionMessageAttachmentService: SessionMessageAttachmentService, workspaceService: WorkspaceService, sessionChangedFileService: SessionChangedFileService, sessionBindingRepository: SessionBindingRepository, authUserRepository: AuthUserRepository, sessionSendQueueRepository: SessionSendQueueRepository, sessionIndexRepository: SessionIndexRepository, sessionStateRepository: SessionStateRepository, sessionStatusSnapshotRepository: SessionStatusSnapshotRepository, sessionProviderConfigService: SessionProviderConfigService, config: HostConfig, sessionActivityAuthorityService?: SessionActivityAuthorityService, openCliSessionPromptService?: OpenCliSessionPromptService | null);
+    constructor(sessionHistoryService: SessionHistoryService, sessionMessageAttachmentService: SessionMessageAttachmentService, workspaceService: WorkspaceService, sessionChangedFileService: SessionChangedFileService, sessionBindingRepository: SessionBindingRepository, authUserRepository: AuthUserRepository, sessionSendQueueRepository: SessionSendQueueRepository, sessionIndexRepository: SessionIndexRepository, sessionStateRepository: SessionStateRepository, sessionStatusSnapshotRepository: SessionStatusSnapshotRepository, sessionProviderConfigService: SessionProviderConfigService, config: HostConfig, sessionActivityAuthorityService?: SessionActivityAuthorityService, openCliSessionPromptService?: OpenCliSessionPromptService | null, workspaceSessionRuntimeContextService?: Pick<WorkspaceSessionRuntimeContextService, "prepareWorkspaceInstructionBundle"> | null);
     startLiveSession(input: StartLiveSessionInput): Promise<LiveMessageAcceptedResult>;
     sendLiveMessage(input: SendLiveMessageInput): Promise<LiveMessageAcceptedResult>;
     listQueuedMessages(sessionId: string, userId: string): Promise<SessionQueueItemView[]>;
@@ -251,6 +253,8 @@ export declare class SessionLiveRuntimeService {
     private launchRuntimeRun;
     private attachRuntimePersistence;
     private createRuntimeBackedSession;
+    private prepareWorkspaceRuntimeContext;
+    private resolveEffectiveRuntimeHomeDir;
     private resolveStartedSession;
     private upsertRuntimeBackedSessionRecords;
     private ensurePendingSessionBinding;

package/dist/server/modules/sessions/session-live-runtime-service.js

@@ -33,6 +33,7 @@ export class SessionLiveRuntimeService {
     sessionProviderConfigService;
     config;
     openCliSessionPromptService;
+    workspaceSessionRuntimeContextService;
     providerRuntimeService;
     sessionActivityAuthorityService;
     sessionPermissionRequestService;
@@ -47,7 +48,7 @@ export class SessionLiveRuntimeService {
     queueDispatchSessions = new Set();
     queueRetryTimers = new Map();
     pendingSendDebugTracesBySessionId = new Map();
-    constructor(sessionHistoryService, sessionMessageAttachmentService, workspaceService, sessionChangedFileService, sessionBindingRepository, authUserRepository, sessionSendQueueRepository, sessionIndexRepository, sessionStateRepository, sessionStatusSnapshotRepository, sessionProviderConfigService, config, sessionActivityAuthorityService = new SessionActivityAuthorityService(), openCliSessionPromptService = null) {
+    constructor(sessionHistoryService, sessionMessageAttachmentService, workspaceService, sessionChangedFileService, sessionBindingRepository, authUserRepository, sessionSendQueueRepository, sessionIndexRepository, sessionStateRepository, sessionStatusSnapshotRepository, sessionProviderConfigService, config, sessionActivityAuthorityService = new SessionActivityAuthorityService(), openCliSessionPromptService = null, workspaceSessionRuntimeContextService = null) {
         this.sessionHistoryService = sessionHistoryService;
         this.sessionMessageAttachmentService = sessionMessageAttachmentService;
         this.workspaceService = workspaceService;
@@ -61,6 +62,7 @@ export class SessionLiveRuntimeService {
         this.sessionProviderConfigService = sessionProviderConfigService;
         this.config = config;
         this.openCliSessionPromptService = openCliSessionPromptService;
+        this.workspaceSessionRuntimeContextService = workspaceSessionRuntimeContextService;
         this.sessionActivityAuthorityService = sessionActivityAuthorityService;
         this.sessionPermissionRequestService = new SessionPermissionRequestService(sessionHistoryService, sessionBindingRepository, authUserRepository, workspaceService, config, async (envelope) => {
             await this.emitExternalRuntimeEnvelope(envelope);
@@ -88,6 +90,8 @@ export class SessionLiveRuntimeService {
             const capabilities = this.sessionHistoryService.getProviderCapabilitiesSnapshot(input.provider);
             const providerBinding = this.sessionProviderConfigService.prepareSessionBinding({
                 sessionId,
+                userId: input.userId,
+                workspaceId: workspace.id,
                 provider: input.provider,
                 providerConfigMode: input.providerConfigMode,
                 providerPresetId: input.providerPresetId ?? null
@@ -102,7 +106,28 @@ export class SessionLiveRuntimeService {
             const persistedAttachments = this.persistMessageAttachments(sessionId, input.clientRequestId, input.runtimeOptions?.attachments ?? []);
             const providerPrompt = this.sessionMessageAttachmentService.buildProviderPrompt(input.provider, input.content, persistedAttachments.runtimeAttachments);
             const resolvedProviderPrompt = this.composeProviderPrompt(input.provider, providerPrompt, providerLaunchContext.runtimeEnv);
-            const providerInstructionFilePath = resolveRuntimeInstructionFilePath(input.provider, workspace.path, input.runtimeOptions?.providerInstructionFilePath ?? null);
+            const workspaceRuntimeContext = this.prepareWorkspaceRuntimeContext({
+                sessionId,
+                userId: input.userId,
+                workspaceId: workspace.id,
+                workspacePath: workspace.path,
+                projectId: null,
+                provider: input.provider
+            });
+            const runtimeEnv = {
+                ...providerLaunchContext.runtimeEnv,
+                ...workspaceRuntimeContext.runtimeEnv
+            };
+            const effectiveRuntimeHomeDir = this.resolveEffectiveRuntimeHomeDir({
+                provider: input.provider,
+                workspaceRuntimeHomeDir: workspaceRuntimeContext.runtimeHomeDir,
+                providerLaunchRuntimeHomeDir: providerLaunchContext.runtimeHomeDir,
+                providerBindingRuntimeHomeDir: providerBinding.runtimeHomeDir
+            });
+            const providerInstructionFilePath = resolveRuntimeInstructionFilePath(input.provider, workspace.path, input.runtimeOptions?.providerInstructionFilePath
+                ?? workspaceRuntimeContext.instructionFilePath
+                ?? providerLaunchContext.providerInstructionFilePath
+                ?? null);
             this.ensureCapability(capabilities, "provider", "canStartSession", "provider 不支持 start-live");
             this.ensureCapability(capabilities, "provider", "canSendMessage", "provider 不支持实时对话");
             const launchRuntimeStartedAtMs = performance.now();
@@ -113,8 +138,8 @@ export class SessionLiveRuntimeService {
                 provider: input.provider,
                 providerSessionId: null,
                 rawStoreRef: null,
-                runtimeHomeDir: providerLaunchContext.runtimeHomeDir,
-                runtimeEnv: providerLaunchContext.runtimeEnv,
+                runtimeHomeDir: effectiveRuntimeHomeDir,
+                runtimeEnv,
                 sequenceBase: 1,
                 options: {
                     content: input.content,
@@ -130,7 +155,7 @@ export class SessionLiveRuntimeService {
                 provider: input.provider,
                 providerConfigMode: providerBinding.providerConfigMode,
                 providerPresetId: providerBinding.providerPresetId,
-                runtimeHomeDir: providerBinding.runtimeHomeDir
+                runtimeHomeDir: effectiveRuntimeHomeDir
             });
             this.logSendDebugStep(debugTrace, "launch_runtime", launchRuntimeStartedAtMs, {
                 userId: input.userId
@@ -1159,7 +1184,28 @@ export class SessionLiveRuntimeService {
                 ?? this.persistMessageAttachments(input.sessionId, input.clientRequestId, input.runtimeOptions?.attachments ?? []);
             const providerPrompt = this.sessionMessageAttachmentService.buildProviderPrompt(session.provider, input.content, resolvedAttachments.runtimeAttachments);
             const resolvedProviderPrompt = this.composeProviderPrompt(session.provider, providerPrompt, providerLaunchContext.runtimeEnv);
-            const providerInstructionFilePath = resolveRuntimeInstructionFilePath(session.provider, workspace.path, input.runtimeOptions?.providerInstructionFilePath ?? null);
+            const workspaceRuntimeContext = this.prepareWorkspaceRuntimeContext({
+                sessionId: input.sessionId,
+                userId: input.userId,
+                workspaceId: session.workspaceId,
+                workspacePath: workspace.path,
+                projectId: null,
+                provider: session.provider
+            });
+            const runtimeEnv = {
+                ...providerLaunchContext.runtimeEnv,
+                ...workspaceRuntimeContext.runtimeEnv
+            };
+            const effectiveRuntimeHomeDir = this.resolveEffectiveRuntimeHomeDir({
+                provider: session.provider,
+                workspaceRuntimeHomeDir: workspaceRuntimeContext.runtimeHomeDir,
+                providerLaunchRuntimeHomeDir: providerLaunchContext.runtimeHomeDir,
+                providerBindingRuntimeHomeDir: providerBinding.runtimeHomeDir
+            });
+            const providerInstructionFilePath = resolveRuntimeInstructionFilePath(session.provider, workspace.path, input.runtimeOptions?.providerInstructionFilePath
+                ?? workspaceRuntimeContext.instructionFilePath
+                ?? providerLaunchContext.providerInstructionFilePath
+                ?? null);
             this.ensureCapability(capabilities, "sessionId", "canSendMessage", "provider 不支持实时对话");
             const runtimeRequest = {
                 sessionId: input.sessionId,
@@ -1168,8 +1214,8 @@ export class SessionLiveRuntimeService {
                 provider: session.provider,
                 providerSessionId: runtimeMode === "start" ? null : session.providerSessionId,
                 rawStoreRef: runtimeRawStoreRef,
-                runtimeHomeDir: providerLaunchContext.runtimeHomeDir,
-                runtimeEnv: providerLaunchContext.runtimeEnv,
+                runtimeHomeDir: effectiveRuntimeHomeDir,
+                runtimeEnv,
                 sequenceBase: nextUserSequence,
                 options: {
                     content: input.content,
@@ -1419,6 +1465,36 @@ export class SessionLiveRuntimeService {
     createRuntimeBackedSession(input) {
         this.upsertRuntimeBackedSessionRecords(input);
     }
+    prepareWorkspaceRuntimeContext(input) {
+        if (!this.workspaceSessionRuntimeContextService) {
+            return {
+                instructionFilePath: null,
+                runtimeHomeDir: null,
+                runtimeEnv: {}
+            };
+        }
+        return this.workspaceSessionRuntimeContextService.prepareWorkspaceInstructionBundle({
+            sessionId: input.sessionId,
+            userId: input.userId,
+            workspaceId: input.workspaceId,
+            workspacePath: input.workspacePath,
+            projectId: input.projectId ?? null,
+            provider: input.provider
+        });
+    }
+    resolveEffectiveRuntimeHomeDir(input) {
+        // Codex 的 thread 索引和 transcript 依赖同一个 home。
+        // 工作区会话需要注入鉴权/MCP/指令文件，但不能顺手把 CODEX_HOME 也切到
+        // workspace-session-runtime 目录，否则真实 transcript 会落到私有目录里，
+        // Host 又会继续绑定 synthetic .stream，最终表现成 assistant 文本极慢地“拼”出来。
+        if (input.provider === "codex") {
+            return input.providerLaunchRuntimeHomeDir ?? input.providerBindingRuntimeHomeDir ?? null;
+        }
+        return (input.workspaceRuntimeHomeDir
+            ?? input.providerLaunchRuntimeHomeDir
+            ?? input.providerBindingRuntimeHomeDir
+            ?? null);
+    }
     resolveStartedSession(input) {
         try {
             return this.sessionHistoryService.getSession(input.sessionId, input.userId);
@@ -1522,6 +1598,8 @@ export class SessionLiveRuntimeService {
     resolveRequestedSessionProviderBinding(session, input, existingBinding) {
         return this.sessionProviderConfigService.resolveSessionBinding({
             sessionId: session.sessionId,
+            userId: input.userId,
+            workspaceId: session.workspaceId,
             provider: session.provider,
             existingBinding,
             providerConfigMode: input.providerConfigMode,