koneck 2.25.44 → 2.25.46

package/dist/ink-chat.js

@@ -32,6 +32,7 @@ const VERSION = (() => {
 })();
 import { startBus, listSessions as listBusSessions, resolveTarget, deliver, } from './session-bus.js';
 import { MODES as MODE_SPECS, modeSpec, decide, loadRules, saveRules, addRule, commandPrefixSuggestion, describeRule, } from './permissions.js';
+import { AskQueue } from './ask-queue.js';
 import { planSummary } from './plan.js';
 import { describeSandbox, resolveSandbox } from './sandbox.js';
 const CYAN = '#54D7E7';
@@ -784,7 +785,15 @@ function App({ config: initialConfig }) {
         }
         catch { /* none */ }
         return new Promise(resolve => {
-            setAsk({ tool, args, prefix: commandPrefixSuggestion(command), choice: 0, resolve });
+            // Queued rather than shown immediately. Sub-agents run concurrently and can each need an
+            // answer at the same moment; setting the question directly meant the second overwrote the
+            // first, whose promise then never settled — that agent waited forever, and the pool waiting
+            // on it hung the whole turn with no sign of why.
+            const isCurrent = askQueueRef.current.add({
+                tool, args, prefix: commandPrefixSuggestion(command), resolve,
+            });
+            if (isCurrent)
+                showNextAsk();
         });
     }
     const sessionOpts = {
@@ -912,15 +921,29 @@ function App({ config: initialConfig }) {
     }, []);
     useEffect(() => { modeRef.current = mode; }, [mode]);
     useEffect(() => { void loadRules(cfg.cwd).then(r => { rulesRef.current = r; }); }, [cfg.cwd]);
-    /** Records a standing permission and lets the waiting call through. */
-    function grant(rule, resolve, ok) {
+    /** Questions waiting for an answer, oldest first. Only the first is on screen. */
+    const askQueueRef = useRef(new AskQueue());
+    /** Puts the next waiting question on screen, or clears the panel when none are left. */
+    function showNextAsk() {
+        const next = askQueueRef.current.current();
+        setAsk(next ? { ...next, choice: 0, waiting: askQueueRef.current.pending } : null);
+    }
+    /** Answers the question on screen and moves to the next. */
+    function answerAsk(rule, ok) {
+        const current = askQueueRef.current.current();
+        if (!current) {
+            setAsk(null);
+            return;
+        }
         if (rule) {
             rulesRef.current = addRule(rulesRef.current, rule);
             void saveRules(cfg.cwd, rulesRef.current).catch(() => { });
             addSystem(`Allowed from now on: ${describeRule(rule)} (in this workspace)`);
         }
-        setAsk(null);
-        resolve(ok);
+        if (!ok)
+            addSystem(`Refused: ${current.tool}. The agent was told to carry on without it.`);
+        askQueueRef.current.answer(ok);
+        showNextAsk();
     }
     const [effort, setEffort] = useState('medium');
     const [showAnalytics, setShowAnalytics] = useState(false);
@@ -2198,6 +2221,14 @@ function App({ config: initialConfig }) {
         // deliberately left alone: cancelling should not cost whatever was typed while waiting.
         if (key.escape && busy && !picker && !keyPrompt && !updatePane && !usagePane) {
             abortRef.current?.abort();
+            // Anything still waiting on a permission answer is refused rather than left hanging: the
+            // agents are being abandoned, and an unsettled promise keeps the pool alive after the work
+            // it was doing has been given up on.
+            const stranded = askQueueRef.current.drain(false);
+            if (stranded > 0) {
+                setAsk(null);
+                addSystem(`Cancelled with ${stranded} permission ${stranded === 1 ? 'request' : 'requests'} unanswered; refused.`);
+            }
             return;
         }
         if (key.ctrl && input === 'c') {
@@ -2238,17 +2269,9 @@ function App({ config: initialConfig }) {
         // agent does next depends on the answer. Answerable either way — type the number, or move to
         // the line and press enter — because both are what people reach for.
         if (ask) {
-            const { tool, prefix, resolve } = ask;
+            const { tool, prefix } = ask;
             const options = askOptions(tool, prefix);
-            const answer = (option) => {
-                if (option.allow) {
-                    grant(option.rule, resolve, true);
-                    return;
-                }
-                setAsk(null);
-                resolve(false);
-                addSystem(`Refused: ${tool}. The agent was told to carry on without it.`);
-            };
+            const answer = (option) => answerAsk(option.rule, option.allow);
             if (key.upArrow || key.downArrow) {
                 const step = key.downArrow ? 1 : options.length - 1; // wraps in both directions
                 setAsk(a => (a ? { ...a, choice: (a.choice + step) % options.length } : a));
@@ -3181,7 +3204,9 @@ function App({ config: initialConfig }) {
                     '',
                     ...options.map((o, i) => `${i === ask.choice ? `**${G.caret} ${o.key}**` : `  ${o.key}`}  ${o.label}`),
                     '',
-                    '*type the number, or arrows and enter · esc refuses*',
+                    ask.waiting > 0
+                        ? `*type the number, or arrows and enter · ${ask.waiting} more waiting*`
+                        : '*type the number, or arrows and enter · esc refuses*',
                 ];
                 return (_jsx(Box, { marginTop: 1, children: _jsx(Panel, { width: panelWidth(lines, barWidth, 46), color: AMBER, title: `Permission — ${modeSpec(mode).label} mode`, children: lines }) }));
             })(), _jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: busy ? DIM : CYAN, paddingX: 1, width: barWidth, children: [_jsxs(Text, { color: CYAN, bold: true, children: [G.caret, " "] }), _jsx(Text, { color: INK, children: draft.slice(0, caret) }), busy