@jingyi0605/codingns 0.6.1 → 0.7.0

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

@@ -16,15 +16,20 @@ export class SessionLiveRuntimeRouterService {
     listQueuedMessages = async (sessionId, userId) => this.resolveServiceForSession(sessionId).listQueuedMessages(sessionId, userId);
     deleteQueuedMessage = async (sessionId, userId, queueItemId) => this.resolveServiceForSession(sessionId).deleteQueuedMessage(sessionId, userId, queueItemId);
     steerQueuedMessage = async (sessionId, userId, queueItemId) => this.resolveServiceForSession(sessionId).steerQueuedMessage(sessionId, userId, queueItemId);
-    getClaudeHookBridgeConfig = () => this.primaryService.getClaudeHookBridgeConfig();
-    ingestClaudeHookEvent = async (payload) => {
+    getClaudeHookBridgeConfig = (provider) => this.primaryService.getClaudeHookBridgeConfig(provider);
+    ingestClaudeHookEvent = async (providerOrPayload, payload) => {
+        const provider = typeof providerOrPayload === "string" ? providerOrPayload : null;
         for (const service of this.services) {
-            const result = await service.ingestClaudeHookEvent(payload);
+            const result = provider
+                ? await service.ingestClaudeHookEvent(provider, payload)
+                : await service.ingestClaudeHookEvent(providerOrPayload);
             if (!result.ignored || result.sessionId) {
                 return result;
             }
         }
-        return this.primaryService.ingestClaudeHookEvent(payload);
+        return provider
+            ? this.primaryService.ingestClaudeHookEvent(provider, payload)
+            : this.primaryService.ingestClaudeHookEvent(providerOrPayload);
     };
     resolveLiveActivityObservation = (sessionId) => this.findOwningService(sessionId)?.resolveLiveActivityObservation(sessionId) ?? null;
     resolveServiceForSession(sessionId) {

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

@@ -1 +1 @@
-{"version":3,"file":"session-live-runtime-router-service.js","sourceRoot":"","sources":["../../../../src/modules/sessions/session-live-runtime-router-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-live-runtime-router-service.js","sourceRoot":"","sources":["../../../../src/modules/sessions/session-live-runtime-router-service.ts"],"names":[],"mappings":"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"}

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

@@ -14,7 +14,9 @@ import type { SessionAttachmentInput } from "./session-message-attachment-servic
 import { SessionMessageAttachmentService } from "./session-message-attachment-service.js";
 import { type SessionPermissionEnvelope, type SessionPermissionReplyInput, type SessionPermissionRequestView } from "./session-permission-request-service.js";
 import type { SessionHistoryEnvelope, SessionHistoryMessageWithOrigin, SessionHistoryService } from "./session-history-service.js";
+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";
 interface RuntimeSendOptions {
     model?: string | null;
     reasoningLevel?: string | null;
@@ -154,7 +156,7 @@ interface SessionTerminalStateEvent {
     source: "runtime" | "external_runtime";
 }
 interface ClaudeHookBridgeConfig {
-    provider: "claude-code";
+    provider: ClaudeCompatibleProviderId;
     bridgeUrl: string;
     token: string;
     scriptPath: string;
@@ -188,6 +190,7 @@ export declare class SessionLiveRuntimeService {
     private readonly sessionStatusSnapshotRepository;
     private readonly sessionProviderConfigService;
     private readonly config;
+    private readonly openCliSessionPromptService;
     private readonly providerRuntimeService;
     private readonly sessionActivityAuthorityService;
     private readonly sessionPermissionRequestService;
@@ -202,15 +205,15 @@ 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);
+    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);
     startLiveSession(input: StartLiveSessionInput): Promise<LiveMessageAcceptedResult>;
     sendLiveMessage(input: SendLiveMessageInput): Promise<LiveMessageAcceptedResult>;
     listQueuedMessages(sessionId: string, userId: string): Promise<SessionQueueItemView[]>;
     enqueueLiveMessage(input: SendLiveMessageInput): Promise<SessionQueueItemView>;
     steerQueuedMessage(sessionId: string, userId: string, queueItemId: string): Promise<SteerQueuedMessageResult>;
     deleteQueuedMessage(sessionId: string, userId: string, queueItemId: string): Promise<DeleteQueuedMessageResult>;
-    getClaudeHookBridgeConfig(): ClaudeHookBridgeConfig;
-    ingestClaudeHookEvent(payload: ClaudeHookEventPayload): Promise<{
+    getClaudeHookBridgeConfig(provider?: ClaudeCompatibleProviderId): ClaudeHookBridgeConfig;
+    ingestClaudeHookEvent(providerOrPayload: ClaudeCompatibleProviderId | ClaudeHookEventPayload, payload?: ClaudeHookEventPayload): Promise<{
         accepted: boolean;
         ignored: boolean;
         sessionId: string | null;
@@ -238,6 +241,7 @@ export declare class SessionLiveRuntimeService {
     private applyExternalRuntimeUpdate;
     private startRuntimeRun;
     private sendLiveMessageDirect;
+    private composeProviderPrompt;
     private dispatchNextQueuedMessage;
     private maybeDispatchQueuedMessages;
     private shouldBlockQueueDispatch;

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

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readdirSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { performance } from "node:perf_hooks";
 import { ClaudeRuntimeAdapter, CodexRuntimeAdapter, GeminiRuntimeAdapter, KimiRuntimeAdapter, LegnaRuntimeAdapter, OpenCodeRuntimeAdapter, ProviderRuntimeService } from "@codingns/session-sync-core";
@@ -8,8 +8,10 @@ import { isPerfDebugEnabled, logPerformance } from "../../shared/utils/perf-log.
 import { logPermissionDebug } from "../../shared/utils/permission-debug-log.js";
 import { nowIso } from "../../shared/utils/time.js";
 import { SessionActivityAuthorityService } from "./session-activity-authority-service.js";
+import { createProviderCapabilityBlockedError } from "../provider/provider-disabled.js";
 import { SessionPermissionRequestService } from "./session-permission-request-service.js";
 import { appendSessionProviderErrorContext, mapSessionProviderError } from "./session-provider-error-mapper.js";
+import { buildClaudeCompatibleHookBridgeUrl, buildClaudeCompatibleRawStoreRef, buildClaudeCompatibleSessionTitle, findClaudeCompatibleSessionFile, isClaudeCompatibleProvider } from "./claude-compatible-provider-registry.js";
 import { ClaudeRuntimeHelperAdapter } from "./claude-runtime-helper-client.js";
 import { CodexAppServerHelperClient } from "./codex-app-server-helper-client.js";
 const OPENCODE_ORDER_DEBUG_ENABLED = /^(1|true|yes)$/i.test(process.env.CODINGNS_OPENCODE_ORDER_DEBUG?.trim() ?? "");
@@ -30,6 +32,7 @@ export class SessionLiveRuntimeService {
     sessionStatusSnapshotRepository;
     sessionProviderConfigService;
     config;
+    openCliSessionPromptService;
     providerRuntimeService;
     sessionActivityAuthorityService;
     sessionPermissionRequestService;
@@ -44,7 +47,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()) {
+    constructor(sessionHistoryService, sessionMessageAttachmentService, workspaceService, sessionChangedFileService, sessionBindingRepository, authUserRepository, sessionSendQueueRepository, sessionIndexRepository, sessionStateRepository, sessionStatusSnapshotRepository, sessionProviderConfigService, config, sessionActivityAuthorityService = new SessionActivityAuthorityService(), openCliSessionPromptService = null) {
         this.sessionHistoryService = sessionHistoryService;
         this.sessionMessageAttachmentService = sessionMessageAttachmentService;
         this.workspaceService = workspaceService;
@@ -57,6 +60,7 @@ export class SessionLiveRuntimeService {
         this.sessionStatusSnapshotRepository = sessionStatusSnapshotRepository;
         this.sessionProviderConfigService = sessionProviderConfigService;
         this.config = config;
+        this.openCliSessionPromptService = openCliSessionPromptService;
         this.sessionActivityAuthorityService = sessionActivityAuthorityService;
         this.sessionPermissionRequestService = new SessionPermissionRequestService(sessionHistoryService, sessionBindingRepository, authUserRepository, workspaceService, config, async (envelope) => {
             await this.emitExternalRuntimeEnvelope(envelope);
@@ -97,9 +101,10 @@ export class SessionLiveRuntimeService {
             this.ensurePendingSessionBinding(sessionId, workspace.id, input.provider, providerBinding);
             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);
-            this.ensureCapability(capabilities.canStartSession, "provider", "provider 不支持 start-live");
-            this.ensureCapability(capabilities.canSendMessage, "provider", "provider 不支持实时对话");
+            this.ensureCapability(capabilities, "provider", "canStartSession", "provider 不支持 start-live");
+            this.ensureCapability(capabilities, "provider", "canSendMessage", "provider 不支持实时对话");
             const launchRuntimeStartedAtMs = performance.now();
             const handle = await this.launchRuntimeRun({
                 sessionId,
@@ -117,7 +122,7 @@ export class SessionLiveRuntimeService {
                     model: input.runtimeOptions?.model ?? null,
                     reasoningLevel: input.runtimeOptions?.reasoningLevel ?? null,
                     permissionMode: input.runtimeOptions?.permissionMode ?? null,
-                    providerPrompt,
+                    providerPrompt: resolvedProviderPrompt,
                     providerInstructionFilePath,
                     attachments: persistedAttachments.runtimeAttachments
                 }
@@ -171,7 +176,7 @@ export class SessionLiveRuntimeService {
             if (!shouldAwaitStartBindingBeforeAcceptedUserLookup(input.provider)) {
                 void startBindingTask;
             }
-            const acceptedAt = acceptedMessage?.timestamp ?? nowIso();
+            const acceptedAt = acceptedMessage?.timestamp ?? requestStartedAt;
             const boundAttachments = this.sessionMessageAttachmentService.bindClientRequestToMessage(sessionId, input.clientRequestId, acceptedMessage?.messageId ?? null);
             const session = this.resolveStartedSession({
                 sessionId,
@@ -353,16 +358,25 @@ export class SessionLiveRuntimeService {
             deleted: true
         };
     }
-    getClaudeHookBridgeConfig() {
-        return buildClaudeHookBridgeConfig(this.config);
-    }
-    async ingestClaudeHookEvent(payload) {
-        const hookEventName = normalizeClaudeHookEventName(payload.hook_event_name);
+    getClaudeHookBridgeConfig(provider = "claude-code") {
+        return buildClaudeHookBridgeConfig(this.config, provider);
+    }
+    async ingestClaudeHookEvent(providerOrPayload, payload) {
+        const hasExplicitProvider = typeof providerOrPayload === "string"
+            && isClaudeCompatibleProvider(providerOrPayload);
+        const provider = hasExplicitProvider
+            ? providerOrPayload
+            : "claude-code";
+        const resolvedPayload = hasExplicitProvider
+            ? (payload ?? {})
+            : providerOrPayload;
+        const hookEventName = normalizeClaudeHookEventName(resolvedPayload.hook_event_name);
         logPermissionDebug("claude_hook_event.ingest.begin", {
+            provider,
             hookEventName,
-            sessionId: payload.session_id ?? null,
-            cwd: payload.cwd ?? null,
-            transcriptPath: payload.transcript_path ?? null
+            sessionId: resolvedPayload.session_id ?? null,
+            cwd: resolvedPayload.cwd ?? null,
+            transcriptPath: resolvedPayload.transcript_path ?? null
         });
         if (!hookEventName) {
             throw new AppError({
@@ -388,23 +402,23 @@ export class SessionLiveRuntimeService {
                 hookEventName,
                 route: "handleClaudePreToolUse"
             });
-            return this.sessionPermissionRequestService.handleClaudePreToolUse(payload);
+            return this.sessionPermissionRequestService.handleClaudePreToolUse(resolvedPayload, provider);
         }
         if (hookEventName === "PermissionRequest") {
             logPermissionDebug("claude_hook_event.route", {
                 hookEventName,
                 route: "handleClaudePermissionRequest"
             });
-            return this.sessionPermissionRequestService.handleClaudePermissionRequest(payload);
+            return this.sessionPermissionRequestService.handleClaudePermissionRequest(resolvedPayload, provider);
         }
-        const providerSessionId = normalizeRequiredText(payload.session_id, "session_id");
-        const workspacePath = normalizeRequiredText(payload.cwd, "cwd");
+        const providerSessionId = normalizeRequiredText(resolvedPayload.session_id, "session_id");
+        const workspacePath = normalizeRequiredText(resolvedPayload.cwd, "cwd");
         const workspace = this.workspaceService.findWorkspaceByPath(workspacePath);
         if (!workspace) {
             logPermissionDebug("claude_hook_event.workspace_not_found", {
                 hookEventName,
-                sessionId: payload.session_id ?? null,
-                cwd: payload.cwd ?? null
+                sessionId: resolvedPayload.session_id ?? null,
+                cwd: resolvedPayload.cwd ?? null
             });
             return {
                 accepted: true,
@@ -414,13 +428,14 @@ export class SessionLiveRuntimeService {
             };
         }
         const binding = await this.resolveClaudeExternalBinding({
+            provider,
             providerSessionId,
             workspaceId: workspace.id,
             workspacePath: workspace.path,
-            transcriptPath: normalizeOptionalText(payload.transcript_path)
+            transcriptPath: normalizeOptionalText(resolvedPayload.transcript_path)
         });
         const timestamp = nowIso();
-        const runtimeUpdate = mapClaudeHookToRuntimeUpdate(hookEventName, payload, timestamp);
+        const runtimeUpdate = mapClaudeHookToRuntimeUpdate(hookEventName, resolvedPayload, timestamp);
         logPermissionDebug("claude_hook_event.runtime_update", {
             hookEventName,
             sessionId: binding.sessionId,
@@ -445,6 +460,7 @@ export class SessionLiveRuntimeService {
             };
         }
         await this.applyExternalRuntimeUpdate({
+            provider,
             sessionId: binding.sessionId,
             workspaceId: workspace.id,
             providerSessionId,
@@ -506,7 +522,7 @@ export class SessionLiveRuntimeService {
         if (externalRuntimeSnapshot) {
             return {
                 sessionId,
-                provider: "claude-code",
+                provider: externalRuntimeSnapshot.provider,
                 providerSessionId: externalRuntimeSnapshot.providerSessionId,
                 runningState: resolution.runningState,
                 hasActiveRun: externalHasActiveRun,
@@ -900,10 +916,10 @@ export class SessionLiveRuntimeService {
     }
     async resolveClaudeExternalBinding(input) {
         const rawStoreRef = input.transcriptPath ??
-            findClaudeSessionFile(this.config.claudeCodeHomeDir, input.providerSessionId) ??
-            buildClaudeRawStoreRef(this.config.claudeCodeHomeDir, input.workspacePath, input.providerSessionId);
-        let binding = this.sessionBindingRepository.findByProviderSession("claude-code", input.providerSessionId) ??
-            this.sessionBindingRepository.findByRawStoreRef("claude-code", rawStoreRef);
+            findClaudeCompatibleSessionFile(this.config, input.provider, input.workspacePath, input.providerSessionId) ??
+            buildClaudeCompatibleRawStoreRef(this.config, input.provider, input.workspacePath, input.providerSessionId);
+        let binding = this.sessionBindingRepository.findByProviderSession(input.provider, input.providerSessionId) ??
+            this.sessionBindingRepository.findByRawStoreRef(input.provider, rawStoreRef);
         if (!binding) {
             const userIds = this.authUserRepository.listIds();
             const bootstrapUserId = userIds[0] ?? null;
@@ -916,8 +932,8 @@ export class SessionLiveRuntimeService {
                 });
             }
             binding =
-                this.sessionBindingRepository.findByProviderSession("claude-code", input.providerSessionId) ??
-                    this.sessionBindingRepository.findByRawStoreRef("claude-code", rawStoreRef);
+                this.sessionBindingRepository.findByProviderSession(input.provider, input.providerSessionId) ??
+                    this.sessionBindingRepository.findByRawStoreRef(input.provider, rawStoreRef);
         }
         if (binding) {
             return {
@@ -928,19 +944,19 @@ export class SessionLiveRuntimeService {
         const sessionId = createId();
         const timestamp = nowIso();
         this.sessionHistoryService.persistSessionBinding(sessionId, input.workspaceId, {
-            provider: "claude-code",
+            provider: input.provider,
             providerSessionId: input.providerSessionId,
             rawStoreRef
         });
         this.sessionIndexRepository.upsert({
             sessionId,
             workspaceId: input.workspaceId,
-            provider: "claude-code",
+            provider: input.provider,
             parentSessionId: null,
             sessionKind: "default",
             isSubagent: false,
             subagentLabel: null,
-            title: `Claude 会话 ${input.providerSessionId.slice(0, 8)}`,
+            title: buildClaudeCompatibleSessionTitle(input.provider, input.providerSessionId),
             messageCount: 0,
             isArchived: false,
             lastMessageAt: null,
@@ -1021,7 +1037,7 @@ export class SessionLiveRuntimeService {
         if (input.runningState === "running") {
             this.externalRuntimeSnapshots.set(input.sessionId, {
                 sessionId: input.sessionId,
-                provider: "claude-code",
+                provider: input.provider,
                 providerSessionId: input.providerSessionId,
                 rawStoreRef: input.rawStoreRef,
                 runningState: input.runningState,
@@ -1064,7 +1080,7 @@ export class SessionLiveRuntimeService {
         this.runtimeMessageSeenSessions.delete(request.sessionId);
         this.runtimeHistoryFallbackSentSessions.delete(request.sessionId);
         this.clearExternalRuntimeInterruptSuppression(request.sessionId);
-        if (request.provider === "claude-code") {
+        if (isClaudeCompatibleProvider(request.provider)) {
             this.clearExternalRuntimeSnapshot(request.sessionId);
         }
         const handle = await this.launchRuntimeRun(request, mode, providerBinding);
@@ -1105,18 +1121,18 @@ export class SessionLiveRuntimeService {
             const activeRun = this.getLiveRuntimeSnapshot(runtimeSessionId);
             const externalRuntimeSnapshot = this.getFreshExternalRuntimeSnapshot(runtimeSessionId);
             const hasActiveRun = Boolean(activeRun && isActiveRuntimeState(activeRun.runningState));
-            if (hasActiveRun && activeRun?.provider === "claude-code") {
+            if (hasActiveRun && isClaudeCompatibleProvider(activeRun?.provider)) {
                 this.clearExternalRuntimeSnapshot(runtimeSessionId);
             }
             if (hasActiveRun
                 || (!activeRun &&
-                    session.provider === "claude-code" &&
+                    isClaudeCompatibleProvider(session.provider) &&
                     externalRuntimeSnapshot &&
                     isActiveRuntimeState(externalRuntimeSnapshot.runningState))) {
                 this.assertProviderBindingStableDuringActiveRun(existingBinding, resolvedProviderBinding);
             }
             if (!activeRun &&
-                session.provider === "claude-code" &&
+                isClaudeCompatibleProvider(session.provider) &&
                 externalRuntimeSnapshot &&
                 isActiveRuntimeState(externalRuntimeSnapshot.runningState)) {
                 throw new AppError({
@@ -1142,8 +1158,9 @@ export class SessionLiveRuntimeService {
             const resolvedAttachments = persistedAttachments
                 ?? 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);
-            this.ensureCapability(capabilities.canSendMessage, "sessionId", "provider 不支持实时对话");
+            this.ensureCapability(capabilities, "sessionId", "canSendMessage", "provider 不支持实时对话");
             const runtimeRequest = {
                 sessionId: input.sessionId,
                 workspaceId: session.workspaceId,
@@ -1160,7 +1177,7 @@ export class SessionLiveRuntimeService {
                     model: input.runtimeOptions?.model ?? null,
                     reasoningLevel: input.runtimeOptions?.reasoningLevel ?? null,
                     permissionMode: input.runtimeOptions?.permissionMode ?? null,
-                    providerPrompt,
+                    providerPrompt: resolvedProviderPrompt,
                     providerInstructionFilePath,
                     attachments: resolvedAttachments.runtimeAttachments
                 }
@@ -1219,7 +1236,7 @@ export class SessionLiveRuntimeService {
             this.logSendDebugStep(debugTrace, "accepted_user_lookup", acceptedLookupStartedAtMs, {
                 matched: Boolean(acceptedMessage)
             });
-            const acceptedAt = acceptedMessage?.timestamp ?? nowIso();
+            const acceptedAt = acceptedMessage?.timestamp ?? requestStartedAt;
             this.sessionHistoryService.resolveMessageOriginByClientRequestId(input.sessionId, input.clientRequestId, acceptedMessage?.messageId ?? null, acceptedAt);
             const boundAttachments = this.sessionMessageAttachmentService.bindClientRequestToMessage(input.sessionId, input.clientRequestId, acceptedMessage?.messageId ?? null);
             this.refreshSyntheticSessionTitle(session, input.content, input.userId);
@@ -1251,6 +1268,16 @@ export class SessionLiveRuntimeService {
             throw error;
         }
     }
+    composeProviderPrompt(_provider, basePrompt, _runtimeEnv) {
+        const normalizedBasePrompt = basePrompt?.trim() ?? "";
+        if (!normalizedBasePrompt) {
+            return null;
+        }
+        // OpenCLI 约束必须走 runtime skill / runtime 环境本身，不能再内联到用户消息里。
+        // Codex / Claude 会优先把 providerPrompt 当成真实用户输入发送；一旦这里拼上
+        // OpenCLI 提示，就会覆盖或污染用户原始内容，导致模型只对提示词本身作答。
+        return normalizedBasePrompt;
+    }
     async dispatchNextQueuedMessage(sessionId) {
         if (this.queueDispatchSessions.has(sessionId)) {
             return;
@@ -1328,7 +1355,7 @@ export class SessionLiveRuntimeService {
         if (externalRuntimeSnapshot && isActiveRuntimeState(externalRuntimeSnapshot.runningState)) {
             return true;
         }
-        if (session.provider === "claude-code" && isPendingSessionRunningState(session.runningState)) {
+        if (isClaudeCompatibleProvider(session.provider) && isPendingSessionRunningState(session.runningState)) {
             return true;
         }
         return false;
@@ -1356,7 +1383,7 @@ export class SessionLiveRuntimeService {
     }
     async resolveQueueDispatchSession(sessionId, userId) {
         const session = this.sessionHistoryService.getSession(sessionId, userId);
-        if (session.provider !== "claude-code"
+        if (!isClaudeCompatibleProvider(session.provider)
             || !isPendingSessionRunningState(session.runningState)) {
             return session;
         }
@@ -2032,7 +2059,7 @@ export class SessionLiveRuntimeService {
         };
     }
     async maybeEmitRuntimeHistoryFallback(sessionId, event) {
-        if (event.provider !== "claude-code") {
+        if (!isClaudeCompatibleProvider(event.provider)) {
             return;
         }
         if (event.status === "starting") {
@@ -2053,16 +2080,11 @@ export class SessionLiveRuntimeService {
         this.runtimeHistoryFallbackSentSessions.add(sessionId);
         await this.emitExternalRuntimeEnvelope(envelope);
     }
-    ensureCapability(enabled, field, detail) {
-        if (enabled) {
+    ensureCapability(capabilities, field, capability, detail) {
+        if (capabilities[capability]) {
             return;
         }
-        throw new AppError({
-            statusCode: 400,
-            errorCode: "CAPABILITY_NOT_SUPPORTED",
-            detail,
-            field
-        });
+        throw createProviderCapabilityBlockedError(capabilities, field, detail);
     }
     upsertSnapshot(sessionId, input) {
         this.sessionStatusSnapshotRepository.upsert({
@@ -2074,7 +2096,7 @@ export class SessionLiveRuntimeService {
     shouldIgnoreClaudeExternalRuntimeUpdate(sessionId) {
         const runtimeSnapshot = this.getLiveRuntimeSnapshot(sessionId);
         return Boolean(runtimeSnapshot &&
-            runtimeSnapshot.provider === "claude-code" &&
+            isClaudeCompatibleProvider(runtimeSnapshot.provider) &&
             isActiveRuntimeState(runtimeSnapshot.runningState));
     }
     clearExternalRuntimeSnapshot(sessionId) {
@@ -2116,7 +2138,7 @@ export class SessionLiveRuntimeService {
     async resolveActiveClaudePermissionSession(input) {
         const activeSnapshots = this.providerRuntimeService
             .listSnapshots()
-            .filter((snapshot) => snapshot.provider === "claude-code" &&
+            .filter((snapshot) => snapshot.provider === input.provider &&
             snapshot.workspaceId === input.workspaceId &&
             isActiveRuntimeState(snapshot.runningState));
         if (activeSnapshots.length !== 1) {
@@ -2128,9 +2150,9 @@ export class SessionLiveRuntimeService {
         }
         const rawStoreRef = input.transcriptPath ??
             activeSnapshot.rawStoreRef ??
-            buildClaudeRawStoreRef(this.config.claudeCodeHomeDir, input.workspacePath, input.providerSessionId);
+            buildClaudeCompatibleRawStoreRef(this.config, input.provider, input.workspacePath, input.providerSessionId);
         this.sessionHistoryService.persistSessionBinding(activeSnapshot.sessionId, input.workspaceId, {
-            provider: "claude-code",
+            provider: input.provider,
             providerSessionId: input.providerSessionId,
             rawStoreRef
         });
@@ -2445,7 +2467,8 @@ function waitForAcceptedUserLookupWindow() {
     });
 }
 function createProviderRuntimeAdapters(config, options = {}) {
-    const claudeHookBridgeConfig = buildClaudeHookBridgeConfig(config);
+    const claudeHookBridgeConfig = buildClaudeHookBridgeConfig(config, "claude-code");
+    const legnaHookBridgeConfig = buildClaudeHookBridgeConfig(config, "legna-code");
     const claudeAdapter = process.env.VITEST
         ? new ClaudeRuntimeAdapter({
             homeDir: config.claudeCodeHomeDir,
@@ -2473,7 +2496,12 @@ function createProviderRuntimeAdapters(config, options = {}) {
             new LegnaRuntimeAdapter({
                 homeDir: config.legnaCodeHomeDir,
                 commandPath: config.legnaCodeCliPath,
-                legacyClaudeHomeDir: config.claudeCodeHomeDir
+                legacyClaudeHomeDir: config.claudeCodeHomeDir,
+                hookBridge: {
+                    url: legnaHookBridgeConfig.bridgeUrl,
+                    token: config.claudeHookBridgeToken,
+                    scriptPath: legnaHookBridgeConfig.scriptPath
+                }
             }),
             new CodexRuntimeAdapter({
                 homeDir: config.codexHomeDir,
@@ -2506,7 +2534,9 @@ function createProviderRuntimeAdapters(config, options = {}) {
             }),
             new OpenCodeRuntimeAdapter({
                 baseUrl: config.opencodeBaseUrl,
-                baseUrlResolver: config.opencodeBaseUrlResolver?.resolve.bind(config.opencodeBaseUrlResolver)
+                baseUrlResolver: config.opencodeBaseUrlResolver?.resolve.bind(config.opencodeBaseUrlResolver),
+                acquireManagedServerLease: config.opencodeBaseUrlResolver?.acquireManagedServerLease.bind(config.opencodeBaseUrlResolver),
+                releaseManagedServerLease: config.opencodeBaseUrlResolver?.releaseManagedServerLease.bind(config.opencodeBaseUrlResolver)
             })
         ],
         disposables
@@ -2518,11 +2548,14 @@ function resolveRuntimeInstructionFilePath(provider, workspacePath, explicitFile
         const resolvedExplicit = path.resolve(normalizedExplicit);
         return existsSync(resolvedExplicit) ? resolvedExplicit : null;
     }
-    const defaultInstructionPath = provider === "claude-code"
-        ? path.join(workspacePath, "CLAUDE.md")
-        : provider === "legna-code"
-            ? path.join(workspacePath, "LEGNA.md")
-            : null;
+    const defaultInstructionFileNames = {
+        "claude-code": "CLAUDE.md",
+        "legna-code": "LEGNA.md"
+    };
+    const defaultInstructionFileName = defaultInstructionFileNames[provider];
+    const defaultInstructionPath = defaultInstructionFileName
+        ? path.join(workspacePath, defaultInstructionFileName)
+        : null;
     if (!defaultInstructionPath) {
         return null;
     }
@@ -2530,12 +2563,12 @@ function resolveRuntimeInstructionFilePath(provider, workspacePath, explicitFile
         ? path.resolve(defaultInstructionPath)
         : null;
 }
-function buildClaudeHookBridgeConfig(config) {
-    const bridgeUrl = `http://127.0.0.1:${config.port}/api/providers/claude-code/hook-bridge/events`;
+function buildClaudeHookBridgeConfig(config, provider) {
+    const bridgeUrl = buildClaudeCompatibleHookBridgeUrl(config, provider);
     const scriptPath = resolveClaudeHookBridgeScriptPath();
     const command = `node "${scriptPath}" --url "${bridgeUrl}" --token "${config.claudeHookBridgeToken}"`;
     return {
-        provider: "claude-code",
+        provider,
         bridgeUrl,
         token: config.claudeHookBridgeToken,
         scriptPath,
@@ -2565,28 +2598,6 @@ function resolveClaudeHookBridgeScriptPath() {
     }
     return candidates[0];
 }
-function buildClaudeRawStoreRef(homeDir, workspacePath, sessionId) {
-    return path.join(homeDir, "projects", workspaceSlug(workspacePath), `${sessionId}.jsonl`);
-}
-function findClaudeSessionFile(homeDir, sessionId) {
-    const projectsDir = path.join(homeDir, "projects");
-    if (!existsSync(projectsDir)) {
-        return null;
-    }
-    const candidates = readdirSync(projectsDir, { withFileTypes: true })
-        .filter((entry) => entry.isDirectory())
-        .map((entry) => path.join(projectsDir, entry.name, `${sessionId}.jsonl`))
-        .filter((candidate) => existsSync(candidate));
-    return candidates[0] ?? null;
-}
-function workspaceSlug(workspacePath) {
-    const trimmed = workspacePath.replace(/[\\/]+$/, "");
-    const normalizedDriveLetter = trimmed.replace(/^[A-Z](?=:)/, (value) => value.toLowerCase());
-    return normalizedDriveLetter
-        .replaceAll(":", "-")
-        .replaceAll("\\", "-")
-        .replaceAll("/", "-");
-}
 function normalizeOptionalBindingValue(value) {
     const normalized = value?.trim();
     return normalized && normalized.length > 0 ? normalized : null;