@benz-ai-x/dsh-24pa 0.2.1-alpha.2.2 → 0.2.1-alpha.2.4

package/README.md

@@ -47,7 +47,7 @@ dsh plugin --profile <name> add @benz-ai-x/dsh-24pa@0.2.1-alpha.1.6
 
 # dsh 0.2.1-alpha.2 host (preset synced to standard.patch.yml of that baseline;
 # the peer check rejects cross-baseline installs, so alpha.2 hosts need this line)
-dsh plugin --profile <name> add @benz-ai-x/dsh-24pa@0.2.1-alpha.2.2
+dsh plugin --profile <name> add @benz-ai-x/dsh-24pa@0.2.1-alpha.2.4
 
 # dsh 0.2.0-rc.2 host — line frozen at 0.2.0-rc.2.3, no further releases (also add the two schedule companions for digests)
 dsh plugin --profile <name> add @benz-ai-x/dsh-24pa@0.2.0-rc.2.3
@@ -194,6 +194,7 @@ These limits define when this assistant needs special operational care. They are
 This Dev Note is working context for maintainers: open questions and undecided directions. It is explicitly non-authoritative — shipped behavior and limits live in the sections above and in the package code.
 
 - **Multi-baseline verification** — regression runs select the runtime with `DSH_BIN` and append the rc.2 schedule companions with `PA24_E2E_EXTRA_PLUGINS`; the active baseline is 0.2.1-alpha.2 plain (156/156), while 0.2.0-rc.2 and 0.2.1-alpha.1 remain covered by the dual-API fallback paths.
+- **Preset patch is generated** — `cordis.patch.yml` is produced by `scripts/sync-preset.mjs` from the `@deepseek-ai/dsh-web-app` standard preset pinned as a devDependency; never edit it by hand. On a new dsh baseline, bump the pin and run `npm run preset:sync`; `npm run preset:check` and unit tests fail when the checked-in copy drifts.
 - **Local harness adjacency** — dev type-checking links vendored peers from an adjacent `deepseek-harness` checkout through `scripts/link-peer.mjs`; registry installs never depend on that checkout.
 
 </details>

package/README.zh.md

@@ -47,7 +47,7 @@ dsh plugin --profile <name> add @benz-ai-x/dsh-24pa@0.2.1-alpha.1.6
 
 # dsh 0.2.1-alpha.2 宿主（预设已同步该基线的 standard.patch.yml；peer 检查拒绝
 # 跨基线安装，alpha.2 宿主须装此线）
-dsh plugin --profile <name> add @benz-ai-x/dsh-24pa@0.2.1-alpha.2.2
+dsh plugin --profile <name> add @benz-ai-x/dsh-24pa@0.2.1-alpha.2.4
 
 # dsh 0.2.0-rc.2 宿主——该线已冻结于 0.2.0-rc.2.3、不再迭代（简报功能另需两个 schedule 伴随件）
 dsh plugin --profile <name> add @benz-ai-x/dsh-24pa@0.2.0-rc.2.3
@@ -194,6 +194,7 @@ dsh 0.2.0-rc.2 宿主上，安装上述 schedule 伴随件之前，简报与会
 本备注是面向维护者的工作上下文：待决问题与未定方向。它明确不具权威性——已交付的行为与限制以正文章节与包代码为准。
 
 - **多基线验证**——回归运行用 `DSH_BIN` 选运行时、`PA24_E2E_EXTRA_PLUGINS` 附加 rc.2 的 schedule 伴随件；当前活跃基线为 0.2.1-alpha.2 无附加（156/156），0.2.0-rc.2 与 0.2.1-alpha.1 由双 API 回退路径保持兼容。
+- **预设补丁为生成物**——`cordis.patch.yml` 由 `scripts/sync-preset.mjs` 对 devDependency 钉住的 `@deepseek-ai/dsh-web-app` 标准预设应用 delta 生成，勿手改；换新 dsh 基线时先改 pin 再跑 `npm run preset:sync`，`npm run preset:check` 与单测守护已提交副本不漂移。
 - **本地 harness 相邻性**——dev 类型检查经 `scripts/link-peer.mjs` 从相邻的 `deepseek-harness` checkout 链接 vendored peers；registry 安装不依赖该 checkout。
 
 </details>

package/client.js

@@ -299,7 +299,7 @@ window.__ModuleLoader__.load({
           } else if (tab === 'work') {
             const roleNames = { memo: '备忘整理' };
             const readyItems = (state.readiness?.items || []).map(item => {
-              const labels = { host: '宿主', config: '配置', postgres: 'PostgreSQL', workspace: '工作区', feishu: '飞书接入', sessions: '固定会话' };
+              const labels = { host: '宿主', config: '配置', postgres: '业务账本', workspace: '工作区', feishu: '飞书接入', sessions: '固定会话' };
               const tier = item.state === 'ok' ? 'ok' : item.state === 'error' ? 'error' : 'warn';
               return h('div', { key: item.id, className: 'pa24-ready-item pa24-tone-' + STATUS[tier][1] },
                 icon(STATUS[tier][2], { width: 17, height: 17 }),
@@ -404,7 +404,7 @@ window.__ModuleLoader__.load({
               if (next === null) return; e.preventDefault(); selectTab(tabItems[next][0]); e.currentTarget.parentElement.querySelectorAll('[role=tab]')[next].focus();
             } }, icon(name, { width: 17, height: 17 }), t(id)))),
             h('div', { id: 'pa24-content', role: 'tabpanel', 'aria-labelledby': 'pa24-tab-' + tab, tabIndex: 0 }, content),
-            h('footer', { className: 'pa24-footer' }, icon('shield', { width: 13, height: 13 }), '数据保存在本机（PostgreSQL）；配置与记忆通过对话维护，界面只显示真实结果。')));
+            h('footer', { className: 'pa24-footer' }, icon('shield', { width: 13, height: 13 }), '数据保存在本机（业务账本随工作区配置，默认 SQLite、可选 PostgreSQL）；配置与记忆通过对话维护，界面只显示真实结果。')));
         }
 
         // F20: 企微接入面板模块——对标飞书接入：渠道配置、CLI 与身份、

package/cordis.patch.yml

@@ -1,15 +1,21 @@
+# GENERATED by packages/24pa/scripts/sync-preset.mjs from the
+# @deepseek-ai/dsh-web-app standard preset (baseline 0.2.1-alpha.2).
+# Do not edit by hand: run "npm run preset:sync" and commit the diff;
+# "npm run preset:check" guards the checked-in copy against drift.
+#
 # 24私助（24PA）formal bundle: one assistant preset plus the host plugin row.
 # The preset carries the full standard-mode capability base (persona merged into
 # the assistant identity), enables ralph / subagent_codex / subagent_claude_code,
-# and omits tool-schedule by design: reminders stay on the PostgreSQL ledger.
-# subagent_codex / subagent_claude_code mount only after their provider bundles
-# (@deepseek-ai/dsh-subagent-codex / -claude-code) are installed into the profile.
-# Synced to standard.patch.yml of dsh 0.2.1-alpha.2: plan-mode guidance wording,
-# persona cwd suffix removal, subagent spawn/fork backgroundMode back to package
-# defaults (upstream dropped the explicit continuable override). The ralph /
-# subagent_codex / subagent_claude_code rows stay enabled here by design:
-# alpha.2 moved them out of standard into the experimental catalog, but the
-# packages ship with the installation and keep resolving.
+# and omits tool-schedule by design: reminders stay on the ledger, so the
+# schedule toolFilter denies and modelSelectionSettings drop with it.
+# tool-plugin-manager stays out (profile plugin management is not a pa24
+# capability). subagent_codex / subagent_claude_code mount only after their
+# provider bundles (@deepseek-ai/dsh-subagent-codex / -claude-code) are installed
+# into the profile; the ralph / subagent_codex / subagent_claude_code rows stay
+# enabled by design even where the baseline's own catalog moved them to
+# experimental — the packages ship with the installation and keep resolving.
+# The host plugin row below is pa24-owned and never derives
+# from the standard preset.
 - insert:
     - id: pa24-preset
       name: '@deepseek-ai/dsh-agent-preset'
@@ -60,7 +66,7 @@
                 name: '@deepseek-ai/dsh-plan-mode'
                 config:
                   section: |
-                    You are in plan mode. Stay in plan mode until the user approves your plan through exit_plan_mode or switches the session mode. Imperative language to implement changes means plan the implementation, not execute it. A user's conversational agreement — including an answer confirming something you asked — approves nothing and does not end plan mode; fold the confirmed decision into the plan and submit it through exit_plan_mode.
+                    You are in plan mode. Stay in plan mode until exit_plan_mode succeeds or the user switches the session mode. Imperative language to implement changes means plan the implementation, not execute it. A user's conversational agreement — including an answer confirming something you asked — approves nothing and does not end plan mode; fold the confirmed decision into the plan and submit it through exit_plan_mode.
 
                     Explore first. Use non-mutating reads, searches, static analysis, and checks to ground the plan in the actual repository. Do not edit or write files, change configuration, run formatters or code generation that rewrites tracked files, commit, or otherwise carry out the plan. Prefer existing functions and patterns over new machinery.
 

package/lib/lock.js

@@ -1,16 +1,25 @@
 import { open, readFile, rename, unlink } from 'node:fs/promises';
 import { join } from 'node:path';
-// The dsh web Host has no built-in second-instance guard, so the plugin
-// refuses to become the active writer when another live process still holds
-// the state-directory lock (P01: a second active Host is rejected).
 export class HostAlreadyActive extends Error {
     holder;
     constructor(holder) {
-        super(`已有活跃的24私助 Host（pid ${holder.pid}，自 ${holder.startedAt} 运行）；同一状态目录只允许一个写实例。`);
+        super(`已有活跃的24私助 Host（pid ${holder.pid}，自 ${holder.startedAt} 运行` +
+            describeHolder(holder) +
+            `，锁文件 ${holder.path}）；同一状态目录只允许一个写实例。`);
         this.holder = holder;
         this.name = 'HostAlreadyActive';
     }
 }
+function describeHolder(holder) {
+    const parts = [];
+    if (holder.argv?.length) {
+        const command = holder.argv.join(' ');
+        parts.push(`，命令「${command.length > 300 ? `${command.slice(0, 300)}…` : command}」`);
+    }
+    if (holder.cwd)
+        parts.push(`，工作目录 ${holder.cwd}`);
+    return parts.join('');
+}
 function isAlive(pid) {
     try {
         process.kill(pid, 0);
@@ -22,7 +31,7 @@ function isAlive(pid) {
 }
 export async function acquireHostLock(stateDirectory) {
     const path = join(stateDirectory, 'host.lock');
-    const record = { pid: process.pid, startedAt: new Date().toISOString() };
+    const record = { pid: process.pid, startedAt: new Date().toISOString(), argv: process.argv, cwd: process.cwd() };
     let handle;
     try {
         handle = await open(path, 'wx', 0o600);
@@ -39,7 +48,13 @@ export async function acquireHostLock(stateDirectory) {
         }
         const pid = Number(previous.pid);
         if (Number.isInteger(pid) && pid > 0 && isAlive(pid)) {
-            throw new HostAlreadyActive({ pid, startedAt: String(previous.startedAt ?? '未知时间'), path });
+            throw new HostAlreadyActive({
+                pid,
+                startedAt: String(previous.startedAt ?? '未知时间'),
+                path,
+                ...(Array.isArray(previous.argv) ? { argv: previous.argv } : {}),
+                ...(typeof previous.cwd === 'string' ? { cwd: previous.cwd } : {}),
+            });
         }
         // Stale holder (crashed or unreadable record): archive and take over.
         await rename(path, `${path}.stale-${Date.now()}`).catch(() => { });

package/lib/runtime.js

@@ -5516,7 +5516,7 @@ export class PaRuntime {
                 ? `启动未完成：${this.startupError.message}`
                 : this.closed
                     ? '插件已停止'
-                    : `24私助 Host 运行中（Node ${process.version}，dsh ${versions.dsh}，飞书 SDK ${versions.sdk}）`,
+                    : `24私助 Host 运行中（Node ${process.version}，dsh ${versions.dsh}，24私助插件 ${versions.plugin}，飞书 SDK ${versions.sdk}）`,
         });
         items.push({
             id: 'config',
@@ -5614,7 +5614,7 @@ function resolveVersions() {
             return '未解析';
         }
     };
-    cachedVersions = { dsh: read('@deepseek-ai/dsh'), sdk: read('@larksuiteoapi/node-sdk') };
+    cachedVersions = { dsh: read('@deepseek-ai/dsh'), sdk: read('@larksuiteoapi/node-sdk'), plugin: read('..') };
     return cachedVersions;
 }
 /** In-process fake used by tests and demo mode to exercise the real pipeline. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@benz-ai-x/dsh-24pa",
-  "version": "0.2.1-alpha.2.2",
+  "version": "0.2.1-alpha.2.4",
   "description": "24私助（24PA）: Feishu-backed personal assistant as a dsh workspace bundle.",
   "type": "module",
   "engines": {
@@ -24,6 +24,8 @@
     "build": "tsc -p tsconfig.json",
     "test": "vitest run",
     "test:unit": "vitest run tests/unit",
+    "preset:sync": "node scripts/sync-preset.mjs",
+    "preset:check": "node scripts/sync-preset.mjs --check",
     "prepare": "node scripts/link-peer.mjs"
   },
   "dependencies": {
@@ -52,10 +54,12 @@
     }
   },
   "devDependencies": {
+    "@deepseek-ai/dsh-web-app": "0.2.1-alpha.2",
     "@types/node": "^22.10.0",
     "@types/pg": "8.11.10",
     "typescript": "^5.7.0",
-    "vitest": "^2.1.0"
+    "vitest": "^2.1.0",
+    "yaml": "2.9.0"
   },
   "dsh": {
     "bundle": {