@khorsheed/dsh-room 0.1.1 → 0.2.0

package/lib/index.js

@@ -1,4 +1,4 @@
-import { a as memberId, c as pendingInstructions, d as rosterStaleSince, f as replayDeliveries, i as isRoomLog, l as previousCursor, n as ROOM_EVENT_TYPES, o as parseMentions, r as coordinatorMember, s as parseRelayDirective, t as MAIN_AGENT_MEMBER, u as replay } from "./journal-CuRnWk66.js";
+import { a as memberId, c as pendingInstructions, d as rosterStaleSince, f as replayDeliveries, i as isRoomLog, l as previousCursor, n as ROOM_EVENT_TYPES, o as parseMentions, r as coordinatorMember, s as parseRelayDirective, t as MAIN_AGENT_MEMBER, u as replay } from "./journal-BWL3-i0s.js";
 import { createHash, randomUUID } from "node:crypto";
 import { SessionId } from "@deepseek-ai/dsh-session";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
@@ -1218,6 +1218,14 @@ var DispatchEngine = class {
 		const error = "Execution outcome is unknown after restart; reconcile before retrying";
 		return {
 			...state,
+			...state.executions === void 0 ? {} : { executions: state.executions.map((execution) => {
+				const active = execution.runId === void 0 ? [...this.inFlight.values()].includes(`${sessionId} ${execution.memberId}`) : this.scheduled.has(`${sessionId}:${execution.runId}`);
+				return execution.state === "running" && !active ? {
+					...execution,
+					state: "failed",
+					error
+				} : execution;
+			}) },
 			...state.deliveries === void 0 ? {} : { deliveries: state.deliveries.map((row) => row.status === "queued" && closedGoal(state, row.plan?.goalId) ? {
 				...row,
 				status: "cancelled"
@@ -1318,7 +1326,8 @@ var DispatchEngine = class {
 				member: memberName,
 				state: "running",
 				startedAt,
-				runId
+				runId,
+				...member.kind === "main-agent" ? { childSessionId: room.id } : member.childSessionId === void 0 ? {} : { childSessionId: member.childSessionId }
 			});
 			await this.hooks.admitted?.(room, options.dispatchSeq);
 			await this.ctx.sessions.flush(room);
@@ -1326,7 +1335,7 @@ var DispatchEngine = class {
 		};
 		let outcome;
 		try {
-			outcome = member.kind === "main-agent" ? await this.runMainAgent(room, member, cursor, text, await admitted(), options.relayIds ?? []) : await this.runCliMember(room, member, cursor, text, admitted, options.relayIds ?? [], submitted);
+			outcome = member.kind === "main-agent" ? await this.runMainAgent(room, member, cursor, text, await admitted(), options.relayIds ?? []) : await this.runCliMember(room, member, cursor, text, admitted, options.relayIds ?? [], submitted, runId);
 		} catch (error) {
 			this.ctx.logger.warn(`room: dispatch to "${memberName}" failed: ${String(error)}`);
 			outcome = {
@@ -1409,7 +1418,7 @@ var DispatchEngine = class {
 		return { state: "done" };
 	}
 	/** CLI member turn: facade start (first round) or resume, then the speech mirror. */
-	async runCliMember(room, member, cursor, text, admitted, relayIds, submitted) {
+	async runCliMember(room, member, cursor, text, admitted, relayIds, submitted, runId) {
 		const facade = probeLocalAgent(this.ctx);
 		if (facade === void 0) {
 			this.ctx.logger.warn(`room: cannot dispatch to "${member.name}": local-agent facade unavailable`);
@@ -1418,9 +1427,23 @@ var DispatchEngine = class {
 		const provider = member.provider ?? "";
 		let startedAt;
 		const controlled = facade.supportsMemberConfiguration?.(provider) === true;
-		const admission = controlled ? { onAdmitted: async () => {
-			startedAt = await admitted();
-		} } : {};
+		const admission = {
+			...controlled ? { onAdmitted: async () => {
+				startedAt = await admitted();
+			} } : {},
+			onProgress: (event) => {
+				if (event.kind !== "settled") return;
+				if (room.snapshotEvents().filter((row) => row.type === "room/run-state" && row.data.runId === runId).at(-1)?.type !== "room/run-state") return;
+				const total = event.usage?.totalTokens ?? (event.usage === void 0 ? void 0 : event.usage.inputTokens + event.usage.outputTokens);
+				room.append("room/execution-metadata", {
+					runId,
+					...event.observedModel === void 0 ? {} : { model: event.observedModel },
+					...event.observedEffort === void 0 ? {} : { effort: event.observedEffort },
+					...total === void 0 || !Number.isFinite(total) || total < 0 ? {} : { tokens: total }
+				});
+				this.ctx.sessions.flush(room).catch((error) => this.ctx.logger.warn(`room: execution metadata flush failed: ${String(error)}`));
+			}
+		};
 		if (!controlled) startedAt = await admitted();
 		const { prompt, carried } = assemblePrompt(room, member, cursor, text, relayIds);
 		const prepared = member.childSessionId !== void 0 && facade.isPreparedMember?.(member.childSessionId) === true;
@@ -1433,14 +1456,14 @@ var DispatchEngine = class {
 		}) : member.childSessionId === void 0 ? facade.start(room.id, provider, [{
 			type: "text",
 			text: prompt
-		}], member.model === void 0 && member.cwd === void 0 && !controlled ? void 0 : {
+		}], {
 			...admission,
 			...member.model === void 0 ? {} : { model: member.model },
 			...member.cwd === void 0 ? {} : { cwd: member.cwd }
 		}) : facade.resume(room.id, provider, member.childSessionId, [{
 			type: "text",
 			text: prompt
-		}], member.cwd === void 0 && !controlled ? void 0 : {
+		}], {
 			...admission,
 			...member.cwd === void 0 ? {} : { cwd: member.cwd }
 		});
@@ -1533,8 +1556,8 @@ var DispatchEngine = class {
 * room host half: the `room` Typert Remote service. (The `room_invite` /
 * `room_task` / `room_message` model tools left this package's profile-root
 * registration in the M4' tool-row split — their definition factories live
-* in ./tool.ts and the companion `@khorsheed/dsh-room-tool` mounts them
-* inside agent-preset compositions.) The room's entire state is the session's `room/*` custom-event
+* in ./tool-definition.ts and the package's own `./tool` composition entry
+* mounts them inside agent-preset compositions.) The room's entire state is the session's `room/*` custom-event
 * journal (log-only events — persistence and reload-replay come free, the
 * model never sees them, and harnesses without this plugin replay the session
 * safely); every read folds the journal through the pure replay, and every
@@ -1637,6 +1660,7 @@ let RoomService = (() => {
 	let _closeTask_decorators;
 	let _setGoal_decorators;
 	let _cancel_decorators;
+	let _cancelChild_decorators;
 	return class RoomService extends _classSuper {
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
@@ -1657,6 +1681,7 @@ let RoomService = (() => {
 			_closeTask_decorators = [Remote("closeTask")];
 			_setGoal_decorators = [Remote("setGoal")];
 			_cancel_decorators = [Remote("cancel")];
+			_cancelChild_decorators = [Remote("cancelChild")];
 			__esDecorate(this, null, _isRoom_decorators, {
 				kind: "method",
 				name: "isRoom",
@@ -1844,6 +1869,17 @@ let RoomService = (() => {
 				},
 				metadata: _metadata
 			}, null, _instanceExtraInitializers);
+			__esDecorate(this, null, _cancelChild_decorators, {
+				kind: "method",
+				name: "cancelChild",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "cancelChild" in obj,
+					get: (obj) => obj.cancelChild
+				},
+				metadata: _metadata
+			}, null, _instanceExtraInitializers);
 			if (_metadata) Object.defineProperty(this, Symbol.metadata, {
 				enumerable: true,
 				configurable: true,
@@ -3197,8 +3233,15 @@ let RoomService = (() => {
 				ok: false,
 				error: { code: "member-not-found" }
 			};
+			const expected = loaded.state.runs.find((entry) => entry.member === request.name && entry.state === "running");
+			if (request.expectedRunId !== void 0 && expected?.runId !== request.expectedRunId || request.expectedStartedAt !== void 0 && expected?.startedAt !== request.expectedStartedAt) return {
+				ok: true,
+				value: { cancelled: false }
+			};
 			const facade = probeLocalAgent(this.ctx);
-			if (facade !== void 0 && member.childSessionId !== void 0 ? facade.cancel(member.childSessionId) : false) {
+			const native = member.kind === "main-agent" && expected !== void 0 ? this.ctx.agents.get(loaded.session.id) : void 0;
+			if (native !== void 0) native.cancel({ kind: "user" });
+			if (native !== void 0 || (facade !== void 0 && member.childSessionId !== void 0 ? facade.cancel(member.childSessionId) : false)) {
 				const running = loaded.state.runs.find((entry) => entry.member === request.name && entry.state === "running");
 				if (running === void 0) return {
 					ok: true,
@@ -3208,6 +3251,7 @@ let RoomService = (() => {
 					member: request.name,
 					state: "cancelled",
 					startedAt: running.startedAt,
+					elapsedMs: Math.max(0, Date.now() - running.startedAt),
 					...running.runId === void 0 ? {} : { runId: running.runId }
 				});
 				for (const task of loaded.state.tasks) if (task.member === request.name && task.status === "in_progress" && (running.runId === void 0 || task.deliveryId === running.runId)) loaded.session.append("room/task-updated", {
@@ -3225,6 +3269,38 @@ let RoomService = (() => {
 				value: { cancelled: false }
 			};
 		}
+		/** Native descendant controls share the host's continuation and cancellation channels. */
+		async cancelChild(request) {
+			const loaded = await this.ensureLive(request.sessionId);
+			if (!loaded.ok) return {
+				ok: false,
+				error: loaded.error
+			};
+			const target = this.ctx.sessions.get(request.childSessionId);
+			const seen = /* @__PURE__ */ new Set([request.childSessionId]);
+			let parent = target?.header.parentSession;
+			while (parent !== void 0 && parent !== request.sessionId && !seen.has(parent)) {
+				seen.add(parent);
+				parent = this.ctx.sessions.get(parent)?.header.parentSession;
+			}
+			if (!target || target.id === request.sessionId || parent !== request.sessionId) return {
+				ok: true,
+				value: { cancelled: false }
+			};
+			const facadeHit = probeLocalAgent(this.ctx)?.cancel(target.id) ?? false;
+			const agent = this.ctx.agents.get(target.id);
+			if (agent) {
+				this.ctx.get("subagents")?.interrupt(target.id, {
+					kind: "user",
+					parentSessionId: target.header.parentSession
+				});
+				agent.cancel({ kind: "user" });
+			}
+			return {
+				ok: true,
+				value: { cancelled: facadeHit || agent !== void 0 }
+			};
+		}
 	};
 })();
 //#endregion

package/lib/{journal-CuRnWk66.js → journal-BWL3-i0s.js}

@@ -68,6 +68,7 @@ const ROOM_EVENT_TYPES = [
 	"room/dispatch",
 	"room/speech",
 	"room/run-state",
+	"room/execution-metadata",
 	"room/relay",
 	"room/relay-resolved",
 	"room/task-added",
@@ -144,6 +145,7 @@ function replay(events) {
 	const tasks = [];
 	const taskById = /* @__PURE__ */ new Map();
 	const runs = /* @__PURE__ */ new Map();
+	const executions = /* @__PURE__ */ new Map();
 	let goal;
 	let coordinator;
 	for (const event of events) switch (event.type) {
@@ -185,6 +187,10 @@ function replay(events) {
 				},
 				...event.data.childSessionId === void 0 ? {} : { childSessionId: event.data.childSessionId }
 			};
+			for (const [id, execution] of executions) if (execution.memberId === member.id && execution.childSessionId === void 0 && patched.childSessionId !== void 0) executions.set(id, {
+				...execution,
+				childSessionId: patched.childSessionId
+			});
 			const rename = event.data.rename;
 			if (rename === void 0 || rename === member.name || byName.has(rename)) {
 				byName.set(member.name, patched);
@@ -310,7 +316,27 @@ function replay(events) {
 			goal = text === "" ? void 0 : text;
 			break;
 		}
+		case "room/execution-metadata": {
+			const previous = executions.get(event.data.runId);
+			if (previous) executions.set(previous.id, {
+				...previous,
+				...event.data
+			});
+			break;
+		}
 		case "room/run-state": {
+			const member = byName.get(event.data.member);
+			const id = event.data.runId ?? `legacy:${member?.id ?? event.data.member}:${event.data.startedAt}`;
+			const previous = executions.get(id);
+			executions.set(id, {
+				id,
+				...member?.id === void 0 ? {} : { memberId: member.id },
+				...member?.childSessionId === void 0 ? {} : { childSessionId: member.childSessionId },
+				...member?.provider === void 0 ? {} : { provider: member.provider },
+				...previous,
+				...event.data,
+				...event.data.state === "running" || event.data.elapsedMs !== void 0 ? {} : { elapsedMs: Math.max(0, event.time - event.data.startedAt) }
+			});
 			const current = runs.get(event.data.member);
 			if (event.data.state !== "running" && event.data.runId !== void 0 && current?.runId !== void 0 && current.runId !== event.data.runId) break;
 			runs.set(event.data.member, {
@@ -331,6 +357,7 @@ function replay(events) {
 		members,
 		relays,
 		tasks,
+		...executions.size === 0 ? {} : { executions: [...executions.values()] },
 		...plan === void 0 ? {} : { plan },
 		...deliveries.length === 0 ? {} : { deliveries },
 		runs: [...runs.values()],

package/lib/tool.js

@@ -1,6 +1,6 @@
-import { i as isRoomLog, r as coordinatorMember } from "./journal-CuRnWk66.js";
+import { i as isRoomLog, r as coordinatorMember } from "./journal-BWL3-i0s.js";
 import { defineTool } from "@deepseek-ai/dsh-tools";
-//#region lib/types/tool.js
+//#region lib/types/tool-definition.js
 /**
 * The room's model-facing tool DEFINITIONS, `room_invite`, `room_task`, and
 * `room_message`: the main
@@ -18,14 +18,18 @@ import { defineTool } from "@deepseek-ai/dsh-tools";
 * a message to a member through the same engine path as the human's
 * `@member text`, minus the user bubble (the caller is the room's own agent).
 *
-* Since the tool-row split (M4') the core no longer REGISTERS these tools:
-* the factories are consumed by the companion `@khorsheed/dsh-room-tool`,
-* which mounts the tool row inside agent-preset compositions (session-granted,
-* never at the profile root). The definitions are therefore returned
-* UNTAGGED — the registering package applies its own tool-origin tag
-* (AGENTS.md § Tool origin tagging — the owner is whichever package mounts
-* the row).
-* @module @khorsheed/dsh-room/tool
+* Since the tool-row split (M4') the core never REGISTERS these tools: the
+* factories are consumed by the package's `./tool` subpath row
+* ({@link file://./tool.ts}), which mounts them inside agent-preset
+* compositions (session-granted, never at the profile root). The definitions
+* are therefore returned UNTAGGED — the registering row applies its own
+* tool-origin tag (AGENTS.md § Tool origin tagging — the owner is whichever
+* package mounts the row).
+*
+* Internal module: not on the package's exports map (consumers reach it only
+* through `./src/*`).
+*
+* @module @khorsheed/dsh-room
 */
 /**
 * Build the room_invite tool definition bound to the room service.
@@ -347,4 +351,52 @@ function roomPlanTool(backend) {
 	});
 }
 //#endregion
-export { roomInviteTool, roomMessageTool, roomPlanTool, roomReadTool, roomTaskTool };
+//#region lib/types/tool.js
+const PACKAGE_NAME = "@khorsheed/dsh-room";
+/**
+* Tag the model-visible tools with their origin (AGENTS.md § Tool origin
+* tagging; seam S12): the capability catalog reads this `Symbol.for`-keyed
+* tag back through `ctx.tools.get()`, so the room tools attribute to THIS
+* package (the row the preset mounts), not to the service core. The tag is
+* host-side only and never travels on the model wire. Generic form (not
+* `typeof defineTool`, which trips typert TS2321).
+*/
+const definePluginTool = (def) => Object.assign(def, { [Symbol.for("dsh.tool.origin")]: {
+	channel: "plugin",
+	owner: PACKAGE_NAME
+} });
+/** Cordis plugin name used by loader diagnostics. */
+const name = "room-tool";
+/**
+* The `room` core is a declared inject (the owning-family companion
+* exception to the community-service probe rule): a preset's standing scope
+* mounts at registry-activation time, BEFORE the profile's later bundle rows
+* provide the core, so a one-shot ctx.get probe at apply saw ABSENT there and
+* nothing re-ran the row (rc.1 boot order; 3080 production 2026-09-27). The
+* declared inject pends the row until the core provides, then the body
+* applies. The tools registry still joins through deferred injection so its
+* mount order cannot strand the registrations.
+*/
+const inject = ["room"];
+/**
+* Plugin body: register the room tools. The declared `room` inject pends the
+* row until the core provides, so mount order can no longer strand it; the
+* in-body guard stays as the defensive direct-call path.
+* @param ctx - Cordis context (the preset's agent-plane mount).
+*/
+function apply(ctx) {
+	const service = ctx.get("room");
+	if (service === void 0) {
+		ctx.logger.info(`${name}: the global room service is absent — the room tools are not registered`);
+		return;
+	}
+	ctx.inject(["tools"], (toolsCtx) => {
+		if (typeof service.commandPlan === "function") toolsCtx.effect(() => toolsCtx.tools.register(definePluginTool(roomPlanTool(service))), "room-tool: room_plan tool");
+		if (typeof service.readRoomContext === "function") toolsCtx.effect(() => toolsCtx.tools.register(definePluginTool(roomReadTool(service))), "room-tool: room_read tool");
+		toolsCtx.effect(() => toolsCtx.tools.register(definePluginTool(roomInviteTool(service))), "room-tool: room_invite tool");
+		toolsCtx.effect(() => toolsCtx.tools.register(definePluginTool(roomTaskTool(service))), "room-tool: room_task tool");
+		toolsCtx.effect(() => toolsCtx.tools.register(definePluginTool(roomMessageTool(service))), "room-tool: room_message tool");
+	});
+}
+//#endregion
+export { apply, inject, name };