creditdaddy 1.4.0 → 1.5.0

package/build.json

@@ -0,0 +1,8 @@
+{
+  "version": "1.5.0",
+  "commit": "78ce530",
+  "branch": "main",
+  "builtAt": "2026-10-15T17:23:45.665Z",
+  "channel": "local",
+  "dirty": false
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "creditdaddy",
-  "version": "1.4.0",
-  "description": "CreditDaddy — Qoder / WorkBuddy / ZCode / mirasim / 妙手 / Trae / MiniMax 多账号本地管理与每日积分自动签到助手",
+  "version": "1.5.0",
+  "description": "CreditDaddy — Qoder / WorkBuddy / ZCode / mirasim / 妙手 / Trae / MiniMax / ModelScope 多账号本地管理与每日积分自动签到助手，及 10Router 供应商 Cookie 会话捕获与外部配额（Token Harbor / 小米 MiMo / River / ModelScope 魔搭 / LongCat）",
   "homepage": "https://github.com/techysy/CreditDaddy",
   "repository": {
     "type": "git",
@@ -15,7 +15,8 @@
     "bin",
     "src",
     "README.md",
-    "LICENSE"
+    "LICENSE",
+    "build.json"
   ],
   "engines": {
     "node": ">=20"
@@ -23,7 +24,8 @@
   "scripts": {
     "start": "node bin/creditdaddy.js daemon",
     "test": "node --test",
-    "release-check": "bash scripts/release-check.sh"
+    "release-check": "bash scripts/release-check.sh",
+    "prepack": "node scripts/gen-build-info.js build.json"
   },
   "license": "MIT",
   "devDependencies": {

package/src/accounts.js

@@ -17,7 +17,6 @@ export { displayNameFrom };
  */
 async function attachPendingWebSession(target) {
   if (!String(target.provider || '').startsWith('qoder') || !target.uid) return false;
-  if (target.meta?.qoderWebSession) return false;
   // 与 daemon 写入暂存会话（/api/auth/qoder-web-session）共用 withSettings 队列，
   // 否则两边同时「读 pending → 改 → 写回」会把对方的暂存项冲掉
   const item = await withSettings((settings) => {
@@ -28,6 +27,9 @@ async function attachPendingWebSession(target) {
     return found;
   });
   if (!item) return false;
+  // 新收割的会话**无条件替换**旧会话（刷新语义）：旧守卫「已有会话就 return false」让
+  // 重新登录永远挂不上新 cookie（会话过期的账号走「浏览器登录」更新 = 死路——10R 卡上
+  // 「网页会话已失效」的账号因此无法在 CD 侧自愈）。与 cookie-site 捕获的原位更新对齐。
   target.meta = { ...(target.meta || {}), qoderWebSession: { cookie: item.cookie, capturedAt: item.capturedAt || new Date().toISOString() } };
   return true;
 }

package/src/buildInfo.js

@@ -0,0 +1,32 @@
+/** 构建身份（#21）:读随包 build.json 与「同版本新构建」平局裁决。 */
+
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+/**
+ * 读包根的 build.json(scripts/gen-build-info.js 生成)。文件不存在 / 损坏 → null,
+ * 调用方一律按「无构建身份」回退(不展示、不参与更新判定)。
+ */
+export function loadBuildInfo(baseDir) {
+  const root = baseDir || path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
+  try {
+    const b = JSON.parse(fs.readFileSync(path.join(root, 'build.json'), 'utf8'));
+    if (!b || typeof b.commit !== 'string') return null;
+    return b;
+  } catch { return null; }
+}
+
+/**
+ * semver 相等时的平局裁决:线上是「同版本但更新的构建」吗?
+ * 仅在双侧都有构建身份、commit 不同、builtAt 更晚,且本机是 release 渠道时成立;
+ * 本地 dev / dirty / 缺元数据一律 false(永不误报「你有旧版」)。
+ */
+export function isNewerRebuild(installed, released) {
+  if (!installed || !released) return false;
+  if (installed.channel !== 'release') return false;
+  if (!installed.commit || !released.commit || installed.commit === released.commit) return false;
+  const tNew = Date.parse(released.builtAt || '');
+  const tOld = Date.parse(installed.builtAt || '');
+  return Number.isFinite(tNew) && Number.isFinite(tOld) && tNew > tOld;
+}