@openeryc/pi-coding-agent 0.75.56 → 0.75.58

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

@@ -62,6 +62,7 @@ import { ToolExecutionComponent } from "./components/tool-execution.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
+import { isNearDuplicateGoalOutput, normalizeGoalOutput } from "./goal-runner-utils.js";
 import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, setRegisteredThemes, setTheme, setThemeInstance, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
@@ -181,9 +182,13 @@ export class InteractiveMode {
     goalRunnerAbortController = undefined;
     goalRunnerRetryAttempt = 0;
     goalRunnerStatusDisplayed = false;
+    /** Normalized assistant texts from recent goal turns (for duplicate detection). */
+    goalRunnerRecentOutputs = [];
     GOAL_RUNNER_MAX_RETRIES = 10;
     GOAL_RUNNER_BASE_DELAY_MS = 3000;
     GOAL_RUNNER_TURN_DELAY_MS = 800;
+    /** Pause when this many consecutive turns look like near-duplicates. */
+    GOAL_RUNNER_MAX_DUPLICATE_STREAK = 3;
     // Extension UI state
     extensionSelector = undefined;
     extensionInput = undefined;
@@ -4003,11 +4008,10 @@ export class InteractiveMode {
                     this.showModelHub("manage");
                     return;
                 }
-                // models.json apiKey is opaque (env/command/literal); do not surface the raw value
                 existing = {
                     providerId: options.providerId,
                     baseUrl: listed.baseUrl ?? "",
-                    apiKey: "",
+                    apiKey: listed.apiKey ?? "",
                     models: listed.modelIds.map((id) => ({ id, name: id })),
                 };
             }
@@ -4032,31 +4036,33 @@ export class InteractiveMode {
             this.ui.requestRender();
         };
         try {
-            let providerId = existing?.providerId ?? "";
-            if (!isEdit) {
-                const rawName = (await dialog.showPrompt("Provider name/id (e.g. ollama, agnes):", existing?.providerId ?? "ollama")).trim();
-                providerId = slugifyProviderId(rawName);
-                if (!providerId) {
-                    throw new Error("Provider name cannot be empty.");
-                }
-                if (BUILT_IN_MODEL_PROVIDERS.has(providerId) && options.target === "openai_compatible") {
-                    throw new Error(`"${providerId}" is a built-in provider. Use a different name, or add it via Manage → models.json override.`);
-                }
-            }
-            const baseUrl = (await dialog.showPrompt("Enter base URL:", existing?.baseUrl || "http://localhost:11434/v1")).trim();
+            const rawName = (await dialog.showPrompt(isEdit ? "Provider name/id:" : "Provider name/id (e.g. ollama, agnes):", isEdit
+                ? { value: existing?.providerId ?? "" }
+                : { placeholder: "ollama", value: existing?.providerId ?? "ollama" })).trim();
+            const providerId = slugifyProviderId(rawName);
+            if (!providerId) {
+                throw new Error("Provider name cannot be empty.");
+            }
+            if (BUILT_IN_MODEL_PROVIDERS.has(providerId) && options.target === "openai_compatible") {
+                throw new Error(`"${providerId}" is a built-in provider. Use a different name, or add it via Manage → models.json override.`);
+            }
+            const baseUrl = (await dialog.showPrompt("Enter base URL:", isEdit || existing?.baseUrl
+                ? { value: existing?.baseUrl || "http://localhost:11434/v1" }
+                : { placeholder: "http://localhost:11434/v1", value: "http://localhost:11434/v1" })).trim();
             if (!baseUrl) {
                 throw new Error("Base URL cannot be empty.");
             }
             const apiKeyPrompt = options.target === "models_json"
-                ? "API key (literal, env var name, or !command; blank = not-needed):"
-                : "Enter API key (or leave blank for local endpoints):";
-            const apiKey = (await dialog.showPrompt(apiKeyPrompt, existing?.apiKey === "not-needed" ? "" : (existing?.apiKey ?? ""))).trim();
-            // On models.json edit, blank keeps the existing apiKey field (not rewritten).
-            const effectiveApiKey = apiKey
-                ? apiKey
-                : isEdit && options.target === "models_json"
-                    ? undefined
-                    : "not-needed";
+                ? isEdit
+                    ? "API key (literal/env/!command; blank keeps current):"
+                    : "API key (literal, env var name, or !command; blank = not-needed):"
+                : isEdit
+                    ? "API key (blank keeps current; type not-needed for local):"
+                    : "Enter API key (or leave blank for local endpoints):";
+            const apiKeyCurrent = existing?.apiKey === "not-needed" ? "" : (existing?.apiKey ?? "");
+            const apiKey = (await dialog.showPrompt(apiKeyPrompt, isEdit || apiKeyCurrent ? { value: apiKeyCurrent } : { placeholder: "sk-... or leave blank" })).trim();
+            // Blank on edit keeps the existing apiKey (models.json and openai_compatible).
+            const effectiveApiKey = apiKey ? apiKey : isEdit ? undefined : "not-needed";
             dialog.showInfo([theme.fg("muted", "Discovering models from /models ...")]);
             this.ui.requestRender();
             const discovered = await fetchOpenAICompatibleModels(baseUrl, effectiveApiKey);
@@ -4123,7 +4129,7 @@ export class InteractiveMode {
                 ]);
                 this.ui.requestRender();
                 const defaultIds = existing?.models.map((m) => m.id).join(", ") || "llama3.1";
-                const modelNames = (await dialog.showPrompt("Enter model name(s) (comma-separated):", defaultIds)).trim();
+                const modelNames = (await dialog.showPrompt("Enter model name(s) (comma-separated):", { value: defaultIds })).trim();
                 if (!modelNames) {
                     throw new Error("At least one model name is required.");
                 }
@@ -4134,8 +4140,8 @@ export class InteractiveMode {
                     .map((id) => ({ id, name: id }));
             }
             if (options.target === "openai_compatible") {
-                const storedKey = effectiveApiKey ?? "not-needed";
-                // Replace previous id if renaming isn't supported (edit keeps id)
+                const storedKey = effectiveApiKey ?? (isEdit && existing?.apiKey ? existing.apiKey : "not-needed");
+                // Rename: drop old id if the name changed
                 if (isEdit && existing && existing.providerId !== providerId) {
                     this.session.modelRegistry.authStorage.remove(existing.providerId);
                 }
@@ -4156,7 +4162,7 @@ export class InteractiveMode {
                 await this.completeProviderAuthentication(providerId, baseUrl, "api_key", previousModel);
             }
             else {
-                this.session.modelRegistry.upsertProviderInModelsJson(providerId, {
+                const writeConfig = {
                     baseUrl,
                     ...(effectiveApiKey !== undefined ? { apiKey: effectiveApiKey } : {}),
                     api: "openai-completions",
@@ -4166,7 +4172,13 @@ export class InteractiveMode {
                         reasoning: false,
                         input: ["text"],
                     })),
-                });
+                };
+                if (isEdit && existing && existing.providerId !== providerId) {
+                    this.session.modelRegistry.renameProviderInModelsJson(existing.providerId, providerId, writeConfig);
+                }
+                else {
+                    this.session.modelRegistry.upsertProviderInModelsJson(providerId, writeConfig);
+                }
                 restoreEditor();
                 await this.updateAvailableProviderCount();
                 // Prefer selecting first model if no real model yet
@@ -4601,6 +4613,9 @@ export class InteractiveMode {
         const lower = goal.toLowerCase();
         if (lower === "on" || lower === "off") {
             this.goalRunnerEnabled = lower === "on";
+            if (lower === "on") {
+                this.goalRunnerRecentOutputs = [];
+            }
             const currentGoal = this.session.sessionGoal;
             if (currentGoal) {
                 const label = lower === "on" ? theme.fg("success", "enabled") : theme.fg("warning", "paused");
@@ -4615,6 +4630,7 @@ export class InteractiveMode {
         }
         this.session.setSessionGoal(goal);
         this.goalRunnerEnabled = true;
+        this.goalRunnerRecentOutputs = [];
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("dim", `Session goal set: ${goal}`), 1, 0));
         this.ui.requestRender();
@@ -4653,9 +4669,41 @@ export class InteractiveMode {
                     this.showStatus(`Pursuing goal: "${goal}" (${keyText("app.interrupt")} to pause)`);
                 }
                 try {
-                    await this.session.prompt(`Continue pursuing the goal: "${goal}". If you have fully completed this goal, report what was accomplished. If you cannot make further progress, explain what blocked you.`);
+                    await this.session.prompt(`Continue pursuing the goal: "${goal}". If you have fully completed this goal, report what was accomplished. If you cannot make further progress, explain what blocked you. Do not repeat the same status/report as previous turns — either make concrete progress or clearly state that the goal is done/blocked.`);
                     // Successful turn completed, reset retry counter
                     this.goalRunnerRetryAttempt = 0;
+                    // Auto-pause when the model keeps emitting near-duplicate content.
+                    const lastText = this.session.getLastAssistantText();
+                    if (lastText) {
+                        const normalized = normalizeGoalOutput(lastText);
+                        const prev = this.goalRunnerRecentOutputs[this.goalRunnerRecentOutputs.length - 1];
+                        if (prev && isNearDuplicateGoalOutput(prev, normalized)) {
+                            this.goalRunnerRecentOutputs.push(normalized);
+                        }
+                        else {
+                            this.goalRunnerRecentOutputs = [normalized];
+                        }
+                        // Keep a small window
+                        if (this.goalRunnerRecentOutputs.length > this.GOAL_RUNNER_MAX_DUPLICATE_STREAK) {
+                            this.goalRunnerRecentOutputs = this.goalRunnerRecentOutputs.slice(-this.GOAL_RUNNER_MAX_DUPLICATE_STREAK);
+                        }
+                        if (this.goalRunnerRecentOutputs.length >= this.GOAL_RUNNER_MAX_DUPLICATE_STREAK) {
+                            const window = this.goalRunnerRecentOutputs;
+                            let allDup = true;
+                            for (let i = 1; i < window.length; i++) {
+                                if (!isNearDuplicateGoalOutput(window[i - 1], window[i])) {
+                                    allDup = false;
+                                    break;
+                                }
+                            }
+                            if (allDup) {
+                                this.goalRunnerEnabled = false;
+                                this.goalRunnerRecentOutputs = [];
+                                this.showStatus(`Goal runner paused: model repeated similar output ${this.GOAL_RUNNER_MAX_DUPLICATE_STREAK} turns in a row. Use /goal on to resume, or refine the goal.`);
+                                break;
+                            }
+                        }
+                    }
                 }
                 catch (error) {
                     this.goalRunnerRetryAttempt++;