@qduc/term2 0.11.1 → 0.13.0

package/dist/hooks/use-shell-mode.js

@@ -1,60 +1,21 @@
-import { useState, useCallback, useEffect } from 'react';
-import { executeFormattedShellCommand, serializeShellHistory, } from '../utils/shell/shell-session.js';
-export const useShellMode = ({ settingsService, conversationService, addShellMessage, replaceInput, liteMode, sshInfo, sshService, }) => {
-    const [isShellMode, setIsShellMode] = useState(false);
-    const [shellHistory, setShellHistory] = useState([]);
-    const flushShellHistory = useCallback(() => {
-        if (shellHistory.length === 0) {
-            return;
-        }
-        const historyText = serializeShellHistory(shellHistory);
-        if (historyText) {
-            conversationService.addShellContext(historyText);
-        }
-        setShellHistory([]);
-    }, [shellHistory, conversationService]);
-    const toggleShellMode = useCallback(() => {
-        setIsShellMode((prev) => {
-            const next = !prev;
-            if (prev && !next) {
-                flushShellHistory();
-            }
-            return next;
-        });
-    }, [flushShellHistory]);
+import { useCallback, useEffect, useSyncExternalStore } from 'react';
+export const useShellMode = ({ session, addShellMessage, replaceInput, liteMode }) => {
+    const snapshot = useSyncExternalStore(session.subscribe, session.getSnapshot, session.getSnapshot);
+    const flushShellHistory = useCallback(() => session.flushShellHistory(), [session]);
+    const toggleShellMode = useCallback(() => session.toggleShellMode(), [session]);
     useEffect(() => {
-        /* eslint-disable react-hooks/set-state-in-effect */
-        if (!liteMode && isShellMode) {
-            setIsShellMode(false);
-            flushShellHistory();
-        }
-        /* eslint-enable react-hooks/set-state-in-effect */
-    }, [liteMode, isShellMode, flushShellHistory]);
+        session.setLiteMode(liteMode);
+    }, [liteMode, session]);
     const handleShellSubmit = useCallback(async (value) => {
-        const commandText = value.trim();
-        if (!commandText) {
-            return;
+        const submission = session.submit(value);
+        if (submission) {
+            replaceInput('');
+            const entry = await submission.completion;
+            addShellMessage(entry.command, entry.output, entry.exitCode, entry.timedOut);
         }
-        replaceInput('');
-        const result = await executeFormattedShellCommand({
-            command: commandText,
-            settingsService,
-            sshInfo,
-            sshService,
-        });
-        addShellMessage(commandText, result.text, result.exitCode, result.timedOut);
-        setShellHistory((prev) => [
-            ...prev,
-            {
-                command: commandText,
-                output: result.text,
-                exitCode: result.exitCode,
-                timedOut: result.timedOut,
-            },
-        ]);
-    }, [settingsService, replaceInput, addShellMessage, sshService, sshInfo]);
+    }, [addShellMessage, replaceInput, session]);
     return {
-        isShellMode,
+        isShellMode: snapshot.isShellMode,
         toggleShellMode,
         handleShellSubmit,
         flushShellHistory,

package/dist/hooks/use-shell-mode.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-shell-mode.js","sourceRoot":"","sources":["../../source/hooks/use-shell-mode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIzD,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,GAEtB,MAAM,iCAAiC,CAAC;AAkBzC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAC3B,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,UAAU,GACQ,EAAE,EAAE;IACtB,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAsB,EAAE,CAAC,CAAC;IAE1E,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;QACzC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;QACD,MAAM,WAAW,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;QACxD,IAAI,WAAW,EAAE,CAAC;YAChB,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACnD,CAAC;QACD,eAAe,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC,EAAE,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAExC,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;QACvC,cAAc,CAAC,CAAC,IAAI,EAAE,EAAE;YACtB,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC;YACnB,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClB,iBAAiB,EAAE,CAAC;YACtB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAExB,SAAS,CAAC,GAAG,EAAE;QACb,oDAAoD;QACpD,IAAI,CAAC,QAAQ,IAAI,WAAW,EAAE,CAAC;YAC7B,cAAc,CAAC,KAAK,CAAC,CAAC;YACtB,iBAAiB,EAAE,CAAC;QACtB,CAAC;QACD,mDAAmD;IACrD,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAE/C,MAAM,iBAAiB,GAAG,WAAW,CACnC,KAAK,EAAE,KAAa,EAAE,EAAE;QACtB,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QACjC,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,YAAY,CAAC,EAAE,CAAC,CAAC;QAEjB,MAAM,MAAM,GAAG,MAAM,4BAA4B,CAAC;YAChD,OAAO,EAAE,WAAW;YACpB,eAAe;YACf,OAAO;YACP,UAAU;SACX,CAAC,CAAC;QAEH,eAAe,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC5E,eAAe,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YACxB,GAAG,IAAI;YACP;gBACE,OAAO,EAAE,WAAW;gBACpB,MAAM,EAAE,MAAM,CAAC,IAAI;gBACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B;SACF,CAAC,CAAC;IACL,CAAC,EACD,CAAC,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,UAAU,EAAE,OAAO,CAAC,CACtE,CAAC;IAEF,OAAO;QACL,WAAW;QACX,eAAe;QACf,iBAAiB;QACjB,iBAAiB;KAClB,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"use-shell-mode.js","sourceRoot":"","sources":["../../source/hooks/use-shell-mode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAUrE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAqB,EAAE,EAAE;IACtG,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAEnG,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEpF,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEhF,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAExB,MAAM,iBAAiB,GAAG,WAAW,CACnC,KAAK,EAAE,KAAa,EAAE,EAAE;QACtB,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,UAAU,EAAE,CAAC;YACf,YAAY,CAAC,EAAE,CAAC,CAAC;YACjB,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC;YAC1C,eAAe,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC,EACD,CAAC,eAAe,EAAE,YAAY,EAAE,OAAO,CAAC,CACzC,CAAC;IAEF,OAAO;QACL,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,eAAe;QACf,iBAAiB;QACjB,iBAAiB;KAClB,CAAC;AACJ,CAAC,CAAC"}

package/dist/hooks/use-skill-selection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-skill-selection.d.ts","sourceRoot":"","sources":["../../source/hooks/use-skill-selection.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,eAAO,MAAM,iBAAiB,SAAU;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE;;uBAyCvD,MAAM;;;;;;;;;;;;;;CAiCtB,CAAC"}
+{"version":3,"file":"use-skill-selection.d.ts","sourceRoot":"","sources":["../../source/hooks/use-skill-selection.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,eAAO,MAAM,iBAAiB,SAAU;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE;;uBA8CvD,MAAM;;;;;;;;;;;;;;CAgCtB,CAAC"}

package/dist/hooks/use-skill-selection.js

@@ -4,15 +4,22 @@ import { useSelection } from './use-selection.js';
 export { SKILLS_TRIGGER } from '../components/input/triggers.js';
 export const useSkillSelection = (deps) => {
     const { skillsService } = deps;
-    const { mode, setMode, input, cursorOffset, triggerIndex, setTriggerIndex } = useInputContext();
-    const isOpen = mode === 'skill_selection';
+    const { mode, input, cursorOffset, triggerIndex, controller } = useInputContext();
+    const controllerFrame = controller.getSnapshot().stack.at(-1);
+    const isControllerOpen = controllerFrame?.kind === 'skills';
+    const isOpen = isControllerOpen || mode === 'skill_selection';
+    const activeTriggerIndex = isControllerOpen ? controllerFrame.binding.replacement.start : triggerIndex;
     const allSkills = useMemo(() => skillsService.getAvailableSkills(), [skillsService]);
     const query = useMemo(() => {
-        if (!isOpen || triggerIndex === null)
+        if (!isOpen)
+            return '';
+        if (isControllerOpen)
+            return controllerFrame.binding.query;
+        if (triggerIndex === null)
             return '';
         const end = Math.min(cursorOffset, input.length);
         return input.slice(triggerIndex, end);
-    }, [isOpen, triggerIndex, input, cursorOffset]);
+    }, [isOpen, isControllerOpen, controllerFrame, triggerIndex, input, cursorOffset]);
     const filteredSkills = useMemo(() => {
         if (!query)
             return allSkills;
@@ -36,22 +43,21 @@ export const useSkillSelection = (deps) => {
     const open = useCallback((startIndex) => {
         if (mode === 'skill_selection')
             return;
-        setMode('skill_selection');
-        setTriggerIndex(startIndex);
+        const editor = controller.getSnapshot().editor;
+        controller.replaceText(editor.text, Math.max(editor.cursor, startIndex));
         setSelectedIndex(0);
-    }, [mode, setMode, setTriggerIndex, setSelectedIndex]);
+    }, [mode, controller, setSelectedIndex]);
     const close = useCallback(() => {
         if (mode === 'skill_selection') {
-            setMode('text');
-            setTriggerIndex(null);
+            controller.close();
         }
-    }, [mode, setMode, setTriggerIndex]);
+    }, [mode, controller]);
     return {
         isOpen,
         open,
         close,
         query,
-        triggerIndex,
+        triggerIndex: activeTriggerIndex,
         skills: filteredSkills,
         selectedIndex,
         scrollOffset,

package/dist/hooks/use-skill-selection.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-skill-selection.js","sourceRoot":"","sources":["../../source/hooks/use-skill-selection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-skill-selection.js","sourceRoot":"","sources":["../../source/hooks/use-skill-selection.ts"],"names":[],"mappings":"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"}

package/dist/hooks/use-slash-commands.d.ts

@@ -30,7 +30,6 @@ export declare const useSlashCommands: ({ commands, onClose }: UseSlashCommandsO
     pageDown: () => void;
     getSelectedItem: () => SlashCommand | undefined;
     executeSelected: () => void;
-    completeSelected: () => void;
 };
 export {};
 //# sourceMappingURL=use-slash-commands.d.ts.map

package/dist/hooks/use-slash-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-slash-commands.d.ts","sourceRoot":"","sources":["../../source/hooks/use-slash-commands.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIzD,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,EAAE,MAAM,IAAI,CAAC;CAErB;AAED,KAAK,gCAAgC,GAAG;IACtC,OAAO,EAAE,YAAY,GAAG,SAAS,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACnD,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CAAC;AAGF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,CAgCvF;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAOjF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAE9E;AAED,wBAAgB,4BAA4B,CAAC,EAC3C,OAAO,EACP,MAAM,EACN,QAAQ,EACR,iBAAiB,EACjB,KAAK,GACN,EAAE,gCAAgC,GAAG,IAAI,CA2BzC;AAED,eAAO,MAAM,gBAAgB,0BAA2B,uBAAuB;;;;;;;;;;;;;;;;;CAoF9E,CAAC"}
+{"version":3,"file":"use-slash-commands.d.ts","sourceRoot":"","sources":["../../source/hooks/use-slash-commands.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIzD,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,EAAE,MAAM,IAAI,CAAC;CAErB;AAED,KAAK,gCAAgC,GAAG;IACtC,OAAO,EAAE,YAAY,GAAG,SAAS,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACnD,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CAAC;AAGF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,CAgCvF;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAOjF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAE9E;AAED,wBAAgB,4BAA4B,CAAC,EAC3C,OAAO,EACP,MAAM,EACN,QAAQ,EACR,iBAAiB,EACjB,KAAK,GACN,EAAE,gCAAgC,GAAG,IAAI,CA4BzC;AAED,eAAO,MAAM,gBAAgB,0BAA2B,uBAAuB;;;;;;;;;;;;;;;;CA2E9E,CAAC"}

package/dist/hooks/use-slash-commands.js

@@ -44,12 +44,13 @@ export function executeSlashCommandSelection({ command, filter, setInput, setCur
     if (!command)
         return;
     if (shouldAutocomplete(command, filter)) {
+        // Close the slash frame before writing a command prefix that activates a
+        // successor menu. The controller reconciles `setInput` synchronously, so
+        // closing afterward would dismiss that newly opened menu instead.
+        close();
         const nextValue = `/${command.name} `;
         setInput(nextValue);
         setCursorOverride(nextValue.length);
-        // Close slash menu first so mode-changing actions (e.g. /undo opening
-        // undo_selection) can take effect; later setMode calls win.
-        close();
         const shouldClose = command.action();
         if (shouldClose !== false) {
             setInput('');
@@ -58,8 +59,8 @@ export function executeSlashCommandSelection({ command, filter, setInput, setCur
         return;
     }
     const args = extractCommandArgs(filter, command.name);
-    // Close slash menu first. Mode-changing actions (e.g. /undo opening undo_selection)
-    // can then take effect; later setMode calls win, and we avoid post-action override.
+    // Close slash menu first. Mode-changing actions (e.g. /rewind opening rewind_selection)
+    // can then take effect without a second local mode transition.
     close();
     const shouldClose = command.action(args || undefined);
     if (shouldClose !== false) {
@@ -68,7 +69,7 @@ export function executeSlashCommandSelection({ command, filter, setInput, setCur
     }
 }
 export const useSlashCommands = ({ commands, onClose }) => {
-    const { mode, setMode, input, setInput, setInputAndCursor, setCursorOverride } = useInputContext();
+    const { mode, controller, input, setInput, setCursorOverride } = useInputContext();
     const isOpen = mode === 'slash_commands';
     // Derive filter from input directly
     const filter = isOpen ? (input.startsWith('/') ? input.slice(1) : input) : '';
@@ -94,15 +95,15 @@ export const useSlashCommands = ({ commands, onClose }) => {
         // keyboard navigation (up/down arrows) state between renders.
         if (mode === 'slash_commands')
             return;
-        setMode('slash_commands');
+        controller.replaceText(input, input.length);
         setSelectedIndex(0);
-    }, [mode, setMode, setSelectedIndex]);
+    }, [mode, controller, input, setSelectedIndex]);
     const close = useCallback(() => {
         if (mode === 'slash_commands') {
-            setMode('text');
+            controller.close();
             onClose();
         }
-    }, [mode, setMode, onClose]);
+    }, [mode, controller, onClose]);
     // No need for updateFilter anymore, it reacts to input changes automatically
     const executeSelected = useCallback(() => {
         executeSlashCommandSelection({
@@ -113,13 +114,6 @@ export const useSlashCommands = ({ commands, onClose }) => {
             close,
         });
     }, [getSelectedItem, close, filter, setInput, setCursorOverride]);
-    const completeSelected = useCallback(() => {
-        const command = getSelectedItem();
-        if (command) {
-            const nextValue = `/${command.name} `;
-            setInputAndCursor(nextValue, nextValue.length, nextValue.length);
-        }
-    }, [getSelectedItem, setInputAndCursor]);
     return {
         isOpen,
         filter,
@@ -137,7 +131,6 @@ export const useSlashCommands = ({ commands, onClose }) => {
         pageDown,
         getSelectedItem,
         executeSelected,
-        completeSelected,
     };
 };
 //# sourceMappingURL=use-slash-commands.js.map

package/dist/hooks/use-slash-commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-slash-commands.js","sourceRoot":"","sources":["../../source/hooks/use-slash-commands.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-slash-commands.js","sourceRoot":"","sources":["../../source/hooks/use-slash-commands.ts"],"names":[],"mappings":"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"}

package/dist/hooks/use-terminal-focus-notifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-terminal-focus-notifier.js","sourceRoot":"","sources":["../../source/hooks/use-terminal-focus-notifier.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-terminal-focus-notifier.js","sourceRoot":"","sources":["../../source/hooks/use-terminal-focus-notifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAWvE,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,EACvC,MAAM,EACN,eAAe,EACf,cAAc,GACkB,EAAE,EAAE;IACpC,sEAAsE;IACtE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAEhC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC5B,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC9B,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,QAAQ,CAAC,CAAC,QAAgB,EAAE,EAAE;QAC5B,cAAc,CAAC,KAAK,CAAC,sCAAsC,EAAE;YAC3D,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YAClC,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC,CAAC;QAEH,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC/C,cAAc,CAAC,KAAK,CAAC,wCAAwC,EAAE;gBAC7D,WAAW,EAAE,UAAU,CAAC,OAAO;aAChC,CAAC,CAAC;YACH,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;YAC1B,OAAO;QACT,CAAC;QACD,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC/C,cAAc,CAAC,KAAK,CAAC,2CAA2C,EAAE;gBAChE,WAAW,EAAE,UAAU,CAAC,OAAO;aAChC,CAAC,CAAC;YACH,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC;YAC3B,OAAO;QACT,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACxB,cAAc,CAAC,KAAK,CAAC,kDAAkD,EAAE;gBACvE,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;aACnC,CAAC,CAAC;YACH,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;QAC5B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CACZ,GAAG,EAAE,CAAC,CAAC;QACL,cAAc;YACZ,cAAc,CAAC,KAAK,CAAC,+BAA+B,EAAE;gBACpD,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,gBAAgB,EAAE,eAAe,CAAC,GAAG,CAAC,mBAAmB,CAAC;gBAC1D,0BAA0B,EAAE,eAAe,CAAC,GAAG,CAAC,6BAA6B,CAAC;aAC/E,CAAC,CAAC;YACH,IAAI,UAAU,CAAC,OAAO;gBAAE,OAAO;YAC/B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,mBAAmB,CAAC;gBAAE,OAAO;YACtD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,6BAA6B,CAAC;gBAAE,OAAO;YAChE,gBAAgB,CAAC,iBAAiB,EAAE,oCAAoC,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;QACxG,CAAC;QACD,YAAY;YACV,cAAc,CAAC,KAAK,CAAC,6BAA6B,EAAE;gBAClD,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,gBAAgB,EAAE,eAAe,CAAC,GAAG,CAAC,mBAAmB,CAAC;gBAC1D,0BAA0B,EAAE,eAAe,CAAC,GAAG,CAAC,6BAA6B,CAAC;aAC/E,CAAC,CAAC;YACH,IAAI,UAAU,CAAC,OAAO;gBAAE,OAAO;YAC/B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,mBAAmB,CAAC;gBAAE,OAAO;YACtD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,6BAA6B,CAAC;gBAAE,OAAO;YAChE,gBAAgB,CAAC,gBAAgB,EAAE,+BAA+B,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;QAClG,CAAC;KACF,CAAC,EACF,CAAC,eAAe,EAAE,cAAc,CAAC,CAClC,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/agent-chat-service.d.ts

@@ -1,34 +1,38 @@
-import { type JsonSchemaDefinition } from '@openai/agents';
-import { type ModelSettingsReasoningEffort } from '@openai/agents-core/model';
+import type { ReasoningEffortSetting } from '../contracts/conversation.js';
+import type { JsonSchemaDefinition } from '../contracts/model-types.js';
 import type { ILoggingService, ISettingsService } from '../services/service-interfaces.js';
 import { AgentConfiguration } from './agent-configuration.js';
-import { RunnerManager } from './runner-manager.js';
+import type { ISessionContextService } from '../services/service-interfaces.js';
 export interface AgentChatServiceDeps {
     agentConfig: AgentConfiguration;
-    runnerManager: RunnerManager;
     settings: ISettingsService;
     logger: ILoggingService;
+    sessionContextService?: ISessionContextService;
 }
 /**
  * Owns the simple chat and structured chat (chatJson) methods extracted from
  * AgentClient. Uses the same `#runAgentWithProvider` and `#extractResponse`
  * helpers with identical logic — the only difference is that references to
- * `this.#agentConfig`, `this.#runnerManager`, `this.#settings`, and
- * `this.#logger` are routed through the injected deps object.
+ * the client-owned configuration and services are routed through the injected
+ * deps object.
  */
 export declare class AgentChatService {
     #private;
     constructor(deps: AgentChatServiceDeps);
+    /** Clear models created with settings that may no longer be current. */
+    clearModelCache(): void;
+    /** Abort every active simple or structured chat operation. */
+    abort(): void;
     chat(message: string, options?: {
         model?: string;
         provider?: string;
-        reasoningEffort?: ModelSettingsReasoningEffort | 'default';
+        reasoningEffort?: ReasoningEffortSetting | null;
         instructions?: string;
     }): Promise<string>;
     chatJson(message: string, options: {
         model?: string;
         provider?: string;
-        reasoningEffort?: ModelSettingsReasoningEffort | 'default';
+        reasoningEffort?: ReasoningEffortSetting | null;
         instructions?: string;
         outputType: JsonSchemaDefinition;
     }): Promise<unknown>;

package/dist/lib/agent-chat-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-chat-service.d.ts","sourceRoot":"","sources":["../../source/lib/agent-chat-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,oBAAoB,EAAO,MAAM,gBAAgB,CAAC;AAE/E,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,kBAAkB,CAAC;IAChC,aAAa,EAAE,aAAa,CAAC;IAC7B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,MAAM,EAAE,eAAe,CAAC;CACzB;AAED;;;;;;GAMG;AACH,qBAAa,gBAAgB;;IAG3B,YAAY,IAAI,EAAE,oBAAoB,EAErC;IAwDK,IAAI,CACR,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;QACP,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,CAAC,EAAE,4BAA4B,GAAG,SAAS,CAAC;QAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;KAClB,GACL,OAAO,CAAC,MAAM,CAAC,CAwEjB;IAEK,QAAQ,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;QACP,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,CAAC,EAAE,4BAA4B,GAAG,SAAS,CAAC;QAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,UAAU,EAAE,oBAAoB,CAAC;KAClC,GACA,OAAO,CAAC,OAAO,CAAC,CAiElB;CACF"}
+{"version":3,"file":"agent-chat-service.d.ts","sourceRoot":"","sources":["../../source/lib/agent-chat-service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAO9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAGhF,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,MAAM,EAAE,eAAe,CAAC;IACxB,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;CAChD;AAED;;;;;;GAMG;AACH,qBAAa,gBAAgB;;IAK3B,YAAY,IAAI,EAAE,oBAAoB,EAErC;IAED,wEAAwE;IACxE,eAAe,IAAI,IAAI,CAEtB;IAED,8DAA8D;IAC9D,KAAK,IAAI,IAAI,CAEZ;IAsEK,IAAI,CACR,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;QACP,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;QAChD,YAAY,CAAC,EAAE,MAAM,CAAC;KAClB,GACL,OAAO,CAAC,MAAM,CAAC,CA4EjB;IAEK,QAAQ,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;QACP,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;QAChD,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,UAAU,EAAE,oBAAoB,CAAC;KAClC,GACA,OAAO,CAAC,OAAO,CAAC,CAuElB;CACF"}

package/dist/lib/agent-chat-service.js

@@ -1,60 +1,89 @@
-import { Agent, run } from '@openai/agents';
+import { ApplicationRunLoop } from '../services/agent-runtime/application-run-loop.js';
 import { getProvider } from '../providers/index.js';
-import { fetchModels, getModelDefaultReasoningLevel } from '../services/model-service.js';
+import { fetchModels, getModelDefaultReasoningLevel, getProviderDefaultReasoningLevel, } from '../services/model-service.js';
+import { selectAgentStreamItems } from '../services/agent-stream.js';
 /**
  * Owns the simple chat and structured chat (chatJson) methods extracted from
  * AgentClient. Uses the same `#runAgentWithProvider` and `#extractResponse`
  * helpers with identical logic — the only difference is that references to
- * `this.#agentConfig`, `this.#runnerManager`, `this.#settings`, and
- * `this.#logger` are routed through the injected deps object.
+ * the client-owned configuration and services are routed through the injected
+ * deps object.
  */
 export class AgentChatService {
     #deps;
+    #modelCache = new Map();
+    #activeRunLoops = new Set();
     constructor(deps) {
         this.#deps = deps;
     }
-    #runAgentWithProvider(providerId, runner, agent, input, options) {
-        // The Agents SDK enables tracing by default and exports spans to OpenAI.
-        // When using non-OpenAI providers (e.g., OpenRouter), this export can fail noisily
-        // (e.g., 503 errors). Disable tracing per-run for any non-OpenAI provider.
-        const effectiveOptions = options ? { ...options } : {};
-        const supportsTracingControl = getProvider(providerId)?.capabilities?.supportsTracingControl ?? false;
-        if (!supportsTracingControl) {
-            effectiveOptions.tracingDisabled = true;
-        }
-        // Check if provider is configured but runner failed to initialize
-        if (!runner && providerId !== 'openai') {
-            const providerDef = getProvider(providerId);
+    /** Clear models created with settings that may no longer be current. */
+    clearModelCache() {
+        this.#modelCache.clear();
+    }
+    /** Abort every active simple or structured chat operation. */
+    abort() {
+        for (const loop of this.#activeRunLoops)
+            loop.abort();
+    }
+    async #getModel(providerId, modelId) {
+        const key = `${providerId}\0${modelId}`;
+        const cached = this.#modelCache.get(key);
+        if (cached)
+            return cached;
+        const providerDef = getProvider(providerId);
+        if (!providerDef?.createStreamedModel) {
             const providerLabel = providerDef?.label || providerId;
             throw new Error(`${providerLabel} is configured but could not be initialized. ` +
                 `Please check that all required credentials and provider settings are set.`);
         }
-        // Use runner if available (custom provider), otherwise use run() directly (OpenAI)
-        if (runner) {
-            return runner.run(agent, input, effectiveOptions);
+        const { settings, logger, sessionContextService } = this.#deps;
+        const created = Promise.resolve(providerDef.createStreamedModel(modelId, {
+            settingsService: settings,
+            loggingService: logger,
+            sessionContextService,
+        }));
+        this.#modelCache.set(key, created);
+        created.catch(() => {
+            if (this.#modelCache.get(key) === created)
+                this.#modelCache.delete(key);
+        });
+        return created;
+    }
+    async #runAgentWithProvider(providerId, agent, input, options) {
+        // Resolve the model from inside the loop so cancellation also reaches a
+        // provider factory that performs asynchronous initialization.
+        const loop = new ApplicationRunLoop({ resolveModel: () => this.#getModel(providerId, agent.model) });
+        this.#activeRunLoops.add(loop);
+        try {
+            const stream = loop.startStream(agent, input, options);
+            await stream.completed;
+            return stream;
+        }
+        finally {
+            this.#activeRunLoops.delete(loop);
         }
-        return run(agent, input, effectiveOptions);
     }
     #extractResponse(result) {
         if (result.finalOutput) {
             return result.finalOutput;
         }
         // Fallback: extract from messages if finalOutput is missing
-        if (result.messages && Array.isArray(result.messages)) {
-            const lastMessage = result.messages[result.messages.length - 1];
-            if (lastMessage && lastMessage.content) {
-                if (typeof lastMessage.content === 'string') {
-                    return lastMessage.content;
-                }
-                if (Array.isArray(lastMessage.content)) {
-                    return lastMessage.content.map((part) => part.text || part.value || '').join('');
-                }
+        const messages = Array.isArray(result.messages)
+            ? result.messages
+            : selectAgentStreamItems(result).filter((item) => item?.role === 'assistant' || item?.type === 'message');
+        if (messages.length > 0) {
+            const lastMessage = messages[messages.length - 1];
+            const content = lastMessage?.content;
+            if (typeof content === 'string')
+                return content;
+            if (Array.isArray(content)) {
+                return content.map((part) => part?.text || part?.value || '').join('');
             }
         }
         return '';
     }
     async chat(message, options = {}) {
-        const { agentConfig, runnerManager, settings, logger } = this.#deps;
+        const { agentConfig, settings, logger } = this.#deps;
         const tempProvider = options.provider || agentConfig.getProvider();
         logger.debug('Agent chat request', {
             messageLength: message.length,
@@ -73,16 +102,23 @@ export class AgentChatService {
         }
         try {
             // Create a temporary agent for this specific chat request if params differ
-            let agentForChat = agentConfig.getAgent();
             const tempModel = options.model || agentConfig.getModel();
+            let agentForChat = agentConfig.getAgent() ?? {
+                name: 'Chat',
+                model: tempModel,
+                instructions: options.instructions || 'You are a helpful assistant.',
+                tools: [],
+            };
             const tempEffort = options.reasoningEffort || agentConfig.reasoningEffort;
             if (options.model || options.reasoningEffort || options.instructions || options.provider) {
                 const modelSettings = {
                     retry: { maxRetries: settings.get('agent.retryAttempts') ?? 2 },
                 };
                 let effectiveEffort = tempEffort;
-                if (tempProvider === 'codex' && isDefaultSetting && (!effectiveEffort || effectiveEffort === 'default')) {
-                    const defaultReasoningLevel = getModelDefaultReasoningLevel('codex', tempModel);
+                if (isDefaultSetting && (!effectiveEffort || effectiveEffort === 'default')) {
+                    const defaultReasoningLevel = tempProvider === 'codex'
+                        ? getModelDefaultReasoningLevel('codex', tempModel)
+                        : getProviderDefaultReasoningLevel(tempProvider);
                     if (defaultReasoningLevel) {
                         effectiveEffort = defaultReasoningLevel;
                     }
@@ -94,18 +130,15 @@ export class AgentChatService {
                     };
                 }
                 // For simple chat, we generally don't need tools, but we keep the system instructions
-                agentForChat = new Agent({
+                agentForChat = {
                     name: 'Chat',
                     model: tempModel,
                     ...(Object.keys(modelSettings).length > 0 ? { modelSettings } : {}),
                     instructions: options.instructions || 'You are a helpful assistant.',
-                });
+                    tools: [],
+                };
             }
-            // If provider is different from main provider, we need a separate runner
-            const runnerForChat = runnerManager.getOrCreateRunner(tempProvider);
-            // We use a simplified run flow for chat
-            const result = await this.#runAgentWithProvider(tempProvider, runnerForChat, agentForChat, message, {
-                stream: false,
+            const result = await this.#runAgentWithProvider(tempProvider, agentForChat, message, {
                 maxTurns: 1, // Chat is usually single turn
             });
             return this.#extractResponse(result);
@@ -119,7 +152,7 @@ export class AgentChatService {
         }
     }
     async chatJson(message, options) {
-        const { agentConfig, runnerManager, settings, logger } = this.#deps;
+        const { agentConfig, settings, logger } = this.#deps;
         const tempProvider = options.provider || agentConfig.getProvider();
         logger.debug('Agent structured chat request', {
             messageLength: message.length,
@@ -143,8 +176,10 @@ export class AgentChatService {
                 retry: { maxRetries: settings.get('agent.retryAttempts') ?? 2 },
             };
             let effectiveEffort = tempEffort;
-            if (tempProvider === 'codex' && isDefaultSetting && (!effectiveEffort || effectiveEffort === 'default')) {
-                const defaultReasoningLevel = getModelDefaultReasoningLevel('codex', tempModel);
+            if (isDefaultSetting && (!effectiveEffort || effectiveEffort === 'default')) {
+                const defaultReasoningLevel = tempProvider === 'codex'
+                    ? getModelDefaultReasoningLevel('codex', tempModel)
+                    : getProviderDefaultReasoningLevel(tempProvider);
                 if (defaultReasoningLevel) {
                     effectiveEffort = defaultReasoningLevel;
                 }
@@ -155,19 +190,23 @@ export class AgentChatService {
                     summary: 'auto',
                 };
             }
-            const agentForChat = new Agent({
+            const agentForChat = {
                 name: 'Chat',
                 model: tempModel,
                 ...(Object.keys(modelSettings).length > 0 ? { modelSettings } : {}),
                 instructions: options.instructions || 'You are a helpful assistant.',
+                tools: [],
                 outputType: options.outputType,
-            });
-            const runnerForChat = runnerManager.getOrCreateRunner(tempProvider);
-            const result = await this.#runAgentWithProvider(tempProvider, runnerForChat, agentForChat, message, {
-                stream: false,
+            };
+            const result = await this.#runAgentWithProvider(tempProvider, agentForChat, message, {
                 maxTurns: 1,
             });
-            return result.finalOutput ?? this.#extractResponse(result);
+            // Some OpenAI-compatible providers (including OpenRouter) can complete a
+            // structured response with an empty finalOutput while still placing the
+            // JSON content in the final message. Treat an empty string like a missing
+            // output so the evaluator does not mistake a valid response for an
+            // invalid one and issue an unnecessary repair request.
+            return result.finalOutput || this.#extractResponse(result);
         }
         catch (error) {
             logger.error('Agent structured chat failed', {