@sanqianx/claude-ai-workbench 0.13.3 → 0.13.4

package/apps/agent-terminal/app.css

@@ -331,6 +331,22 @@ body.light .perm .btn-allow { color:#fff; }
 .perm .btn-deny:hover { color:var(--bad); }
 .perm .p-state { color:var(--muted); font-size:12.5px; }
 .perm .p-state.no { color:var(--bad); }
+.perm.question-card { display:block; padding:16px; color:var(--text); }
+.question-title { font-size:14px; font-weight:600; margin-bottom:12px; }
+.question-fields { max-height: min(52vh, 460px); overflow:auto; overscroll-behavior:contain; }
+.question-field { min-width:0; margin:0 0 16px; padding:0; border:0; }
+.question-field legend { font-size:14px; line-height:1.6; margin:0 0 10px; padding:0; overflow-wrap:anywhere; }
+.question-option { display:flex; gap:10px; align-items:flex-start; padding:10px; margin:6px 0; border:1px solid var(--line); border-radius:10px; cursor:pointer; }
+.question-option:has(input:checked) { border-color:var(--accent); background:var(--surface2); }
+.question-option input { flex:0 0 auto; width:16px; height:16px; margin:3px 0; accent-color:var(--accent); }
+.question-option-copy { min-width:0; display:grid; gap:3px; overflow-wrap:anywhere; }
+.question-option-label { font-size:14px; line-height:1.5; }
+.question-option-description { font-size:12px; color:var(--muted); line-height:1.5; }
+.question-custom { box-sizing:border-box; width:100%; margin-top:6px; padding:10px; border:1px solid var(--line); border-radius:8px; background:var(--surface); color:inherit; font:inherit; font-size:14px; }
+.question-footer { display:flex; justify-content:space-between; align-items:center; gap:10px; font-size:12px; color:var(--muted); }
+.question-error { font-size:12px; color:var(--bad); margin-bottom:8px; }
+.question-submit:disabled { opacity:.45; cursor:default; }
+.question-settled .question-title { margin:0; font-size:12px; font-weight:400; color:var(--muted); }
 
 /* 附件托盘:缩略图统一 48px,移除按钮悬浮于角标 */
 .attach-tray { display:flex; flex-wrap:wrap; gap:8px; justify-content:flex-end; margin:-8px 0 12px; }

package/apps/agent-terminal/app.js

@@ -991,6 +991,10 @@ async function openSession(sessionId, options = {}) {
   try {
     for (const event of historyView.events) { renderEvent(event); if (!page) last = Math.max(last, event.sequence || 0); }
   } finally { state.replaying = false; }
+  if (snapshot.permission?.kind === 'question') renderEvent({ type: 'claude/permission-request', ...snapshot.permission });
+  for (const card of state.questionCards?.values() || []) {
+    if (!card.classList.contains('question-settled') && card.dataset.permId !== snapshot.permission?.requestId) card.settle({ cancelled: true });
+  }
   renderBackgroundTasks();
   rememberTitleFromEvents(historyView.events);
   // The SSE replay window can overlap the snapshot (a slow turn raced the
@@ -1171,6 +1175,7 @@ function rememberTitleFromEvents(events) {
 }
 
 function resetStream() {
+  state.questionCards?.clear();
   endTurnVisuals();
   const col = $('stream-col');
   col.textContent = '';
@@ -1586,6 +1591,16 @@ function renderEvent(event) {
       break;
     }
     case 'claude/permission-request': {
+      if (col.querySelector(`[data-perm-id="${cssEscape(event.requestId || '')}"]`)) break;
+      if (event.kind === 'question' && Array.isArray(event.questions)) {
+        const sessionId = state.activeSessionId;
+        const card = window.createUserQuestionCard({ document, event,
+          storageKey: `kb.workbench.questions:${apiBase}:${sessionId}:${event.requestId}`,
+          onSubmit: answers => client.resolvePermission({ sessionId, requestId: event.requestId, allow: true, answers }),
+        });
+        state.questionCards ||= new Map(); state.questionCards.set(event.requestId, card);
+        col.append(card); setBusyState('pending-permission'); break;
+      }
       const card = el('div', 'perm');
       card.dataset.permId = event.requestId || '';
       const pIcon = el('span', 'p-icon');
@@ -1608,7 +1623,8 @@ function renderEvent(event) {
     }
     case 'claude/permission-resolved': {
       const card = col.querySelector(`.perm[data-perm-id="${cssEscape(event.requestId || '')}"]`);
-      if (card) settlePermissionCard(card, event.allow === true);
+      if (card?.settle) card.settle(event);
+      else if (card) settlePermissionCard(card, event.allow === true);
       setBusyState('running');
       break;
     }
@@ -2217,7 +2233,7 @@ function renderSessionStatus(activity) {
     status.hidden = false;
     text.textContent = ({
       running: '工作中', thinking: '思考中', 'tool-running': '执行工具', spawning: '启动中',
-      'pending-permission': '等待授权', aborted: '已停止', failed: '失败',
+      'pending-permission': '等待你确认', aborted: '已停止', failed: '失败',
     }[sessionState] || sessionState) + (background > 0 ? ' · 后台运行中' : '');
     return;
   }

package/apps/agent-terminal/index.html

@@ -165,6 +165,7 @@
 <script src="../packages/client/index.js"></script>
 <script src="./right-dock-panel-registry.js"></script>
 <script src="./conversation-composer.js"></script>
+<script src="./user-question-card.js"></script>
 <script src="./right-workspace-dock.js"></script>
 <script src="./app.js"></script>
 </body>

package/apps/agent-terminal/right-workspace-dock.css

@@ -182,6 +182,8 @@
 .rd-composer-wrap .send { margin-left:auto; }
 .rd-composer-wrap .composer textarea { font-size:14px; min-height:48px; }
 .rd-continue { align-self:center; border:1px solid var(--line); border-radius:8px; background:var(--page); color:var(--text); font-size:13px; padding:9px 16px; margin:12px 20px 20px; }
-.rd-permissions { padding:0 20px; }
+.rd-permissions { padding:0 20px; flex:0 1 auto; min-height:0; overflow-y:auto; }
+.rd-permissions:empty { display:none; }
+.rd-permissions .question-fields { max-height:min(38vh,360px); }
 .rd-pane[hidden], .rd-host-pane[hidden] { display:none; }
 @media (max-width:640px) { .rd-head,.rd-scroll { padding-left:16px; padding-right:16px; } .rd-composer-wrap { padding:12px; } }

package/apps/agent-terminal/right-workspace-dock.js

@@ -733,6 +733,8 @@
           void loadDelegationFirstPage(tab); return;
         }
         panel.events = mergeDelegationEvents(panel.events, [event]); panel.rendered = false;
+        if (event.type === 'claude/permission-request') { panel.currentPermission = event; panel.permissionRevision = (panel.permissionRevision || 0) + 1; }
+        if (event.type === 'claude/permission-resolved') { if (panel.currentPermission?.requestId === event.requestId) panel.currentPermission = null; panel.permissionRevision = (panel.permissionRevision || 0) + 1; }
         panel.highWater = Math.max(panel.highWater || 0, Number(event.sequence) || 0);
         if (event.type === 'claude/state') { currentView.child.state = event.state; currentView.child.active = ['created', 'spawning', 'running', 'thinking', 'tool-running', 'pending-permission'].includes(event.state); }
         if (event.type === 'claude/result') { currentView.child.active = false; currentView.child.turns = (currentView.child.turns || 0) + 1; }
@@ -786,7 +788,27 @@
         if (event.type === 'claude/permission-request') pending.set(event.requestId, event);
         if (event.type === 'claude/permission-resolved') pending.delete(event.requestId);
       }
+      if (tab.panel.currentPermission !== undefined) {
+        for (const [id, event] of pending) if (event.kind === 'question' && id !== tab.panel.currentPermission?.requestId) pending.delete(id);
+        if (tab.panel.currentPermission?.kind === 'question') pending.set(tab.panel.currentPermission.requestId, tab.panel.currentPermission);
+      }
+      for (const [id, card] of pane.questionCards || []) if (!pending.has(id)) { card.settle({ cancelled: true }); pane.questionCards.delete(id); }
       for (const [requestId, event] of pending) {
+        if (event.kind === 'question' && typeof global.createUserQuestionCard === 'function') {
+          pane.questionCards ||= new Map();
+          let card = pane.questionCards.get(requestId);
+          if (!card) {
+            const childId = view.childSessionId;
+            card = global.createUserQuestionCard({ document: doc, event,
+              storageKey: `kb.workbench.questions:${deps.apiBase || ''}:${childId}:${requestId}`,
+              onSubmit: async answers => {
+                if (tab.invalid || !tabs.includes(tab)) throw new Error('任务已关闭');
+                await client.resolvePermission({ sessionId: childId, requestId, allow: true, answers });
+              },
+            }); pane.questionCards.set(requestId, card);
+          }
+          pane.permissions.append(card); continue;
+        }
         const card = el('div', 'perm'); card.append(el('span', 'p-title', (event.toolName || '子代理') + ' 请求执行操作'));
         for (const allow of [true, false]) {
           const button = el('button', allow ? 'btn-allow' : 'btn-deny', allow ? '允许' : '拒绝');
@@ -863,9 +885,14 @@
       panel.loading = true; panel.error = null; panel.loaded = false; panel.rendered = false;
       render();
       let page = null, error = null;
-      try { page = await client.loadHistory(view.childSessionId, { limit: DOCK_PAGE_LIMIT }); }
-      catch (err) { error = err; }
+      const permissionRevision = panel.permissionRevision || 0;
+      const [historyResult, snapshotResult] = await Promise.allSettled([
+        client.loadHistory(view.childSessionId, { limit: DOCK_PAGE_LIMIT }),
+        typeof client.loadSession === 'function' ? client.loadSession(view.childSessionId) : Promise.resolve(null),
+      ]);
+      if (historyResult.status === 'fulfilled') page = historyResult.value; else error = historyResult.reason;
       if (epoch !== scopeEpoch || !tabs.includes(tab) || panel.revision !== revision) return;
+      if (snapshotResult.status === 'fulfilled' && snapshotResult.value && permissionRevision === (panel.permissionRevision || 0)) panel.currentPermission = snapshotResult.value.permission || null;
       panel.loading = false;
       if (error) {
         const code = (error && error.code) || String((error && error.status) || '');
@@ -1107,7 +1134,7 @@
       if (!child.present) return { status: 'failed', label: '任务暂不可用' };
       if (child.state === 'failed') return { status: 'failed', label: '失败' };
       if (child.state === 'aborted') return { status: 'stopped', label: '已停止' };
-      if (child.state === 'pending-permission') return { status: 'pending', label: '等待授权' };
+      if (child.state === 'pending-permission') return { status: 'pending', label: '等待你确认' };
       if (child.active) return { status: 'running', label: '运行中' };
       if (['dispatched', 'completed'].includes(view.phase) && child.state === 'idle' && child.turns > 0) return { status: 'completed', label: '已完成' };
       return { status: 'pending', label: '待执行' };

package/apps/agent-terminal/user-question-card.js

@@ -0,0 +1,68 @@
+(function (global) {
+  'use strict';
+  let serial = 0;
+  function createUserQuestionCard({ document: doc, event, storageKey, onSubmit }) {
+    const make = (tag, cls, text) => { const node = doc.createElement(tag); if (cls) node.className = cls; if (text) node.textContent = text; return node; };
+    const node = make('section', 'perm question-card'); node.dataset.permId = event.requestId;
+    node.setAttribute('aria-label', '等待你的选择');
+    const title = make('div', 'question-title', '等待你的选择');
+    const form = make('form', 'question-form');
+    const fields = make('div', 'question-fields');
+    const error = make('div', 'question-error'); error.setAttribute('role', 'alert');
+    const submit = make('button', 'btn-allow question-submit', '提交答案'); submit.type = 'submit'; submit.disabled = true;
+    const footer = make('div', 'question-footer'); footer.append(make('span', '', '提交后继续'), submit);
+    form.append(fields, error, footer); node.append(title, form);
+    const readers = [], questions = event.questions || [], group = `question-${++serial}`;
+    let saved = {}, sending = false, settled = false;
+    try { saved = JSON.parse(global.localStorage?.getItem(storageKey) || '{}'); } catch {}
+    const read = () => Object.fromEntries(readers.map(reader => [reader.id, reader.read()]));
+    const update = () => {
+      const answers = read();
+      submit.disabled = sending || settled || readers.some(reader => !answers[reader.id].length || reader.incomplete());
+      const draft = Object.fromEntries(questions.filter(question => !question.isSecret).map(question => [question.id, answers[question.id]]));
+      try { if (storageKey) global.localStorage?.setItem(storageKey, JSON.stringify(draft)); } catch {}
+    };
+    questions.forEach((question, index) => {
+      const field = make('fieldset', 'question-field');
+      field.append(make('legend', '', question.question));
+      const options = [], custom = question.allowCustom ? make('input', 'question-custom') : null;
+      const previous = question.isSecret ? [] : Array.isArray(saved[question.id]) ? saved[question.id] : [];
+      let other = null;
+      const addOption = (text, description, value, checked) => {
+        const label = make('label', 'question-option');
+        const input = make('input'); input.type = question.multiSelect ? 'checkbox' : 'radio'; input.name = `${group}-${index}`; input.value = value; input.checked = checked;
+        const copy = make('span', 'question-option-copy'); copy.append(make('span', 'question-option-label', text));
+        if (description) copy.append(make('span', 'question-option-description', description));
+        label.append(input, copy); field.append(label); input.addEventListener('change', update); return input;
+      };
+      for (const option of question.options || []) options.push(addOption(option.label, option.description, option.label, previous.includes(option.label)));
+      if (custom) {
+        const own = previous.filter(value => !question.options.some(option => option.label === value));
+        if (question.options.length) other = addOption('其他', '', '__custom__', own.length > 0);
+        custom.type = question.isSecret ? 'password' : 'text'; custom.placeholder = question.options.length ? '输入你的选择或要求' : '输入答案';
+        custom.setAttribute('aria-label', question.question + '：自定义答案'); custom.value = own.join(', '); custom.autocomplete = 'off';
+        custom.addEventListener('input', () => { if (other) { if (!question.multiSelect) options.forEach(option => { option.checked = false; }); other.checked = true; } update(); });
+        field.append(custom);
+      }
+      readers.push({ id: question.id,
+        read: () => [...options.filter(option => option.checked).map(option => option.value), ...(custom && (!other || other.checked) && custom.value.trim() ? [custom.value.trim()] : [])],
+        incomplete: () => Boolean(custom && (!other || other.checked) && !custom.value.trim()),
+      }); fields.append(field);
+    });
+    node.settle = result => {
+      settled = true; form.hidden = true; title.textContent = result?.cancelled || result?.allow === false ? '问题已取消，未提交选择' : '答案已提交';
+      node.classList.add('question-settled');
+      try { if (storageKey) global.localStorage?.removeItem(storageKey); } catch {}
+    };
+    form.addEventListener('submit', async action => {
+      action.preventDefault(); update(); if (submit.disabled) return;
+      sending = true; error.textContent = ''; update();
+      try { await onSubmit(read()); node.settle({ allow: true }); }
+      catch { error.textContent = '答案未提交，请重试。'; }
+      finally { sending = false; if (!settled) update(); }
+    });
+    update(); return node;
+  }
+  global.createUserQuestionCard = createUserQuestionCard;
+  if (typeof module !== 'undefined' && module.exports) module.exports = { createUserQuestionCard };
+})(typeof window === 'undefined' ? globalThis : window);

package/docs/sdk/SESSION_EVENTS.md

@@ -1,5 +1,7 @@
 # Session activity subscriptions
 
+Structured user questions use `claude/permission-request` with `kind: "question"` and a `questions` array. Each question has `id`, `question`, `options`, `multiSelect`, and `allowCustom`. Render a choice form rather than an allow/deny prompt. Nothing is selected or submitted automatically. Use `client.resolvePermission({sessionId, requestId, allow: true, answers: { [questionId]: [selectedLabel] }})`; custom text is an answer value. Missing, empty, incomplete, or foreign answers return 400 and leave the request pending. Read the current `permission` from `loadSession` when restoring a page, because the original request may be outside the latest history page. Closing a tab or refreshing does not answer a question. Stopping the turn emits a cancelled resolution without inventing answers. Claude SDK and Codex app-server native reply formats are translated by their owning drivers; UI callers never construct native payloads.
+
 `GET /sessions/changes?contextId=<id>&after=<revision>` streams SSE session summaries. The client exposes `subscribeSessionChanges(contextId, callback, onError, { afterRevision })`. Embedded hosts may supply their existing EventSource-compatible WebSocket transport; standalone pages use native SSE.
 
 An initial `workbench/sessions-snapshot` contains `sessions` (including archived records) and `revision`. Subsequent `workbench/session-changed` messages contain `session`, `contextId`, and `revision`; `deleted: true` removes that session. Cursors outside the retained revision window produce `workbench/resync`. Re-read one full snapshot after that marker. Reconnection does not resend input.

package/docs/sdk/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: 3.1.0
 info:
   title: Claude AI Workbench API
-  version: 0.13.3
+  version: 0.13.4
   description: Versioned local API for AI Profile, credential and Claude Code session management.
 servers:
   - url: http://127.0.0.1:5760/api/claude-workbench/v1
@@ -613,8 +613,16 @@ paths:
               properties:
                 allow: { type: boolean }
                 message: { type: string }
+                answers:
+                  type: object
+                  description: Explicit answers to a pending structured question, keyed by its question IDs.
+                  additionalProperties:
+                    type: array
+                    minItems: 1
+                    items: { type: string, minLength: 1 }
       responses:
         "200": { description: Permission resolved }
+        "400": { description: Incomplete or invalid question answers; the question remains pending }
   /sessions/{sessionId}/abort:
     parameters:
       - $ref: "#/components/parameters/SessionId"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanqianx/claude-ai-workbench",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "description": "Shared Claude Code terminal and Anthropic-compatible AI profile modules for local developer tools.",
   "type": "commonjs",
   "main": "src/index.js",

package/packages/client/index.d.ts

@@ -108,7 +108,7 @@ export interface ClaudeWorkbenchClient {
   send(sessionId: string, text: string, options?: SendOptions): Promise<unknown>;
   send(args: {sessionId: string; text?: string; attachments?: AttachmentInput[]; options?: SendOptions}): Promise<unknown>;
   resolvePermission(sessionId: string, requestId: string, allow: boolean, message?: string): Promise<unknown>;
-  resolvePermission(args: {sessionId: string; requestId: string; allow: boolean; message?: string}): Promise<unknown>;
+  resolvePermission(args: {sessionId: string; requestId: string; allow: boolean; message?: string; answers?: Record<string, string[]>}): Promise<unknown>;
   abort(sessionId: string | {sessionId: string}): Promise<unknown>;
   setPermissionMode(sessionId: string, mode: PermissionMode): Promise<unknown>;
   setPermissionMode(args: {sessionId: string; mode: PermissionMode}): Promise<unknown>;

package/packages/client/index.js

@@ -216,7 +216,7 @@
       resolvePermission(sessionOrArgs, requestId, allow, message) {
         const args = typeof sessionOrArgs === 'object' ? sessionOrArgs : { sessionId: sessionOrArgs, requestId, allow, message };
         return request(`/sessions/${encodeURIComponent(args.sessionId)}/permissions/${encodeURIComponent(args.requestId)}/resolve`, {
-          method: 'POST', body: JSON.stringify({ allow: args.allow === true, message: args.message || '' }),
+          method: 'POST', body: JSON.stringify({ allow: args.allow === true, message: args.message || '', ...(args.answers ? { answers: args.answers } : {}) }),
         });
       },
       abort(sessionOrArgs) {

package/packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claude-ai-workbench/client",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "type": "commonjs",
   "main": "index.js",
   "browser": "index.js",
@@ -20,7 +20,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@claude-ai-workbench/contracts": "0.13.3"
+    "@claude-ai-workbench/contracts": "0.13.4"
   },
   "engines": {
     "node": ">=18"

package/packages/contracts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claude-ai-workbench/contracts",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "type": "commonjs",
   "main": "index.js",
   "types": "index.d.ts",

package/packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claude-ai-workbench/core",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "type": "commonjs",
   "main": "index.js",
   "browser": "index.js",
@@ -20,7 +20,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@claude-ai-workbench/contracts": "0.13.3"
+    "@claude-ai-workbench/contracts": "0.13.4"
   },
   "engines": {
     "node": ">=18"

package/packages/server/lib/drivers/codex-driver.js

@@ -7,6 +7,7 @@ const crypto = require('crypto');
 const { writeJson } = require('../json-file');
 const { createCliJsonRunner, resolveCliInvocation } = require('./cli-json-runner');
 const { createAppServerBridge } = require('../bridges/app-server-bridge');
+const { normalizeQuestions, codexAnswers } = require('../user-questions');
 const { stampEvent, resequenceRestoredEvents } = require('../event-stream');
 const {
   appendTextAttachments, normalizeAttachments, resolveOpenAIModel, resolveOpenAIBaseUrl,
@@ -14,7 +15,7 @@ const {
 
 const PROVIDER_ID = 'agent_terminal';
 const PROVIDER_KEY_ENV = 'AGENT_TERMINAL_PROVIDER_API_KEY';
-const ACTIVE_STATES = new Set(['running', 'thinking', 'tool-running']);
+const ACTIVE_STATES = new Set(['running', 'thinking', 'tool-running', 'pending-permission']);
 
 // Codex driver, two transports:
 //   app-server (preferred) — one persistent `codex app-server` child speaking
@@ -666,6 +667,8 @@ function createAppServerCodexDriver(options = {}) {
       }
       const allow = decision && decision.allow === true;
       const approval = session.pendingApproval;
+      if (approval.questions && !allow) throw Object.assign(new Error('请提交问题答案，或停止当前任务。'), { status: 400 });
+      const questionResponse = approval.questions ? codexAnswers(approval.questions, decision?.answers) : null;
       session.pendingApproval = null;
       session.pendingPermission = null;
       const rpcDecision = approvalDecisionFor(approval.method, allow);
@@ -674,10 +677,11 @@ function createAppServerCodexDriver(options = {}) {
         requestId,
         allow,
         decision: rpcDecision,
+        ...(questionResponse ? { kind: 'question' } : {}),
         resolvedAt: new Date().toISOString(),
       });
       setState(session, 'running');
-      approval.resolve({ decision: rpcDecision });
+      approval.resolve(questionResponse || { decision: rpcDecision });
       return { ok: true, started: true, decision: rpcDecision };
     },
 
@@ -1141,6 +1145,19 @@ function createAppServerCodexDriver(options = {}) {
   // -- server-initiated requests (approvals) --------------------------------
 
   async function handleServerRequest(method, params) {
+    if (method === 'item/tool/requestUserInput') {
+      const session = params && threads.get(params.threadId) && sessions.get(threads.get(params.threadId));
+      if (!session || !ACTIVE_STATES.has(session.state) || session.currentTurn && params.turnId !== session.currentTurn.turnId) throw Object.assign(new Error('question is not part of an active turn'), { status: 409 });
+      if (session.pendingApproval) throw Object.assign(new Error('another user interaction is pending'), { status: 409 });
+      const questions = normalizeQuestions(params, true);
+      return await new Promise((resolve, reject) => {
+        const requestId = `codex-question-${nextPermissionId++}`;
+        session.pendingApproval = { requestId, method, params, questions, resolve, reject };
+        session.pendingPermission = { requestId, kind: 'question', toolName: 'request_user_input', questions, status: 'pending', createdAt: new Date().toISOString() };
+        setState(session, 'pending-permission');
+        emit(session, { type: 'claude/permission-request', ...session.pendingPermission });
+      });
+    }
     if (isApprovalMethod(method)) {
       const session = params && threads.get(params.threadId) && sessions.get(threads.get(params.threadId));
       if (!session) throw Object.assign(new Error('codex approval for an unknown thread'), { status: 404 });
@@ -1204,11 +1221,13 @@ function createAppServerCodexDriver(options = {}) {
       type: 'claude/permission-resolved',
       requestId: approval.requestId,
       allow: false,
+      ...(approval.questions ? { kind: 'question', cancelled: true } : {}),
       decision: approvalDecisionFor(approval.method, false),
       message: reason,
       resolvedAt: new Date().toISOString(),
     });
-    approval.resolve({ decision: approvalDecisionFor(approval.method, false) });
+    if (approval.questions) approval.reject(Object.assign(new Error('Question cancelled without a user answer: ' + reason), { rpcCode: -32800 }));
+    else approval.resolve({ decision: approvalDecisionFor(approval.method, false) });
   }
 
   // -- CLI fallback plumbing ------------------------------------------------

package/packages/server/lib/user-questions.js

@@ -0,0 +1,67 @@
+'use strict';
+
+function invalid(message) { return Object.assign(new Error(message), { status: 400, code: 'QUESTION_ANSWER_INVALID' }); }
+function normalizeQuestions(input, codex = false) {
+  if (!Array.isArray(input?.questions) || !input.questions.length || input.questions.length > 8) throw invalid('问题列表无效，请重新提问。');
+  const ids = new Set();
+  return input.questions.map((question, index) => {
+    const id = codex ? question.id : `question-${index + 1}`;
+    if (typeof id !== 'string' || !id || ids.has(id) || typeof question.question !== 'string' || !question.question.trim()) throw invalid('问题标识或内容无效。');
+    ids.add(id);
+    const options = Array.isArray(question.options) ? question.options.map(option => {
+      if (typeof option?.label !== 'string' || !option.label.trim()) throw invalid('问题选项无效。');
+      return { label: option.label, description: String(option.description || '') };
+    }) : [];
+    return { id, header: String(question.header || ''), question: question.question, options,
+      multiSelect: !codex && question.multiSelect === true, isSecret: question.isSecret === true,
+      allowCustom: !codex || question.isOther === true || !options.length };
+  });
+}
+function validateAnswers(questions, answers) {
+  if (!answers || typeof answers !== 'object' || Array.isArray(answers)) throw invalid('请填写答案后再提交。');
+  if (Object.keys(answers).some(id => !questions.some(question => question.id === id))) throw invalid('答案不属于本次问题。');
+  const result = Object.create(null);
+  for (const question of questions) {
+    const value = Object.hasOwn(answers, question.id) ? answers[question.id] : undefined;
+    const selected = typeof value === 'string' ? [value] : value;
+    if (!Array.isArray(selected) || !selected.length || !question.multiSelect && selected.length !== 1
+      || selected.some(item => typeof item !== 'string' || !item.trim() || item.length > 8192)) throw invalid('请回答全部问题后再提交。');
+    if (!question.allowCustom && selected.some(item => !question.options.some(option => option.label === item))) throw invalid('请选择本次问题提供的选项。');
+    result[question.id] = [...new Set(selected.map(item => question.options.some(option => option.label === item) ? item : item.trim()))];
+  }
+  return result;
+}
+function sdkAnswers(input, questions, answers) {
+  const checked = validateAnswers(questions, answers);
+  return { ...input, answers: Object.fromEntries(questions.map(question => [question.question, checked[question.id].join(', ')])) };
+}
+function codexAnswers(questions, answers) {
+  const checked = validateAnswers(questions, answers);
+  return { answers: Object.fromEntries(questions.map(question => [question.id, { answers: checked[question.id] }])) };
+}
+function waitForSdkQuestion({ session, input, context = {}, requestId, emit, setState }) {
+  const questions = normalizeQuestions(input);
+  if (session.pendingToolApproval) throw invalid('已有待回答的问题或授权，请先完成当前操作。');
+  return new Promise(resolve => {
+    const cleanup = () => context.signal?.removeEventListener('abort', cancel);
+    const cancel = () => {
+      if (session.pendingToolApproval?.requestId !== requestId) return;
+      session.pendingToolApproval = null; session.pendingPermission = null; cleanup();
+      emit({ type: 'claude/permission-resolved', requestId, kind: 'question', allow: false, cancelled: true });
+      resolve({ behavior: 'deny', interrupt: true, message: 'Question cancelled without a user answer. No option was selected.', toolUseID: context.toolUseID });
+    };
+    session.pendingToolApproval = { requestId, input, questions, toolUseID: context.toolUseID,
+      resolve: result => { cleanup(); resolve(result); }, cancel };
+    session.pendingPermission = { requestId, kind: 'question', toolName: 'AskUserQuestion', questions,
+      status: 'pending', createdAt: new Date().toISOString() };
+    if (context.signal?.aborted) { cancel(); return; }
+    context.signal?.addEventListener('abort', cancel, { once: true });
+    setState('pending-permission');
+    emit({ type: 'claude/permission-request', ...session.pendingPermission });
+  });
+}
+async function questionPromptHook(input) {
+  if (input.tool_name !== 'AskUserQuestion') return {};
+  return { hookSpecificOutput: { hookEventName: 'PreToolUse', permissionDecision: 'ask', permissionDecisionReason: '等待用户明确回答问题。' } };
+}
+module.exports = { normalizeQuestions, validateAnswers, sdkAnswers, codexAnswers, waitForSdkQuestion, questionPromptHook };

package/packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claude-ai-workbench/server",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "type": "commonjs",
   "main": "index.js",
   "types": "index.d.ts",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.141",
-    "@claude-ai-workbench/contracts": "0.13.3"
+    "@claude-ai-workbench/contracts": "0.13.4"
   },
   "engines": {
     "node": ">=18"

package/packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claude-ai-workbench/ui",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "type": "commonjs",
   "main": "ai-profile-settings.js",
   "browser": "ai-profile-settings.js",
@@ -33,7 +33,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@claude-ai-workbench/core": "0.13.3"
+    "@claude-ai-workbench/core": "0.13.4"
   },
   "engines": {
     "node": ">=18"

package/src/backend/lib/claude-cli-runner.js

@@ -20,6 +20,7 @@ const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
 const { writeJson } = require('../../../packages/server/lib/json-file');
+const { sdkAnswers, waitForSdkQuestion, questionPromptHook } = require('../../../packages/server/lib/user-questions');
 const { renderPrompt } = require('./prompt-registry');
 const aiWorkspace = require('./ai-workspace');
 const {
@@ -980,11 +981,15 @@ function resolvePermission(sessionId, requestId, decision) {
     throw new Error('permission request not found or already resolved');
   }
   const allow = decision && decision.allow === true;
+  const questionApproval = session.pendingToolApproval?.questions ? session.pendingToolApproval : null;
+  if (questionApproval && !allow) throw Object.assign(new Error('请提交问题答案，或停止当前任务。'), { status: 400 });
+  const questionInput = questionApproval ? sdkAnswers(questionApproval.input, questionApproval.questions, decision.answers) : null;
   const resolvedAt = new Date().toISOString();
   emit(session, {
     type: 'claude/permission-resolved',
     requestId,
     allow,
+    ...(questionApproval ? { kind: 'question' } : {}),
     message: decision && decision.message || '',
     resolvedAt,
   });
@@ -997,7 +1002,7 @@ function resolvePermission(sessionId, requestId, decision) {
     session.pendingPermission = null;
     setState(session, 'running', { message: allow ? 'tool permission approved' : 'tool permission denied', requestId });
     approval.resolve(allow
-      ? { behavior: 'allow', updatedInput: approval.input, toolUseID: approval.toolUseID }
+      ? { behavior: 'allow', updatedInput: questionInput || approval.input, toolUseID: approval.toolUseID }
       : { behavior: 'deny', message: decision && decision.message || 'User denied tool use', toolUseID: approval.toolUseID });
     persistSession(session);
     return { ok: true, started: true, toolPermission: true };
@@ -1780,6 +1785,10 @@ async function runSdkTurn(session, opts, isResume, generation) {
         }
         return { behavior: 'deny', message: decision.reason || 'Denied by automation safety policy', toolUseID };
       }
+      if (toolName === 'AskUserQuestion') {
+        return waitForSdkQuestion({ session, input, context, requestId: newPermissionId(),
+          emit: event => emit(session, event), setState: state => setState(session, state) });
+      }
       if (sdkPermissionMode === 'bypassPermissions') {
         return { behavior: 'allow', updatedInput: input, toolUseID };
       }
@@ -1859,6 +1868,10 @@ async function runSdkTurn(session, opts, isResume, generation) {
     isCurrent,
     getSecrets: () => sdkOptions.env,
   });
+  // A question always needs a human answer, even when tool execution is
+  // otherwise auto-approved. The hook only routes to canUseTool; it never
+  // chooses an answer or waits inside a hook timeout.
+  sdkOptions.hooks.PreToolUse.push({ matcher: '^AskUserQuestion$', hooks: [questionPromptHook] });
 
   // Native transcript collection rides on the same query. One collector per
   // session keeps the published-uuid cursors across inputs, while each
@@ -2020,6 +2033,7 @@ async function runSdkTurn(session, opts, isResume, generation) {
     if (session.sdkTurnGeneration === generation) {
       session.subprocess = null;
       session.sdkTransport = null;
+      session.pendingToolApproval?.cancel?.();
       session.pendingToolApproval = null;
       session.pendingPermission = null;
       persistSession(session);
@@ -2047,6 +2061,7 @@ function abort(sessionId, reason) {
   const session = getSession(sessionId);
   if (!session) throw new Error(`session not found: ${sessionId}`);
   const cause = reason || 'user-abort';
+  session.pendingToolApproval?.cancel?.();
   finishBackgroundTasks(session, cause);
   if (session.subprocess) {
     try {
@@ -2211,6 +2226,7 @@ function isStaleActive(record, thresholdMs, now) {
 // automation queue (post-commit dispatcher) treats `failed` as a release
 // signal for the next queued run.
 function demoteSessionToFailed(session, reason, source) {
+  session.pendingToolApproval?.cancel?.();
   session.state = 'failed';
   session.endedAt = new Date().toISOString();
   session.error = reason;