dsh-as-aistudio 0.5.7 → 0.5.8

package/CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ## 中文
 
+**0.5.8** —— 跟进 dsh-log-trim 0.6.1（扫描崩溃修复、`/run` 后台执行）。
+
 **0.5.7** —— 跟进 dsh-delete-turn 0.2.4（多选条「取消」）。
 
 **0.5.6** —— 组件设置里补上「会话日志裁剪」的卡片。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-as-aistudio",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "Google-AI-Studio-style turn controls for DeepSeek Harness, in one install: edit a prompt and re-run it, re-run a reply in place, delete a turn from the model context, and render sent prompts as Markdown. Self-contained: the plugin list shows this one row, and the four components are vendored inside it - installing the studio installs nothing else.",
   "type": "module",
   "main": "src/index.js",

package/src/client.js

@@ -9578,7 +9578,7 @@ window.__ModuleLoader__.load({
     const react = require('react')
     const { jsx, jsxs } = require('react/jsx-runtime')
 
-    const PLUGIN_VERSION = '0.6.0'
+    const PLUGIN_VERSION = '0.6.1'
     const ROUTE_PREFIX = '/api/dsh-log-trim'
 
     /** The knobs this card edits, in the order they are drawn. */
@@ -9891,9 +9891,24 @@ window.__ModuleLoader__.load({
         setNote('')
         try {
           const data = await call('/run', {})
-          setStatus({ last: data.result })
-          const last = data.result || {}
-          setNote(`扫了 ${last.scanned || 0} 个会话：裁 ${(last.trimmed || []).length}，跳过 ${(last.skipped || []).length}，失败 ${(last.failed || []).length}`)
+          if (data.started === false) setNote('已经在扫了，等它跑完…')
+          // 扫描在后台跑：轮询 /status，直到 running 变回 false。
+          let last = data.result || null
+          for (let attempt = 0; attempt < 240; attempt += 1) {
+            await new Promise((resolve) => setTimeout(resolve, 500))
+            const state = await call('/status')
+            setStatus(state)
+            if (state.error) {
+              setError(`扫描失败：${state.error}`)
+              return
+            }
+            if (state.running !== true) {
+              last = state.last || last
+              break
+            }
+          }
+          const scanned = last || {}
+          setNote(`扫了 ${scanned.scanned || 0} 个会话：裁 ${(scanned.trimmed || []).length}，跳过 ${(scanned.skipped || []).length}，失败 ${(scanned.failed || []).length}`)
           void loadBackups()
         } catch (failure) {
           setError(String(failure.message || failure))
@@ -10089,7 +10104,7 @@ window.__ModuleLoader__.load({
     const NS = 'dsh-as-aistudio'
 
     /** Keep in sync with package.json and src/components.js. */
-    const PLUGIN_VERSION = '0.5.7'
+    const PLUGIN_VERSION = '0.5.8'
 
     /** Presence marker the live verifier reads. */
     const DEBUG_KEY = '__DSH_AS_AISTUDIO__'

package/src/components.js

@@ -26,7 +26,7 @@
 export const STUDIO_ID = 'dsh-as-aistudio'
 
 /** Keep in sync with package.json and src/client.js. */
-export const STUDIO_VERSION = '0.5.7'
+export const STUDIO_VERSION = '0.5.8'
 
 /**
  * The AI Studio action strip this studio composes, in the order the user meets

package/src/vendor/host/dsh-log-trim.flatten.js

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.flatten.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/flatten.js  (v0.6.0, sha256 3aa1fdcbb120ab06)
+// Source: ../dsh-log-trim/lib/flatten.js  (v0.6.1, sha256 3aa1fdcbb120ab06)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.host-libs.mjs

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.host-libs.mjs), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/host-libs.mjs  (v0.6.0, sha256 5ebed01988b5bfcf)
+// Source: ../dsh-log-trim/lib/host-libs.mjs  (v0.6.1, sha256 5ebed01988b5bfcf)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.js

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/index.js  (v0.6.0, sha256 1ef6710b85f69330)
+// Source: ../dsh-log-trim/lib/index.js  (v0.6.1, sha256 6716b35e8747d594)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the
@@ -43,7 +43,7 @@ import { readLedger, recordFor } from './dsh-log-trim.ledger.js'
 
 export const name = 'dsh-log-trim'
 export const PLUGIN_ID = name
-export const PLUGIN_VERSION = '0.6.0'
+export const PLUGIN_VERSION = '0.6.1'
 export const ROUTE_PREFIX = '/api/dsh-log-trim'
 
 /**
@@ -846,8 +846,9 @@ export async function runScan(config, logger = {}) {
     }
     // 先折叠：edit/rerun/delete 的载体是“注释行”，落成正文后日志才是“本来如此”。
     // 折叠完继续往下走，于是同一份日志还能顺带被裁窗口（两步都各自验过才写）。
+    // 这个计数跨两个分支用（折叠要不要跑、清理已遮蔽要不要跳过），必须在外层声明。
+    let carriers = 0
     if (config.flattenOnBoot !== false) {
-      let carriers = 0
       try {
         carriers = carriersIn(logFile)
       } catch {
@@ -1158,9 +1159,14 @@ export function apply(ctx, config = {}) {
   const run = async () => {
     if (state.running) return state.last
     state.running = true
+    state.error = null
     try {
       state.last = await runScan(resolved, ctx.logger ?? {})
       return state.last
+    } catch (error) {
+      // 扫描失败要能在 /status 里看到，否则界面只会一直转圈。
+      state.error = error instanceof Error ? error.message : String(error)
+      throw error
     } finally {
       state.running = false
     }
@@ -1228,7 +1234,7 @@ export function apply(ctx, config = {}) {
             return
           }
           res.setHeader('content-type', 'application/json; charset=utf-8')
-          res.end(JSON.stringify({ ok: true, version: PLUGIN_VERSION, config: resolved, running: state.running, last: state.last, duplicateStudio: duplicate }, null, 2))
+          res.end(JSON.stringify({ ok: true, version: PLUGIN_VERSION, config: resolved, running: state.running, last: state.last, error: state.error ?? null, duplicateStudio: duplicate }, null, 2))
         },
       }),
     )
@@ -1247,9 +1253,18 @@ export function apply(ctx, config = {}) {
             res.end('POST only')
             return
           }
-          const result = await run()
+          // 一次扫描可能要几十秒（169 份日志 / 62 MB），不能把 HTTP 请求挂在那里。
+          // 启动后台扫描并立刻返回，客户端轮询 /status 拿 running / last / error。
+          if (state.running) {
+            res.setHeader('content-type', 'application/json; charset=utf-8')
+            res.end(JSON.stringify({ ok: true, started: false, busy: true }, null, 2))
+            return
+          }
+          void run().catch((error) => {
+            if (typeof ctx.logger?.warn === 'function') ctx.logger.warn(`[dsh-log-trim] 扫描失败：${error instanceof Error ? error.message : String(error)}`)
+          })
           res.setHeader('content-type', 'application/json; charset=utf-8')
-          res.end(JSON.stringify({ ok: true, result }, null, 2))
+          res.end(JSON.stringify({ ok: true, started: true }, null, 2))
         },
       }),
     )

package/src/vendor/host/dsh-log-trim.ledger.js

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.ledger.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/ledger.js  (v0.6.0, sha256 1b391592e0cc0fbf)
+// Source: ../dsh-log-trim/lib/ledger.js  (v0.6.1, sha256 1b391592e0cc0fbf)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.lossless.js

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.lossless.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/lossless.js  (v0.6.0, sha256 a35a99d4fe824689)
+// Source: ../dsh-log-trim/lib/lossless.js  (v0.6.1, sha256 a35a99d4fe824689)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.roots.js

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.roots.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/roots.js  (v0.6.0, sha256 028d9c12a395aaab)
+// Source: ../dsh-log-trim/lib/roots.js  (v0.6.1, sha256 028d9c12a395aaab)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.vendor.compact-session.mjs

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.vendor.compact-session.mjs), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/vendor.compact-session.mjs  (v0.6.0, sha256 2c1c819e732c9649)
+// Source: ../dsh-log-trim/lib/vendor.compact-session.mjs  (v0.6.1, sha256 2c1c819e732c9649)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.verify-session-log.mjs

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.verify-session-log.mjs), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/verify-session-log.mjs  (v0.6.0, sha256 6a0527e8483fb252)
+// Source: ../dsh-log-trim/lib/verify-session-log.mjs  (v0.6.1, sha256 6a0527e8483fb252)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/versions.json

@@ -3,5 +3,5 @@
   "dsh-rerun-turn": "0.2.9",
   "dsh-delete-turn": "0.2.4",
   "dsh-markdown-bubble": "0.1.5",
-  "dsh-log-trim": "0.6.0"
+  "dsh-log-trim": "0.6.1"
 }