@caupulican/pi-adaptative 0.80.99 → 0.80.102

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

@@ -22,9 +22,9 @@ import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/htt
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { cliProviderAliases, defaultModelPerProvider, findExactModelReferenceMatch, resolveCliModel, resolveModelScope, } from "../../core/model-resolver.js";
+import { DEFAULT_MODEL_SUGGESTIONS } from "../../core/models/default-model-suggestions.js";
 import { FitnessStore } from "../../core/models/fitness-store.js";
 import { registerLocalModel, unregisterLocalModel } from "../../core/models/local-registration.js";
-import { OllamaRuntime } from "../../core/models/local-runtime.js";
 import { normalizeModelSource } from "../../core/models/model-ref.js";
 import { DefaultPackageManager } from "../../core/package-manager.js";
 import { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "../../core/provider-display-names.js";
@@ -68,6 +68,7 @@ import { FooterComponent } from "./components/footer.js";
 import { formatKeyText, keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
 import { LoginDialogComponent } from "./components/login-dialog.js";
 import { ModelSelectorComponent } from "./components/model-selector.js";
+import { ModelSuggestionSelectorComponent } from "./components/model-suggestion-selector.js";
 import { OAuthSelectorComponent } from "./components/oauth-selector.js";
 import { ProfileResourceEditorComponent, resolveResourceEditPath, } from "./components/profile-resource-editor.js";
 import { ProfileSelectorComponent } from "./components/profile-selector.js";
@@ -2690,6 +2691,25 @@ export class InteractiveMode {
         }
         this.footer.invalidate();
         switch (event.type) {
+            // Part B: general "the system is processing" feedback for the routing/prep gap before a
+            // turn starts streaming (the judge is a real bounded LLM call, not instant) — independent
+            // of thinking level, since this isn't model-thinking. Reuses the same working loader
+            // agent_start below uses, so the hand-off into real streaming is the same
+            // stop-then-recreate it already does — no distinct spinner, no double-render.
+            case "routing_start":
+                if (!this.session.isStreaming && !this.loadingAnimation && this.workingVisible) {
+                    this.loadingAnimation = this.createWorkingLoader();
+                    this.statusContainer.addChild(this.loadingAnimation);
+                    this.ui.requestRender();
+                }
+                break;
+            case "routing_end":
+                // Unconditional: covers both a clean hand-off into agent_start (which immediately
+                // stops-and-recreates its own loader anyway) and a turn that failed before ever
+                // starting, which must not leave the indicator spinning forever.
+                this.stopWorkingLoader();
+                this.ui.requestRender();
+                break;
             case "agent_start":
                 this.clearActiveToolCalls();
                 if (this.settingsManager.getShowTerminalProgress()) {
@@ -5138,10 +5158,14 @@ export class InteractiveMode {
         this.settingsManager.setAutoLearnSettings(preset, scope);
         this.updateAutoLearnFooter();
     }
-    _localRuntime;
+    /**
+     * Delegates to the session rather than keeping its own instance (#27): the model router boots a
+     * local server through AgentSession.getLocalRuntime() before a routed turn, and `/models`
+     * commands need to see and be able to stop that SAME pi-managed process, not an unrelated one
+     * tracked separately here.
+     */
     get localRuntime() {
-        this._localRuntime ??= new OllamaRuntime({ agentDir: getAgentDir() });
-        return this._localRuntime;
+        return this.session.getLocalRuntime();
     }
     /**
      * /models — USER-invoked local model lifecycle (never a model-invokable tool):
@@ -5151,6 +5175,10 @@ export class InteractiveMode {
     async handleModelsCommand(argsText) {
         const [action = "list", ...rest] = argsText.split(/\s+/).filter(Boolean);
         try {
+            if (action === "suggest" || action === "suggestions") {
+                this.showModelSuggestionSelector();
+                return;
+            }
             if (action === "stop") {
                 const stopped = this.localRuntime.stop();
                 this.showStatus(stopped.stopped
@@ -5162,6 +5190,7 @@ export class InteractiveMode {
                 const rawRef = rest.join(" ");
                 if (!rawRef) {
                     this.showStatus("Usage: /models add <ollama-tag | hf.co/org/repo[:quant] | huggingface URL | pasted install command>");
+                    this.showStatus("Or start from a validated suggestion: /models suggest");
                     return;
                 }
                 const source = normalizeModelSource(rawRef);
@@ -5224,7 +5253,9 @@ export class InteractiveMode {
         const fitness = FitnessStore.forAgentDir(getAgentDir()).getForHost();
         const lines = [
             `Local models (${status.managedByPi ? `pi-managed server, storage: ${status.ownedModelsDir}` : "system server — storage owned by the system daemon"}):`,
-            ...(models.length === 0 ? ["  (none installed — /models add <ref>)"] : []),
+            ...(models.length === 0
+                ? ["  (none installed — /models add <ref>, or /models suggest for a validated roster)"]
+                : []),
             ...models.map((model) => {
                 const report = fitness.find((entry) => entry.model === `ollama/${model.name}`);
                 const gb = (model.sizeBytes / 1e9).toFixed(2);
@@ -5238,7 +5269,7 @@ export class InteractiveMode {
         for (const line of lines)
             this.showStatus(line);
     }
-    async addLocalModel(pullRef) {
+    async addLocalModel(pullRef, preselectRole) {
         if (!(await this.ensureLocalServer()))
             return;
         this.showStatus(`Pulling ${pullRef}… (weights land in the server's model storage)`);
@@ -5268,7 +5299,7 @@ export class InteractiveMode {
         }
         this.session.modelRegistry.refresh();
         this.showStatus(`${pullRef} installed and registered as ollama/${pullRef}. Probing fitness…`);
-        await this.runFitnessAndAssign(`ollama/${pullRef}`);
+        await this.runFitnessAndAssign(`ollama/${pullRef}`, preselectRole);
     }
     async removeLocalModel(ref, confirmed) {
         const status = await this.localRuntime.detect();
@@ -5305,6 +5336,21 @@ export class InteractiveMode {
         this.showStatus(`${ref} removed: weights deleted, registration and fitness report dropped.`);
     }
     /** /fitness with no args: pick a model from the configured registry, probe it, assign a role. */
+    /** Pick a validated suggestion → install it → probe on this host → land its shaped role. */
+    showModelSuggestionSelector() {
+        this.showSelector((done) => {
+            const selector = new ModelSuggestionSelectorComponent(DEFAULT_MODEL_SUGGESTIONS, async (suggestion) => {
+                done();
+                // The shaped role rides along so the post-probe selector lands on it pre-selected;
+                // non-tool-callers carry curator/judge/none, never executor, so this can't footgun.
+                await this.addLocalModel(suggestion.pullRef, suggestion.assignRole);
+            }, () => {
+                done();
+                this.ui.requestRender();
+            });
+            return { component: selector, focus: selector };
+        });
+    }
     showFitnessModelSelector() {
         this.showSelector((done) => {
             const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRegistry, this.session.scopedModels, async (model) => {
@@ -5317,8 +5363,9 @@ export class InteractiveMode {
             return { component: selector, focus: selector };
         });
     }
-    /** Probe a model's fitness, show the report, then offer one-step role assignment. */
-    async runFitnessAndAssign(modelRef) {
+    /** Probe a model's fitness, show the report, then offer one-step role assignment. When the model
+     * came from a validated suggestion, `preselectRole` lands its shaped role already highlighted. */
+    async runFitnessAndAssign(modelRef, preselectRole) {
         this.showStatus(`Model fitness probe running on ${modelRef}… (6 surfaces; local models may take a few minutes)`);
         try {
             const outcome = await this.session.runModelFitness({ model: modelRef });
@@ -5336,7 +5383,7 @@ export class InteractiveMode {
                 }, () => {
                     done();
                     this.ui.requestRender();
-                });
+                }, preselectRole);
                 return { component: selector, focus: selector };
             });
         }