Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
refactor(codex): 拆出 request_user_input 问答归一化与回包函数
RickyYii5511ded5169e
diff --git a/packages/maker-core/src/agents/codex/index.ts b/packages/maker-core/src/agents/codex/index.tsindex 4ca69ea3a2..e80bbd7f31 100644--- a/packages/maker-core/src/agents/codex/index.ts+++ b/packages/maker-core/src/agents/codex/index.ts@@ -169,6 +169,23 @@ import {supportsCodexForkExcludeTurns,supportsCodexNativeTurnFork,} from './version-gates.js';+import {+ emptyUserInputResponse,+ normalizeRequestUserInputQuestions,+ normalizeDynamicAskUserQuestions,+ questionsToAskUserItems,+ responseFromAskUserAnswers,+ responseFromPermissionDecision,+ dynamicToolResponseFromUserInput,+ userInputQuestionsFingerprint,+ userInputAnswersByPosition,+ responseFromUserInputAnswersByPosition,+ hasSubmittedUserInput,+ formatAskUserContinuationMessage,+ MAX_REQUEST_USER_INPUT_QUESTIONS,+ MAX_REQUEST_USER_INPUT_OPTIONS,+ type UserInputAnswersByPosition,+} from './request-user-input.js';import {dedupeCells,extractAliveYieldCellsFromCodexItem,@@ -719,10 +736,6 @@ const ASK_USER_DYNAMIC_TOOL_CANONICAL_NAME =`${ASK_USER_DYNAMIC_TOOL_NAMESPACE}__${ASK_USER_DYNAMIC_TOOL_NAME}`;const CODEX_SUBAGENT_ASK_USER_QUESTION_DENIAL_MESSAGE ='User questions are only available to the root agent. Report the question to the parent agent, which can decide whether to ask the user.';-const MAX_REQUEST_USER_INPUT_QUESTIONS = 3;-const MAX_REQUEST_USER_INPUT_OPTIONS = 10;-const MAX_REQUEST_USER_INPUT_TEXT_CHARS = 1_000;-const MAX_REQUEST_USER_INPUT_ANSWER_CHARS = 2_000;const DISABLE_ASK_USER_DYNAMIC_TOOL_FALLBACK = process.env.XDT_CODEX_DISABLE_ASK_USER_DYNAMIC_TOOL === '1';// xAI rejects Codex namespace dynamic tools in its Responses `tools[]` schema.const CODEX_DYNAMIC_TOOL_UNSUPPORTED_PROVIDER_IDS = new Set(['xai']);@@ -824,196 +837,12 @@ function supportsCodexDynamicTools(return true;}-function truncateUserInputText(value: string): string {- return value.length > MAX_REQUEST_USER_INPUT_TEXT_CHARS- ? value.slice(0, MAX_REQUEST_USER_INPUT_TEXT_CHARS)- : value;-}--function truncateAnswerText(value: string): string {- return value.length > MAX_REQUEST_USER_INPUT_ANSWER_CHARS- ? value.slice(0, MAX_REQUEST_USER_INPUT_ANSWER_CHARS)- : value;-}--function emptyUserInputResponse(questions: readonly Pick<ToolRequestUserInputQuestion, 'id'>[]): ToolRequestUserInputResponse {- const answers: ToolRequestUserInputResponse['answers'] = {};- for (const q of questions) {- if (q.id) answers[q.id] = { answers: [] };- }- return { answers };-}--function normalizeRequestUserInputQuestions(- questions: readonly ToolRequestUserInputQuestion[],-): ToolRequestUserInputQuestion[] {- return questions.slice(0, MAX_REQUEST_USER_INPUT_QUESTIONS).map((q, index) => ({- id: q.id || `question-${index + 1}`,- header: truncateUserInputText(q.header || ''),- question: truncateUserInputText(q.question || q.header || `Question ${index + 1}`),- isOther: q.isOther === true,- isSecret: q.isSecret === true,- options: Array.isArray(q.options)- ? q.options.slice(0, MAX_REQUEST_USER_INPUT_OPTIONS).map((option) => ({- label: truncateUserInputText(option.label || ''),- description: truncateUserInputText(option.description || ''),- })).filter((option) => option.label.trim().length > 0)- : null,- }));-}--function normalizeDynamicAskUserQuestions(args: unknown): ToolRequestUserInputQuestion[] {- const input = args && typeof args === 'object' ? args as { questions?: unknown } : {};- const rawQuestions = Array.isArray(input.questions) ? input.questions : [];- const questions: ToolRequestUserInputQuestion[] = rawQuestions.map((raw, index) => {- const q = raw && typeof raw === 'object' ? raw as Record<string, unknown> : {};- const rawOptions = Array.isArray(q.options) ? q.options : null;- return {- id: typeof q.id === 'string' && q.id.trim() ? q.id : `question-${index + 1}`,- header: typeof q.header === 'string' ? q.header : '',- question: typeof q.question === 'string' ? q.question : '',- isOther: q.isOther === true,- // Dynamic fallback is a business-choice tool. It must not collect secrets.- isSecret: false,- options: rawOptions- ? rawOptions.map((rawOption) => {- const option = rawOption && typeof rawOption === 'object'- ? rawOption as Record<string, unknown>- : {};- return {- label: typeof option.label === 'string' ? option.label : '',- description: typeof option.description === 'string' ? option.description : '',- };- })- : null,- };- });- return normalizeRequestUserInputQuestions(questions);-}--function questionsToAskUserItems(questions: readonly ToolRequestUserInputQuestion[]) {- return questions.map((q) => ({- question: q.question,- header: q.header || undefined,- options: q.options?.map((option) => ({- label: option.label,- description: option.description || undefined,- })),- multiSelect: false,- }));-}--function responseFromAskUserAnswers(- questions: readonly ToolRequestUserInputQuestion[],- answers: Record<string, string>,-): ToolRequestUserInputResponse {- const out: ToolRequestUserInputResponse['answers'] = {};- for (const q of questions) {- const raw = answers[q.question] ?? answers[q.header] ?? answers[q.id] ?? '';- if (!raw) {- out[q.id] = { answers: [] };- continue;- }- try {- const parsed = JSON.parse(raw);- if (Array.isArray(parsed)) {- out[q.id] = { answers: parsed.filter((v): v is string => typeof v === 'string').map(truncateAnswerText) };- continue;- }- } catch {- // Single-select answers are plain labels, not JSON.- }- out[q.id] = { answers: [truncateAnswerText(raw)] };- }- return { answers: out };-}--function responseFromPermissionDecision(- questions: readonly ToolRequestUserInputQuestion[],- decision: Extract<InteractionDecision, { kind: 'permission' }>,-): ToolRequestUserInputResponse {- if (decision.behavior === 'deny') return emptyUserInputResponse(questions);- const out: ToolRequestUserInputResponse['answers'] = {};- for (const q of questions) {- const positiveOption = q.options?.find((option) =>- /^(allow|approve|accept|yes|continue|confirm)$/i.test(option.label.trim()),- );- const option = positiveOption?.label ?? q.options?.[0]?.label ?? 'allow';- out[q.id] = { answers: [option] };- }- return { answers: out };-}--function dynamicToolResponseFromUserInput(response: ToolRequestUserInputResponse): DynamicToolCallResponse {- return {- success: true,- contentItems: [{ type: 'inputText', text: JSON.stringify(response.answers) }],- };-}--function userInputQuestionsFingerprint(- questions: readonly ToolRequestUserInputQuestion[],-): string {- return JSON.stringify(questions.map((question) => ({- header: question.header,- question: question.question,- isOther: question.isOther === true,- options: (question.options ?? []).map((option) => ({- label: option.label,- description: option.description,- })),- })));-}--type UserInputAnswersByPosition = string[][];-interface PendingUserInputInteraction {interactionPromise: Promise<UserInputAnswersByPosition>;cancelledPromise: Promise<void>;cancel: () => void;}-function userInputAnswersByPosition(- questions: readonly ToolRequestUserInputQuestion[],- response: ToolRequestUserInputResponse,-): UserInputAnswersByPosition {- return questions.map((question) =>- response.answers[question.id]?.answers.slice() ?? [],- );-}--function responseFromUserInputAnswersByPosition(- questions: readonly ToolRequestUserInputQuestion[],- answersByPosition: readonly (readonly string[])[],-): ToolRequestUserInputResponse {- const answers: ToolRequestUserInputResponse['answers'] = {};- questions.forEach((question, index) => {- answers[question.id] = { answers: [...(answersByPosition[index] ?? [])] };- });- return { answers };-}--function hasSubmittedUserInput(answersByPosition: readonly (readonly string[])[]): boolean {- return answersByPosition.some((answers) =>- answers.some((value) => value.trim().length > 0),- );-}--function formatAskUserContinuationMessage(- questions: readonly ToolRequestUserInputQuestion[],- answers: Record<string, string>,-): string {- const lines = [ASK_USER_CONTINUATION_INTRO, ''];- for (const question of questions) {- const raw = answers[question.question] ?? answers[question.header] ?? answers[question.id] ?? '';- lines.push(`Q: ${question.question}`);- lines.push(`A: ${raw.trim() || '(no answer)'}`);- lines.push('');- }- lines.push(ASK_USER_CONTINUATION_OUTRO);- return lines.join('\n');-}-interface LiveAskUserRequest {requestId: string;turnId: string | null;@@ -1259,8 +1088,6 @@ function codexPermissionStrictnessRank(mode: PermissionMode): number {// (codex-rs/tui/src/chatwidget/plan_implementation.rs 的// PLAN_IMPLEMENTATION_CODING_MESSAGE), 模型对这句有训练分布上的既有理解。const PLAN_IMPLEMENTATION_MESSAGE = 'Implement the plan.';-const ASK_USER_CONTINUATION_INTRO = 'The user answered the pending question.';-const ASK_USER_CONTINUATION_OUTRO = 'Continue from the previous turn. Do not ask the same question again.';const CODEX_INHERITED_CAPABILITY_SELECTION = Symbol('codexInheritedCapabilitySelection');// 计划实施/修订 turn 的**审查意图**:这些 turn 的 message 是固定内部串('Implement the plan.'),// 直接拿它当 review intent 会让灰区 reviewer 完全看不到用户原始请求与获批计划(codex 报)。diff --git a/packages/maker-core/src/agents/codex/request-user-input.ts b/packages/maker-core/src/agents/codex/request-user-input.tsnew file mode 100644index 0000000000..9ea9e053e5--- /dev/null+++ b/packages/maker-core/src/agents/codex/request-user-input.ts@@ -0,0 +1,197 @@+import type { InteractionDecision } from '../../types/events.js';+import type {+ DynamicToolCallResponse,+ ToolRequestUserInputQuestion,+ ToolRequestUserInputResponse,+} from './app-server/protocol.js';++export const MAX_REQUEST_USER_INPUT_QUESTIONS = 3;+export const MAX_REQUEST_USER_INPUT_OPTIONS = 10;+const MAX_REQUEST_USER_INPUT_TEXT_CHARS = 1_000;+const MAX_REQUEST_USER_INPUT_ANSWER_CHARS = 2_000;+const ASK_USER_CONTINUATION_INTRO = 'The user answered the pending question.';+const ASK_USER_CONTINUATION_OUTRO = 'Continue from the previous turn. Do not ask the same question again.';++function truncateUserInputText(value: string): string {+ return value.length > MAX_REQUEST_USER_INPUT_TEXT_CHARS+ ? value.slice(0, MAX_REQUEST_USER_INPUT_TEXT_CHARS)+ : value;+}++function truncateAnswerText(value: string): string {+ return value.length > MAX_REQUEST_USER_INPUT_ANSWER_CHARS+ ? value.slice(0, MAX_REQUEST_USER_INPUT_ANSWER_CHARS)+ : value;+}++export function emptyUserInputResponse(questions: readonly Pick<ToolRequestUserInputQuestion, 'id'>[]): ToolRequestUserInputResponse {+ const answers: ToolRequestUserInputResponse['answers'] = {};+ for (const q of questions) {+ if (q.id) answers[q.id] = { answers: [] };+ }+ return { answers };+}++export function normalizeRequestUserInputQuestions(+ questions: readonly ToolRequestUserInputQuestion[],+): ToolRequestUserInputQuestion[] {+ return questions.slice(0, MAX_REQUEST_USER_INPUT_QUESTIONS).map((q, index) => ({+ id: q.id || `question-${index + 1}`,+ header: truncateUserInputText(q.header || ''),+ question: truncateUserInputText(q.question || q.header || `Question ${index + 1}`),+ isOther: q.isOther === true,+ isSecret: q.isSecret === true,+ options: Array.isArray(q.options)+ ? q.options.slice(0, MAX_REQUEST_USER_INPUT_OPTIONS).map((option) => ({+ label: truncateUserInputText(option.label || ''),+ description: truncateUserInputText(option.description || ''),+ })).filter((option) => option.label.trim().length > 0)+ : null,+ }));+}++export function normalizeDynamicAskUserQuestions(args: unknown): ToolRequestUserInputQuestion[] {+ const input = args && typeof args === 'object' ? args as { questions?: unknown } : {};+ const rawQuestions = Array.isArray(input.questions) ? input.questions : [];+ const questions: ToolRequestUserInputQuestion[] = rawQuestions.map((raw, index) => {+ const q = raw && typeof raw === 'object' ? raw as Record<string, unknown> : {};+ const rawOptions = Array.isArray(q.options) ? q.options : null;+ return {+ id: typeof q.id === 'string' && q.id.trim() ? q.id : `question-${index + 1}`,+ header: typeof q.header === 'string' ? q.header : '',+ question: typeof q.question === 'string' ? q.question : '',+ isOther: q.isOther === true,+ // Dynamic fallback is a business-choice tool. It must not collect secrets.+ isSecret: false,+ options: rawOptions+ ? rawOptions.map((rawOption) => {+ const option = rawOption && typeof rawOption === 'object'+ ? rawOption as Record<string, unknown>+ : {};+ return {+ label: typeof option.label === 'string' ? option.label : '',+ description: typeof option.description === 'string' ? option.description : '',+ };+ })+ : null,+ };+ });+ return normalizeRequestUserInputQuestions(questions);+}++export function questionsToAskUserItems(questions: readonly ToolRequestUserInputQuestion[]) {+ return questions.map((q) => ({+ question: q.question,+ header: q.header || undefined,+ options: q.options?.map((option) => ({+ label: option.label,+ description: option.description || undefined,+ })),+ multiSelect: false,+ }));+}++export function responseFromAskUserAnswers(+ questions: readonly ToolRequestUserInputQuestion[],+ answers: Record<string, string>,+): ToolRequestUserInputResponse {+ const out: ToolRequestUserInputResponse['answers'] = {};+ for (const q of questions) {+ const raw = answers[q.question] ?? answers[q.header] ?? answers[q.id] ?? '';+ if (!raw) {+ out[q.id] = { answers: [] };+ continue;+ }+ try {+ const parsed = JSON.parse(raw);+ if (Array.isArray(parsed)) {+ out[q.id] = { answers: parsed.filter((v): v is string => typeof v === 'string').map(truncateAnswerText) };+ continue;+ }+ } catch {+ // Single-select answers are plain labels, not JSON.+ }+ out[q.id] = { answers: [truncateAnswerText(raw)] };+ }+ return { answers: out };+}++export function responseFromPermissionDecision(+ questions: readonly ToolRequestUserInputQuestion[],+ decision: Extract<InteractionDecision, { kind: 'permission' }>,+): ToolRequestUserInputResponse {+ if (decision.behavior === 'deny') return emptyUserInputResponse(questions);+ const out: ToolRequestUserInputResponse['answers'] = {};+ for (const q of questions) {+ const positiveOption = q.options?.find((option) =>+ /^(allow|approve|accept|yes|continue|confirm)$/i.test(option.label.trim()),+ );+ const option = positiveOption?.label ?? q.options?.[0]?.label ?? 'allow';+ out[q.id] = { answers: [option] };+ }+ return { answers: out };+}++export function dynamicToolResponseFromUserInput(response: ToolRequestUserInputResponse): DynamicToolCallResponse {+ return {+ success: true,+ contentItems: [{ type: 'inputText', text: JSON.stringify(response.answers) }],+ };+}++export function userInputQuestionsFingerprint(+ questions: readonly ToolRequestUserInputQuestion[],+): string {+ return JSON.stringify(questions.map((question) => ({+ header: question.header,+ question: question.question,+ isOther: question.isOther === true,+ options: (question.options ?? []).map((option) => ({+ label: option.label,+ description: option.description,+ })),+ })));+}++export type UserInputAnswersByPosition = string[][];++export function userInputAnswersByPosition(+ questions: readonly ToolRequestUserInputQuestion[],+ response: ToolRequestUserInputResponse,+): UserInputAnswersByPosition {+ return questions.map((question) =>+ response.answers[question.id]?.answers.slice() ?? [],+ );+}++export function responseFromUserInputAnswersByPosition(+ questions: readonly ToolRequestUserInputQuestion[],+ answersByPosition: readonly (readonly string[])[],+): ToolRequestUserInputResponse {+ const answers: ToolRequestUserInputResponse['answers'] = {};+ questions.forEach((question, index) => {+ answers[question.id] = { answers: [...(answersByPosition[index] ?? [])] };+ });+ return { answers };+}++export function hasSubmittedUserInput(answersByPosition: readonly (readonly string[])[]): boolean {+ return answersByPosition.some((answers) =>+ answers.some((value) => value.trim().length > 0),+ );+}++export function formatAskUserContinuationMessage(+ questions: readonly ToolRequestUserInputQuestion[],+ answers: Record<string, string>,+): string {+ const lines = [ASK_USER_CONTINUATION_INTRO, ''];+ for (const question of questions) {+ const raw = answers[question.question] ?? answers[question.header] ?? answers[question.id] ?? '';+ lines.push(`Q: ${question.question}`);+ lines.push(`A: ${raw.trim() || '(no answer)'}`);+ lines.push('');+ }+ lines.push(ASK_USER_CONTINUATION_OUTRO);+ return lines.join('\n');+}