@jingyi0605/codingns 1.0.0-beta.1 → 1.0.0-beta.2

package/dist/server/modules/sessions/session-permission-request-service.js

@@ -5,6 +5,7 @@ import { createId } from "../../shared/utils/id.js";
 import { nowIso } from "../../shared/utils/time.js";
 import { buildClaudeCompatibleRawStoreRef } from "./claude-compatible-provider-registry.js";
 const CLAUDE_PRE_TOOL_USE_TIMEOUT_MS = 90_000;
+const CLAUDE_ASK_USER_QUESTION_TIMEOUT_MS = 90_000;
 const OPENCODE_RECONNECT_DELAY_MS = 1_500;
 export class SessionPermissionRequestService {
     sessionHistoryService;
@@ -70,11 +71,38 @@ export class SessionPermissionRequestService {
         }
         if (request.source.kind === "claude-pre-tool-use") {
             const action = normalizeText(input.action);
-            if (action !== "allow" && action !== "allow_session" && action !== "deny") {
+            if (action !== "allow" &&
+                action !== "allow_session" &&
+                action !== "deny" &&
+                action !== "submit") {
                 throw new AppError({
                     statusCode: 400,
                     errorCode: "INVALID_INPUT",
-                    detail: "Claude 权限申请只支持 allow、allow_session 或 deny",
+                    detail: "Claude 请求只支持 allow、allow_session、deny 或 submit",
+                    field: "action"
+                });
+            }
+            if (request.kind === "user_input" && action !== "submit") {
+                throw new AppError({
+                    statusCode: 400,
+                    errorCode: "INVALID_INPUT",
+                    detail: "Claude 问题请求只支持提交答案",
+                    field: "action"
+                });
+            }
+            if (request.kind !== "user_input" && action === "submit") {
+                throw new AppError({
+                    statusCode: 400,
+                    errorCode: "INVALID_INPUT",
+                    detail: "只有问题请求可以提交答案",
+                    field: "action"
+                });
+            }
+            if (request.kind === "plan_approval" && action === "allow_session") {
+                throw new AppError({
+                    statusCode: 400,
+                    errorCode: "INVALID_INPUT",
+                    detail: "计划审批不支持设置整场会话默认允许",
                     field: "action"
                 });
             }
@@ -91,7 +119,8 @@ export class SessionPermissionRequestService {
                 });
             }
             request.source.resolve({
-                action: action === "deny" ? "deny" : "allow"
+                action: action === "deny" ? "deny" : "allow",
+                answers: request.kind === "user_input" ? input.answers : undefined
             });
             return await this.markResolved(request, action === "deny" ? "declined" : "approved");
         }
@@ -240,7 +269,7 @@ export class SessionPermissionRequestService {
             const timer = setTimeout(() => {
                 resolvedByTimeout = true;
                 resolve({ action: "ask" });
-            }, CLAUDE_PRE_TOOL_USE_TIMEOUT_MS);
+            }, normalized.kind === "user_input" ? CLAUDE_ASK_USER_QUESTION_TIMEOUT_MS : CLAUDE_PRE_TOOL_USE_TIMEOUT_MS);
             const record = {
                 ...normalized,
                 source: {
@@ -273,7 +302,11 @@ export class SessionPermissionRequestService {
             accepted: true,
             ignored: false,
             sessionId: binding.sessionId,
-            bridgeResponse: buildClaudePreToolUseBridgeResponse(decision.action, buildClaudeDecisionReason(decision.action, normalized.title, resolvedByTimeout))
+            bridgeResponse: normalized.kind === "user_input"
+                ? buildClaudeAskUserQuestionBridgeResponse(decision.action, decision.answers ?? {}, normalized.questions, payload.tool_input, buildClaudeDecisionReason(decision.action, normalized.title, resolvedByTimeout))
+                : normalized.kind === "plan_approval"
+                    ? buildClaudeExitPlanModeBridgeResponse(decision.action, buildClaudeDecisionReason(decision.action, normalized.title, resolvedByTimeout))
+                    : buildClaudePreToolUseBridgeResponse(decision.action, buildClaudeDecisionReason(decision.action, normalized.title, resolvedByTimeout))
         };
     }
     async handleClaudePermissionRequest(payload, provider = "claude-code") {
@@ -404,6 +437,96 @@ export class SessionPermissionRequestService {
                     : "CodingNS 已拒绝本次权限申请")
         };
     }
+    async handleClaudeElicitation(payload, provider = "claude-code") {
+        logPermissionDebug("claude_permission.elicitation.begin", {
+            provider,
+            providerSessionId: payload.session_id ?? null,
+            cwd: payload.cwd ?? null,
+            transcriptPath: payload.transcript_path ?? null,
+            title: payload.title ?? null
+        });
+        const providerSessionId = requireNonEmptyText(payload.session_id, "session_id");
+        const workspacePath = requireNonEmptyText(payload.cwd, "cwd");
+        const workspace = this.workspaceService.findWorkspaceByPath(workspacePath);
+        if (!workspace) {
+            return {
+                accepted: true,
+                ignored: true,
+                sessionId: null,
+                bridgeResponse: buildClaudePreToolUseBridgeResponse("ask", "未匹配到工作区，回退 Claude 原生征询")
+            };
+        }
+        const transcriptPath = normalizeText(payload.transcript_path) || null;
+        const binding = await this.resolveClaudeBinding(provider, providerSessionId, workspace.id, workspace.path, transcriptPath, workspace.ownerUserId ?? null).catch(() => null)
+            ?? this.resolveClaudeWorkspaceSessionFallback({
+                provider,
+                providerSessionId,
+                workspaceId: workspace.id,
+                workspacePath: workspace.path,
+                transcriptPath,
+                userId: workspace.ownerUserId ?? null
+            })
+            ?? (this.resolveActiveClaudeSession
+                ? await this.resolveActiveClaudeSession({
+                    provider,
+                    providerSessionId,
+                    workspaceId: workspace.id,
+                    workspacePath: workspace.path,
+                    transcriptPath
+                }).catch(() => null)
+                : null);
+        if (!binding) {
+            return {
+                accepted: true,
+                ignored: true,
+                sessionId: null,
+                bridgeResponse: buildClaudePreToolUseBridgeResponse("ask", "未匹配到会话绑定，回退 Claude 原生征询")
+            };
+        }
+        const now = nowIso();
+        const normalized = normalizeClaudeElicitationRequest({
+            provider,
+            sessionId: binding.sessionId,
+            providerSessionId,
+            payload,
+            createdAt: now
+        });
+        let resolvedByTimeout = false;
+        const decision = await new Promise((resolve) => {
+            const timer = setTimeout(() => {
+                resolvedByTimeout = true;
+                resolve({ action: "deny" });
+            }, CLAUDE_ASK_USER_QUESTION_TIMEOUT_MS);
+            const record = {
+                ...normalized,
+                source: {
+                    kind: "claude-pre-tool-use",
+                    resolve,
+                    timer
+                }
+            };
+            this.upsertRequest(record);
+            void this.emitEnvelope({
+                type: "session.permission_request",
+                sessionId: binding.sessionId,
+                request: this.toRequestView(record)
+            });
+        });
+        const existing = this.requestsById.get(normalized.id);
+        if (existing) {
+            await this.markResolved(existing, resolvedByTimeout ? "expired" : "approved");
+        }
+        return {
+            accepted: true,
+            ignored: false,
+            sessionId: binding.sessionId,
+            bridgeResponse: buildClaudeAskUserQuestionBridgeResponse(decision.action, decision.answers ?? {}, normalized.questions, payload, decision.action === "allow"
+                ? "用户已提供补充信息"
+                : resolvedByTimeout
+                    ? "用户补充信息超时，回退 Claude 原生处理"
+                    : "用户拒绝补充信息")
+        };
+    }
     ingestCodexServerRequest(sessionId, providerSessionId, request) {
         const normalized = normalizeCodexServerRequest(sessionId, providerSessionId, request);
         if (!normalized) {
@@ -1017,7 +1140,7 @@ export function normalizeClaudePreToolUseRequest(input) {
         cwd: normalizeText(toRecord(toolInput)?.cwd) || null,
         paths: normalized.paths,
         permissionProfile: null,
-        questions: [],
+        questions: normalized.questions,
         actions: buildClaudeActions({
             kind: normalized.kind,
             command: normalized.command,
@@ -1035,6 +1158,46 @@ export function normalizeClaudePreToolUseRequest(input) {
         }
     };
 }
+export function normalizeClaudeElicitationRequest(input) {
+    const rawPayload = stringifyPayload(input.payload);
+    const questions = readClaudeElicitationQuestions(input.payload);
+    const requestKey = normalizeText(input.payload.title) ||
+        normalizeText(input.payload.prompt) ||
+        normalizeText(input.payload.question) ||
+        normalizeText(input.payload.message) ||
+        `Elicitation:${hashLike(rawPayload)}`;
+    return {
+        id: `permission-${createId()}`,
+        sessionId: input.sessionId,
+        provider: input.provider,
+        providerSessionId: input.providerSessionId,
+        requestKey,
+        kind: "user_input",
+        status: "pending",
+        title: normalizeText(input.payload.title) || "Claude 需要你补充信息",
+        summary: questions[0]?.question ?? "Claude 需要你补充信息后才能继续",
+        detail: rawPayload,
+        reason: normalizeText(input.payload.reason) || null,
+        toolName: "Elicitation",
+        command: null,
+        cwd: normalizeText(input.payload.cwd) || null,
+        paths: [],
+        permissionProfile: null,
+        questions,
+        actions: [
+            createAction("submit", "提交答案", "primary", "把补充信息交给 Claude 继续处理")
+        ],
+        rawPayload,
+        createdAt: input.createdAt,
+        updatedAt: input.createdAt,
+        resolvedAt: null,
+        source: {
+            kind: "claude-pre-tool-use",
+            resolve: () => undefined,
+            timer: null
+        }
+    };
+}
 export function normalizeOpenCodePermissionRequest(input) {
     const requestKey = normalizeText(input.permission.id) || createId();
     const title = normalizeText(input.permission.title) || "OpenCode 请求权限";
@@ -1215,6 +1378,7 @@ export function normalizeCodexServerRequest(sessionId, providerSessionId, reques
                 question: normalizeText(question.question) || "请输入答案",
                 allowOther: Boolean(question.isOther),
                 secret: Boolean(question.isSecret),
+                multiSelect: Boolean(question.multiSelect),
                 options: Array.isArray(question.options)
                     ? question.options
                         .map((option) => toRecord(option))
@@ -1268,6 +1432,25 @@ function buildClaudePreToolUseBridgeResponse(action, reason) {
         }
     };
 }
+function buildClaudeAskUserQuestionBridgeResponse(action, answers, questions, originalInput, reason) {
+    const response = buildClaudePreToolUseBridgeResponse(action, reason);
+    const originalInputRecord = toRecord(originalInput);
+    if (action === "allow") {
+        return {
+            hookSpecificOutput: {
+                ...response.hookSpecificOutput,
+                updatedInput: {
+                    ...(originalInputRecord ?? {}),
+                    answers: buildClaudeAskUserQuestionAnswers(answers, questions)
+                }
+            }
+        };
+    }
+    return response;
+}
+function buildClaudeExitPlanModeBridgeResponse(action, reason) {
+    return buildClaudePreToolUseBridgeResponse(action, reason);
+}
 function buildClaudePermissionRequestBridgeResponse(action, message) {
     return {
         hookSpecificOutput: {
@@ -1422,6 +1605,7 @@ function buildClaudeKind(toolName, toolInput) {
     const command = normalizeText(inputRecord?.command) ||
         normalizeText(inputRecord?.cmd) ||
         null;
+    const allowedPrompts = readClaudeAllowedPrompts(inputRecord);
     if (normalizedToolName === "bash" || normalizedToolName === "shell") {
         return {
             kind: "command",
@@ -1429,7 +1613,37 @@ function buildClaudeKind(toolName, toolInput) {
             summary: command ?? "Bash 工具需要确认",
             detail: stringifyPayload(toolInput),
             command,
-            paths: []
+            paths: [],
+            questions: []
+        };
+    }
+    if (normalizedToolName === "askuserquestion") {
+        const questions = readClaudeAskUserQuestionQuestions(inputRecord);
+        return {
+            kind: "user_input",
+            title: "Claude 需要你回答问题",
+            summary: questions[0]?.question ?? "Claude 需要你补充选择",
+            detail: stringifyPayload(toolInput),
+            command: null,
+            paths: [],
+            questions
+        };
+    }
+    if (normalizedToolName === "exitplanmode") {
+        const summary = normalizeText(inputRecord?.plan) ||
+            normalizeText(inputRecord?.summary) ||
+            normalizeText(inputRecord?.title) ||
+            (allowedPrompts[0]
+                ? `Claude 准备按计划继续执行：${allowedPrompts[0].prompt}`
+                : "Claude 准备退出计划模式并继续执行");
+        return {
+            kind: "plan_approval",
+            title: "Claude 请求确认执行计划",
+            summary,
+            detail: stringifyPayload(toolInput),
+            command: null,
+            paths: [],
+            questions: []
         };
     }
     if (normalizedToolName === "edit" ||
@@ -1442,7 +1656,8 @@ function buildClaudeKind(toolName, toolInput) {
             summary: paths[0] ?? `${toolName} 工具需要确认`,
             detail: stringifyPayload(toolInput),
             command: null,
-            paths
+            paths,
+            questions: []
         };
     }
     return {
@@ -1451,9 +1666,134 @@ function buildClaudeKind(toolName, toolInput) {
         summary: toolName,
         detail: stringifyPayload(toolInput),
         command,
-        paths
+        paths,
+        questions: []
     };
 }
+function readClaudeAskUserQuestionQuestions(inputRecord) {
+    if (!inputRecord) {
+        return [];
+    }
+    const rawQuestions = Array.isArray(inputRecord.questions)
+        ? inputRecord.questions
+        : [
+            {
+                ...inputRecord,
+                id: normalizeText(inputRecord.id) || "question"
+            }
+        ];
+    return rawQuestions
+        .map((question, index) => normalizeClaudeAskUserQuestion(question, index))
+        .filter((question) => question !== null);
+}
+function normalizeClaudeAskUserQuestion(value, index) {
+    const record = toRecord(value);
+    if (!record) {
+        return null;
+    }
+    const questionText = normalizeText(record.question) ||
+        normalizeText(record.prompt) ||
+        normalizeText(record.message) ||
+        "请选择一个选项";
+    const options = readClaudeAskUserQuestionOptions(record.options ?? record.choices ?? record.answers);
+    return {
+        id: normalizeText(record.id) ||
+            normalizeText(record.name) ||
+            `question-${index + 1}`,
+        header: normalizeText(record.header) ||
+            normalizeText(record.title) ||
+            `问题 ${index + 1}`,
+        question: questionText,
+        allowOther: readBoolean(record.allowOther) ??
+            readBoolean(record.allow_other) ??
+            readBoolean(record.isOther) ??
+            readBoolean(record.allowFreeform) ??
+            readBoolean(record.allow_freeform) ??
+            true,
+        secret: readBoolean(record.secret) ??
+            readBoolean(record.isSecret) ??
+            false,
+        multiSelect: readBoolean(record.multiSelect) ??
+            readBoolean(record.multi_select) ??
+            false,
+        options
+    };
+}
+function readClaudeAskUserQuestionOptions(value) {
+    if (!Array.isArray(value)) {
+        return [];
+    }
+    return value
+        .map((item) => {
+        if (typeof item === "string") {
+            const label = item.trim();
+            return label ? { label, description: null } : null;
+        }
+        const record = toRecord(item);
+        const label = normalizeText(record?.label) ||
+            normalizeText(record?.value) ||
+            normalizeText(record?.text) ||
+            normalizeText(record?.title);
+        if (!label) {
+            return null;
+        }
+        return {
+            label,
+            description: normalizeText(record?.description) || normalizeText(record?.detail) || null
+        };
+    })
+        .filter((option) => option !== null);
+}
+function readClaudeElicitationQuestions(payload) {
+    const options = readClaudeAskUserQuestionOptions(payload.options);
+    const questionText = normalizeText(payload.question) ||
+        normalizeText(payload.prompt) ||
+        normalizeText(payload.message) ||
+        "请补充 Claude 继续执行所需的信息";
+    return [
+        {
+            id: "elicitation",
+            header: normalizeText(payload.title) || "补充信息",
+            question: questionText,
+            allowOther: true,
+            secret: false,
+            multiSelect: false,
+            options
+        }
+    ];
+}
+export function buildClaudeAskUserQuestionAnswers(answers, questions) {
+    return Object.fromEntries(questions
+        .map((question) => {
+        const values = Array.isArray(answers[question.id])
+            ? answers[question.id].map((value) => normalizeText(value)).filter(Boolean)
+            : [];
+        if (values.length === 0) {
+            return null;
+        }
+        return [
+            question.question,
+            question.multiSelect ? values.join(", ") : values[0] ?? ""
+        ];
+    })
+        .filter((entry) => entry !== null));
+}
+function readClaudeAllowedPrompts(inputRecord) {
+    if (!inputRecord || !Array.isArray(inputRecord.allowedPrompts)) {
+        return [];
+    }
+    return inputRecord.allowedPrompts
+        .map((value) => {
+        const record = toRecord(value);
+        const tool = normalizeText(record?.tool);
+        const prompt = normalizeText(record?.prompt);
+        if (!tool || !prompt) {
+            return null;
+        }
+        return { tool, prompt };
+    })
+        .filter((item) => item !== null);
+}
 function buildOpenCodeKind(title, metadata, pattern, fallbackToolName) {
     const command = normalizeText(metadata?.command);
     const toolName = normalizeText(metadata?.tool) || fallbackToolName;
@@ -1581,6 +1921,17 @@ function buildClaudeAllowedScopeKey(request) {
     return null;
 }
 function buildClaudeActions(request) {
+    if (request.kind === "user_input") {
+        return [
+            createAction("submit", "提交选择", "primary", "把选择结果交给 Claude 继续处理")
+        ];
+    }
+    if (request.kind === "plan_approval") {
+        return [
+            createAction("allow", "批准计划", "primary", "允许 Claude 按当前计划继续执行"),
+            createAction("deny", "退回计划", "danger", "拒绝这次计划，要求 Claude 停在计划阶段")
+        ];
+    }
     const actions = [
         createAction("allow", "允许", "primary", "只允许这一次")
     ];
@@ -1908,6 +2259,21 @@ function normalizeText(value) {
     }
     return null;
 }
+function readBoolean(value) {
+    if (typeof value === "boolean") {
+        return value;
+    }
+    if (typeof value === "string") {
+        const normalized = value.trim().toLowerCase();
+        if (normalized === "true" || normalized === "1" || normalized === "yes") {
+            return true;
+        }
+        if (normalized === "false" || normalized === "0" || normalized === "no") {
+            return false;
+        }
+    }
+    return null;
+}
 function toRecord(value) {
     if (!value || typeof value !== "object" || Array.isArray(value)) {
         return null;