@jingyi0605/codingns 0.3.6 → 0.5.0

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

@@ -0,0 +1,25 @@
+import type { ProviderSubscription } from "@codingns/session-sync-core";
+import type { SessionHistoryEnvelope } from "./session-history-service.js";
+import type { SessionLiveRuntimeService, SessionRuntimeEnvelope } from "./session-live-runtime-service.js";
+export type SessionRuntimeRouterServiceContract = Pick<SessionLiveRuntimeService, "startLiveSession" | "sendLiveMessage" | "enqueueLiveMessage" | "getSessionRuntime" | "interruptSession" | "subscribeRuntime" | "listPermissionRequests" | "replyPermissionRequest" | "listQueuedMessages" | "deleteQueuedMessage" | "steerQueuedMessage" | "getClaudeHookBridgeConfig" | "ingestClaudeHookEvent" | "resolveLiveActivityObservation">;
+export declare class SessionLiveRuntimeRouterService implements SessionRuntimeRouterServiceContract {
+    private readonly primaryService;
+    private readonly services;
+    constructor(primaryService: SessionRuntimeRouterServiceContract, delegatedServices: readonly SessionRuntimeRouterServiceContract[]);
+    readonly startLiveSession: SessionLiveRuntimeService["startLiveSession"];
+    readonly sendLiveMessage: SessionLiveRuntimeService["sendLiveMessage"];
+    readonly enqueueLiveMessage: SessionLiveRuntimeService["enqueueLiveMessage"];
+    readonly getSessionRuntime: SessionLiveRuntimeService["getSessionRuntime"];
+    readonly interruptSession: SessionLiveRuntimeService["interruptSession"];
+    readonly subscribeRuntime: (sessionId: string, onEnvelope: (envelope: SessionRuntimeEnvelope | SessionHistoryEnvelope) => Promise<void> | void) => ProviderSubscription;
+    readonly listPermissionRequests: SessionLiveRuntimeService["listPermissionRequests"];
+    readonly replyPermissionRequest: SessionLiveRuntimeService["replyPermissionRequest"];
+    readonly listQueuedMessages: SessionLiveRuntimeService["listQueuedMessages"];
+    readonly deleteQueuedMessage: SessionLiveRuntimeService["deleteQueuedMessage"];
+    readonly steerQueuedMessage: SessionLiveRuntimeService["steerQueuedMessage"];
+    readonly getClaudeHookBridgeConfig: SessionLiveRuntimeService["getClaudeHookBridgeConfig"];
+    readonly ingestClaudeHookEvent: SessionLiveRuntimeService["ingestClaudeHookEvent"];
+    readonly resolveLiveActivityObservation: SessionLiveRuntimeService["resolveLiveActivityObservation"];
+    private resolveServiceForSession;
+    private findOwningService;
+}

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

@@ -0,0 +1,42 @@
+export class SessionLiveRuntimeRouterService {
+    primaryService;
+    services;
+    constructor(primaryService, delegatedServices) {
+        this.primaryService = primaryService;
+        this.services = [primaryService, ...delegatedServices];
+    }
+    startLiveSession = async (input) => this.primaryService.startLiveSession(input);
+    sendLiveMessage = async (input) => this.resolveServiceForSession(input.sessionId).sendLiveMessage(input);
+    enqueueLiveMessage = async (input) => this.resolveServiceForSession(input.sessionId).enqueueLiveMessage(input);
+    getSessionRuntime = async (sessionId, userId) => this.resolveServiceForSession(sessionId).getSessionRuntime(sessionId, userId);
+    interruptSession = async (sessionId, userId) => this.resolveServiceForSession(sessionId).interruptSession(sessionId, userId);
+    subscribeRuntime = (sessionId, onEnvelope) => this.resolveServiceForSession(sessionId).subscribeRuntime(sessionId, onEnvelope);
+    listPermissionRequests = async (sessionId, userId) => this.resolveServiceForSession(sessionId).listPermissionRequests(sessionId, userId);
+    replyPermissionRequest = async (sessionId, userId, requestId, input) => this.resolveServiceForSession(sessionId).replyPermissionRequest(sessionId, userId, requestId, input);
+    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) => {
+        for (const service of this.services) {
+            const result = await service.ingestClaudeHookEvent(payload);
+            if (!result.ignored || result.sessionId) {
+                return result;
+            }
+        }
+        return this.primaryService.ingestClaudeHookEvent(payload);
+    };
+    resolveLiveActivityObservation = (sessionId) => this.findOwningService(sessionId)?.resolveLiveActivityObservation(sessionId) ?? null;
+    resolveServiceForSession(sessionId) {
+        return this.findOwningService(sessionId) ?? this.primaryService;
+    }
+    findOwningService(sessionId) {
+        for (const service of this.services) {
+            if (service.resolveLiveActivityObservation(sessionId)) {
+                return service;
+            }
+        }
+        return null;
+    }
+}
+//# sourceMappingURL=session-live-runtime-router-service.js.map

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

@@ -0,0 +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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"}

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

@@ -18,6 +18,7 @@ interface RuntimeSendOptions {
     model?: string | null;
     reasoningLevel?: string | null;
     permissionMode?: string | null;
+    providerInstructionFilePath?: string | null;
     attachments?: SessionAttachmentInput[];
 }
 interface StartLiveSessionInput {
@@ -188,6 +189,7 @@ export declare class SessionLiveRuntimeService {
     private readonly externalRuntimeSnapshots;
     private readonly runtimeListeners;
     private readonly terminalStateListeners;
+    private readonly deadRuntimeReconciliationSessions;
     private readonly runtimeMessageSeenSessions;
     private readonly runtimeHistoryFallbackSentSessions;
     private readonly queueDispatchSessions;
@@ -217,6 +219,10 @@ export declare class SessionLiveRuntimeService {
     dispose(): Promise<void>;
     private subscribeExternalRuntime;
     private emitExternalRuntimeEnvelope;
+    private getLiveRuntimeSnapshot;
+    private demoteDeadRuntimeSnapshot;
+    private scheduleDeadRuntimeReconciliation;
+    private reconcileDeadRuntimeSession;
     private buildSessionActivityEnvelope;
     private resolveRuntimeSessionId;
     private isLinkedGeminiRuntimeSession;

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

@@ -33,6 +33,7 @@ export class SessionLiveRuntimeService {
     externalRuntimeSnapshots = new Map();
     runtimeListeners = new Map();
     terminalStateListeners = new Set();
+    deadRuntimeReconciliationSessions = new Set();
     runtimeMessageSeenSessions = new Set();
     runtimeHistoryFallbackSentSessions = new Set();
     queueDispatchSessions = new Set();
@@ -78,6 +79,7 @@ export class SessionLiveRuntimeService {
             this.ensurePendingSessionBinding(sessionId, workspace.id, input.provider);
             const persistedAttachments = this.persistMessageAttachments(sessionId, input.clientRequestId, input.runtimeOptions?.attachments ?? []);
             const providerPrompt = this.sessionMessageAttachmentService.buildProviderPrompt(input.provider, input.content, persistedAttachments.runtimeAttachments);
+            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 不支持实时对话");
             const launchRuntimeStartedAtMs = performance.now();
@@ -96,6 +98,7 @@ export class SessionLiveRuntimeService {
                     reasoningLevel: input.runtimeOptions?.reasoningLevel ?? null,
                     permissionMode: input.runtimeOptions?.permissionMode ?? null,
                     providerPrompt,
+                    providerInstructionFilePath,
                     attachments: persistedAttachments.runtimeAttachments
                 }
             }, "start");
@@ -238,16 +241,6 @@ export class SessionLiveRuntimeService {
                 field: "queueItemId"
             });
         }
-        const runtimeSessionId = this.resolveRuntimeSessionId(sessionId);
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(runtimeSessionId);
-        if (!runtimeSnapshot || !isActiveRuntimeState(runtimeSnapshot.runningState)) {
-            throw new AppError({
-                statusCode: 409,
-                errorCode: "SESSION_NOT_RUNNING",
-                detail: "当前会话不在运行中，无法立刻引导这条消息",
-                field: "queueItemId"
-            });
-        }
         const capabilities = await this.sessionHistoryService.getSessionCapabilities(sessionId);
         if (capabilities.inRunInputMode === "none") {
             throw new AppError({
@@ -275,6 +268,8 @@ export class SessionLiveRuntimeService {
             runtimeAttachments: restoredAttachments
         };
         try {
+            // 队列里的“引导”语义是立刻发这条，而不是死盯着“必须命中当前 run”。
+            // 有 active run 时走原生 steer；空闲时就直接起新一轮，把指定队列项先发出去。
             const result = await this.sendLiveMessageDirect({
                 sessionId,
                 userId,
@@ -439,7 +434,7 @@ export class SessionLiveRuntimeService {
     }
     async getSessionRuntime(sessionId, userId) {
         const runtimeSessionId = this.resolveRuntimeSessionId(sessionId);
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(runtimeSessionId);
         const externalRuntimeSnapshot = this.externalRuntimeSnapshots.get(runtimeSessionId) ?? null;
         const runtimeHasActiveRun = runtimeSnapshot ? isActiveRuntimeState(runtimeSnapshot.runningState) : false;
         const externalHasActiveRun = externalRuntimeSnapshot
@@ -529,7 +524,7 @@ export class SessionLiveRuntimeService {
     }
     resolveLiveActivityObservation(sessionId) {
         const runtimeSessionId = this.resolveRuntimeSessionId(sessionId);
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(runtimeSessionId);
         if (runtimeSnapshot) {
             return createRuntimeActivityObservation(runtimeSessionId, runtimeSnapshot);
         }
@@ -542,8 +537,17 @@ export class SessionLiveRuntimeService {
     async interruptSession(sessionId, userId) {
         this.sessionHistoryService.getSession(sessionId, userId);
         const runtimeSessionId = this.resolveRuntimeSessionId(sessionId);
-        const runtime = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+        const runtime = this.getLiveRuntimeSnapshot(runtimeSessionId);
+        const externalRuntimeSnapshot = this.externalRuntimeSnapshots.get(runtimeSessionId) ?? null;
         if (!runtime || (runtime.runningState !== "running" && runtime.runningState !== "starting")) {
+            if (externalRuntimeSnapshot && isActiveRuntimeState(externalRuntimeSnapshot.runningState)) {
+                throw new AppError({
+                    statusCode: 409,
+                    errorCode: "CAPABILITY_NOT_SUPPORTED",
+                    detail: "当前 Claude 外部运行仍在进行，但现有链路不支持中断",
+                    field: "sessionId"
+                });
+            }
             throw new AppError({
                 statusCode: 409,
                 errorCode: "SESSION_NOT_RUNNING",
@@ -584,7 +588,7 @@ export class SessionLiveRuntimeService {
     }
     subscribeRuntime(sessionId, onEnvelope) {
         const runtimeSessionId = this.resolveRuntimeSessionId(sessionId);
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(runtimeSessionId);
         const externalRuntimeSnapshot = this.externalRuntimeSnapshots.get(runtimeSessionId) ?? null;
         const initialActivityEnvelope = this.buildSessionActivityEnvelope(sessionId, runtimeSessionId);
         if (runtimeSnapshot) {
@@ -685,8 +689,74 @@ export class SessionLiveRuntimeService {
             await listener(envelope);
         }));
     }
+    getLiveRuntimeSnapshot(sessionId) {
+        const snapshot = this.providerRuntimeService.getSnapshot(sessionId);
+        if (!snapshot) {
+            return null;
+        }
+        if (!isActiveRuntimeState(snapshot.runningState)) {
+            return snapshot;
+        }
+        if (this.providerRuntimeService.isRunHealthy(sessionId) === false) {
+            this.demoteDeadRuntimeSnapshot(snapshot);
+            this.scheduleDeadRuntimeReconciliation(snapshot);
+            return null;
+        }
+        return snapshot;
+    }
+    demoteDeadRuntimeSnapshot(snapshot) {
+        const updatedAt = nowIso();
+        for (const userId of this.authUserRepository.listIds()) {
+            const current = this.sessionStateRepository.findBySessionAndUser(snapshot.sessionId, userId);
+            if (!current || !isPendingSessionRunningState(current.runningState) || current.activitySource !== "runtime") {
+                continue;
+            }
+            this.sessionStateRepository.upsert({
+                ...current,
+                runningState: "interrupted",
+                activitySource: "runtime",
+                completedAt: updatedAt,
+                updatedAt
+            });
+        }
+        this.sessionActivityAuthorityService.observe({
+            sessionId: snapshot.sessionId,
+            runId: buildRuntimeRunId(snapshot.sessionId, snapshot.startedAt),
+            runningState: "interrupted",
+            source: "authoritative_runtime",
+            confidence: "strong",
+            detail: "Host 检测到这轮运行已经异常结束，已自动回收残留运行态",
+            interruptSource: "runtime",
+            errorCode: null,
+            observedAt: updatedAt
+        });
+    }
+    scheduleDeadRuntimeReconciliation(snapshot) {
+        if (this.deadRuntimeReconciliationSessions.has(snapshot.sessionId)) {
+            return;
+        }
+        this.deadRuntimeReconciliationSessions.add(snapshot.sessionId);
+        void this.reconcileDeadRuntimeSession(snapshot).finally(() => {
+            this.deadRuntimeReconciliationSessions.delete(snapshot.sessionId);
+        });
+    }
+    async reconcileDeadRuntimeSession(snapshot) {
+        await this.providerRuntimeService.abandonRun(snapshot.sessionId).catch(() => {
+            return;
+        });
+        for (const userId of this.authUserRepository.listIds()) {
+            await this.sessionHistoryService.refreshRuntimeFallbackSession(snapshot.sessionId, userId).catch(() => {
+                return;
+            });
+        }
+        const envelope = this.buildSessionActivityEnvelope(snapshot.sessionId, snapshot.sessionId);
+        if (envelope) {
+            await this.emitExternalRuntimeEnvelope(envelope);
+        }
+        void this.dispatchNextQueuedMessage(snapshot.sessionId);
+    }
     buildSessionActivityEnvelope(sessionId, runtimeSessionId = sessionId) {
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(runtimeSessionId);
         if (runtimeSnapshot) {
             const resolution = this.sessionActivityAuthorityService.observe(createRuntimeActivityObservation(runtimeSessionId, runtimeSnapshot));
             return {
@@ -968,6 +1038,7 @@ 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 providerInstructionFilePath = resolveRuntimeInstructionFilePath(session.provider, workspace.path, input.runtimeOptions?.providerInstructionFilePath ?? null);
             this.ensureCapability(capabilities.canSendMessage, "sessionId", "provider 不支持实时对话");
             const runtimeRequest = {
                 sessionId: input.sessionId,
@@ -984,11 +1055,12 @@ export class SessionLiveRuntimeService {
                     reasoningLevel: input.runtimeOptions?.reasoningLevel ?? null,
                     permissionMode: input.runtimeOptions?.permissionMode ?? null,
                     providerPrompt,
+                    providerInstructionFilePath,
                     attachments: resolvedAttachments.runtimeAttachments
                 }
             };
             const runtimeSessionId = this.resolveRuntimeSessionId(input.sessionId);
-            const activeRun = this.providerRuntimeService.getSnapshot(runtimeSessionId);
+            const activeRun = this.getLiveRuntimeSnapshot(runtimeSessionId);
             const externalRuntimeSnapshot = this.externalRuntimeSnapshots.get(runtimeSessionId);
             if (activeRun &&
                 activeRun.provider === "claude-code" &&
@@ -1008,14 +1080,29 @@ export class SessionLiveRuntimeService {
             }
             if (activeRun && isActiveRuntimeState(activeRun.runningState)) {
                 const submitStartedAtMs = performance.now();
-                await this.providerRuntimeService.submitToActiveRun(runtimeSessionId, runtimeRequest.options)
-                    .catch((error) => {
-                    throw mapSessionProviderError(error);
-                });
-                this.logSendDebugStep(debugTrace, "submit_to_active_run", submitStartedAtMs, {
-                    runtimeMode,
-                    activeRunState: activeRun.runningState
-                });
+                try {
+                    await this.providerRuntimeService.submitToActiveRun(runtimeSessionId, runtimeRequest.options);
+                    this.logSendDebugStep(debugTrace, "submit_to_active_run", submitStartedAtMs, {
+                        runtimeMode,
+                        activeRunState: activeRun.runningState
+                    });
+                }
+                catch (error) {
+                    const mapped = mapSessionProviderError(error);
+                    // 运行时句柄还没来得及收尾时，steer 可能会撞上 provider 已终态。
+                    // 这里直接失败只会把一条正常消息变成偶发 409，属于纯粹的坏味道。
+                    if (mapped.errorCode === "SESSION_NOT_RUNNING") {
+                        await this.providerRuntimeService.abandonRun(runtimeSessionId);
+                        const restartRuntimeStartedAtMs = performance.now();
+                        await this.startRuntimeRun(runtimeRequest, input.userId, runtimeMode);
+                        this.logSendDebugStep(debugTrace, "restart_runtime_after_stale_active_run", restartRuntimeStartedAtMs, {
+                            runtimeMode
+                        });
+                    }
+                    else {
+                        throw mapped;
+                    }
+                }
             }
             else {
                 const startRuntimeStartedAtMs = performance.now();
@@ -1031,6 +1118,7 @@ export class SessionLiveRuntimeService {
                 matched: Boolean(acceptedMessage)
             });
             const acceptedAt = acceptedMessage?.timestamp ?? nowIso();
+            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);
             this.markSendDebugResponseReady(debugTrace, {
@@ -1067,7 +1155,7 @@ export class SessionLiveRuntimeService {
         }
         this.queueDispatchSessions.add(sessionId);
         try {
-            const runtimeSnapshot = this.providerRuntimeService.getSnapshot(sessionId);
+            const runtimeSnapshot = this.getLiveRuntimeSnapshot(sessionId);
             const externalRuntimeSnapshot = this.externalRuntimeSnapshots.get(sessionId);
             if ((runtimeSnapshot && isActiveRuntimeState(runtimeSnapshot.runningState))
                 || (externalRuntimeSnapshot && isActiveRuntimeState(externalRuntimeSnapshot.runningState))) {
@@ -1130,7 +1218,7 @@ export class SessionLiveRuntimeService {
         void this.dispatchNextQueuedMessage(session.sessionId);
     }
     shouldBlockQueueDispatch(session) {
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(session.sessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(session.sessionId);
         if (runtimeSnapshot && isActiveRuntimeState(runtimeSnapshot.runningState)) {
             return true;
         }
@@ -1170,7 +1258,7 @@ export class SessionLiveRuntimeService {
             || !isPendingSessionRunningState(session.runningState)) {
             return session;
         }
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(sessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(sessionId);
         const externalRuntimeSnapshot = this.externalRuntimeSnapshots.get(sessionId);
         if ((runtimeSnapshot && isActiveRuntimeState(runtimeSnapshot.runningState))
             || (externalRuntimeSnapshot && isActiveRuntimeState(externalRuntimeSnapshot.runningState))) {
@@ -1668,7 +1756,7 @@ export class SessionLiveRuntimeService {
         });
     }
     shouldIgnoreClaudeExternalRuntimeUpdate(sessionId) {
-        const runtimeSnapshot = this.providerRuntimeService.getSnapshot(sessionId);
+        const runtimeSnapshot = this.getLiveRuntimeSnapshot(sessionId);
         return Boolean(runtimeSnapshot &&
             runtimeSnapshot.provider === "claude-code" &&
             isActiveRuntimeState(runtimeSnapshot.runningState));
@@ -2056,6 +2144,20 @@ function createProviderRuntimeAdapters(config, options = {}) {
         disposables
     };
 }
+function resolveRuntimeInstructionFilePath(provider, workspacePath, explicitFilePath) {
+    const normalizedExplicit = explicitFilePath?.trim();
+    if (normalizedExplicit) {
+        const resolvedExplicit = path.resolve(normalizedExplicit);
+        return existsSync(resolvedExplicit) ? resolvedExplicit : null;
+    }
+    if (provider !== "claude-code") {
+        return null;
+    }
+    const defaultClaudeInstructionPath = path.join(workspacePath, "CLAUDE.md");
+    return existsSync(defaultClaudeInstructionPath)
+        ? path.resolve(defaultClaudeInstructionPath)
+        : null;
+}
 function buildClaudeHookBridgeConfig(config) {
     const bridgeUrl = `http://127.0.0.1:${config.port}/api/providers/claude-code/hook-bridge/events`;
     const scriptPath = resolveClaudeHookBridgeScriptPath();