iosm-cli 0.2.6 → 0.2.8

package/dist/modes/interactive/interactive-mode.js

@@ -692,6 +692,8 @@ export class InteractiveMode {
         // Extension UI state
         this.extensionSelector = undefined;
         this.extensionInput = undefined;
+        this.extensionInputRestoreComponent = undefined;
+        this.extensionInputRestoreFocus = undefined;
         this.extensionEditor = undefined;
         this.extensionTerminalInputUnsubscribers = new Set();
         // Extension widgets (components rendered above/below the editor)
@@ -716,6 +718,9 @@ export class InteractiveMode {
         this.modelsDevProviderCatalogRefreshPromise = undefined;
         // Custom header from extension (undefined = use built-in header)
         this.customHeader = undefined;
+        // Active selector shown in editor container (used to restore UI after temporary dialogs)
+        this.activeSelectorComponent = undefined;
+        this.activeSelectorFocus = undefined;
         /**
          * Gracefully shutdown the agent.
          * Emits shutdown event to extensions, then exits.
@@ -2595,6 +2600,12 @@ export class InteractiveMode {
                 resolve(undefined);
             };
             opts?.signal?.addEventListener("abort", onAbort, { once: true });
+            const canRestoreSelector = this.activeSelectorComponent !== undefined &&
+                this.editorContainer.children.includes(this.activeSelectorComponent);
+            this.extensionInputRestoreComponent = canRestoreSelector ? this.activeSelectorComponent : this.editor;
+            this.extensionInputRestoreFocus = canRestoreSelector
+                ? (this.activeSelectorFocus ?? this.activeSelectorComponent)
+                : this.editor;
             this.extensionInput = new ExtensionInputComponent(title, placeholder, (value) => {
                 opts?.signal?.removeEventListener("abort", onAbort);
                 this.hideExtensionInput();
@@ -2616,9 +2627,13 @@ export class InteractiveMode {
     hideExtensionInput() {
         this.extensionInput?.dispose();
         this.editorContainer.clear();
-        this.editorContainer.addChild(this.editor);
+        const restoreComponent = this.extensionInputRestoreComponent ?? this.editor;
+        const restoreFocus = this.extensionInputRestoreFocus ?? restoreComponent;
+        this.editorContainer.addChild(restoreComponent);
         this.extensionInput = undefined;
-        this.ui.setFocus(this.editor);
+        this.extensionInputRestoreComponent = undefined;
+        this.extensionInputRestoreFocus = undefined;
+        this.ui.setFocus(restoreFocus);
         this.ui.requestRender();
     }
     /**
@@ -4837,8 +4852,12 @@ export class InteractiveMode {
             this.editorContainer.clear();
             this.editorContainer.addChild(this.editor);
             this.ui.setFocus(this.editor);
+            this.activeSelectorComponent = undefined;
+            this.activeSelectorFocus = undefined;
         };
         const { component, focus } = create(done);
+        this.activeSelectorComponent = component;
+        this.activeSelectorFocus = focus;
         this.editorContainer.clear();
         this.editorContainer.addChild(component);
         this.ui.setFocus(focus);
@@ -5334,6 +5353,16 @@ export class InteractiveMode {
                 autocompleteMaxVisible: this.settingsManager.getAutocompleteMaxVisible(),
                 quietStartup: this.settingsManager.getQuietStartup(),
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
+                webSearchEnabled: this.settingsManager.getWebSearchEnabled(),
+                webSearchProviderMode: this.settingsManager.getWebSearchProviderMode(),
+                webSearchFallbackMode: this.settingsManager.getWebSearchFallbackMode(),
+                webSearchSafeSearch: this.settingsManager.getWebSearchSafeSearch(),
+                webSearchMaxResults: this.settingsManager.getWebSearchMaxResults(),
+                webSearchTimeoutSeconds: this.settingsManager.getWebSearchTimeoutSeconds(),
+                webSearchTavilyApiKeyConfigured: this.settingsManager.isWebSearchTavilyApiKeyConfigured(),
+                webSearchSearxngUrlConfigured: this.settingsManager.isWebSearchSearxngUrlConfigured(),
+                githubToolsNetworkEnabled: this.settingsManager.getGithubToolsNetworkEnabled(),
+                githubToolsTokenConfigured: this.settingsManager.isGithubToolsTokenConfigured(),
             }, {
                 onAutoCompactChange: (enabled) => {
                     this.session.setAutoCompactionEnabled(enabled);
@@ -5370,6 +5399,103 @@ export class InteractiveMode {
                     this.settingsManager.setTransport(transport);
                     this.session.agent.setTransport(transport);
                 },
+                onWebSearchEnabledChange: (enabled) => {
+                    this.settingsManager.setWebSearchEnabled(enabled);
+                },
+                onWebSearchProviderModeChange: (mode) => {
+                    this.settingsManager.setWebSearchProviderMode(mode);
+                },
+                onWebSearchFallbackModeChange: (mode) => {
+                    this.settingsManager.setWebSearchFallbackMode(mode);
+                },
+                onWebSearchSafeSearchChange: (mode) => {
+                    this.settingsManager.setWebSearchSafeSearch(mode);
+                },
+                onWebSearchMaxResultsChange: (maxResults) => {
+                    this.settingsManager.setWebSearchMaxResults(maxResults);
+                },
+                onWebSearchTimeoutSecondsChange: (timeoutSeconds) => {
+                    this.settingsManager.setWebSearchTimeoutSeconds(timeoutSeconds);
+                },
+                onWebSearchTavilyApiKeyAction: async (action) => {
+                    if (action === "clear") {
+                        this.settingsManager.setWebSearchTavilyApiKey(undefined);
+                        await this.settingsManager.flush();
+                        this.showStatus("Web Search Tool: Tavily API key cleared.");
+                        return "not configured";
+                    }
+                    const current = this.settingsManager.getWebSearchTavilyApiKey();
+                    const entered = await this.showExtensionInput("Web Search Tool: Tavily API key", current ?? "tvly-...");
+                    if (entered === undefined) {
+                        return this.settingsManager.isWebSearchTavilyApiKeyConfigured() ? "configured" : "not configured";
+                    }
+                    const normalized = entered.trim();
+                    if (!normalized) {
+                        this.showWarning("Tavily API key cannot be empty.");
+                        return this.settingsManager.isWebSearchTavilyApiKeyConfigured() ? "configured" : "not configured";
+                    }
+                    this.settingsManager.setWebSearchTavilyApiKey(normalized);
+                    await this.settingsManager.flush();
+                    this.showStatus("Web Search Tool: Tavily API key saved.");
+                    return "configured";
+                },
+                onWebSearchSearxngUrlAction: async (action) => {
+                    if (action === "clear") {
+                        this.settingsManager.setWebSearchSearxngUrl(undefined);
+                        await this.settingsManager.flush();
+                        this.showStatus("Web Search Tool: SearXNG base URL cleared.");
+                        return "not configured";
+                    }
+                    const current = this.settingsManager.getWebSearchSearxngUrl();
+                    const entered = await this.showExtensionInput("Web Search Tool: SearXNG base URL", current ?? "https://searx.example");
+                    if (entered === undefined) {
+                        return this.settingsManager.isWebSearchSearxngUrlConfigured() ? "configured" : "not configured";
+                    }
+                    const normalized = entered.trim();
+                    if (!normalized) {
+                        this.showWarning("SearXNG base URL cannot be empty.");
+                        return this.settingsManager.isWebSearchSearxngUrlConfigured() ? "configured" : "not configured";
+                    }
+                    try {
+                        const parsed = new URL(normalized);
+                        if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+                            throw new Error("SearXNG URL must use http or https.");
+                        }
+                    }
+                    catch (error) {
+                        this.showWarning(error instanceof Error ? error.message : "Invalid SearXNG URL.");
+                        return this.settingsManager.isWebSearchSearxngUrlConfigured() ? "configured" : "not configured";
+                    }
+                    this.settingsManager.setWebSearchSearxngUrl(normalized);
+                    await this.settingsManager.flush();
+                    this.showStatus("Web Search Tool: SearXNG base URL saved.");
+                    return "configured";
+                },
+                onGithubToolsNetworkEnabledChange: (enabled) => {
+                    this.settingsManager.setGithubToolsNetworkEnabled(enabled);
+                },
+                onGithubToolsTokenAction: async (action) => {
+                    if (action === "clear") {
+                        this.settingsManager.setGithubToolsToken(undefined);
+                        await this.settingsManager.flush();
+                        this.showStatus("Github tools: token cleared.");
+                        return "not configured";
+                    }
+                    const current = this.settingsManager.getGithubToolsToken();
+                    const entered = await this.showExtensionInput("Github tools: token", current ?? "ghp_...");
+                    if (entered === undefined) {
+                        return this.settingsManager.isGithubToolsTokenConfigured() ? "configured" : "not configured";
+                    }
+                    const normalized = entered.trim();
+                    if (!normalized) {
+                        this.showWarning("GitHub token cannot be empty.");
+                        return this.settingsManager.isGithubToolsTokenConfigured() ? "configured" : "not configured";
+                    }
+                    this.settingsManager.setGithubToolsToken(normalized);
+                    await this.settingsManager.flush();
+                    this.showStatus("Github tools: token saved.");
+                    return "configured";
+                },
                 onThinkingLevelChange: (level) => {
                     this.session.setThinkingLevel(level);
                     this.footer.invalidate();
@@ -10016,8 +10142,6 @@ export class InteractiveMode {
         let activeTool;
         const dispatchTimeoutMs = this.resolveSwarmDispatchTimeoutMs();
         let timedOut = false;
-        let timeoutHandle;
-        let detachStopListener;
         const delegatedFailureCauses = new Map();
         const accumulateFailureCauses = (raw) => {
             if (!raw || typeof raw !== "object")
@@ -10147,21 +10271,24 @@ export class InteractiveMode {
                 });
             }
         });
-        try {
-            emitProgress({
-                phase: "booting subagent",
-                phaseState: "starting",
-            });
-            if (input.stopSignal?.aborted) {
-                return {
-                    taskId: input.task.id,
-                    status: "blocked",
-                    error: "Swarm run interrupted.",
-                    failureCause: "interrupted",
-                    costUsd: this.estimateSwarmTaskCostUsd(input.task),
-                };
-            }
-            const promptPromise = swarmSession.prompt(prompt, {
+        const protocolCorrectionPrompt = [
+            "[SWARM_PROTOCOL_CORRECTION]",
+            `Previous response for run_id="${input.meta.runId}" task_id="${input.task.id}" executed zero task tool calls.`,
+            "Execute the required task tool call now. Do not return prose-only output.",
+            `Required task call args: description="${safeDescription || input.task.id}", profile="${profile}", delegate_parallel_hint=${delegateParallelHint}, run_id="${input.meta.runId}", task_id="${input.task.id}".`,
+            minDelegatesRequired > 0
+                ? `Inside this single task call, emit at least ${minDelegatesRequired} independent <delegate_task> subtasks (target parallel fan-out up to ${delegateParallelHint}).`
+                : "Keep execution focused in a single task call unless decomposition is clearly beneficial.",
+            minDelegatesRequired > 0
+                ? 'If safe decomposition is impossible, output exactly one line: DELEGATION_IMPOSSIBLE: <reason>.'
+                : "If decomposition is not beneficial, continue with single-agent execution in the task call.",
+            "If blocked, output exactly one line: BLOCKED: <reason>",
+            "[/SWARM_PROTOCOL_CORRECTION]",
+        ].join("\n");
+        const runPromptAttempt = async (attemptPrompt) => {
+            let timeoutHandle;
+            let detachStopListener;
+            const promptPromise = swarmSession.prompt(attemptPrompt, {
                 expandPromptTemplates: false,
                 skipIosmAutopilot: true,
                 skipOrchestrationDirective: true,
@@ -10204,7 +10331,44 @@ export class InteractiveMode {
                 input.stopSignal.addEventListener("abort", onAbort, { once: true });
                 detachStopListener = () => input.stopSignal?.removeEventListener("abort", onAbort);
             });
-            await Promise.race([promptPromise, timeoutPromise, stopPromise]);
+            try {
+                await Promise.race([promptPromise, timeoutPromise, stopPromise]);
+            }
+            finally {
+                detachStopListener?.();
+                if (timeoutHandle) {
+                    clearTimeout(timeoutHandle);
+                }
+            }
+        };
+        try {
+            emitProgress({
+                phase: "booting subagent",
+                phaseState: "starting",
+            });
+            if (input.stopSignal?.aborted) {
+                return {
+                    taskId: input.task.id,
+                    status: "blocked",
+                    error: "Swarm run interrupted.",
+                    failureCause: "interrupted",
+                    costUsd: this.estimateSwarmTaskCostUsd(input.task),
+                };
+            }
+            await runPromptAttempt(prompt);
+            const firstAttemptOutput = chunks.join("\n\n").trim();
+            const firstAttemptBlocked = /^\s*BLOCKED\s*:/im.test(firstAttemptOutput);
+            const needsProtocolCorrection = !firstAttemptBlocked &&
+                !input.stopSignal?.aborted &&
+                taskToolCalls === 0 &&
+                taskErrors.length === 0;
+            if (needsProtocolCorrection) {
+                emitProgress({
+                    phase: "protocol correction",
+                    phaseState: "running",
+                });
+                await runPromptAttempt(protocolCorrectionPrompt);
+            }
         }
         catch (error) {
             return {
@@ -10220,10 +10384,6 @@ export class InteractiveMode {
             };
         }
         finally {
-            detachStopListener?.();
-            if (timeoutHandle) {
-                clearTimeout(timeoutHandle);
-            }
             unsubscribe();
             if (timedOut || swarmSession.isStreaming) {
                 await swarmSession.abort().catch(() => {