dsh-as-aistudio 0.5.0 → 0.5.1

package/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ## 中文
 
+**0.5.1** —— 组件行标出「动作 / 维护」；跟进内嵌组件。
+
+- 面板里每个组件行在名字后多一个徽章：`动作`（edit/rerun/delete/markdown）或 `维护`（log-trim）。
+- 内嵌 dsh-log-trim 升到 0.5.1（双份安装告警）。
+
 **0.5.0** —— 第五个组件：会话日志裁剪（dsh-log-trim 0.5.0）。
 
 - **维护型组件**：manifest 新增 `{ id: 'dsh-log-trim', suffix: 'trim', kind: 'maintenance' }`，它没有消息行动作、没有输入区浮层，因此不占 slot / overlay；补丁行、`exports["./trim"]`、vendor 副本与状态行照旧，和其它四个组件一样由本包内置。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-as-aistudio",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "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

@@ -9575,7 +9575,7 @@ window.__ModuleLoader__.load({
     const react = require('react')
     const { jsx, jsxs } = require('react/jsx-runtime')
 
-    const PLUGIN_VERSION = '0.5.0'
+    const PLUGIN_VERSION = '0.5.1'
     const ROUTE_PREFIX = '/api/dsh-log-trim'
 
     /** The knobs this card edits, in the order they are drawn. */
@@ -9988,6 +9988,12 @@ window.__ModuleLoader__.load({
               `版本 ${PLUGIN_VERSION}；设置在 ~/.dsh/dsh-log-trim/config.json，配置文件里的那一行只是初始值。`,
             ],
           }),
+          status !== null && status !== undefined && status.duplicateStudio === true
+            ? jsx('p', {
+                style: { ...style.status, color: 'var(--dsw-alias-state-warning-primary, #d98b00)' },
+                children: '检测到同时安装了 dsh-as-aistudio（它内置了本插件）：两份会各跑一次启动扫描，建议在插件列表里只保留一份。',
+              })
+            : null,
           jsx('div', {
             style: style.grid,
             children: FIELDS.filter((field) => field.kind === 'select').map((field) =>
@@ -10076,7 +10082,7 @@ window.__ModuleLoader__.load({
     const NS = 'dsh-as-aistudio'
 
     /** Keep in sync with package.json and src/components.js. */
-    const PLUGIN_VERSION = '0.5.0'
+    const PLUGIN_VERSION = '0.5.1'
 
     /** Presence marker the live verifier reads. */
     const DEBUG_KEY = '__DSH_AS_AISTUDIO__'
@@ -10117,6 +10123,8 @@ window.__ModuleLoader__.load({
       statusInstalled: '已安装，宿主未挂载',
       statusMissing: '未安装',
       statusUnknown: '宿主未报告',
+      kindAction: '动作',
+      kindMaintenance: '维护',
       hostOnly: '（独立安装时走自己的插件行）',
       row: '行 {row}',
       version: '版本 {version}',
@@ -10143,6 +10151,8 @@ window.__ModuleLoader__.load({
       statusMounted: 'Enabled',
       statusInstalled: 'Installed, host not mounted',
       statusMissing: 'Not installed',
+      kindAction: 'action',
+      kindMaintenance: 'maintenance',
       statusUnknown: 'Host did not report',
       hostOnly: '(a standalone install also shows its own row)',
       row: 'row {row}',
@@ -10554,6 +10564,7 @@ window.__ModuleLoader__.load({
         h('div', { className: 'dsas-rowHead', key: 'head' }, [
           h('span', { className: 'dsas-dot', 'data-state': state, key: 'dot' }),
           h('span', { className: 'dsas-name', key: 'name' }, text.title),
+          h('span', { className: 'dsas-badge', key: 'kind' }, component.kind === 'maintenance' ? t('kindMaintenance') : t('kindAction')),
           h('span', { className: 'dsas-badge', key: 'badge' }, stateLabelText),
           h('span', { className: 'dsas-badge dsas-code', key: 'version' }, version),
         ]),

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.0'
+export const STUDIO_VERSION = '0.5.1'
 
 /**
  * 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.5.0, sha256 3aa1fdcbb120ab06)
+// Source: ../dsh-log-trim/lib/flatten.js  (v0.5.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.5.0, sha256 5ebed01988b5bfcf)
+// Source: ../dsh-log-trim/lib/host-libs.mjs  (v0.5.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.5.0, sha256 f8f01a5f2ae2ca7b)
+// Source: ../dsh-log-trim/lib/index.js  (v0.5.1, sha256 bd4d3c438d7c00ba)
 // 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
@@ -42,7 +42,7 @@ import { applyFlatten, applyLossless, applyStreamOnly, planLossless, applyRebuil
 
 export const name = 'dsh-log-trim'
 export const PLUGIN_ID = name
-export const PLUGIN_VERSION = '0.5.0'
+export const PLUGIN_VERSION = '0.5.1'
 export const ROUTE_PREFIX = '/api/dsh-log-trim'
 
 /**
@@ -1032,11 +1032,47 @@ function isLoopback(req) {
  * @param {object} ctx - 插件上下文。
  * @param {object} [config] - 用户配置。
  */
+
+/**
+ * 本机是否同时装了独立的本插件与内嵌了它的聚合包（`dsh-as-aistudio`）。
+ *
+ * 两份会各跑一次启动扫描：都能看见对方的 `.precompact-` 备份，也能同时改写同一份日志。
+ * 这不是错误，是需要提醒的配置。
+ *
+ * @param {string} [home] - 家目录（测试用）。
+ * @returns {boolean} 同时装了就是 true。
+ */
+export function duplicateStudioInstall(home = os.homedir()) {
+  const profiles = path.join(home, '.dsh', 'profiles')
+  let names = []
+  try {
+    names = fs.readdirSync(profiles)
+  } catch {
+    return false
+  }
+  for (const name of names) {
+    let manifest
+    try {
+      manifest = JSON.parse(fs.readFileSync(path.join(profiles, name, 'package.json'), 'utf8'))
+    } catch {
+      continue
+    }
+    const bundles = Array.isArray(manifest?.dsh?.profile?.bundles) ? manifest.dsh.profile.bundles : []
+    if (bundles.includes('dsh-log-trim') && bundles.includes('dsh-as-aistudio')) return true
+  }
+  return false
+}
+
 export function apply(ctx, config = {}) {
   // The card can change these while the host runs, so the resolved values live in
   // a box the routes can replace instead of a frozen const.
   let resolved = resolveConfig({ ...config, ...readSavedConfig() })
   const state = { last: null, running: false }
+  // 双份安装：聚合包里已经内嵌了一份裁剪器，再单装一份会各跑一遍启动扫描。
+  const duplicate = duplicateStudioInstall()
+  if (duplicate && typeof ctx.logger?.warn === 'function') {
+    ctx.logger.warn('[dsh-log-trim] 检测到同时安装了 dsh-as-aistudio（内置本插件）：两份会各跑一次启动扫描，建议只留一份')
+  }
 
   // A session the GUI has open cannot be rewritten (the host holds its lock).
   // The moment one closes it becomes writable, so the deferred work happens
@@ -1150,7 +1186,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 }, null, 2))
+          res.end(JSON.stringify({ ok: true, version: PLUGIN_VERSION, config: resolved, running: state.running, last: state.last, duplicateStudio: duplicate }, null, 2))
         },
       }),
     )

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.5.0, sha256 adf9bf5d79aa41b0)
+// Source: ../dsh-log-trim/lib/lossless.js  (v0.5.1, sha256 adf9bf5d79aa41b0)
 // 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.5.0, sha256 028d9c12a395aaab)
+// Source: ../dsh-log-trim/lib/roots.js  (v0.5.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.5.0, sha256 2c1c819e732c9649)
+// Source: ../dsh-log-trim/lib/vendor.compact-session.mjs  (v0.5.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.5.0, sha256 6a0527e8483fb252)
+// Source: ../dsh-log-trim/lib/verify-session-log.mjs  (v0.5.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.7",
   "dsh-delete-turn": "0.2.0",
   "dsh-markdown-bubble": "0.1.5",
-  "dsh-log-trim": "0.5.0"
+  "dsh-log-trim": "0.5.1"
 }