@jingyi0605/codingns 0.7.4 → 0.8.1

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,29 @@ 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,
+                messageContent: input.content
+            });
+            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 +139,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 +156,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 +1185,29 @@ 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,
+                messageContent: input.content
+            });
+            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 +1216,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 +1467,37 @@ 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,
+            instructionOverlay: buildBrowserTaskInstructionOverlay(input.messageContent ?? null)
+        });
+    }
+    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 +1601,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,
@@ -2563,6 +2644,46 @@ function resolveRuntimeInstructionFilePath(provider, workspacePath, explicitFile
         ? path.resolve(defaultInstructionPath)
         : null;
 }
+function buildBrowserTaskInstructionOverlay(content) {
+    const intent = classifyBrowserTaskIntent(content);
+    if (intent !== "real_site_authenticated") {
+        return null;
+    }
+    return `## 浏览器任务临时规则（本轮生效）
+
+- 当前用户消息已识别为真实站点登录态浏览器任务。
+- 如果任务涉及登录态、个人账户、订单、后台页面、验证码、下载文件、表单提交，必须优先走 \`codingns assistant office browser-task-create\`。
+- 如果用户明确要求复用当前已登录的 Edge/Chrome 会话，必须显式传 \`executionBackend=opencli_bridge\`。
+- 这类任务不要把 persistent profile 当成当前真人浏览器会话的替代品。
+- 首次桥接失败时，不要自动切到 \`playwright\`；先检查 \`executionBackend\`、\`finalUrl\` 和步骤结果，再重试一次 \`opencli_bridge\`。
+- 只有用户明确同意放弃“当前已登录会话”约束后，才允许改用 \`playwright\` 或手工指定 profile。
+- 成功标准不仅是任务执行完成，还必须同时满足：
+  - \`executionBackend = opencli_bridge\`
+  - \`finalUrl\` 落在目标业务页
+  - 页面确认处于已登录状态
+- 如果结果是 \`about:blank\`、登录页、验证码页或错误页，必须明确说明“未满足用户约束”。`;
+}
+function classifyBrowserTaskIntent(content) {
+    const normalized = normalizeIntentText(content);
+    if (!normalized) {
+        return "none";
+    }
+    if (/(localhost|127\.0\.0\.1|::1|本地预览|前端调试|热更新|ui 冒烟|ui冒烟)/i.test(normalized)) {
+        return "local_debug";
+    }
+    const browserActionPattern = /(打开网页|打开页面|登录网站|抓取页面|读取dom|读取 dom|截图|点按钮|点击按钮|填写表单|提交表单|下载文件|浏览器|网页|页面|站点)/i;
+    if (!browserActionPattern.test(normalized)) {
+        return "none";
+    }
+    const authenticatedPattern = /(已登录|登录态|当前浏览器|当前窗口|现有窗口|复用.*登录|edge|chrome|淘宝|京东|飞书|订单|购物车|个人账户|账号|后台|验证码|待收货|待付款|商家后台|管理后台)/i;
+    if (authenticatedPattern.test(normalized)) {
+        return "real_site_authenticated";
+    }
+    return "real_site_public";
+}
+function normalizeIntentText(content) {
+    return (content ?? "").trim().toLowerCase();
+}
 function buildClaudeHookBridgeConfig(config, provider) {
     const bridgeUrl = buildClaudeCompatibleHookBridgeUrl(config, provider);
     const scriptPath = resolveClaudeHookBridgeScriptPath();