dsh-foreman 0.3.2 → 0.3.4

package/CHANGELOG.md

@@ -6,6 +6,43 @@
 
 本项目自己的版本从 `0.1.0` 开始。
 
+## 0.3.4 — 2026-11-08
+
+### 修复：设备回报只进了账本，主会话从没收到
+
+远程设备的 `report` 帧只调了 `engine.report(...)`，**没有生成 relay**。后果是那张工单在面板上显示
+`ready`、`ended`，但派它的主会话完全不知道——既不把结果转达给人，也不会据此继续处理。
+
+本地 worker 的 `orchestrator_report` 工具一直有这一步（`reportRelay` + `steer`），远程这条路径从来没接上。
+
+现在 `applyReport` 补上同一道缝：报告入账后生成 relay 并 steer 到发起该工单的主会话。
+`reportRelay` 自己决定哪些值得打扰人——`progress` 仍然留在内部，`ready` / `blocked` / `failed`
+会唤醒主会话，由它决定是转达结果还是接着做下一步。
+
+relay 失败只记日志：报告已经入账，不能因为通知不到就把它退回去。
+
+## 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
 
 ### 修复：派单文本没有说要回报

package/lib/index.js

@@ -9629,6 +9629,16 @@ function attachmentSection(names) {
 * 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 ",
@@ -9654,9 +9664,11 @@ 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)),
@@ -9812,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",
@@ -9829,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. */
@@ -10354,6 +10371,11 @@ function applyReport(input) {
 			summary: frame.summary,
 			...frame.question === void 0 ? {} : { question: frame.question }
 		});
+		try {
+			input.relay?.(where.ticketId);
+		} catch (error) {
+			input.log(`could not relay the report for ${where.ticketId}: ${String(error)}`);
+		}
 	};
 }
 /**
@@ -11924,6 +11946,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)
@@ -11972,6 +12001,14 @@ var Runtime = class extends Service {
 					engine.report(ticketId, workerReport);
 				},
 				ticketOf: (assignmentId) => assignmentWhere(store, assignmentId),
+				relay: (ticketId) => {
+					const ticket = store.tickets.get(ticketId);
+					if (ticket === void 0) return;
+					const report = latestAssignment(ticket)?.report;
+					if (report === void 0) return;
+					const relay = reportRelay(ticket, report);
+					if (relay !== void 0) sessions.relay(relay.id, relay.text, this.masterOf(store.triggers.get(ticket.origin.triggerId)));
+				},
 				log: (text) => ctx.logger.warn("dsh-foreman: %s", text)
 			});
 			const evals = board.claim("evals", {

package/package.json

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