@chengzhao-dev/dsh-cpp-workflow 0.6.6 → 0.6.7

package/README.en.md

@@ -19,13 +19,13 @@ The exception material follows the C++ Core Guidelines' Error handling section a
 Pinned npm install:
 
 ```bash
-dsh plugin --profile web add npm:@chengzhao-dev/dsh-cpp-workflow@0.6.6
+dsh plugin --profile web add npm:@chengzhao-dev/dsh-cpp-workflow@0.6.7
 ```
 
 The matching Git tag:
 
 ```bash
-dsh plugin --profile web add github:chengzhao-dev/dsh-cpp-workflow#v0.6.6
+dsh plugin --profile web add github:chengzhao-dev/dsh-cpp-workflow#v0.6.7
 ```
 
 The desktop app owns the `desktop` profile. If the command-line `add` is rejected, add the plugin in the app settings and use the same pinned npm version. A Git tag install uses the prebuilt `lib/` committed in the repository and runs no build on the target machine; the package has no install script that needs approval.
@@ -34,6 +34,8 @@ The desktop app owns the `desktop` profile. If the command-line `add` is rejecte
 
 The plugin page's "C++ Workflow" card is the only entry point and manages file-header tags only: `@file` is always the file name, `@brief` is written by default, and `@author`, `@date`, `@copyright`, `@version` stay off and are written only when they hold a non-empty value; `@param` is required for every parameter; `@return` is written by default but may be omitted when the condition is self-evident; `@throws` only when the function throws. The preview follows the switches, saving takes effect on the next skill read, and existing sources are never rewritten. Settings navigation no longer duplicates the form.
 
+If the page still reports that it is not connected to a configuration form after an upgrade, the window is still running the previous client bundle: restart DeepSeek Harness or select "Reload page" on the plugin page. The page retries the connection while open and switches to the editable form as soon as the host serves it; reinstalling is unnecessary. Discard changes, Restore defaults and Save are separate: discard returns to the last value read from the host, restore fills the draft, and only Save writes it.
+
 ## Workspace gate
 
 Only one condition must hold before either skill appears: walking up from the current directory to the Git root, the path contains `.agents/skills/cpp-workflow-project/SKILL.md`.

package/README.md

@@ -19,13 +19,13 @@
 npm 安装钉死版本：
 
 ```bash
-dsh plugin --profile web add npm:@chengzhao-dev/dsh-cpp-workflow@0.6.6
+dsh plugin --profile web add npm:@chengzhao-dev/dsh-cpp-workflow@0.6.7
 ```
 
 同版本的 Git 标签：
 
 ```bash
-dsh plugin --profile web add github:chengzhao-dev/dsh-cpp-workflow#v0.6.6
+dsh plugin --profile web add github:chengzhao-dev/dsh-cpp-workflow#v0.6.7
 ```
 
 桌面应用独占 `desktop` profile。命令行 `add` 被拒绝时，在应用设置里添加插件，地址填同一个 npm 版本。Git 标签安装使用仓库内已构建的 `lib/`，不在目标机器上重新构建；包内也不含需要授权执行的安装脚本。
@@ -34,6 +34,8 @@ dsh plugin --profile web add github:chengzhao-dev/dsh-cpp-workflow#v0.6.6
 
 插件页的「C++ 工程流程」是唯一入口，只管文件头标签：`@file` 固定为文件名，`@brief` 默认写出，`@author`、`@date`、`@copyright`、`@version` 默认关闭且只在填了非空值时才写出；有参数就要求 `@param`，有返回值默认要求 `@return`（成立条件自明时可省），会抛才要求 `@throws`。预览随开关即时更新，保存后下一次读取技能即生效，已有源码不会被改写。设置导航不再重复放一份。
 
+升级插件后如果这一页仍显示“暂时没有连到配置表单”，说明当前窗口还挂着旧的前端产物：重启 DeepSeek Harness，或在插件页点“重新载入页面”。页面会在打开后自动重试连接，拿到表单就切换为可编辑，不需要重装插件。保存、撤销修改与恢复默认值分三个按钮：撤销只回到最近一次读到的值，恢复默认值只填草稿，点保存才写盘。
+
 ## 工作区门禁
 
 一个会话里只需要满足一件事，技能就会出现：从当前目录向上、停在 git 根，沿途有 `.agents/skills/cpp-workflow-project/SKILL.md`。

package/lib/client.js

@@ -1,4 +1,4 @@
-// 由 scripts/building-client.mjs 生成，请改 src/comment-policy.ts 与 src/client/app.cjs.js。
+// 由 scripts/building-client.mjs 生成，请改 src/comment-policy.ts 与 src/client/*.js。
 window.__ModuleLoader__.load({
   id: "@chengzhao-dev/dsh-cpp-workflow",
   factory: (require) => {
@@ -237,14 +237,18 @@ const STRINGS = {
     preview: '预览',
     previewHint: '按当前开关生成，文件名用占位符表示。',
     save: '保存',
-    reset: '恢复出厂值',
+    reset: '撤销修改',
+    defaults: '恢复默认值',
+    restored: '已填入内置默认值，点“保存”后生效。',
     saved: '已保存，下一次读取技能时生效。',
-    rejected: '保存被拒绝：配置可能已在别处修改，请恢复出厂值后再试。',
+    rejected: '保存被拒绝：配置可能已在别处修改。请先撤销修改，再重新编辑。',
     unsaved: '有未保存的改动',
     loading: '正在读取配置…',
     unavailable: '这个部署没有提供这份配置。',
     unreadable: '当前账户不能修改这份配置。',
-    readOnly: '当前部署没有把可编辑配置传给这个页面，下面显示的是出厂值。',
+    readOnly: '这个页面暂时没有连到配置表单，下面的值是内置默认值。重启 DeepSeek Harness 后重新打开本页即可编辑。',
+    reload: '重新载入页面',
+    noService: '（configForms 服务未连接）',
     fixed: '跟随文件名',
     fixedHint: '值由实际文件决定，不写进配置。',
     emptyValue: '留空则由文件自己写',
@@ -273,14 +277,18 @@ const STRINGS = {
     preview: 'Preview',
     previewHint: 'Generated from the switches above; the file name is a placeholder.',
     save: 'Save',
-    reset: 'Restore defaults',
+    reset: 'Discard changes',
+    defaults: 'Restore defaults',
+    restored: 'Built-in defaults are filled in; select Save to apply them.',
     saved: 'Saved; the next skill read uses it.',
-    rejected: 'The host rejected the save: the config changed elsewhere. Restore defaults and try again.',
+    rejected: 'The host rejected the save: the config changed elsewhere. Discard your changes and edit again.',
     unsaved: 'Unsaved changes',
     loading: 'Reading configuration…',
     unavailable: 'This deployment does not serve this configuration.',
     unreadable: 'This account cannot edit the configuration.',
-    readOnly: 'This deployment does not pass an editable form to this page; the values below are defaults.',
+    readOnly: 'This page is not connected to a configuration form yet; the values below are built-in defaults. Restart DeepSeek Harness, then reopen this page to edit.',
+    reload: 'Reload page',
+    noService: ' (the configForms service is not connected)',
     fixed: 'Follows the file name',
     fixedHint: 'Derived from the file itself, never stored in the config.',
     emptyValue: 'Leave empty and each file writes its own',
@@ -357,6 +365,9 @@ const CSS = `
 .dcw-status{flex:1 1 200px;margin:0;color:var(--dcw-muted);font-size:12px}
 .dcw-status[data-tone="warn"]{color:var(--dcw-danger)}
 .dcw-status[data-tone="ok"]{color:var(--dsw-alias-state-success-primary,#1a7f37)}
+.dcw-note-code{font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11px;opacity:.8;margin-left:6px}
+.dcw-note-action{margin-left:auto;flex:none;padding:3px 10px;border:1px solid currentColor;border-radius:6px;background:transparent;color:inherit;font:inherit;font-size:11.5px;cursor:pointer;white-space:nowrap}
+.dcw-note-action:hover{background:var(--dcw-bg1)}
 @media (max-width:640px){.dcw-row{grid-template-columns:1fr;gap:4px}.dcw-row-label{padding-top:0}.dcw-flags{grid-template-columns:1fr}.dcw-flag:nth-child(2){border-top:1px solid var(--dcw-border)}}
 `
 
@@ -521,10 +532,21 @@ function useFormSnapshot(form) {
   return snapshot
 }
 
+// 配置卡片本身：状态机、保存/撤销/恢复默认值，以及组合包条目里的挂点。
+// 分片按 scripts/building-client.mjs 的模块表顺序拼接：shell → text → styles →
+// widgets → form-state → 本文件。分片共享同一个工厂作用域，不要各自 require。
+
+// 宿主组合包 cordis.patch.yml 插入的 profile 条目 id；设置服务按它定位表单。
+const ENTRY_ID = 'cpp-workflow'
+// configForms 可能晚于本插件挂载；页面在首次绘制后短暂重试，拿不到再给手动恢复入口。
+const FORM_RETRY_MS = 500
+const MAX_FORM_RETRIES = 20
+
 function ConfigPage(props) {
   const s = t()
   ensureStyles()
-  const form = props.form
+  // form 由挂点注入；resolveForm 兜住“服务晚到”的部署，拿到后下一次绘制自动接上。
+  const form = props.form || (typeof props.resolveForm === 'function' ? props.resolveForm() : undefined)
   const state = useFormSnapshot(form)
   const initial = React.useMemo(() => normalizeConfig(state.value), [])
   const [draft, setDraft] = React.useState(initial)
@@ -533,11 +555,13 @@ function ConfigPage(props) {
   const [busy, setBusy] = React.useState(false)
   const [message, setMessage] = React.useState('')
   const [tone, setTone] = React.useState('')
+  const [attempt, setAttempt] = React.useState(0)
   const revision = state.revision
   // 快照只有 status / writable / revision；旧版本多出来的 mode 字段已不存在，
   // 再按它判断会把所有可写表单误判成只读。
-  const ready = Boolean(state.status === 'ready' && state.writable)
+  const ready = Boolean(form && state.status === 'ready' && state.writable)
   const status = state.status
+  const missing = !form
 
   React.useEffect(() => {
     if (dirty || state.status !== 'ready') return
@@ -546,6 +570,12 @@ function ConfigPage(props) {
     setDraft(next)
   }, [revision, status, dirty, form, state.value])
 
+  React.useEffect(() => {
+    if (form || attempt >= MAX_FORM_RETRIES || typeof setTimeout !== 'function') return undefined
+    const timer = setTimeout(() => setAttempt((value) => value + 1), FORM_RETRY_MS)
+    return () => clearTimeout(timer)
+  }, [form, attempt])
+
   const update = (patch) => {
     setDraft((current) => ({ ...current, ...patch }))
     setDirty(true)
@@ -553,6 +583,7 @@ function ConfigPage(props) {
     setTone('')
   }
 
+  // 撤销：回到最近一次从宿主读到的值，不写盘。
   const reset = () => {
     setDraft(base)
     setDirty(false)
@@ -560,6 +591,20 @@ function ConfigPage(props) {
     setTone('')
   }
 
+  // 恢复默认值：只填进草稿，点“保存”后才写盘，避免误触直接覆盖已保存的配置。
+  const restoreDefaults = () => {
+    setDraft(normalizeConfig(DEFAULT_CONFIG))
+    setDirty(true)
+    setMessage(s.restored)
+    setTone('')
+  }
+
+  const reload = () => {
+    if (typeof window !== 'undefined' && window.location && typeof window.location.reload === 'function') {
+      window.location.reload()
+    }
+  }
+
   const save = async () => {
     if (!ready || busy) return
     const operations = diffOperations(draft, base)
@@ -573,6 +618,9 @@ function ConfigPage(props) {
         setMessage(s.saved)
         setTone('ok')
       } else {
+        // 被拒时宿主已刷新镜像；把基准对齐到新快照，撤销才不会回到过期值。
+        const fresh = snapshotOf(form)
+        if (fresh && fresh.status === 'ready') setBase(normalizeConfig(fresh.value))
         setMessage(s.rejected)
         setTone('warn')
       }
@@ -597,12 +645,22 @@ function ConfigPage(props) {
       h('h3', { className: 'dcw-title' }, s.title),
       h('p', { className: 'dcw-lede' }, s.intro),
     ),
-    !editable
+    missing
       ? h(
           'div',
-          { className: 'dcw-note', role: 'status' },
+          { className: 'dcw-note', role: 'status', 'data-tone': 'warn' },
           h('span', { className: 'dcw-note-dot' }),
-          h('span', null, s.readOnly),
+          h(
+            'span',
+            null,
+            s.readOnly,
+            props.hasService === false ? h('span', { className: 'dcw-note-code' }, s.noService) : null,
+          ),
+          h(
+            'button',
+            { type: 'button', className: 'dcw-note-action', onClick: reload },
+            s.reload,
+          ),
         )
       : null,
     editable && !ready && status !== 'missing'
@@ -704,24 +762,31 @@ function ConfigPage(props) {
           ),
           h('button', { type: 'button', className: 'dcw-btn', onClick: reset, disabled: busy || !dirty }, s.reset),
           h(
-            'p',
-            { className: 'dcw-status', role: 'status', 'data-tone': tone },
-            message || (dirty ? s.unsaved : ''),
+            'button',
+            { type: 'button', className: 'dcw-btn', onClick: restoreDefaults, disabled: busy || !ready },
+            s.defaults,
           ),
+          h('p', { className: 'dcw-status', role: 'status', 'data-tone': tone }, message || (dirty ? s.unsaved : '')),
         )
       : null,
   )
 }
 
-// 组合包 cordis.patch.yml 插入的 profile 条目 id；设置服务按它定位表单。
-const ENTRY_ID = 'cpp-workflow'
-
-function page(ownerProps, form) {
-  return h(ConfigPage, { ...(ownerProps || {}), form })
+function page(ownerProps, form, resolveForm, hasService) {
+  return h(ConfigPage, { ...(ownerProps || {}), form, resolveForm, hasService })
 }
 
 function apply(ctx) {
-  const form = ctx.configForms ? ctx.configForms.get(ENTRY_ID) : undefined
+  // 每次取表单都重新查询服务：宿主可能在本插件之后才挂载 configForms。
+  const resolveForm = () => {
+    if (!ctx.configForms || typeof ctx.configForms.get !== 'function') return undefined
+    try {
+      return ctx.configForms.get(ENTRY_ID)
+    } catch {
+      return undefined
+    }
+  }
+  const hasService = Boolean(ctx.configForms && typeof ctx.configForms.get === 'function')
   const mount = () =>
     ctx.slots.inject('plugins.bundle.config', () =>
       ctx.slots.register(
@@ -730,7 +795,10 @@ function apply(ctx) {
           key: PACKAGE_NAME,
           label: () => t().nav,
         },
-        (ownerProps) => (ownerProps && ownerProps.view === 'summary' ? null : page(ownerProps, form)),
+        (ownerProps) =>
+          ownerProps && ownerProps.view === 'summary'
+            ? null
+            : page(ownerProps, undefined, resolveForm, hasService),
       ),
     )
   if (ctx.configForms && typeof ctx.configForms.whileServed === 'function') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chengzhao-dev/dsh-cpp-workflow",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "写 C++ 源码、配 CMake、用 Clang 构建；头文件用 /// Doxygen 文档注释，函数体用 // 分段说明，文件头标签可在设置里改。 · Write C++ sources, configure CMake, and build with Clang; /// Doxygen on declarations, // section notes in bodies, and configurable file-header tags.",
   "type": "module",
   "main": "./lib/index.js",