mslxdff 0.1.199 → 0.1.203

package/src/cli/commands/provider/cline-quota.js

@@ -1,65 +1,65 @@
-/**
- * mslxdff -provider cline quota [--json] [--account <hash>] [--model <substr>]
- * 只读：聚合 cline-usage.jsonl 的账号×模型双口径统计，不碰转发/daemon/凭据。
- * free 口径：本周期 tokens + 已完成周期数/上周期产出；pass 口径：近 24h + 累计。
- * 空账本给空状态引导；--json 供脚本消费。
- */
-import { normalizeProviderId } from "../../../providers/model-id.js";
-import { loadAndAggregate } from "../../../providers/cline/usage.js";
-
-function pickOpt(args, name) {
-  const i = args.indexOf(name);
-  if (i < 0) return "";
-  const v = args[i + 1];
-  return v && !String(v).startsWith("-") ? String(v) : "";
-}
-
-/** 纯渲染：entries 为 aggregateUsage 的 value 数组（可单测，不碰 IO）。 */
-export function formatQuota(entries) {
-  const list = [...(entries || [])];
-  if (!list.length) {
-    return [
-      "cline quota：账本为空（cline-usage.jsonl 无记录）。",
-      "先用 cline 模型成功跑一轮对话（流式/非流式都会记账），再来看：",
-      "  mslxdff -provider cline quota",
-    ].join("\n");
-  }
-  const byAcct = new Map();
-  for (const e of list) {
-    if (!byAcct.has(e.accountId)) byAcct.set(e.accountId, []);
-    byAcct.get(e.accountId).push(e);
-  }
-  const lines = [`cline quota：${byAcct.size} 个账号 · ${list.length} 条账号×模型`];
-  for (const [acct, rows] of byAcct) {
-    lines.push(`\n[${acct}]`);
-    for (const r of rows.sort((a, b) => String(a.model).localeCompare(String(b.model)))) {
-      if (r.modelType === "free") {
-        lines.push(`  ${r.model}（free）：本周期 ${r.currentCycleTokens} · 已完成 ${r.completedCycles} 周期（上周期 ${r.lastCompletedCycleTokens}）· 累计 ${r.totalTokens}`);
-      } else {
-        lines.push(`  ${r.model}（pass）：近24h ${r.last24hTokens} · 累计 ${r.totalTokens}`);
-      }
-    }
-  }
-  return lines.join("\n");
-}
-
-export async function handleClineQuota(id, sub, rest = [], args = []) {
-  if (normalizeProviderId(id) !== "cline") return false;
-  if (String(sub || "").toLowerCase() !== "quota") return false;
-  const wantsJson = args.includes("--json") || args.includes("-json");
-  const acctFilter = pickOpt(args, "--account");
-  const modelFilter = pickOpt(args, "--model");
-  const map = await loadAndAggregate();
-  let entries = [...map.values()];
-  if (acctFilter) entries = entries.filter((e) => e.accountId === acctFilter);
-  if (modelFilter) entries = entries.filter((e) => String(e.model || "").includes(modelFilter));
-  if (wantsJson) {
-    console.log(JSON.stringify({ provider: "cline", entries }, null, 2));
-    process.exit(0);
-  }
-  console.log(formatQuota(entries));
-  if (!entries.length && map.size > 0) {
-    console.log("\n（过滤条件无命中，去掉 --account/--model 再试）");
-  }
-  process.exit(0);
-}
+/**
+ * mslxdff -provider cline quota [--json] [--account <hash>] [--model <substr>]
+ * 只读：聚合 cline-usage.jsonl 的账号×模型双口径统计，不碰转发/daemon/凭据。
+ * free 口径：本周期 tokens + 已完成周期数/上周期产出；pass 口径：近 24h + 累计。
+ * 空账本给空状态引导；--json 供脚本消费。
+ */
+import { normalizeProviderId } from "../../../providers/model-id.js";
+import { loadAndAggregate } from "../../../providers/cline/usage.js";
+
+function pickOpt(args, name) {
+  const i = args.indexOf(name);
+  if (i < 0) return "";
+  const v = args[i + 1];
+  return v && !String(v).startsWith("-") ? String(v) : "";
+}
+
+/** 纯渲染：entries 为 aggregateUsage 的 value 数组（可单测，不碰 IO）。 */
+export function formatQuota(entries) {
+  const list = [...(entries || [])];
+  if (!list.length) {
+    return [
+      "cline quota：账本为空（cline-usage.jsonl 无记录）。",
+      "先用 cline 模型成功跑一轮对话（流式/非流式都会记账），再来看：",
+      "  mslxdff -provider cline quota",
+    ].join("\n");
+  }
+  const byAcct = new Map();
+  for (const e of list) {
+    if (!byAcct.has(e.accountId)) byAcct.set(e.accountId, []);
+    byAcct.get(e.accountId).push(e);
+  }
+  const lines = [`cline quota：${byAcct.size} 个账号 · ${list.length} 条账号×模型`];
+  for (const [acct, rows] of byAcct) {
+    lines.push(`\n[${acct}]`);
+    for (const r of rows.sort((a, b) => String(a.model).localeCompare(String(b.model)))) {
+      if (r.modelType === "free") {
+        lines.push(`  ${r.model}（free）：本周期 ${r.currentCycleTokens} · 已完成 ${r.completedCycles} 周期（上周期 ${r.lastCompletedCycleTokens}）· 累计 ${r.totalTokens}`);
+      } else {
+        lines.push(`  ${r.model}（pass）：近24h ${r.last24hTokens} · 累计 ${r.totalTokens}`);
+      }
+    }
+  }
+  return lines.join("\n");
+}
+
+export async function handleClineQuota(id, sub, rest = [], args = []) {
+  if (normalizeProviderId(id) !== "cline") return false;
+  if (String(sub || "").toLowerCase() !== "quota") return false;
+  const wantsJson = args.includes("--json") || args.includes("-json");
+  const acctFilter = pickOpt(args, "--account");
+  const modelFilter = pickOpt(args, "--model");
+  const map = await loadAndAggregate();
+  let entries = [...map.values()];
+  if (acctFilter) entries = entries.filter((e) => e.accountId === acctFilter);
+  if (modelFilter) entries = entries.filter((e) => String(e.model || "").includes(modelFilter));
+  if (wantsJson) {
+    console.log(JSON.stringify({ provider: "cline", entries }, null, 2));
+    process.exit(0);
+  }
+  console.log(formatQuota(entries));
+  if (!entries.length && map.size > 0) {
+    console.log("\n（过滤条件无命中，去掉 --account/--model 再试）");
+  }
+  process.exit(0);
+}

package/src/cli/commands/provider/codearts-login.js

@@ -1,45 +1,45 @@
-// `-provider codearts login`：浏览器 PKCE 登录华为云 → 凭证 blob 落盘 providerConfigs.codearts。
-// 约定（对齐 cline-login/workbuddy-login）：不匹配返 false 交给下一个 handler；匹配即处理并退出。
-import { normalizeProviderId } from "../../../providers/model-id.js";
-import { defaultStateFile, loadProviderKeys, saveProviderConfig, saveProviderAllowAnyModels, loadProviderBaseUrl } from "../../../state.js";
-import { SNAP_BASE } from "../../../providers/codearts/const.js";
-import { runCodeartsLogin, accountToBlob } from "../../../providers/codearts/login.js";
-import { accountFromBlob } from "../../../providers/codearts/auth-pool.js";
-
-export async function handleCodeartsLogin(id, sub, rest = [], deps = {}) {
-  if (normalizeProviderId(id) !== "codearts") return false;
-  if (!(sub === "login" || sub === "auth" || sub === "oauth")) return false;
-  const noAllowAny = (rest || []).includes("--no-allow-any");
-  const file = deps.file || defaultStateFile();
-  const fetchImpl = deps.fetchImpl;
-  const log = deps.log || ((m) => console.log(m));
-
-  try {
-    const { account, state } = await runCodeartsLogin({ fetchImpl, log });
-    const blob = accountToBlob(account, { codeVerifier: state.codeVerifier, dpopJwk: state.dpopJwk, clientId: state.clientId });
-    // 同一账号重复登录：替换旧 blob；新账号：追加（多账号 keyring 轮转）。
-    // 去重键：userId 非空才可信；双方任一为空时退化为 refreshToken 比较
-    // （空 userId==空 userId 的误判会把第二个不同账号当同一账号替换，真机实测恒剩 1 key）
-    const cur = loadProviderKeys("codearts", { file }).filter((k) => {
-      const parsed = accountFromBlob(k);
-      if (!parsed) return false;
-      if (parsed.userId && account.userId) return parsed.userId !== account.userId;
-      return parsed.refreshToken !== account.refreshToken;
-    });
-    const baseUrl = loadProviderBaseUrl("codearts", { file }) || SNAP_BASE;
-    saveProviderConfig("codearts", { baseUrl, keys: [...cur, blob] }, { file });
-    if (!noAllowAny) saveProviderAllowAnyModels("codearts", true, { file });
-
-    log("");
-    log(`✅ codearts 登录成功：${account.userName || account.userId || "(user)"}（剩余账号数：${cur.length + 1}）`);
-    log(`   baseUrl: ${baseUrl}`);
-    log(`   凭证已写入 providerConfigs.codearts.keys（state.json，0600 权限目录，绝不入库）`);
-    if (!noAllowAny) log("   allowAnyModels=on（免费福利供应商默认放行全部模型；收紧：mslxdff -provider codearts allowAny off）");
-    log("   生效：mslxdff -restart（用户终端跑），然后 mslxdff -provider codearts models 验证");
-    process.exit(0);
-  } catch (err) {
-    console.error(`❌ codearts 登录失败：${String(err?.message || err)}`);
-    process.exit(1);
-  }
-  return true;
-}
+// `-provider codearts login`：浏览器 PKCE 登录华为云 → 凭证 blob 落盘 providerConfigs.codearts。
+// 约定（对齐 cline-login/workbuddy-login）：不匹配返 false 交给下一个 handler；匹配即处理并退出。
+import { normalizeProviderId } from "../../../providers/model-id.js";
+import { defaultStateFile, loadProviderKeys, saveProviderConfig, saveProviderAllowAnyModels, loadProviderBaseUrl } from "../../../state.js";
+import { SNAP_BASE } from "../../../providers/codearts/const.js";
+import { runCodeartsLogin, accountToBlob } from "../../../providers/codearts/login.js";
+import { accountFromBlob } from "../../../providers/codearts/auth-pool.js";
+
+export async function handleCodeartsLogin(id, sub, rest = [], deps = {}) {
+  if (normalizeProviderId(id) !== "codearts") return false;
+  if (!(sub === "login" || sub === "auth" || sub === "oauth")) return false;
+  const noAllowAny = (rest || []).includes("--no-allow-any");
+  const file = deps.file || defaultStateFile();
+  const fetchImpl = deps.fetchImpl;
+  const log = deps.log || ((m) => console.log(m));
+
+  try {
+    const { account, state } = await runCodeartsLogin({ fetchImpl, log });
+    const blob = accountToBlob(account, { codeVerifier: state.codeVerifier, dpopJwk: state.dpopJwk, clientId: state.clientId });
+    // 同一账号重复登录：替换旧 blob；新账号：追加（多账号 keyring 轮转）。
+    // 去重键：userId 非空才可信；双方任一为空时退化为 refreshToken 比较
+    // （空 userId==空 userId 的误判会把第二个不同账号当同一账号替换，真机实测恒剩 1 key）
+    const cur = loadProviderKeys("codearts", { file }).filter((k) => {
+      const parsed = accountFromBlob(k);
+      if (!parsed) return false;
+      if (parsed.userId && account.userId) return parsed.userId !== account.userId;
+      return parsed.refreshToken !== account.refreshToken;
+    });
+    const baseUrl = loadProviderBaseUrl("codearts", { file }) || SNAP_BASE;
+    saveProviderConfig("codearts", { baseUrl, keys: [...cur, blob] }, { file });
+    if (!noAllowAny) saveProviderAllowAnyModels("codearts", true, { file });
+
+    log("");
+    log(`✅ codearts 登录成功：${account.userName || account.userId || "(user)"}（剩余账号数：${cur.length + 1}）`);
+    log(`   baseUrl: ${baseUrl}`);
+    log(`   凭证已写入 providerConfigs.codearts.keys（state.json，0600 权限目录，绝不入库）`);
+    if (!noAllowAny) log("   allowAnyModels=on（免费福利供应商默认放行全部模型；收紧：mslxdff -provider codearts allowAny off）");
+    log("   生效：mslxdff -restart（用户终端跑），然后 mslxdff -provider codearts models 验证");
+    process.exit(0);
+  } catch (err) {
+    console.error(`❌ codearts 登录失败：${String(err?.message || err)}`);
+    process.exit(1);
+  }
+  return true;
+}

package/src/cli/commands/provider/config.js

@@ -1,119 +1,119 @@
-export async function handleProviderConfig(id, sub, rest) {
-  if (sub === "del" || sub === "delete" || sub === "rm" || sub === "remove-provider" || sub === "del-provider") {
-    const nid = String(id || "").trim().toLowerCase();
-    if (nid === "opencode" || nid === "oc") {
-      console.error("opencode 是内置供应商，不能删除");
-      process.exit(1);
-    }
-    const { loadProviderConfigs, saveProviderConfig } = await import("../../../state.js");
-    const { isPidAlive, readPid } = await import("../../../daemon.js");
-    const configs = loadProviderConfigs();
-    if (!configs[id] && !configs[nid]) {
-      // 也查旧的 providerKeys
-      const { readState } = await import("../../../state/store.js");
-      const { defaultStateFile } = await import("../../../state/store.js");
-      const raw = readState(defaultStateFile());
-      const hasLegacy = raw.providerKeys && raw.providerKeys[id];
-      if (!hasLegacy) {
-        console.error(`provider not found: ${id}`);
-        process.exit(1);
-      }
-    }
-    // 真删：空对象会触发 saveProviderConfig 的 delete 分支
-    saveProviderConfig(id, { baseUrl: "", keys: [], auths: [], allowedModels: [], modelsPath: "", chatPath: "" });
-    // 兼容旧路径的残留
-    try {
-      const { readState, writeStateImmediate, defaultStateFile } = await import("../../../state/store.js");
-      const file = defaultStateFile();
-      const raw = readState(file);
-      let changed = false;
-      if (raw.providerKeys && raw.providerKeys[id] !== undefined) {
-        const nk = { ...raw.providerKeys };
-        delete nk[id];
-        writeStateImmediate(file, { providerKeys: nk });
-        changed = true;
-      }
-      // 清理模型错误/延迟中该供应商前缀的条目（可选，不阻塞）
-      void changed;
-    } catch {}
-    console.log(`已删除供应商: ${id} — 配置已清空`);
-    // 需要重启才生效，自动重启
-    const pid = readPid();
-    if (pid && isPidAlive(pid)) {
-      console.log("检测到 daemon 运行中，自动重启以生效…");
-      const { spawnSync } = await import("node:child_process");
-      const { fileURLToPath } = await import("node:url");
-      const bin = fileURLToPath(new URL("../../../../bin/mslxdff.js", import.meta.url));
-      const r = spawnSync(process.execPath, [bin, "-restart"], { stdio: "inherit" });
-      if (r.status !== 0) console.log("自动重启失败，请手动执行: mslxdff -restart");
-      else console.log("已自动重启完成");
-    } else {
-      console.log("daemon 未运行，下次启动时生效");
-    }
-    process.exit(0);
-  }
-  if (sub === "set-models-path" || sub === "setModelsPath" || sub === "models-path") {
-    const p = rest[1];
-    if (!p) {
-      console.error(`usage: mslxdff -provider ${id} set-models-path <path>  (e.g. /v1/models)`);
-      process.exit(1);
-    }
-    if (!String(p).trim().startsWith("/")) {
-      console.error(`invalid modelsPath: ${p} (must start with /)`);
-      process.exit(1);
-    }
-    const { loadProviderConfig, saveProviderConfig } = await import("../../../state.js");
-    const cur = loadProviderConfig(id) || { baseUrl: "", keys: [] };
-    const { normalizeProviderId } = await import("../../../providers/model-id.js");
-    const nid = normalizeProviderId(id);
-    saveProviderConfig(nid || id, { baseUrl: cur.baseUrl || "", keys: cur.keys || [], modelsPath: String(p).trim() });
-    console.log(`set ${nid || id} modelsPath: ${String(p).trim()} — restart daemon to activate`);
-    process.exit(0);
-  }
-  if (sub === "set-chat-path" || sub === "setChatPath" || sub === "chat-path") {
-    const p = rest[1];
-    if (!p) {
-      console.error(`usage: mslxdff -provider ${id} set-chat-path <path>  (e.g. /v1/chat/completions)`);
-      process.exit(1);
-    }
-    if (!String(p).trim().startsWith("/")) {
-      console.error(`invalid chatPath: ${p} (must start with /)`);
-      process.exit(1);
-    }
-    const { loadProviderConfig, saveProviderConfig } = await import("../../../state.js");
-    const cur = loadProviderConfig(id) || { baseUrl: "", keys: [] };
-    const { normalizeProviderId } = await import("../../../providers/model-id.js");
-    const nid = normalizeProviderId(id);
-    saveProviderConfig(nid || id, { baseUrl: cur.baseUrl || "", keys: cur.keys || [], chatPath: String(p).trim() });
-    console.log(`set ${nid || id} chatPath: ${String(p).trim()} — restart daemon to activate`);
-    process.exit(0);
-  }
-  if (sub === "clear") {
-    const { loadProviderConfigs, loadProviderConfig, saveProviderConfig, saveProviderKeys } = await import("../../../state.js");
-    const configs = loadProviderConfigs();
-    if (configs[id]) {
-      saveProviderConfig(id, { baseUrl: "", keys: [] });
-    } else {
-      saveProviderKeys(id, []);
-    }
-    console.log(`cleared ${id} API keys (provider disabled on next daemon start)`);
-    process.exit(0);
-  }
-  if (sub === "set-url" || sub === "setUrl" || sub === "url") {
-    const url = rest[1];
-    if (!url) {
-      console.error(`usage: mslxdff -provider ${id} set-url <baseUrl>`);
-      process.exit(1);
-    }
-    if (!/^https?:\/\/.+/.test(String(url).trim())) {
-      console.error(`invalid baseUrl: ${url} (must start with http:// or https://)`);
-      process.exit(1);
-    }
-    const { loadProviderConfig, saveProviderConfig } = await import("../../../state.js");
-    const cur = loadProviderConfig(id) || { baseUrl: "", keys: [] };
-    saveProviderConfig(id, { baseUrl: String(url).trim(), keys: cur.keys || [] });
-    console.log(`set ${id} baseUrl: ${String(url).trim().replace(/\/+$/, "")} — restart daemon to activate`);
-    process.exit(0);
-  }
-  return false;
-}
+export async function handleProviderConfig(id, sub, rest) {
+  if (sub === "del" || sub === "delete" || sub === "rm" || sub === "remove-provider" || sub === "del-provider") {
+    const nid = String(id || "").trim().toLowerCase();
+    if (nid === "opencode" || nid === "oc") {
+      console.error("opencode 是内置供应商，不能删除");
+      process.exit(1);
+    }
+    const { loadProviderConfigs, saveProviderConfig } = await import("../../../state.js");
+    const { isPidAlive, readPid } = await import("../../../daemon.js");
+    const configs = loadProviderConfigs();
+    if (!configs[id] && !configs[nid]) {
+      // 也查旧的 providerKeys
+      const { readState } = await import("../../../state/store.js");
+      const { defaultStateFile } = await import("../../../state/store.js");
+      const raw = readState(defaultStateFile());
+      const hasLegacy = raw.providerKeys && raw.providerKeys[id];
+      if (!hasLegacy) {
+        console.error(`provider not found: ${id}`);
+        process.exit(1);
+      }
+    }
+    // 真删：空对象会触发 saveProviderConfig 的 delete 分支
+    saveProviderConfig(id, { baseUrl: "", keys: [], auths: [], allowedModels: [], modelsPath: "", chatPath: "" });
+    // 兼容旧路径的残留
+    try {
+      const { readState, writeStateImmediate, defaultStateFile } = await import("../../../state/store.js");
+      const file = defaultStateFile();
+      const raw = readState(file);
+      let changed = false;
+      if (raw.providerKeys && raw.providerKeys[id] !== undefined) {
+        const nk = { ...raw.providerKeys };
+        delete nk[id];
+        writeStateImmediate(file, { providerKeys: nk });
+        changed = true;
+      }
+      // 清理模型错误/延迟中该供应商前缀的条目（可选，不阻塞）
+      void changed;
+    } catch {}
+    console.log(`已删除供应商: ${id} — 配置已清空`);
+    // 需要重启才生效，自动重启
+    const pid = readPid();
+    if (pid && isPidAlive(pid)) {
+      console.log("检测到 daemon 运行中，自动重启以生效…");
+      const { spawnSync } = await import("node:child_process");
+      const { fileURLToPath } = await import("node:url");
+      const bin = fileURLToPath(new URL("../../../../bin/mslxdff.js", import.meta.url));
+      const r = spawnSync(process.execPath, [bin, "-restart"], { stdio: "inherit" });
+      if (r.status !== 0) console.log("自动重启失败，请手动执行: mslxdff -restart");
+      else console.log("已自动重启完成");
+    } else {
+      console.log("daemon 未运行，下次启动时生效");
+    }
+    process.exit(0);
+  }
+  if (sub === "set-models-path" || sub === "setModelsPath" || sub === "models-path") {
+    const p = rest[1];
+    if (!p) {
+      console.error(`usage: mslxdff -provider ${id} set-models-path <path>  (e.g. /v1/models)`);
+      process.exit(1);
+    }
+    if (!String(p).trim().startsWith("/")) {
+      console.error(`invalid modelsPath: ${p} (must start with /)`);
+      process.exit(1);
+    }
+    const { loadProviderConfig, saveProviderConfig } = await import("../../../state.js");
+    const cur = loadProviderConfig(id) || { baseUrl: "", keys: [] };
+    const { normalizeProviderId } = await import("../../../providers/model-id.js");
+    const nid = normalizeProviderId(id);
+    saveProviderConfig(nid || id, { baseUrl: cur.baseUrl || "", keys: cur.keys || [], modelsPath: String(p).trim() });
+    console.log(`set ${nid || id} modelsPath: ${String(p).trim()} — restart daemon to activate`);
+    process.exit(0);
+  }
+  if (sub === "set-chat-path" || sub === "setChatPath" || sub === "chat-path") {
+    const p = rest[1];
+    if (!p) {
+      console.error(`usage: mslxdff -provider ${id} set-chat-path <path>  (e.g. /v1/chat/completions)`);
+      process.exit(1);
+    }
+    if (!String(p).trim().startsWith("/")) {
+      console.error(`invalid chatPath: ${p} (must start with /)`);
+      process.exit(1);
+    }
+    const { loadProviderConfig, saveProviderConfig } = await import("../../../state.js");
+    const cur = loadProviderConfig(id) || { baseUrl: "", keys: [] };
+    const { normalizeProviderId } = await import("../../../providers/model-id.js");
+    const nid = normalizeProviderId(id);
+    saveProviderConfig(nid || id, { baseUrl: cur.baseUrl || "", keys: cur.keys || [], chatPath: String(p).trim() });
+    console.log(`set ${nid || id} chatPath: ${String(p).trim()} — restart daemon to activate`);
+    process.exit(0);
+  }
+  if (sub === "clear") {
+    const { loadProviderConfigs, loadProviderConfig, saveProviderConfig, saveProviderKeys } = await import("../../../state.js");
+    const configs = loadProviderConfigs();
+    if (configs[id]) {
+      saveProviderConfig(id, { baseUrl: "", keys: [] });
+    } else {
+      saveProviderKeys(id, []);
+    }
+    console.log(`cleared ${id} API keys (provider disabled on next daemon start)`);
+    process.exit(0);
+  }
+  if (sub === "set-url" || sub === "setUrl" || sub === "url") {
+    const url = rest[1];
+    if (!url) {
+      console.error(`usage: mslxdff -provider ${id} set-url <baseUrl>`);
+      process.exit(1);
+    }
+    if (!/^https?:\/\/.+/.test(String(url).trim())) {
+      console.error(`invalid baseUrl: ${url} (must start with http:// or https://)`);
+      process.exit(1);
+    }
+    const { loadProviderConfig, saveProviderConfig } = await import("../../../state.js");
+    const cur = loadProviderConfig(id) || { baseUrl: "", keys: [] };
+    saveProviderConfig(id, { baseUrl: String(url).trim(), keys: cur.keys || [] });
+    console.log(`set ${id} baseUrl: ${String(url).trim().replace(/\/+$/, "")} — restart daemon to activate`);
+    process.exit(0);
+  }
+  return false;
+}