openfox 2.0.4 → 2.0.5

package/dist/{ask-5SSOA6SZ.js → ask-4GZ334CO.js}

@@ -4,16 +4,18 @@ import {
   awaitAnswer,
   cancelQuestion,
   cancelQuestionsForSession,
+  getPendingQuestionsForSession,
   hasPendingQuestion,
   provideAnswer
-} from "./chunk-BJYPTN5S.js";
+} from "./chunk-EU3WWTFH.js";
 export {
   AskUserInterrupt,
   askUserTool,
   awaitAnswer,
   cancelQuestion,
   cancelQuestionsForSession,
+  getPendingQuestionsForSession,
   hasPendingQuestion,
   provideAnswer
 };
-//# sourceMappingURL=ask-5SSOA6SZ.js.map
+//# sourceMappingURL=ask-4GZ334CO.js.map

package/dist/{chat-handler-WHE75FCD.js → chat-handler-RQXMBCKX.js}

@@ -5,28 +5,28 @@ import {
   generateSessionName,
   getSessionMessageCount,
   needsNameGenerationCheck
-} from "./chunk-KXJWTSOS.js";
+} from "./chunk-TIKQWNYK.js";
 import {
   runChatTurn
-} from "./chunk-STJJDIXV.js";
-import "./chunk-N374WCXC.js";
+} from "./chunk-7EHJPONC.js";
+import "./chunk-7S6FKODI.js";
 import "./chunk-DL6ZILAF.js";
 import "./chunk-PBGOZMVY.js";
 import "./chunk-VRGRAQDG.js";
 import "./chunk-XAMAYRDA.js";
 import {
   getEventStore
-} from "./chunk-FRJQC77Y.js";
-import "./chunk-4HBWSC6K.js";
+} from "./chunk-SYG2ENUQ.js";
+import "./chunk-LX66KJPL.js";
 import {
   createChatMessageMessage,
   createPhaseChangedMessage,
   createSessionRunningMessage
-} from "./chunk-DTJJZZOC.js";
-import "./chunk-BJYPTN5S.js";
+} from "./chunk-3QB2RMX2.js";
+import "./chunk-EU3WWTFH.js";
 import "./chunk-RFNEDBVO.js";
 import "./chunk-FBGWG4N6.js";
-import "./chunk-LVS5YGTX.js";
+import "./chunk-5BDVM6YI.js";
 import "./chunk-CQGTEGKL.js";
 import "./chunk-Z4SWOUWC.js";
 import {
@@ -161,4 +161,4 @@ export {
   startChatSession,
   stopSessionExecution
 };
-//# sourceMappingURL=chat-handler-WHE75FCD.js.map
+//# sourceMappingURL=chat-handler-RQXMBCKX.js.map

package/dist/{chunk-DTJJZZOC.js → chunk-3QB2RMX2.js}

@@ -1,7 +1,7 @@
 import {
   createServerMessage,
   isClientMessage
-} from "./chunk-LVS5YGTX.js";
+} from "./chunk-5BDVM6YI.js";
 
 // src/server/ws/protocol.ts
 function enrichMessagesWithToolResults(messages) {
@@ -43,11 +43,17 @@ function serializeServerMessage(message) {
 function createErrorMessage(code, message, correlationId) {
   return createServerMessage("error", { code, message }, correlationId);
 }
-function createSessionStateMessage(session, messages, pendingConfirmations = [], gitStatus, correlationId) {
+function createSessionStateMessage(session, messages, pendingConfirmations = [], pendingQuestions, gitStatus, correlationId) {
   const enrichedMessages = enrichMessagesWithToolResults(messages);
   return createServerMessage(
     "session.state",
-    { session, messages: enrichedMessages, pendingConfirmations, ...gitStatus ? { gitStatus } : {} },
+    {
+      session,
+      messages: enrichedMessages,
+      pendingConfirmations,
+      ...pendingQuestions ? { pendingQuestions } : {},
+      ...gitStatus ? { gitStatus } : {}
+    },
     correlationId
   );
 }
@@ -123,8 +129,8 @@ function createChatErrorMessage(error, recoverable) {
 function createChatPathConfirmationMessage(callId, tool, paths, workdir, reason) {
   return createServerMessage("chat.path_confirmation", { callId, tool, paths, workdir, reason });
 }
-function createChatAskUserMessage(callId, question) {
-  return createServerMessage("chat.ask_user", { callId, question });
+function createChatAskUserMessage(callId, question, type, options) {
+  return createServerMessage("chat.ask_user", { callId, question, type, options });
 }
 function createModeChangedMessage(mode, auto, reason) {
   return createServerMessage("mode.changed", { mode, auto, ...reason ? { reason } : {} });
@@ -281,7 +287,7 @@ function storedEventToServerMessage(event) {
     }
     case "chat.ask_user": {
       const data = event.data;
-      return createChatAskUserMessage(data.callId, data.question);
+      return createChatAskUserMessage(data.callId, data.question, data.type, data.options);
     }
     case "pattern.retry": {
       const data = event.data;
@@ -333,4 +339,4 @@ export {
   createQueueStateMessage,
   storedEventToServerMessage
 };
-//# sourceMappingURL=chunk-DTJJZZOC.js.map
+//# sourceMappingURL=chunk-3QB2RMX2.js.map

package/dist/{chunk-LVS5YGTX.js → chunk-5BDVM6YI.js}

@@ -26,4 +26,4 @@ export {
   isClientMessage,
   isServerMessage
 };
-//# sourceMappingURL=chunk-LVS5YGTX.js.map
+//# sourceMappingURL=chunk-5BDVM6YI.js.map

package/dist/{chunk-RVXAYREQ.js → chunk-734M5CG5.js}

@@ -193,7 +193,7 @@ async function runCli(options) {
       if (!configExists) {
         await runNetworkSetup(mode);
       }
-      const { runServe } = await import("./serve-XPCJSKXX.js");
+      const { runServe } = await import("./serve-YJIMBTIX.js");
       const serveOptions = { mode };
       if (values.port) serveOptions.port = parseInt(values.port);
       if (values["no-browser"] === true) serveOptions.openBrowser = false;
@@ -205,4 +205,4 @@ async function runCli(options) {
 export {
   runCli
 };
-//# sourceMappingURL=chunk-RVXAYREQ.js.map
+//# sourceMappingURL=chunk-734M5CG5.js.map

package/dist/{chunk-STJJDIXV.js → chunk-7EHJPONC.js}

@@ -17,16 +17,16 @@ import {
   loadAllAgentsDefault,
   processEventsForConversation,
   runTopLevelAgentLoop
-} from "./chunk-N374WCXC.js";
+} from "./chunk-7S6FKODI.js";
 import {
   getCurrentContextWindowId,
   getCurrentWindowMessageOptions,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-FRJQC77Y.js";
+} from "./chunk-SYG2ENUQ.js";
 import {
   buildSnapshotFromSessionState
-} from "./chunk-4HBWSC6K.js";
+} from "./chunk-LX66KJPL.js";
 import {
   getGlobalConfigDir
 } from "./chunk-CQGTEGKL.js";
@@ -311,4 +311,4 @@ export {
   runAgentTurn,
   injectWorkflowKickoffIfNeeded
 };
-//# sourceMappingURL=chunk-STJJDIXV.js.map
+//# sourceMappingURL=chunk-7EHJPONC.js.map

package/dist/{chunk-N374WCXC.js → chunk-7S6FKODI.js}

@@ -22,7 +22,7 @@ import {
   getCurrentWindowMessageOptions,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-FRJQC77Y.js";
+} from "./chunk-SYG2ENUQ.js";
 import {
   buildContextMessagesFromEventHistory,
   foldContextState,
@@ -31,18 +31,18 @@ import {
   handleToolCall,
   handleToolResult,
   stripOrphanedToolCalls
-} from "./chunk-4HBWSC6K.js";
+} from "./chunk-LX66KJPL.js";
 import {
   createChatDoneMessage,
   createChatMessageMessage,
   createChatMessageUpdatedMessage,
   createChatPathConfirmationMessage,
   createQueueStateMessage
-} from "./chunk-DTJJZZOC.js";
+} from "./chunk-3QB2RMX2.js";
 import {
   AskUserInterrupt,
   askUserTool
-} from "./chunk-BJYPTN5S.js";
+} from "./chunk-EU3WWTFH.js";
 import {
   SETTINGS_KEYS,
   deleteSetting,
@@ -2647,9 +2647,9 @@ async function executeTools(assistantMsgId, toolCalls, ctx, append) {
     } else if (error instanceof AskUserInterrupt) {
       append({
         type: "chat.ask_user",
-        data: { callId: error.callId, question: error.question }
+        data: { callId: error.callId, question: error.question, type: error.type, options: error.options }
       });
-      const { awaitAnswer } = await import("./ask-5SSOA6SZ.js");
+      const { awaitAnswer } = await import("./ask-4GZ334CO.js");
       const answerPromise = awaitAnswer(error.callId);
       if (!answerPromise) {
         throw new Error(`No pending question found for callId: ${error.callId}`);
@@ -2676,7 +2676,6 @@ async function executeTools(assistantMsgId, toolCalls, ctx, append) {
         durationMs: 0,
         truncated: false
       };
-      ctx.turnMetrics.addToolTime(toolResult2.durationMs);
       append(createToolResultEvent(assistantMsgId, toolCall.id, toolResult2));
       return {
         toolCall,
@@ -2708,7 +2707,6 @@ async function executeTools(assistantMsgId, toolCalls, ctx, append) {
     } catch (error) {
       toolResult = await handleToolExecutionError(error, ctx.sessionId, startTime);
     }
-    ctx.turnMetrics.addToolTime(toolResult.durationMs);
     ctx.onToolExecuted?.(toolCall, toolResult);
     if (toolCall.name === "return_value" && !toolCall.parseError) {
       returnValueContent = toolCall.arguments["content"];
@@ -2730,8 +2728,10 @@ Error: ${toolResult.error}` : `Error: ${toolResult.error}`
       index
     };
   };
+  const batchStart = Date.now();
   const executionPromises = toolCalls.map((toolCall, index) => executeTool(toolCall, index));
   const results = await Promise.all(executionPromises);
+  ctx.turnMetrics.addToolTime(Date.now() - batchStart);
   results.sort((a, b) => a.index - b.index);
   for (const result of results) {
     toolMessages.push({
@@ -3761,7 +3761,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-22OPY2O7.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-Z6KF35SO.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -4811,4 +4811,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-N374WCXC.js.map
+//# sourceMappingURL=chunk-7S6FKODI.js.map

package/dist/{chunk-O2MR653P.js → chunk-DXV74LCI.js}

@@ -3,7 +3,7 @@ import {
   injectWorkflowKickoffIfNeeded,
   runAgentTurn,
   runChatTurn
-} from "./chunk-STJJDIXV.js";
+} from "./chunk-7EHJPONC.js";
 import {
   COMPACTION_PROMPT,
   TurnMetrics,
@@ -58,7 +58,7 @@ import {
   skillExists,
   spawnShellProcess,
   streamLLMPure
-} from "./chunk-N374WCXC.js";
+} from "./chunk-7S6FKODI.js";
 import {
   getPathSeparator,
   getPlatformShell,
@@ -95,11 +95,11 @@ import {
   updateSessionMetadata,
   updateSessionProvider,
   updateSessionRunning
-} from "./chunk-FRJQC77Y.js";
+} from "./chunk-SYG2ENUQ.js";
 import {
   buildMessagesFromStoredEvents,
   foldPendingConfirmations
-} from "./chunk-4HBWSC6K.js";
+} from "./chunk-LX66KJPL.js";
 import {
   createChatErrorMessage,
   createChatMessageMessage,
@@ -114,11 +114,11 @@ import {
   parseClientMessage,
   serializeServerMessage,
   storedEventToServerMessage
-} from "./chunk-DTJJZZOC.js";
+} from "./chunk-3QB2RMX2.js";
 import {
   EventEmitter,
   provideAnswer
-} from "./chunk-BJYPTN5S.js";
+} from "./chunk-EU3WWTFH.js";
 import {
   initDatabase
 } from "./chunk-FBGWG4N6.js";
@@ -127,7 +127,7 @@ import {
 } from "./chunk-VUQCQXXJ.js";
 import {
   createServerMessage
-} from "./chunk-LVS5YGTX.js";
+} from "./chunk-5BDVM6YI.js";
 import {
   getGlobalConfigDir
 } from "./chunk-CQGTEGKL.js";
@@ -690,6 +690,26 @@ var RULES = [
   // -------------------------------------------------------------------------
   // Ask User Tool
   // -------------------------------------------------------------------------
+  // Specific type rules must come before generic ask rules
+  {
+    match: /confirm.*question/i,
+    tools: [{ name: "ask_user", arguments: { question: "Do you approve?", type: "confirm" } }],
+    response: "I asked a confirm question."
+  },
+  {
+    match: /choose.*option/i,
+    tools: [
+      {
+        name: "ask_user",
+        arguments: {
+          question: "Which option do you prefer?",
+          type: "choice",
+          options: ["Option A", "Option B", "Option C"]
+        }
+      }
+    ],
+    response: "I asked a choice question."
+  },
   {
     match: /ask.*user|ask.*question|clarif/i,
     tools: [{ name: "ask_user", arguments: { question: "What would you like me to do?" } }],
@@ -3263,7 +3283,12 @@ async function handleClientMessage(ws, client, message, _getLLMClient, _getActiv
           const compactEvents = compactEventStore.getEvents(sessionId);
           const compactMessages = buildMessagesFromStoredEvents(compactEvents);
           const pendingConfirmations = foldPendingConfirmations(compactEvents);
-          sendForSession(sessionId, createSessionStateMessage(updatedSession, compactMessages, pendingConfirmations));
+          const { getPendingQuestionsForSession } = await import("./tools-Z6KF35SO.js");
+          const pendingQuestions = getPendingQuestionsForSession(sessionId);
+          sendForSession(
+            sessionId,
+            createSessionStateMessage(updatedSession, compactMessages, pendingConfirmations, pendingQuestions)
+          );
         } catch (error) {
           logger.error("Compaction failed", { error, sessionId });
           sendForSession(
@@ -3471,8 +3496,8 @@ ${content}` : workflowInfo;
         send(createErrorMessage("INVALID_PAYLOAD", "Invalid ask.answer payload", message.id));
         return;
       }
-      const { callId, answer } = message.payload;
-      const found = provideAnswer(callId, answer);
+      const { callId, answer, skip } = message.payload;
+      const found = provideAnswer(callId, answer, skip);
       if (!found) {
         send(createErrorMessage("NOT_FOUND", "No pending question with that ID", message.id));
         return;
@@ -5793,7 +5818,7 @@ import { Router as Router6 } from "express";
 import { spawn as spawn5 } from "child_process";
 
 // src/constants.ts
-var VERSION = "2.0.4";
+var VERSION = "2.0.5";
 
 // src/server/routes/auto-update.ts
 var updateInProgress = false;
@@ -6086,7 +6111,7 @@ async function createServerHandle(config4) {
     res.json({ project });
   });
   app.get("/api/sessions", async (req, res) => {
-    const { getRecentUserPromptsForSession } = await import("./events-5SWEG62X.js");
+    const { getRecentUserPromptsForSession } = await import("./events-4K52FKPR.js");
     const projectId = req.query["projectId"];
     const limit = Math.min(parseInt(req.query["limit"]) || 20, 100);
     const offset = parseInt(req.query["offset"]) || 0;
@@ -6119,8 +6144,9 @@ async function createServerHandle(config4) {
     res.status(201).json({ session });
   });
   app.get("/api/sessions/:id", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-5SWEG62X.js");
-    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-NUBDA4HS.js");
+    const { getEventStore: getEventStore2 } = await import("./events-4K52FKPR.js");
+    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-QIBNKYA6.js");
+    const { getPendingQuestionsForSession } = await import("./tools-Z6KF35SO.js");
     const session = sessionManager.getSession(req.params.id);
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
@@ -6130,7 +6156,8 @@ async function createServerHandle(config4) {
     const messages = buildMessagesFromStoredEvents2(events);
     const contextState = sessionManager.getContextState(req.params.id);
     const queueState = sessionManager.getQueueState(req.params.id);
-    res.json({ session, messages, contextState, queueState });
+    const pendingQuestions = getPendingQuestionsForSession(req.params.id);
+    res.json({ session, messages, contextState, queueState, pendingQuestions });
   });
   app.delete("/api/sessions/:id", (req, res) => {
     const session = sessionManager.getSession(req.params["id"]);
@@ -6150,8 +6177,8 @@ async function createServerHandle(config4) {
     res.json({ success: true });
   });
   app.post("/api/sessions/:id/provider", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-5SWEG62X.js");
-    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-NUBDA4HS.js");
+    const { getEventStore: getEventStore2 } = await import("./events-4K52FKPR.js");
+    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-QIBNKYA6.js");
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
     if (!session) {
@@ -6193,8 +6220,8 @@ async function createServerHandle(config4) {
     res.json({ success: true });
   });
   app.put("/api/sessions/:id/mode", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-5SWEG62X.js");
-    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-NUBDA4HS.js");
+    const { getEventStore: getEventStore2 } = await import("./events-4K52FKPR.js");
+    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-QIBNKYA6.js");
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
     if (!session) {
@@ -6250,32 +6277,37 @@ async function createServerHandle(config4) {
     if (!callId || approved === void 0) {
       return res.status(400).json({ error: "callId and approved are required" });
     }
-    const { providePathConfirmation } = await import("./tools-22OPY2O7.js");
+    const { providePathConfirmation } = await import("./tools-Z6KF35SO.js");
     const result = providePathConfirmation(callId, approved, alwaysAllow);
     if (!result.found) {
       return res.status(404).json({ error: "No pending path confirmation with that ID" });
     }
-    const { getEventStore: getEventStore2 } = await import("./events-5SWEG62X.js");
-    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2, foldPendingConfirmations: foldPendingConfirmations2 } = await import("./folding-NUBDA4HS.js");
-    const { createSessionStateMessage: createSessionStateMessage2 } = await import("./protocol-X53W2J73.js");
+    const { getEventStore: getEventStore2 } = await import("./events-4K52FKPR.js");
+    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2, foldPendingConfirmations: foldPendingConfirmations2 } = await import("./folding-QIBNKYA6.js");
+    const { createSessionStateMessage: createSessionStateMessage2 } = await import("./protocol-YYWMFR35.js");
+    const { getPendingQuestionsForSession } = await import("./tools-Z6KF35SO.js");
     const eventStore = getEventStore2();
     const events = eventStore.getEvents(sessionId);
     const messages = buildMessagesFromStoredEvents2(events);
     const pendingConfirmations = foldPendingConfirmations2(events);
+    const pendingQuestions = getPendingQuestionsForSession(sessionId);
     const session = sessionManager.getSession(sessionId);
     if (session) {
-      const stateMsg = createSessionStateMessage2(session, messages, pendingConfirmations);
+      const stateMsg = createSessionStateMessage2(session, messages, pendingConfirmations, pendingQuestions);
       wssExports.broadcastForSession(sessionId, { ...stateMsg, sessionId });
     }
     res.json({ success: true });
   });
   app.post("/api/sessions/:id/answer", async (req, res) => {
-    const { callId, answer } = req.body;
-    if (!callId || !answer) {
-      return res.status(400).json({ error: "callId and answer are required" });
+    const { callId, answer, skip } = req.body;
+    if (!callId) {
+      return res.status(400).json({ error: "callId is required" });
+    }
+    if (!skip && typeof answer !== "string") {
+      return res.status(400).json({ error: "answer is required when not skipping" });
     }
-    const { provideAnswer: provideAnswer2 } = await import("./tools-22OPY2O7.js");
-    const found = provideAnswer2(callId, answer);
+    const { provideAnswer: provideAnswer2 } = await import("./tools-Z6KF35SO.js");
+    const found = provideAnswer2(callId, answer ?? "", skip ?? false);
     if (!found) {
       return res.status(404).json({ error: "No pending question with that ID" });
     }
@@ -6310,15 +6342,15 @@ async function createServerHandle(config4) {
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
     }
-    const { stopSessionExecution } = await import("./chat-handler-WHE75FCD.js");
-    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-22OPY2O7.js");
+    const { stopSessionExecution } = await import("./chat-handler-RQXMBCKX.js");
+    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-Z6KF35SO.js");
     const queuedMessages = sessionManager.getQueueState(sessionId);
     sessionManager.clearMessageQueue(sessionId);
     stopSessionExecution(sessionId, sessionManager);
     abortSession(sessionId);
     cancelQuestionsForSession(sessionId, "Session stopped by user");
     cancelPathConfirmationsForSession(sessionId, "Session stopped by user");
-    const eventStore = (await import("./events-5SWEG62X.js")).getEventStore();
+    const eventStore = (await import("./events-4K52FKPR.js")).getEventStore();
     eventStore.append(sessionId, { type: "running.changed", data: { isRunning: false } });
     res.json({ success: true, queuedMessages });
   });
@@ -6332,7 +6364,7 @@ async function createServerHandle(config4) {
     if (typeof messageIndex !== "number" || messageIndex < 0) {
       return res.status(400).json({ error: "messageIndex must be a non-negative number" });
     }
-    const { truncateSessionMessages } = await import("./events-5SWEG62X.js");
+    const { truncateSessionMessages } = await import("./events-4K52FKPR.js");
     truncateSessionMessages(sessionId, messageIndex);
     res.json({ success: true });
   });
@@ -6350,7 +6382,7 @@ async function createServerHandle(config4) {
     if (!msg) {
       return res.status(400).json({ error: "Message not found at this index" });
     }
-    const { truncateSessionMessages } = await import("./events-5SWEG62X.js");
+    const { truncateSessionMessages } = await import("./events-4K52FKPR.js");
     truncateSessionMessages(sessionId, messageIndex - 1);
     sessionManager.queueMessage(sessionId, "asap", msg.content, msg.attachments, msg.messageKind);
     res.json({ success: true });
@@ -6921,7 +6953,7 @@ async function createServerHandle(config4) {
     providerManager
   );
   const wss = wssExports.wss;
-  const { QueueProcessor } = await import("./processor-7TYZNS4I.js");
+  const { QueueProcessor } = await import("./processor-KRBBTKRS.js");
   const queueProcessor = new QueueProcessor({
     sessionManager,
     providerManager,
@@ -6995,4 +7027,4 @@ export {
   createServerHandle,
   createServer
 };
-//# sourceMappingURL=chunk-O2MR653P.js.map
+//# sourceMappingURL=chunk-DXV74LCI.js.map

package/dist/{chunk-BJYPTN5S.js → chunk-EU3WWTFH.js}

@@ -48,6 +48,16 @@ var askUserTool = {
           question: {
             type: "string",
             description: "The question to ask the user"
+          },
+          type: {
+            type: "string",
+            enum: ["text", "confirm", "choice"],
+            description: "Type of question (text, confirm, or choice)"
+          },
+          options: {
+            type: "array",
+            items: { type: "string" },
+            description: "Options for choice-type questions"
           }
         },
         required: ["question"]
@@ -56,7 +66,9 @@ var askUserTool = {
   },
   async execute(args, context) {
     const question = args["question"];
-    const callId = crypto.randomUUID();
+    const type = args["type"] ?? "text";
+    const options = args["options"];
+    const callId = context.toolCallId ?? crypto.randomUUID();
     const deferred = createDeferred();
     void deferred.promise.catch(() => {
     });
@@ -64,25 +76,30 @@ var askUserTool = {
       promise: deferred.promise,
       resolve: deferred.resolve,
       reject: deferred.reject,
-      sessionId: context.sessionId
+      sessionId: context.sessionId,
+      question,
+      type,
+      options
     });
-    throw new AskUserInterrupt(callId, question);
+    throw new AskUserInterrupt(callId, question, type, options);
   }
 };
 var AskUserInterrupt = class extends Error {
-  constructor(callId, question) {
+  constructor(callId, question, type = "text", options) {
     super("Ask user interrupt");
     this.callId = callId;
     this.question = question;
+    this.type = type;
+    this.options = options;
     this.name = "AskUserInterrupt";
   }
 };
-function provideAnswer(callId, answer) {
+function provideAnswer(callId, answer, skip) {
   const pending = pendingQuestions.get(callId);
   if (!pending) {
     return false;
   }
-  pending.resolve(answer);
+  pending.resolve(skip ? "[user skipped]" : answer);
   pendingQuestions.delete(callId);
   return true;
 }
@@ -114,6 +131,15 @@ function awaitAnswer(callId) {
   const pending = pendingQuestions.get(callId);
   return pending?.promise ?? null;
 }
+function getPendingQuestionsForSession(sessionId) {
+  const result = [];
+  for (const [callId, pending] of pendingQuestions.entries()) {
+    if (pending.sessionId === sessionId) {
+      result.push({ callId, question: pending.question, type: pending.type, options: pending.options });
+    }
+  }
+  return result;
+}
 
 export {
   EventEmitter,
@@ -123,6 +149,7 @@ export {
   cancelQuestion,
   cancelQuestionsForSession,
   hasPendingQuestion,
-  awaitAnswer
+  awaitAnswer,
+  getPendingQuestionsForSession
 };
-//# sourceMappingURL=chunk-BJYPTN5S.js.map
+//# sourceMappingURL=chunk-EU3WWTFH.js.map

package/dist/{chunk-4HBWSC6K.js → chunk-LX66KJPL.js}

@@ -694,7 +694,7 @@ function foldSessionState(events, initialWindowId, maxTokens, initialMessages) {
       }
       case "chat.ask_user": {
         const data = event.data;
-        pendingUserInput = { callId: data.callId, question: data.question };
+        pendingUserInput = { callId: data.callId, question: data.question, type: data.type, options: data.options };
         break;
       }
       case "task.completed": {
@@ -856,4 +856,4 @@ export {
   getMessagesForWindow,
   buildContextMessagesFromMessages
 };
-//# sourceMappingURL=chunk-4HBWSC6K.js.map
+//# sourceMappingURL=chunk-LX66KJPL.js.map

package/dist/{chunk-FRJQC77Y.js → chunk-SYG2ENUQ.js}

@@ -5,7 +5,7 @@ import {
   foldContextState,
   foldSessionState,
   spreadOptionalMessageFields
-} from "./chunk-4HBWSC6K.js";
+} from "./chunk-LX66KJPL.js";
 import {
   getDatabase
 } from "./chunk-FBGWG4N6.js";
@@ -1397,4 +1397,4 @@ export {
   truncateSessionMessages,
   getRecentUserPromptsForSession
 };
-//# sourceMappingURL=chunk-FRJQC77Y.js.map
+//# sourceMappingURL=chunk-SYG2ENUQ.js.map