dsh-mobile-plugin 0.4.1 → 0.4.4

package/lib/update-install.cjs

@@ -13,9 +13,10 @@
  * 别的插件刚发也会连累我们）。
  *
  * 包管理器优先用宿主发布的那个（profile 是宿主自带 pnpm 装的，PATH 上版本不同会
- * ERR_PNPM_UNEXPECTED_STORE），找不到再退回 PATH。装之前先看有没有 agent 在跑；force 跳过
- * 这道闸并跳过发布晾置期，auto 只跳过这道闸。顺序上先答「有没有新版」，没东西可装时不该拿
- * 「有对话在跑」挡在前面。
+ * ERR_PNPM_UNEXPECTED_STORE），找不到再退回 PATH。装之前先看有没有 agent 在跑；force 与 auto
+ * 都跳过这道闸、也都不等发布晾置期（2026-10-26 用户要求自动更新一检测到新版就立刻装，与面板
+ * 上那颗「强制更新」同一个口径），两者的区别只剩「没新版时装不装」。顺序上先答「有没有新版」，
+ * 没东西可装时不该拿「有对话在跑」挡在前面。
  *
  * 只动 profile 的依赖树；找不到包管理器就如实失败；装完以盘上版本号为准，退出码 0 不算装上。
  */
@@ -243,6 +244,7 @@ function run(command, args, { cwd, env, timeoutMs, spawnImpl = spawn }) {
  * @param {string} options.profileNodeModules profile 的 `node_modules` 目录
  * @param {string} options.version           要装的版本（注册表给的）
  * @param {boolean} [options.force]          true = 跳过「新发布先晾一会儿」的门槛
+ * @param {boolean} [options.auto]           自动更新那一轮：同样跳过发布晾置期（见文件头）
  * @param {() => any} [options.beforeInstall] 真正跑包管理器**之前**调一次（外壳用它把正在跑的
  *   那一代复制进回退目录）。包管理器一跑就把旧的 store 目录清掉了，晚一步没得复制。
  * @returns {Promise<{installed, skipped, beforeVersion, installedVersion, source, command, output, failure}>}
@@ -252,6 +254,7 @@ async function installLatest({
   version,
   name = DEFAULT_NAME,
   force = false,
+  auto = false,
   timeoutMs = INSTALL_TIMEOUT_MS,
   env = process.env,
   platform = process.platform,
@@ -331,8 +334,11 @@ async function installLatest({
 
   const spec = `${name}@${version}`;
   const releaseAgeFlag = '--config.minimum-release-age=0';
+  // `auto` 与 `force` 一样一开始就带上开关：自动更新要「一检测到就装」，不该先被那道策略挡回来
+  // 再重试一遍（多等一轮、日志里多一条失败）。
+  const skipReleaseAge = force || auto;
   const args = picked.manager === 'pnpm'
-    ? ['add', spec, '--config.auto-install-peers=false', ...(force ? [releaseAgeFlag] : [])]
+    ? ['add', spec, '--config.auto-install-peers=false', ...(skipReleaseAge ? [releaseAgeFlag] : [])]
     : ['install', spec, '--no-audit', '--no-fund'];
   let command = [picked.manager, ...args].join(' ');
   onEvent({ phase: 'install-started', command, manager: picked.kind });
@@ -356,7 +362,7 @@ async function installLatest({
    * 重试一次只会把同一条错误再说一遍，还多花一次等待。
    */
   const releaseAgeLike = /MINIMUM_RELEASE_AGE|minimumReleaseAge|minimum-release-age|release age/i;
-  const retried = !result.ok && picked.manager === 'pnpm' && !force && releaseAgeLike.test(output);
+  const retried = !result.ok && picked.manager === 'pnpm' && !skipReleaseAge && releaseAgeLike.test(output);
   if (retried) {
     onEvent({ phase: 'release-age-retry' });
     result = await spawnAdd([releaseAgeFlag]);
@@ -422,7 +428,8 @@ async function installLatest({
  *
  * `force` 是**用户明说「我知道，装吧」**的那一挡（面板上那颗「强制更新」）：它同时跳过
  * 这道闸和「新发布先晾一会儿」的门槛，而且不管有没有新版都装一遍。`auto`（宿主那一轮自动
- * 更新）只跳过这道闸，其余照旧 —— 见文件头。
+ * 更新）跳过同样的两道闸，只是仍然「没新版就不动盘」—— 2026-10-26 用户要求自动更新一检测到
+ * 新版就立刻装，所以它不再等发布晾置期，见文件头。
  */
 async function installLatestIfNeeded(options = {}) {
   const { profileNodeModules, force = false, auto = false, name = DEFAULT_NAME, agents = null } = options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mobile-plugin",
-  "version": "0.4.1",
+  "version": "0.4.4",
   "description": "Mobile API (/api/mobile/v1) and relay client for the DSH mobile app — desktop profile build (dsh 0.2.x, peers resolved by the host)",
   "license": "MIT",
   "engines": {

package/lib/auto-archive.cjs

@@ -1,98 +0,0 @@
-'use strict'
-
-const { unwrap } = require('./mobile/envelope.js')
-
-const ARCHIVE_AFTER_MS = 24 * 60 * 60 * 1000
-const SCAN_INTERVAL_MS = 12 * 60 * 60 * 1000
-
-function projectCounts(items) {
-  const counts = new Map()
-  for (const item of items) {
-    const cwd = typeof item?.cwd === 'string' ? item.cwd.trim() : ''
-    if (cwd) counts.set(cwd, (counts.get(cwd) || 0) + 1)
-  }
-  return counts
-}
-
-function archiveCandidates(items, now = Date.now()) {
-  const counts = projectCounts(items)
-  const cutoff = now - ARCHIVE_AFTER_MS
-  return items.filter(item => {
-    const cwd = typeof item?.cwd === 'string' ? item.cwd.trim() : ''
-    if (!cwd || (counts.get(cwd) || 0) <= 10) return false
-    if (item?.blank || item?.running || item?.sessionId === undefined) return false
-    return Number.isFinite(item.updatedAt) && item.updatedAt < cutoff
-  })
-}
-
-function loggerOf(ctx) {
-  return ctx?.logger && typeof ctx.logger === 'object' ? ctx.logger : undefined
-}
-
-function logFailure(ctx, sessionId, error) {
-  const logger = loggerOf(ctx)
-  const message = `automatic session archive failed for ${sessionId}: ${String(error?.message || error)}`
-  if (typeof logger?.warn === 'function') logger.warn(message)
-  else if (typeof logger?.error === 'function') logger.error(message)
-}
-
-async function scanAndArchive(ctx, now = Date.now()) {
-  const api = ctx?.apiProxy
-  const list = api?.sessions?.list
-  const archive = api?.workspace?.archiveSession
-  if (typeof list !== 'function' || typeof archive !== 'function') return { scanned: 0, archived: 0, failed: 0 }
-
-  const response = await list({ rpcId: 'dsh-mobile-plugin-auto-archive', method: 'session.list', payload: {} })
-  // 回执是 { result: { ok, value } } 信封：早先这里直接读 response.value，
-  // 而 list() 的回执根本不在那一层——这个定时任务从来没真正扫到过会话。
-  const listed = unwrap(response)
-  const items = (listed.value && listed.value.items) || []
-  const candidates = archiveCandidates(items, now)
-  let archived = 0
-  let failed = 0
-  for (const item of candidates) {
-    try {
-      const result = await archive({
-        rpcId: 'dsh-mobile-plugin-auto-archive',
-        method: 'workspace.archiveSession',
-        payload: { sessionId: item.sessionId },
-      })
-      if (result?.ok === false) throw new Error(result.error?.message || 'archive rejected')
-      archived += 1
-    } catch (error) {
-      failed += 1
-      logFailure(ctx, item.sessionId, error)
-    }
-  }
-  return { scanned: items.length, archived, failed }
-}
-
-function installAutoArchive(ctx) {
-  let disposed = false
-  let inFlight
-  const scan = () => {
-    if (disposed || inFlight) return inFlight
-    inFlight = Promise.resolve().then(() => scanAndArchive(ctx)).catch(error => {
-      logFailure(ctx, 'scan', error)
-      return { scanned: 0, archived: 0, failed: 1 }
-    }).finally(() => { inFlight = undefined })
-    return inFlight
-  }
-
-  void scan()
-  const timer = setInterval(() => { void scan() }, SCAN_INTERVAL_MS)
-  return () => {
-    if (disposed) return
-    disposed = true
-    clearInterval(timer)
-  }
-}
-
-module.exports = {
-  ARCHIVE_AFTER_MS,
-  SCAN_INTERVAL_MS,
-  archiveCandidates,
-  installAutoArchive,
-  projectCounts,
-  scanAndArchive,
-}