@openeryc/pi-coding-agent 0.75.56 → 0.75.57

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

@@ -4003,11 +4003,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 +4031,28 @@ 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 rawName = (await dialog.showPrompt(isEdit ? "Provider name/id:" : "Provider name/id (e.g. ollama, agnes):", 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:", existing?.baseUrl || "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):";
+                ? 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 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";
+            // 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);
@@ -4134,8 +4130,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 +4152,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 +4162,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