@minpeter/pss-runtime 0.1.0-next.1 → 0.1.0-next.2

package/dist/subagent-jobs.js

@@ -1,151 +1,96 @@
-import { collectSubagentRunWithEvents } from "./subagent-run.js";
+import { createBackgroundTaskId, createDurableBackgroundTaskId, getBackgroundChildRun, getOrCreateBackgroundChildRun } from "./subagent-background-child-run.js";
+import { backgroundCancelledLaunchOutput, backgroundLaunchOutput, backgroundReplayOutput, backgroundRunJobStatus, hasBackgroundJobCapacity } from "./subagent-job-state.js";
+import { startInProcessBackgroundJob } from "./subagent-background-in-process.js";
+import { scheduleDurableBackgroundJob } from "./subagent-background-schedule.js";
 //#region src/subagent-jobs.ts
 const maxBackgroundJobs = 64;
 const maxRetainedBackgroundJobs = maxBackgroundJobs * 4;
-function startBackgroundJob({ abortSignal, description, jobs, parentSession, prompt, registerCleanup, sessionKey, subagent }) {
-	const id = `bg_${crypto.randomUUID().replaceAll("-", "")}`;
-	const childSessionKey = `${sessionKey}:task:${id}`;
-	if (!hasJobCapacity(jobs)) return {
+async function startBackgroundJob({ abortSignal, description, executionHost, jobs, groupId, groups = /* @__PURE__ */ new Map(), delegateToolCallId, parentSession, parentRunId, parentSessionKey, ownerNamespace, prompt, registerCleanup, sessionKey, subagent }) {
+	const existingChildRun = await getBackgroundChildRun({
+		delegateToolCallId,
+		executionHost,
+		parentRunId,
+		parentSessionKey,
+		prompt,
+		sessionKey
+	});
+	const id = existingChildRun?.publicTaskId ?? (executionHost ? await createDurableBackgroundTaskId({
+		delegateToolCallId,
+		prompt,
+		sessionKey
+	}) : createBackgroundTaskId());
+	const existingJob = jobs.get(id);
+	if (existingJob) return backgroundLaunchOutput(existingJob);
+	const replayedStatus = backgroundRunJobStatus(existingChildRun?.status);
+	if (existingChildRun?.publicTaskId && replayedStatus) return backgroundReplayOutput({
+		id: existingChildRun.publicTaskId,
+		status: replayedStatus,
+		subagent: subagent.name ?? "subagent"
+	});
+	if (!hasBackgroundJobCapacity({
+		jobs,
+		maxActiveJobs: maxBackgroundJobs,
+		maxRetainedJobs: maxRetainedBackgroundJobs
+	})) return {
 		message: "Background subagent job was not started because the background job limit is full.",
 		run_in_background: true,
 		status: "cancelled",
 		subagent: subagent.name,
 		task_id: id
 	};
-	if (abortSignal.aborted) return {
-		message: `Background subagent job ${id} was cancelled before it started.`,
-		run_in_background: true,
-		status: "cancelled",
-		subagent: subagent.name,
-		task_id: id
-	};
-	const childSession = subagent.session(childSessionKey);
-	const abort = () => childSession.interrupt();
-	abortSignal.addEventListener("abort", abort, { once: true });
-	const cleanup = () => childSession.delete();
-	const unregisterCleanup = registerCleanup(cleanup);
-	const job = {
-		abort,
-		cleanup,
+	if (abortSignal.aborted) return backgroundCancelledLaunchOutput({
+		id,
+		subagent: subagent.name
+	});
+	const childRun = executionHost ? existingChildRun ?? await getOrCreateBackgroundChildRun({
+		delegateToolCallId,
+		description,
+		executionHost,
+		groupId,
+		ownerNamespace,
+		parentRunId,
+		parentSessionKey,
+		prompt,
+		publicTaskId: id,
+		sessionKey,
+		subagent: subagent.name ?? "subagent"
+	}) : void 0;
+	if (executionHost?.capabilities.backgroundSubagents === "durable" && childRun) return backgroundLaunchOutput(await scheduleDurableBackgroundJob({
+		childRun,
+		delegateToolCallId,
 		description,
+		executionHost,
+		groupId,
+		groups,
 		id,
-		promise: Promise.resolve(),
-		sessionKey: childSessionKey,
-		settled: false,
-		status: "pending",
-		subagent: subagent.name ?? "subagent",
-		unregisterCleanup
-	};
-	job.promise = runBackgroundJob({
-		childSession,
-		job,
+		jobs,
+		parentRunId,
 		parentSession,
-		prompt
-	}).finally(() => {
-		abortSignal.removeEventListener("abort", abort);
-		job.settled = true;
-	});
-	jobs.set(id, job);
-	parentSession.emitObserverEvent({
+		parentSessionKey,
+		ownerNamespace,
+		subagent: subagent.name ?? "subagent"
+	}));
+	return await startInProcessBackgroundJob({
+		abortSignal,
+		childRun,
+		delegateToolCallId,
 		description,
-		run_in_background: true,
-		subagent: subagent.name ?? "subagent",
-		task_id: id,
-		type: "subagent-job-start"
-	});
-	return {
-		message: `Background subagent job ${id} started. Use background_output({ task_id: "${id}" }) to retrieve the result.`,
-		run_in_background: true,
-		status: job.status,
-		subagent: subagent.name,
-		task_id: id
-	};
-}
-async function runBackgroundJob({ childSession, job, parentSession, prompt }) {
-	if (job.status === "cancelled") return;
-	job.status = "running";
-	try {
-		const { result } = await collectSubagentRunWithEvents(await childSession.send(prompt), job.subagent, (event) => emitJobUpdate(parentSession, job, event));
-		if (isCancelledJob(job)) return;
-		job.result = result;
-		job.status = result.result;
-	} catch (error) {
-		if (isCancelledJob(job)) return;
-		const jobError = error instanceof Error ? error : new Error(String(error));
-		job.status = "error";
-		job.result = {
-			error: errorMessage(jobError),
-			eventCount: 0,
-			result: "error",
-			run_in_background: false,
-			subagent: job.subagent,
-			text: ""
-		};
-	}
-	if (isCancelledJob(job)) return;
-	parentSession.enqueueRuntimeInput({
-		text: [
-			"<system-reminder>",
-			"[SUBAGENT JOB RESULT READY]",
-			`Task ID: ${job.id}`,
-			`Subagent: ${job.subagent}`,
-			`Description: ${sanitizeReminderField(job.description ?? "")}`,
-			`Use background_output({ task_id: "${job.id}" }) to retrieve the result.`,
-			"</system-reminder>"
-		].join("\n"),
-		type: "user-text"
-	}, "turn-start");
-	parentSession.emitObserverEvent({
-		error: job.result?.error,
-		eventCount: job.result?.eventCount ?? 0,
-		status: job.result?.result ?? "error",
-		subagent: job.subagent,
-		task_id: job.id,
-		type: "subagent-job-end"
-	});
-}
-function emitJobUpdate(parentSession, job, event) {
-	parentSession.emitObserverEvent({
-		eventType: event.type,
-		status: job.status,
-		subagent: job.subagent,
-		task_id: job.id,
-		type: "subagent-job-update"
-	});
-}
-function assertBackgroundTaskId(value, toolName) {
-	if (value.startsWith("bg_")) return;
-	throw new Error(`${toolName} expects a background task_id starting with bg_, not a session key: ${value}`);
-}
-function errorMessage(error) {
-	if (error instanceof Error) return error.message;
-	return String(error);
-}
-function isActiveJob(status) {
-	return status === "pending" || status === "running";
-}
-function isCancelledJob(job) {
-	return job.status === "cancelled";
-}
-function hasJobCapacity(jobs) {
-	if (jobs.size >= maxRetainedBackgroundJobs) return false;
-	let activeJobs = 0;
-	for (const job of jobs.values()) if (isActiveJob(job.status) || !job.settled) activeJobs += 1;
-	return activeJobs < maxBackgroundJobs;
-}
-function cancelJob(job) {
-	job.status = "cancelled";
-	job.abort();
-}
-function cleanupJob(job) {
-	return job.cleanup().then(() => {
-		job.unregisterCleanup?.();
+		executionHost,
+		groupId,
+		groups,
+		id,
+		jobs,
+		parentRunId,
+		parentSession,
+		parentSessionKey,
+		ownerNamespace,
+		prompt,
+		registerCleanup,
+		sessionKey,
+		subagent
 	});
 }
-function sanitizeReminderField(value) {
-	return value.replaceAll("\r", " ").replaceAll("\n", " ").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
-}
 //#endregion
-export { assertBackgroundTaskId, cancelJob, cleanupJob, isActiveJob, startBackgroundJob };
+export { startBackgroundJob };
 
 //# sourceMappingURL=subagent-jobs.js.map

package/dist/subagent-jobs.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-jobs.js","names":[],"sources":["../src/subagent-jobs.ts"],"sourcesContent":["import type { AgentEvent } from \"./session/events\";\nimport type { AgentInput } from \"./session/input\";\nimport { collectSubagentRunWithEvents } from \"./subagent-run\";\nimport type { RuntimeInputSink, Subagent, SubagentJob } from \"./subagent-types\";\n\nconst maxBackgroundJobs = 64;\nconst maxRetainedBackgroundJobs = maxBackgroundJobs * 4;\n\nexport function startBackgroundJob({\n  abortSignal,\n  description,\n  jobs,\n  parentSession,\n  prompt,\n  registerCleanup,\n  sessionKey,\n  subagent,\n}: {\n  readonly abortSignal: AbortSignal;\n  readonly description?: string;\n  readonly jobs: Map<string, SubagentJob>;\n  readonly parentSession: RuntimeInputSink;\n  readonly prompt: AgentInput;\n  readonly registerCleanup: (cleanup: () => Promise<void>) => () => void;\n  readonly sessionKey: string;\n  readonly subagent: Subagent;\n}) {\n  const id = `bg_${crypto.randomUUID().replaceAll(\"-\", \"\")}`;\n  const childSessionKey = `${sessionKey}:task:${id}`;\n  if (!hasJobCapacity(jobs)) {\n    return {\n      message:\n        \"Background subagent job was not started because the background job limit is full.\",\n      run_in_background: true,\n      status: \"cancelled\",\n      subagent: subagent.name,\n      task_id: id,\n    };\n  }\n\n  if (abortSignal.aborted) {\n    return {\n      message: `Background subagent job ${id} was cancelled before it started.`,\n      run_in_background: true,\n      status: \"cancelled\",\n      subagent: subagent.name,\n      task_id: id,\n    };\n  }\n\n  const childSession = subagent.session(childSessionKey);\n  const abort = () => childSession.interrupt();\n  abortSignal.addEventListener(\"abort\", abort, { once: true });\n  const cleanup = () => childSession.delete();\n  const unregisterCleanup = registerCleanup(cleanup);\n\n  const job: SubagentJob = {\n    abort,\n    cleanup,\n    description,\n    id,\n    promise: Promise.resolve(),\n    sessionKey: childSessionKey,\n    settled: false,\n    status: \"pending\",\n    subagent: subagent.name ?? \"subagent\",\n    unregisterCleanup,\n  };\n  job.promise = runBackgroundJob({\n    childSession,\n    job,\n    parentSession,\n    prompt,\n  }).finally(() => {\n    abortSignal.removeEventListener(\"abort\", abort);\n    job.settled = true;\n  });\n  jobs.set(id, job);\n  parentSession.emitObserverEvent({\n    description,\n    run_in_background: true,\n    subagent: subagent.name ?? \"subagent\",\n    task_id: id,\n    type: \"subagent-job-start\",\n  });\n\n  return {\n    message: `Background subagent job ${id} started. Use background_output({ task_id: \"${id}\" }) to retrieve the result.`,\n    run_in_background: true,\n    status: job.status,\n    subagent: subagent.name,\n    task_id: id,\n  };\n}\n\nasync function runBackgroundJob({\n  childSession,\n  job,\n  parentSession,\n  prompt,\n}: {\n  readonly childSession: ReturnType<Subagent[\"session\"]>;\n  readonly job: SubagentJob;\n  readonly parentSession: RuntimeInputSink;\n  readonly prompt: AgentInput;\n}): Promise<void> {\n  if (job.status === \"cancelled\") {\n    return;\n  }\n\n  job.status = \"running\";\n  try {\n    const { result } = await collectSubagentRunWithEvents(\n      await childSession.send(prompt),\n      job.subagent,\n      (event) => emitJobUpdate(parentSession, job, event)\n    );\n    if (isCancelledJob(job)) {\n      return;\n    }\n    job.result = result;\n    job.status = result.result;\n  } catch (error) {\n    if (isCancelledJob(job)) {\n      return;\n    }\n    const jobError = error instanceof Error ? error : new Error(String(error));\n    job.status = \"error\";\n    job.result = {\n      error: errorMessage(jobError),\n      eventCount: 0,\n      result: \"error\",\n      run_in_background: false,\n      subagent: job.subagent,\n      text: \"\",\n    };\n  }\n\n  if (isCancelledJob(job)) {\n    return;\n  }\n\n  parentSession.enqueueRuntimeInput(\n    {\n      text: [\n        \"<system-reminder>\",\n        \"[SUBAGENT JOB RESULT READY]\",\n        `Task ID: ${job.id}`,\n        `Subagent: ${job.subagent}`,\n        `Description: ${sanitizeReminderField(job.description ?? \"\")}`,\n        `Use background_output({ task_id: \"${job.id}\" }) to retrieve the result.`,\n        \"</system-reminder>\",\n      ].join(\"\\n\"),\n      type: \"user-text\",\n    },\n    \"turn-start\"\n  );\n  parentSession.emitObserverEvent({\n    error: job.result?.error,\n    eventCount: job.result?.eventCount ?? 0,\n    status: job.result?.result ?? \"error\",\n    subagent: job.subagent,\n    task_id: job.id,\n    type: \"subagent-job-end\",\n  });\n}\n\nfunction emitJobUpdate(\n  parentSession: RuntimeInputSink,\n  job: SubagentJob,\n  event: AgentEvent\n): void {\n  parentSession.emitObserverEvent({\n    eventType: event.type,\n    status: job.status,\n    subagent: job.subagent,\n    task_id: job.id,\n    type: \"subagent-job-update\" as const,\n  });\n}\n\nexport function assertBackgroundTaskId(value: string, toolName: string): void {\n  if (value.startsWith(\"bg_\")) {\n    return;\n  }\n\n  throw new Error(\n    `${toolName} expects a background task_id starting with bg_, not a session key: ${value}`\n  );\n}\n\nfunction errorMessage(error: unknown): string {\n  if (error instanceof Error) {\n    return error.message;\n  }\n\n  return String(error);\n}\n\nexport function isActiveJob(status: SubagentJob[\"status\"]): boolean {\n  return status === \"pending\" || status === \"running\";\n}\n\nfunction isCancelledJob(job: SubagentJob): boolean {\n  return job.status === \"cancelled\";\n}\n\nfunction hasJobCapacity(jobs: Map<string, SubagentJob>): boolean {\n  if (jobs.size >= maxRetainedBackgroundJobs) {\n    return false;\n  }\n\n  let activeJobs = 0;\n  for (const job of jobs.values()) {\n    if (isActiveJob(job.status) || !job.settled) {\n      activeJobs += 1;\n    }\n  }\n\n  return activeJobs < maxBackgroundJobs;\n}\n\nexport function cancelJob(job: SubagentJob): void {\n  job.status = \"cancelled\";\n  job.abort();\n}\n\nexport function cleanupJob(job: SubagentJob): Promise<void> {\n  return job.cleanup().then(() => {\n    job.unregisterCleanup?.();\n  });\n}\n\nfunction sanitizeReminderField(value: string): string {\n  return value\n    .replaceAll(\"\\r\", \" \")\n    .replaceAll(\"\\n\", \" \")\n    .replaceAll(\"<\", \"&lt;\")\n    .replaceAll(\">\", \"&gt;\");\n}\n"],"mappings":"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"}
+{"version":3,"file":"subagent-jobs.js","names":[],"sources":["../src/subagent-jobs.ts"],"sourcesContent":["import type { ExecutionHost } from \"./execution/types\";\nimport type { AgentInput } from \"./session/input\";\nimport {\n  createBackgroundTaskId,\n  createDurableBackgroundTaskId,\n  getBackgroundChildRun,\n  getOrCreateBackgroundChildRun,\n} from \"./subagent-background-child-run\";\nimport { startInProcessBackgroundJob } from \"./subagent-background-in-process\";\nimport { scheduleDurableBackgroundJob } from \"./subagent-background-schedule\";\nimport {\n  backgroundCancelledLaunchOutput,\n  backgroundLaunchOutput,\n  backgroundReplayOutput,\n  backgroundRunJobStatus,\n  hasBackgroundJobCapacity,\n} from \"./subagent-job-state\";\nimport type {\n  RuntimeInputSink,\n  Subagent,\n  SubagentJob,\n  SubagentJobGroup,\n} from \"./subagent-types\";\n\nconst maxBackgroundJobs = 64;\nconst maxRetainedBackgroundJobs = maxBackgroundJobs * 4;\n\nexport async function startBackgroundJob({\n  abortSignal,\n  description,\n  executionHost,\n  jobs,\n  groupId,\n  groups = new Map<string, SubagentJobGroup>(),\n  delegateToolCallId,\n  parentSession,\n  parentRunId,\n  parentSessionKey,\n  ownerNamespace,\n  prompt,\n  registerCleanup,\n  sessionKey,\n  subagent,\n}: {\n  readonly abortSignal: AbortSignal;\n  readonly description?: string;\n  readonly executionHost?: ExecutionHost;\n  readonly jobs: Map<string, SubagentJob>;\n  readonly groupId?: string;\n  readonly groups?: Map<string, SubagentJobGroup>;\n  readonly delegateToolCallId?: string;\n  readonly parentSession: RuntimeInputSink;\n  readonly parentRunId?: string;\n  readonly parentSessionKey?: string;\n  readonly ownerNamespace?: string;\n  readonly prompt: AgentInput;\n  readonly registerCleanup: (cleanup: () => Promise<void>) => () => void;\n  readonly sessionKey: string;\n  readonly subagent: Subagent;\n}) {\n  const existingChildRun = await getBackgroundChildRun({\n    delegateToolCallId,\n    executionHost,\n    parentRunId,\n    parentSessionKey,\n    prompt,\n    sessionKey,\n  });\n  const id =\n    existingChildRun?.publicTaskId ??\n    (executionHost\n      ? await createDurableBackgroundTaskId({\n          delegateToolCallId,\n          prompt,\n          sessionKey,\n        })\n      : createBackgroundTaskId());\n  const existingJob = jobs.get(id);\n  if (existingJob) {\n    return backgroundLaunchOutput(existingJob);\n  }\n  const replayedStatus = backgroundRunJobStatus(existingChildRun?.status);\n  if (existingChildRun?.publicTaskId && replayedStatus) {\n    return backgroundReplayOutput({\n      id: existingChildRun.publicTaskId,\n      status: replayedStatus,\n      subagent: subagent.name ?? \"subagent\",\n    });\n  }\n\n  if (\n    !hasBackgroundJobCapacity({\n      jobs,\n      maxActiveJobs: maxBackgroundJobs,\n      maxRetainedJobs: maxRetainedBackgroundJobs,\n    })\n  ) {\n    return {\n      message:\n        \"Background subagent job was not started because the background job limit is full.\",\n      run_in_background: true,\n      status: \"cancelled\",\n      subagent: subagent.name,\n      task_id: id,\n    };\n  }\n\n  if (abortSignal.aborted) {\n    return backgroundCancelledLaunchOutput({ id, subagent: subagent.name });\n  }\n\n  const childRun = executionHost\n    ? (existingChildRun ??\n      (await getOrCreateBackgroundChildRun({\n        delegateToolCallId,\n        description,\n        executionHost,\n        groupId,\n        ownerNamespace,\n        parentRunId,\n        parentSessionKey,\n        prompt,\n        publicTaskId: id,\n        sessionKey,\n        subagent: subagent.name ?? \"subagent\",\n      })))\n    : undefined;\n  if (\n    executionHost?.capabilities.backgroundSubagents === \"durable\" &&\n    childRun\n  ) {\n    const job = await scheduleDurableBackgroundJob({\n      childRun,\n      delegateToolCallId,\n      description,\n      executionHost,\n      groupId,\n      groups,\n      id,\n      jobs,\n      parentRunId,\n      parentSession,\n      parentSessionKey,\n      ownerNamespace,\n      subagent: subagent.name ?? \"subagent\",\n    });\n    return backgroundLaunchOutput(job);\n  }\n  return await startInProcessBackgroundJob({\n    abortSignal,\n    childRun,\n    delegateToolCallId,\n    description,\n    executionHost,\n    groupId,\n    groups,\n    id,\n    jobs,\n    parentRunId,\n    parentSession,\n    parentSessionKey,\n    ownerNamespace,\n    prompt,\n    registerCleanup,\n    sessionKey,\n    subagent,\n  });\n}\n"],"mappings":";;;;;AAwBA,MAAM,oBAAoB;AAC1B,MAAM,4BAA4B,oBAAoB;AAEtD,eAAsB,mBAAmB,EACvC,aACA,aACA,eACA,MACA,SACA,yBAAS,IAAI,IAA8B,GAC3C,oBACA,eACA,aACA,kBACA,gBACA,QACA,iBACA,YACA,YAiBC;CACD,MAAM,mBAAmB,MAAM,sBAAsB;EACnD;EACA;EACA;EACA;EACA;EACA;CACF,CAAC;CACD,MAAM,KACJ,kBAAkB,iBACjB,gBACG,MAAM,8BAA8B;EAClC;EACA;EACA;CACF,CAAC,IACD,uBAAuB;CAC7B,MAAM,cAAc,KAAK,IAAI,EAAE;CAC/B,IAAI,aACF,OAAO,uBAAuB,WAAW;CAE3C,MAAM,iBAAiB,uBAAuB,kBAAkB,MAAM;CACtE,IAAI,kBAAkB,gBAAgB,gBACpC,OAAO,uBAAuB;EAC5B,IAAI,iBAAiB;EACrB,QAAQ;EACR,UAAU,SAAS,QAAQ;CAC7B,CAAC;CAGH,IACE,CAAC,yBAAyB;EACxB;EACA,eAAe;EACf,iBAAiB;CACnB,CAAC,GAED,OAAO;EACL,SACE;EACF,mBAAmB;EACnB,QAAQ;EACR,UAAU,SAAS;EACnB,SAAS;CACX;CAGF,IAAI,YAAY,SACd,OAAO,gCAAgC;EAAE;EAAI,UAAU,SAAS;CAAK,CAAC;CAGxE,MAAM,WAAW,gBACZ,oBACA,MAAM,8BAA8B;EACnC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,cAAc;EACd;EACA,UAAU,SAAS,QAAQ;CAC7B,CAAC,IACD,KAAA;CACJ,IACE,eAAe,aAAa,wBAAwB,aACpD,UAiBA,OAAO,uBAAuB,MAfZ,6BAA6B;EAC7C;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,UAAU,SAAS,QAAQ;CAC7B,CAAC,CACgC;CAEnC,OAAO,MAAM,4BAA4B;EACvC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;CACF,CAAC;AACH"}

package/dist/subagent-run.js

@@ -33,14 +33,14 @@ async function collectSubagentRunWithEvents(run, subagent, onEvent) {
 		for await (const event of run.events()) {
 			eventCount += 1;
 			if (events.length < maxStoredEvents) events.push(event);
-			onEvent?.(event);
+			await onEvent?.(event);
 			if (event.type === "assistant-text") {
 				const appended = appendCompactText(textParts, textLength, event.text);
 				textLength = appended.length;
 				textTruncated ||= appended.truncated;
 			} else if (event.type === "turn-abort") result = "aborted";
 			else if (event.type === "turn-error") return {
-				events,
+				retainedEvents: events,
 				result: {
 					error: event.message,
 					eventCount,
@@ -53,7 +53,7 @@ async function collectSubagentRunWithEvents(run, subagent, onEvent) {
 		}
 	} catch (error) {
 		return {
-			events,
+			retainedEvents: events,
 			result: {
 				error: errorMessage(error),
 				eventCount,
@@ -65,7 +65,7 @@ async function collectSubagentRunWithEvents(run, subagent, onEvent) {
 		};
 	}
 	return {
-		events,
+		retainedEvents: events,
 		result: {
 			eventCount,
 			result,

package/dist/subagent-run.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-run.js","names":[],"sources":["../src/subagent-run.ts"],"sourcesContent":["import type { AgentEvent } from \"./session/events\";\nimport type { AgentInput } from \"./session/input\";\nimport type { AgentRun } from \"./session/run\";\nimport type {\n  CompactSubagentResult,\n  Subagent,\n  SubagentRunResult,\n} from \"./subagent-types\";\n\nconst maxCompactTextLength = 20_000;\nconst maxStoredEvents = 200;\nconst childSessionKeySuffixPattern = /^[A-Za-z0-9_-]{1,80}$/;\n\nexport async function runBlockingDelegation({\n  abortSignal,\n  prompt,\n  sessionKey,\n  subagent,\n}: {\n  readonly abortSignal?: AbortSignal;\n  readonly prompt: AgentInput;\n  readonly sessionKey: string;\n  readonly subagent: Subagent;\n}): Promise<CompactSubagentResult> {\n  const childSession = subagent.session(sessionKey);\n  if (abortSignal?.aborted) {\n    return {\n      eventCount: 0,\n      result: \"aborted\",\n      run_in_background: false,\n      subagent: subagent.name ?? \"subagent\",\n      text: \"\",\n    };\n  }\n\n  const abort = () => childSession.interrupt();\n  abortSignal?.addEventListener(\"abort\", abort, { once: true });\n  try {\n    return await collectSubagentRun(\n      await childSession.send(prompt),\n      subagent.name ?? \"subagent\"\n    );\n  } finally {\n    abortSignal?.removeEventListener(\"abort\", abort);\n  }\n}\n\nexport async function collectSubagentRun(\n  run: AgentRun,\n  subagent: string\n): Promise<CompactSubagentResult> {\n  return (await collectSubagentRunWithEvents(run, subagent)).result;\n}\n\nexport async function collectSubagentRunWithEvents(\n  run: AgentRun,\n  subagent: string,\n  onEvent?: (event: AgentEvent) => void\n): Promise<SubagentRunResult> {\n  let eventCount = 0;\n  let result: CompactSubagentResult[\"result\"] = \"completed\";\n  const events: AgentEvent[] = [];\n  const textParts: string[] = [];\n  let textLength = 0;\n  let textTruncated = false;\n\n  try {\n    for await (const event of run.events()) {\n      eventCount += 1;\n      if (events.length < maxStoredEvents) {\n        events.push(event);\n      }\n      onEvent?.(event);\n      if (event.type === \"assistant-text\") {\n        const appended = appendCompactText(textParts, textLength, event.text);\n        textLength = appended.length;\n        textTruncated ||= appended.truncated;\n      } else if (event.type === \"turn-abort\") {\n        result = \"aborted\";\n      } else if (event.type === \"turn-error\") {\n        return {\n          events,\n          result: {\n            error: event.message,\n            eventCount,\n            result: \"error\",\n            run_in_background: false,\n            subagent,\n            text: compactText(textParts, textTruncated),\n          },\n        };\n      }\n    }\n  } catch (error) {\n    return {\n      events,\n      result: {\n        error: errorMessage(error),\n        eventCount,\n        result: \"error\",\n        run_in_background: false,\n        subagent,\n        text: compactText(textParts, textTruncated),\n      },\n    };\n  }\n\n  return {\n    events,\n    result: {\n      eventCount,\n      result,\n      run_in_background: false,\n      subagent,\n      text: compactText(textParts, textTruncated),\n    },\n  };\n}\n\nexport function defaultChildSessionKey(\n  parentAgentNamespace: string,\n  parentSessionKey: string,\n  subagent: string\n): string {\n  return `parent:${parentAgentNamespace}:${parentSessionKey}:subagent:${subagent}`;\n}\n\nexport function scopedChildSessionKey({\n  parentAgentNamespace,\n  parentSessionKey,\n  sessionKey,\n  subagent,\n}: {\n  readonly parentAgentNamespace: string;\n  readonly parentSessionKey: string;\n  readonly sessionKey?: string;\n  readonly subagent: string;\n}): string {\n  const base = defaultChildSessionKey(\n    parentAgentNamespace,\n    parentSessionKey,\n    subagent\n  );\n  if (!sessionKey) {\n    return base;\n  }\n\n  if (!childSessionKeySuffixPattern.test(sessionKey)) {\n    throw new Error(\n      \"delegate sessionKey must be a short alphanumeric child-session suffix\"\n    );\n  }\n\n  return `${base}:${sessionKey}`;\n}\n\nfunction compactText(parts: readonly string[], truncated: boolean): string {\n  const text = parts.join(\"\");\n  return truncated ? `${text}…[truncated]` : text;\n}\n\nfunction appendCompactText(\n  parts: string[],\n  currentLength: number,\n  next: string\n): { readonly length: number; readonly truncated: boolean } {\n  if (currentLength >= maxCompactTextLength) {\n    return { length: currentLength, truncated: next.length > 0 };\n  }\n\n  const remaining = maxCompactTextLength - currentLength;\n  const chunk = next.length > remaining ? next.slice(0, remaining) : next;\n  parts.push(chunk);\n  return {\n    length: currentLength + chunk.length,\n    truncated: next.length > remaining,\n  };\n}\n\nfunction errorMessage(error: unknown): string {\n  if (error instanceof Error) {\n    return error.message;\n  }\n\n  return String(error);\n}\n"],"mappings":";AASA,MAAM,uBAAuB;AAC7B,MAAM,kBAAkB;AACxB,MAAM,+BAA+B;AAErC,eAAsB,sBAAsB,EAC1C,aACA,QACA,YACA,YAMiC;CACjC,MAAM,eAAe,SAAS,QAAQ,UAAU;CAChD,IAAI,aAAa,SACf,OAAO;EACL,YAAY;EACZ,QAAQ;EACR,mBAAmB;EACnB,UAAU,SAAS,QAAQ;EAC3B,MAAM;CACR;CAGF,MAAM,cAAc,aAAa,UAAU;CAC3C,aAAa,iBAAiB,SAAS,OAAO,EAAE,MAAM,KAAK,CAAC;CAC5D,IAAI;EACF,OAAO,MAAM,mBACX,MAAM,aAAa,KAAK,MAAM,GAC9B,SAAS,QAAQ,UACnB;CACF,UAAU;EACR,aAAa,oBAAoB,SAAS,KAAK;CACjD;AACF;AAEA,eAAsB,mBACpB,KACA,UACgC;CAChC,QAAQ,MAAM,6BAA6B,KAAK,QAAQ,GAAG;AAC7D;AAEA,eAAsB,6BACpB,KACA,UACA,SAC4B;CAC5B,IAAI,aAAa;CACjB,IAAI,SAA0C;CAC9C,MAAM,SAAuB,CAAC;CAC9B,MAAM,YAAsB,CAAC;CAC7B,IAAI,aAAa;CACjB,IAAI,gBAAgB;CAEpB,IAAI;EACF,WAAW,MAAM,SAAS,IAAI,OAAO,GAAG;GACtC,cAAc;GACd,IAAI,OAAO,SAAS,iBAClB,OAAO,KAAK,KAAK;GAEnB,UAAU,KAAK;GACf,IAAI,MAAM,SAAS,kBAAkB;IACnC,MAAM,WAAW,kBAAkB,WAAW,YAAY,MAAM,IAAI;IACpE,aAAa,SAAS;IACtB,kBAAkB,SAAS;GAC7B,OAAO,IAAI,MAAM,SAAS,cACxB,SAAS;QACJ,IAAI,MAAM,SAAS,cACxB,OAAO;IACL;IACA,QAAQ;KACN,OAAO,MAAM;KACb;KACA,QAAQ;KACR,mBAAmB;KACnB;KACA,MAAM,YAAY,WAAW,aAAa;IAC5C;GACF;EAEJ;CACF,SAAS,OAAO;EACd,OAAO;GACL;GACA,QAAQ;IACN,OAAO,aAAa,KAAK;IACzB;IACA,QAAQ;IACR,mBAAmB;IACnB;IACA,MAAM,YAAY,WAAW,aAAa;GAC5C;EACF;CACF;CAEA,OAAO;EACL;EACA,QAAQ;GACN;GACA;GACA,mBAAmB;GACnB;GACA,MAAM,YAAY,WAAW,aAAa;EAC5C;CACF;AACF;AAEA,SAAgB,uBACd,sBACA,kBACA,UACQ;CACR,OAAO,UAAU,qBAAqB,GAAG,iBAAiB,YAAY;AACxE;AAEA,SAAgB,sBAAsB,EACpC,sBACA,kBACA,YACA,YAMS;CACT,MAAM,OAAO,uBACX,sBACA,kBACA,QACF;CACA,IAAI,CAAC,YACH,OAAO;CAGT,IAAI,CAAC,6BAA6B,KAAK,UAAU,GAC/C,MAAM,IAAI,MACR,uEACF;CAGF,OAAO,GAAG,KAAK,GAAG;AACpB;AAEA,SAAS,YAAY,OAA0B,WAA4B;CACzE,MAAM,OAAO,MAAM,KAAK,EAAE;CAC1B,OAAO,YAAY,GAAG,KAAK,gBAAgB;AAC7C;AAEA,SAAS,kBACP,OACA,eACA,MAC0D;CAC1D,IAAI,iBAAiB,sBACnB,OAAO;EAAE,QAAQ;EAAe,WAAW,KAAK,SAAS;CAAE;CAG7D,MAAM,YAAY,uBAAuB;CACzC,MAAM,QAAQ,KAAK,SAAS,YAAY,KAAK,MAAM,GAAG,SAAS,IAAI;CACnE,MAAM,KAAK,KAAK;CAChB,OAAO;EACL,QAAQ,gBAAgB,MAAM;EAC9B,WAAW,KAAK,SAAS;CAC3B;AACF;AAEA,SAAS,aAAa,OAAwB;CAC5C,IAAI,iBAAiB,OACnB,OAAO,MAAM;CAGf,OAAO,OAAO,KAAK;AACrB"}
+{"version":3,"file":"subagent-run.js","names":[],"sources":["../src/subagent-run.ts"],"sourcesContent":["import type { AgentEvent } from \"./session/events\";\nimport type { AgentInput } from \"./session/input\";\nimport type { AgentRun } from \"./session/run\";\nimport type {\n  CompactSubagentResult,\n  Subagent,\n  SubagentRunResult,\n} from \"./subagent-types\";\n\nconst maxCompactTextLength = 20_000;\nconst maxStoredEvents = 200;\nconst childSessionKeySuffixPattern = /^[A-Za-z0-9_-]{1,80}$/;\n\nexport async function runBlockingDelegation({\n  abortSignal,\n  prompt,\n  sessionKey,\n  subagent,\n}: {\n  readonly abortSignal?: AbortSignal;\n  readonly prompt: AgentInput;\n  readonly sessionKey: string;\n  readonly subagent: Subagent;\n}): Promise<CompactSubagentResult> {\n  const childSession = subagent.session(sessionKey);\n  if (abortSignal?.aborted) {\n    return {\n      eventCount: 0,\n      result: \"aborted\",\n      run_in_background: false,\n      subagent: subagent.name ?? \"subagent\",\n      text: \"\",\n    };\n  }\n\n  const abort = () => childSession.interrupt();\n  abortSignal?.addEventListener(\"abort\", abort, { once: true });\n  try {\n    return await collectSubagentRun(\n      await childSession.send(prompt),\n      subagent.name ?? \"subagent\"\n    );\n  } finally {\n    abortSignal?.removeEventListener(\"abort\", abort);\n  }\n}\n\nexport async function collectSubagentRun(\n  run: AgentRun,\n  subagent: string\n): Promise<CompactSubagentResult> {\n  return (await collectSubagentRunWithEvents(run, subagent)).result;\n}\n\nexport async function collectSubagentRunWithEvents(\n  run: AgentRun,\n  subagent: string,\n  onEvent?: (event: AgentEvent) => Promise<void> | void\n): Promise<SubagentRunResult> {\n  let eventCount = 0;\n  let result: CompactSubagentResult[\"result\"] = \"completed\";\n  const events: AgentEvent[] = [];\n  const textParts: string[] = [];\n  let textLength = 0;\n  let textTruncated = false;\n\n  try {\n    for await (const event of run.events()) {\n      eventCount += 1;\n      if (events.length < maxStoredEvents) {\n        events.push(event);\n      }\n      await onEvent?.(event);\n      if (event.type === \"assistant-text\") {\n        const appended = appendCompactText(textParts, textLength, event.text);\n        textLength = appended.length;\n        textTruncated ||= appended.truncated;\n      } else if (event.type === \"turn-abort\") {\n        result = \"aborted\";\n      } else if (event.type === \"turn-error\") {\n        return {\n          retainedEvents: events,\n          result: {\n            error: event.message,\n            eventCount,\n            result: \"error\",\n            run_in_background: false,\n            subagent,\n            text: compactText(textParts, textTruncated),\n          },\n        };\n      }\n    }\n  } catch (error) {\n    return {\n      retainedEvents: events,\n      result: {\n        error: errorMessage(error),\n        eventCount,\n        result: \"error\",\n        run_in_background: false,\n        subagent,\n        text: compactText(textParts, textTruncated),\n      },\n    };\n  }\n\n  return {\n    retainedEvents: events,\n    result: {\n      eventCount,\n      result,\n      run_in_background: false,\n      subagent,\n      text: compactText(textParts, textTruncated),\n    },\n  };\n}\n\nexport function defaultChildSessionKey(\n  parentAgentNamespace: string,\n  parentSessionKey: string,\n  subagent: string\n): string {\n  return `parent:${parentAgentNamespace}:${parentSessionKey}:subagent:${subagent}`;\n}\n\nexport function scopedChildSessionKey({\n  parentAgentNamespace,\n  parentSessionKey,\n  sessionKey,\n  subagent,\n}: {\n  readonly parentAgentNamespace: string;\n  readonly parentSessionKey: string;\n  readonly sessionKey?: string;\n  readonly subagent: string;\n}): string {\n  const base = defaultChildSessionKey(\n    parentAgentNamespace,\n    parentSessionKey,\n    subagent\n  );\n  if (!sessionKey) {\n    return base;\n  }\n\n  if (!childSessionKeySuffixPattern.test(sessionKey)) {\n    throw new Error(\n      \"delegate sessionKey must be a short alphanumeric child-session suffix\"\n    );\n  }\n\n  return `${base}:${sessionKey}`;\n}\n\nfunction compactText(parts: readonly string[], truncated: boolean): string {\n  const text = parts.join(\"\");\n  return truncated ? `${text}…[truncated]` : text;\n}\n\nfunction appendCompactText(\n  parts: string[],\n  currentLength: number,\n  next: string\n): { readonly length: number; readonly truncated: boolean } {\n  if (currentLength >= maxCompactTextLength) {\n    return { length: currentLength, truncated: next.length > 0 };\n  }\n\n  const remaining = maxCompactTextLength - currentLength;\n  const chunk = next.length > remaining ? next.slice(0, remaining) : next;\n  parts.push(chunk);\n  return {\n    length: currentLength + chunk.length,\n    truncated: next.length > remaining,\n  };\n}\n\nfunction errorMessage(error: unknown): string {\n  if (error instanceof Error) {\n    return error.message;\n  }\n\n  return String(error);\n}\n"],"mappings":"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"}

package/dist/subagents.js

@@ -1,23 +1,31 @@
+import { scopedChildSessionKey } from "./subagent-run.js";
 import { normalizeAgentInput } from "./session/input-normalization.js";
-import { runBlockingDelegation, scopedChildSessionKey } from "./subagent-run.js";
-import { startBackgroundJob } from "./subagent-jobs.js";
+import { blockingSubagentDedupeKey, runBlockingChild } from "./subagent-child-run.js";
 import { createBackgroundCancelTool } from "./subagent-job-cancel.js";
 import { createBackgroundOutputTool } from "./subagent-job-output.js";
+import { startBackgroundJob } from "./subagent-jobs.js";
 import { delegatePromptSchema } from "./subagent-prompt-schema.js";
 import { jsonSchema, tool } from "ai";
 //#region src/subagents.ts
-function createSubagentTools({ parentAgentNamespace, parentSession, parentSessionKey, registerChildSession, subagents }) {
+function createSubagentTools({ backgroundSubagents, executionHost, parentAgentNamespace, parentSession, parentSessionKey, registerChildSession, subagents }) {
 	if (subagents.length === 0) return {};
 	const jobs = /* @__PURE__ */ new Map();
-	const generatedTools = {
-		background_cancel: createBackgroundCancelTool(jobs),
-		background_output: createBackgroundOutputTool(jobs)
-	};
+	const groups = /* @__PURE__ */ new Map();
+	const blockingRuns = /* @__PURE__ */ new Map();
+	const backgroundToolScope = { childSessionKeyPrefix: `parent:${parentAgentNamespace}:${parentSessionKey}:subagent:` };
+	const generatedTools = backgroundSubagents ? {
+		background_cancel: createBackgroundCancelTool(jobs, executionHost, backgroundToolScope),
+		background_output: createBackgroundOutputTool(jobs, executionHost, backgroundToolScope)
+	} : {};
 	for (const subagent of subagents) {
 		const name = subagent.name;
 		if (!name) continue;
 		generatedTools[`delegate_to_${name.replaceAll("-", "_")}`] = createDelegateTool({
 			jobs,
+			groups,
+			backgroundSubagents,
+			blockingRuns,
+			executionHost,
 			parentAgentNamespace,
 			parentSession,
 			parentSessionKey,
@@ -27,10 +35,10 @@ function createSubagentTools({ parentAgentNamespace, parentSession, parentSessio
 	}
 	return generatedTools;
 }
-function createDelegateTool({ jobs, parentAgentNamespace, parentSession, parentSessionKey, registerChildSession, subagent }) {
+function createDelegateTool({ jobs, groups, backgroundSubagents, blockingRuns, executionHost, parentAgentNamespace, parentSession, parentSessionKey, registerChildSession, subagent }) {
 	return tool({
 		description: `Delegate work to ${subagent.name}: ${subagent.description}`,
-		execute: async (input, { abortSignal }) => {
+		execute: async (input, { abortSignal, toolCallId }) => {
 			const prompt = normalizeAgentInput(input.prompt);
 			const sessionKey = scopedChildSessionKey({
 				parentAgentNamespace,
@@ -38,54 +46,79 @@ function createDelegateTool({ jobs, parentAgentNamespace, parentSession, parentS
 				sessionKey: input.sessionKey,
 				subagent: subagent.name ?? "subagent"
 			});
-			if (input.run_in_background === true) return startBackgroundJob({
-				abortSignal: abortSignal ?? new AbortController().signal,
-				description: input.description,
-				jobs,
-				parentSession,
-				prompt,
-				registerCleanup: (cleanup) => registerChildSession(parentSessionKey, cleanup),
-				sessionKey,
-				subagent
-			});
+			if (input.run_in_background === true) {
+				if (!backgroundSubagents) throw new Error("Background subagent delegation is not available for this host.");
+				return await startBackgroundJob({
+					abortSignal: abortSignal ?? new AbortController().signal,
+					description: input.description,
+					executionHost,
+					groupId: parentSession.currentBackgroundGroupId?.(),
+					groups,
+					jobs,
+					delegateToolCallId: toolCallId,
+					parentSession,
+					parentRunId: parentSession.currentRunId?.() ?? parentAgentNamespace,
+					parentSessionKey,
+					ownerNamespace: parentAgentNamespace,
+					prompt,
+					registerCleanup: (cleanup) => registerChildSession(parentSessionKey, cleanup),
+					sessionKey,
+					subagent
+				});
+			}
 			registerChildSession(parentSessionKey, () => subagent.session(sessionKey).delete());
-			parentSession.emitObserverEvent({
+			await parentSession.emitObserverEvent({
 				description: input.description,
+				delegateToolCallId: toolCallId,
 				run_in_background: false,
 				subagent: subagent.name ?? "subagent",
 				type: "subagent-job-start"
 			});
-			const result = await runBlockingDelegation({
+			const dedupeKey = blockingSubagentDedupeKey(parentAgentNamespace, toolCallId);
+			const result = blockingRuns.get(dedupeKey) ?? runBlockingChild({
 				abortSignal,
+				dedupeKey,
+				executionHost,
+				parentRunId: parentSession.currentRunId?.() ?? parentAgentNamespace,
 				prompt,
 				sessionKey,
 				subagent
 			});
-			parentSession.emitObserverEvent({
-				error: result.error,
-				eventCount: result.eventCount,
-				status: result.result,
+			blockingRuns.set(dedupeKey, result);
+			const awaitedResult = await result;
+			await parentSession.emitObserverEvent({
+				error: awaitedResult.error,
+				eventCount: awaitedResult.eventCount,
+				delegateToolCallId: toolCallId,
+				status: awaitedResult.result,
 				subagent: subagent.name ?? "subagent",
 				type: "subagent-job-end"
 			});
-			return result;
+			return awaitedResult;
 		},
 		inputSchema: jsonSchema({
 			additionalProperties: false,
-			properties: {
-				description: { type: "string" },
-				prompt: delegatePromptSchema,
-				run_in_background: {
-					default: false,
-					type: "boolean"
-				},
-				sessionKey: { type: "string" }
-			},
+			properties: createDelegateToolProperties(backgroundSubagents),
 			required: ["prompt"],
 			type: "object"
 		})
 	});
 }
+function createDelegateToolProperties(backgroundSubagents) {
+	const baseProperties = {
+		description: { type: "string" },
+		prompt: delegatePromptSchema,
+		sessionKey: { type: "string" }
+	};
+	if (!backgroundSubagents) return baseProperties;
+	return {
+		...baseProperties,
+		run_in_background: {
+			default: false,
+			type: "boolean"
+		}
+	};
+}
 //#endregion
 export { createSubagentTools };
 

package/dist/subagents.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagents.js","names":[],"sources":["../src/subagents.ts"],"sourcesContent":["import { jsonSchema, type ToolSet, tool } from \"ai\";\nimport { normalizeAgentInput } from \"./session/input-normalization\";\nimport { createBackgroundCancelTool } from \"./subagent-job-cancel\";\nimport { createBackgroundOutputTool } from \"./subagent-job-output\";\nimport { startBackgroundJob } from \"./subagent-jobs\";\nimport { delegatePromptSchema } from \"./subagent-prompt-schema\";\nimport { runBlockingDelegation, scopedChildSessionKey } from \"./subagent-run\";\nimport type {\n  CreateSubagentToolsOptions,\n  DelegateInput,\n  RuntimeInputSink,\n  Subagent,\n  SubagentJob,\n} from \"./subagent-types\";\n\nexport function createSubagentTools({\n  parentAgentNamespace,\n  parentSession,\n  parentSessionKey,\n  registerChildSession,\n  subagents,\n}: CreateSubagentToolsOptions): ToolSet {\n  if (subagents.length === 0) {\n    return {};\n  }\n\n  const jobs = new Map<string, SubagentJob>();\n  const generatedTools: Record<string, unknown> = {\n    background_cancel: createBackgroundCancelTool(jobs),\n    background_output: createBackgroundOutputTool(jobs),\n  };\n\n  for (const subagent of subagents) {\n    const name = subagent.name;\n    if (!name) {\n      continue;\n    }\n\n    generatedTools[`delegate_to_${name.replaceAll(\"-\", \"_\")}`] =\n      createDelegateTool({\n        jobs,\n        parentAgentNamespace,\n        parentSession,\n        parentSessionKey,\n        registerChildSession,\n        subagent,\n      });\n  }\n\n  return generatedTools as ToolSet;\n}\n\nfunction createDelegateTool({\n  jobs,\n  parentAgentNamespace,\n  parentSession,\n  parentSessionKey,\n  registerChildSession,\n  subagent,\n}: {\n  readonly jobs: Map<string, SubagentJob>;\n  readonly parentAgentNamespace: string;\n  readonly parentSession: RuntimeInputSink;\n  readonly parentSessionKey: string;\n  readonly registerChildSession: CreateSubagentToolsOptions[\"registerChildSession\"];\n  readonly subagent: Subagent;\n}) {\n  return tool<DelegateInput, unknown, Record<string, unknown>>({\n    description: `Delegate work to ${subagent.name}: ${subagent.description}`,\n    execute: async (input: DelegateInput, { abortSignal }) => {\n      const prompt = normalizeAgentInput(input.prompt);\n      const sessionKey = scopedChildSessionKey({\n        parentAgentNamespace,\n        parentSessionKey,\n        sessionKey: input.sessionKey,\n        subagent: subagent.name ?? \"subagent\",\n      });\n      if (input.run_in_background === true) {\n        return startBackgroundJob({\n          abortSignal: abortSignal ?? new AbortController().signal,\n          description: input.description,\n          jobs,\n          parentSession,\n          prompt,\n          registerCleanup: (cleanup) =>\n            registerChildSession(parentSessionKey, cleanup),\n          sessionKey,\n          subagent,\n        });\n      }\n\n      registerChildSession(parentSessionKey, () =>\n        subagent.session(sessionKey).delete()\n      );\n      parentSession.emitObserverEvent({\n        description: input.description,\n        run_in_background: false,\n        subagent: subagent.name ?? \"subagent\",\n        type: \"subagent-job-start\",\n      });\n      const result = await runBlockingDelegation({\n        abortSignal,\n        prompt,\n        sessionKey,\n        subagent,\n      });\n      parentSession.emitObserverEvent({\n        error: result.error,\n        eventCount: result.eventCount,\n        status: result.result,\n        subagent: subagent.name ?? \"subagent\",\n        type: \"subagent-job-end\",\n      });\n      return result;\n    },\n    inputSchema: jsonSchema<DelegateInput>({\n      additionalProperties: false,\n      properties: {\n        description: { type: \"string\" },\n        prompt: delegatePromptSchema,\n        run_in_background: { default: false, type: \"boolean\" },\n        sessionKey: { type: \"string\" },\n      },\n      required: [\"prompt\"],\n      type: \"object\",\n    }),\n  });\n}\n"],"mappings":";;;;;;;;AAeA,SAAgB,oBAAoB,EAClC,sBACA,eACA,kBACA,sBACA,aACsC;CACtC,IAAI,UAAU,WAAW,GACvB,OAAO,CAAC;CAGV,MAAM,uBAAO,IAAI,IAAyB;CAC1C,MAAM,iBAA0C;EAC9C,mBAAmB,2BAA2B,IAAI;EAClD,mBAAmB,2BAA2B,IAAI;CACpD;CAEA,KAAK,MAAM,YAAY,WAAW;EAChC,MAAM,OAAO,SAAS;EACtB,IAAI,CAAC,MACH;EAGF,eAAe,eAAe,KAAK,WAAW,KAAK,GAAG,OACpD,mBAAmB;GACjB;GACA;GACA;GACA;GACA;GACA;EACF,CAAC;CACL;CAEA,OAAO;AACT;AAEA,SAAS,mBAAmB,EAC1B,MACA,sBACA,eACA,kBACA,sBACA,YAQC;CACD,OAAO,KAAsD;EAC3D,aAAa,oBAAoB,SAAS,KAAK,IAAI,SAAS;EAC5D,SAAS,OAAO,OAAsB,EAAE,kBAAkB;GACxD,MAAM,SAAS,oBAAoB,MAAM,MAAM;GAC/C,MAAM,aAAa,sBAAsB;IACvC;IACA;IACA,YAAY,MAAM;IAClB,UAAU,SAAS,QAAQ;GAC7B,CAAC;GACD,IAAI,MAAM,sBAAsB,MAC9B,OAAO,mBAAmB;IACxB,aAAa,eAAe,IAAI,gBAAgB,EAAE;IAClD,aAAa,MAAM;IACnB;IACA;IACA;IACA,kBAAkB,YAChB,qBAAqB,kBAAkB,OAAO;IAChD;IACA;GACF,CAAC;GAGH,qBAAqB,wBACnB,SAAS,QAAQ,UAAU,EAAE,OAAO,CACtC;GACA,cAAc,kBAAkB;IAC9B,aAAa,MAAM;IACnB,mBAAmB;IACnB,UAAU,SAAS,QAAQ;IAC3B,MAAM;GACR,CAAC;GACD,MAAM,SAAS,MAAM,sBAAsB;IACzC;IACA;IACA;IACA;GACF,CAAC;GACD,cAAc,kBAAkB;IAC9B,OAAO,OAAO;IACd,YAAY,OAAO;IACnB,QAAQ,OAAO;IACf,UAAU,SAAS,QAAQ;IAC3B,MAAM;GACR,CAAC;GACD,OAAO;EACT;EACA,aAAa,WAA0B;GACrC,sBAAsB;GACtB,YAAY;IACV,aAAa,EAAE,MAAM,SAAS;IAC9B,QAAQ;IACR,mBAAmB;KAAE,SAAS;KAAO,MAAM;IAAU;IACrD,YAAY,EAAE,MAAM,SAAS;GAC/B;GACA,UAAU,CAAC,QAAQ;GACnB,MAAM;EACR,CAAC;CACH,CAAC;AACH"}
+{"version":3,"file":"subagents.js","names":[],"sources":["../src/subagents.ts"],"sourcesContent":["import { jsonSchema, type ToolSet, tool } from \"ai\";\nimport type { ExecutionHost } from \"./execution/types\";\nimport { normalizeAgentInput } from \"./session/input-normalization\";\nimport {\n  type BlockingSubagentRunCache,\n  blockingSubagentDedupeKey,\n  runBlockingChild,\n} from \"./subagent-child-run\";\nimport { createBackgroundCancelTool } from \"./subagent-job-cancel\";\nimport { createBackgroundOutputTool } from \"./subagent-job-output\";\nimport { startBackgroundJob } from \"./subagent-jobs\";\nimport { delegatePromptSchema } from \"./subagent-prompt-schema\";\nimport { scopedChildSessionKey } from \"./subagent-run\";\nimport type {\n  CreateSubagentToolsOptions,\n  DelegateInput,\n  RuntimeInputSink,\n  Subagent,\n  SubagentJob,\n  SubagentJobGroup,\n} from \"./subagent-types\";\n\nexport function createSubagentTools({\n  backgroundSubagents,\n  executionHost,\n  parentAgentNamespace,\n  parentSession,\n  parentSessionKey,\n  registerChildSession,\n  subagents,\n}: CreateSubagentToolsOptions): ToolSet {\n  if (subagents.length === 0) {\n    return {};\n  }\n\n  const jobs = new Map<string, SubagentJob>();\n  const groups = new Map<string, SubagentJobGroup>();\n  const blockingRuns: BlockingSubagentRunCache = new Map();\n  const backgroundToolScope = {\n    childSessionKeyPrefix: `parent:${parentAgentNamespace}:${parentSessionKey}:subagent:`,\n  };\n  const generatedTools: Record<string, unknown> = backgroundSubagents\n    ? {\n        background_cancel: createBackgroundCancelTool(\n          jobs,\n          executionHost,\n          backgroundToolScope\n        ),\n        background_output: createBackgroundOutputTool(\n          jobs,\n          executionHost,\n          backgroundToolScope\n        ),\n      }\n    : {};\n\n  for (const subagent of subagents) {\n    const name = subagent.name;\n    if (!name) {\n      continue;\n    }\n\n    generatedTools[`delegate_to_${name.replaceAll(\"-\", \"_\")}`] =\n      createDelegateTool({\n        jobs,\n        groups,\n        backgroundSubagents,\n        blockingRuns,\n        executionHost,\n        parentAgentNamespace,\n        parentSession,\n        parentSessionKey,\n        registerChildSession,\n        subagent,\n      });\n  }\n\n  return generatedTools as ToolSet;\n}\n\nfunction createDelegateTool({\n  jobs,\n  groups,\n  backgroundSubagents,\n  blockingRuns,\n  executionHost,\n  parentAgentNamespace,\n  parentSession,\n  parentSessionKey,\n  registerChildSession,\n  subagent,\n}: {\n  readonly jobs: Map<string, SubagentJob>;\n  readonly groups: Map<string, SubagentJobGroup>;\n  readonly backgroundSubagents: boolean;\n  readonly blockingRuns: BlockingSubagentRunCache;\n  readonly executionHost?: ExecutionHost;\n  readonly parentAgentNamespace: string;\n  readonly parentSession: RuntimeInputSink;\n  readonly parentSessionKey: string;\n  readonly registerChildSession: CreateSubagentToolsOptions[\"registerChildSession\"];\n  readonly subagent: Subagent;\n}) {\n  return tool<DelegateInput, unknown, Record<string, unknown>>({\n    description: `Delegate work to ${subagent.name}: ${subagent.description}`,\n    execute: async (input: DelegateInput, { abortSignal, toolCallId }) => {\n      const prompt = normalizeAgentInput(input.prompt);\n      const sessionKey = scopedChildSessionKey({\n        parentAgentNamespace,\n        parentSessionKey,\n        sessionKey: input.sessionKey,\n        subagent: subagent.name ?? \"subagent\",\n      });\n      if (input.run_in_background === true) {\n        if (!backgroundSubagents) {\n          throw new Error(\n            \"Background subagent delegation is not available for this host.\"\n          );\n        }\n\n        return await startBackgroundJob({\n          abortSignal: abortSignal ?? new AbortController().signal,\n          description: input.description,\n          executionHost,\n          groupId: parentSession.currentBackgroundGroupId?.(),\n          groups,\n          jobs,\n          delegateToolCallId: toolCallId,\n          parentSession,\n          parentRunId: parentSession.currentRunId?.() ?? parentAgentNamespace,\n          parentSessionKey,\n          ownerNamespace: parentAgentNamespace,\n          prompt,\n          registerCleanup: (cleanup) =>\n            registerChildSession(parentSessionKey, cleanup),\n          sessionKey,\n          subagent,\n        });\n      }\n\n      registerChildSession(parentSessionKey, () =>\n        subagent.session(sessionKey).delete()\n      );\n      await parentSession.emitObserverEvent({\n        description: input.description,\n        delegateToolCallId: toolCallId,\n        run_in_background: false,\n        subagent: subagent.name ?? \"subagent\",\n        type: \"subagent-job-start\",\n      });\n      const dedupeKey = blockingSubagentDedupeKey(\n        parentAgentNamespace,\n        toolCallId\n      );\n      const existing = blockingRuns.get(dedupeKey);\n      const result =\n        existing ??\n        runBlockingChild({\n          abortSignal,\n          dedupeKey,\n          executionHost,\n          parentRunId: parentSession.currentRunId?.() ?? parentAgentNamespace,\n          prompt,\n          sessionKey,\n          subagent,\n        });\n      blockingRuns.set(dedupeKey, result);\n      const awaitedResult = await result;\n      await parentSession.emitObserverEvent({\n        error: awaitedResult.error,\n        eventCount: awaitedResult.eventCount,\n        delegateToolCallId: toolCallId,\n        status: awaitedResult.result,\n        subagent: subagent.name ?? \"subagent\",\n        type: \"subagent-job-end\",\n      });\n      return awaitedResult;\n    },\n    inputSchema: jsonSchema<DelegateInput>({\n      additionalProperties: false,\n      properties: createDelegateToolProperties(backgroundSubagents),\n      required: [\"prompt\"],\n      type: \"object\",\n    }),\n  });\n}\n\nfunction createDelegateToolProperties(backgroundSubagents: boolean) {\n  const baseProperties = {\n    description: { type: \"string\" },\n    prompt: delegatePromptSchema,\n    sessionKey: { type: \"string\" },\n  };\n\n  if (!backgroundSubagents) {\n    return baseProperties;\n  }\n\n  return {\n    ...baseProperties,\n    run_in_background: { default: false, type: \"boolean\" },\n  };\n}\n"],"mappings":";;;;;;;;;AAsBA,SAAgB,oBAAoB,EAClC,qBACA,eACA,sBACA,eACA,kBACA,sBACA,aACsC;CACtC,IAAI,UAAU,WAAW,GACvB,OAAO,CAAC;CAGV,MAAM,uBAAO,IAAI,IAAyB;CAC1C,MAAM,yBAAS,IAAI,IAA8B;CACjD,MAAM,+BAAyC,IAAI,IAAI;CACvD,MAAM,sBAAsB,EAC1B,uBAAuB,UAAU,qBAAqB,GAAG,iBAAiB,YAC5E;CACA,MAAM,iBAA0C,sBAC5C;EACE,mBAAmB,2BACjB,MACA,eACA,mBACF;EACA,mBAAmB,2BACjB,MACA,eACA,mBACF;CACF,IACA,CAAC;CAEL,KAAK,MAAM,YAAY,WAAW;EAChC,MAAM,OAAO,SAAS;EACtB,IAAI,CAAC,MACH;EAGF,eAAe,eAAe,KAAK,WAAW,KAAK,GAAG,OACpD,mBAAmB;GACjB;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;EACF,CAAC;CACL;CAEA,OAAO;AACT;AAEA,SAAS,mBAAmB,EAC1B,MACA,QACA,qBACA,cACA,eACA,sBACA,eACA,kBACA,sBACA,YAYC;CACD,OAAO,KAAsD;EAC3D,aAAa,oBAAoB,SAAS,KAAK,IAAI,SAAS;EAC5D,SAAS,OAAO,OAAsB,EAAE,aAAa,iBAAiB;GACpE,MAAM,SAAS,oBAAoB,MAAM,MAAM;GAC/C,MAAM,aAAa,sBAAsB;IACvC;IACA;IACA,YAAY,MAAM;IAClB,UAAU,SAAS,QAAQ;GAC7B,CAAC;GACD,IAAI,MAAM,sBAAsB,MAAM;IACpC,IAAI,CAAC,qBACH,MAAM,IAAI,MACR,gEACF;IAGF,OAAO,MAAM,mBAAmB;KAC9B,aAAa,eAAe,IAAI,gBAAgB,EAAE;KAClD,aAAa,MAAM;KACnB;KACA,SAAS,cAAc,2BAA2B;KAClD;KACA;KACA,oBAAoB;KACpB;KACA,aAAa,cAAc,eAAe,KAAK;KAC/C;KACA,gBAAgB;KAChB;KACA,kBAAkB,YAChB,qBAAqB,kBAAkB,OAAO;KAChD;KACA;IACF,CAAC;GACH;GAEA,qBAAqB,wBACnB,SAAS,QAAQ,UAAU,EAAE,OAAO,CACtC;GACA,MAAM,cAAc,kBAAkB;IACpC,aAAa,MAAM;IACnB,oBAAoB;IACpB,mBAAmB;IACnB,UAAU,SAAS,QAAQ;IAC3B,MAAM;GACR,CAAC;GACD,MAAM,YAAY,0BAChB,sBACA,UACF;GAEA,MAAM,SADW,aAAa,IAAI,SAEzB,KACP,iBAAiB;IACf;IACA;IACA;IACA,aAAa,cAAc,eAAe,KAAK;IAC/C;IACA;IACA;GACF,CAAC;GACH,aAAa,IAAI,WAAW,MAAM;GAClC,MAAM,gBAAgB,MAAM;GAC5B,MAAM,cAAc,kBAAkB;IACpC,OAAO,cAAc;IACrB,YAAY,cAAc;IAC1B,oBAAoB;IACpB,QAAQ,cAAc;IACtB,UAAU,SAAS,QAAQ;IAC3B,MAAM;GACR,CAAC;GACD,OAAO;EACT;EACA,aAAa,WAA0B;GACrC,sBAAsB;GACtB,YAAY,6BAA6B,mBAAmB;GAC5D,UAAU,CAAC,QAAQ;GACnB,MAAM;EACR,CAAC;CACH,CAAC;AACH;AAEA,SAAS,6BAA6B,qBAA8B;CAClE,MAAM,iBAAiB;EACrB,aAAa,EAAE,MAAM,SAAS;EAC9B,QAAQ;EACR,YAAY,EAAE,MAAM,SAAS;CAC/B;CAEA,IAAI,CAAC,qBACH,OAAO;CAGT,OAAO;EACL,GAAG;EACH,mBAAmB;GAAE,SAAS;GAAO,MAAM;EAAU;CACvD;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minpeter/pss-runtime",
-  "version": "0.1.0-next.1",
+  "version": "0.1.0-next.2",
   "description": "Generic agent runtime for sessions, model loops, and synchronized run events.",
   "type": "module",
   "main": "./dist/index.js",
@@ -20,6 +20,16 @@
       "@minpeter/pss-source": "./src/session/store/file.ts",
       "types": "./dist/session/store/file.d.ts",
       "import": "./dist/session/store/file.js"
+    },
+    "./execution": {
+      "@minpeter/pss-source": "./src/execution/index.ts",
+      "types": "./dist/execution/index.d.ts",
+      "import": "./dist/execution/index.js"
+    },
+    "./execution/memory": {
+      "@minpeter/pss-source": "./src/execution/memory.ts",
+      "types": "./dist/execution/memory.d.ts",
+      "import": "./dist/execution/memory.js"
     }
   },
   "files": [

package/dist/hooks.d.ts

@@ -1,32 +0,0 @@
-import { RuntimeLlmContext } from "./llm.js";
-import { UserInput } from "./session/input.js";
-
-//#region src/hooks.d.ts
-type AgentTurnResult = "aborted" | "completed";
-type AgentStepResult = "completed" | "continue";
-type MaybePromise<T> = PromiseLike<T> | T;
-interface AgentBeforeTurnContext {
-  readonly history: RuntimeLlmContext["history"];
-  readonly input: UserInput;
-  readonly signal: AbortSignal;
-}
-interface AgentAfterTurnContext extends AgentBeforeTurnContext {
-  readonly result: AgentTurnResult;
-}
-interface AgentBeforeStepContext {
-  readonly history: RuntimeLlmContext["history"];
-  readonly signal: AbortSignal;
-  readonly stepIndex: number;
-}
-interface AgentAfterStepContext extends AgentBeforeStepContext {
-  readonly result: AgentStepResult;
-}
-interface AgentHooks {
-  afterStep?(context: AgentAfterStepContext): MaybePromise<void>;
-  afterTurn?(context: AgentAfterTurnContext): MaybePromise<void>;
-  beforeStep?(context: AgentBeforeStepContext): MaybePromise<void>;
-  beforeTurn?(context: AgentBeforeTurnContext): MaybePromise<void>;
-}
-//#endregion
-export { AgentAfterStepContext, AgentAfterTurnContext, AgentBeforeStepContext, AgentBeforeTurnContext, AgentHooks, AgentStepResult, AgentTurnResult };
-//# sourceMappingURL=hooks.d.ts.map