ai_co_discuss 0.3.60 → 0.3.61

package/docs/runner.md

@@ -75,11 +75,11 @@ codiscuss local connect https://你的站点
 之后：
 - 设备在浏览器里保存一把不可导出的设备密钥，之后打开网站直接可用。网站只认电脑签过名的设备名单，没有能被盗用的账号密码。
 - 每台设备授权 30 天，到期前用通行密钥续期。勾选“临时设备”的只授权 1 天，用于借来的电脑。
-- 新设备只能在电脑前添加，已配对设备不能远程添加。设备丢失时，在其他已配对设备或电脑上撤销它；只有一台外出设备时，回到电脑前撤销并重新配对。
-- 每台设备的“记录”列出电脑为它记下的配对、撤销、每日确认和远程操作（不含内容）；已撤销设备的记录汇总在列表末尾。看到不是你做的操作，立即撤销对应设备。
+- 新设备只能在电脑前添加，已配对设备不能远程添加。设备丢失时，在其他已配对设备或电脑上解绑它；只有一台外出设备时，回到电脑前解绑并重新配对。
+- 每台设备的记录按钮（时钟图标）列出电脑为它记下的配对、解绑、每日确认和远程操作（不含内容）；已解绑设备的记录汇总在列表末尾。看到不是你做的操作，立即解绑对应设备。
 - 清除浏览器数据会删掉设备密钥，需要回到电脑前重新配对。
 
-**每日确认**：每台设备每天第一次打开网页时，用面容、指纹或设备密码确认一次，之后 24 小时内建房、发消息、设置任意权限档（含可写、全放开）都不再询问。配对和续期本身也算一次确认。撤销设备只阻止之后的远程操作，已经在运行的工作和已改动的文件不会因此撤回。
+**每日确认**：每台设备每天第一次打开网页时，用面容、指纹或设备密码确认一次，之后 24 小时内建房、发消息、设置任意权限档（含可写、全放开）都不再询问。配对和续期本身也算一次确认。解绑设备只阻止之后的远程操作，已经在运行的工作和已改动的文件不会因此撤回。
 
 配对后目录“协作房间”直接列出电脑上的房间，与在电脑上看到的一致，可以发消息、上传附件、管理成员、导出备份，并实时更新。对话只保存在电脑上，网站只转交加密内容。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai_co_discuss",
-  "version": "0.3.60",
+  "version": "0.3.61",
   "bin": {
     "codiscuss": "runner/codiscuss.mjs"
   },

package/runner/discussion_launch.mjs

@@ -251,19 +251,44 @@ export function pick_directory({ platform = process.platform, spawn_process = sp
 /** Some CLIs take seconds to list models; reuse a good list for a day unless the executable changes or the user retries. */
 const MODEL_CACHE_MS = 24 * 60 * 60 * 1000;
 
+/** The executable's size and modification time, so a reinstalled or updated CLI is read again. */
+function executable_stamp(profile) {
+  try { const file = statSync(profile.executable); return `${file.size}:${file.mtimeMs}`; } catch { return ''; }
+}
+
+/**
+ * The model and effort a software runs with when the card leaves them empty. One read from its own settings is
+ * cheap and always fresh; one that must run the CLI (agy) is kept for a day, because each run may refresh the
+ * software's login and, when that refresh fails, it opens a browser sign-in. `refresh` reads it again.
+ */
+export async function cached_software_defaults(home, profile, { refresh = false, query = software_defaults } = {}) {
+  if (!adapter_profile(profile.adapter)?.defaults_by_query) return query(profile);
+  const path = join(home, 'model-catalogs.json');
+  const key = JSON.stringify([profile.adapter, profile.executable || '', executable_stamp(profile), 'defaults']);
+  let cache = {};
+  try { cache = JSON.parse(readFileSync(path, 'utf8')); } catch {}
+  const entry = cache[key];
+  if (!refresh && entry && Date.now() - entry.at < MODEL_CACHE_MS) return entry.result;
+  const result = await query(profile);
+  if (result?.model) {
+    try { cache = JSON.parse(readFileSync(path, 'utf8')); } catch {}
+    atomic_json(path, { ...cache, [key]: { at: Date.now(), result } });
+  }
+  return result;
+}
+
 /** Return the software catalog, served from the private service home when still valid. */
 export async function cached_software_models(home, profile, { refresh = false, query = software_models, query_effort = software_effort, query_defaults = software_defaults } = {}) {
   const path = join(home, 'model-catalogs.json');
-  let stamp = '';
-  try { const file = statSync(profile.executable); stamp = `${file.size}:${file.mtimeMs}`; } catch {}
+  const stamp = executable_stamp(profile);
   const key = JSON.stringify([profile.adapter, profile.executable || '', stamp]);
   const effort_key = JSON.stringify([profile.adapter, profile.executable || '', stamp, 'effort', profile.model || '']);
   let cache = {};
   try { cache = JSON.parse(readFileSync(path, 'utf8')); } catch {}
   const cached = entry => !refresh && entry && Date.now() - entry.at < MODEL_CACHE_MS ? entry.result : null;
-  // Defaults are read on every request, so a changed software setting shows without waiting out the cache.
   const [result, effort, defaults] = await Promise.all([cached(cache[key]) || query(profile),
-    adapter_profile(profile.adapter)?.efforts_per_model ? cached(cache[effort_key]) || query_effort(profile) : null, query_defaults(profile)]);
+    adapter_profile(profile.adapter)?.efforts_per_model ? cached(cache[effort_key]) || query_effort(profile) : null,
+    cached_software_defaults(home, profile, { refresh, query: query_defaults })]);
   const updates = {};
   if (!cached(cache[key]) && !result.error && result.models.length) {
     updates[key] = { at: Date.now(), result };
@@ -291,7 +316,7 @@ export function launch_settings(home) {
  * `actual_model` / `actual_effort` (present only when known) are what each member's session last ran with, read from the software's own session log.
  * With `quick`, agy's default model is not queried and its entry is marked `defaults_pending`.
  */
-export async function room_models(home, raw, { read_defaults = software_defaults, read_session = session_settings } = {}) {
+export async function room_models(home, raw, { read_defaults = profile => cached_software_defaults(home, profile), read_session = session_settings } = {}) {
   const input = launch_input({ ...raw, entry: 'web' });
   if (!input.room_id) throw new Error('读取本场模型须提供 room_id');
   const paths = read_registry(home).filter(path => {