dsh-foreman 0.3.1 → 0.3.3

package/CHANGELOG.md

@@ -6,6 +6,42 @@
 
 本项目自己的版本从 `0.1.0` 开始。
 
+## 0.3.3 — 2026-11-08
+
+### 改进：派单时直接告诉设备「你就是那台机器」
+
+人在 hub 上写「看看宿舍电脑上的项目结构」。「宿舍电脑」就是收到这条任务的那台机器，但**派单文本里
+没有一句话说明这件事**——设备收到的只有标题和请求原文。
+
+于是模型每次都要先花不少步数去比对设备名、列目录、找自己在哪儿，确认之后才真正开始干活。
+
+现在每张派单的开头多了一段：
+
+```
+## Where this job runs
+
+You are the device **宿舍电脑** (id `pc`) working in `F:\dsh`. When the request names this machine —
+"宿舍电脑", or "this computer", "here", "the machine you are on" — it means you, and the files are
+already under that directory. Do not go looking for another machine.
+```
+
+只把**登记的设备名**当作别名。目录的最后一段通常是项目名（`shop`），把它说成机器别名会让模型
+搞不清那是项目还是主机。
+
+## 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 的两个连接互相踢，设备永远上不了线

package/lib/index.js

@@ -9622,6 +9622,30 @@ 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.
+*/
+/**
+* Where this job is running, stated so the device never has to deduce that the request referred to itself.
+*
+* A person at the hub writes about their machines by name ("the dorm computer", "my laptop"). The device that receives
+* that sentence IS one of those machines, but nothing in the text said which one, so the model spent its first steps
+* comparing names, listing directories and looking for itself. This is one line that ends that.
+*/
+function locationSection(device) {
+	return `\n## Where this job runs\n\nYou are the device **${device.name}** (id \`${device.id}\`) working in \`${device.directory}\`. When the request names this machine — "${device.name}", or "this computer", "here", "the machine you are on" — it means you, and the files are already under that directory. Do not go looking for another machine.\n`;
+}
+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);
@@ -9640,12 +9664,15 @@ function renderForDevice(input) {
 	}
 	const scope = scopeOf(ticket);
 	const request = trigger?.text?.trim() ?? "";
+	const location = input.device === void 0 ? "" : locationSection(input.device);
 	return {
 		text: [
 			`# ${ticket.title}`,
+			location,
 			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
 	};
@@ -9797,7 +9824,11 @@ var ForemanExecutor = class {
 		}));
 	}
 	assignFrame(ticket, assignment, deviceId, directory) {
-		const rendered = this.render(ticket);
+		const device = this.input.deviceOf?.(deviceId);
+		const rendered = this.render(ticket, device === void 0 ? void 0 : {
+			...device,
+			directory
+		});
 		return {
 			v: 1,
 			type: "assign",
@@ -9814,11 +9845,12 @@ var ForemanExecutor = class {
 	* The task as the device reads it. Rendered on the hub because the device has none of the hub's resources; the
 	* device directory rides on the frame, not in the text.
 	*/
-	render(ticket) {
+	render(ticket, device) {
 		return renderForDevice({
 			ticket,
 			...(this.input.triggerOf ?? (() => ({})))(ticket),
-			readAttachment: this.input.readAttachment ?? (() => Buffer.alloc(0))
+			readAttachment: this.input.readAttachment ?? (() => Buffer.alloc(0)),
+			...device === void 0 ? {} : { device }
 		});
 	}
 	/** Append work to the send chain, keeping the chain alive after a failure. */
@@ -11909,6 +11941,13 @@ var Runtime = class extends Service {
 				local: executor,
 				readAttachment: (id) => readFileSync(attachmentPath(id)),
 				triggerOf: (ticket) => ({ trigger: store.triggers.get(ticket.origin.triggerId) }),
+				deviceOf: (id) => {
+					const device = this.devices.get(id);
+					return device === void 0 ? void 0 : {
+						id: device.id,
+						name: device.name
+					};
+				},
 				engine: () => this.engine,
 				transport: { send: (deviceId, frame) => this.hub?.send(deviceId, frame) ?? Promise.reject(/* @__PURE__ */ new Error(`the foreman hub is not listening, so ${deviceId} cannot be reached`)) },
 				log: (text) => ctx.logger.warn("dsh-foreman: %s", text)

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-foreman",
   "author": "niechao136",
   "license": "MIT",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "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"