dsh-openwrite 0.2.28 → 0.2.34

package/presets/openwrite/skills/world-query/SKILL.md

@@ -8,14 +8,14 @@ Language: follow the author's current conversation language for responses and he
 
 # 世界查询系统
 
-把 `data/novels/{novel_id}/src/` 下的人物与世界实体文件作为唯一关系真源。Studio 拓扑和 ReAct 的 `get_world_relations` 必须调用同一个拓扑查询，不维护 `graph.yaml` 或第二套关系数据库。
+把 `data/novels/{novel_id}/src/` 下的人物与世界实体文件作为唯一关系真源。Studio 拓扑与 `novel_continuity` 必须调用同一份资产数据，不维护 `graph.yaml` 或第二套关系数据库。
 
 ## 查询
 
-- 用 `query_world` 查询实体列表或详情。
-- 用 `get_world_relations` 读取与 Studio 连续性页面同源的节点和边。
+- 用 `novel_assets(action="list", kind="world")` / `novel_assets(action="list", kind="character")` 查询实体列表。
+- 用 `novel_assets(action="read", kind="world", id=…)` 读单个实体详情。
 - Studio 关系拓扑支持按节点名称、ID、类型、摘要和关系文字搜索；命中节点会保留一跳相邻节点和连线作为上下文。
-- ReAct 没有第二套拓扑搜索索引；需要搜索时读取 `get_world_relations` 后在同一份节点/边结果中按上述字段过滤。
+- ReAct 没有第二套拓扑搜索索引；需要搜索时先 `novel_assets(action="list")` 再在同一份结果里按上述字段过滤。
 - 先用 ID 定位；用户只提供名称时允许按 front matter 名称或 Markdown H1 定位。
 
 兼容读取以下关系来源：
@@ -28,14 +28,19 @@ Language: follow the author's current conversation language for responses and he
 
 ## 增量修改关系
 
-新建、更新或删除正式关系时使用 `edit_world_relation`，并固定执行两阶段确认：
+新建、更新或删除正式关系一律走变更计划的两阶段确认，不直接写文件：
 
-1. 先以 `confirm=false` 调用，保存返回的 `base_revision`，向用户展示 diff。此步不得写文件。
-2. 只有用户明确确认后，才传回同一个 `base_revision` 并设置 `confirm=true`。
-3. 若返回 `relation_revision_conflict`，重新预览；不得复用旧 revision 或整文件重写。
-4. 用户拒绝、犹豫或只是讨论关系时，不得确认写入。
+1. `novel_change_plan(action="structured", change_kind="asset", step="preview", change=<一条 novel_assets 形状的变更>)`，
+   保存返回的 `preview_token`，向作者展示 diff。此步不写文件。
+2. 只有作者明确确认后，才 `step="apply"` 并传回同一个 `preview_token`。
+3. 若返回 `DOCUMENT_CONFLICT` 或预览 token 失效，重新 preview；不得复用旧 token 或整文件重写。
+4. 作者拒绝、犹豫或只是讨论关系时，不得 apply。
 
-正式修改统一写入源文件 TOML front matter：
+作者已在本轮明确授权过这条精确变更时，才可用直接兼容入口
+`novel_assets(action="update", kind="character"|"world", id=…, revision=<刚才 list 得到的 revision>, data={…})`。
+`revision` 必须来自刚刚一次 `novel_assets(action="list")`，否则服务端会以 409 拒绝。
+
+正式关系写在源文件 front matter：
 
 ```toml
 [[related]]
@@ -44,4 +49,4 @@ kind = "related"
 note = "共同调查旧案"
 ```
 
-使用 `action="upsert"` 新增或更新，使用 `action="remove"` 删除。源和目标必须是已有实体，禁止自关系。旧 Markdown 关系段落继续作为兼容只读来源；不要为了修改一条边而覆盖人物卡正文。
+源和目标必须是已有实体，禁止自关系。旧 Markdown 关系段落继续作为兼容只读来源；不要为了修改一条边而覆盖人物卡正文。

package/presets/openwrite/skills/write-next/SKILL.md

@@ -10,7 +10,7 @@ Language: follow the author's current conversation language for responses and he
 接到已有 `novel_*`。已有正文不得覆盖。
 
 1. `novel_status` 看阶段与待确认项；`outline_scope` 待确认时先让作者确认大纲范围。
-2. `novel_outline_read` 定位章纲：未指定则取大纲顺序中最早尚无正文的章。
+2. `novel_outline_read` 定位章纲，并读它的 `recommendation`。未指定章节时**省略 `chapter_id`**，让服务端取大纲推荐的下一章——自己推算的 id 只要和推荐不一致就会被拒绝。
 3. `novel_context_preview` 预检上下文包。
 4. `novel_chapter_work` 读取本章到期/超期/待埋入伏笔与字数目标。
 5. `novel_write_chapter` 写下一章或指定章。

package/release/runtime-manifest.json

@@ -3,7 +3,7 @@
   "dsh": "0.1.2-rc.1",
   "uv_version": "0.11.19",
   "python_version": "3.12.13",
-  "core_version": "5.8.20",
+  "core_version": "5.8.30",
   "contract_version": 1,
   "platforms": {
     "darwin-arm64": {
@@ -56,8 +56,8 @@
     }
   },
   "wheel": {
-    "file": "openwrite-5.8.20-py3-none-any.whl",
-    "sha256": "aa1f25f3c615497cd73c3c059fd2acc4e71ba2e936765d02331d1382df4b201a"
+    "file": "openwrite-5.8.30-py3-none-any.whl",
+    "sha256": "d9e48cbaa0263c7cc194005606a61abdd9194e56adb5e3365b52e4c2be805a37"
   },
   "requirements": {
     "file": "requirements.lock",
@@ -67,16 +67,7 @@
     "core": {
       "repository": "https://github.com/LiPu-jpg/Openwrite",
       "branch": "native-core",
-      "commit": "9611c654e5d77bcb5968105a7adfa8e9b4f9624a"
-    },
-    "dog": {
-      "repository": "https://github.com/Fun10165/dsh-dog",
-      "tag": "v1.2.0",
-      "commit": "3a442ef4b1a82cc4258a01baf798913c94a99445",
-      "patches": [
-        "0.2.19: src/host-shims.ts 内置 dshHomePath/defineTool，移除 @deepseek-ai/dsh-home-paths 与 @deepseek-ai/dsh-tools 的运行时导入（#74）",
-        "unreleased 0.2.28: Electron Node-mode verifier execution, structured process/output diagnostics, and per-condition DoG guards (#121)"
-      ]
+      "commit": "82bae73fd2e1cab88dc05f36cc3945c2d6ee6756"
     },
     "cryptography": {
       "package": "cryptography",

package/release/source.json

@@ -1,10 +1,10 @@
 {
   "repository": "https://github.com/LiPu-jpg/Openwrite",
-  "commit": "9390c7826024ee78cc91d5a144825a55ca0016e0",
-  "tree": "d59236a0d5dd77ce0d960586cd7c59eeaf0b96c9",
+  "commit": "4538026daf85cb0ce5652d8f0fc831173f5981b9",
+  "tree": "ed35517a1e41632b60e07076cf27227184163ee0",
   "dirty": false,
   "acquisition": "git-checkout",
-  "sourceTreeSha256": "b257753216e9ff918bae3ef04487531cb27d186f65d2e0cc613343c4663db1c8",
+  "sourceTreeSha256": "2945bc2f3de4f83878d633788d7ef2628fa0929a6b1a64beee51db5b23f79817",
   "components": [
     {
       "name": "@deepseek-ai/schemastery",
@@ -119,6 +119,24 @@
         "LICENSE"
       ]
     },
+    {
+      "name": "js-yaml",
+      "version": "4.3.1",
+      "license": "MIT",
+      "repository": "nodeca/js-yaml",
+      "files": [
+        "LICENSE"
+      ]
+    },
+    {
+      "name": "argparse",
+      "version": "2.0.1",
+      "license": "Python-2.0",
+      "repository": "nodeca/argparse",
+      "files": [
+        "LICENSE"
+      ]
+    },
     {
       "name": "proper-lockfile",
       "version": "4.1.2",
@@ -236,24 +254,6 @@
         "LICENSE.md"
       ]
     },
-    {
-      "name": "js-yaml",
-      "version": "4.3.1",
-      "license": "MIT",
-      "repository": "nodeca/js-yaml",
-      "files": [
-        "LICENSE"
-      ]
-    },
-    {
-      "name": "argparse",
-      "version": "2.0.1",
-      "license": "Python-2.0",
-      "repository": "nodeca/argparse",
-      "files": [
-        "LICENSE"
-      ]
-    },
     {
       "name": "@xyflow/react",
       "version": "12.11.6",

package/release/wheels/licenses/OPENSSL-3.6.3-LICENSE.txt

@@ -0,0 +1,225 @@
+OpenSSL 3.6.3 — Apache License 2.0
+
+This file accompanies the OpenWrite-built cryptography 50.0.1 wheel
+(cryptography-50.0.1-cp312-abi3-macosx_13_0_x86_64.whl), which statically links
+OpenSSL 3.6.3 as recorded in release/wheels/provenance.json:
+
+    /openssl = OpenSSL 3.6.3 9 Jun 2026 (Library: OpenSSL 3.6.3 9 Jun 2026)
+
+OpenSSL 3.x is licensed under the Apache License, Version 2.0
+(https://www.openssl.org/source/apache-license-2.0.txt). The license text below
+is reproduced verbatim from the Apache License 2.0 shipped inside that wheel at
+
+    cryptography-50.0.1.dist-info/licenses/LICENSE.APACHE
+
+Its SHA-256 is recorded at the end of this file so the copy can be verified
+against the wheel it came from.
+
+--------------------------------------------------------------------------
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+SHA-256 of the Apache License 2.0 text above (as shipped in
+cryptography-50.0.1.dist-info/licenses/LICENSE.APACHE):
+  aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe

package/scripts/maintenance.mjs

@@ -13,17 +13,24 @@ export const legacyBundles = legacyPackages
 const PROFILE = /^[a-zA-Z0-9_-]+$/
 const PROFILE_FILES = ['package.json', 'pnpm-lock.yaml', 'pnpm-workspace.yaml', 'cordis.patch.yml']
 
-export function inspectProfile(manifest) {
+export function inspectProfile(manifest, options = {}) {
   const bundles = Array.isArray(manifest?.dsh?.profile?.bundles) ? manifest.dsh.profile.bundles : []
   const dependencies = manifest?.dependencies && typeof manifest.dependencies === 'object'
     ? Object.keys(manifest.dependencies) : []
   const leftoverBundles = legacyPackages.filter(name => bundles.includes(name))
   const leftoverDeps = legacyPackages.filter(name => dependencies.includes(name))
+  // A manifest that names the bundle while node_modules is gone is not a working
+  // install; the caller passes bundlePresent so `installed` can say so. Without
+  // it the diagnostic reported "installed: true" and the healthy instruction on
+  // a profile that cannot boot.
+  const bundlePresent = options.bundlePresent !== false
   return {
     leftover: [...new Set([...leftoverBundles, ...leftoverDeps])],
     leftoverBundles,
     leftoverDeps,
-    installed: bundles.filter(name => name === 'dsh-openwrite').length === 1,
+    installed: bundlePresent && bundles.filter(name => name === 'dsh-openwrite').length === 1,
+    bundlePresent,
+    malformedBundles: manifest?.dsh?.profile?.bundles !== undefined && !Array.isArray(manifest.dsh.profile.bundles),
     otherPlugins: bundles.filter(name => name !== 'dsh-openwrite' && !legacyPackages.includes(name)),
   }
 }
@@ -33,8 +40,20 @@ export async function inspectPresets(home) {
   const names = await readdir(dir).catch(error => { if (error.code === 'ENOENT') return []; throw error })
   const presets = []
   for (const name of names) {
-    const marker = await readFile(join(dir, name, '.openwrite-managed.json'), 'utf8').then(JSON.parse).catch(() => null)
-    presets.push({ name, origin: marker ? 'package-managed' : 'author-owned', preserved: true })
+    const markerPath = join(dir, name, '.openwrite-managed.json')
+    const raw = await readFile(markerPath, 'utf8').catch(() => null)
+    // A marker that exists but does not parse is not the same as no marker: a
+    // crash during the install (or a hand edit) can leave a truncated file, and
+    // treating that as "author-owned" made the preset permanently unupgradable
+    // with no diagnostic. Report it distinctly so the fix (re-run the installer)
+    // is visible.
+    let marker = null
+    let origin = 'author-owned'
+    if (raw !== null) {
+      try { marker = JSON.parse(raw) } catch { marker = null; origin = 'marker-corrupt' }
+      if (marker) origin = 'package-managed'
+    }
+    presets.push({ name, origin, preserved: true, marker })
   }
   return presets
 }
@@ -126,10 +145,16 @@ export async function migrate(home, profile, apply = false, options = {}) {
     leftover: inspection.leftover, leftoverBundles: inspection.leftoverBundles, leftoverDeps: inspection.leftoverDeps,
   })
   const runPlugin = options.runPlugin ?? defaultRunPlugin
+  // The spec each removed dependency was installed from, so a failure midway can
+  // put the packages back instead of leaving a half-migrated profile whose
+  // manifest lists dependencies node_modules no longer contains.
+  const removedSpecs = []
   try {
     if (await readFile(file, 'utf8') !== original) throw new Error('Profile changed during backup; retry with dsh stopped')
     for (const name of inspection.leftoverDeps) {
+      const spec = manifest.dependencies?.[name]
       await runPlugin(home, profile, ['plugin', '--profile', profile, 'remove', '-w', name])
+      if (typeof spec === 'string') removedSpecs.push(spec)
     }
     const afterRemove = await readFile(file, 'utf8')
     const remaining = inspectProfile(JSON.parse(afterRemove))
@@ -141,6 +166,12 @@ export async function migrate(home, profile, apply = false, options = {}) {
     return { ...base, leftover: [], leftoverBundles: [], leftoverDeps: [], changed: true, backup, otherPlugins: final.otherPlugins }
   } catch (error) {
     await restoreBackup(backup, home, profile)
+    // Restoring the manifest alone is not enough: the host remove already
+    // deleted these packages from node_modules. Put them back so the profile the
+    // user is left with is the one the manifest describes.
+    for (const spec of removedSpecs) {
+      await runPlugin(home, profile, ['plugin', '--profile', profile, 'add', '-w', spec]).catch(() => {})
+    }
     error.message = `${error.message}; restored profile from ${backup}`
     throw error
   }
@@ -148,9 +179,27 @@ export async function migrate(home, profile, apply = false, options = {}) {
 
 export async function diagnose(home, profile) {
   const { manifest } = await readManifest(home, profile)
-  const inspection = inspectProfile(manifest)
   const presets = await inspectPresets(home)
   const runtime = await readFile(join(home, 'openwrite', 'active.json'), 'utf8').then(JSON.parse).catch(() => null)
+  const installedPackage = await readFile(join(home, 'profiles', profile, 'node_modules', 'dsh-openwrite', 'package.json'), 'utf8').then(JSON.parse).catch(() => null)
+  // A manifest that names the bundle while the tree is absent is not a working
+  // install. Reading the package first lets `installed` say so, instead of
+  // reporting healthy on a profile that cannot boot.
+  const inspection = inspectProfile(manifest, { bundlePresent: installedPackage !== null })
+  const toolPackage = JSON.parse(await readFile(new URL('../package.json', import.meta.url), 'utf8'))
+  const requestedSpec = manifest.dependencies?.['dsh-openwrite']
+  const packageSelection = {
+    // A private registry/git URL can contain credentials in its authority,
+    // query, fragment or path. Do not copy it into a shareable diagnostic.
+    requestedSpec: typeof requestedSpec === 'string'
+      ? requestedSpec.includes('://') || /^[^\s@]+@[^\s:]+:/.test(requestedSpec) ? '[remote package URL redacted]' : requestedSpec
+      : null,
+    resolvedVersion: installedPackage?.version ?? null,
+    diagnosticToolVersion: toolPackage.version,
+    matchesDiagnosticTool: installedPackage?.version === toolPackage.version,
+    reinstallTarget: `dsh-openwrite@${toolPackage.version}`,
+    instructions: 'After stopping dsh and backing up the profile, explicitly select a verified version or @latest; a bare add may preserve the existing dependency selection. See docs/INSTALL.md#stale-package-selection.',
+  }
   return {
     node: process.version, platform: process.platform, arch: process.arch, profile,
     installed: inspection.installed,
@@ -161,19 +210,30 @@ export async function diagnose(home, profile) {
     otherPlugins: inspection.otherPlugins,
     presets,
     runtimePrepared: runtime !== null,
+    packageSelection,
+    bundlePresent: inspection.bundlePresent,
+    malformedBundles: inspection.malformedBundles,
     instructions: inspection.leftover.length
       ? 'Stop dsh, run openwrite-maintenance migrate --profile web --apply, then install the Release package. Author-owned presets and historical sessions are preserved.'
-      : 'OpenWrite → 诊断与帮助：查看实时健康状态；本命令不启动模型。',
+      : !inspection.bundlePresent
+        ? 'The manifest lists dsh-openwrite but node_modules/dsh-openwrite is missing, so the plugin cannot load. Stop dsh, then reinstall with dsh plugin add dsh-openwrite@<verified version>.'
+        : inspection.malformedBundles
+          ? 'dsh.profile.bundles is not an array, so no bundle can be registered. Restore the profile manifest from a backup or reinstall the plugin.'
+          : 'OpenWrite → 诊断与帮助：查看实时健康状态；本命令不启动模型。',
   }
 }
 
 if (process.argv[1] && import.meta.url === pathToFileURL(resolve(process.argv[1])).href) {
   const command = process.argv[2] ?? 'doctor'
   const index = process.argv.indexOf('--profile')
-  const profile = index < 0 ? 'web' : process.argv[index + 1]
   const home = resolve(process.env.DSH_HOME || join(homedir(), '.dsh'))
   try {
     if (!['doctor', 'migrate'].includes(command)) throw new Error('Usage: openwrite-maintenance doctor|migrate --profile web [--apply]')
+    // `--profile` with no value must be a usage error. `PROFILE.test(undefined)`
+    // coerces to the string "undefined", which the pattern accepts, so the guard
+    // downstream cannot catch it and the failure surfaces as a raw TypeError.
+    if (index >= 0 && process.argv[index + 1] === undefined) throw new Error('Usage: openwrite-maintenance doctor|migrate --profile <name> [--apply]')
+    const profile = index < 0 ? 'web' : process.argv[index + 1]
     console.log(JSON.stringify(await (command === 'migrate' ? migrate(home, profile, process.argv.includes('--apply')) : diagnose(home, profile)), null, 2))
   } catch (error) { console.error(error.message); process.exitCode = 1 }
 }