cortico-world-workbuddy 0.3.0 → 0.3.4

package/dist/webui.js

@@ -21,7 +21,6 @@ var TEXT = {
     source: "\u6765\u6E90",
     token: "Token\uFF08\u63A9\u7801\uFF09",
     account: "\u8D26\u53F7",
-    region: "\u533A\u57DF",
     upstream: "\u4E0A\u6E38",
     rediscover: "\u91CD\u65B0\u68C0\u6D4B\u672C\u673A\u767B\u5F55",
     pasteToken: "\u624B\u52A8\u7C98\u8D34 access token",
@@ -34,27 +33,25 @@ var TEXT = {
     lastError: "\u6700\u8FD1\u9519\u8BEF",
     models: "\u4E2A\u6A21\u578B",
     currentModel: "\u5F53\u524D\u6A21\u578B",
-    priorityTitle: "\u4E2D\u8F6C\u7AD9\u4F18\u5148",
-    priorityLabel: "\u662F\u5426\u542F\u7528Workbuddy",
-    priorityDesc: "\u6253\u5F00\u540E\u684C\u5BA0\u6BCF\u8F6E\u5BF9\u8BDD\u4F18\u5148\u8C03\u7528 WorkBuddy \u7684\u6A21\u578B\uFF0C\u5173\u95ED\u5219\u5B8C\u5168\u8DF3\u8FC7 WorkBuddy\u3002\u9700\u8981 WorkBuddy \u684C\u9762\u7AEF\u4E3B\u8FDB\u7A0B\u5728\u8FD0\u884C\u3002",
     procRunning: "WorkBuddy \u4E3B\u8FDB\u7A0B\uFF1A\u8FD0\u884C\u4E2D",
     procStopped: "WorkBuddy \u4E3B\u8FDB\u7A0B\uFF1A\u672A\u68C0\u6D4B\u5230",
-    noProcess: "\u672A\u68C0\u6D4B\u5230Workbuddy",
-    enabledOn: "\u5DF2\u5F00\u542F\uFF1A\u684C\u5BA0\u4F18\u5148\u8D70 WorkBuddy \u6A21\u578B",
-    enabledOff: "\u5DF2\u5173\u95ED\uFF1A\u684C\u5BA0\u8DF3\u8FC7 WorkBuddy",
-    usageTitle: "\u7528\u91CF",
-    usageDesc: "\u672C\u673A\u8BB0\u8D26\u7684\u8C03\u7528\u7528\u91CF\u4E0E WorkBuddy \u79EF\u5206\u5305\u4F59\u989D\u3002\u79EF\u5206\u53D6\u4E0A\u6E38\u6BCF\u6B21\u8C03\u7528\u56DE\u4F20\u7684\u771F\u5B9E\u6263\u8D39\uFF08\u53EF\u80FD\u4E3A 0\uFF09\uFF0C\u500D\u7387\u6309\u76EE\u5F55 + \u9650\u65F6\u4F18\u60E0\u5B9E\u65F6\u8BA1\u7B97\u3002",
+    usageTitle: "\u7528\u91CF\u4E0E\u6210\u672C",
+    usageDesc: "\u7ECF\u7531 WorkBuddy \u6D88\u8017\u7684 token \u4E0E\u79EF\u5206\uFF08\u672C\u5730\u8BB0\u8D26\uFF09\uFF1A\u79EF\u5206\u53D6\u4E0A\u6E38\u6BCF\u6B21\u8C03\u7528\u56DE\u4F20\u7684\u771F\u5B9E\u6263\u8D39\uFF08\u53EF\u80FD\u4E3A 0\uFF09\uFF0Ctoken \u53D6\u540C\u4E00\u6BB5 SSE \u7684 usage\uFF1B\u500D\u7387\u6309\u76EE\u5F55 + \u9650\u65F6\u4F18\u60E0\u5B9E\u65F6\u8BA1\u7B97\u3002",
     usageRefresh: "\u5237\u65B0\u4F59\u989D",
     usageClear: "\u6E05\u7A7A\u672C\u5730\u8D26\u672C",
     usageCleared: "\u672C\u5730\u8D26\u672C\u5DF2\u6E05\u7A7A",
     metricCalls: "\u8C03\u7528",
+    metricFailed: "\u5931\u8D25",
     metricCredit: "\u79EF\u5206",
     metricInput: "\u8F93\u5165 tok",
     metricOutput: "\u8F93\u51FA tok",
+    metricCached: "\u7F13\u5B58\u547D\u4E2D",
+    metricTotal: "\u5171 tok",
     spanToday: "\u4ECA\u5929",
     spanWeek: "\u8FD1 7 \u5929",
     spanMonth: "\u8FD1 30 \u5929",
-    byModel: "\u6309\u6A21\u578B",
+    spanAll: "\u5168\u90E8",
+    byModel: "\u6309\u6A21\u578B\uFF08\u8FD1 30 \u5929\uFF09",
     balanceTitle: "\u79EF\u5206\u5305\u4F59\u989D",
     colPkgName: "\u79EF\u5206\u5305",
     colPkgRemain: "\u5269\u4F59",
@@ -100,7 +97,6 @@ var TEXT = {
     source: "Source",
     token: "Token (masked)",
     account: "Account",
-    region: "Region",
     upstream: "Upstream",
     rediscover: "Re-detect local sign-in",
     pasteToken: "Paste an access token manually",
@@ -113,27 +109,25 @@ var TEXT = {
     lastError: "Last error",
     models: "models",
     currentModel: "Current model",
-    priorityTitle: "Relay first",
-    priorityLabel: "Enable Workbuddy",
-    priorityDesc: "Same state as the \u201CRelay first\u201D button on the Home page: when on, the pet asks a WorkBuddy model first every turn; when off, WorkBuddy is skipped entirely. Requires the WorkBuddy desktop main process.",
     procRunning: "WorkBuddy process: running",
     procStopped: "WorkBuddy process: not detected",
-    noProcess: "Workbuddy not detected",
-    enabledOn: "On: the pet asks WorkBuddy first",
-    enabledOff: "Off: the pet skips WorkBuddy",
-    usageTitle: "Usage",
-    usageDesc: "Locally recorded call usage plus the WorkBuddy credit balance. Credits come from the per-call figure the upstream returns (may be 0); multipliers combine the catalog with time-limited offers in real time.",
+    usageTitle: "Usage & cost",
+    usageDesc: "Tokens and credits spent through WorkBuddy (locally recorded): credits are the per-call figure the upstream returns (may be 0), tokens come from the same SSE usage block; multipliers combine the catalog with time-limited offers in real time.",
     usageRefresh: "Refresh balance",
     usageClear: "Clear local ledger",
     usageCleared: "Local ledger cleared",
     metricCalls: "Calls",
+    metricFailed: "Failed",
     metricCredit: "Credits",
     metricInput: "Input tok",
     metricOutput: "Output tok",
+    metricCached: "Cached",
+    metricTotal: "Total tok",
     spanToday: "Today",
     spanWeek: "Last 7 days",
     spanMonth: "Last 30 days",
-    byModel: "By model",
+    spanAll: "All",
+    byModel: "By model (last 30 days)",
     balanceTitle: "Credit packages",
     colPkgName: "Package",
     colPkgRemain: "Remaining",
@@ -196,9 +190,10 @@ function mountModels(ctx) {
   const head = ui.rowbar();
   const refreshBtn = ui.button(s.refresh, { variant: "primary" });
   const stateChip = ui.chip("", "plain");
+  const procChip = ui.chip("", "plain");
   const currentChip = ui.chip("", "accent");
   const allBox = ui.checkbox(s.showAllModels, { checked: false });
-  head.append(refreshBtn, stateChip, currentChip, allBox.el);
+  head.append(refreshBtn, stateChip, procChip, currentChip, allBox.el);
   sheet.body.append(head);
   const errLine = ui.msgline();
   sheet.body.append(errLine);
@@ -213,6 +208,7 @@ function mountModels(ctx) {
     const safeCount = models.filter((m) => m.safety?.allow).length;
     stateChip.textContent = `${s.lastRefresh}: ${fmtTs(state?.catalogAt, s)} \xB7 ${safeCount}/${models.length} ${s.models} \xB7 ${state?.safeOnly === false ? s.safeOnlyOff : s.safeOnlyOn}`;
     currentChip.textContent = `${s.currentModel}: ${state?.model || "\u2014"}`;
+    procChip.textContent = state?.running ? s.procRunning : s.procStopped;
   }
   function pickable(m) {
     if (state?.safeOnly === false) return true;
@@ -352,7 +348,6 @@ function mountAccount(ctx) {
       { k: s.source, v: state?.tokenSource ?? "\u2014" },
       { k: s.token, v: state?.tokenMask ?? "\u2014" },
       { k: s.account, v: state?.account?.name ?? "\u2014" },
-      { k: s.region, v: state?.region ?? "\u2014" },
       { k: s.upstream, v: state?.baseUrl ?? "\u2014" }
     ];
     if (state?.lastError) rows.push({ k: s.lastError, v: state.lastError });
@@ -415,53 +410,14 @@ function mountAccount(ctx) {
     errLine.textContent = String(err?.message ?? err);
   });
 }
-function mountPriority(ctx) {
-  const s = strings(ctx);
-  const { ui } = ctx;
-  const sheet = ui.sheet({ title: s.priorityTitle, desc: s.priorityDesc });
-  ctx.root.append(sheet.el);
-  const statusLine = ui.msgline();
-  function apply(r) {
-    if (!r) return;
-    box.setChecked(r.prefer === true);
-    statusLine.textContent = r.running ? s.procRunning : s.procStopped;
-  }
-  const box = ui.checkbox(s.priorityLabel, {
-    checked: false,
-    title: s.priorityDesc,
-    onChange: async (checked) => {
-      try {
-        const r = await ctx.invoke("set", [checked]);
-        if (r?.ok) {
-          apply(r);
-          ui.toast(checked ? s.enabledOn : s.enabledOff);
-        } else {
-          apply(r);
-          box.setChecked(false);
-          ui.toast(r?.error ?? s.noProcess, "bad");
-        }
-      } catch (err) {
-        box.setChecked(false);
-        ui.toast(String(err?.message ?? err), "bad");
-      }
-    }
-  });
-  sheet.body.append(box.el, statusLine);
-  async function load() {
-    apply(await ctx.invoke("state"));
-  }
-  ctx.stream({
-    message: () => load().catch(() => {
-    })
-  });
-  load().catch((err) => {
-    statusLine.textContent = String(err?.message ?? err);
-  });
-}
 function fmtNum(n) {
   if (typeof n !== "number" || !Number.isFinite(n)) return "\u2014";
   return String(Math.round(n * 100) / 100);
 }
+function fmtCredit(bucket) {
+  const known = fmtNum(bucket?.credit);
+  return (bucket?.creditUnknown ?? 0) > 0 ? `${known} + ?` : known;
+}
 function mountUsage(ctx) {
   const s = strings(ctx);
   const { ui } = ctx;
@@ -477,13 +433,22 @@ function mountUsage(ctx) {
   const errLine = ui.msgline();
   sheet.body.append(errLine);
   const overview = ui.table({
-    head: ["", s.metricCalls, s.metricCredit, s.metricInput, s.metricOutput],
+    head: [
+      "",
+      s.metricCalls,
+      s.metricFailed,
+      s.metricCredit,
+      s.metricInput,
+      s.metricOutput,
+      s.metricCached,
+      s.metricTotal
+    ],
     maxHeight: "220px"
   });
   sheet.body.append(overview.el);
   const modelSection = ui.section(s.byModel);
   const modelTable = ui.table({
-    head: [s.colModel, s.metricCalls, s.metricCredit, s.metricInput, s.metricOutput],
+    head: [s.colModel, s.metricCalls, s.metricFailed, s.metricCredit, s.metricInput, s.metricOutput, s.metricTotal],
     maxHeight: "260px"
   });
   modelSection.append(modelTable.el);
@@ -509,21 +474,43 @@ function mountUsage(ctx) {
   let state = null;
   function spanRow(label, bucket) {
     const b = bucket ?? {};
-    return [label, String(b.calls ?? 0), fmtNum(b.credit), fmtNum(b.prompt), fmtNum(b.completion)];
+    return [
+      label,
+      String(b.calls ?? 0),
+      String(b.failed ?? 0),
+      fmtCredit(b),
+      fmtNum(b.prompt),
+      fmtNum(b.completion),
+      fmtNum(b.cached),
+      fmtNum(b.total)
+    ];
   }
   function render() {
     const totals = state?.summary?.totals ?? {};
-    todayChip.textContent = `${s.todayCredit}: ${fmtNum(totals.today?.credit)} \xB7 ${s.todayTokens}: ${fmtNum(
+    todayChip.textContent = `${s.todayCredit}: ${fmtCredit(totals.today)} \xB7 ${s.todayTokens}: ${fmtNum(
       (totals.today?.prompt ?? 0) + (totals.today?.completion ?? 0)
     )}`;
     balanceChip.textContent = `${s.balanceTitle}: ${fmtNum(state?.balance?.total)}`;
-    const spans = [spanRow(s.spanToday, totals.today), spanRow(s.spanWeek, totals.week), spanRow(s.spanMonth, totals.month)];
+    const spans = [
+      spanRow(s.spanToday, totals.today),
+      spanRow(s.spanWeek, totals.week),
+      spanRow(s.spanMonth, totals.month),
+      spanRow(s.spanAll, totals.all)
+    ];
     overview.clear();
     for (const row of spans) overview.addRow(row);
     const byModel = state?.summary?.byModel ?? [];
     modelTable.clear(byModel.length > 0 ? void 0 : s.noData);
     for (const m of byModel) {
-      modelTable.addRow([m.model, String(m.calls ?? 0), fmtNum(m.credit), fmtNum(m.prompt), fmtNum(m.completion)]);
+      modelTable.addRow([
+        m.model,
+        String(m.calls ?? 0),
+        String(m.failed ?? 0),
+        fmtCredit(m),
+        fmtNum(m.prompt),
+        fmtNum(m.completion),
+        fmtNum(m.total)
+      ]);
     }
     const packages = state?.balance?.packages ?? [];
     pkgTable.clear(packages.length > 0 ? void 0 : s.noData);
@@ -620,7 +607,6 @@ var client_default = {
   panels: {
     models: { mount: mountModels },
     account: { mount: mountAccount },
-    priority: { mount: mountPriority },
     usage: { mount: mountUsage }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cortico-world-workbuddy",
-  "version": "0.3.0",
+  "version": "0.3.4",
   "type": "module",
   "description": "把 Windows 端已登录的 WorkBuddy 客户端模型桥接进 Coopanion：读取本机登录态，列出模型目录与默认积分倍率，供 Coo 调用。",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "locales": {
       "zh": {
         "displayName": "WorkBuddy 桥接",
-        "description": "把本机已登录的 WorkBuddy 客户端（国内版 / 国际版）模型接入 Coopanion，面板中可选模型并显示其默认积分倍率。"
+        "description": "把本机已登录的 WorkBuddy 客户端模型接入 Coopanion，面板中可选模型并显示其默认积分倍率。"
       },
       "en": {
         "displayName": "WorkBuddy Bridge",
@@ -78,6 +78,6 @@
     "win32"
   ],
   "devDependencies": {
-    "esbuild": "^0.24.2"
+    "esbuild": "0.28.2"
   }
 }

package/scripts/clean-legacy-injection.mjs

@@ -0,0 +1,77 @@
+#!/usr/bin/env node
+/**
+ * 一次性迁移工具：清理 0.2.x 主页注入留在宿主 `build/console` 里的三样东西。
+ *
+ * 0.3.0 起扩展本体**不再改写宿主任何文件**，所以这个脚本不由扩展自动执行：
+ * 装过 0.2.x 的用户主动跑一次即可。它只删本扩展自己留下的东西：
+ *   - `index.html` 里引用 `workbuddy-home.js` 的那一行 `<script>`
+ *   - `workbuddy-home.js`
+ *   - `index.html.workbuddy-backup`
+ * 绝不用备份覆盖 `index.html`（避免把宿主升级过的文件降级），也不碰其余内容。
+ *
+ * 用法：
+ *   node scripts/clean-legacy-injection.mjs --check   # 只列出会动的项，不改文件
+ *   node scripts/clean-legacy-injection.mjs --clean   # 执行清理（幂等）
+ *   COOPANION_APP_ROOT=<...>/resources/app            # 显式指定宿主位置
+ */
+import { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { findAppRoot } from './lib/app-root.mjs';
+
+const pkgDir = fileURLToPath(new URL('..', import.meta.url));
+const checkOnly = process.argv.includes('--check');
+const doClean = process.argv.includes('--clean');
+if (checkOnly === doClean) {
+  console.error('用法：node scripts/clean-legacy-injection.mjs --check | --clean（二选一）');
+  process.exit(2);
+}
+
+const appRoot = process.env.COOPANION_APP_ROOT || findAppRoot({ packageDir: pkgDir });
+if (!appRoot) {
+  console.error('✗ 找不到 Coopanion 的 resources/app（可设 COOPANION_APP_ROOT 指定）');
+  process.exit(2);
+}
+const consoleDir = join(appRoot, 'build', 'console');
+const htmlPath = join(consoleDir, 'index.html');
+if (!existsSync(htmlPath)) {
+  console.error(`✗ 找不到 ${htmlPath}`);
+  process.exit(2);
+}
+
+/** 只认「引用了 workbuddy-home.js 的 script 行」，其他一行都不动。 */
+const INJECT_LINE = /<script[^>]*workbuddy-home\.js/i;
+
+const text = readFileSync(htmlPath, 'utf8');
+const newline = text.includes('\r\n') ? '\r\n' : '\n';
+const lines = text.split(/\r?\n/);
+const kept = lines.filter((line) => !INJECT_LINE.test(line));
+const removedLines = lines.length - kept.length;
+
+const files = [
+  join(consoleDir, 'workbuddy-home.js'),
+  join(consoleDir, 'index.html.workbuddy-backup'),
+].filter((p) => existsSync(p));
+
+console.log(`宿主：${consoleDir}`);
+console.log(`index.html 注入引用行：${removedLines} 行`);
+for (const p of files) console.log(`残留文件：${p}`);
+
+if (removedLines === 0 && files.length === 0) {
+  console.log('✓ 已经是干净的，无需清理（扩展本体不会重新注入）');
+  process.exit(0);
+}
+if (checkOnly) {
+  console.log('（--check：以上为待清理项，未做任何改动；执行请加 --clean）');
+  process.exit(0);
+}
+
+if (removedLines > 0) {
+  writeFileSync(htmlPath, kept.join(newline), 'utf8');
+  console.log(`✓ 已剥掉 ${removedLines} 行注入引用（保留原有 ${newline === '\r\n' ? 'CRLF' : 'LF'} 换行风格）`);
+}
+for (const p of files) {
+  rmSync(p, { force: true });
+  console.log(`✓ 已删除 ${p}`);
+}
+console.log('✓ 清理完成；扩展本体不会重新注入，卸载也不需要还原。');

package/scripts/clean-workbuddy.mjs

@@ -0,0 +1,101 @@
+#!/usr/bin/env node
+/**
+ * 显式卸载清理：只清本扩展自己的配置块、三份数据文件和手动 token/哨兵。
+ * 宿主界面卸载只删扩展包，不会调用 World.stop()；普通 stop()/重启又不能删用户数据，
+ * 所以清理由用户在卸载后主动执行。--check 只读，--clean 才修改，且绝不打印 token。
+ *
+ * 用法：
+ *   node scripts/clean-workbuddy.mjs --check
+ *   node scripts/clean-workbuddy.mjs --clean
+ * 隔离验证可显式传 --bot-dir <部署目录> --data-dir <数据目录>。
+ */
+import { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { findAppRoot } from './lib/app-root.mjs';
+
+export const WORKBUDDY_DATA_FILES = ['workbuddy-usage.jsonl', 'workbuddy-catalog.json', 'workbuddy-balance.json'];
+
+function readConfig(path) {
+  if (!existsSync(path)) return { value: null, text: '' };
+  const text = readFileSync(path, 'utf8');
+  return { value: JSON.parse(text), text };
+}
+
+/** 返回残留位置与布尔状态，不返回任何凭据内容。 */
+export function inspectWorkbuddyResidue({ botDir, dataDir }) {
+  const configPath = join(botDir, 'config.json');
+  const envPath = join(botDir, '.env');
+  const config = readConfig(configPath);
+  const env = existsSync(envPath) ? readFileSync(envPath, 'utf8') : '';
+  return {
+    botDir,
+    dataDir,
+    configPath,
+    envPath,
+    configPresent: config.value?.worlds && Object.hasOwn(config.value.worlds, 'workbuddy'),
+    envPresent: /^[\t ]*accessToken[\t ]*=/m.test(env),
+    dataFiles: WORKBUDDY_DATA_FILES.map((name) => join(dataDir, name)).filter((path) => existsSync(path)),
+  };
+}
+
+/** 幂等清理；返回清理前后状态供 CLI 与契约测试核对。 */
+export function cleanWorkbuddyResidue({ botDir, dataDir, clean = false }) {
+  const before = inspectWorkbuddyResidue({ botDir, dataDir });
+  if (clean) {
+    if (before.configPresent) {
+      const config = readConfig(before.configPath);
+      delete config.value.worlds.workbuddy;
+      const indent = /^\{\r?\n([\t ]+)\S/.exec(config.text)?.[1] ?? '  ';
+      const newline = config.text.includes('\r\n') ? '\r\n' : '\n';
+      const trailing = config.text.endsWith(newline) ? newline : '';
+      writeFileSync(before.configPath, `${JSON.stringify(config.value, null, indent)}${trailing}`, 'utf8');
+    }
+    if (before.envPresent) {
+      const env = readFileSync(before.envPath, 'utf8');
+      const next = env.replace(/^[\t ]*accessToken[\t ]*=.*(?:\r?\n|$)/gm, '');
+      writeFileSync(before.envPath, next, 'utf8');
+    }
+    for (const path of before.dataFiles) rmSync(path, { force: true });
+  }
+  return { before, after: inspectWorkbuddyResidue({ botDir, dataDir }) };
+}
+
+function argValue(name) {
+  const index = process.argv.indexOf(name);
+  return index >= 0 ? process.argv[index + 1] : '';
+}
+
+function runCli() {
+  const check = process.argv.includes('--check');
+  const clean = process.argv.includes('--clean');
+  if (check === clean) {
+    console.error('用法：node scripts/clean-workbuddy.mjs --check | --clean（二选一）');
+    process.exit(2);
+  }
+  const pkgDir = fileURLToPath(new URL('..', import.meta.url));
+  const appRoot = process.env.COOPANION_APP_ROOT || findAppRoot({ packageDir: pkgDir });
+  const defaultBotDir = appRoot ? join(appRoot, '..', '..', 'data', 'home', 'companion') : '';
+  const botDir = resolve(argValue('--bot-dir') || defaultBotDir);
+  const dataDir = resolve(argValue('--data-dir') || join(defaultBotDir, 'data'));
+  if (!defaultBotDir && (!argValue('--bot-dir') || !argValue('--data-dir'))) {
+    console.error('✗ 找不到 Coopanion 部署目录；请显式传 --bot-dir 与 --data-dir');
+    process.exit(2);
+  }
+  try {
+    const result = cleanWorkbuddyResidue({ botDir, dataDir, clean });
+    const state = clean ? result.after : result.before;
+    console.log(`配置 worlds.workbuddy：${state.configPresent ? '存在' : '无'}`);
+    console.log(`.env accessToken：${state.envPresent ? '存在（值未读取到输出）' : '无'}`);
+    for (const path of state.dataFiles) console.log(`数据文件：${path}`);
+    if (!clean) console.log('（--check：未做任何改动；卸载扩展后执行 --clean 清理）');
+    const left = state.configPresent || state.envPresent || state.dataFiles.length > 0;
+    console.log(clean && !left ? '✓ 本扩展的配置、数据与凭据残留已清理' : left ? '发现上述本扩展残留' : '✓ 没有本扩展残留');
+    process.exit(clean && left ? 1 : 0);
+  } catch (err) {
+    console.error(`✗ 清理失败：${err?.message ?? err}`);
+    process.exit(1);
+  }
+}
+
+if (process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url)) runCli();