@dexto/tui 1.13.5 → 1.14.0

package/dist/containers/InputContainer.cjs

@@ -50,6 +50,7 @@ const InputContainer = (0, import_react.forwardRef)(
     ui,
     session,
     initialPrompt,
+    isHydratingHistory,
     approval,
     steerMessages,
     queuedMessages,
@@ -74,6 +75,14 @@ const InputContainer = (0, import_react.forwardRef)(
     const queuedEditPendingRef = (0, import_react.useRef)(false);
     const [isQueuedEditPending, setIsQueuedEditPending] = import_react.default.useState(false);
     const didAutoSubmitInitialPromptRef = (0, import_react.useRef)(false);
+    const initialPromptSessionIdRef = (0, import_react.useRef)(session.id);
+    const [isSubmittingInitialPrompt, setIsSubmittingInitialPrompt] = import_react.default.useState(
+      Boolean(initialPrompt)
+    );
+    const [deferredSubmissions, setDeferredSubmissions] = import_react.default.useState(
+      []
+    );
+    const isSubmittingDeferredRef = (0, import_react.useRef)(false);
     const soundService = (0, import_contexts.useSoundService)();
     const autoApproveEditsRef = (0, import_react.useRef)(ui.autoApproveEdits);
     (0, import_react.useEffect)(() => {
@@ -397,38 +406,70 @@ const InputContainer = (0, import_react.forwardRef)(
       return result;
     }, []);
     const handleSubmit = (0, import_react.useCallback)(
-      async (value, bypassOverlayCheck = false, queueAsFollowUp = false) => {
-        const expandedValue = expandPasteBlocks(value, input.pastedBlocks);
+      async (value, bypassOverlayCheck = false, queueAsFollowUp = false, submittedInput) => {
+        if (!submittedInput && (isHydratingHistory || deferredSubmissions.length > 0)) {
+          if (!value.trim()) return;
+          if (!bypassOverlayCheck && ui.activeOverlay !== "none" && ui.activeOverlay !== "approval")
+            return;
+          const completion = new Promise((resolve, reject) => {
+            setDeferredSubmissions((previous) => [
+              ...previous,
+              {
+                value,
+                input,
+                sessionId: session.id,
+                queueAsFollowUp,
+                resolve,
+                reject
+              }
+            ]);
+          });
+          buffer.setText("");
+          setInput((previous) => ({
+            ...previous,
+            value: "",
+            images: [],
+            pastedBlocks: [],
+            historyIndex: -1,
+            draftBeforeHistory: "",
+            editingQueuedFollowUp: false
+          }));
+          return completion;
+        }
+        const composer = submittedInput ?? input;
+        const expandedValue = expandPasteBlocks(value, composer.pastedBlocks);
         const trimmed = expandedValue.trim();
         if (!trimmed) return;
         if (ui.isProcessing && session.id) {
           const content = [{ type: "text", text: trimmed }];
-          for (const img of input.images) {
+          for (const img of composer.images) {
             content.push({
               type: "image",
               image: img.data,
               mimeType: img.mimeType
             });
           }
-          const submitAsFollowUp = queueAsFollowUp || input.editingQueuedFollowUp;
+          const submitAsFollowUp = queueAsFollowUp || composer.editingQueuedFollowUp;
           try {
             if (submitAsFollowUp) {
               await agent.followUp(session.id, { content });
             } else {
               await agent.steer(session.id, { content });
             }
-            buffer.setText("");
+            if (!submittedInput) buffer.setText("");
             setInput((prev) => {
               const newHistory = prev.history.length > 0 && prev.history[prev.history.length - 1] === trimmed ? prev.history : [...prev.history, trimmed].slice(-100);
               return {
                 ...prev,
-                value: "",
+                ...submittedInput ? {} : {
+                  value: "",
+                  images: [],
+                  pastedBlocks: [],
+                  editingQueuedFollowUp: false,
+                  draftBeforeHistory: ""
+                },
                 history: newHistory,
-                historyIndex: -1,
-                draftBeforeHistory: "",
-                editingQueuedFollowUp: false,
-                images: [],
-                pastedBlocks: []
+                historyIndex: -1
               };
             });
           } catch (error) {
@@ -447,24 +488,23 @@ const InputContainer = (0, import_react.forwardRef)(
         if (!bypassOverlayCheck && ui.activeOverlay !== "none" && ui.activeOverlay !== "approval") {
           return;
         }
-        const pendingImages = [...input.images];
+        const pendingImages = [...composer.images];
         const userMessage = (0, import_messageFormatting.createUserMessage)(trimmed);
         setMessages((prev) => [...prev, userMessage]);
-        buffer.setText("");
+        if (!submittedInput) buffer.setText("");
         setInput((prev) => {
           const newHistory = prev.history.length > 0 && prev.history[prev.history.length - 1] === trimmed ? prev.history : [...prev.history, trimmed].slice(-100);
           return {
-            value: "",
+            ...prev,
+            ...submittedInput ? {} : {
+              value: "",
+              images: [],
+              pastedBlocks: [],
+              editingQueuedFollowUp: false,
+              draftBeforeHistory: ""
+            },
             history: newHistory,
-            historyIndex: -1,
-            draftBeforeHistory: "",
-            editingQueuedFollowUp: false,
-            images: [],
-            // Clear images on submit
-            pastedBlocks: [],
-            // Clear paste blocks on submit
-            pasteCounter: prev.pasteCounter
-            // Keep counter for next session
+            historyIndex: -1
           };
         });
         setUi((prev) => ({
@@ -719,8 +759,9 @@ ${trimmed}`;
       },
       [
         buffer,
-        input.images,
-        input.pastedBlocks,
+        isHydratingHistory,
+        deferredSubmissions.length,
+        input,
         expandPasteBlocks,
         setInput,
         setUi,
@@ -742,11 +783,19 @@ ${trimmed}`;
       ]
     );
     (0, import_react.useEffect)(() => {
-      if (!initialPrompt || didAutoSubmitInitialPromptRef.current) {
+      if (!initialPrompt || didAutoSubmitInitialPromptRef.current) return;
+      if (initialPromptSessionIdRef.current !== null && session.id !== initialPromptSessionIdRef.current) {
+        didAutoSubmitInitialPromptRef.current = true;
+        setIsSubmittingInitialPrompt(false);
         return;
       }
+      if (isHydratingHistory) return;
       didAutoSubmitInitialPromptRef.current = true;
-      handleSubmit(initialPrompt, true).catch((error) => {
+      handleSubmit(initialPrompt, true, false, {
+        images: [],
+        pastedBlocks: [],
+        editingQueuedFollowUp: false
+      }).catch((error) => {
         agent.logger.error("InputContainer initial prompt submission failed", {
           error,
           initialPrompt
@@ -760,8 +809,39 @@ ${trimmed}`;
             timestamp: /* @__PURE__ */ new Date()
           }
         ]);
+      }).finally(() => setIsSubmittingInitialPrompt(false));
+    }, [
+      agent.logger,
+      handleSubmit,
+      initialPrompt,
+      setMessages,
+      isHydratingHistory,
+      session.id
+    ]);
+    (0, import_react.useEffect)(() => {
+      const submission = deferredSubmissions[0];
+      if (isHydratingHistory || isSubmittingInitialPrompt || !submission || isSubmittingDeferredRef.current)
+        return;
+      isSubmittingDeferredRef.current = true;
+      const result = submission.sessionId === session.id ? handleSubmit(
+        submission.value,
+        true,
+        submission.queueAsFollowUp,
+        submission.input
+      ) : Promise.resolve();
+      result.then(submission.resolve, submission.reject).finally(() => {
+        isSubmittingDeferredRef.current = false;
+        setDeferredSubmissions(
+          (previous) => previous.filter((item) => item !== submission)
+        );
       });
-    }, [agent.logger, handleSubmit, initialPrompt, setMessages]);
+    }, [
+      deferredSubmissions,
+      handleSubmit,
+      isHydratingHistory,
+      isSubmittingInitialPrompt,
+      session.id
+    ]);
     const mainInputAllowedOverlays = ["none", "slash-autocomplete", "resource-autocomplete"];
     const mainInputAllowed = mainInputAllowedOverlays.includes(ui.activeOverlay);
     const isHistorySearchActive = ui.historySearch.isActive;

package/dist/containers/InputContainer.d.ts

@@ -25,6 +25,7 @@ interface InputContainerProps {
     session: SessionState;
     /** If provided, auto-submits once when the UI is ready */
     initialPrompt?: string | undefined;
+    isHydratingHistory: boolean;
     approval: ApprovalRequest | null;
     /** Active-turn input waiting for the next executor boundary */
     steerMessages: QueuedMessage[];

package/dist/containers/InputContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InputContainer.d.ts","sourceRoot":"","sources":["../../src/containers/InputContainer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"InputContainer.d.ts","sourceRoot":"","sources":["../../src/containers/InputContainer.tsx"],"names":[],"mappings":"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"}

package/dist/containers/InputContainer.js

@@ -21,6 +21,7 @@ const InputContainer = forwardRef(
     ui,
     session,
     initialPrompt,
+    isHydratingHistory,
     approval,
     steerMessages,
     queuedMessages,
@@ -45,6 +46,14 @@ const InputContainer = forwardRef(
     const queuedEditPendingRef = useRef(false);
     const [isQueuedEditPending, setIsQueuedEditPending] = React.useState(false);
     const didAutoSubmitInitialPromptRef = useRef(false);
+    const initialPromptSessionIdRef = useRef(session.id);
+    const [isSubmittingInitialPrompt, setIsSubmittingInitialPrompt] = React.useState(
+      Boolean(initialPrompt)
+    );
+    const [deferredSubmissions, setDeferredSubmissions] = React.useState(
+      []
+    );
+    const isSubmittingDeferredRef = useRef(false);
     const soundService = useSoundService();
     const autoApproveEditsRef = useRef(ui.autoApproveEdits);
     useEffect(() => {
@@ -368,38 +377,70 @@ const InputContainer = forwardRef(
       return result;
     }, []);
     const handleSubmit = useCallback(
-      async (value, bypassOverlayCheck = false, queueAsFollowUp = false) => {
-        const expandedValue = expandPasteBlocks(value, input.pastedBlocks);
+      async (value, bypassOverlayCheck = false, queueAsFollowUp = false, submittedInput) => {
+        if (!submittedInput && (isHydratingHistory || deferredSubmissions.length > 0)) {
+          if (!value.trim()) return;
+          if (!bypassOverlayCheck && ui.activeOverlay !== "none" && ui.activeOverlay !== "approval")
+            return;
+          const completion = new Promise((resolve, reject) => {
+            setDeferredSubmissions((previous) => [
+              ...previous,
+              {
+                value,
+                input,
+                sessionId: session.id,
+                queueAsFollowUp,
+                resolve,
+                reject
+              }
+            ]);
+          });
+          buffer.setText("");
+          setInput((previous) => ({
+            ...previous,
+            value: "",
+            images: [],
+            pastedBlocks: [],
+            historyIndex: -1,
+            draftBeforeHistory: "",
+            editingQueuedFollowUp: false
+          }));
+          return completion;
+        }
+        const composer = submittedInput ?? input;
+        const expandedValue = expandPasteBlocks(value, composer.pastedBlocks);
         const trimmed = expandedValue.trim();
         if (!trimmed) return;
         if (ui.isProcessing && session.id) {
           const content = [{ type: "text", text: trimmed }];
-          for (const img of input.images) {
+          for (const img of composer.images) {
             content.push({
               type: "image",
               image: img.data,
               mimeType: img.mimeType
             });
           }
-          const submitAsFollowUp = queueAsFollowUp || input.editingQueuedFollowUp;
+          const submitAsFollowUp = queueAsFollowUp || composer.editingQueuedFollowUp;
           try {
             if (submitAsFollowUp) {
               await agent.followUp(session.id, { content });
             } else {
               await agent.steer(session.id, { content });
             }
-            buffer.setText("");
+            if (!submittedInput) buffer.setText("");
             setInput((prev) => {
               const newHistory = prev.history.length > 0 && prev.history[prev.history.length - 1] === trimmed ? prev.history : [...prev.history, trimmed].slice(-100);
               return {
                 ...prev,
-                value: "",
+                ...submittedInput ? {} : {
+                  value: "",
+                  images: [],
+                  pastedBlocks: [],
+                  editingQueuedFollowUp: false,
+                  draftBeforeHistory: ""
+                },
                 history: newHistory,
-                historyIndex: -1,
-                draftBeforeHistory: "",
-                editingQueuedFollowUp: false,
-                images: [],
-                pastedBlocks: []
+                historyIndex: -1
               };
             });
           } catch (error) {
@@ -418,24 +459,23 @@ const InputContainer = forwardRef(
         if (!bypassOverlayCheck && ui.activeOverlay !== "none" && ui.activeOverlay !== "approval") {
           return;
         }
-        const pendingImages = [...input.images];
+        const pendingImages = [...composer.images];
         const userMessage = createUserMessage(trimmed);
         setMessages((prev) => [...prev, userMessage]);
-        buffer.setText("");
+        if (!submittedInput) buffer.setText("");
         setInput((prev) => {
           const newHistory = prev.history.length > 0 && prev.history[prev.history.length - 1] === trimmed ? prev.history : [...prev.history, trimmed].slice(-100);
           return {
-            value: "",
+            ...prev,
+            ...submittedInput ? {} : {
+              value: "",
+              images: [],
+              pastedBlocks: [],
+              editingQueuedFollowUp: false,
+              draftBeforeHistory: ""
+            },
             history: newHistory,
-            historyIndex: -1,
-            draftBeforeHistory: "",
-            editingQueuedFollowUp: false,
-            images: [],
-            // Clear images on submit
-            pastedBlocks: [],
-            // Clear paste blocks on submit
-            pasteCounter: prev.pasteCounter
-            // Keep counter for next session
+            historyIndex: -1
           };
         });
         setUi((prev) => ({
@@ -690,8 +730,9 @@ ${trimmed}`;
       },
       [
         buffer,
-        input.images,
-        input.pastedBlocks,
+        isHydratingHistory,
+        deferredSubmissions.length,
+        input,
         expandPasteBlocks,
         setInput,
         setUi,
@@ -713,11 +754,19 @@ ${trimmed}`;
       ]
     );
     useEffect(() => {
-      if (!initialPrompt || didAutoSubmitInitialPromptRef.current) {
+      if (!initialPrompt || didAutoSubmitInitialPromptRef.current) return;
+      if (initialPromptSessionIdRef.current !== null && session.id !== initialPromptSessionIdRef.current) {
+        didAutoSubmitInitialPromptRef.current = true;
+        setIsSubmittingInitialPrompt(false);
         return;
       }
+      if (isHydratingHistory) return;
       didAutoSubmitInitialPromptRef.current = true;
-      handleSubmit(initialPrompt, true).catch((error) => {
+      handleSubmit(initialPrompt, true, false, {
+        images: [],
+        pastedBlocks: [],
+        editingQueuedFollowUp: false
+      }).catch((error) => {
         agent.logger.error("InputContainer initial prompt submission failed", {
           error,
           initialPrompt
@@ -731,8 +780,39 @@ ${trimmed}`;
             timestamp: /* @__PURE__ */ new Date()
           }
         ]);
+      }).finally(() => setIsSubmittingInitialPrompt(false));
+    }, [
+      agent.logger,
+      handleSubmit,
+      initialPrompt,
+      setMessages,
+      isHydratingHistory,
+      session.id
+    ]);
+    useEffect(() => {
+      const submission = deferredSubmissions[0];
+      if (isHydratingHistory || isSubmittingInitialPrompt || !submission || isSubmittingDeferredRef.current)
+        return;
+      isSubmittingDeferredRef.current = true;
+      const result = submission.sessionId === session.id ? handleSubmit(
+        submission.value,
+        true,
+        submission.queueAsFollowUp,
+        submission.input
+      ) : Promise.resolve();
+      result.then(submission.resolve, submission.reject).finally(() => {
+        isSubmittingDeferredRef.current = false;
+        setDeferredSubmissions(
+          (previous) => previous.filter((item) => item !== submission)
+        );
       });
-    }, [agent.logger, handleSubmit, initialPrompt, setMessages]);
+    }, [
+      deferredSubmissions,
+      handleSubmit,
+      isHydratingHistory,
+      isSubmittingInitialPrompt,
+      session.id
+    ]);
     const mainInputAllowedOverlays = ["none", "slash-autocomplete", "resource-autocomplete"];
     const mainInputAllowed = mainInputAllowedOverlays.includes(ui.activeOverlay);
     const isHistorySearchActive = ui.historySearch.isActive;

package/dist/containers/OverlayContainer.cjs

@@ -45,6 +45,7 @@ var import_SessionSelectorRefactored = __toESM(require("../components/overlays/S
 var import_LogLevelSelector = __toESM(require("../components/overlays/LogLevelSelector.js"), 1);
 var import_StreamSelector = __toESM(require("../components/overlays/StreamSelector.js"), 1);
 var import_SoundsSelector = __toESM(require("../components/overlays/SoundsSelector.js"), 1);
+var import_PermissionsSelector = require("../components/overlays/PermissionsSelector.js");
 var import_ToolBrowser = __toESM(require("../components/overlays/ToolBrowser.js"), 1);
 var import_CommandOutputOverlay = require("../components/overlays/CommandOutputOverlay.js");
 var import_McpServerList = __toESM(require("../components/overlays/McpServerList.js"), 1);
@@ -135,6 +136,7 @@ const OverlayContainer = (0, import_react.forwardRef)(
     const logLevelSelectorRef = (0, import_react.useRef)(null);
     const streamSelectorRef = (0, import_react.useRef)(null);
     const soundsSelectorRef = (0, import_react.useRef)(null);
+    const permissionsRef = (0, import_react.useRef)(null);
     const toolBrowserRef = (0, import_react.useRef)(null);
     const commandOutputRef = (0, import_react.useRef)(null);
     const mcpServerListRef = (0, import_react.useRef)(null);
@@ -207,6 +209,8 @@ const OverlayContainer = (0, import_react.forwardRef)(
               return streamSelectorRef.current?.handleInput(inputStr, key) ?? false;
             case "sounds-selector":
               return soundsSelectorRef.current?.handleInput(inputStr, key) ?? false;
+            case "permissions":
+              return permissionsRef.current?.handleInput(inputStr, key) ?? false;
             case "tool-browser":
               return toolBrowserRef.current?.handleInput(inputStr, key) ?? false;
             case "command-output":
@@ -2309,6 +2313,17 @@ Use /${data.name} to run it.`,
           onClose: handleClose
         }
       ) }),
+      ui.activeOverlay === "permissions" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        import_PermissionsSelector.PermissionsSelector,
+        {
+          ref: permissionsRef,
+          agent,
+          sessionId: session.id,
+          ui,
+          setUi,
+          onClose: handleClose
+        }
+      ) }),
       ui.activeOverlay === "tool-browser" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         import_ToolBrowser.default,
         {

package/dist/containers/OverlayContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OverlayContainer.d.ts","sourceRoot":"","sources":["../../src/containers/OverlayContainer.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAyE,MAAM,OAAO,CAAC;AAI9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,iCAAiC,CAAC;AAmGzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAuC3D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAuC3D,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,qBAAqB;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,KAAK,EAAE,eAAe,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,UAAU,CAAC;IACnB,mDAAmD;IACnD,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,qBAAqB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,sGA6+F5B,CAAC"}
+{"version":3,"file":"OverlayContainer.d.ts","sourceRoot":"","sources":["../../src/containers/OverlayContainer.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAyE,MAAM,OAAO,CAAC;AAI9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,iCAAiC,CAAC;AAuGzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAuC3D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAuC3D,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,qBAAqB;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,KAAK,EAAE,eAAe,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,UAAU,CAAC;IACnB,mDAAmD;IACnD,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,qBAAqB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,sGA6/F5B,CAAC"}

package/dist/containers/OverlayContainer.js

@@ -18,6 +18,9 @@ import SessionSelectorRefactored from "../components/overlays/SessionSelectorRef
 import LogLevelSelector from "../components/overlays/LogLevelSelector.js";
 import StreamSelector from "../components/overlays/StreamSelector.js";
 import SoundsSelector from "../components/overlays/SoundsSelector.js";
+import {
+  PermissionsSelector
+} from "../components/overlays/PermissionsSelector.js";
 import ToolBrowser from "../components/overlays/ToolBrowser.js";
 import {
   CommandOutputOverlay
@@ -115,6 +118,7 @@ const OverlayContainer = forwardRef(
     const logLevelSelectorRef = useRef(null);
     const streamSelectorRef = useRef(null);
     const soundsSelectorRef = useRef(null);
+    const permissionsRef = useRef(null);
     const toolBrowserRef = useRef(null);
     const commandOutputRef = useRef(null);
     const mcpServerListRef = useRef(null);
@@ -187,6 +191,8 @@ const OverlayContainer = forwardRef(
               return streamSelectorRef.current?.handleInput(inputStr, key) ?? false;
             case "sounds-selector":
               return soundsSelectorRef.current?.handleInput(inputStr, key) ?? false;
+            case "permissions":
+              return permissionsRef.current?.handleInput(inputStr, key) ?? false;
             case "tool-browser":
               return toolBrowserRef.current?.handleInput(inputStr, key) ?? false;
             case "command-output":
@@ -2289,6 +2295,17 @@ Use /${data.name} to run it.`,
           onClose: handleClose
         }
       ) }),
+      ui.activeOverlay === "permissions" && /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(
+        PermissionsSelector,
+        {
+          ref: permissionsRef,
+          agent,
+          sessionId: session.id,
+          ui,
+          setUi,
+          onClose: handleClose
+        }
+      ) }),
       ui.activeOverlay === "tool-browser" && /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(
         ToolBrowser,
         {

package/dist/hooks/useAgentEvents.cjs

@@ -43,6 +43,7 @@ function useAgentEvents({
   currentSessionId,
   buffer
 }) {
+  const { setText } = buffer;
   const externalTriggerRef = (0, import_react.useRef)({ active: false, sessionId: null, messageId: null });
   (0, import_react.useEffect)(() => {
     const controller = new AbortController();
@@ -51,6 +52,7 @@ function useAgentEvents({
     const syncQueue = (sessionId, queue) => {
       const getMessages = queue === "steer" ? agent.getSteerMessages(sessionId) : agent.getFollowUpMessages(sessionId);
       void getMessages.then((messages) => {
+        if (signal.aborted) return;
         if (queue === "steer") {
           setSteerMessages(messages);
         } else {
@@ -200,7 +202,7 @@ function useAgentEvents({
           setApprovalQueue([]);
           setSteerMessages([]);
           setQueuedMessages([]);
-          buffer.setText("");
+          setText("");
           setInput((prev) => ({
             ...prev,
             value: "",
@@ -288,7 +290,7 @@ function useAgentEvents({
     agent.on(
       "message:queued",
       (payload) => {
-        if (!payload.sessionId) return;
+        if (!payload.sessionId || payload.sessionId !== currentSessionId) return;
         syncQueue(payload.sessionId, payload.queue);
       },
       { signal }
@@ -304,6 +306,7 @@ function useAgentEvents({
           }
           return;
         }
+        if (payload.sessionId !== currentSessionId) return;
         syncQueue(payload.sessionId, payload.queue);
       },
       { signal }
@@ -430,7 +433,7 @@ function useAgentEvents({
     setSteerMessages,
     setQueuedMessages,
     currentSessionId,
-    buffer
+    setText
   ]);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/hooks/useAgentEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAgentEvents.d.ts","sourceRoot":"","sources":["../../src/hooks/useAgentEvents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAqB,KAAK,aAAa,EAAoB,MAAM,aAAa,CAAC;AAEtF,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,UAAU,mBAAmB;IACzB,KAAK,EAAE,eAAe,CAAC;IACvB,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACxE,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzE,8CAA8C;IAC9C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iFAAiF;IACjF,MAAM,EAAE,UAAU,CAAC;CACtB;AAYD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAC3B,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,MAAM,GACT,EAAE,mBAAmB,GAAG,IAAI,CAgiB5B"}
+{"version":3,"file":"useAgentEvents.d.ts","sourceRoot":"","sources":["../../src/hooks/useAgentEvents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAqB,KAAK,aAAa,EAAoB,MAAM,aAAa,CAAC;AAEtF,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,UAAU,mBAAmB;IACzB,KAAK,EAAE,eAAe,CAAC;IACvB,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACxE,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzE,8CAA8C;IAC9C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iFAAiF;IACjF,MAAM,EAAE,UAAU,CAAC;CACtB;AAYD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAC3B,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,MAAM,GACT,EAAE,mBAAmB,GAAG,IAAI,CAsiB5B"}

package/dist/hooks/useAgentEvents.js

@@ -20,6 +20,7 @@ function useAgentEvents({
   currentSessionId,
   buffer
 }) {
+  const { setText } = buffer;
   const externalTriggerRef = useRef({ active: false, sessionId: null, messageId: null });
   useEffect(() => {
     const controller = new AbortController();
@@ -28,6 +29,7 @@ function useAgentEvents({
     const syncQueue = (sessionId, queue) => {
       const getMessages = queue === "steer" ? agent.getSteerMessages(sessionId) : agent.getFollowUpMessages(sessionId);
       void getMessages.then((messages) => {
+        if (signal.aborted) return;
         if (queue === "steer") {
           setSteerMessages(messages);
         } else {
@@ -177,7 +179,7 @@ function useAgentEvents({
           setApprovalQueue([]);
           setSteerMessages([]);
           setQueuedMessages([]);
-          buffer.setText("");
+          setText("");
           setInput((prev) => ({
             ...prev,
             value: "",
@@ -265,7 +267,7 @@ function useAgentEvents({
     agent.on(
       "message:queued",
       (payload) => {
-        if (!payload.sessionId) return;
+        if (!payload.sessionId || payload.sessionId !== currentSessionId) return;
         syncQueue(payload.sessionId, payload.queue);
       },
       { signal }
@@ -281,6 +283,7 @@ function useAgentEvents({
           }
           return;
         }
+        if (payload.sessionId !== currentSessionId) return;
         syncQueue(payload.sessionId, payload.queue);
       },
       { signal }
@@ -407,7 +410,7 @@ function useAgentEvents({
     setSteerMessages,
     setQueuedMessages,
     currentSessionId,
-    buffer
+    setText
   ]);
 }
 export {