@morlay/dsh-subagent 0.0.9 → 0.0.11-alpha.0

package/dist/index.mjs

@@ -14,7 +14,7 @@ import { SessionLogOffset, SessionSeq } from "@deepseek-ai/dsh-session";
 import { assertNever, snapshotJsonValue } from "@deepseek-ai/dsh-util-values";
 import { appendChunkedList, chunkedListSchema, iterateChunkedList } from "@deepseek-ai/dsh-chunked-list";
 import { accessSync, constants, statSync } from "node:fs";
-//#region src/vendor/dsh-subagent/error.ts
+// src/vendor/dsh-subagent/error.ts
 /**
 * Typed failures shared by subagent service and provider operations.
 *
@@ -27,8 +27,7 @@ var SubagentError = class extends HarnessError {
 		this.name = "SubagentError";
 	}
 };
-//#endregion
-//#region src/vendor/dsh-subagent/control.ts
+// src/vendor/dsh-subagent/control.ts
 /**
 * Browser-facing subagent prompt and interrupt request validation plus the
 * stable prompt failure codes returned by the Remote surface.
@@ -88,8 +87,7 @@ function rejectPrompt(error, childSessionId, signal) {
 function isCancellation(error, signal) {
 	return signal.aborted || error instanceof SubagentError && error.code === "CANCELLED";
 }
-//#endregion
-//#region src/vendor/dsh-subagent/depth.ts
+// src/vendor/dsh-subagent/depth.ts
 /**
 * Read an agent's delegation depth, treating absence as top-level depth zero.
 * The persisted session header is authoritative and monotone: runtime
@@ -112,8 +110,7 @@ function delegationDepthOf(agent) {
 function assertSubagentMaxDepth(maxDepth) {
 	if (maxDepth !== void 0 && (typeof maxDepth !== "number" || !Number.isSafeInteger(maxDepth) || maxDepth < 0 || Object.is(maxDepth, -0))) throw new TypeError("subagent maxDepth must be a non-negative safe integer");
 }
-//#endregion
-//#region src/vendor/dsh-subagent/types.ts
+// src/vendor/dsh-subagent/types.ts
 /**
 * Brand a string as a {@link SubagentRunId}.
 * @param id - the raw run id.
@@ -122,8 +119,7 @@ function assertSubagentMaxDepth(maxDepth) {
 function SubagentRunId(id) {
 	return id;
 }
-//#endregion
-//#region src/vendor/dsh-subagent/lifecycle.ts
+// src/vendor/dsh-subagent/lifecycle.ts
 /**
 * Lifecycle-edge publication for managed subagent activations.
 *
@@ -228,8 +224,7 @@ function renderThrown(value) {
 		return "<unrenderable thrown value>";
 	}
 }
-//#endregion
-//#region src/vendor/dsh-subagent/child-agent.ts
+// src/vendor/dsh-subagent/child-agent.ts
 /** Thrown when starting a child would exceed the requested depth cap. */
 var SubagentDepthError = class extends Error {
 	attemptedDepth;
@@ -390,11 +385,11 @@ function captureDelegatedPolicyOverrides(parent) {
 }
 /**
 * Append the captured delegation policy onto the child's own log as
-* `source: 'delegation'` events inside the unpublished creation window, so the
+* `source: 'delegation'` events after Session announcement and before Agent registration, so the
 * child's effective policy is reconstructable from its log alone. Appends land
 * after any fork seed, so fresh policy wins stale seed state; later child
 * switches still win over these events.
-* @param childSession - the unpublished child's session.
+* @param childSession - the child's announced, writable Session.
 * @param overrides - the policy captured at delegation.
 */
 function appendDelegatedPolicyOverrides(childSession, overrides) {
@@ -408,8 +403,7 @@ function appendDelegatedPolicyOverrides(childSession, overrides) {
 	});
 	if (overrides.permissionPreset !== void 0) childSession.append("permission/preset", { preset: overrides.permissionPreset });
 }
-//#endregion
-//#region src/continuation-messages.ts
+// src/continuation-messages.ts
 /** Build durable attribution for one adjacent-Agent message. */
 function agentMessageSource(sender) {
 	return {
@@ -489,9 +483,11 @@ function settlementSummary(childId, stopReason, continuable) {
 * @param childId - durable child session id named in the notice.
 * @param terminal - recorded terminal state for the settled Activation.
 * @param continuable - whether the child can accept another task.
+* @param omitClosingText - replace the closing text with a note that the child
+* already reported to its parent; the parent should not read the result twice.
 * @returns the durable user-message representation delivered to the parent.
 */
-function createSettlementMessage(childId, terminal, continuable = true) {
+function createSettlementMessage(childId, terminal, continuable = true, omitClosingText = false) {
 	const summary = settlementSummary(childId, terminal.stopReason, continuable);
 	const closingText = terminal.output.flatMap((block) => block.type === "text" && block.text.length > 0 ? [block] : []);
 	return createUserMessage({
@@ -500,7 +496,10 @@ function createSettlementMessage(childId, terminal, continuable = true) {
 				type: "text",
 				text: summary
 			},
-			...closingText.length === 0 ? [{
+			...omitClosingText ? [{
+				type: "text",
+				text: "It sent you a message just before finishing, so its closing message is omitted."
+			}] : closingText.length === 0 ? [{
 				type: "text",
 				text: "It left no closing message."
 			}] : [{
@@ -524,8 +523,7 @@ function createSettlementMessage(childId, terminal, continuable = true) {
 		}
 	});
 }
-//#endregion
-//#region src/vendor/dsh-subagent/continuation-messages.ts
+// src/vendor/dsh-subagent/continuation-messages.ts
 /**
 * Append adjacent-Agent return guidance to a continuable child's initial task.
 * @param parentId - durable parent session id named in the guidance.
@@ -539,8 +537,7 @@ function withContinuableReturnGuidance(parentId, prompt) {
 		text: `Your parent agent id is ${encodedParentId}. Before you finish, send your result to that agent with send_message({ agent_id: ${encodedParentId}, message: "<self-contained result>" }). The parent shares your workspace but does not automatically receive your transcript, tool output, or reasoning. Send earlier messages as well when a finding changes what the parent should do next; sending a message does not end your turn.`
 	}];
 }
-//#endregion
-//#region src/vendor/dsh-subagent/descriptor.ts
+// src/vendor/dsh-subagent/descriptor.ts
 /**
 * The durable subagent-child descriptor: the versioned, model-hidden
 * `subagent/descriptor` session event that identifies every session-backed
@@ -835,8 +832,7 @@ function establishExternalCatalogChild(parent, childId, label) {
 		label
 	});
 }
-//#endregion
-//#region src/vendor/dsh-subagent/internal.ts
+// src/vendor/dsh-subagent/internal.ts
 /** Process-stable identity carried only by the standard adjacent-Agent messaging tool. */
 const adjacentAgentSendMessageTool = Symbol.for("dsh.subagent.adjacentAgentSendMessageTool");
 /**
@@ -853,8 +849,7 @@ function isAdjacentAgentSendMessageTool(definition) {
 * @internal
 */
 const deliverSubagentPrompt = Symbol.for("dsh.subagent.deliverPrompt");
-//#endregion
-//#region src/vendor/dsh-subagent/structured.ts
+// src/vendor/dsh-subagent/structured.ts
 /** The model-facing tool name a structured child must call to finish. */
 const STRUCTURED_OUTPUT_TOOL = "structured_output";
 /**
@@ -950,8 +945,7 @@ function attachStructuredRuntime(childCtx, schema, canComplete) {
 		acceptsInput: () => staged.size === 0 && pending === void 0 && captured === void 0
 	};
 }
-//#endregion
-//#region src/vendor/dsh-subagent/assistant-output.ts
+// src/vendor/dsh-subagent/assistant-output.ts
 /**
 * Canonical selection of a child's final assistant output. Backend run results
 * and `subagent/end.lastAssistantMessage` apply the same rule: select the last
@@ -1016,8 +1010,7 @@ function finalAssistantOutput(events) {
 	for (const event of events) fold.push(event);
 	return fold.collect();
 }
-//#endregion
-//#region src/vendor/dsh-subagent/activation.ts
+// src/vendor/dsh-subagent/activation.ts
 /** Process-local slots shared through uninterrupted continuable parent links. */
 var ActivationPool = class {
 	slots = /* @__PURE__ */ new Set();
@@ -1119,8 +1112,7 @@ var ChildLock = class {
 		return result;
 	}
 };
-//#endregion
-//#region src/manager.ts
+// src/manager.ts
 /**
 * Owns subagent startup, message admission, cold resume, and execution lifetimes.
 * One child lock orders input acceptance and closure; one activation map owns
@@ -1770,7 +1762,8 @@ var SubagentManager = class {
 				outputStart: handle.agent.session.seq,
 				structured,
 				failureAt: void 0,
-				poke: Promise.withResolvers()
+				poke: Promise.withResolvers(),
+				omitClosingText: false
 			};
 		}
 		const observer = this.host.observeActivation(provider, childId, parent);
@@ -1801,8 +1794,14 @@ var SubagentManager = class {
 			if (activation.kind === "local") {
 				observeLocalFailure(activation, wakeSettlement);
 				activation.handle.agent.ctx.on("agent/inbox/inserted", wakeSettlement);
-				activation.handle.agent.ctx.on("agent/inbox/claimed", wakeSettlement);
+				activation.handle.agent.ctx.on("agent/inbox/claimed", () => {
+					activation.omitClosingText = false;
+					wakeSettlement();
+				});
 				activation.handle.agent.ctx.on("agent/inbox/discarded", wakeSettlement);
+				activation.handle.agent.ctx.on("session/event", (_session, event) => {
+					if (event.type === "tool/call") activation.omitClosingText = false;
+				});
 			}
 			observer.start(activationAgent(activation));
 		} catch (error) {
@@ -1992,7 +1991,7 @@ var SubagentManager = class {
 		try {
 			const parent = this.ctx.agents.get(activation.parent.id);
 			if (parent !== activation.parent) return;
-			const message = createSettlementMessage(activation.childId, terminal, activationAgent(activation) !== void 0);
+			const message = createSettlementMessage(activation.childId, terminal, activationAgent(activation) !== void 0, activation.kind === "local" && activation.omitClosingText);
 			if (this.closingTeardownFor(parent) !== void 0) {
 				parent.inject(message);
 				return;
@@ -2066,6 +2065,7 @@ var SubagentManager = class {
 		if (parent !== activation.parent) throw new SubagentError("direct parent is not live; the message was not delivered", "PARENT_UNAVAILABLE");
 		const message = createAgentMessage(sender, content);
 		this.sendAgentMessage(parent, message);
+		activation.omitClosingText = true;
 		return message.id;
 	}
 	/** Send one Agent message while translating only the target's own rejection. */
@@ -2207,8 +2207,7 @@ function installDelegationContext(ctx) {
 		};
 	});
 }
-//#endregion
-//#region src/vendor/dsh-subagent/list-children.ts
+// src/vendor/dsh-subagent/list-children.ts
 /**
 * Read one parent's durable catalog through a live-preferred Session observation.
 * @param ctx - context carrying the Session query service.
@@ -2304,8 +2303,7 @@ async function listDescendants(ctx, rootSessionId, signal) {
 function assertListingNotCancelled(signal) {
 	if (signal?.aborted) throw new SubagentError("subagent listing was cancelled", "CANCELLED");
 }
-//#endregion
-//#region src/vendor/dsh-subagent/archive-admission.ts
+// src/vendor/dsh-subagent/archive-admission.ts
 /**
 * Answer `workspace/session-activity` with the running subagent descendants of
 * the asked Session, and `workspace/session-stop` by cancelling each of them
@@ -2380,8 +2378,7 @@ async function describe(ctx, child) {
 		return { id: child.id };
 	}
 }
-//#endregion
-//#region src/vendor/dsh-subagent/projection.ts
+// src/vendor/dsh-subagent/projection.ts
 /**
 * Pure session projections for subagent identity (mode/label) and active-turn
 * duration.
@@ -2536,8 +2533,7 @@ const subagentIdentityProjectionDefinition = {
 	},
 	stateVersion: 2
 };
-//#endregion
-//#region src/vendor/dsh-subagent/out-of-process.ts
+// src/vendor/dsh-subagent/out-of-process.ts
 /**
 * Provider-side vocabulary for OUT-OF-PROCESS subagent backends — the pieces
 * that enforce this seam's own contracts around a child in another process:
@@ -2688,8 +2684,7 @@ function subprocessRunHandle(parts) {
 		}
 	};
 }
-//#endregion
-//#region src/index.ts
+// src/index.ts
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -2805,10 +2800,10 @@ var SubagentRuntime = class extends (_b = TypertRemoteService) {
 				if (this.manager === manager) this.manager = void 0;
 			}, "subagents.managerBinding()");
 		});
-		ctx.inject(["sessionProjections"], (projectionCtx) => {
-			projectionCtx.sessionProjections.register(subagentCatalogProjectionDefinition);
-			projectionCtx.sessionProjections.register(subagentTimingProjectionDefinition);
-			projectionCtx.sessionProjections.register(subagentIdentityProjectionDefinition);
+		ctx.inject(["sessionProjections"], async (projectionCtx) => {
+			await projectionCtx.sessionProjections.register(subagentCatalogProjectionDefinition);
+			await projectionCtx.sessionProjections.register(subagentTimingProjectionDefinition);
+			await projectionCtx.sessionProjections.register(subagentIdentityProjectionDefinition);
 		});
 		ctx.inject(["agents"], (agentsCtx) => {
 			installSubagentArchiveAdmission(agentsCtx);
@@ -3105,5 +3100,4 @@ __publicField(SubagentRuntime, "Config", z.object({
 	localizedReturnGuidancePresets: z.array(z.string()).default([]).hidden()
 }));
 __publicField(SubagentRuntime, "inject", ["workingDirectory"]);
-//#endregion
 export { AssistantOutputFold, NO_START_CAPABILITIES, STRUCTURED_OUTPUT_TOOL, SUBAGENT_DESCRIPTOR_VERSION, SubagentDepthError, SubagentError, SubagentRunId, SubagentRuntime, SubagentRuntime as default, appendDelegatedPolicyOverrides, applyChildComposition, assertPositiveFinite, assertSubagentMaxDepth, assertUsableCwd, captureDelegatedPolicyOverrides, childSessionMeta, delegationDepthOf, finalAssistantOutput, foldSubagentDescriptor, parentAgentOptionsForDelegation, resolveChildAgentOptions, resolveChildDepth, settleRunResult, snapshotSubagentDescriptor, subprocessRunHandle };

package/dist/rows.d.mts

@@ -1,4 +1,3 @@
-//#region src/rows.d.ts
 export interface PatchRow {
   readonly id?: string;
   readonly disabled?: boolean;
@@ -12,5 +11,4 @@ export interface RowEntry {
 export interface SubagentRowsOptions {
   readonly localizedReturnGuidancePresets?: readonly string[];
 }
-export declare function subagentRows(options?: SubagentRowsOptions): readonly PatchRow[];
-//#endregion
+export declare function subagentRows(options?: SubagentRowsOptions): readonly PatchRow[];

package/dist/rows.mjs

@@ -1,4 +1,4 @@
-//#region src/rows.ts
+// src/rows.ts
 function subagentRows(options = {}) {
 	const presets = options.localizedReturnGuidancePresets;
 	return [{ insert: [{
@@ -7,5 +7,4 @@ function subagentRows(options = {}) {
 		...presets === void 0 ? {} : { config: { localizedReturnGuidancePresets: [...presets] } }
 	}] }];
 }
-//#endregion
 export { subagentRows };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/dsh-subagent",
-  "version": "0.0.9",
+  "version": "0.0.11-alpha.0",
   "description": "Thin-shell fork of @deepseek-ai/dsh-subagent: takes over the official `subagent` row for two wording changes — the continuable child's return guidance in Chinese wording and the child's Chinese delegation-scope runtime context (`subagent:delegation`) — plus the row-id reuse (same `subagent` id, so the official settings card stays); everything not intentionally changed is imported from the vendored upstream source.",
   "keywords": [
     "dsh",
@@ -34,37 +34,37 @@
     "./locale/*.json": "./locale/*.json"
   },
   "dependencies": {
-    "@deepseek-ai/dsh-brand": "^0.2.1-rc.1",
-    "@deepseek-ai/schemastery": "~3.18.5"
+    "@deepseek-ai/dsh-brand": "^0.2.2-alpha.2",
+    "@deepseek-ai/schemastery": "~3.18.6-alpha.1"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-agent-loop": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-agent-loop-testkit": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-chunked-list": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-session-persistence-jsonl": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-subagent-fork-in-process": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-subagent-spawn-in-process": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-tool-subagent-control": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-util-values": "^0.2.1-rc.1",
-    "@deepseek-ai/schemastery": "~3.18.5",
+    "@deepseek-ai/dsh-agent-loop": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-agent-loop-testkit": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-chunked-list": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-session-persistence-jsonl": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-subagent-fork-in-process": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-subagent-spawn-in-process": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-tool-subagent-control": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-util-values": "^0.2.2-alpha.2",
+    "@deepseek-ai/schemastery": "~3.18.6-alpha.1",
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "~4.0.5",
-    "@deepseek-ai/dsh-agent": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-agent-preset-registry": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-attachment": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-scope": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-session": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-session-persistence": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-session-query": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-subagent": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-system-prompt": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-tools": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-typert-protocol": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-util-time": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-working-directory": "^0.2.1-rc.1"
+    "@deepseek-ai/cordis": "~4.0.6-alpha.1",
+    "@deepseek-ai/dsh-agent": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-agent-preset-registry": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-attachment": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-scope": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-session-persistence": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-session-query": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-subagent": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-tools": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-typert-protocol": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-util-time": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-working-directory": "^0.2.2-alpha.2"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh-session-persistence": {
@@ -75,7 +75,7 @@
     }
   },
   "engines": {
-    "dsh": ">= 0.2.1-rc.1 < 0.2.2"
+    "dsh": ">= 0.2.2-alpha.2 < 0.2.3"
   },
   "scripts": {
     "build": "pnpm exec tsdown"

package/src/continuation-messages.ts

@@ -4,19 +4,19 @@
  * @module @deepseek-ai/dsh-subagent/continuation-messages
  */
 
-import type { Agent } from '@deepseek-ai/dsh-agent'
-import { boundContextSummary, createUserMessage } from '@deepseek-ai/dsh-llm'
-import type { ContentBlock } from '@deepseek-ai/dsh-llm'
-import type { SessionId } from '@deepseek-ai/dsh-session'
-import type { SubagentResult } from './vendor/dsh-subagent/types.ts'
+import type { Agent } from "@deepseek-ai/dsh-agent";
+import { boundContextSummary, createUserMessage } from "@deepseek-ai/dsh-llm";
+import type { ContentBlock } from "@deepseek-ai/dsh-llm";
+import type { SessionId } from "@deepseek-ai/dsh-session";
+import type { SubagentResult } from "./vendor/dsh-subagent/types.ts";
 
 /** Durable attribution for one model-authored message between Agents. */
 export interface AgentMessageSource {
-  readonly kind: 'agent-message'
+  readonly kind: "agent-message";
   /** A message another agent addressed to this one (`relay` context form). */
-  readonly form: 'relay'
+  readonly form: "relay";
   /** Session id of the Agent whose tool call produced the message. */
-  readonly senderSessionId: SessionId
+  readonly senderSessionId: SessionId;
 }
 
 /**
@@ -27,29 +27,29 @@ export interface AgentMessageSource {
  * transcript that merged them would credit the child with words it never wrote.
  */
 export interface SubagentSettledMessageSource {
-  readonly kind: 'subagent-settled'
+  readonly kind: "subagent-settled";
   /** A runtime account shown without expanding the row (`notice` context form). */
-  readonly form: 'notice'
+  readonly form: "notice";
   /** One-line account of how the child ended. */
-  readonly summary: string
+  readonly summary: string;
   /** Session id of the child that settled. */
-  readonly senderSessionId: SessionId
+  readonly senderSessionId: SessionId;
 }
 
-declare module '@deepseek-ai/dsh-llm' {
+declare module "@deepseek-ai/dsh-llm" {
   interface MessageSourceMap {
-    'agent-message': AgentMessageSource
-    'subagent-settled': SubagentSettledMessageSource
+    "agent-message": AgentMessageSource;
+    "subagent-settled": SubagentSettledMessageSource;
   }
 }
 
 /** Build durable attribution for one adjacent-Agent message. */
 function agentMessageSource(sender: Agent): AgentMessageSource {
   return {
-    kind: 'agent-message',
-    form: 'relay',
+    kind: "agent-message",
+    form: "relay",
     senderSessionId: sender.id,
-  }
+  };
 }
 
 /**
@@ -63,12 +63,9 @@ export function createAgentMessage(
   content: ContentBlock[],
 ): ReturnType<typeof createUserMessage> {
   return createUserMessage({
-    content: [
-      { type: 'text' as const, text: `Agent ${sender.id} sent a message: ` },
-      ...content,
-    ],
+    content: [{ type: "text" as const, text: `Agent ${sender.id} sent a message: ` }, ...content],
     source: agentMessageSource(sender),
-  })
+  });
 }
 
 /**
@@ -87,8 +84,8 @@ export function localizedReturnGuidance(
   composedPreset: string | undefined,
   configured: readonly string[],
 ): boolean {
-  if (configured.length === 0) return true
-  return composedPreset !== undefined && configured.includes(composedPreset)
+  if (configured.length === 0) return true;
+  return composedPreset !== undefined && configured.includes(composedPreset);
 }
 /**
  * Append adjacent-Agent return guidance to a continuable child's initial task.
@@ -100,16 +97,17 @@ export function withContinuableReturnGuidance(
   parentId: SessionId,
   prompt: ContentBlock[],
 ): ContentBlock[] {
-  const encodedParentId = JSON.stringify(parentId)
+  const encodedParentId = JSON.stringify(parentId);
   return [
     ...prompt,
     {
-      type: 'text',
-      text: `你的父智能体 id 是 ${encodedParentId}。完成前用 send_message({ agent_id: ${encodedParentId}, `
-        + 'message: "<自包含的结论>" }) 把结果发给它。父智能体与你共享工作区，但不会自动收到你的对话、'
-        + '工具输出与推理过程。发现会改变父智能体下一步行动的事情时也尽早再发一条；发消息不会结束你的回合。',
+      type: "text",
+      text:
+        `你的父智能体 id 是 ${encodedParentId}。完成前用 send_message({ agent_id: ${encodedParentId}, ` +
+        'message: "<自包含的结论>" }) 把结果发给它。父智能体与你共享工作区，但不会自动收到你的对话、' +
+        "工具输出与推理过程。发现会改变父智能体下一步行动的事情时也尽早再发一条；发消息不会结束你的回合。",
     },
-  ]
+  ];
 }
 
 /**
@@ -120,28 +118,32 @@ export function withContinuableReturnGuidance(
  * @param continuable - whether the child accepts a later message.
  * @returns the model-facing opening line of the settlement notice.
  */
-function settlementSummary(childId: SessionId, stopReason: SubagentResult['stopReason'], continuable: boolean): string {
-  const subject = `Background subagent ${childId}`
+function settlementSummary(
+  childId: SessionId,
+  stopReason: SubagentResult["stopReason"],
+  continuable: boolean,
+): string {
+  const subject = `Background subagent ${childId}`;
   switch (stopReason) {
-    case 'completed':
+    case "completed":
       return continuable
         ? `${subject} finished and will do no further work unless you send it more.`
-        : `${subject} finished. It cannot receive follow-up messages.`
-    case 'aborted':
-      return `${subject} was stopped before it finished.`
-    case 'max-tokens':
-      return `${subject} ran out of room before it finished.`
+        : `${subject} finished. It cannot receive follow-up messages.`;
+    case "aborted":
+      return `${subject} was stopped before it finished.`;
+    case "max-tokens":
+      return `${subject} ran out of room before it finished.`;
     // A pre-step rejection — a hook deny, a policy plugin — discarded input
     // the child had claimed, so the parent must not treat the task as done.
-    case 'refusal':
-      return `${subject} declined the task.`
-    case 'error':
-      return `${subject} failed before it finished.`
+    case "refusal":
+      return `${subject} declined the task.`;
+    case "error":
+      return `${subject} failed before it finished.`;
     /* v8 ignore next 4 -- `SubagentResult['stopReason']` is merge-extensible, so this arm
      * needs a backend that adds a variant; an unnameable ending is reported as unfinished
      * rather than silently as success. */
     default:
-      return `${subject} ended abnormally (${String(stopReason)}) before it finished.`
+      return `${subject} ended abnormally (${String(stopReason)}) before it finished.`;
   }
 }
 
@@ -150,36 +152,48 @@ function settlementSummary(childId: SessionId, stopReason: SubagentResult['stopR
  * @param childId - durable child session id named in the notice.
  * @param terminal - recorded terminal state for the settled Activation.
  * @param continuable - whether the child can accept another task.
+ * @param omitClosingText - replace the closing text with a note that the child
+ * already reported to its parent; the parent should not read the result twice.
  * @returns the durable user-message representation delivered to the parent.
  */
 export function createSettlementMessage(
   childId: SessionId,
   terminal: SubagentResult,
   continuable = true,
+  omitClosingText = false,
 ): ReturnType<typeof createUserMessage> {
-  const summary = settlementSummary(childId, terminal.stopReason, continuable)
+  const summary = settlementSummary(childId, terminal.stopReason, continuable);
   // Parent providers receive this notice as a user message and may reject
   // nontext assistant blocks. Keep this conversion local so SDK/UI consumers
   // retain the complete child output.
-  const closingText = terminal.output.flatMap(block =>
-    block.type === 'text' && block.text.length > 0 ? [block] : [],
-  )
+  const closingText = terminal.output.flatMap((block) =>
+    block.type === "text" && block.text.length > 0 ? [block] : [],
+  );
   return createUserMessage({
     content: [
-      { type: 'text' as const, text: summary },
-      ...closingText.length === 0
-        ? [{ type: 'text' as const, text: 'It left no closing message.' }]
-        : [{ type: 'text' as const, text: 'Its closing message:' }, ...closingText],
-      ...terminal.structured !== undefined
-        ? [{ type: 'text' as const, text: `Structured result: ${JSON.stringify(terminal.structured)}` }] : [],
-      ...terminal.diagnostic !== undefined
-        ? [{ type: 'text' as const, text: terminal.diagnostic }] : [],
+      { type: "text" as const, text: summary },
+      ...(omitClosingText
+        ? [{ type: "text" as const, text: "It sent you a message just before finishing, so its closing message is omitted." }]
+        : closingText.length === 0
+          ? [{ type: "text" as const, text: "It left no closing message." }]
+          : [{ type: "text" as const, text: "Its closing message:" }, ...closingText]),
+      ...(terminal.structured !== undefined
+        ? [
+            {
+              type: "text" as const,
+              text: `Structured result: ${JSON.stringify(terminal.structured)}`,
+            },
+          ]
+        : []),
+      ...(terminal.diagnostic !== undefined
+        ? [{ type: "text" as const, text: terminal.diagnostic }]
+        : []),
     ],
     source: {
-      kind: 'subagent-settled' as const,
-      form: 'notice' as const,
+      kind: "subagent-settled" as const,
+      form: "notice" as const,
       summary: boundContextSummary(summary),
       senderSessionId: childId,
     },
-  })
+  });
 }