@hienlh/ppm 0.23.16 → 0.23.17

package/src/providers/codex-app-server/codex-provider.ts

@@ -51,6 +51,7 @@ import { getOrFetchUsage, registerUsageSource } from "../../services/provider-us
 import { codexUsageSource } from "./codex-usage-source.ts";
 import { AMBIENT_ACCOUNT_KEY } from "../../services/provider-usage/usage-source.ts";
 import { redactTruncate } from "./codex-redact.ts";
+import { buildUserInputResponse, normalizeCodexQuestions } from "./codex-user-input.ts";
 import { localizeRollout } from "./codex-rollout-transfer.ts";
 import { getRolloutMessagesAsync } from "./codex-history-async.ts";
 import {
@@ -62,7 +63,6 @@ import type {
   ModelListResponse,
   ServerRequest,
   JsonRpcNotification,
-  ToolRequestUserInputResponse,
   Thread,
   UserInput,
   CodexSkill,
@@ -328,24 +328,6 @@ function approvalToolLabel(method: string, params: unknown): string {
   return String(p.tool ?? "Tool");
 }
 
-function buildUserInputResponse(questions: unknown, data: unknown): ToolRequestUserInputResponse {
-  const answers: ToolRequestUserInputResponse["answers"] = {};
-  if (data && typeof data === "object" && !Array.isArray(data)) {
-    for (const [k, v] of Object.entries(data as Record<string, unknown>)) {
-      answers[k] = { answers: Array.isArray(v) ? v.map(String) : [String(v)] };
-    }
-    return { answers };
-  }
-  const arr = Array.isArray(data) ? data : data != null ? [data] : [];
-  const qs = Array.isArray(questions) ? questions : [];
-  qs.forEach((q, i) => {
-    const qid = (q && typeof q === "object" && ((q as any).id ?? (q as any).questionId)) || String(i);
-    const a = arr[i];
-    answers[qid] = { answers: a != null ? [String(a)] : [] };
-  });
-  return { answers };
-}
-
 /**
  * Codex provider — implements AIProvider directly (mirrors claude-agent-sdk),
  * driving `codex app-server` over JSON-RPC. Per-session live subprocess map;
@@ -1160,7 +1142,7 @@ export class CodexAppServerProvider implements AIProvider {
       const ppmReqId = crypto.randomUUID();
       const questions = (req.params as { questions?: unknown })?.questions;
       live.pendingApprovals.set(ppmReqId, { codexId: req.id, method, questions });
-      live.channel.push({ type: "approval_request", requestId: ppmReqId, tool: "AskUserQuestion", input: redactTruncate(req.params) });
+      live.channel.push({ type: "approval_request", requestId: ppmReqId, tool: "AskUserQuestion", input: { questions: normalizeCodexQuestions(questions) } });
       return;
     }
     // permissions/* response is a granted-profile, not a decision → decline.
@@ -1174,7 +1156,7 @@ export class CodexAppServerProvider implements AIProvider {
       if (!pending) continue;
       live.pendingApprovals.delete(requestId);
       if (pending.method === "item/tool/requestUserInput") {
-        this.respondOnce(live, pending.codexId, buildUserInputResponse(pending.questions, data));
+        this.respondOnce(live, pending.codexId, buildUserInputResponse(pending.questions, approved ? data : undefined));
       } else if (isApprovalMethod(pending.method)) {
         this.respondOnce(live, pending.codexId, decisionFor(pending.method as ApprovalMethod, approved));
       }

package/src/providers/codex-app-server/codex-rollout-items.ts

@@ -1,5 +1,6 @@
 import type { ChatEvent } from "../provider.interface.ts";
 import { redactTruncate } from "./codex-redact.ts";
+import { codexAsyncQuestionEvent } from "./codex-user-input.ts";
 import { parseSubagentActivity, type SubagentActivity } from "./codex-subagent-thread.ts";
 import { changeToToolUse, rolloutFileChanges } from "./codex-patch.ts";
 
@@ -161,6 +162,8 @@ export function mapRolloutItem(item: unknown): RolloutItemMapping {
     return text ? { kind: "user", text } : { kind: "ignore" };
   }
   if (type === "AgentMessage") {
+    const question = codexAsyncQuestionEvent(it);
+    if (question) return { kind: "events", events: [question] };
     const text = textFrom(it.content);
     return text ? { kind: "assistant", text } : { kind: "ignore" };
   }

package/src/providers/codex-app-server/codex-thread-params.ts

@@ -116,6 +116,7 @@ export function dbToolsMcpEnv(access: DbToolsMcpAccess | undefined): Record<stri
 export function buildThreadParams(input: ThreadParamsInput): CodexThreadParams {
   const instructions = input.developerInstructions?.trim();
   const config = {
+    "features.default_mode_request_user_input": true,
     ...(input.configOverrides?.config ?? {}),
     ...designMcpConfig(input.designMcp),
     ...tabToolsMcpConfig(input.tabToolsMcp),

package/src/providers/codex-app-server/codex-user-input.ts

@@ -0,0 +1,41 @@
+import type { ChatEvent } from "../provider.interface.ts";
+import { ASYNC_QUESTION_TOOL, type ChatQuestion } from "../../shared/chat-questions.ts";
+import type { ToolRequestUserInputResponse } from "./codex-protocol.ts";
+
+export function normalizeCodexQuestions(value: unknown): ChatQuestion[] {
+  if (!Array.isArray(value)) return [];
+  return value.flatMap((value, index) => {
+    if (!value || typeof value !== "object") return [];
+    const question = typeof value.question === "string" ? value.question : value.title;
+    if (typeof question !== "string" || !question.trim()) return [];
+    const options = Array.isArray(value.options) ? value.options.flatMap((option: unknown) => {
+      if (typeof option === "string") return [{ label: option }];
+      if (!option || typeof option !== "object" || !("label" in option) || typeof option.label !== "string") return [];
+      return [{ label: option.label, ...("description" in option && typeof option.description === "string" ? { description: option.description } : {}) }];
+    }) : [];
+    return [{ id: typeof value.id === "string" ? value.id : String(index), question,
+      ...(typeof value.header === "string" ? { header: value.header } : {}), options }];
+  });
+}
+
+export function codexAsyncQuestionEvent(item: Record<string, unknown>): ChatEvent | null {
+  if (item.type !== "agentMessage" && item.type !== "AgentMessage") return null;
+  const questions = normalizeCodexQuestions(item.questions);
+  if (typeof item.id !== "string" || !questions.length) return null;
+  return { type: "tool_use", tool: ASYNC_QUESTION_TOOL, toolUseId: item.id, input: { questions } };
+}
+
+export function buildUserInputResponse(questions: unknown, data: unknown): ToolRequestUserInputResponse {
+  const answers: ToolRequestUserInputResponse["answers"] = {};
+  if (!data || typeof data !== "object") return { answers };
+  normalizeCodexQuestions(questions).forEach((question, index) => {
+    const id = question.id!;
+    const value = Array.isArray(data) ? data[index]
+      : Object.hasOwn(data, id) ? (data as Record<string, unknown>)[id]
+      : Object.hasOwn(data, question.question) ? (data as Record<string, unknown>)[question.question] : undefined;
+    if (value != null) Object.defineProperty(answers, id, {
+      value: { answers: Array.isArray(value) ? value.map(String) : [String(value)] }, enumerable: true,
+    });
+  });
+  return { answers };
+}

package/src/shared/chat-questions.ts

@@ -0,0 +1,19 @@
+export interface ChatQuestion {
+  id?: string;
+  question: string;
+  header?: string;
+  options: { label: string; description?: string }[];
+  multiSelect?: boolean;
+}
+
+export const ASYNC_QUESTION_TOOL = "RequestUserInput";
+
+export function questionReplyPrefix(itemId: string): string {
+  return `Answers to Codex question ${encodeURIComponent(itemId)}:\n`;
+}
+
+export function formatQuestionReply(itemId: string, questions: ChatQuestion[], answers?: Record<string, string>): string {
+  return questionReplyPrefix(itemId) + (answers
+    ? questions.map((question) => `${question.question}\n${answers[question.id ?? question.question] ?? ""}`).join("\n\n")
+    : "Skipped by the user.");
+}

package/src/web/components/chat/async-question-card.tsx

@@ -0,0 +1,24 @@
+import { createContext, useContext } from "react";
+import type { ChatMessage } from "../../../types/chat";
+import { formatQuestionReply, questionReplyPrefix, type ChatQuestion } from "../../../shared/chat-questions";
+import { QuestionCard } from "./question-card";
+
+export const AsyncQuestionContext = createContext<{
+  messages: ChatMessage[];
+  onSend?: (content: string) => void;
+}>({ messages: [] });
+
+export function AsyncQuestionCard({ itemId, questions }: { itemId: string; questions: ChatQuestion[] }) {
+  const { messages, onSend } = useContext(AsyncQuestionContext);
+  const prefix = questionReplyPrefix(itemId);
+  const reply = messages.find((message) => message.role === "user" && message.content.startsWith(prefix));
+  if (reply || !onSend) return (
+    <div className="rounded-lg border border-border bg-surface p-3 text-sm whitespace-pre-wrap">
+      {reply ? reply.content.slice(prefix.length) : questions.map((question) => question.question).join("\n")}
+      <div className="mt-2 text-xs text-text-secondary">{reply ? "Response sent" : "Connect to answer this question"}</div>
+    </div>
+  );
+  return <QuestionCard questions={questions} autoFocus={false}
+    onSubmit={(answers) => onSend(formatQuestionReply(itemId, questions, answers))}
+    onSkip={() => onSend(formatQuestionReply(itemId, questions))} />;
+}

package/src/web/components/chat/chat-tab.tsx

@@ -1,4 +1,5 @@
 import { useState, useCallback, useRef, useEffect, useMemo } from "react";
+import { AsyncQuestionContext } from "./async-question-card";
 import { Loader2, Upload, X } from "@/lib/icons";
 import { toast } from "sonner";
 import { api, projectUrl } from "@/lib/api-client";
@@ -1315,7 +1316,7 @@ function ChatTabContent({ metadata, tabId, onNewSession, onFork, historyFilter }
             <span>Starting conversation...</span>
           </div>
         </div>
-      ) : <SessionChangesContext.Provider value={sessionChangesValue}><MessageList
+      ) : <AsyncQuestionContext.Provider value={{ messages: renderedMessages, onSend: isConnected ? (content) => sendMessage(content, { permissionMode }) : undefined }}><SessionChangesContext.Provider value={sessionChangesValue}><MessageList
         messages={renderedMessages}
         onExpandCompact={expandCompact}
         isCompactExpanded={isCompactExpanded}
@@ -1346,7 +1347,7 @@ function ChatTabContent({ metadata, tabId, onNewSession, onFork, historyFilter }
         onDismissMessage={dismissMessage}
         onClearErrors={clearErrors}
         bashPartialOutput={bashPartialOutput}
-      /></SessionChangesContext.Provider>}
+      /></SessionChangesContext.Provider></AsyncQuestionContext.Provider>}
 
       {/* Agents still working — pinned here so it is the last thing under the conversation */}
       <RunningAgentsBar

package/src/web/components/chat/message-events.tsx

@@ -12,6 +12,8 @@ import type { SessionPhase } from "../../../types/api";
 import type { BashPartialEntry } from "../../hooks/use-chat";
 import { ToolCard } from "./tool-cards";
 import { MarkdownContent } from "./message-markdown";
+import { AsyncQuestionCard } from "./async-question-card";
+import { ASYNC_QUESTION_TOOL, type ChatQuestion } from "../../../shared/chat-questions";
 
 /**
  * Renders events in order — consecutive text events merged into one bubble,
@@ -163,6 +165,10 @@ export function InterleavedEvents({ events, isStreaming, projectName, bashPartia
             </div>
           );
         }
+        if (group.tool.type === "tool_use" && group.tool.tool === ASYNC_QUESTION_TOOL && !group.tool.parentToolUseId) {
+          const input = group.tool.input as { questions: ChatQuestion[] };
+          return <AsyncQuestionCard key={group.tool.toolUseId} itemId={group.tool.toolUseId!} questions={input.questions} />;
+        }
         return <ToolCard key={`tool-${i}`} tool={group.tool} result={group.result} completed={group.completed} projectName={projectName} bashPartialOutput={bashPartialOutput} />;
       })}
     </>

package/src/web/components/chat/question-card.tsx

@@ -1,4 +1,5 @@
 import { useState, useCallback, useMemo, useEffect, useRef } from "react";
+import type { ChatQuestion } from "../../../shared/chat-questions";
 
 /* ── Types ── */
 export interface QuestionOption {
@@ -6,17 +7,13 @@ export interface QuestionOption {
   description?: string;
 }
 
-export interface Question {
-  question: string;
-  header?: string;
-  options: QuestionOption[];
-  multiSelect?: boolean;
-}
+export type Question = ChatQuestion;
 
 interface QuestionCardProps {
   questions: Question[];
   onSubmit: (answers: Record<string, string>) => void;
   onSkip: () => void;
+  autoFocus?: boolean;
 }
 
 /* ── Hook: form state ── */
@@ -81,6 +78,7 @@ function useQuestionKeyboard(config: {
   onSubmit: () => void;
   customInputRef: React.RefObject<HTMLInputElement | null>;
   enabled: boolean;
+  autoFocus: boolean;
 }) {
   const [focusedOption, setFocusedOption] = useState(0);
   const containerRef = useRef<HTMLDivElement>(null);
@@ -139,7 +137,7 @@ function useQuestionKeyboard(config: {
       // Same reason: asking the main document whether focus is already inside the card answers
       // "no" for a card living in another document, and this effect re-runs on every render —
       // which would yank focus out of the custom input after each keystroke.
-      if (!el.contains(el.ownerDocument.activeElement)) el.focus();
+      if (config.autoFocus && !el.contains(el.ownerDocument.activeElement)) el.focus();
     }
     return () => { el?.removeEventListener("keydown", handleKeyDown); };
   }, [config, focusedOption]);
@@ -148,7 +146,7 @@ function useQuestionKeyboard(config: {
 }
 
 /* ── Component ── */
-export function QuestionCard({ questions, onSubmit, onSkip }: QuestionCardProps) {
+export function QuestionCard({ questions, onSubmit, onSkip, autoFocus = true }: QuestionCardProps) {
   const customInputRef = useRef<HTMLInputElement>(null);
   const form = useQuestionForm(questions);
   const currentQ = questions[form.activeTab];
@@ -158,7 +156,7 @@ export function QuestionCard({ questions, onSubmit, onSkip }: QuestionCardProps)
   const handleSubmit = useCallback(() => {
     if (!form.allAnswered) return;
     const result: Record<string, string> = {};
-    questions.forEach((q, i) => { result[q.question] = form.getFinalAnswer(i); });
+    questions.forEach((q, i) => { result[q.id ?? q.question] = form.getFinalAnswer(i); });
     onSubmit(result);
   }, [form.allAnswered, form.getFinalAnswer, questions, onSubmit]);
 
@@ -182,7 +180,7 @@ export function QuestionCard({ questions, onSubmit, onSkip }: QuestionCardProps)
     allAnswered: form.allAnswered, hasAnswer: form.hasAnswer,
     onSelectOption: handleSelectOption,
     goToNextTab: form.goToNextTab, goToPrevTab: form.goToPrevTab,
-    onSubmit: handleSubmit, customInputRef, enabled: true,
+    onSubmit: handleSubmit, customInputRef, enabled: true, autoFocus,
   });
 
   const selectWithFocus = useCallback(

package/src/web/components/chat/tool-cards.tsx

@@ -626,7 +626,7 @@ function ToolDetails({
         </div>
       );
     case "AskUserQuestion": {
-      const qs = (input.questions as Array<{ question: string; header?: string; options: Array<{ label: string; description?: string }>; multiSelect?: boolean }>) ?? [];
+      const qs = (input.questions as Array<{ id?: string; question: string; header?: string; options: Array<{ label: string; description?: string }>; multiSelect?: boolean }>) ?? [];
       const answers = (input.answers as Record<string, string>) ?? {};
       return (
         <div className="space-y-2">
@@ -635,7 +635,7 @@ function ToolDetails({
               <p className="text-text-primary font-medium">{q.header ? `${q.header}: ` : ""}{q.question}</p>
               <div className="flex flex-wrap gap-1">
                 {q.options.map((opt, oi) => {
-                  const answer = answers[q.question] ?? "";
+                  const answer = answers[q.id ?? q.question] ?? answers[q.question] ?? "";
                   const isSelected = answer.split(", ").includes(opt.label);
                   return (
                     <span key={oi} className={`inline-block rounded px-1.5 py-0.5 text-xs border ${
@@ -646,8 +646,8 @@ function ToolDetails({
                   );
                 })}
               </div>
-              {answers[q.question] && (
-                <p className="text-foreground text-xs">Answer: {answers[q.question]}</p>
+              {(answers[q.id ?? q.question] ?? answers[q.question]) && (
+                <p className="text-foreground text-xs">Answer: {answers[q.id ?? q.question] ?? answers[q.question]}</p>
               )}
             </div>
           ))}