iosm-cli 0.2.2 → 0.2.4

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

@@ -15,6 +15,7 @@ import { parseSkillBlock } from "../../core/agent-session.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage, INTERNAL_UI_META_CUSTOM_TYPE, isInternalUiMetaDetails, } from "../../core/messages.js";
+import { MAX_ORCHESTRATION_AGENTS, MAX_ORCHESTRATION_PARALLEL, MAX_SUBAGENT_DELEGATE_PARALLEL, } from "../../core/orchestration-limits.js";
 import { loadModelsDevProviderCatalog, } from "../../core/models-dev-provider-catalog.js";
 import { ModelRegistry } from "../../core/model-registry.js";
 import { MODELS_DEV_PROVIDERS } from "../../core/models-dev-providers.js";
@@ -75,6 +76,152 @@ import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMar
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
+export function resolveStreamingSubmissionMode(input) {
+    if (input.configuredMode === "meta" &&
+        input.activeProfileName === "meta" &&
+        (input.activeSubagentCount > 0 || input.activeAssistantOrchestrationContext)) {
+        return "followUp";
+    }
+    return input.configuredMode;
+}
+function parseRequestedParallelAgentCount(text) {
+    const patterns = [
+        /(\d+)\s+(?:parallel|concurrent)\s+agents?/i,
+        /(\d+)\s+agents?/i,
+        /(\d+)\s+паралл\w*\s+агент\w*/i,
+        /(\d+)\s+агент\w*/i,
+    ];
+    for (const pattern of patterns) {
+        const match = text.match(pattern);
+        const parsed = match?.[1] ? Number.parseInt(match[1], 10) : Number.NaN;
+        if (Number.isInteger(parsed) && parsed >= 1) {
+            return Math.max(1, Math.min(MAX_ORCHESTRATION_AGENTS, parsed));
+        }
+    }
+    return undefined;
+}
+function deriveMetaRequiredTopLevelTaskCalls(userInput, taskPlanSnapshot) {
+    const requested = parseRequestedParallelAgentCount(userInput);
+    if (requested)
+        return requested;
+    if (!taskPlanSnapshot)
+        return undefined;
+    return Math.max(2, Math.min(3, taskPlanSnapshot.totalSteps));
+}
+function extractTaskToolErrorText(result) {
+    if (!result || typeof result !== "object")
+        return undefined;
+    const candidate = result;
+    if (typeof candidate.error === "string" && candidate.error.trim())
+        return candidate.error.trim();
+    if (typeof candidate.output === "string" && candidate.output.trim())
+        return candidate.output.trim();
+    return undefined;
+}
+function buildMetaParallelismCorrection(input) {
+    const validationFailure = input.taskToolError && /Validation failed for tool "task"/i.test(input.taskToolError)
+        ? input.taskToolError.split("\n").slice(0, 3).join("\n")
+        : undefined;
+    return [
+        "[META_PARALLELISM_CORRECTION]",
+        `Meta runtime correction: this run currently has ${input.launchedTopLevelTasks} top-level task call(s), but it should have at least ${input.requiredTopLevelTasks}.`,
+        "Stop manual sequential execution in the main agent and convert the execution graph into parallel task calls now.",
+        "Emit the missing top-level task calls in the same assistant response when branches are independent.",
+        "Each task tool call MUST include description and prompt.",
+        'If you want a custom subagent, pass it via agent="name"; keep profile set to the capability profile, not the custom subagent name.',
+        input.rawRootDelegateBlocks && input.rawRootDelegateBlocks > 0
+            ? `You emitted ${input.rawRootDelegateBlocks} raw root-level <delegate_task> block(s). Those are not executed automatically in the parent session. Convert each one into an actual top-level task tool call now.`
+            : undefined,
+        "If a child workstream is still broad, require nested <delegate_task> fan-out instead of letting one child do everything alone.",
+        input.taskPlanSnapshot
+            ? `You already produced a complex plan with ${input.taskPlanSnapshot.totalSteps} steps. Turn that plan into parallel execution now.`
+            : undefined,
+        validationFailure ? `Previous task validation failure:\n${validationFailure}` : undefined,
+        "If you truly cannot split safely, output exactly one line: DELEGATION_IMPOSSIBLE: <precise reason>.",
+        "[/META_PARALLELISM_CORRECTION]",
+    ]
+        .filter((line) => typeof line === "string" && line.trim().length > 0)
+        .join("\n");
+}
+async function promptMetaWithParallelismGuard(input) {
+    let taskToolCalls = 0;
+    let nonTaskToolCalls = 0;
+    let taskPlanSnapshot;
+    let taskToolError;
+    let rawRootDelegateBlocks = 0;
+    let delegationImpossibleDeclared = false;
+    let correctionText;
+    const maybeScheduleCorrection = () => {
+        const requiredTopLevelTasks = deriveMetaRequiredTopLevelTaskCalls(input.userInput, taskPlanSnapshot);
+        if (!requiredTopLevelTasks || taskToolCalls >= requiredTopLevelTasks || delegationImpossibleDeclared) {
+            return;
+        }
+        const hasComplexPlan = !!taskPlanSnapshot;
+        const hasTaskFailure = !!taskToolError;
+        const hasRawRootDelegates = rawRootDelegateBlocks > 0;
+        if (!hasTaskFailure && !hasRawRootDelegates && nonTaskToolCalls < 1) {
+            return;
+        }
+        if (!hasComplexPlan && !hasTaskFailure && !hasRawRootDelegates && nonTaskToolCalls < 2) {
+            return;
+        }
+        correctionText = buildMetaParallelismCorrection({
+            requiredTopLevelTasks,
+            launchedTopLevelTasks: taskToolCalls,
+            taskPlanSnapshot,
+            taskToolError,
+            rawRootDelegateBlocks,
+        });
+    };
+    const unsubscribe = input.session.subscribe((event) => {
+        if (event.type === "message_end" && event.message.role === "custom") {
+            if (event.message.customType === TASK_PLAN_CUSTOM_TYPE && isTaskPlanSnapshot(event.message.details)) {
+                taskPlanSnapshot = event.message.details;
+                maybeScheduleCorrection();
+            }
+            return;
+        }
+        if (event.type === "message_end" && event.message.role === "assistant") {
+            const rawText = extractAssistantText(event.message);
+            rawRootDelegateBlocks += (rawText.match(/<delegate_task\b/gi) ?? []).length;
+            delegationImpossibleDeclared =
+                delegationImpossibleDeclared || /^\s*DELEGATION_IMPOSSIBLE\s*:/im.test(rawText);
+            maybeScheduleCorrection();
+            return;
+        }
+        if (event.type === "tool_execution_start") {
+            if (event.toolName === "task") {
+                taskToolCalls += 1;
+            }
+            else {
+                nonTaskToolCalls += 1;
+            }
+            maybeScheduleCorrection();
+            return;
+        }
+        if (event.type === "tool_execution_end" && event.toolName === "task" && event.isError) {
+            taskToolError = extractTaskToolErrorText(event.result) ?? taskToolError;
+            maybeScheduleCorrection();
+        }
+    });
+    try {
+        await input.session.prompt(input.userInput);
+        const requiredTopLevelTasks = deriveMetaRequiredTopLevelTaskCalls(input.userInput, taskPlanSnapshot);
+        if (correctionText &&
+            requiredTopLevelTasks &&
+            taskToolCalls < requiredTopLevelTasks &&
+            !delegationImpossibleDeclared) {
+            await input.session.prompt(correctionText, {
+                expandPromptTemplates: false,
+                skipOrchestrationDirective: true,
+                source: "interactive",
+            });
+        }
+    }
+    finally {
+        unsubscribe();
+    }
+}
 const IOSM_PROFILE_ONLY_COMMANDS = new Set(["iosm", "cycle-list", "cycle-plan", "cycle-status", "cycle-report"]);
 const CHECKPOINT_LABEL_PREFIX = "checkpoint:";
 const INTERRUPT_ABORT_TIMEOUT_MS = 8_000;
@@ -411,6 +558,7 @@ export class InteractiveMode {
         // Streaming message tracking
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
+        this.currentTurnSawAssistantMessage = false;
         // Tool execution tracking: toolCallId -> component
         this.pendingTools = new Map();
         // Subagent execution tracking with live progress/metadata for task tool calls.
@@ -1245,6 +1393,8 @@ export class InteractiveMode {
         // Both are needed: fd for autocomplete, rg for grep tool and bash commands
         const [fdPath] = await Promise.all([ensureTool("fd"), ensureTool("rg")]);
         this.fdPath = fdPath;
+        // Restore saved default model early so startup header/session are consistent after restart.
+        await this.restoreSavedModelSelectionOnStartup();
         // Add header container as first child
         this.ui.addChild(this.headerContainer);
         // Add header with keybindings from config (unless silenced)
@@ -1481,7 +1631,10 @@ export class InteractiveMode {
             this.showError(`models.json error: ${modelsJsonError}`);
         }
         if (modelFallbackMessage) {
-            this.showWarning(modelFallbackMessage);
+            const staleNoModelsWarning = this.session.model && modelFallbackMessage.startsWith("No models available.");
+            if (!staleNoModelsWarning) {
+                this.showWarning(modelFallbackMessage);
+            }
         }
         if (!this.session.model) {
             this.showWarning("No model selected. Choose a model to start.");
@@ -2912,9 +3065,18 @@ export class InteractiveMode {
             // If streaming, use configured stream input mode (meta/followUp/steer)
             // This handles extension commands (execute immediately), prompt template expansion, and queueing
             if (this.session.isStreaming) {
+                const streamingBehavior = resolveStreamingSubmissionMode({
+                    configuredMode: this.session.streamInputMode,
+                    activeProfileName: this.activeProfileName,
+                    activeSubagentCount: this.subagentComponents.size,
+                    activeAssistantOrchestrationContext: this.activeAssistantOrchestrationContext,
+                });
                 this.editor.addToHistory?.(text);
                 this.editor.setText("");
-                await this.session.prompt(text, { streamingBehavior: this.session.streamInputMode });
+                await this.session.prompt(text, { streamingBehavior });
+                if (streamingBehavior !== this.session.streamInputMode) {
+                    this.showStatus("Queued follow-up until meta orchestration completes");
+                }
                 this.updatePendingMessagesDisplay();
                 this.ui.requestRender();
                 return;
@@ -2993,6 +3155,7 @@ export class InteractiveMode {
         this.footer.invalidate();
         switch (event.type) {
             case "agent_start":
+                this.currentTurnSawAssistantMessage = false;
                 // Restore main escape handler if retry handler is still active
                 // (retry success event fires later, but we need main handler now)
                 if (this.retryEscapeHandler) {
@@ -3029,6 +3192,7 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "assistant") {
+                    this.currentTurnSawAssistantMessage = true;
                     this.activeAssistantOrchestrationContext = this.pendingAssistantOrchestrationContexts > 0;
                     if (this.activeAssistantOrchestrationContext) {
                         this.pendingAssistantOrchestrationContexts -= 1;
@@ -3079,6 +3243,7 @@ export class InteractiveMode {
                 if (this.streamingComponent && event.message.role === "assistant") {
                     this.streamingMessage = event.message;
                     let errorMessage;
+                    let interruptedStopReason;
                     if (this.streamingMessage.stopReason === "aborted") {
                         const retryAttempt = this.session.retryAttempt;
                         errorMessage =
@@ -3086,9 +3251,13 @@ export class InteractiveMode {
                                 ? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
                                 : "Operation aborted";
                         this.streamingMessage.errorMessage = errorMessage;
+                        interruptedStopReason = "aborted";
                     }
                     this.streamingComponent.updateContent(this.sanitizeAssistantDisplayMessage(this.streamingMessage));
                     if (this.streamingMessage.stopReason === "aborted" || this.streamingMessage.stopReason === "error") {
+                        if (this.streamingMessage.stopReason === "error") {
+                            interruptedStopReason = "error";
+                        }
                         if (!errorMessage) {
                             errorMessage = this.streamingMessage.errorMessage || "Error";
                         }
@@ -3106,6 +3275,9 @@ export class InteractiveMode {
                             component.setArgsComplete();
                         }
                     }
+                    if (interruptedStopReason) {
+                        this.showMetaModeInterruptionHint(interruptedStopReason);
+                    }
                     this.streamingComponent = undefined;
                     this.streamingMessage = undefined;
                     this.activeAssistantOrchestrationContext = false;
@@ -3325,6 +3497,9 @@ export class InteractiveMode {
                 break;
             }
             case "agent_end":
+                if (this.activeProfileName === "meta" && !this.currentTurnSawAssistantMessage) {
+                    this.showMetaModeInterruptionHint("error");
+                }
                 if (this.loadingAnimation) {
                     this.loadingAnimation.stop();
                     this.loadingAnimation = undefined;
@@ -3338,6 +3513,7 @@ export class InteractiveMode {
                 this.pendingTools.clear();
                 this.subagentComponents.clear();
                 this.clearSubagentElapsedTimer();
+                this.currentTurnSawAssistantMessage = false;
                 await this.checkShutdownRequested();
                 this.ui.requestRender();
                 break;
@@ -3454,7 +3630,12 @@ export class InteractiveMode {
             return;
         if (message.details.kind !== "orchestration_context")
             return;
-        this.pendingAssistantOrchestrationContexts += 1;
+        // Hide assistant prose only for explicit legacy orchestration contracts.
+        // META profile guidance should not suppress normal chat/task responses.
+        const rawPrompt = message.details.rawPrompt ?? "";
+        if (rawPrompt.includes("[ORCHESTRATION_DIRECTIVE]")) {
+            this.pendingAssistantOrchestrationContexts += 1;
+        }
         if (message.details.rawPrompt && message.details.displayText) {
             this.pendingInternalUserDisplayAliases.push({
                 rawPrompt: message.details.rawPrompt,
@@ -3485,6 +3666,21 @@ export class InteractiveMode {
         this.lastStatusText = text;
         this.ui.requestRender();
     }
+    showMetaModeInterruptionHint(reason) {
+        if (this.activeProfileName !== "meta")
+            return;
+        const reasonText = reason === "error" ? "response failed unexpectedly" : "response was interrupted";
+        this.showWarning(`META mode ${reasonText}. ` +
+            "Please repeat your request following META profile rules: concrete repository task (goal + scope + constraints + expected output). " +
+            "For conversational chat, switch profile to `full` (Shift+Tab).");
+    }
+    showMetaModeProfileHint() {
+        if (this.activeProfileName !== "meta")
+            return;
+        this.showWarning("META mode is orchestration-first. " +
+            "Send concrete repository tasks (goal + scope + constraints + expected output). " +
+            "For conversational chat, switch profile to `full` (Shift+Tab).");
+    }
     showProgressLine(message) {
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("dim", message), 1, 0));
@@ -3885,6 +4081,7 @@ export class InteractiveMode {
         const nextActiveTools = this.getProfileToolNames(profile.name);
         this.session.setActiveToolsByName(nextActiveTools);
         this.session.setThinkingLevel(profile.thinkingLevel);
+        this.session.setProfileName(profile.name);
         this.profilePromptSuffix = profile.systemPromptAppend || undefined;
         this.syncRuntimePromptSuffix();
         this.session.setIosmAutopilotEnabled(profile.name === "iosm");
@@ -3896,6 +4093,7 @@ export class InteractiveMode {
         this.updateEditorBorderColor();
         this.refreshBuiltInHeader();
         this.showStatus(`Profile: ${profile.name}`);
+        this.showMetaModeProfileHint();
     }
     cycleProfile(direction) {
         if (this.session.isStreaming || this.session.isCompacting || this.iosmAutomationRun || this.iosmVerificationSession) {
@@ -5533,6 +5731,29 @@ export class InteractiveMode {
             await this.hydrateProviderModelsFromModelsDev(providerId);
         }
     }
+    async restoreSavedModelSelectionOnStartup() {
+        if (this.session.model)
+            return;
+        const defaultProvider = this.settingsManager.getDefaultProvider();
+        const defaultModelId = this.settingsManager.getDefaultModel();
+        if (!defaultProvider || !defaultModelId)
+            return;
+        if (!this.hasRegisteredProviderModels(defaultProvider)) {
+            await this.hydrateProviderModelsFromModelsDev(defaultProvider);
+        }
+        const model = this.session.modelRegistry.find(defaultProvider, defaultModelId);
+        if (!model)
+            return;
+        try {
+            const apiKey = await this.session.modelRegistry.getApiKey(model);
+            if (!apiKey)
+                return;
+        }
+        catch {
+            return;
+        }
+        this.session.agent.setModel(model);
+    }
     getApiKeyLoginProviders(modelsDevProviders) {
         const providerNames = new Map();
         this.apiKeyProviderDisplayNames.clear();
@@ -8627,7 +8848,7 @@ export class InteractiveMode {
             const mentionTask = cleaned.length > 0 ? cleaned : userInput;
             const orchestrationAwareAgent = /orchestrator/i.test(mentionedAgent);
             const mentionMode = orchestrationAwareAgent ? "parallel" : "sequential";
-            const mentionMaxParallel = orchestrationAwareAgent ? 20 : undefined;
+            const mentionMaxParallel = orchestrationAwareAgent ? MAX_ORCHESTRATION_PARALLEL : undefined;
             const mentionPrompt = [
                 `<orchestrate mode="${mentionMode}" agents="1"${mentionMaxParallel ? ` max_parallel="${mentionMaxParallel}"` : ""}>`,
                 `- agent 1: profile=${this.activeProfileName} cwd=${this.sessionManager.getCwd()} agent=${mentionedAgent}`,
@@ -8638,8 +8859,8 @@ export class InteractiveMode {
                 ...(orchestrationAwareAgent
                     ? [
                         "- Include delegate_parallel_hint in the task call.",
-                        "- If user explicitly requested an agent count, set delegate_parallel_hint to that count (clamp 1..10).",
-                        "- Otherwise set delegate_parallel_hint based on complexity: simple=1, medium=3-6, complex/risky=7-10.",
+                        `- If user explicitly requested an agent count, set delegate_parallel_hint to that count (clamp 1..${MAX_SUBAGENT_DELEGATE_PARALLEL}).`,
+                        `- Otherwise set delegate_parallel_hint based on complexity: simple=1, medium=3-6, complex/risky=7-${MAX_SUBAGENT_DELEGATE_PARALLEL}.`,
                         "- For non-trivial tasks, prefer delegate_parallel_hint >= 2 and split into independent <delegate_task> workstreams.",
                         '- Prefer existing custom agents for delegated work when suitable (use <delegate_task agent="name" ...>).',
                         "- If no existing custom agent fits, create focused delegate streams via profile-based <delegate_task> blocks.",
@@ -8654,6 +8875,13 @@ export class InteractiveMode {
             });
             return;
         }
+        if (this.activeProfileName === "meta") {
+            await promptMetaWithParallelismGuard({
+                session: this.session,
+                userInput,
+            });
+            return;
+        }
         await this.session.prompt(userInput);
     }
     createIosmVerificationEventBridge(options) {
@@ -9109,8 +9337,8 @@ export class InteractiveMode {
             if (token === "--max-parallel") {
                 const next = rest[index + 1];
                 const parsed = next ? Number.parseInt(next, 10) : Number.NaN;
-                if (!Number.isInteger(parsed) || parsed < 1 || parsed > 20) {
-                    this.showWarning("Invalid --max-parallel value (expected 1..20).");
+                if (!Number.isInteger(parsed) || parsed < 1 || parsed > MAX_ORCHESTRATION_PARALLEL) {
+                    this.showWarning(`Invalid --max-parallel value (expected 1..${MAX_ORCHESTRATION_PARALLEL}).`);
                     return undefined;
                 }
                 maxParallel = parsed;
@@ -9627,7 +9855,7 @@ export class InteractiveMode {
             index: indexInfo.index,
         });
         const runId = `swarm_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-        const maxParallel = Math.max(1, Math.min(20, options.maxParallel ?? 3));
+        const maxParallel = Math.max(1, Math.min(MAX_ORCHESTRATION_PARALLEL, options.maxParallel ?? 3));
         const meta = this.buildSwarmRunMeta({
             runId,
             source: "plain",
@@ -9671,7 +9899,7 @@ export class InteractiveMode {
             index: indexInfo.index,
         });
         const runId = `swarm_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-        const maxParallel = Math.max(1, Math.min(20, input.maxParallel ?? 3));
+        const maxParallel = Math.max(1, Math.min(MAX_ORCHESTRATION_PARALLEL, input.maxParallel ?? 3));
         const meta = this.buildSwarmRunMeta({
             runId,
             source: "singular",
@@ -9941,8 +10169,8 @@ export class InteractiveMode {
             if (arg === "--agents") {
                 const value = args[index + 1];
                 const parsed = value ? Number.parseInt(value, 10) : Number.NaN;
-                if (!Number.isInteger(parsed) || parsed < 1 || parsed > 20) {
-                    this.showWarning("Invalid --agents value (expected 1..20).");
+                if (!Number.isInteger(parsed) || parsed < 1 || parsed > MAX_ORCHESTRATION_AGENTS) {
+                    this.showWarning(`Invalid --agents value (expected 1..${MAX_ORCHESTRATION_AGENTS}).`);
                     return undefined;
                 }
                 agents = parsed;
@@ -9952,8 +10180,8 @@ export class InteractiveMode {
             if (arg === "--max-parallel") {
                 const value = args[index + 1];
                 const parsed = value ? Number.parseInt(value, 10) : Number.NaN;
-                if (!Number.isInteger(parsed) || parsed < 1 || parsed > 20) {
-                    this.showWarning("Invalid --max-parallel value (expected 1..20).");
+                if (!Number.isInteger(parsed) || parsed < 1 || parsed > MAX_ORCHESTRATION_PARALLEL) {
+                    this.showWarning(`Invalid --max-parallel value (expected 1..${MAX_ORCHESTRATION_PARALLEL}).`);
                     return undefined;
                 }
                 maxParallel = parsed;
@@ -10484,7 +10712,7 @@ export class InteractiveMode {
             "You are generating a custom IOSM subagent specification.",
             "Return ONLY a single JSON object and no additional text.",
             'Allowed JSON keys: name, description, profile, tools, disallowed_tools, system_prompt, cwd, background, instructions.',
-            'profile must be one of: full, plan, iosm, explore, iosm_analyst, iosm_verifier, cycle_planner.',
+            'profile must be one of: full, plan, iosm, meta, explore, iosm_analyst, iosm_verifier, cycle_planner.',
             "name must be short snake/kebab case, suitable for @mention.",
             "tools/disallowed_tools must be arrays of tool names when present.",
             "instructions must be a concise markdown body for the agent file.",