@oldsuns/pi-switch 0.3.4 → 0.3.5

package/README.md

@@ -147,7 +147,8 @@ Session 根目录优先级：非空 `PI_CODING_AGENT_SESSION_DIR` → `<Pi agent
 - 已同步 provider 的编辑与 model 变更会同步两份文件；不同步项只更新本地库。
 - 在线导入 model **不会**隐式同步到 Pi。
 - 启动或手动重载时，以 `models.json` 中同 ID provider 为准回灌本地库；外部从 Pi 删除的 provider 仍作为不同步项保留。
-- 从 Pi 移除当前默认 provider 会先确认并清除默认模型；`d` 永久删除本地副本，必要时同时从 Pi 删除。
+- 从 Pi 移除当前默认 provider 会先确认并清除默认模型；`d` 永久删除本地副本，必要时同时从 Pi 删除；若该 provider 在 `auth.json` 有 `api_key` 凭据，删除时会询问是否一并删除（OAuth 等凭据不会被删除）。
+- API 密钥保存位置可在 Settings 里切换：默认写入 Pi 的 `auth.json`（provider 的 ID 映射到 `{"type":"api_key","key":...}`，`models.json` 与 `providers.json` 不保存密钥）；可切换回旧的 `models.json` 行为。provider 重命名时凭据随之迁移（重命名并输入新密钥时源 OAuth 凭据保留原位），目标 ID 已有凭据时先询问。切到 `models.json` 后保存密钥会移除同名 ID 上的 auth.json 条目（否则它会继续优先于 models.json）；该条目含 `env` 等配置时先询问。回到 `auth.json` 后保存会清掉 provider 文档里遗留的同名明文密钥。
 
 ## 模型导入与价格
 
@@ -193,6 +194,7 @@ Pi `settings.json` 中由 pi-switch 管理的字段：
 |------|------|
 | `language` | `en` \| `zh-CN` |
 | `fetchModelMetadata` | 是否拉 models.dev（默认 `true`） |
+| `keyStorage` | API 密钥保存位置：`auth.json`（默认）或 `models.json` |
 | `checkForUpdates` | 是否启动时检查 npm 新版本（默认 `true`） |
 | `modelDefaults` | 关闭实时元数据时的导入缺省（context / maxTokens / cost） |
 
@@ -203,6 +205,7 @@ Pi `settings.json` 中由 pi-switch 管理的字段：
 - 写前备份 `providers.json`、Pi `models.json` / `settings.json` 和 pi-switch `settings.json` 到 `~/.pi-switch/backups/`（version 3）；最多保留最近 10 份。现有 version 2 备份仍可恢复并自动拆分设置，version 1 备份不支持恢复。
 - 写入使用 `write.lock` 互斥；异常残留锁时 `doctor` 会提示。
 - `providers.json` 损坏时归档为 `corrupt-providers-*.json`，再从当前 Pi 配置重建，启动时显示归档路径。
+- `auth.json` 不参与备份；写入前以 `<auth.json>.lock` 目录与 Pi 的 proper-lockfile 互斥，并额外持有 `<auth.json>.lock.guard` 这个 OS 级锁（进程退出时内核自动释放），因此崩溃遗留的锁目录会在 30 秒后被安全接管，不会永久阻塞写入。新文件权限 `0600`，只修改目标 provider 的条目（OAuth 等其他凭据原样保留）。要替换目标 ID 上不属于该 provider 的凭据（重命名落到已有凭据的 ID、或给已有 OAuth 登录的 ID 写 API 密钥）时会先询问，未确认不写入。
 - 原子写入，只 patch 目标字段，保留未知 JSON；格式错误时停止写入并显示错误。
 - 支持 Pi 的 `$ENV` / `${ENV}` 插值与 `$$` / `$!` 转义；`!command` 原样保存，在线拉取**不会**执行它。
 - Session 删除只作用于选中的 JSONL，并校验路径必须位于 session 根目录内；优先调用系统 `trash`，失败后再永久删除。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oldsuns/pi-switch",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "A local terminal and Web UI for Pi provider and model configuration",
   "type": "module",
   "bin": {

package/web/public/app.js

@@ -174,12 +174,15 @@ function openDialog(content, context = null, preserveFocus = false) {
 
 function closeDialog() {
   if (state.busy) return;
+  const onCancel = dialogContext?.onCancel;
   dialogVersion++;
   dialog.close();
+  onCancel?.();
 }
 
 dialog.addEventListener("cancel", (event) => {
-  if (state.busy) event.preventDefault();
+  event.preventDefault();
+  closeDialog();
 });
 dialog.addEventListener("close", () => {
   dialogVersion++;
@@ -237,8 +240,8 @@ async function save(action, payload, message, options = {}) {
   return result;
 }
 
-function confirm(options, task) {
-  openDialog(dialogs.confirmationDialog(options), { kind: "confirm", task });
+function confirm(options, task, onCancel = null) {
+  openDialog(dialogs.confirmationDialog(options), { kind: "confirm", task, onCancel });
 }
 
 async function refresh() {
@@ -412,10 +415,29 @@ async function submitImport() {
   if (prepared.ambiguities.length) {
     openDialog(dialogs.ambiguityDialog(prepared.ambiguities), { kind: "ambiguities", action: "opencode.import", payload: { planId: prepared.planId }, count: prepared.ambiguities.length });
   } else {
-    showImportResult(await api("opencode.import", { planId: prepared.planId, candidateIndices: [] }));
+    await applyOpenCodeImport({ planId: prepared.planId });
   }
 }
 
+async function applyOpenCodeImport(payload) {
+  const result = await api("opencode.import", { ...payload, candidateIndices: [] });
+  if (await confirmCredentialOverwrite(result, () => applyOpenCodeImport(payload))) return;
+  showImportResult(result);
+}
+
+/// Pi resolves auth.json before the provider documents, so replacing an entry
+/// there discards a credential only Pi can restore by signing in again.
+async function confirmCredentialOverwrite(result, retry) {
+  if (!result.requiresCredentialOverwrite) return false;
+  confirm({
+    title: t("覆盖已有的 Pi 凭据？", "Replace the existing Pi credential?"),
+    description: t("auth.json 里该 ID 已有 Pi 凭据（例如 OAuth 登录）。继续会丢弃它，Pi 需要重新登录才能恢复。", "auth.json already stores a Pi credential for this ID (an OAuth sign-in, for example). Continuing discards it, and Pi has to sign in again to restore it."),
+    label: t("覆盖", "Replace"),
+    danger: true,
+  }, retry);
+  return true;
+}
+
 async function copyText(value) {
   await navigator.clipboard.writeText(value);
   toast(t("已复制到剪贴板", "Copied to clipboard"));
@@ -630,8 +652,8 @@ async function handleAction(action, target) {
       }); break;
     case "remove-provider":
       if (!provider) break;
-      confirm({ title: t("删除 Provider？", "Delete provider?"), description: t("这会从本地库删除此 Provider，并取消其 Pi 同步。关联的默认模型也会清除。", "This deletes the provider from your local library and Pi, and clears its default model if selected."), detail: provider.id, label: t("删除 Provider", "Delete provider"), danger: true },
-        () => save("provider.remove", { providerId: provider.id }, t("Provider 已删除", "Provider deleted"))); break;
+      confirm({ title: t("删除 Provider？", "Delete provider?"), description: t("这会从本地库删除此 Provider，并取消其 Pi 同步。关联的默认模型也会清除。", "This deletes the provider from your local library and Pi, and clears its default model if selected."), detail: provider.id, label: t("删除 Provider", "Delete provider"), danger: true, checkbox: provider.hasAuth ? { label: t("同时删除 auth.json 中的凭据", "Also delete the credential in auth.json"), checked: true } : null },
+        () => save("provider.remove", { providerId: provider.id, removeAuth: Boolean(provider.hasAuth && dialog.querySelector("[data-confirm-option]")?.checked) }, t("Provider 已删除", "Provider deleted"))); break;
     case "sync-provider": {
       const inPi = !provider.inPi;
       if (!inPi && state.snapshot.defaultProvider === provider.id) {
@@ -682,6 +704,7 @@ async function handleAction(action, target) {
         () => save("backups.restore", { name }, t("配置已恢复", "Configuration restored"))); break;
     }
     case "language": await execute(() => save("settings.language", { value: target.value }, t("语言设置已保存", "Language preference saved"))); break;
+case "key-storage": await execute(() => save("settings.key-storage", { value: target.value }, t("密钥保存位置已更新", "Key storage preference saved"))); break;
     case "metadata": await execute(() => save("settings.metadata", { value: target.checked }, t("元数据设置已保存", "Metadata preference saved"))); break;
     case "auto-updates": await execute(() => save("settings.updates", { value: target.checked }, t("更新设置已保存", "Update preference saved"))); break;
     case "model-defaults": openDialog(dialogs.defaultsDialog(state.snapshot.modelDefaults), { kind: "defaults" }); break;
@@ -772,9 +795,24 @@ document.addEventListener("submit", (event) => {
     switch (form.dataset.form) {
       case "provider": {
         const draft = dialogs.providerDraft(form, context.provider);
-        await save("provider.save", { previousId: context.provider?.id ?? null, draft }, t("Provider 已保存", "Provider saved"));
-        state.providerQuery = ""; state.providerFilter = "all";
-        navigate("profiles", "provider", draft.id); break;
+        const previousId = context.provider?.id ?? null;
+        const finish = () => { state.providerQuery = ""; state.providerFilter = "all"; navigate("profiles", "provider", draft.id); };
+        const result = await save("provider.save", { previousId, draft }, null, { close: false });
+        if (result.requiresCredentialOverwrite) {
+          confirm({
+            title: t("覆盖已有的 Pi 凭据？", "Replace the existing Pi credential?"),
+            description: t("auth.json 里该 ID 已有 Pi 凭据（例如 OAuth 登录）。继续会丢弃它，Pi 需要重新登录才能恢复。", "auth.json already stores a Pi credential for this ID (an OAuth sign-in, for example). Continuing discards it, and Pi has to sign in again to restore it."),
+            detail: draft.id,
+            label: t("覆盖", "Replace"),
+            danger: true,
+          },
+            () => save("provider.save", { previousId, draft, overwriteCredential: true }, t("Provider 已保存", "Provider saved")).then(finish),
+            () => openDialog(dialogs.providerDialog(state.snapshot, draft, Boolean(context.provider)), context));
+          return;
+        }
+        dialog.close();
+        toast(t("Provider 已保存", "Provider saved"));
+        finish(); break;
       }
       case "model": {
         const draft = dialogs.modelDraft(form);
@@ -788,7 +826,10 @@ document.addEventListener("submit", (event) => {
       case "import": await submitImport(); break;
       case "ambiguities": {
         const candidateIndices = Array.from({ length: context.count }, (_, index) => Number(form.elements["candidate-" + index].value));
-        showImportResult(await api(context.action, { ...context.payload, candidateIndices })); break;
+        const retry = async () => showImportResult(await api(context.action, { ...context.payload, candidateIndices, overwriteCredential: true }));
+        const result = await api(context.action, { ...context.payload, candidateIndices });
+        if (await confirmCredentialOverwrite(result, retry)) break;
+        showImportResult(result); break;
       }
     }
   });

package/web/public/dialogs.js

@@ -35,13 +35,13 @@ function numericFields(values) {
     + field("cacheWriteCost", t("缓存写入 · USD / 1M", "Cache write · USD / 1M"), values.cacheWriteCost, { type: "number", placeholder: "0" });
 }
 
-export function providerDialog(snapshot, provider) {
+export function providerDialog(snapshot, provider, editing = Boolean(provider)) {
   const value = provider ?? { id: "", baseUrl: "", api: "openai-completions", apiKey: "", authHeader: true, inPi: true, headers: null, compat: null };
   const headers = Object.fromEntries(Object.entries(value.headers ?? {}).filter(([key]) => key.toLowerCase() !== "user-agent"));
   const userAgent = Object.entries(value.headers ?? {}).find(([key]) => key.toLowerCase() === "user-agent")?.[1] ?? "";
   const compat = Object.fromEntries(Object.entries(value.compat ?? {}).filter(([key]) => key !== "sendSessionAffinityHeaders"));
   return frame({
-    title: provider ? t("编辑 Provider", "Edit provider") : t("新建 Provider", "New provider"),
+    title: editing ? t("编辑 Provider", "Edit provider") : t("新建 Provider", "New provider"),
     description: t("连接你的模型服务，将配置保存在本地。", "Connect a model service and keep its configuration locally."),
     form: "provider",
     body: `<div class="form-grid">
@@ -80,8 +80,9 @@ export function defaultsDialog(values) {
   return frame({ title: t("默认模型参数", "Default model parameters"), description: t("关闭 models.dev 元数据后，这些参数用于模型导入。", "Used for model imports when models.dev metadata is disabled."), form: "defaults", body: '<div class="form-grid">' + numericFields(values) + "</div>", footer: cancel() + submit(t("保存参数", "Save parameters")) });
 }
 
-export function confirmationDialog({ title, description, detail, label, danger = false }) {
-  return frame({ title, body: `<p class="confirm-description">${h(description)}</p>${detail ? '<div class="confirm-detail">' + h(detail) + "</div>" : ""}`, footer: `<button class="btn quiet" type="button" data-action="close-dialog" autofocus>${t("取消", "Cancel")}</button><button class="btn ${danger ? "danger" : "primary"}" type="button" data-action="confirm" data-submit>${h(label || t("确认", "Confirm"))}</button>` });
+export function confirmationDialog({ title, description, detail, label, danger = false, checkbox = null }) {
+  const option = checkbox ? `<p class="confirm-description"><label class="checkbox-label"><input type="checkbox" data-confirm-option ${checkbox.checked ? "checked" : ""}>${h(checkbox.label)}</label></p>` : "";
+  return frame({ title, body: `<p class="confirm-description">${h(description)}</p>${detail ? '<div class="confirm-detail">' + h(detail) + "</div>" : ""}${option}`, footer: `<button class="btn quiet" type="button" data-action="close-dialog" autofocus>${t("取消", "Cancel")}</button><button class="btn ${danger ? "danger" : "primary"}" type="button" data-action="confirm" data-submit>${h(label || t("确认", "Confirm"))}</button>` });
 }
 
 export function loadingDialog(title, description) {

package/web/public/profiles.js

@@ -88,7 +88,7 @@ function providerInfo(provider) {
       </div>
     </div><div class="provider-meta">
       <div><div class="meta-label">BASE URL</div><div class="meta-value">${icon("globe")}${h(provider.baseUrl || "—")}</div></div>
-      <div><div class="meta-label">API KEY</div><div class="meta-value">${icon("key")}${h(apiKey)}</div></div>
+      <div><div class="meta-label">API KEY</div><div class="meta-value">${icon("key")}${h(apiKey)}${provider.apiKeySource ? `<span class="meta-hint"> · ${h(provider.apiKeySource)}</span>` : ""}</div></div>
     </div></div>
   </section>`;
 }

package/web/public/settings.js

@@ -22,6 +22,7 @@ export function settings(state) {
         ${setting(t("界面语言", "Language"), t("Web 和 TUI 共享这项设置。", "Shared between the Web interface and TUI."), `<select data-action="language" aria-label="${t("界面语言", "Interface language")}"><option value="zh-CN" ${snapshot.language === "zh-CN" ? "selected" : ""}>简体中文</option><option value="en" ${snapshot.language === "en" ? "selected" : ""}>English</option></select>`)}
         ${setting(t("获取模型元数据", "Fetch model metadata"), t("导入时从 models.dev 获取上下文、价格与模型能力信息。", "Get context limits, pricing, and capabilities from models.dev during import."), toggle("metadata", snapshot.fetchModelMetadata, t("获取模型元数据", "Fetch model metadata")))}
         ${!snapshot.fetchModelMetadata ? setting(t("默认模型参数", "Default model parameters"), t("未使用在线元数据时，导入模型采用这些缺省值。", "Defaults used when importing without online metadata."), `<button class="btn" data-action="model-defaults">${icon("edit")}${t("编辑", "Edit")}</button>`) : ""}
+        ${setting(t("API 密钥保存位置", "API key storage"), t("编辑 Provider 时，密钥写入 Pi 的 auth.json（推荐）还是 models.json。", "When saving a provider, its API key goes to Pi's auth.json (recommended) or models.json."), `<select data-action="key-storage" aria-label="${t("API 密钥保存位置", "API key storage")}"><option value="auth.json" ${snapshot.keyStorage !== "models.json" ? "selected" : ""}>auth.json</option><option value="models.json" ${snapshot.keyStorage === "models.json" ? "selected" : ""}>models.json</option></select>`)}
         ${setting(t("TUI 启动时检查更新", "Check for updates on TUI startup"), t("控制终端界面的自动检查。Web 可在下方手动检查。", "Controls automatic checks in the terminal interface. Check manually below on the Web."), toggle("auto-updates", snapshot.checkUpdates, t("TUI 启动时检查更新", "Check for updates on TUI startup")))}
       </section>
       <section class="panel settings-group"><div class="panel-header"><h2>${icon("shield")}${t("配置维护", "Configuration tools")}</h2></div>

package/web/public/styles.css

@@ -395,6 +395,7 @@ kbd { display: inline-flex; align-items: center; justify-content: center; min-wi
 .meta-label { color: var(--muted); font-size: 10px; margin-bottom: 5px; }
 .meta-value { color: var(--subtext); font: 11px var(--mono); display: flex; gap: 7px; align-items: center; overflow-wrap: anywhere; }
 .meta-value .icon { color: var(--overlay); width: 13px; height: 13px; }
+.meta-value .meta-hint { color: var(--muted); }
 .switch { position: relative; display: inline-flex; align-items: center; justify-content: center; min-width: 44px; height: 44px; cursor: pointer; flex-shrink: 0; }
 .switch input { opacity: 0; position: absolute; inset: 0; width: 100%; height: 100%; margin: 0; cursor: pointer; }
 .switch-track { display: block; width: 31px; height: 18px; border-radius: 10px; background: var(--switch-track); transition: background 160ms; pointer-events: none; }