@wuyaos/pi-model-config 0.1.4 → 0.1.6

package/README.md

@@ -127,7 +127,7 @@ Chat 写入 Pi 标准 `models.json`。Classifier 和 image 通过 Pi 的原生 m
 - `xai-images`（xAI Images；默认 `https://api.x.ai/v1`；当前将 base64 结果标为 `image/jpeg`，待真实服务商响应验证）
 - `dashscope-images`（DashScope 同步 multimodal-generation；默认 `https://dashscope.aliyuncs.com/api/v1`）
 
-这四个新增协议由本插件直接实现请求级 `generateImages()`，**不经过宿主图像管线**。模型级 Base URL 优先，其次服务商 Base URL，最后才采用上列协议默认值；`openrouter-images` 与未知/自定义协议没有默认 URL，必须由用户明确填写。图像响应不计算 token/cost usage（保持为空）。DashScope 固定使用同步 `/services/aigc/multimodal-generation/generation`，解析 `output.choices[0].message.content[].image`（URL 字符串或 `{ url }`）；不发送 `X-DashScope-Async`。返回 URL 会经同源重定向、内网地址、30 秒和 10 MiB 限制后下载。
+这四个新增协议由本插件直接实现请求级 `generateImages()`，**不经过宿主图像管线**。模型级 Base URL 优先，其次服务商 Base URL，最后才采用上列协议默认值；`openrouter-images` 与未知/自定义协议没有默认 URL，必须由用户明确填写。图像响应不计算 token/cost usage（保持为空）。OpenAI 兼容网关的 `data[].url`（包括 `b64_json: null`）及 DashScope 的 `output.choices[0].message.content[].image`（URL 字符串或 `{ url }`）都会下载并转为 data URL；下载不携带认证头，逐跳重验私网/CGNAT/mapped-IPv6，允许公开对象存储跨源跳转，并有 30 秒和 10 MiB 限制。DashScope 不发送 `X-DashScope-Async`。
 
 支持的 chat API：
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wuyaos/pi-model-config",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "type": "module",
   "description": "Pi provider 连接、远程发现与 chat/classifier/image 模型配置 TUI",
   "keywords": [

package/src/command.ts

@@ -409,7 +409,9 @@ export function applyChanges(
   const originalRows = new Map(
     (oldProvider.models ?? []).filter((row) => typeof row.id === "string").map((row) => [row.id as string, row]),
   );
-  const managedScopeIds = new Set([...oldManagedIds, ...adoptedChatIds]);
+  // models.json rows are managed scope by default: selected rows are rewritten (merging
+  // unknown fields), unchecked rows are removed. Only rows without a string id are kept verbatim.
+  const managedScopeIds = new Set([...oldManagedIds, ...adoptedChatIds, ...originalRows.keys()]);
   const unmanagedRows = (oldProvider.models ?? []).filter((row) => typeof row.id !== "string" || !managedScopeIds.has(row.id));
   const selectedChat = selected.filter((model) => model.type === "chat");
   provider.models = [...unmanagedRows, ...selectedChat.map((model) => ({
@@ -795,19 +797,48 @@ export function registerModelConfigCommand(pi: ExtensionAPI, startupIssues: Star
           const draft = draftFrom(target.id, oldProvider, oldConfig, target.isNew);
           const baselineDraft = structuredClone(draft);
           const managedBefore = previousManaged(oldProvider, oldConfig);
-          const baselineSelected = structuredClone(managedBefore);
           const persistedMetadata = new Map((oldConfig?.modelMetadata ?? []).map((entry) => [`${entry.type}\0${entry.id}`, entry]));
-          let selectedMetadata: ModelMetadataEntry[] = managedBefore.map((model) => {
-            const stored = persistedMetadata.get(`${model.type}\0${model.id}`);
-            if (stored) return structuredClone(stored);
-            const raw = model.type === "chat" ? oldProvider?.models?.find((entry) => entry.id === model.id) : oldConfig?.models?.find((entry) => entry.type === model.type && entry.id === model.id);
-            const explicitThinkingMap = model.type === "chat" && typeof (raw as any)?.thinkingLevelMap === "object" && (raw as any).thinkingLevelMap !== null && !Array.isArray((raw as any).thinkingLevelMap);
-            return { type: model.type, id: model.id, contextSource: model.type === "image" ? undefined : typeof (raw as any)?.contextWindow === "number" ? "existing" : "compat", maxTokensSource: model.type === "chat" ? typeof (raw as any)?.maxTokens === "number" ? "existing" : "compat" : undefined, thinkingSource: explicitThinkingMap ? "existing" : undefined };
-          });
+          const parseConfig: ProviderConnectionConfig = oldConfig ?? {
+            authMode: draft.authMode === "temporary" ? "reuse-pi" : draft.authMode,
+            chatApi: draft.chatApi,
+          };
+          // models.json rows outside managedChatIds are directly editable and become
+          // managed on the next save; only runtime catalog rows stay read-only.
+          const managedChatIdSet = new Set(oldConfig?.managedChatIds ?? []);
+          const externalModels: ManagedModel[] = [];
+          const externalMetadata = new Map<string, ModelMetadataEntry>();
+          for (const raw of oldProvider?.models ?? []) {
+            if (typeof raw.id !== "string" || managedChatIdSet.has(raw.id)) continue;
+            const model = parseManagedChat(raw, oldProvider!, parseConfig, true);
+            if (!model) continue;
+            externalModels.push(model);
+            const explicitMap = typeof raw.thinkingLevelMap === "object" && raw.thinkingLevelMap !== null && !Array.isArray(raw.thinkingLevelMap);
+            externalMetadata.set(model.id, persistedMetadata.get(`${model.type}\0${model.id}`) ?? {
+              type: model.type,
+              id: model.id,
+              contextSource: model.type === "image" ? undefined : typeof raw.contextWindow === "number" ? "existing" : "compat",
+              maxTokensSource: model.type === "chat" ? typeof raw.maxTokens === "number" ? "existing" : "compat" : undefined,
+              thinkingSource: model.type === "chat" ? explicitMap ? "existing" as const : protocolThinkingMap(model.api) ? "protocol" as const : undefined : undefined,
+            });
+          }
+          const metadataEntryFor = (model: ManagedModel, raw: Record<string, unknown> | undefined, fallback: ModelMetadataEntry | undefined): ModelMetadataEntry => fallback ?? {
+            type: model.type,
+            id: model.id,
+            contextSource: model.type === "image" ? undefined : typeof raw?.contextWindow === "number" ? "existing" : "compat",
+            maxTokensSource: model.type === "chat" ? typeof raw?.maxTokens === "number" ? "existing" : "compat" : undefined,
+            thinkingSource: model.type === "chat" && typeof raw?.thinkingLevelMap === "object" && raw.thinkingLevelMap !== null && !Array.isArray(raw.thinkingLevelMap) ? "existing" as const : undefined,
+          };
+          let selectedMetadata: ModelMetadataEntry[] = [
+            ...managedBefore.map((model) => {
+              const raw = model.type === "chat" ? oldProvider?.models?.find((entry) => entry.id === model.id) : oldConfig?.models?.find((entry) => entry.type === model.type && entry.id === model.id);
+              return structuredClone(metadataEntryFor(model, raw as Record<string, unknown> | undefined, persistedMetadata.get(`${model.type}\0${model.id}`)));
+            }),
+            ...externalModels.map((model) => structuredClone(externalMetadata.get(model.id)!)),
+          ];
+          const baselineSelected = structuredClone([...managedBefore, ...externalModels]);
           const baselineMetadata = structuredClone(selectedMetadata);
 
-          let selectedDraft = structuredClone(managedBefore);
-          const adoptedChatIds = new Set<string>();
+          let selectedDraft = structuredClone(baselineSelected);
           let cachedRemote: CandidateModel[] = [];
           let page: "connection" | "model" | "preview" = "connection";
           let previewOrigin: "connection" | "model" = "model";
@@ -816,18 +847,14 @@ export function registerModelConfigCommand(pi: ExtensionAPI, startupIssues: Star
           const previewState: MenuPanelState = { selectedId: "provider", focus: "list", actionIndex: 0, detailScroll: 0 };
           activeSecrets.push(draft.apiKeyRaw);
 
-          const adoptableIds = () => {
-            const alreadyManaged = new Set(oldConfig?.managedChatIds ?? []);
-            return (oldProvider?.models ?? [])
-              .filter((model) => typeof model.id === "string" && !alreadyManaged.has(model.id) && !adoptedChatIds.has(model.id))
-              .map((model) => model.id as string);
-          };
+          const adoptableIds = () => externalModels
+            .filter((model) => !selectedDraft.some((selected) => selected.id === model.id && selected.type === model.type))
+            .map((model) => model.id);
           const selectionFingerprint = (models: ManagedModel[]) => JSON.stringify([...models].sort((a, b) => identityOf(a, target.id).localeCompare(identityOf(b, target.id))));
           const metadataFingerprint = (entries: ModelMetadataEntry[]) => JSON.stringify([...entries].sort((a, b) => `${a.type}\0${a.id}`.localeCompare(`${b.type}\0${b.id}`)));
           const isDirty = () => JSON.stringify(draft) !== JSON.stringify(baselineDraft)
             || selectionFingerprint(selectedDraft) !== selectionFingerprint(baselineSelected)
-            || metadataFingerprint(selectedMetadata) !== metadataFingerprint(baselineMetadata)
-            || adoptedChatIds.size > 0;
+            || metadataFingerprint(selectedMetadata) !== metadataFingerprint(baselineMetadata);
           const preparePreview = async (): Promise<boolean> => {
             if (draft.authMode === "temporary") {
               ctx.ui.notify(t(language, "temporarySaveBlocked"), "warning");
@@ -835,7 +862,7 @@ export function registerModelConfigCommand(pi: ExtensionAPI, startupIssues: Star
             }
             try { validateSelection(draft, selectedDraft, installedModels(ctx, target.id), oldProvider); }
             catch (error) { ctx.ui.notify(displayError(language, error, activeSecrets), "error"); return false; }
-            if ((managedBefore.length > 0 || adoptedChatIds.size > 0) && selectedDraft.length === 0) {
+            if (baselineSelected.length > 0 && selectedDraft.length === 0) {
               const empty = await showConfirmationPanel(ctx, {
                 title: t(language, "emptyTitle"), summary: [t(language, "emptyBody")], severity: "error",
                 defaultActionIndex: 0, cancelActionId: "cancel",
@@ -849,10 +876,11 @@ export function registerModelConfigCommand(pi: ExtensionAPI, startupIssues: Star
             return true;
           };
           const adoptExisting = async (): Promise<boolean> => {
-            const ids = adoptableIds();
-            if (!ids.length) { ctx.ui.notify(t(language, "takeoverModelsNone"), "info"); return false; }
+            const selectedKeys = new Set(selectedDraft.map((model) => identityOf(model, target.id)));
+            const missing = externalModels.filter((model) => !selectedKeys.has(identityOf(model, target.id)));
+            if (!missing.length) { ctx.ui.notify(t(language, "takeoverModelsNone"), "info"); return false; }
             const action = await showConfirmationPanel(ctx, {
-              title: t(language, "takeoverModelsTitle"), summary: [t(language, "takeoverModelsBody", { provider: target.id, count: ids.length })],
+              title: t(language, "takeoverModelsTitle"), summary: [t(language, "takeoverModelsBody", { provider: target.id, count: missing.length })],
               details: [t(language, "diffSafety")], severity: "warning", defaultActionIndex: 0, cancelActionId: "cancel",
               actions: [
                 { id: "cancel", label: t(language, "confirmCancel") },
@@ -860,16 +888,10 @@ export function registerModelConfigCommand(pi: ExtensionAPI, startupIssues: Star
               ],
             });
             if (action !== "confirm") return false;
-            const parseConfig: ProviderConnectionConfig = oldConfig ?? {
-              authMode: draft.authMode === "temporary" ? "reuse-pi" : draft.authMode,
-              chatApi: draft.chatApi,
-            };
-            const selectedKeys = new Set(selectedDraft.map((model) => identityOf(model, target.id)));
-            for (const raw of oldProvider?.models ?? []) {
-              if (typeof raw.id !== "string" || !ids.includes(raw.id)) continue;
-              const model = parseManagedChat(raw, oldProvider!, parseConfig, true);
-              if (model && !selectedKeys.has(identityOf(model, target.id))) selectedDraft.push(model);
-              adoptedChatIds.add(raw.id);
+            for (const model of missing) {
+              selectedDraft.push(structuredClone(model));
+              const metadata = externalMetadata.get(model.id)!;
+              if (!selectedMetadata.some((entry) => entry.type === metadata.type && entry.id === metadata.id)) selectedMetadata.push(structuredClone(metadata));
             }
             return true;
           };
@@ -911,24 +933,7 @@ export function registerModelConfigCommand(pi: ExtensionAPI, startupIssues: Star
             if (page === "model") {
               const installedRaw = installedModels(ctx, target.id);
               const installed = installedRaw.map(candidateFromInstalled);
-              const managedChatIds = new Set(oldConfig?.managedChatIds ?? []);
-              const parseConfig: ProviderConnectionConfig = oldConfig ?? {
-                authMode: draft.authMode === "temporary" ? "reuse-pi" : draft.authMode,
-                chatApi: draft.chatApi,
-              };
-              const external = (oldProvider?.models ?? [])
-                .filter((model) => typeof model.id === "string" && !managedChatIds.has(model.id))
-                .map((model) => parseManagedChat(model, oldProvider!, parseConfig, adoptedChatIds.has(typeof model.id === "string" ? model.id : "")))
-                .filter((model): model is ManagedModel => model !== undefined)
-                .map((model) => {
-                  const raw = oldProvider?.models?.find((entry) => entry.id === model.id);
-                  const explicitMap = typeof raw?.thinkingLevelMap === "object" && raw.thinkingLevelMap !== null && !Array.isArray(raw.thinkingLevelMap);
-                  const defaultThinkingSource = model.type === "chat"
-                    ? explicitMap ? "existing" as const : adoptedChatIds.has(model.id) && protocolThinkingMap(model.api) ? "protocol" as const : undefined
-                    : undefined;
-                  const metadata = persistedMetadata.get(`${model.type}\0${model.id}`) ?? { type: model.type, id: model.id, contextSource: model.type === "image" ? undefined : "compat", maxTokensSource: model.type === "chat" ? "compat" : undefined, thinkingSource: defaultThinkingSource };
-                  return adoptedChatIds.has(model.id) ? candidateFromManaged(model, metadata) : candidateFromExternal(model, metadata);
-                });
+              const external = externalModels.map((model) => candidateFromExternal(model, externalMetadata.get(model.id)));
               const candidates = mergeCandidates(target.id, [...external, ...installed], managedBefore.map((model) => candidateFromManaged(model, persistedMetadata.get(`${model.type}\0${model.id}`))), cachedRemote);
               const selection = await selectModels(ctx, language, target.id, draft, candidates, selectedDraft, modelState, selectedMetadata);
               selectedDraft = selection.selected;
@@ -936,7 +941,6 @@ export function registerModelConfigCommand(pi: ExtensionAPI, startupIssues: Star
               if (selection.action === "back") { page = "connection"; continue; }
               if (selection.action === "edit") {
                 const editTarget = selection.target;
-                if (editTarget?.readOnlyReason === "external-config") { ctx.ui.notify(t(language, "editorExternalTakeover"), "warning"); continue; }
                 const managedIndex = editTarget ? selectedDraft.findIndex((model) => model.id === editTarget.id && model.type === editTarget.type) : -1;
                 if (managedIndex < 0) { ctx.ui.notify(t(language, "editorManagedOnly"), "warning"); continue; }
                 const model = selectedDraft[managedIndex]!;
@@ -1050,7 +1054,7 @@ export function registerModelConfigCommand(pi: ExtensionAPI, startupIssues: Star
             const confirmed = await confirmAction(ctx, language, t(language, "finalSaveTitle"), [t(language, "finalSaveBody"), ...risk], [...details.providerDetails, ...details.modelDetails], t(language, "confirmSave"));
             if (!confirmed) continue;
             try {
-              const next = applyChanges(files, target.id, draft, selectedDraft, adoptedChatIds, selectedMetadata);
+              const next = applyChanges(files, target.id, draft, selectedDraft, new Set(externalModels.map((model) => model.id)), selectedMetadata);
               const transaction = writeConfigTransaction(files.modelsSnapshot, files.configSnapshot, next.models, next.config);
               ctx.ui.notify(t(language, "saveSuccess", { count: transaction.backups.length }), "info");
               continue mainLoop;

package/src/i18n.ts

@@ -12,7 +12,7 @@ const ZH = {
   languageEn: "English",
   languageSaved: "界面语言已保存：{language}（立即生效）",
   tuiRequired: "/model-config 需要交互式 TUI；RPC/print/json 模式不支持自定义多选界面",
-  startupIssues: "部分服务商因配置错误未注册，可继续编辑：{issues}{more}",
+  startupIssues: "部分服务商/模型条目存在配置问题（无效条目已跳过，可继续编辑修复）：{issues}{more}",
   startupMore: "；另有 {count} 项",
   newProviderTitle: "选择内置服务商（内置不代表已认证或可用）",
   providerTagCustom: "自定义",
@@ -40,7 +40,7 @@ const ZH = {
   detailFetchHint: "进入“配置模型”后按 Ctrl+R 获取远程模型列表",
   detailEditConnection: "[Ctrl+E] 编辑连接",
   detailConfigureModels: "[Ctrl+M] 配置模型",
-  detailTakeover: "[Ctrl+T] 接管已有模型",
+  detailTakeover: "[Ctrl+T] 全选并纳入管理",
   detailDisable: "[Ctrl+X] 禁用服务商",
   detailEnable: "[Ctrl+X] 启用服务商",
   detailTestModels: "[Ctrl+P] 批量测试模型",
@@ -95,8 +95,7 @@ const ZH = {
   modelDeselectFiltered: "[Ctrl+D] 取消勾选搜索结果",
   modelCycleType: "[Ctrl+T] 切换模型类型",
   modelEditParameters: "[Ctrl+E] 编辑模型参数",
-  editorExternalTakeover: "此模型来自 models.json；请先在连接页执行“接管已有模型”后再编辑",
-  editorManagedOnly: "仅当前草稿中已勾选、由本插件管理的模型可编辑参数",
+  editorManagedOnly: "仅当前草稿中已勾选的模型可编辑参数；请先勾选再编辑",
   modelProbeContext: "[Ctrl+K] 探测上下文容量",
   modelProbeThinking: "[Ctrl+L] 探测思考档位",
   modelFetch: "[Ctrl+R] 获取远程模型列表",
@@ -112,7 +111,7 @@ const ZH = {
   discoveryRequiredEdit: "进入编辑连接设置",
   discoveryRequiredCancel: "取消获取",
   dirtyLeaveTitle: "放弃尚未保存的更改？",
-  dirtyLeaveBody: "返回总览会放弃当前服务商的连接草稿、模型选择和接管状态；不会写入配置。",
+  dirtyLeaveBody: "返回总览会放弃当前服务商的连接草稿和模型选择；不会写入配置。",
   confirmCancel: "[Esc] 取消/返回",
   confirmSave: "[Ctrl+S] 确认保存",
   confirmEmpty: "[Ctrl+S] 确认清空",
@@ -178,7 +177,7 @@ const ZH = {
   panelSummaryAuth: "认证方式：{value}",
   panelSummaryProxy: "专属代理：{value}",
   panelSummaryModels: "模型：聊天 {chat} · 判定 {classifier} · 图像生成 {image}",
-  panelTakeoverCount: "尚未接管的 models.json chat：{count}",
+  panelTakeoverCount: "尚未纳入管理的 models.json chat：{count}",
   panelDescName: "设置界面显示名称；不会改变服务商 ID。",
   panelDescId: "配置标识，只读。provider/model identity 使用此 ID。",
   panelDescOwnership: "决定 classifier/image 是否由本插件注册；不要接管 Pi 内置服务商。",
@@ -222,11 +221,10 @@ const ZH = {
   probeMaxConflict: "探测下限小于当前maxTokens；不会自动调整maxTokens，请等待逐模型参数编辑功能",
   panelModelBaseUrl: "Base URL：{value}",
   panelModelReadonly: "此模型只读，不能在这里修改或移除。",
-  panelModelReadonlyExternal: "此模型来自 models.json，但尚未由本插件管理；可先执行“接管已有模型”。",
   panelModelReadonlyRuntime: "此模型来自 Pi 内置目录或其他运行时扩展；本插件不能把取消勾选伪装成删除。",
-  takeoverModelsTitle: "接管已有模型？",
-  takeoverModelsBody: "仅接管服务商 {provider} 在 models.json 中已有的 {count} 个 chat 模型。接管只修改内存草稿；取消、返回或放弃不会写盘，最终确认保存后才更新 managedChatIds。Pi 内置目录和其他运行时扩展模型不在接管范围。",
-  takeoverModelsNone: "当前服务商没有可接管的 models.json chat 模型",
+  takeoverModelsTitle: "全选 models.json 模型？",
+  takeoverModelsBody: "将勾选服务商 {provider} 在 models.json 中尚未勾选的 {count} 个模型，并在最终保存后纳入 managedChatIds。此操作只修改内存草稿；取消、返回或放弃不会写盘。Pi 内置目录和其他运行时扩展模型不在范围。",
+  takeoverModelsNone: "当前服务商没有未勾选的 models.json 模型",
   previewConfirmSave: "[Ctrl+S] 确认保存",
   previewBackEdit: "[Esc] 返回继续编辑",
   previewDiscard: "[Ctrl+D] 放弃全部更改",
@@ -311,7 +309,6 @@ const ZH = {
   selectorNarrow: "终端过窄；请扩宽后重试，Esc 返回",
   selectorNoMatches: "  没有匹配的模型",
   selectorReadonlyStatus: "此模型不由本插件管理，当前不能在这里修改或移除",
-  selectorReadonlyExternal: "此模型来自 models.json，需先使用“接管已有模型”后才能修改或移除",
   selectorReadonlyRuntime: "此模型来自 Pi 内置目录或其他运行时扩展，不能在这里移除",
   selectorTypeConflict: "不能切换为{type}：{identity} 已存在",
   selectorReadonlyTag: "只读",
@@ -349,7 +346,7 @@ const EN = {
   languageEn: "English",
   languageSaved: "UI language saved: {language} (effective immediately)",
   tuiRequired: "/model-config requires the interactive TUI; custom multi-select is unavailable in RPC/print/JSON modes",
-  startupIssues: "Some providers were not registered because of configuration errors. You can continue editing: {issues}{more}",
+  startupIssues: "Some providers/model entries have configuration problems (invalid entries were skipped; keep editing to fix): {issues}{more}",
   startupMore: "; {count} more",
   newProviderTitle: "Choose a Built-in Provider (built-in does not mean authenticated or available)",
   providerTagCustom: "Custom",
@@ -377,7 +374,7 @@ const EN = {
   detailFetchHint: "Open Configure models, then press Ctrl+R to fetch the remote model list",
   detailEditConnection: "[Ctrl+E] Edit connection",
   detailConfigureModels: "[Ctrl+M] Configure models",
-  detailTakeover: "[Ctrl+T] Manage existing models",
+  detailTakeover: "[Ctrl+T] Select all and manage",
   detailDisable: "[Ctrl+X] Disable provider",
   detailEnable: "[Ctrl+X] Enable provider",
   detailTestModels: "[Ctrl+P] Batch test models",
@@ -432,8 +429,7 @@ const EN = {
   modelDeselectFiltered: "[Ctrl+D] Uncheck search results",
   modelCycleType: "[Ctrl+T] Change model type",
   modelEditParameters: "[Ctrl+E] Edit model parameters",
-  editorExternalTakeover: "This model comes from models.json. Use Manage existing models on the connection page before editing it.",
-  editorManagedOnly: "Only checked models managed by this plugin in the current draft can be edited",
+  editorManagedOnly: "Only checked models in the current draft can be edited; check the row first",
   modelProbeContext: "[Ctrl+K] Probe context capacity",
   modelProbeThinking: "[Ctrl+L] Probe thinking levels",
   modelFetch: "[Ctrl+R] Fetch remote model list",
@@ -449,7 +445,7 @@ const EN = {
   discoveryRequiredEdit: "Open connection settings",
   discoveryRequiredCancel: "Cancel fetch",
   dirtyLeaveTitle: "Discard unsaved changes?",
-  dirtyLeaveBody: "Returning to the overview discards this provider's connection draft, model selection, and takeover state. Nothing will be written.",
+  dirtyLeaveBody: "Returning to the overview discards this provider's connection draft and model selection. Nothing will be written.",
   confirmCancel: "[Esc] Cancel / Back",
   confirmSave: "[Ctrl+S] Confirm Save",
   confirmEmpty: "[Ctrl+S] Confirm Empty",
@@ -515,7 +511,7 @@ const EN = {
   panelSummaryAuth: "Authentication: {value}",
   panelSummaryProxy: "Provider-only proxy: {value}",
   panelSummaryModels: "Models: Chat {chat} · Classification {classifier} · Image generation {image}",
-  panelTakeoverCount: "Unmanaged models.json chat models: {count}",
+  panelTakeoverCount: "models.json chat models not yet managed: {count}",
   panelDescName: "Set the display name without changing the provider ID.",
   panelDescId: "Read-only configuration identity used by provider/model identities.",
   panelDescOwnership: "Controls classifier/image registration. Never take ownership of a Pi built-in provider.",
@@ -559,11 +555,10 @@ const EN = {
   probeMaxConflict: "The probe lower bound is below current maxTokens. maxTokens will not be changed automatically; wait for per-model parameter editing.",
   panelModelBaseUrl: "Base URL: {value}",
   panelModelReadonly: "This model is read-only and cannot be changed or removed here.",
-  panelModelReadonlyExternal: "This model is in models.json but is not managed by this plugin yet; use Manage existing models first.",
   panelModelReadonlyRuntime: "This model comes from Pi's built-in catalog or another runtime extension; unchecking it cannot be presented as deletion.",
-  takeoverModelsTitle: "Manage existing models?",
-  takeoverModelsBody: "This takes ownership only of the {count} existing chat model(s) for provider {provider} in models.json. It changes the in-memory draft only; cancel, back, or discard writes nothing. managedChatIds changes only after final save. Pi built-in catalogs and other runtime-extension models are outside this scope.",
-  takeoverModelsNone: "This provider has no models.json chat models available for takeover",
+  takeoverModelsTitle: "Select all models.json models?",
+  takeoverModelsBody: "This checks the {count} unchecked model(s) of provider {provider} in models.json and includes them in managedChatIds after the final save. It changes the in-memory draft only; cancel, back, or discard writes nothing. Pi built-in catalogs and other runtime-extension models are outside this scope.",
+  takeoverModelsNone: "This provider has no unchecked models.json models",
   previewConfirmSave: "[Ctrl+S] Confirm Save",
   previewBackEdit: "[Esc] Back to Editing",
   previewDiscard: "[Ctrl+D] Discard All Changes",
@@ -648,7 +643,6 @@ const EN = {
   selectorNarrow: "Terminal too narrow; resize and retry, or press Esc to go back",
   selectorNoMatches: "  No matching models",
   selectorReadonlyStatus: "This model is not managed by this plugin and cannot be changed or removed here",
-  selectorReadonlyExternal: "This model comes from models.json; use Manage existing models before changing or removing it",
   selectorReadonlyRuntime: "This model comes from Pi's built-in catalog or another runtime extension and cannot be removed here",
   selectorTypeConflict: "Cannot change to {type}: {identity} already exists",
   selectorReadonlyTag: "read-only",

package/src/image-apis/common.ts

@@ -155,16 +155,16 @@ function timedSignal(signal: AbortSignal | undefined, timeoutMs: number): { sign
   const abort = () => controller.abort(signal?.reason);
   if (signal?.aborted) abort();
   else signal?.addEventListener("abort", abort, { once: true });
-  const timer = setTimeout(() => controller.abort(new Error("DashScope image download timed out")), timeoutMs);
+  const timer = setTimeout(() => controller.abort(new Error("Image download timed out")), timeoutMs);
   return { signal: controller.signal, dispose: () => { clearTimeout(timer); signal?.removeEventListener("abort", abort); } };
 }
 
 async function readLimitedBody(response: Response, limit: number): Promise<Uint8Array> {
   const contentLength = Number(response.headers.get("content-length"));
-  if (Number.isFinite(contentLength) && contentLength > limit) throw new Error(`DashScope image exceeds ${limit} byte limit`);
+  if (Number.isFinite(contentLength) && contentLength > limit) throw new Error(`Image download exceeds ${limit} byte limit`);
   if (!response.body) {
     const bytes = new Uint8Array(await response.arrayBuffer());
-    if (bytes.byteLength > limit) throw new Error(`DashScope image exceeds ${limit} byte limit`);
+    if (bytes.byteLength > limit) throw new Error(`Image download exceeds ${limit} byte limit`);
     return bytes;
   }
   const reader = response.body.getReader();
@@ -175,7 +175,7 @@ async function readLimitedBody(response: Response, limit: number): Promise<Uint8
       const next = await reader.read();
       if (next.done) break;
       size += next.value.byteLength;
-      if (size > limit) { await reader.cancel(); throw new Error(`DashScope image exceeds ${limit} byte limit`); }
+      if (size > limit) { await reader.cancel(); throw new Error(`Image download exceeds ${limit} byte limit`); }
       chunks.push(next.value);
     }
   } finally {
@@ -187,32 +187,46 @@ async function readLimitedBody(response: Response, limit: number): Promise<Uint8
   return bytes;
 }
 
-/** Downloads only public HTTP(S) URLs, preserves origin across at most five manual redirects, and sends no API headers. */
-export async function downloadDashScopeImage(urlValue: string, fetcher: FetchFunction, signal?: AbortSignal): Promise<{ mimeType: string; data: string }> {
+function sniffImageMime(bytes: Uint8Array): string | undefined {
+  if (bytes[0] === 0xff && bytes[1] === 0xd8) return "image/jpeg";
+  if (bytes[0] === 0x89 && bytes[1] === 0x50 && bytes[2] === 0x4e && bytes[3] === 0x47) return "image/png";
+  return undefined;
+}
+
+export interface DownloadImageUrlOptions {
+  fetch?: FetchFunction;
+  signal?: AbortSignal;
+  timeoutMs?: number;
+  sizeLimit?: number;
+}
+
+/** Downloads a public image without credentials. Every manually followed redirect is revalidated for SSRF. */
+export async function downloadImageUrl(urlValue: string, options: DownloadImageUrlOptions = {}): Promise<{ mimeType: string; data: string }> {
   const initial = validatePublicImageUrl(urlValue);
-  const origin = initial.origin;
-  const timed = timedSignal(signal, 30_000);
+  const fetcher = options.fetch ?? (globalThis.fetch as FetchFunction);
+  const timed = timedSignal(options.signal, options.timeoutMs ?? 30_000);
+  const sizeLimit = options.sizeLimit ?? 10 * 1024 * 1024;
   try {
     let current = initial;
     for (let redirects = 0; redirects <= 5; redirects++) {
       const response = await fetcher(current, { method: "GET", redirect: "manual", signal: timed.signal });
       if (redirectStatus(response.status)) {
-        if (redirects === 5) throw new Error("DashScope image redirect limit exceeded");
+        if (redirects === 5) throw new Error("Image download redirect limit exceeded");
         const location = response.headers.get("location");
-        if (!location) throw new Error(`DashScope image redirect ${response.status} lacks Location`);
+        if (!location) throw new Error(`Image download redirect ${response.status} lacks Location`);
+        // Signed-image CDNs may change public origins; each redirect must still pass URL and SSRF validation.
         const next = validatePublicImageUrl(new URL(location, current).toString());
-        if (next.origin !== origin) throw new Error("DashScope image redirect changed origin");
         await response.body?.cancel();
         current = next;
         continue;
       }
-      if (!response.ok) throw new Error(`DashScope image download failed: HTTP ${response.status}`);
-      const bytes = await readLimitedBody(response, 10 * 1024 * 1024);
+      if (!response.ok) throw new Error(`Image download failed: HTTP ${response.status}`);
+      const bytes = await readLimitedBody(response, sizeLimit);
       const contentType = response.headers.get("content-type")?.split(";", 1)[0]?.trim();
-      const mimeType = contentType?.startsWith("image/") ? contentType : "image/png";
+      const mimeType = contentType?.startsWith("image/") ? contentType : sniffImageMime(bytes) ?? "image/jpeg";
       return { mimeType, data: dataUrl(mimeType, Buffer.from(bytes).toString("base64")) };
     }
-    throw new Error("DashScope image redirect limit exceeded");
+    throw new Error("Image download redirect limit exceeded");
   } finally {
     timed.dispose();
   }

package/src/image-apis/dashscope.ts

@@ -1,5 +1,5 @@
 import type { AssistantImages, ImageModel, ImagesContext, ImagesOptions } from "@earendil-works/pi-ai";
-import { apiKey, downloadDashScopeImage, failedImageResult, fetchFor, imageResult, normalizeBaseUrl, promptFromContext, records, requestHeaders, resolveImageBaseUrl, responseJson } from "./common.ts";
+import { apiKey, downloadImageUrl, failedImageResult, fetchFor, imageResult, normalizeBaseUrl, promptFromContext, records, requestHeaders, resolveImageBaseUrl, responseJson } from "./common.ts";
 
 /** DashScope multimodal-generation synchronous endpoint. Deliberately does not set X-DashScope-Async. */
 export async function generateImages(model: ImageModel<string>, context: ImagesContext, options?: ImagesOptions, activeSecrets: readonly string[] = []): Promise<AssistantImages> {
@@ -31,7 +31,7 @@ export async function generateImages(model: ImageModel<string>, context: ImagesC
           ? String((imageField as Record<string, unknown>).url)
           : undefined;
       if (!url) continue;
-      const image = await downloadDashScopeImage(url, fetcher, options?.signal);
+      const image = await downloadImageUrl(url, { fetch: fetcher, signal: options?.signal });
       result.output.push({ type: "image", mimeType: image.mimeType, data: image.data });
     }
     if (!result.output.length) throw new Error("DashScope Images returned no downloadable image URLs");

package/src/image-apis/openai.ts

@@ -1,5 +1,5 @@
 import type { AssistantImages, ImageModel, ImagesContext, ImagesOptions } from "@earendil-works/pi-ai";
-import { apiKey, dataUrl, failedImageResult, fetchFor, imageResult, normalizeBaseUrl, promptFromContext, records, requestHeaders, resolveImageBaseUrl, responseJson } from "./common.ts";
+import { apiKey, dataUrl, downloadImageUrl, failedImageResult, fetchFor, imageResult, normalizeBaseUrl, promptFromContext, records, requestHeaders, resolveImageBaseUrl, responseJson } from "./common.ts";
 
 /** OpenAI Images API; this is a small request-local adapter, not Pi's host image pipeline. */
 export async function generateImages(model: ImageModel<string>, context: ImagesContext, options?: ImagesOptions, activeSecrets: readonly string[] = []): Promise<AssistantImages> {
@@ -20,11 +20,19 @@ export async function generateImages(model: ImageModel<string>, context: ImagesC
     });
     const json = await responseJson(response, options, activeSecrets) as Record<string, unknown>;
     const result = imageResult(model);
+    const fetcher = fetchFor(options);
     for (const item of records(json.data)) {
-      const encoded = typeof item.b64_json === "string" ? item.b64_json : undefined;
-      if (encoded) result.output.push({ type: "image", data: dataUrl("image/png", encoded), mimeType: "image/png" });
+      const encoded = typeof item.b64_json === "string" && item.b64_json ? item.b64_json : undefined;
+      if (encoded) {
+        result.output.push({ type: "image", data: dataUrl("image/png", encoded), mimeType: "image/png" });
+        continue;
+      }
+      if (typeof item.url === "string" && item.url) {
+        const image = await downloadImageUrl(item.url, { fetch: fetcher, signal: options?.signal });
+        result.output.push({ type: "image", data: image.data, mimeType: image.mimeType });
+      }
     }
-    if (!result.output.length) throw new Error("OpenAI Images returned no base64 image data");
+    if (!result.output.length) throw new Error("OpenAI Images returned no usable b64_json or url image data");
     return result;
   } catch (error) {
     return failedImageResult(model, error, options, activeSecrets);

package/src/runtime.ts

@@ -159,34 +159,61 @@ function normalizeChatModels(providerId: string, provider: ModelsJsonProvider, c
   }));
 }
 
-function validateRuntimeConfig(providerId: string, config: ProviderConnectionConfig, modelsProvider: ModelsJsonProvider | undefined): void {
+function validateRuntimeConfig(providerId: string, config: ProviderConnectionConfig, modelsProvider: ModelsJsonProvider | undefined, issues: ProviderRegistrationIssue[] = []): void {
   if (config.discoveryUrl) validateHttpUrl(config.discoveryUrl, `${providerId} Discovery URL`);
   if (config.proxyUrl) validateHttpUrl(config.proxyUrl, `${providerId}.proxyUrl`);
   const chatApis = new Set<string>();
   for (const model of modelsProvider?.models ?? []) {
-    if (typeof model.id !== "string" || !model.id) throw mcError("MCFG_E_MODEL_SHAPE", { file: "models.json", provider: providerId });
+    if (typeof model.id !== "string" || !model.id) {
+      issues.push({ providerId, error: mcError("MCFG_E_MODEL_SHAPE", { file: "models.json", provider: providerId }) });
+      continue;
+    }
     if (model.type === "classifier" || model.type === "image") {
-      throw mcError("MCFG_E_TYPE_API", { identity: `${providerId}/chat/${model.id}`, api: String(model.api ?? model.type) });
+      issues.push({ providerId, error: mcError("MCFG_E_TYPE_API", { identity: `${providerId}/chat/${model.id}`, api: String(model.api ?? model.type) }) });
+      continue;
     }
     const api = typeof model.api === "string" ? model.api : (modelsProvider?.api ?? config.chatApi ?? "openai-completions");
-    if (!CHAT_APIS.has(api)) throw mcError("MCFG_E_UNSUPPORTED_API", { identity: `${providerId}/chat/${model.id}`, api });
+    if (!CHAT_APIS.has(api)) {
+      issues.push({ providerId, error: mcError("MCFG_E_UNSUPPORTED_API", { identity: `${providerId}/chat/${model.id}`, api }) });
+      continue;
+    }
     chatApis.add(api);
-    if (config.owned) validateHttpUrl(String(model.baseUrl ?? modelsProvider?.baseUrl ?? ""), `${providerId}/${model.id} Base URL`);
-    if (config.owned && (typeof model.contextWindow !== "number" || typeof model.maxTokens !== "number")) throw mcError("MCFG_E_MODEL_SHAPE", { file: "models.json", provider: providerId });
+    // owned chat 缺失 context/max 由 normalizeChatModels 补 Pi 兼容默认（128000/16384），
+    // 不再作为错误阻断注册；来源标记在保存时记录为 compat。
+    if (config.owned) {
+      try { validateHttpUrl(String(model.baseUrl ?? modelsProvider?.baseUrl ?? ""), `${providerId}/${model.id} Base URL`); }
+      catch (error) { issues.push({ providerId, error }); continue; }
+    }
   }
   for (const model of config.models ?? []) {
     const supported = model.type === "classifier" ? CLASSIFIER_APIS : model.type === "image" ? IMAGE_APIS : undefined;
-    if (!supported) throw mcError("MCFG_E_MODEL_SHAPE", { file: "model-config.json", provider: providerId });
-    if (!supported.has(model.api)) throw mcError("MCFG_E_TYPE_API", { identity: `${providerId}/${model.type}/${model.id}`, api: model.api });
+    if (!supported) {
+      issues.push({ providerId, error: mcError("MCFG_E_MODEL_SHAPE", { file: "model-config.json", provider: providerId }) });
+      continue;
+    }
+    if (!supported.has(model.api)) {
+      issues.push({ providerId, error: mcError("MCFG_E_TYPE_API", { identity: `${providerId}/${model.type}/${model.id}`, api: model.api }) });
+      continue;
+    }
+    if (config.authMode === "anonymous" && model.type === "image" && SELF_IMAGE_APIS.has(model.api)) {
+      issues.push({ providerId, error: mcError("MCFG_E_ANONYMOUS_UNSUPPORTED", { identity: `${providerId}/image/${model.id}` }) });
+      continue;
+    }
+    if (config.owned && model.type === "classifier" && typeof model.contextWindow !== "number") {
+      issues.push({ providerId, error: mcError("MCFG_E_MODEL_SHAPE", { file: "model-config.json", provider: providerId }) });
+      continue;
+    }
     const effectiveBaseUrl = model.type === "image"
       ? resolveImageBaseUrl(model.api, model.baseUrl, modelsProvider?.baseUrl)
       : model.baseUrl ?? modelsProvider?.baseUrl;
-    if (config.owned && !effectiveBaseUrl) throw mcError("MCFG_E_BASE_URL_REQUIRED");
-    if (config.owned && effectiveBaseUrl) validateHttpUrl(effectiveBaseUrl, `${providerId}/${model.id} Base URL`);
-    if (config.authMode === "anonymous" && model.type === "image" && SELF_IMAGE_APIS.has(model.api)) {
-      throw mcError("MCFG_E_ANONYMOUS_UNSUPPORTED", { identity: `${providerId}/image/${model.id}` });
+    if (config.owned && !effectiveBaseUrl) {
+      issues.push({ providerId, error: mcError("MCFG_E_BASE_URL_REQUIRED") });
+      continue;
+    }
+    if (config.owned && effectiveBaseUrl) {
+      try { validateHttpUrl(effectiveBaseUrl, `${providerId}/${model.id} Base URL`); }
+      catch (error) { issues.push({ providerId, error }); continue; }
     }
-    if (config.owned && model.type === "classifier" && typeof model.contextWindow !== "number") throw mcError("MCFG_E_MODEL_SHAPE", { file: "model-config.json", provider: providerId });
   }
   if (!config.owned && (config.models?.length ?? 0) > 0) {
     throw mcError("MCFG_E_NOT_OWNED", { provider: providerId });
@@ -202,14 +229,17 @@ function validateRuntimeConfig(providerId: string, config: ProviderConnectionCon
 }
 
 function registerOwnedProvider(pi: ExtensionAPI, providerId: string, config: ProviderConnectionConfig, modelsProvider: ModelsJsonProvider, language: UiLanguage): void {
-  const chatModels = normalizeChatModels(providerId, modelsProvider, config);
-  const extraModels = (config.models ?? []).map((model) => ({
-    ...model,
-    provider: providerId,
-    baseUrl: model.type === "image"
-      ? resolveImageBaseUrl(model.api, model.baseUrl, modelsProvider.baseUrl) ?? ""
-      : model.baseUrl ?? modelsProvider.baseUrl ?? "",
-  }));
+  const chatModels = normalizeChatModels(providerId, modelsProvider, config)
+    .filter((model) => typeof model.id === "string" && model.id && CHAT_APIS.has(model.api) && typeof model.contextWindow === "number" && typeof model.maxTokens === "number");
+  const extraModels = (config.models ?? [])
+    .map((model) => ({
+      ...model,
+      provider: providerId,
+      baseUrl: model.type === "image"
+        ? resolveImageBaseUrl(model.api, model.baseUrl, modelsProvider.baseUrl) ?? ""
+        : model.baseUrl ?? modelsProvider.baseUrl ?? "",
+    }))
+    .filter((model) => typeof model.id === "string" && model.id && (model.type !== "classifier" || typeof model.contextWindow === "number"));
   const allModels = [...chatModels, ...extraModels];
   if (allModels.length === 0) return;
   const chatApis = new Set(chatModels.map((model) => model.api));
@@ -297,7 +327,7 @@ export function registerConfiguredProviders(
         registerDisabledProvider(pi, providerId, config, modelsProvider);
         continue;
       }
-      validateRuntimeConfig(providerId, config, modelsProvider);
+      validateRuntimeConfig(providerId, config, modelsProvider, issues);
       if (config.owned) {
         if (!modelsProvider) throw mcError("MCFG_E_OWNED_PROVIDER_MISSING", { provider: providerId });
         registerOwnedProvider(pi, providerId, config, modelsProvider, language);

package/src/selector.ts

@@ -76,8 +76,10 @@ export function candidateFromManaged(model: ManagedModel, metadata?: ModelMetada
   return { ...cloneManaged(model), source: "managed", mutableType: false, contextSource: metadata?.contextSource ?? (model.type === "image" ? undefined : "existing"), maxTokensSource: metadata?.maxTokensSource ?? (model.type === "chat" ? "existing" : undefined), thinkingSource: metadata?.thinkingSource ?? (model.type === "chat" && model.thinkingLevelMap ? "existing" : undefined) } as CandidateModel;
 }
 
+/** A models.json row belongs to this provider configuration and is immediately editable.
+ * It becomes managed on the next save; only runtime catalog rows remain read-only. */
 export function candidateFromExternal(model: ManagedModel, metadata?: ModelMetadataEntry): CandidateModel {
-  return { ...cloneManaged(model), source: "external", mutableType: false, contextSource: metadata?.contextSource ?? (model.type === "image" ? undefined : "existing"), maxTokensSource: metadata?.maxTokensSource ?? (model.type === "chat" ? "existing" : undefined), thinkingSource: metadata?.thinkingSource ?? (model.type === "chat" && model.thinkingLevelMap ? "existing" : undefined), readOnly: true, readOnlyReason: "external-config" } as CandidateModel;
+  return { ...cloneManaged(model), source: "external", mutableType: false, contextSource: metadata?.contextSource ?? (model.type === "image" ? undefined : "existing"), maxTokensSource: metadata?.maxTokensSource ?? (model.type === "chat" ? "existing" : undefined), thinkingSource: metadata?.thinkingSource ?? (model.type === "chat" && model.thinkingLevelMap ? "existing" : undefined) } as CandidateModel;
 }
 
 export function mergeCandidates(provider: string, installed: CandidateModel[], managed: CandidateModel[], remote: CandidateModel[]): CandidateModel[] {
@@ -206,7 +208,7 @@ class ModelSelector implements Component, Focusable {
     const row = this.filtered[this.index];
     if (!row) return;
     if (row.readOnly) {
-      this.status = t(this.language, row.readOnlyReason === "external-config" ? "selectorReadonlyExternal" : row.readOnlyReason === "runtime-catalog" ? "selectorReadonlyRuntime" : "selectorReadonlyStatus");
+      this.status = t(this.language, row.readOnlyReason === "runtime-catalog" ? "selectorReadonlyRuntime" : "selectorReadonlyStatus");
       this.tui.requestRender();
       return;
     }
@@ -405,7 +407,7 @@ class ModelSelector implements Component, Focusable {
       ...(current.type === "image" ? [t(this.language, "panelModelOutput", { value: current.output.join(", ") || t(this.language, "valueUnset") })] : []),
       t(this.language, "panelModelCost", { input: current.cost.input, output: current.cost.output, cacheRead: current.cost.cacheRead, cacheWrite: current.cost.cacheWrite }),
       t(this.language, "panelModelBaseUrl", { value: current.baseUrl ?? t(this.language, "valueDefault") }),
-      ...(current.readOnly ? [t(this.language, current.readOnlyReason === "external-config" ? "panelModelReadonlyExternal" : current.readOnlyReason === "runtime-catalog" ? "panelModelReadonlyRuntime" : "panelModelReadonly")] : []),
+      ...(current.readOnly ? [t(this.language, current.readOnlyReason === "runtime-catalog" ? "panelModelReadonlyRuntime" : "panelModelReadonly")] : []),
     ] : [];
     const rightAll = detailText.flatMap((line) => wrapTextWithAnsi(this.theme.fg("muted", line), rightWidth));
     this.detailMaxScroll = Math.max(0, rightAll.length - bodyBudget);

package/src/types.ts

@@ -120,9 +120,9 @@ export interface ProviderDraft {
 export type CandidateModel = ManagedModel & {
   source: "managed" | "external" | "installed" | "remote";
   mutableType: boolean;
-  /** Read-only entries are visible but cannot be toggled until an explicit supported ownership action. */
+  /** Read-only entries are visible but cannot be toggled: only runtime catalog rows. */
   readOnly?: boolean;
-  readOnlyReason?: "external-config" | "runtime-catalog";
+  readOnlyReason?: "runtime-catalog";
   contextSource?: ModelMetadataSource;
   maxTokensSource?: ModelMetadataSource;
   thinkingSource?: ThinkingMetadataSource;