dsh-foreman 0.3.0 → 0.3.2

package/CHANGELOG.md

@@ -1,8 +1,170 @@
 # Changelog
 
-本仓库是 dsh-foreman（研究方向原型）的本地改造版。下面是相对上游 0.1.0 的改动。
+本仓库的历史从本项目自己的初始提交开始，**不携带上游 git 历史**（见 README 的「由来与致谢」）。
+下面 `0.2.0` 一节是从代码基线 `dsh-superagent-local` 沿袭下来的、那一份代码相对上游
+`dsh-superagent-prototype` 的改动记录，保留它是为了说明基线里已经有什么；**它不是本项目的发布版本**。
 
-## 0.2.0 — 2026-11-01
+本项目自己的版本从 `0.1.0` 开始。
+
+## 0.3.2 — 2026-11-08
+
+### 修复：派单文本没有说要回报
+
+真机上一次派单，设备做了 30 步、写完整答案，**一次都没调用 `foreman_report`**——因为派单文本里
+根本没提这件事。设备收到的只有标题、请求原文和附件说明，模型自然当成普通任务做完就停，
+hub 于是永远停在 `running`。
+
+现在每张派单的末尾都有一段：`foreman_report` 是结果到达问话人的唯一途径，答在对话里
+不算完成，**没回报就不算做完**。
+
+配套地，设备侧 `dsh-foreman-node@0.2.1` 加了一层兜底：一轮结束而还没回报时自动补一条
+`ready`。两层一起，模型照做时走正路，不照做也不会让工单挂死。
+
+## 0.3.1 — 2026-11-08
+
+### 修复：同一 id 的两个连接互相踢，设备永远上不了线
+
+`Hub.attach` 在新连接到达时，立刻关闭同 id 的旧连接。设备重连时旧 socket 往往还没超时，
+于是**两边互相踢**：谁都完不成握手，hub 一直认为设备离线，双方不停重试。
+
+现场证据：本机 89 个 TIME_WAIT，hub 上一个在线设备都没有；一张要查看宿舍电脑的工单，
+因为选不到设备，回退到服务器本地，在空目录里跑完并报告成功。
+
+现在新连接先排队，**令牌验证通过后才接管 id**。半成品连接打扰不到正在工作的那条，
+真正的重连仍然能接管。
+
+### 修复：点名了机器，却在服务器上跑
+
+`prepareTicket` 在选不到设备时静默回退本地执行，并把这种行为写成了「有意为之」。
+在「项目只存在于远程设备」的场景里，它给出一个看起来成功、实际毫无意义的结果。
+
+现在：点名了设备或要求了标签的请求，选不到设备就记 `blockedReason`，由 executor
+直接报 `blocked`，**不启动任何 Session**。人在面板上看到「没有设备能接」，
+而不是假成功。没点名设备的仍然回退本地——本机可达的项目不该因为笔记本离线就卡住。
+
+### 修复：worker 会话在侧栏看不到
+
+原来把所有 `worker-*` 都藏起来。那恰好藏掉了唯一能回答「任务在哪台机器、哪个目录跑」的线索。
+现在只藏主会话（用行上的 M 气泡进），worker 保留显示。
+
+### 新增：设备可以删除，也可以改项目
+
+- **删除**：吊销保留记录（审计用），删除连记录一起去掉（登记错了用）。删除需要二次确认。
+- **编辑**：显示名、标签、它能接的项目都能改，**id 和令牌不动**，所以那台设备不用重新配置。
+  这解决了「登记时漏了项目只能重登」的问题。
+
+## 0.3.0 — 2026-11-07
+
+### 新增：在面板里登记设备，不用再跑脚本
+
+「设置 › 设备」多了一个登记表单：填 id、显示名、它能接的项目和**那台机器上的路径**，
+点「登记」就得到一枚令牌。卡片把设备要的四样东西排在一起——`url`、`deviceId`、`token`，
+以及设备页面的入口——令牌只显示这一次，因为库里只存哈希，关掉或刷新就再也拿不回来。
+
+以前这一步只能跑 `scripts/add-device.mjs`，那个脚本还在，行为不变；面板走的是同一个
+`Devices.add`，所以两条路得到的结果一样。
+
+重复的 id 会回 400 并明确说「去换令牌」，不是 500——那是操作者的失误，不是服务端故障。
+
+### 新增接口
+
+`POST /orchestrator/api/devices`，body `{ id, name, labels?, roots }`，
+响应 `{ id, token }`。令牌只在这里出现一次。
+
+### 修复：bundle patch 里的中文是乱码
+
+`cordis.patch.yml` 里几行中文在初始提交时就已经是「UTF-8 字节被当成 GBK 读」的产物，
+所以面板上主会话旁边显示的是 `dsh-foreman 涓?Session`。已改回正确的
+`dsh-foreman 主 Session` 与 `dsh-foreman 执行器`。
+
+### 依赖
+
+`dsh-foreman-node` 精确锁到 `0.2.0`（不写 `^`）：两边协议必须同版本，自动升级反而危险。
+
+## 0.1.1 — 2026-11-07
+
+修的是 `0.1.0` 发布时才暴露的两个问题，都是真机验证（上海服务器 srv-02）发现的。
+
+### 修复：运维脚本没有进包
+
+`0.1.0` 的 `files` 漏了 `scripts/`，于是装完 `dsh-foreman@0.1.0` 之后
+`node scripts/add-device.mjs` **不存在** —— 而那是加设备的唯一入口，
+文档里却写着让人这么跑。现在随包发三个脚本：
+
+- `scripts/add-device.mjs`（加设备 / 换令牌 / 吊销）
+- `scripts/migrate.mjs`（迁机打包与自检）
+- `scripts/dsh-foreman`（服务脚本）
+
+`scripts/sync-wsl.sh`、`scripts/deploy-preview.sh` 是开发用的，**不发布**。
+
+### 修复：一个不带正文的帧会崩掉握手
+
+`ws.ts` 把收到的任何消息一律 `.toString()`，于是 payload 缺失时会得到字符串 `"undefined"`，
+再被当成帧去解析。现在只接受真的带文本的帧（字符串 / Buffer / Buffer[]），
+其余直接忽略，并在握手阶段给出可读原因。
+
+## 0.1.0 — 2026-11-07
+
+首个公开发布。**一个常驻主 loop，把工单派给多台在线设备上各自完整运行的 DSH，账本只有一份。**
+
+### 新增：设备与派单
+
+- **设备注册表**（`src/foreman/devices.ts`）：同一份 SQLite 里的 `foreman-device:` 家族，
+  令牌只存 SHA-256。加设备、换令牌、吊销都不需要重启主 loop。
+  CLI：`scripts/add-device.mjs add | list | rotate | revoke`。
+- **Selector**（`src/foreman/selector.ts`）：纯函数。吊销的、离线的、没有对应项目 root 的设备先出局；
+  显式点名或标签要求再收窄；剩下的按在跑数量最少，平局取最近心跳。
+- **选择落在 accept 上**：`Ticket.target` 在 accept 时确定，`newAssignment` 复制到
+  `Assignment.target`。选设备在 `prepareTicket` 缝上，**不在** Executor 里——Executor 没有写库通道。
+- **ForemanExecutor**（`src/foreman/executor.ts`）：本机目标原样交给 `DshExecutor`；
+  远端目标变成一个 `assign` 帧。设备不可达时报 `blocked`，**不伪造 failed，也不悄悄改成本机执行**。
+- **Foreman Hub**（`src/foreman/hub.ts` + `ws.ts`）：设备主动外连，`ws` 只出现在一个文件里，
+  只监听 `127.0.0.1`（对外由隧道终结 TLS）。握手校验令牌与协议版本；吊销在下一帧就生效。
+- **文本渲染**（`src/foreman/render.ts`）：任务文本在主 loop 侧定稿，**不带任何主 loop 路径**；
+  附件走 base64 字节，按编码后大小卡 256 KiB 上限。
+
+### 新增：断线与恢复
+
+- **断线绝不自动重派**。`assignmentInterrupted` 会走 `Tickets.restart` 立刻重开一张，
+  而设备可能还在跑——那是「同一件事执行两遍」。超时只转 `blocked`，交给人。
+- Hub 重启时，在飞的远端 assignment 一律先转 `blocked`，等设备 `hello` 对齐；
+  `DshExecutor.resume()` 按 target 跳过远端项。
+- 设备重连后先 `hello` 报「我在跑哪些」，Hub 对齐而不是假设。
+
+### 新增：设备侧插件（另一个包）
+
+- [`dsh-foreman-node`](https://www.npmjs.com/package/dsh-foreman-node)：连出去、接单、回报三件事。
+  job 会话是 `job-<assignmentId>`，权限是 **`workspace-write`**（不是主 loop 自己的 `danger-full-access`：
+  笔记本前没人，弹审批等于卡死）。
+- 设备上注册 `foreman_report` 工具（`progress` / `ready` / `blocked` / `failed`）。
+  **`dropped` 不允许**：那是判断，设备没有判断权。
+
+### 新增：面板
+
+- 「设置 › 设备」：在线点、在跑数、最近活动、项目名（**不显示设备自己的路径**）、吊销与换令牌。
+
+### 新增：飞书群即项目
+
+- Policy 的 `routing.chats`：群 → 工作区，同时约束设备选择（内网群只选带 `intranet` 标签的设备）。
+  映射按 settings 修订号缓存，改了对新到的消息生效。
+
+### 新增：迁移
+
+- `scripts/migrate.mjs`：`plan` / `checkpoint` / `pack` / `verify`。
+  必须先 checkpoint——库跑在 WAL 模式，只拷 `.sqlite` 会**静默丢掉**最近的工单。
+- [docs/migration.md](docs/migration.md) 五步 runbook。
+
+### 依赖
+
+- 唯一新增的运行时依赖是 `ws@8`。
+- `@deepseek-ai/*` 全是 `peerDependencies`，由装了本插件的 DSH 实例提供。
+
+---
+
+## 0.2.0 — 2026-11-01（上游基线，非本项目发布）
+
+> 这一节记录的是代码基线 `dsh-superagent-local` 相对上游 `dsh-superagent-prototype` 的改动。
+> 本项目的 `0.1.0` 已包含其中全部内容。
 
 ### 新增：需求来自本机操作者
 

package/lib/client.js

@@ -4614,6 +4614,13 @@ window.__ModuleLoader__.load({
 			deviceRevoked: ["已吊销", "Revoked"],
 			deviceRunning: ["在跑 {count} 件", "{count} running"],
 			deviceLastSeen: ["最近活动", "Last seen"],
+			deviceEdit: ["编辑", "Edit"],
+			deviceEditHint: ["改显示名、标签和能接的项目。id 和令牌不在这里改：id 已经写在那台机器的配置里，换令牌要先把新令牌给它。", "Change the display name, labels and projects. The id and token are not editable here: the id is already in that machine's configuration, and a new token must be handed to it first."],
+			deviceLabels: ["标签", "Labels"],
+			deviceLabelsHint: ["逗号分隔。群聊可以要求某个标签，只有带这个标签的设备才接得到。", "Comma separated. A chat can require a label, so only devices carrying it can take that work."],
+			devicePathKeep: ["留空即保持原路径", "Leave empty to keep the current path"],
+			deviceDelete: ["删除", "Delete"],
+			deviceDeleteConfirm: ["确认删除", "Confirm delete"],
 			deviceRevoke: ["吊销", "Revoke"],
 			deviceRevokeConfirm: ["确认吊销", "Confirm revoke"],
 			deviceRotate: ["换令牌", "New token"],
@@ -5561,6 +5568,7 @@ window.__ModuleLoader__.load({
 			const { t, call } = usePanel();
 			const { data, error, reload } = usePoll(() => call("GET devices"), []);
 			const [rotated, setRotated] = (0, react.useState)();
+			const [editing, setEditing] = (0, react.useState)();
 			const revoke = async (id) => {
 				await call("POST devices/:id/revoke", { id });
 				await reload();
@@ -5572,6 +5580,10 @@ window.__ModuleLoader__.load({
 				});
 				await reload();
 			};
+			const remove = async (id) => {
+				await call("DELETE devices/:id", { id });
+				await reload();
+			};
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(PageHead, {
 					back: false,
@@ -5615,11 +5627,20 @@ window.__ModuleLoader__.load({
 							children: data.rows.map((row) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DeviceLine, {
 								row,
 								onRevoke: () => revoke(row.id),
-								onRotate: () => rotate(row.id)
+								onRotate: () => rotate(row.id),
+								onEdit: () => setEditing(row),
+								onDelete: () => remove(row.id)
 							}, row.id))
 						}) : void 0
 					})
 				}),
+				editing && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(EditDevice, {
+					row: editing,
+					onClose: () => setEditing(void 0),
+					onSaved: () => {
+						reload();
+					}
+				}),
 				rotated && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, {
 					title: t("devicesRotated"),
 					tone: "warn",
@@ -5638,10 +5659,11 @@ window.__ModuleLoader__.load({
 				})
 			] });
 		}
-		/** One device: name, online dot, load, project names, last seen, and the two token actions. */
-		function DeviceLine({ row, onRevoke, onRotate }) {
+		/** One device: name, online dot, load, project names, last seen, and the actions an operator needs. */
+		function DeviceLine({ row, onRevoke, onRotate, onEdit, onDelete }) {
 			const { t } = usePanel();
 			const [confirming, setConfirming] = (0, react.useState)(false);
+			const [deleting, setDeleting] = (0, react.useState)(false);
 			const tone = row.revoked ? "idle" : row.online ? "done" : "warning";
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
 				className: "dt-row",
@@ -5683,31 +5705,58 @@ window.__ModuleLoader__.load({
 					})]
 				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "dt-row-actions",
-					children: [!row.revoked && (confirming ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-						variant: "danger",
-						size: "sm",
-						onClick: () => {
-							setConfirming(false);
-							onRevoke();
-						},
-						children: t("deviceRevokeConfirm")
-					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-						size: "sm",
-						onClick: () => setConfirming(false),
-						children: t("cancel")
-					})] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-						variant: "ghost",
-						size: "sm",
-						onClick: () => setConfirming(true),
-						children: t("deviceRevoke")
-					})), !row.revoked && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-						variant: "ghost",
-						size: "sm",
-						onClick: () => {
-							onRotate();
-						},
-						children: t("deviceRotate")
-					})]
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+							variant: "ghost",
+							size: "sm",
+							onClick: onEdit,
+							children: t("deviceEdit")
+						}),
+						!row.revoked && (confirming ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+							variant: "danger",
+							size: "sm",
+							onClick: () => {
+								setConfirming(false);
+								onRevoke();
+							},
+							children: t("deviceRevokeConfirm")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+							size: "sm",
+							onClick: () => setConfirming(false),
+							children: t("cancel")
+						})] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+							variant: "ghost",
+							size: "sm",
+							onClick: () => setConfirming(true),
+							children: t("deviceRevoke")
+						})),
+						!row.revoked && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+							variant: "ghost",
+							size: "sm",
+							onClick: () => {
+								onRotate();
+							},
+							children: t("deviceRotate")
+						}),
+						deleting ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+							variant: "danger",
+							size: "sm",
+							onClick: () => {
+								setDeleting(false);
+								onDelete();
+							},
+							children: t("deviceDeleteConfirm")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+							size: "sm",
+							onClick: () => setDeleting(false),
+							children: t("cancel")
+						})] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+							variant: "ghost",
+							size: "sm",
+							onClick: () => setDeleting(true),
+							children: t("deviceDelete")
+						})
+					]
 				})]
 			});
 		}
@@ -5848,6 +5897,118 @@ window.__ModuleLoader__.load({
 				["token", minted.token]
 			];
 		}
+		/**
+		* Editing what a device offers: its display name, its labels, and the projects it can work on.
+		*
+		* The id and the token are not editable here on purpose. The id is what the device's own configuration already says,
+		* and changing it would need the machine in front of you; a token is rotated deliberately, because the machine must
+		* be given the new one before it can connect again.
+		*/
+		function EditDevice({ row, onClose, onSaved }) {
+			const { t, call } = usePanel();
+			const [name, setName] = (0, react.useState)(row.name);
+			const [labels, setLabels] = (0, react.useState)(row.labels.join(", "));
+			const [roots, setRoots] = (0, react.useState)(row.projects.map((project) => ({
+				project,
+				path: ""
+			})));
+			const [refusal, setRefusal] = (0, react.useState)();
+			const [busy, setBusy] = (0, react.useState)(false);
+			const save = async () => {
+				setBusy(true);
+				setRefusal(void 0);
+				try {
+					await call("PUT devices/:id", {
+						id: row.id,
+						body: {
+							name: name.trim(),
+							labels: labels.split(",").map((label) => label.trim()).filter(Boolean),
+							roots: roots.filter((root) => root.project.trim() && root.path.trim()).map((root) => ({
+								project: root.project.trim(),
+								path: root.path.trim()
+							}))
+						}
+					});
+					onSaved();
+					onClose();
+				} catch (error) {
+					setRefusal(errorText(error));
+				} finally {
+					setBusy(false);
+				}
+			};
+			const edit = (index, patch) => setRoots((current) => current.map((root, at) => at === index ? {
+				...root,
+				...patch
+			} : root));
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, {
+				title: `${t("deviceEdit")} · ${row.id}`,
+				hint: t("deviceEditHint"),
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(FieldGrid, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+						label: t("devicesAddName"),
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Input, {
+							value: name,
+							onChange: (event) => setName(event.target.value)
+						})
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+						label: t("deviceLabels"),
+						note: t("deviceLabelsHint"),
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Input, {
+							value: labels,
+							onChange: (event) => setLabels(event.target.value),
+							placeholder: "intranet, office"
+						})
+					})] }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(FieldGrid, { children: roots.map((root, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+						label: `${t("devicesAddProject")} ${index + 1}`,
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Input, {
+							value: root.project,
+							onChange: (event) => edit(index, { project: event.target.value })
+						})
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+						label: `${t("devicesAddPath")} ${index + 1}`,
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Input, {
+							value: root.path,
+							onChange: (event) => edit(index, { path: event.target.value }),
+							placeholder: t("devicePathKeep")
+						})
+					})] }, index)) }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "dt-form-actions",
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+								size: "sm",
+								onClick: () => setRoots((current) => [...current, {
+									project: "",
+									path: ""
+								}]),
+								"data-edit-root": "1",
+								children: t("devicesAddRoot")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+								size: "sm",
+								variant: "primary",
+								busy,
+								onClick: () => {
+									save();
+								},
+								children: t("save")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+								size: "sm",
+								onClick: onClose,
+								children: t("cancel")
+							})
+						]
+					}),
+					refusal !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ErrorLine, {
+						error: refusal,
+						title: t("loadFailed")
+					})
+				]
+			});
+		}
 		//#endregion
 		//#region src/client/logs.tsx
 		/**
@@ -8327,10 +8488,15 @@ window.__ModuleLoader__.load({
 				return key.startsWith("workspace:") ? key.slice(10) : void 0;
 			};
 			/**
-			* 插件自己建的会话：`worker-`（每张工单的执行者）与 `orchestrator-`（主会话与评估）。
-			* 它们的生命周期由我们管，不该再占侧栏一行 —— 人要进主会话，用行上的 M 气泡。
+			* 插件自己建的会话里，只有主会话被藏起来。
+			*
+			* `orchestrator-` 是主会话本身，人用行上的 M 气泡进，侧栏再列一行就是重复。
+			*
+			* `worker-` 以前也藏，理由是「数量会多」。但那让人失去唯一的线索：任务到底在哪台机器、哪个目录里跑。
+			* 一张工单派到别的设备时，设备上那条会话就是答案，而它恰恰被藏掉了。现在保留显示：多一行，
+			* 换来看得见工作发生的地方。
 			*/
-			const ours = (id) => id.startsWith("worker-") || id.startsWith("orchestrator-");
+			const ours = (id) => id.startsWith("orchestrator-");
 			const rowId = (row) => (row.getAttribute("data-row-key") ?? "").replace(/^session:/, "");
 			/**
 			* 收起插件自己的会话行，以及状态目录那一个伪工作区行。

package/lib/feishu-watch.d.ts

@@ -1,5 +1,5 @@
-import { G as Trigger, L as Thread } from "./intake-Di3PgVj2.js";
-import { g as Tally, h as SourceRegistry, n as SourceContext, t as SourceKind } from "./kind-DGutnJ2b.js";
+import { G as Trigger, L as Thread } from "./intake-B1UsoHuw.js";
+import { g as Tally, h as SourceRegistry, n as SourceContext, t as SourceKind } from "./kind-BYtP14oM.js";
 import { Context } from "@deepseek-ai/cordis";
 import { z } from "zod";
 //#region src/sources/feishu-read.d.ts

package/lib/github-watch.d.ts

@@ -1,2 +1,2 @@
-import { a as apply, c as name, d as pollThreads, f as pollTicketPulls, i as Retry, l as pollFailure, m as commentTrigger, o as githubKind, p as GithubComment, r as GithubConfig, s as inject, u as pollRound } from "./kind-DGutnJ2b.js";
+import { a as apply, c as name, d as pollThreads, f as pollTicketPulls, i as Retry, l as pollFailure, m as commentTrigger, o as githubKind, p as GithubComment, r as GithubConfig, s as inject, u as pollRound } from "./kind-BYtP14oM.js";
 export { type GithubComment, GithubConfig, Retry, apply, commentTrigger, githubKind, inject, name, pollFailure, pollRound, pollThreads, pollTicketPulls };

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as reached, A as LOCAL_TARGET, B as ThreadRef, C as ChannelRef, D as Execution, E as Evaluation, F as Strength, G as Trigger, H as TicketEndBy, I as Text, J as followupOwners, K as TriggerDisposition, L as Thread, M as MandateBasis, N as PolicyEffect, O as Follow, P as ReportState, Q as liveTicket, R as ThreadFact, S as Attention, T as DecisionKind, U as TicketInput, V as Ticket, W as TicketOutcome, X as latestAssignment, Y as isoTime, Z as latestReport, _ as ActorRef, a as DomainEvent, at as ticketOutcome, b as AssignmentState, c as GateResult, ct as Reason, d as Policy, dt as said, et as readUntil, f as ReplyStatus, ft as Config, g as AcceptMode, h as SourceScope, i as Candidate, it as threadKey, j as Mandate, k as FollowupRecords, l as OutboundMessage, lt as ReasonCode, m as ScopeResult, mt as DeploymentConfig, n as AssessmentOutcome, nt as settled, o as DomainEvents, ot as waitsForPerson, p as Repositories, pt as Deployment, q as assignmentTargetOf, r as Assessor, rt as targetOf, s as Executor, st as REASONS, t as ReceiveResult, tt as runningAssignment, u as Outbox, ut as reasonText, v as AdmissionCell, w as Decision, x as AssignmentTarget, y as Assignment, z as ThreadFacts } from "./intake-Di3PgVj2.js";
+import { $ as reached, A as LOCAL_TARGET, B as ThreadRef, C as ChannelRef, D as Execution, E as Evaluation, F as Strength, G as Trigger, H as TicketEndBy, I as Text, J as followupOwners, K as TriggerDisposition, L as Thread, M as MandateBasis, N as PolicyEffect, O as Follow, P as ReportState, Q as liveTicket, R as ThreadFact, S as Attention, T as DecisionKind, U as TicketInput, V as Ticket, W as TicketOutcome, X as latestAssignment, Y as isoTime, Z as latestReport, _ as ActorRef, a as DomainEvent, at as ticketOutcome, b as AssignmentState, c as GateResult, ct as Reason, d as Policy, dt as said, et as readUntil, f as ReplyStatus, ft as Config, g as AcceptMode, h as SourceScope, i as Candidate, it as threadKey, j as Mandate, k as FollowupRecords, l as OutboundMessage, lt as ReasonCode, m as ScopeResult, mt as DeploymentConfig, n as AssessmentOutcome, nt as settled, o as DomainEvents, ot as waitsForPerson, p as Repositories, pt as Deployment, q as assignmentTargetOf, r as Assessor, rt as targetOf, s as Executor, st as REASONS, t as ReceiveResult, tt as runningAssignment, u as Outbox, ut as reasonText, v as AdmissionCell, w as Decision, x as AssignmentTarget, y as Assignment, z as ThreadFacts } from "./intake-B1UsoHuw.js";
 import { Context } from "@deepseek-ai/cordis";
 //#region src/core/part.d.ts
 interface EngineOptions {

package/lib/index.js

@@ -5491,6 +5491,13 @@ var DshExecutor = class {
 		const ticket = this.host.store.tickets.get(ticketId);
 		const assignment = ticket && latestAssignment(ticket);
 		if (!ticket || !liveTicket(ticket) || assignment?.id !== assignmentId || assignment.state !== "pending") return;
+		if (ticket.blockedReason !== void 0) {
+			this.host.engine.report(ticketId, {
+				state: "blocked",
+				summary: ticket.blockedReason
+			});
+			return;
+		}
 		this.slots.reserve(ticketId, "launch");
 		try {
 			await this.launch(ticket, assignment);
@@ -9197,6 +9204,28 @@ function routes(runtime) {
 			runtime.revokeDevice(decodeURIComponent(params.id));
 			return { revoked: true };
 		},
+		/** 删掉一台设备。和吊销不同：吊销留着记录，删除连记录一起去掉。 */
+		"DELETE devices/:id": ({ params }) => {
+			runtime.deleteDevice(decodeURIComponent(params.id));
+			return { deleted: true };
+		},
+		/** 改一台设备的名字、标签或项目；id 与令牌不动，所以那台设备不用重新配置。 */
+		"PUT devices/:id": async ({ params, body: readBody }) => {
+			const body = z.object({
+				name: z.string().trim().min(1).optional(),
+				labels: z.array(z.string().trim().min(1)).optional(),
+				roots: z.array(z.object({
+					project: z.string().trim().min(1),
+					path: z.string().trim().min(1)
+				})).optional()
+			}).parse(await readBody());
+			try {
+				runtime.updateDevice(decodeURIComponent(params.id), body);
+			} catch (error) {
+				throw new RouteError(400, error instanceof Error ? error.message : String(error));
+			}
+			return { updated: true };
+		},
 		/** 轮换令牌：旧令牌立刻失效，新令牌只返回这一次。 */
 		"POST devices/:id/rotate": ({ params }) => ({ token: runtime.rotateDeviceToken(decodeURIComponent(params.id)) }),
 		"GET prompts": ({ query }) => {
@@ -9504,6 +9533,36 @@ var Devices = class {
 			revokedAt: (/* @__PURE__ */ new Date()).toISOString()
 		});
 	}
+	/**
+	* Delete a device outright, revoked or not.
+	*
+	* Revoking keeps the record for the audit trail; deleting is for the mistake — a device registered under the wrong
+	* id, or one that will never come back — that an operator does not want cluttering the list forever. The two are
+	* deliberately separate actions: revoke is the safe one, delete is the one that loses the history.
+	*
+	* @throws When the device is unknown, so a typo is reported rather than silently removing nothing.
+	*/
+	delete(id) {
+		this.require(id);
+		this.store.delete(KV.foreman.device(id));
+	}
+	/**
+	* Replace what a device offers: its display name, its labels, and the projects it can work on.
+	*
+	* The id and the token are not touched: an id is what the device's own configuration already says, and rotating a
+	* token is a separate decision with its own effect (the device must be given the new one). A handshake in flight
+	* keeps using the record it read, which is why the hub drops the connection after a change.
+	*
+	* @throws When the device is unknown.
+	*/
+	update(id, change) {
+		const next = { ...this.require(id) };
+		if (change.name !== void 0) next.name = change.name;
+		if (change.labels !== void 0) next.labels = [...change.labels];
+		if (change.roots !== void 0) next.roots = change.roots.map((root) => ({ ...root }));
+		this.store.set(KV.foreman.device(id), next);
+		return next;
+	}
 	/** Whether a token is this device's and the device is still allowed to connect; `false` for an unknown or revoked id. */
 	verify(id, token) {
 		const device = this.get(id);
@@ -9563,6 +9622,20 @@ function attachmentSection(names) {
 *
 * @throws When the attachments together exceed the frame budget: a truncated task would be worse than a refused one.
 */
+/**
+* What a device is told about reporting, appended to every assignment.
+*
+* Without it the job Session simply answers and stops: on a real deployment a device did thirty steps of real work,
+* wrote a complete answer, and never called `foreman_report`, so the hub sat at `running` with no report forever and
+* a person saw a job that never finished. The tool exists, but nothing told the model it was required or final.
+*/
+const REPORT_SECTION = [
+	"\n## Reporting back\n",
+	"\nWhen you have finished, call `foreman_report` — that tool is how this job reaches the person who asked, and ",
+	"answering in chat does not reach them. Report `ready` with a one-sentence summary of the result, or `blocked` with ",
+	"the one question only they can answer, or `failed` if the work cannot be done. The job is not finished until you ",
+	"have reported.\n"
+].join("");
 function renderForDevice(input) {
 	const { ticket, trigger } = input;
 	const refs = refsOf(trigger);
@@ -9586,7 +9659,8 @@ function renderForDevice(input) {
 			`# ${ticket.title}`,
 			scope === "" ? "" : `\n${scope}\n`,
 			request === "" ? "" : `\n## The request as it was written\n\n${request}\n`,
-			attachmentSection(attachments.map((attachment) => attachment.name ?? attachment.id))
+			attachmentSection(attachments.map((attachment) => attachment.name ?? attachment.id)),
+			REPORT_SECTION
 		].filter((section) => section !== "").join(""),
 		attachments
 	};
@@ -9789,6 +9863,8 @@ var ForemanExecutor = class {
 */
 var Hub = class {
 	connections = /* @__PURE__ */ new Map();
+	/** Connections that have arrived but not yet verified: parked so they cannot disturb an established one. */
+	pending = /* @__PURE__ */ new Map();
 	devices;
 	onFrame;
 	log;
@@ -9799,9 +9875,16 @@ var Hub = class {
 		this.log = input.log ?? (() => {});
 		this.now = input.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
 	}
-	/** Register a connection under the device id the transport says it belongs to; it is a claim until `hello`. */
+	/**
+	* Register a connection under the device id the transport says it belongs to; it is a claim until `hello`.
+	*
+	* A new connection does NOT evict an established one here. Evicting on arrival let two clients using the same id
+	* close each other in a loop — each reconnect killed the other's socket, neither ever finished its handshake, and
+	* the device stayed offline forever while both kept retrying. Instead a fresh connection waits in `pending` until
+	* its `hello` verifies, and only then replaces whoever held the id (`admit`). A half-finished connection therefore
+	* cannot disturb a working one, while a genuine reconnect still takes over once it has proved itself.
+	*/
 	attach(deviceId, channel) {
-		this.connections.get(deviceId)?.channel.close();
 		const connection = {
 			channel,
 			handshook: false,
@@ -9809,12 +9892,23 @@ var Hub = class {
 			lastSeenAt: this.now(),
 			dedupe: new FrameDedupe(/* @__PURE__ */ new Set())
 		};
-		this.connections.set(deviceId, connection);
+		this.pending.set(channel, {
+			deviceId,
+			connection
+		});
 		channel.onMessage((text) => this.receive(deviceId, connection, text));
 		channel.onClose(() => {
+			this.pending.delete(channel);
 			if (this.connections.get(deviceId) === connection) this.connections.delete(deviceId);
 		});
 	}
+	/** Promote a verified connection to be the one the id answers to, replacing whatever held it. */
+	admit(deviceId, connection) {
+		const previous = this.connections.get(deviceId);
+		if (previous !== void 0 && previous !== connection) previous.channel.close();
+		this.connections.set(deviceId, connection);
+		this.pending.delete(connection.channel);
+	}
 	/** Drop a device's connection and stop listing it as online. */
 	detach(deviceId) {
 		const connection = this.connections.get(deviceId);
@@ -9855,6 +9949,8 @@ var Hub = class {
 	}
 	/** Close every device connection, used at shutdown so in-flight work fails fast instead of hanging. */
 	closeAll() {
+		for (const [, parked] of [...this.pending]) parked.connection.channel.close();
+		this.pending.clear();
 		for (const [id, connection] of [...this.connections]) {
 			this.connections.delete(id);
 			connection.channel.close();
@@ -9915,6 +10011,7 @@ var Hub = class {
 		connection.running = [...frame.running];
 		connection.runningCount = connection.running.length;
 		connection.lastSeenAt = this.now();
+		this.admit(deviceId, connection);
 		this.devices.seen(deviceId, connection.lastSeenAt);
 		this.onFrame(deviceId, frame);
 	}
@@ -9929,6 +10026,7 @@ var Hub = class {
 			}));
 		} catch {}
 		this.log(`foreman hub refused a device: ${reason}`);
+		this.pending.delete(connection.channel);
 		connection.channel.close();
 		for (const [id, current] of this.connections) if (current === connection) this.connections.delete(id);
 	}
@@ -10180,6 +10278,14 @@ function prepareTicketWithForeman(input) {
 			const labels = input.labelsOf?.(trigger);
 			if (labels !== void 0 && labels.length > 0) request.labels = labels;
 			const target = select(request, input.devices(), input.online());
+			const mustBeRemote = request.device !== void 0 || request.labels !== void 0 && request.labels.length > 0;
+			if (target === void 0 && mustBeRemote) {
+				const blockedReason = `no online device can take this: it asked for ${request.device !== void 0 ? `device "${request.device}"` : "a restricted machine"} on project "${request.project}"; nothing was run`;
+				return {
+					...ticket,
+					blockedReason
+				};
+			}
 			const prepared = input.local({
 				...ticket,
 				...target === void 0 ? {} : { target }
@@ -12415,6 +12521,14 @@ var Runtime = class extends Service {
 				const token = runtime.devices.rotate(id);
 				runtime.hub?.detach(id);
 				return token;
+			},
+			deleteDevice: (id) => {
+				runtime.hub?.detach(id);
+				runtime.devices.delete(id);
+			},
+			updateDevice: (id, change) => {
+				runtime.devices.update(id, change);
+				runtime.hub?.detach(id);
 			}
 		};
 	}

package/lib/{intake-Di3PgVj2.d.ts → intake-B1UsoHuw.d.ts}

@@ -485,6 +485,14 @@ interface Ticket {
    * It lives on the Ticket because `newAssignment` never sees the accept outcome that made the choice.
    */
   target?: AssignmentTarget;
+  /**
+   * Why this ticket cannot start, when its acceptance required a machine and none could take it.
+   *
+   * Set instead of throwing: the request is real and worth recording, but running it on the host would answer a
+   * different question than the one asked. The executor reports it `blocked` without starting a Session, so it
+   * reaches a person as a visible failure rather than a silent success somewhere else.
+   */
+  blockedReason?: string;
   inputs: TicketInput[];
   /** Inputs not yet handed to a running assignment. */
   undelivered: string[];

package/lib/{kind-DGutnJ2b.d.ts → kind-BYtP14oM.d.ts}

@@ -1,4 +1,4 @@
-import { B as ThreadRef, C as ChannelRef, G as Trigger, L as Thread, R as ThreadFact, V as Ticket, h as SourceScope, l as OutboundMessage, m as ScopeResult, pt as Deployment, t as ReceiveResult, v as AdmissionCell } from "./intake-Di3PgVj2.js";
+import { B as ThreadRef, C as ChannelRef, G as Trigger, L as Thread, R as ThreadFact, V as Ticket, h as SourceScope, l as OutboundMessage, m as ScopeResult, pt as Deployment, t as ReceiveResult, v as AdmissionCell } from "./intake-B1UsoHuw.js";
 import { Context } from "@deepseek-ai/cordis";
 import { z } from "zod";
 import { DatabaseSync } from "node:sqlite";

package/lib/local-watch.d.ts

@@ -1,5 +1,5 @@
-import { G as Trigger } from "./intake-Di3PgVj2.js";
-import { t as SourceKind } from "./kind-DGutnJ2b.js";
+import { G as Trigger } from "./intake-B1UsoHuw.js";
+import { t as SourceKind } from "./kind-BYtP14oM.js";
 import { Context } from "@deepseek-ai/cordis";
 import { z } from "zod";
 //#region src/sources/dsh.d.ts

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-foreman",
   "author": "niechao136",
   "license": "MIT",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "dsh-foreman：主 loop 在多设备上派单的 DSH bundle：需求来自本机操作者的主会话而不是 GitHub/飞书，每个工作区各有一条主会话，主会话只负责路由，真正的活儿派给 Worker 在该工作区目录里执行。",
   "type": "module",
   "main": "lib/index.js",
@@ -62,7 +62,7 @@
   },
   "packageManager": "pnpm@11.7.0",
   "dependencies": {
-    "dsh-foreman-node": "0.2.0",
+    "dsh-foreman-node": "0.2.1",
     "proper-lockfile": "4.1.2",
     "ws": "8.22.0",
     "zod": "4.4.3"