@godv61/dsh-task-engine 0.22.2 → 0.22.4

package/.p0-test.mjs

@@ -33,6 +33,7 @@ async function assertThrows(fn, fragment, msg) {
 
 function makeFs(initial = {}) {
   const files = new Map(Object.entries(initial))
+  const versions = new Map()
   return {
     async resolve(relPath, opts) {
       const base = opts && opts.cwd ? String(opts.cwd).replace(/\\/g, '/') : ''
@@ -42,8 +43,31 @@ function makeFs(initial = {}) {
     async readText(target) {
       return files.get(target.targetKey)
     },
-    async writeText(target, content) {
-      files.set(target.targetKey, content)
+    async lstat(path, opts) {
+      const base = opts && opts.cwd ? String(opts.cwd).replace(/\\/g, '/') : ''
+      const key = base ? `${base}/${path}` : path
+      if (!files.has(key)) return undefined
+      return { version: `v${versions.get(key) ?? 0}` }
+    },
+    async writeText(target, content, expected, signal, sandboxPolicy) {
+      const key = target.targetKey
+      if (expected !== undefined && expected !== null) {
+        if (expected.kind === 'createIfAbsent' && files.has(key)) {
+          const err = new Error('already exists')
+          err.code = 'FS_NOT_OBSERVED'
+          throw err
+        }
+        if (expected.kind === 'replaceIfVersion') {
+          const current = `v${versions.get(key) ?? 0}`
+          if (!files.has(key) || current !== expected.version) {
+            const err = new Error('stale version')
+            err.code = 'FS_STALE_VERSION'
+            throw err
+          }
+        }
+      }
+      files.set(key, content)
+      versions.set(key, (versions.get(key) ?? 0) + 1)
     },
     _files: files,
   }
@@ -140,7 +164,8 @@ await assertThrows(
   const prop = await exe({ operation: 'init', phase: 'propose', content: '# 项目\n示例' }, EXEC)
   assert(prop.includes('proposed create'), 'propose previews without writing')
   assert(fs._files.get('AGENTS.md') === undefined, 'propose writes nothing')
-  const app = await exe({ operation: 'init', phase: 'apply', content: '# 项目\n示例' }, EXEC)
+  const hash9 = /content hash: ([0-9a-f]{64})/.exec(prop)[1]
+  const app = await exe({ operation: 'init', phase: 'apply', content: '# 项目\n示例', expected_hash: hash9 }, EXEC)
   assert(app.includes('wrote ./AGENTS.md'), 'apply writes the file')
   assert(fs._files.get('AGENTS.md') === '# 项目\n示例', 'apply persisted the draft')
 }
@@ -149,16 +174,35 @@ await assertThrows(
 {
   const fs = makeFs({ 'AGENTS.md': '# 已有治理文件\n' })
   const exe = await registered(fs)
+  const prop10 = await exe({ operation: 'init', phase: 'propose', content: '# new' }, EXEC)
+  const hash10 = /content hash: ([0-9a-f]{64})/.exec(prop10)[1]
+  const existingHash10 = /existing hash: ([0-9a-f]{64})/.exec(prop10)[1]
+  assert(existingHash10 !== undefined, 'propose returns the existing-file hash when the file exists')
   await assertThrows(
-    () => exe({ operation: 'init', phase: 'apply', content: '# new' }, EXEC),
+    () => exe({ operation: 'init', phase: 'apply', content: '# new', expected_hash: hash10 }, EXEC),
+    'requires existing_hash',
+    'apply without existing_hash on an existing file is rejected',
+  )
+  await assertThrows(
+    () => exe({ operation: 'init', phase: 'apply', content: '# new', expected_hash: hash10, existing_hash: '0'.repeat(64) }, EXEC),
+    'existing_hash mismatch',
+    'apply with a stale existing_hash is rejected (TOCTOU)',
+  )
+  await assertThrows(
+    () => exe({ operation: 'init', phase: 'apply', content: '# new', expected_hash: hash10, existing_hash: existingHash10 }, EXEC),
     'protected',
     'apply without overwrite on an existing file is rejected',
   )
   await assertThrows(
-    () => exe({ operation: 'init', phase: 'apply', content: '# new', overwrite: true }, EXEC),
+    () => exe({ operation: 'init', phase: 'apply', content: '# new', expected_hash: hash10, existing_hash: existingHash10, overwrite: true }, EXEC),
     'approval',
     'overwrite requires an approval service',
   )
+  await assertThrows(
+    () => exe({ operation: 'init', phase: 'apply', content: '# new' }, EXEC),
+    'requires expected_hash',
+    'apply without expected_hash is rejected',
+  )
 }
 
 // ── 11. a project cannot shadow a bundled core rule ────────────────────────
@@ -615,4 +659,53 @@ function memProbe(files) {
   assert(controller.includes('not an allowed workspace'), 'remote rejects system-wide roots')
 }
 
+// ── 33. 0.23: verify runs in the task's recorded project root ──────────────
+{
+  const fs = makeFs({ '.dsh/eng.json': JSON.stringify({ flow: 'standard' }), 'package.json': '{}' })
+  const seenWorkdirs = []
+  const shell = {
+    resolve(request) { return { command: request.command, workdir: request.workdir ?? '', timeoutMs: request.timeoutMs } },
+    async run(spec) { seenWorkdirs.push(spec.workdir); return { exitCode: 0, timedOut: false, aborted: false, stdout: { text: 'ok' }, stderr: { text: '' } } },
+  }
+  const ctx = makeCtx(fs, undefined)
+  ctx.get = (service) => (service === 'shell' ? shell : service === 'approval' ? undefined : undefined)
+  registerDevTask(ctx)
+  const exe = ctx._tools[0].execute
+  await exe({ operation: 'create', task_id: 'VR-1', title: 'x', branch: 'main' }, EXEC)
+  await exe({ operation: 'verify', task_id: 'VR-1' }, EXEC)
+  const record = JSON.parse(fs._files.get('.dsh/task-VR-1.json'))
+  assert(seenWorkdirs.length === 1, 'bare verify ran the default command')
+  assert(seenWorkdirs[0] === (record.root ?? ''), 'verify ran in the recorded project root, not the session cwd')
+  assert(record.verification.receipt.root === record.root, 'receipt binds the recorded project root')
+}
+
+// ── 34. 0.23: revision increments on every write (CAS foundation) ───────────
+{
+  const fs = makeFs({ '.dsh/eng.json': JSON.stringify({ flow: 'standard' }) })
+  const exe = await registered(fs)
+  await exe({ operation: 'create', task_id: 'CAS-1', title: 'x', branch: 'main' }, EXEC)
+  const r1 = JSON.parse(fs._files.get('.dsh/task-CAS-1.json')).revision
+  await exe({ operation: 'scope', task_id: 'CAS-1', files: ['a'] }, EXEC)
+  const r2 = JSON.parse(fs._files.get('.dsh/task-CAS-1.json')).revision
+  assert(r1 === 1 && r2 === 2, 'revision increments on every write')
+  const devtask = readFileSync('./lib/dev-task.js', 'utf8')
+  assert(devtask.includes('changed concurrently'), 'concurrent-write CAS guard is present')
+}
+
+// ── 35. 0.23: Remote path guard + workspace registry ────────────────────────
+{
+  const ctl = await import('./lib/controller.js')
+  assert(ctl.checkedPath('D:/proj/one') === 'D:/proj/one', 'absolute workspace passes')
+  assert(ctl.checkedPath('D:/proj/one/') === 'D:/proj/one', 'trailing slash is normalized')
+  await assertThrows(() => ctl.checkedPath('relative/path'), 'must be absolute', 'relative path is rejected')
+  await assertThrows(() => ctl.checkedPath('C:/Windows/system32'), 'not an allowed workspace', 'system root is rejected')
+  await assertThrows(() => ctl.checkedPath('c:/windows'), 'not an allowed workspace', 'case variant of a system root is rejected')
+  ctl.registerWorkspace('D:/proj/one')
+  assert(ctl.checkedPath('D:/PROJ/one') === 'D:/PROJ/one', 'registered workspace passes under any case')
+  await assertThrows(() => ctl.checkedPath('D:/other-project'), 'not registered', 'unregistered workspace is rejected once the registry is active')
+  ctl.enableStrictWorkspaces()
+  await assertThrows(() => ctl.checkedPath('D:/still-unregistered'), 'not registered', 'strict mode keeps rejecting unregistered workspaces')
+  assert(ctl.checkedPath('D:/proj/one') === 'D:/proj/one', 'strict mode still admits registered workspaces')
+}
+
 console.log(`\nP0 acceptance: ${passed} checks passed`)

package/README.md

@@ -137,13 +137,19 @@ dsh plugin --profile <name> add .
 
 > 钩子读 `.dsh/eng.json` + `.dsh/task-*.json`，跨仓库零依赖、自包含。
 
+### 门禁边界：hook / host / CI 各自负责什么（0.22.3 起明确）
+
+- **git hook = 本地即时反馈**：拦常规 `git commit`（校验任务存在、阶段、范围、消息、快照 hash、敏感路径）。它挡不住 `git commit --no-verify`、`core.hooksPath` 替换或手改 task 记录——这是定位，不是漏洞。
+- **host 工具流 = 正常路径的强约束**：`dev_task` 的阶段/范围/回执/审批门禁在工具调用时生效；Remote 路径校验 + workspace registry（host 集成 `registerWorkspace` 后生效）挡住越界访问；文件沙箱是最终文件边界。
+- **CI = 最终可信门禁**：CI 里重新验证 task id、快照 hash、staged 范围、提交消息、真实验证退出码、高风险回执、hook 是否被绕过——这是唯一不依赖"模型配合"的可信验证点。
+
 ## 项目初始化（init）
 
 二开 / 遗留项目常常没有文档，AI 接手前需要先「认识」这个项目。`dev_task`（operation=init）走 **inspect → propose → apply** 三阶段管理项目根的 `AGENTS.md`，绝不直接覆盖已有治理文件：
 
 1. `inspect`——读取现有 `AGENTS.md`（若有）返回给模型；没有则提示扫描项目。
-2. `propose`——模型扫描（目录结构、技术栈、构建/运行命令、约定、红线）后给出全文草稿，此步**只预览不落盘**。
-3. `apply`——落盘。首次创建直接写入；覆盖已有 `AGENTS.md` 必须 `overwrite: true` 且**经人工批准**，否则拒绝。
+2. `propose`——模型扫描（目录结构、技术栈、构建/运行命令、约定、红线）后给出全文草稿，此步**只预览不落盘**，并返回草稿内容 hash（已有文件时另附现有文件 hash）。
+3. `apply`——落盘。**必须传回 propose 返回的 `expected_hash`**（防预览与落盘之间内容被换）；覆盖已有 `AGENTS.md` 必须 `overwrite: true` 且**经人工批准**，传回 `existing_hash` 可防审批期间文件被他人改动（TOCTOU），否则拒绝。
 
 - **为什么是 `AGENTS.md`**：DSH 平台会把项目根的 `AGENTS.md` **自动注入到每个会话**——生成一次，之后每个任务开工 AI 都自带这份项目认知，引擎无需额外的注入逻辑。
 - **行数上限**：`AGENTS.md` 每次都进上下文，200 行（约 4–6K token）是硬约束，逼着只写「项目是什么 → 怎么跑 → 结构 → 约定 → 坑」，而不是塞长篇文档。
@@ -179,4 +185,6 @@ dsh plugin --profile <name> add .
 - **通用项目适配（0.21.0）**：① 新增项目适配层 `src/project.ts`——按特征文件识别 Node / Java / Python / Go / Rust 类型，从 workspace 向上发现项目根（`.git` / `.dsh` / 语言特征文件）；② 各语言默认验证命令（`npm test` / `mvn -q test` / `python -m pytest` / `go test ./...` / `cargo test`），`verify` 不带 `command` 时按 `.dsh/eng.json` 的 `verify_command` → 语言默认链自动跑真实命令；③ 治理文件识别扩展至 `AGENTS.md`、`CLAUDE.md`、`.cursorrules`，`init inspect` 一并报告治理文件、项目根、语言栈与项目级 skill/rule 目录（约定 `.dsh/rules/*.md`、`.dsh/skills/<name>/SKILL.md`）；④ 提交钩子加风险策略——触及敏感路径（`.git` / `.env` / credentials / secrets；`.dsh` 的任务记录与流程配置由快照 hash 与豁免保护）要求任务为 `high_risk` 且验证有真实命令回执，否则拒绝；⑤ 初始化写入越界保护——`init` / `create` 的写入目标必须落在项目根内；任务记录新增 `root` / `project_type` 字段。
 - **审计和发布质量（0.22.0）**：① 流程快照 hash——任务创建时固化 `config` 的 SHA-256，工具与提交钩子读任务记录时校验，被手改的快照一律拒绝继续；② 提交钩子完整性检测——新增 `dev_task verify_hook`，比对 `.git/hooks/commit-msg` 与内置门禁的 hash，被替换/篡改立即报错；③ 风险降级审批——新增 `set_risk`，`high_risk → standard` 必须人工批准并落 `risk_downgrades` 审计记录；④ 验证回执绑定项目根——receipt 记录 `root`，与任务 workspace 绑定；⑤ 内置规则指纹锁定——创建时固化内置规则内容指纹，包升级后 `status` 报 `bindings_drift` 而非静默换规则；⑥ 多项目 / 多语言 / 多任务测试矩阵补强。
 - **沙箱写入修复（0.22.1）**：`dev_task` 的文件写入此前没有携带按调用传递的沙箱策略（`writeText` 的 `sandboxPolicy` 参数），在 DSH 文件沙箱下会把 workspace 内的任务记录写入误判为越界而拒绝（`file access denied under workspace-write mode`，且会话策略变化无法影响它）；现在每次写入显式携带 `{ mode, workspaceRoot: 会话目录 }`，并新增 `sandbox_permissions` 参数（`workspace-write` / `danger-full-access`）作为被拒后的一次性升级路径。
-- **质量修补（0.22.2，采纳 codex 评审五项）**：① client typecheck 修复——`project.ts` 不再依赖 `node:path`，浏览器面可完整类型检查；② sandbox 升级补审批——`sandbox_permissions` 必须与 `justification` 成对出现，`danger-full-access` 需人工一次批准，无审批服务即拒绝；③ Remote 任意路径设防——工作台 Remote 拒绝非绝对路径与系统级根目录；④ `set_risk` 升到 `high_risk` 时受流程能力门约束（`minimal`/`agile` 拒绝，不再绕过 `create` 的检查）；⑤ `loadTask` 补齐旧记录缺失字段（items / verification / review / commits），损坏记录 fail-closed 而非引擎裸崩。
+- **质量修补（0.22.2，采纳 codex 评审五项）**：① client typecheck 修复——`project.ts` 不再依赖 `node:path`，浏览器面可完整类型检查；② sandbox 升级补审批——`sandbox_permissions` 必须与 `justification` 成对出现，`danger-full-access` 需人工一次批准，无审批服务即拒绝；③ Remote 任意路径设防——工作台 Remote 拒绝非绝对路径与系统级根目录；④ `set_risk` 升到 `high_risk` 时受流程能力门约束（`minimal`/`agile` 拒绝，不再绕过 `create` 的检查）；⑤ `loadTask` 补齐旧记录缺失字段（items / verification / review / commits），损坏记录 fail-closed 而非引擎裸崩。
+- **可信边界加固（0.22.3，采纳 GPT 评审）**：① 验证命令统一在任务记录的项目根运行（monorepo 子目录不再跑错目录），receipt.root 与任务根强校验；② 旧任务（无 frozen 快照）禁止升 `high_risk`——迁移或重建后才可；③ `init apply` 强制 `expected_hash`，新增 `existing_hash` 防审批期间文件被换（TOCTOU）；④ 任务记录新增 `revision`，每次写入 compare-and-swap，并发覆盖直接报错（`changed concurrently`）；⑤ 工作台 Remote 增加 host workspace registry（`registerWorkspace` 供 harness 集成，注册后未授权路径一律拒绝）；⑥ sandbox 升级审批展示 workspace；⑦ 文档明确 hook（本地反馈）/ host（工具流约束）/ CI（最终可信门禁）三层职责边界。
+- **并发与发布闭环（0.22.4，采纳 REVIEW-0.22.3）**：① `init apply` 在目标文件存在时**强制** `existing_hash`（不再可选），propose→apply 之间文件被篡改直接 fail-closed；② 任务写入升级为真正的原子 CAS——逻辑 `revision` 检查 + dsh-fs 的 `lstat` 版本号 `replaceIfVersion` write intent，并发写入报 `FS_STALE_VERSION` 而非静默覆盖；③ workspace registry 增加 `enableStrictWorkspaces()` 生产模式（空 registry 不再回退放行）；④ `exports["./client"]` 补 `types` 条件（`lib/client.d.ts` 随构建生成）；⑤ 新增 `npm run verify:package` 发布包黑盒验证（pack → 白名单一致性 → 真实安装 → 主入口 import → client 注册 → 包内 121 checks → CLI 语法）。REVIEW 指出的 Typert invocation context、host 可信状态签名、CI 最终门禁仍属 harness 层，集成点已在文档标注。

package/docs/manual.html

@@ -229,7 +229,7 @@ pnpm install &amp;&amp; pnpm run build &amp;&amp; pnpm dsh web</code></pre>
         <ol>
           <li><b>inspect</b>：对 AI 说「帮我初始化这个项目」；AI 读现有 <code>AGENTS.md</code>（若有）返回，没有则扫目录结构、技术栈、构建 / 运行命令、约定与红线。同时报告：项目根（自动从 workspace 向上发现）、语言栈（Node / Java / Python / Go / Rust）与默认验证命令、其它治理文件（<code>CLAUDE.md</code>、<code>.cursorrules</code>——init 只管理 AGENTS.md，不覆盖它们）、项目级 skill/rule 目录（<code>.dsh/rules/*.md</code>、<code>.dsh/skills/&lt;name&gt;/SKILL.md</code>）。</li>
           <li><b>propose</b>：AI 写成 <code>AGENTS.md</code> 草稿，此步<b>只预览、不落盘</b>，同样硬校验<b>行数 ≤ 200 行</b>，并返回内容 hash。</li>
-          <li><b>apply</b>：落盘。首次创建直接写入；覆盖已有 <code>AGENTS.md</code> 必须带 <code>overwrite</code> 且<b>经人工批准</b>；传回 <code>expected_hash</code> 与 propose 的内容 hash 不一致会被拒绝（防止预览与落盘之间内容被换）。写入目标必须在项目根内。</li>
+          <li><b>apply</b>：落盘。<b>必须传回 propose 返回的 <code>expected_hash</code></b>（缺失或与内容不一致一律拒绝，防止预览与落盘之间内容被换）；覆盖已有 <code>AGENTS.md</code> 时<b>还必须传回 <code>existing_hash</code></b>（证明审批期间现有文件未被他人改动）并带 <code>overwrite</code> 且<b>经人工批准</b>。写入目标必须在项目根内。</li>
         </ol>
         <pre><code>项目根/
 ├─ AGENTS.md          ← init 生成，DSH 每会话自动注入

package/lib/client.d.ts

@@ -0,0 +1,6 @@
+/** dsh-task-engine browser half — declared surface for TypeScript consumers of "./client". */
+import type { Context } from '@deepseek-ai/cordis'
+
+export const inject: string[]
+
+export function apply(ctx: Context): Promise<() => Promise<void>>

package/lib/client.js

@@ -4469,6 +4469,7 @@ var surface = "var(--dsw-alias-bg-layer-2)";
 var danger = "var(--dsw-alias-state-error-primary)";
 var success = "var(--dsw-alias-state-success-primary)";
 var warn = "var(--dsw-alias-state-warn-primary)";
+var brand = "var(--dsw-alias-state-business-primary)";
 var styles = {
   wrap: { display: "flex", flexDirection: "column", gap: 16, padding: 20, maxWidth: 900 },
   head: { display: "flex", flexDirection: "column", gap: 4 },
@@ -4533,7 +4534,54 @@ var styles = {
   noticeTitle: { color: warn, fontSize: 13, fontWeight: 600, display: "flex", alignItems: "center", gap: 8 },
   okText: { color: success, fontSize: 13, display: "flex", alignItems: "center", gap: 6 },
   status: { color: textTertiary, fontSize: 13, display: "flex", alignItems: "center", gap: 6 },
-  actions: { display: "flex", alignItems: "center", gap: 12, marginTop: 4 }
+  actions: {
+    display: "flex",
+    alignItems: "center",
+    gap: 12,
+    marginTop: 4,
+    paddingTop: 14,
+    borderTop: `1px solid ${border}`
+  },
+  // ── flow preset picker ────────────────────────────────────────────────────
+  flowGrid: { display: "grid", gridTemplateColumns: "repeat(auto-fit, minmax(230px, 1fr))", gap: 10 },
+  flowOption: {
+    display: "flex",
+    flexDirection: "column",
+    gap: 6,
+    alignItems: "stretch",
+    border: `1px solid ${border}`,
+    borderRadius: 10,
+    padding: "10px 12px",
+    background: surface,
+    cursor: "pointer",
+    color: text,
+    fontSize: 13,
+    textAlign: "left",
+    fontFamily: "inherit",
+    transition: "border-color 120ms ease, box-shadow 120ms ease"
+  },
+  flowOptionActive: {
+    borderColor: brand,
+    boxShadow: `0 0 0 1px ${brand}`
+  },
+  flowOptionTitle: {
+    display: "flex",
+    alignItems: "center",
+    gap: 7,
+    fontSize: 13,
+    fontWeight: 600,
+    color: text
+  },
+  flowOptionDesc: { color: textTertiary, fontSize: 12, lineHeight: 1.45, margin: 0 },
+  // ── init preview ──────────────────────────────────────────────────────────
+  mdPreview: {
+    border: `1px solid ${border}`,
+    borderRadius: 8,
+    background: "var(--dsw-alias-bg-layer-1)",
+    padding: "12px 14px",
+    maxHeight: 420,
+    overflowY: "auto"
+  }
 };
 
 // src/client/TaskEngineSection.tsx
@@ -4722,8 +4770,8 @@ function deriveCapabilities(config) {
   if (config.commit.file_scope) caps.push("file_scope");
   return caps;
 }
-function preset(id, version, label, description, config) {
-  return { id, version, label, description, capabilities: deriveCapabilities(config), config };
+function preset(id, version, label2, description, config) {
+  return { id, version, label: label2, description, capabilities: deriveCapabilities(config), config };
 }
 var FLOW_PRESETS = {
   standard: preset("standard", 1, "\u6807\u51C6\u7814\u53D1", "\u9700\u6C42\u8BC4\u5BA1 \u2192 \u8BBE\u8BA1 \u2192 \u5F00\u53D1 \u2192 \u4EA4\u4ED8 \u2192 \u4EE3\u7801\u5BA1\u6838\uFF0C\u542B\u4EA7\u7269\u95E8 + \u786E\u8BA4\u95E8", STANDARD),
@@ -4873,9 +4921,28 @@ function TaskEngineSection(props) {
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: styles.field, children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: styles.fieldLabel, children: "\u6D41\u7A0B\u9884\u8BBE" }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: styles.chips, children: FLOW_OPTIONS.map((option) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Pill, { active: flow === option.id, onClick: () => {
-        selectFlow(option.id);
-      }, title: option.description, children: option.label }, option.id)) }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: styles.flowGrid, children: FLOW_OPTIONS.map((option) => {
+        const active = flow === option.id;
+        return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
+          "button",
+          {
+            type: "button",
+            "aria-pressed": active,
+            onClick: () => {
+              selectFlow(option.id);
+            },
+            style: { ...styles.flowOption, ...active ? styles.flowOptionActive : {} },
+            children: [
+              /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { style: styles.flowOptionTitle, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.StateDot, { state: active ? "done" : "ongoing", size: 8 }),
+                option.label
+              ] }),
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { style: styles.flowOptionDesc, children: option.description })
+            ]
+          },
+          option.id
+        );
+      }) }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { style: styles.hint, children: FLOW_OPTIONS.find((option) => option.id === flow)?.description })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SectionCard, { icon: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.IconBranchOutline16, { size: 16 }), title: "\u6D41\u7A0B\u8282\u70B9", hint: "\u8BE5\u6D41\u7A0B\u9884\u8BBE\u56FA\u5B9A\u7684\u9636\u6BB5\u987A\u5E8F\uFF1B\u6539\u53D8\u6D41\u7A0B\u8BF7\u5207\u6362\u4E0A\u9762\u7684\u9884\u8BBE\u3002", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: styles.chips, children: stages.map((stage) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Pill, { active: stage === (FLOW_PRESETS[flow]?.config.start_stage ?? ""), title: stage === FLOW_PRESETS[flow]?.config.start_stage ? "\u8D77\u59CB\u9636\u6BB5" : void 0, children: stage }, stage)) }) }),
@@ -5113,12 +5180,25 @@ function InitPanel({ workspace, remote }) {
         { style: styles.muted },
         "\u9879\u76EE\u6839 AGENTS.md \u4F1A\u88AB DSH \u81EA\u52A8\u6CE8\u5165\u5230\u6BCF\u4E2A\u4F1A\u8BDD\u3002\u521D\u59CB\u5316\u4E00\u6B21\uFF0C\u4E4B\u540E\u6BCF\u6B21\u4EFB\u52A1\u5F00\u5DE5 AI \u90FD\u81EA\u5E26\u8FD9\u4EFD\u9879\u76EE\u8BA4\u77E5\uFF08\u9879\u76EE\u662F\u4EC0\u4E48 \u2192 \u600E\u4E48\u8DD1 \u2192 \u7ED3\u6784 \u2192 \u7EA6\u5B9A \u2192 \u5751\uFF09\u3002"
       ),
-      exists && !editing && draft === null ? (0, import_react2.createElement)(import_dsh_client_ui_primitives2.MarkdownText, { text: view.content, labels: MD_LABELS }) : null,
+      exists && !editing && draft === null ? (0, import_react2.createElement)(
+        "div",
+        { style: styles.mdPreview },
+        (0, import_react2.createElement)(import_dsh_client_ui_primitives2.MarkdownText, { text: view.content, labels: MD_LABELS })
+      ) : null,
       draft !== null ? (0, import_react2.createElement)(
         "div",
         { style: styles.section },
-        (0, import_react2.createElement)("span", { style: styles.sourceBadge }, `AI \u8349\u7A3F \xB7 ${draft.lines} \u884C \xB7 \u5C1A\u672A\u5199\u5165`),
-        (0, import_react2.createElement)(import_dsh_client_ui_primitives2.MarkdownText, { text: draft.content, labels: MD_LABELS })
+        (0, import_react2.createElement)(
+          "div",
+          { style: styles.sourceRow },
+          (0, import_react2.createElement)(import_dsh_client_ui_primitives2.StateDot, { state: "ongoing", size: 8 }),
+          (0, import_react2.createElement)("span", { style: styles.sourceBadge }, `AI \u8349\u7A3F \xB7 ${draft.lines} \u884C \xB7 \u5C1A\u672A\u5199\u5165`)
+        ),
+        (0, import_react2.createElement)(
+          "div",
+          { style: styles.mdPreview },
+          (0, import_react2.createElement)(import_dsh_client_ui_primitives2.MarkdownText, { text: draft.content, labels: MD_LABELS })
+        )
       ) : null,
       editing ? (0, import_react2.createElement)("textarea", {
         style: { ...styles.textarea, minHeight: 300 },
@@ -5946,6 +6026,10 @@ var header = {
   padding: "12px 20px",
   borderBottom: "1px solid var(--dsw-alias-border-l2)"
 };
+var headerBrand = { display: "flex", alignItems: "center", gap: 10, minWidth: 0 };
+var headerText = { display: "flex", flexDirection: "column", gap: 1, minWidth: 0 };
+var headerTitle = { fontSize: 15, fontWeight: 600, color: "var(--dsw-alias-label-primary)" };
+var headerSub = { fontSize: 12, color: "var(--dsw-alias-label-tertiary)", margin: 0 };
 var tabbar = {
   display: "flex",
   alignItems: "center",
@@ -5999,12 +6083,33 @@ function Workbench({ useStore, actions, useWorkspaces, remote }) {
     (0, import_react7.createElement)(
       "div",
       { style: header },
-      (0, import_react7.createElement)("span", { style: { fontSize: 15, fontWeight: 600, color: "var(--dsw-alias-label-primary)" } }, "\u5DE5\u7A0B\u6D41\u7A0B"),
+      (0, import_react7.createElement)(
+        "div",
+        { style: headerBrand },
+        (0, import_react7.createElement)(import_dsh_client_ui_primitives7.IconSettingsOutline16, { size: 18 }),
+        (0, import_react7.createElement)(
+          "div",
+          { style: headerText },
+          (0, import_react7.createElement)("span", { style: headerTitle }, "\u5DE5\u7A0B\u6D41\u7A0B"),
+          (0, import_react7.createElement)("p", { style: headerSub }, "\u5DE5\u7A0B\u5316\u4EA4\u4ED8\u5DE5\u4F5C\u53F0 \xB7 \u9700\u6C42\u8BC4\u5BA1 \u2192 \u8BBE\u8BA1 \u2192 \u5F00\u53D1 \u2192 \u4EA4\u4ED8 \u2192 \u4EE3\u7801\u5BA1\u6838")
+        )
+      ),
       (0, import_react7.createElement)(
         "button",
-        { type: "button", title: "\u5173\u95ED", onClick: () => {
-          actions.close();
-        }, style: closeStyle },
+        {
+          type: "button",
+          title: "\u5173\u95ED",
+          onClick: () => {
+            actions.close();
+          },
+          style: closeStyle,
+          onMouseEnter: (event) => {
+            event.currentTarget.style.background = "var(--dsw-alias-bg-layer-2)";
+          },
+          onMouseLeave: (event) => {
+            event.currentTarget.style.background = "transparent";
+          }
+        },
         (0, import_react7.createElement)(import_dsh_client_ui_primitives7.IconCloseOutline16, { size: 16 })
       )
     ),
@@ -6033,6 +6138,8 @@ function Workbench({ useStore, actions, useWorkspaces, remote }) {
 // src/client/TriggerButton.tsx
 var import_react8 = require("react");
 var import_dsh_client_ui_primitives8 = require("@deepseek-ai/dsh-client-ui-primitives");
+var hover = "var(--dsw-alias-bg-layer-2)";
+var label = "var(--dsw-alias-label-primary)";
 function TriggerButton({ wide, actions }) {
   return (0, import_react8.createElement)(
     "button",
@@ -6043,24 +6150,39 @@ function TriggerButton({ wide, actions }) {
       onClick: () => {
         actions.open();
       },
+      onMouseEnter: (event) => {
+        event.currentTarget.style.background = hover;
+      },
+      onMouseLeave: (event) => {
+        event.currentTarget.style.background = "transparent";
+      },
       style: {
         display: "flex",
         alignItems: "center",
         justifyContent: wide ? "flex-start" : "center",
         gap: wide ? 8 : 0,
-        width: "100%",
-        height: 32,
+        width: wide ? "100%" : 36,
+        minWidth: wide ? 0 : 36,
+        height: wide ? 42 : 36,
+        flex: wide ? "1 1 auto" : "none",
         border: "none",
         background: "transparent",
         cursor: "pointer",
-        color: "var(--dsw-alias-label-secondary)",
-        borderRadius: 6,
-        padding: wide ? "0 10px" : 0,
-        boxSizing: "border-box"
+        color: label,
+        borderRadius: wide ? 12 : "50%",
+        padding: wide ? "0 10px 0 8px" : 0,
+        // The native settings row bleeds 2px past its seat on both sides so its
+        // hover chrome spans the full row; matching keeps both icon columns on
+        // the same x.
+        margin: wide ? "0 -2px" : "0 auto 2px",
+        fontSize: wide ? 14 : void 0,
+        lineHeight: wide ? "22px" : void 0,
+        boxSizing: "border-box",
+        transition: "background 120ms ease"
       }
     },
     (0, import_react8.createElement)(import_dsh_client_ui_primitives8.IconSettingsOutline16, { size: wide ? 16 : 18 }),
-    wide ? (0, import_react8.createElement)("span", { style: { fontSize: 13 } }, "\u5DE5\u7A0B\u6D41\u7A0B") : null
+    wide ? (0, import_react8.createElement)("span", { style: { fontSize: 14, lineHeight: "22px" } }, "\u5DE5\u7A0B\u6D41\u7A0B") : null
   );
 }