dsh-foreman 0.1.1 → 0.3.0

package/CHANGELOG.md

@@ -1,95 +1,8 @@
 # Changelog
 
-本仓库的历史从本项目自己的初始提交开始，**不携带上游 git 历史**（见 README 的「由来与致谢」）。
-下面 `0.2.0` 一节是从代码基线 `dsh-superagent-local` 沿袭下来的、那一份代码相对上游
-`dsh-superagent-prototype` 的改动记录，保留它是为了说明基线里已经有什么；**它不是本项目的发布版本**。
+本仓库是 dsh-foreman（研究方向原型）的本地改造版。下面是相对上游 0.1.0 的改动。
 
-本项目自己的版本从 `0.1.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` 已包含其中全部内容。
+## 0.2.0 — 2026-11-01
 
 ### 新增：需求来自本机操作者
 

package/cordis.patch.yml

@@ -6,11 +6,11 @@
       name: dsh-foreman
     - id: dsh-foreman-github
       name: dsh-foreman/github-watch
-    # 椋炰功 IM 鏉ユ簮锛氱兢娑堟伅涓庣鑱婅繘宸ュ崟銆傛病鏈夐厤缃満鍣ㄤ汉 CLI 鏃跺畠鑷繁鎶ャ€屾湭璁剧疆鏈哄櫒浜?CLI銆嶏紝
-    # 涓嶅奖鍝嶅埆鐨勬潵婧愶紝鎵€浠ラ粯璁ゅ紑鐫€锛岃浜鸿兘鐩存帴鍦ㄨ缃噷濉€?
+    # 飞书 IM 来源：群消息与私聊进工单。没有配置机器人 CLI 时它自己报「未设置机器人 CLI」，
+    # 不影响别的来源，所以默认开着，让人能直接在设置里填。
     - id: dsh-foreman-feishu
       name: dsh-foreman/feishu-watch
-    # 鏈湴 Source锛氭妸鎿嶄綔鑰呭湪涓讳細璇濋噷璇寸殑璇濆綋浣滈渶姹傛潵婧愶紱涓€涓疄渚嬭鐩栨墍鏈夊伐浣滃尯銆?
+    # 本地 Source：把操作者在主会话里说的话当作需求来源；一个实例覆盖所有工作区。
     - id: dsh-foreman-dsh
       name: dsh-foreman/local-watch
     # The agent preset of every Executor Session (WORKER_PRESET in src/app/sessions.ts); the main Session has its own, below.
@@ -24,8 +24,8 @@
       name: '@deepseek-ai/dsh-agent-preset'
       config:
         id: dsh-foreman-worker
-        name: dsh-foreman 鎵ц鍣?
-        description: dsh-foreman 鐨勬墽琛屽櫒 Session 涓撶敤锛屼笉渚涙墜鍔ㄩ€夋嫨銆傚墠鍙板懡浠よ秴 5 绉掕浆鍏ュ悗鍙帮紝鍙惈鎵ц宸ヤ綔鎵€闇€鐨勫伐鍏枫€?
+        name: dsh-foreman 执行器
+        description: dsh-foreman 的执行器 Session 专用，不供手动选择。前台命令超 5 秒转入后台，只含执行工作所需的工具。
         order: 90
         plugins:
           - id: persona
@@ -129,8 +129,8 @@
       name: '@deepseek-ai/dsh-agent-preset'
       config:
         id: dsh-foreman-router
-        name: dsh-foreman 涓?Session
-        description: dsh-foreman 鐨勪富 Session 涓撶敤锛屼笉渚涙墜鍔ㄩ€夋嫨銆傚墠鍙板懡浠ゅ拰浠诲姟绛夊緟瓒?5 绉掕浆鍏ュ悗鍙帮紝鍙惈璺敱鎵€闇€鐨勫伐鍏枫€?
+        name: dsh-foreman 主 Session
+        description: dsh-foreman 的主 Session 专用，不供手动选择。前台命令和任务等待超 5 秒转入后台，只含路由所需的工具。
         order: 91
         plugins:
           - id: agent-instructions

package/lib/client.js

@@ -4598,7 +4598,18 @@ window.__ModuleLoader__.load({
 			devicesOnline: ["在线", "Online"],
 			devicesRunning: ["在跑", "Running"],
 			devicesEmpty: ["还没有登记任何设备", "No device is registered yet"],
-			devicesEmptyHint: ["在服务器上运行 dsh-foreman 的注册命令生成令牌，再把域名、设备 id 与令牌填进设备自己的配置。", "Mint a token with the hub's registration command, then put the address, device id and token into that device's own configuration."],
+			devicesEmptyHint: ["在下面登记一台设备，它会给出三样东西填进那台设备的配置页。", "Register a machine below; it gives you the three values to put on that machine's own configuration page."],
+			devicesAdd: ["登记一台设备", "Register a machine"],
+			devicesAddHint: ["登记后这台设备才能接单。登记不会连上它——连接由那台设备自己发起。", "A machine takes work only after it is registered here. Registering does not connect it: the machine dials out itself."],
+			devicesAddId: ["设备 id", "Device id"],
+			devicesAddName: ["显示名", "Display name"],
+			devicesAddRoots: ["它能接的项目", "Projects it can take"],
+			devicesAddRoot: ["加一个项目", "Add a project"],
+			devicesAddProject: ["项目名", "Project"],
+			devicesAddPath: ["那台机器上的路径", "Path on that machine"],
+			devicesAddSubmit: ["登记", "Register"],
+			devicesAddMinted: ["把这四样填进那台设备的配置页", "Put these values on that machine's configuration page"],
+			devicesAddMintedHint: ["令牌只显示这一次，库里只存哈希。关掉或刷新这一页就再也拿不回来了；丢了只能换一个。", "The token is shown once; only its hash is stored. Closing or refreshing this page loses it for good, and the only way back is a new one."],
 			deviceOnline: ["在线", "Online"],
 			deviceRevoked: ["已吊销", "Revoked"],
 			deviceRunning: ["在跑 {count} 件", "{count} running"],
@@ -5545,7 +5556,7 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/devices.tsx
 		/** Devices settings group: which machines may take work, whether each is online, and what it is running. */
-		/** The device list, read-only apart from revoking and rotating a token. */
+		/** The device list, the registration form, and the two token actions. */
 		function DevicesSettings() {
 			const { t, call } = usePanel();
 			const { data, error, reload } = usePoll(() => call("GET devices"), []);
@@ -5585,6 +5596,9 @@ window.__ModuleLoader__.load({
 						})
 					]
 				}),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(AddDevice, { onAdded: () => {
+					reload();
+				} }),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Section, {
 					title: t("devicesList"),
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ListSection, {
@@ -5697,6 +5711,143 @@ window.__ModuleLoader__.load({
 				})]
 			});
 		}
+		/**
+		* Registering a machine, in place.
+		*
+		* The three values the machine needs are shown together and once: the hub keeps only a token hash, so a token that
+		* leaves this card is gone. That is why the card is not dismissible: closing it is losing the token, and the page
+		* says so instead of letting someone find out at the device.
+		*/
+		function AddDevice({ onAdded }) {
+			const { t, call } = usePanel();
+			const { data: state } = usePoll(() => call("GET state"), []);
+			const [id, setId] = (0, react.useState)("");
+			const [name, setName] = (0, react.useState)("");
+			const [roots, setRoots] = (0, react.useState)([]);
+			const [minted, setMinted] = (0, react.useState)();
+			const [refusal, setRefusal] = (0, react.useState)();
+			const [busy, setBusy] = (0, react.useState)(false);
+			const register = async () => {
+				setBusy(true);
+				setRefusal(void 0);
+				try {
+					const result = await call("POST devices", { body: {
+						id: id.trim(),
+						name: name.trim(),
+						labels: [],
+						roots: roots.map((root) => ({
+							project: root.project.trim(),
+							path: root.path.trim()
+						}))
+					} });
+					setMinted({
+						id: result.id,
+						token: result.token
+					});
+					setId("");
+					setName("");
+					setRoots([]);
+					onAdded();
+				} catch (error) {
+					setRefusal(errorText(error));
+				} finally {
+					setBusy(false);
+				}
+			};
+			const edit = (index, patch) => {
+				setRoots((current) => current.map((root, at) => at === index ? {
+					...root,
+					...patch
+				} : root));
+			};
+			const hubPort = state?.setup.machine.hubPort ?? 0;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, {
+				title: t("devicesAdd"),
+				hint: t("devicesAddHint"),
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(FieldGrid, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+						label: t("devicesAddId"),
+						required: true,
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Input, {
+							value: id,
+							onChange: (event) => setId(event.target.value),
+							placeholder: "laptop"
+						})
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+						label: t("devicesAddName"),
+						required: true,
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Input, {
+							value: name,
+							onChange: (event) => setName(event.target.value)
+						})
+					})] }),
+					roots.length > 0 && /* @__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: index === 0 ? t("devicesAddProject") : `${t("devicesAddProject")} ${index + 1}`,
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Input, {
+							value: root.project,
+							onChange: (event) => edit(index, { project: event.target.value }),
+							placeholder: "shop"
+						})
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+						label: index === 0 ? t("devicesAddPath") : `${t("devicesAddPath")} ${index + 1}`,
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Input, {
+							value: root.path,
+							onChange: (event) => edit(index, { path: event.target.value }),
+							placeholder: "F:\\\\dsh\\\\shop"
+						})
+					})] }, 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: ""
+							}]),
+							children: t("devicesAddRoot")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+							size: "sm",
+							variant: "primary",
+							busy,
+							disabled: id.trim() === "" || name.trim() === "",
+							onClick: () => {
+								register();
+							},
+							children: t("devicesAddSubmit")
+						})]
+					}),
+					refusal !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ErrorLine, {
+						error: refusal,
+						title: t("loadFailed")
+					})
+				]
+			}), minted && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Card, {
+				title: t("devicesAddMinted"),
+				tone: "warn",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Hint, { children: t("devicesAddMintedHint") }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(KeyValues, { rows: mintedRows(minted, hubPort) }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", {
+						className: "dt-mono",
+						"data-device-token": true,
+						children: minted.token
+					})
+				]
+			})] });
+		}
+		/**
+		* The rows a device needs, with the hub's real port.
+		*
+		* A hub with `hubPort: 0` has its listener switched off, so no address a card could print would work; saying so is
+		* more use than a plausible-looking port that nothing listens on.
+		*/
+		function mintedRows(minted, hubPort) {
+			return [
+				["url", hubPort > 0 ? `ws://127.0.0.1:${hubPort}` : "the hub is off: set hubPort in the plugin configuration"],
+				["deviceId", minted.id],
+				["token", minted.token]
+			];
+		}
 		//#endregion
 		//#region src/client/logs.tsx
 		/**

package/lib/index.js

@@ -8802,6 +8802,10 @@ var RouteError = class extends Error {
 		this.status = status;
 	}
 };
+/** Whether a registration failed because the id is taken, the only failure that is the caller's to fix. */
+function isDuplicateDevice(error) {
+	return error instanceof Error && /is already registered/.test(error.message);
+}
 async function readBody(req, maxBytes = 131072) {
 	let size = 0;
 	const chunks = [];
@@ -8924,12 +8928,13 @@ function failure(error, internal) {
 		id
 	}];
 }
-function machineView({ stateDir, promptMaxChars, admissionContextMaxPages, admissionContextTimeoutMs }) {
+function machineView({ stateDir, promptMaxChars, admissionContextMaxPages, admissionContextTimeoutMs, hubPort }) {
 	return {
 		stateDir,
 		promptMaxChars: promptMaxChars.get(),
 		admissionContextMaxPages: admissionContextMaxPages.get(),
-		admissionContextTimeoutMs: admissionContextTimeoutMs.get()
+		admissionContextTimeoutMs: admissionContextTimeoutMs.get(),
+		hubPort
 	};
 }
 /** Every setup problem the panel shows: global first, then the ones that pause a single Source, each with that Source's title. */
@@ -9169,6 +9174,24 @@ function routes(runtime) {
 			devices: runtime.devices(),
 			online: runtime.onlineDevices()
 		}),
+		/** 登记一台新设备。令牌只在这一次响应里出现，刷新就没了。 */
+		"POST devices": async (input) => {
+			const body = z.object({
+				id: z.string().trim().min(1),
+				name: z.string().trim().min(1),
+				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)
+				}))
+			}).parse(await input.body());
+			try {
+				return runtime.addDevice(body);
+			} catch (error) {
+				if (isDuplicateDevice(error)) throw new RouteError(400, error.message);
+				throw error;
+			}
+		},
 		/** 吊销一台设备：登记保留（审计要看），下一次心跳就断开。 */
 		"POST devices/:id/revoke": ({ params }) => {
 			runtime.revokeDevice(decodeURIComponent(params.id));
@@ -12376,6 +12399,14 @@ var Runtime = class extends Service {
 			models: () => this.ctx.sessionController.modelCatalog(),
 			devices: () => runtime.devices.list(),
 			onlineDevices: () => runtime.hub?.snapshot() ?? [],
+			/** 登记一台设备并铸一枚令牌；和 `scripts/add-device.mjs` 走同一个 `Devices.add`。 */
+			addDevice: (input) => {
+				const { device, token } = runtime.devices.add(input);
+				return {
+					id: device.id,
+					token
+				};
+			},
 			revokeDevice: (id) => {
 				runtime.devices.revoke(id);
 				runtime.hub?.detach(id);

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-foreman",
   "author": "niechao136",
   "license": "MIT",
-  "version": "0.1.1",
+  "version": "0.3.0",
   "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.1.0",
+    "dsh-foreman-node": "0.2.0",
     "proper-lockfile": "4.1.2",
     "ws": "8.22.0",
     "zod": "4.4.3"

package/prompts/admission.md

@@ -28,7 +28,6 @@ The host posts it as a reply to the triggering message; do not quote that messag
 Return rule_assessments with exactly one entry for every enabled rule: rule_id, matched and a factual reason.
 Include negative judgments as matched=false; a reason saying that a rule does not apply cannot be a positive match.
 Never include disabled, unknown or repeated rule IDs.
-Fill device only when the request itself says where the work has to happen — a named machine, an office-only system, a machine the person says they are at. Otherwise leave it out: the host picks the least busy online machine that can reach the project, and a guess here can send work to a machine that cannot do it.
 The host derives positive-only matches from those booleans.
 One source message produces at most one ticket.
 If matching rules conflict or the scope is ambiguous, ignore quietly.