@jingyi0605/codingns 0.9.9 → 1.0.0-beta.2

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

@@ -170,6 +170,13 @@ interface ClaudeHookEventPayload {
     session_id?: string;
     transcript_path?: string;
     cwd?: string;
+    path?: string;
+    file_path?: string;
+    worktree_path?: string;
+    config_path?: string;
+    rule_file?: string;
+    matcher?: string;
+    permission_mode?: string;
     reason?: string;
     stop_hook_active?: boolean;
     tool_name?: string;
@@ -177,6 +184,11 @@ interface ClaudeHookEventPayload {
     permission_suggestions?: unknown;
     title?: string;
     message?: string;
+    prompt?: string;
+    command_name?: string;
+    action?: string;
+    trigger?: string;
+    mcp_server_name?: string;
     notification_type?: string;
 }
 export declare class SessionLiveRuntimeService {
@@ -268,6 +280,7 @@ export declare class SessionLiveRuntimeService {
     private assertProviderBindingStableDuringActiveRun;
     private hasSessionProviderBindingChanged;
     private resolveCodexRuntimeRequestRawStoreRef;
+    private buildClaudeForkBootstrapDescriptor;
     private buildBindingSnapshot;
     private persistRuntimeEvent;
     private runRuntimeSqliteRead;

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

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, 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";
@@ -449,6 +449,13 @@ export class SessionLiveRuntimeService {
             });
             return this.sessionPermissionRequestService.handleClaudePermissionRequest(resolvedPayload, provider);
         }
+        if (hookEventName === "Elicitation") {
+            logPermissionDebug("claude_hook_event.route", {
+                hookEventName,
+                route: "handleClaudeElicitation"
+            });
+            return this.sessionPermissionRequestService.handleClaudeElicitation(resolvedPayload, provider);
+        }
         const providerSessionId = normalizeRequiredText(resolvedPayload.session_id, "session_id");
         const workspacePath = normalizeRequiredText(resolvedPayload.cwd, "cwd");
         const workspace = this.workspaceService.findWorkspaceByPath(workspacePath);
@@ -1193,9 +1200,12 @@ export class SessionLiveRuntimeService {
             const runtimeRawStoreRef = runtimeMode === "start"
                 ? syntheticForkRawStoreRef
                 : await this.resolveCodexRuntimeRequestRawStoreRef(session, providerBinding);
-            const nextUserSequence = runtimeMode === "start"
-                ? 1
-                : await this.resolveNextUserSequence(input.sessionId, session.messageCount);
+            const sequenceBase = resolveRuntimeSequenceBase(session, runtimeMode);
+            const nextUserSequence = sequenceBase !== null
+                ? sequenceBase
+                : (runtimeMode === "start"
+                    ? 1
+                    : await this.resolveNextUserSequence(input.sessionId, session.messageCount));
             const resolvedAttachments = persistedAttachments
                 ?? this.persistMessageAttachments(input.sessionId, input.clientRequestId, input.runtimeOptions?.attachments ?? []);
             const providerPrompt = this.sessionMessageAttachmentService.buildProviderPrompt(session.provider, input.content, resolvedAttachments.runtimeAttachments);
@@ -1219,7 +1229,17 @@ export class SessionLiveRuntimeService {
                 providerLaunchRuntimeHomeDir: providerLaunchContext.runtimeHomeDir,
                 providerBindingRuntimeHomeDir: providerBinding.runtimeHomeDir
             });
-            const providerInstructionFilePath = resolveRuntimeInstructionFilePath(session.provider, workspace.path, input.runtimeOptions?.providerInstructionFilePath
+            const claudeForkBootstrap = await this.buildClaudeForkBootstrapDescriptor({
+                session,
+                runtimeMode,
+                baseInstructionFilePath: input.runtimeOptions?.providerInstructionFilePath
+                    ?? workspaceRuntimeContext.instructionFilePath
+                    ?? providerLaunchContext.providerInstructionFilePath
+                    ?? null,
+                runtimeHomeDir: effectiveRuntimeHomeDir
+            });
+            const providerInstructionFilePath = resolveRuntimeInstructionFilePath(session.provider, workspace.path, claudeForkBootstrap?.instructionFilePath
+                ?? input.runtimeOptions?.providerInstructionFilePath
                 ?? workspaceRuntimeContext.instructionFilePath
                 ?? providerLaunchContext.providerInstructionFilePath
                 ?? null);
@@ -1707,6 +1727,37 @@ export class SessionLiveRuntimeService {
         writeFileSync(syntheticFilePath, `${serialized}\n`, "utf8");
         return syntheticFilePath;
     }
+    async buildClaudeForkBootstrapDescriptor(input) {
+        if (input.runtimeMode !== "start" || !shouldBootstrapClaudeForkSession(input.session)) {
+            return null;
+        }
+        const messages = await Promise.resolve(this.sessionHistoryService.readAllTextHistoryMessages(input.session.sessionId)).catch(() => []);
+        const textMessages = Array.isArray(messages)
+            ? messages.filter((message) => (message.role === "user" || message.role === "assistant")
+                && message.kind === "text"
+                && message.content.trim().length > 0)
+            : [];
+        if (textMessages.length === 0) {
+            return null;
+        }
+        const overlay = buildClaudeForkBootstrapInstructionOverlay({
+            sessionTitle: input.session.title,
+            messages: textMessages
+        });
+        if (!overlay) {
+            return null;
+        }
+        const baseInstructionContent = readInstructionFileSafe(input.baseInstructionFilePath);
+        const targetRoot = input.runtimeHomeDir?.trim()
+            || path.resolve(path.dirname(this.config.databasePath), "runtime", "claude-fork-bootstrap");
+        const targetDir = path.join(targetRoot, ".codingns-fork-bootstrap");
+        const instructionFilePath = path.join(targetDir, `${input.session.sessionId}.md`);
+        mkdirSync(targetDir, { recursive: true });
+        writeFileSync(instructionFilePath, composeForkBootstrapInstructionFile(baseInstructionContent, overlay), "utf8");
+        return {
+            instructionFilePath
+        };
+    }
     buildBindingSnapshot(sessionId, provider, providerSessionId, rawStoreRef) {
         const pendingValue = `pending://${provider}/${sessionId}`;
         return {
@@ -2445,8 +2496,30 @@ function normalizeClaudeHookEventName(value) {
 }
 function isSupportedClaudeHookEvent(value) {
     return (value === "PreToolUse" ||
+        value === "PostToolUse" ||
+        value === "PostToolUseFailure" ||
         value === "PermissionRequest" ||
+        value === "PermissionDenied" ||
+        value === "Elicitation" ||
+        value === "ElicitationResult" ||
+        value === "MessageDisplay" ||
         value === "Notification" ||
+        value === "PostToolBatch" ||
+        value === "TaskCreated" ||
+        value === "TaskCompleted" ||
+        value === "TeammateIdle" ||
+        value === "SubagentStart" ||
+        value === "SubagentStop" ||
+        value === "PreCompact" ||
+        value === "PostCompact" ||
+        value === "InstructionsLoaded" ||
+        value === "ConfigChange" ||
+        value === "CwdChanged" ||
+        value === "FileChanged" ||
+        value === "WorktreeCreate" ||
+        value === "WorktreeRemove" ||
+        value === "Setup" ||
+        value === "UserPromptExpansion" ||
         value === "UserPromptSubmit" ||
         value === "SessionStart" ||
         value === "Stop" ||
@@ -2484,6 +2557,160 @@ function mapClaudeHookToRuntimeUpdate(hookEventName, payload, timestamp) {
             timestamp
         };
     }
+    if (hookEventName === "Setup") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 正在执行初始化", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "UserPromptExpansion") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 正在展开用户指令", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "PostToolUse") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 已完成一次工具调用", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "PostToolUseFailure") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 的一次工具调用失败", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "PermissionDenied") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 的工具权限请求被拒绝", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "Notification") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 发来一条通知", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "MessageDisplay") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 正在展示回复内容", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "ElicitationResult") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 已收到补充信息结果", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "PostToolBatch") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 已完成一批工具调用", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "TaskCreated") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 新建了一个任务", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "TaskCompleted") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 完成了一个任务", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "SubagentStart") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 子任务已启动", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "SubagentStop") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 子任务已结束", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "TeammateIdle") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 队友任务即将空闲", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "PreCompact") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 正在压缩上下文", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "PostCompact") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 已完成上下文压缩", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "InstructionsLoaded") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 已加载指令文件", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "ConfigChange") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 检测到配置变化", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "CwdChanged") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 已切换工作目录", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "FileChanged") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 检测到文件变化", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "WorktreeCreate") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 正在创建工作树", payload),
+            timestamp
+        };
+    }
+    if (hookEventName === "WorktreeRemove") {
+        return {
+            runningState: "running",
+            detail: buildClaudeHookRunningDetail("Claude 正在移除工作树", payload),
+            timestamp
+        };
+    }
     if (hookEventName === "StopFailure") {
         return {
             runningState: "failed",
@@ -2514,6 +2741,32 @@ function mapClaudeHookToRuntimeUpdate(hookEventName, payload, timestamp) {
     }
     return null;
 }
+function buildClaudeHookRunningDetail(base, payload) {
+    const candidates = [
+        normalizeOptionalText(payload.title),
+        normalizeOptionalText(payload.message),
+        normalizeOptionalText(payload.reason),
+        normalizeOptionalText(payload.prompt),
+        normalizeOptionalText(payload.path),
+        normalizeOptionalText(payload.file_path),
+        normalizeOptionalText(payload.worktree_path),
+        normalizeOptionalText(payload.config_path),
+        normalizeOptionalText(payload.rule_file),
+        normalizeOptionalText(payload.cwd),
+        normalizeOptionalText(payload.command_name),
+        normalizeOptionalText(payload.notification_type),
+        normalizeOptionalText(payload.mcp_server_name),
+        normalizeOptionalText(payload.matcher),
+        normalizeOptionalText(payload.trigger),
+        normalizeOptionalText(payload.action)
+    ].filter((value) => Boolean(value));
+    const suffix = payload.tool_name?.trim()
+        ? `（${payload.tool_name.trim()}）`
+        : candidates[0]
+            ? `：${candidates[0]}`
+            : "";
+    return `${base}${suffix}`;
+}
 function resolveRuntimeSessionTitle(provider, existingTitle, content, parentTitle, forkMethod, forkSourceType) {
     const normalizedExistingTitle = existingTitle.trim();
     const normalizedParentTitle = parentTitle?.trim() ?? "";
@@ -2525,6 +2778,76 @@ function resolveRuntimeSessionTitle(provider, existingTitle, content, parentTitl
     }
     return buildSessionTitleFromContent(content, "继续对话");
 }
+function shouldBootstrapClaudeForkSession(session) {
+    if (session.provider !== "claude-code") {
+        return false;
+    }
+    if (session.forkMethod !== "native_message_fork"
+        && session.forkMethod !== "native_session_fork") {
+        return false;
+    }
+    const inheritedCount = typeof session.inheritedPrefixMessageCount === "number"
+        ? Math.max(0, session.inheritedPrefixMessageCount)
+        : null;
+    if (inheritedCount === null) {
+        return false;
+    }
+    return session.messageCount <= inheritedCount;
+}
+function resolveRuntimeSequenceBase(session, runtimeMode) {
+    if (runtimeMode !== "start"
+        || session.provider !== "claude-code"
+        || (session.forkMethod !== "native_message_fork"
+            && session.forkMethod !== "native_session_fork")
+        || typeof session.inheritedPrefixMessageCount !== "number") {
+        return null;
+    }
+    return Math.max(0, session.inheritedPrefixMessageCount);
+}
+function buildClaudeForkBootstrapInstructionOverlay(input) {
+    const title = input.sessionTitle.trim() || "未命名会话";
+    const lines = [
+        `这是一个从既有 Claude Code 会话 fork 出来的子会话，标题：${title}。`,
+        "下面这些历史内容已经发生过，只是给你恢复上下文。",
+        "不要把它们当成新的用户问题逐条重答，也不要重复总结。",
+        "真正需要处理的新用户输入，会在你看到这段说明之后单独发给你。",
+        ""
+    ];
+    let appended = 0;
+    for (const message of input.messages) {
+        if (message.kind !== "text") {
+            continue;
+        }
+        const normalizedContent = message.content.trim();
+        if (!normalizedContent) {
+            continue;
+        }
+        lines.push(message.role === "user" ? "[历史用户]" : "[历史助手]");
+        lines.push(normalizedContent);
+        lines.push("");
+        appended += 1;
+    }
+    if (appended === 0) {
+        return null;
+    }
+    return lines.join("\n").trim();
+}
+function readInstructionFileSafe(filePath) {
+    const normalizedPath = filePath?.trim() || null;
+    if (!normalizedPath || !existsSync(normalizedPath)) {
+        return null;
+    }
+    try {
+        return readFileSync(normalizedPath, "utf8");
+    }
+    catch {
+        return null;
+    }
+}
+function composeForkBootstrapInstructionFile(baseInstructionContent, overlay) {
+    const sections = [baseInstructionContent?.trim() ?? "", overlay.trim()].filter((value) => value.length > 0);
+    return `${sections.join("\n\n")}\n`;
+}
 function isSyntheticRuntimeSessionTitle(provider, title) {
     if (provider !== "codex") {
         return false;
@@ -2534,6 +2857,10 @@ function isSyntheticRuntimeSessionTitle(provider, title) {
 }
 function shouldStartNativeSessionOnFirstMessage(session) {
     if (session.provider !== "codex" && session.provider !== "opencode") {
+        if (session.provider === "claude-code"
+            && shouldBootstrapClaudeForkSession(session)) {
+            return "start";
+        }
         return "continue";
     }
     if (session.provider === "codex" && session.providerSessionId.startsWith("rollout-")) {
@@ -2798,8 +3125,30 @@ function buildClaudeHookBridgeConfig(config, provider) {
         command,
         supportedEvents: [
             "PreToolUse",
+            "PostToolUse",
+            "PostToolUseFailure",
+            "PostToolBatch",
             "PermissionRequest",
+            "PermissionDenied",
+            "Elicitation",
+            "ElicitationResult",
+            "MessageDisplay",
             "Notification",
+            "TaskCreated",
+            "TaskCompleted",
+            "TeammateIdle",
+            "SubagentStart",
+            "SubagentStop",
+            "PreCompact",
+            "PostCompact",
+            "InstructionsLoaded",
+            "ConfigChange",
+            "CwdChanged",
+            "FileChanged",
+            "WorktreeCreate",
+            "WorktreeRemove",
+            "Setup",
+            "UserPromptExpansion",
             "UserPromptSubmit",
             "SessionStart",
             "Stop",