@gajae-code/coding-agent 0.11.0 → 0.11.2

package/src/tools/subagent.ts

@@ -80,8 +80,17 @@ export interface SubagentSnapshot {
 	modelFellBack?: boolean;
 }
 
+export type SubagentAwaitOutcome = "completed" | "timed_out" | "interrupted";
+
+const AWAIT_INTERRUPTED_GUIDANCE =
+	"Await interrupted; this subagent continues. Inspect its current state or cancel it only when necessary.";
+
 export interface SubagentToolDetails {
 	subagents: SubagentSnapshot[];
+	/** Await outcome for a live await receipt; omitted when no wait was started. */
+	awaitOutcome?: SubagentAwaitOutcome;
+	/** True only when the parent await was interrupted; the child was not cancelled. */
+	interrupted?: true;
 }
 
 export class SubagentTool implements AgentTool<typeof subagentSchema, SubagentToolDetails> {
@@ -370,35 +379,50 @@ export class SubagentTool implements AgentTool<typeof subagentSchema, SubagentTo
 		// the viewport (the source of the await-panel repaint storms).
 		emitIfChanged(true);
 
-		let timedOut = false;
+		let awaitOutcome: SubagentAwaitOutcome;
+		const { promise: timeoutPromise, resolve: resolveTimeout } = Promise.withResolvers<SubagentAwaitOutcome>();
+		const timeoutTimer = setTimeout(() => resolveTimeout("timed_out"), timeoutMs);
+		const completionPromise = Promise.all(runningJobs.map(job => job.promise)).then(() => "completed" as const);
+		let onAbort: (() => void) | undefined;
 		try {
-			const completionPromise = Promise.all(runningJobs.map(job => job.promise));
-			const timeoutPromise = Bun.sleep(timeoutMs).then(() => {
-				timedOut = true;
-			});
 			if (signal) {
-				const { promise: abortPromise, resolve: abortResolve } = Promise.withResolvers<void>();
-				const onAbort = () => abortResolve();
-				signal.addEventListener("abort", onAbort, { once: true });
-				try {
-					await Promise.race([completionPromise, timeoutPromise, abortPromise]);
-				} finally {
-					signal.removeEventListener("abort", onAbort);
-				}
+				const { promise: abortPromise, resolve: resolveAbort } = Promise.withResolvers<SubagentAwaitOutcome>();
+				onAbort = () => resolveAbort("interrupted");
+				if (signal.aborted) onAbort();
+				else signal.addEventListener("abort", onAbort, { once: true });
+				awaitOutcome = await Promise.race([completionPromise, timeoutPromise, abortPromise]);
 			} else {
-				await Promise.race([completionPromise, timeoutPromise]);
+				awaitOutcome = await Promise.race([completionPromise, timeoutPromise]);
 			}
 		} finally {
-			manager.unwatchJobs(watchedJobIds);
+			clearTimeout(timeoutTimer);
+			if (signal && onAbort) signal.removeEventListener("abort", onAbort);
 			if (progressTimer) clearInterval(progressTimer);
 		}
+		if (awaitOutcome !== "interrupted") {
+			const terminalWatchedJobIds = watchedJobIds.filter(jobId => {
+				const status = manager.getJob(jobId)?.status;
+				return status === "completed" || status === "failed" || status === "cancelled";
+			});
+			manager.acknowledgeDeliveries(terminalWatchedJobIds);
+		}
+		manager.unwatchJobs(watchedJobIds);
 
-		return await this.#buildRecordResult(manager, records, {
-			title: "Subagent await",
-			notFoundIds,
-			timedOut,
+		const finalRecords = this.#visibleRecordsByIds(
+			manager,
+			records.map(record => record.subagentId),
+			ownerFilter,
+		);
+		const finalNotFoundIds = [...new Set([...notFoundIds, ...records.map(record => record.subagentId)])].filter(
+			id => !finalRecords.some(record => record.subagentId === id),
+		);
+		return await this.#buildRecordResult(manager, finalRecords, {
+			title: awaitOutcome === "interrupted" ? "Subagent await interrupted" : "Subagent await",
+			notFoundIds: finalNotFoundIds,
+			timedOut: awaitOutcome === "timed_out",
 			verbosity: params.verbosity ?? "receipt",
 			attachLiveProgress: true,
+			awaitOutcome,
 		});
 	}
 
@@ -516,6 +540,7 @@ export class SubagentTool implements AgentTool<typeof subagentSchema, SubagentTo
 			timedOut?: boolean;
 			verbosity?: SubagentParams["verbosity"];
 			attachLiveProgress?: boolean;
+			awaitOutcome?: SubagentAwaitOutcome;
 		},
 	): Promise<AgentToolResult<SubagentToolDetails>> {
 		const verifiedOutputIds = await this.#verifiedOutputIds(records);
@@ -530,18 +555,34 @@ export class SubagentTool implements AgentTool<typeof subagentSchema, SubagentTo
 		for (const id of options.notFoundIds ?? []) {
 			snapshots.push(this.#missingSnapshot(id, "not_found", "No visible detached subagent matches this id."));
 		}
-		manager.acknowledgeDeliveries(
-			snapshots
-				.filter(
-					s =>
-						s.status !== "running" && s.status !== "paused" && s.status !== "queued" && s.status !== "not_found",
-				)
-				.map(s => s.jobId),
-		);
-		return this.#buildSnapshotResult(snapshots, options.title);
+		if (options.awaitOutcome !== "interrupted") {
+			manager.acknowledgeDeliveries(
+				snapshots
+					.filter(
+						s =>
+							s.status !== "running" &&
+							s.status !== "paused" &&
+							s.status !== "queued" &&
+							s.status !== "not_found",
+					)
+					.map(s => s.jobId),
+			);
+		}
+		if (options.awaitOutcome === "interrupted") {
+			for (const snapshot of snapshots) {
+				if (snapshot.status === "running" || snapshot.status === "paused" || snapshot.status === "queued") {
+					snapshot.guidance = AWAIT_INTERRUPTED_GUIDANCE;
+				}
+			}
+		}
+		return this.#buildSnapshotResult(snapshots, options.title, options.awaitOutcome);
 	}
 
-	#buildSnapshotResult(snapshots: SubagentSnapshot[], title: string): AgentToolResult<SubagentToolDetails> {
+	#buildSnapshotResult(
+		snapshots: SubagentSnapshot[],
+		title: string,
+		awaitOutcome?: SubagentAwaitOutcome,
+	): AgentToolResult<SubagentToolDetails> {
 		const lines = [`## ${title} (${snapshots.length})`, ""];
 		for (const snapshot of snapshots) {
 			lines.push(`### ${snapshot.id} — ${snapshot.status}`);
@@ -571,7 +612,11 @@ export class SubagentTool implements AgentTool<typeof subagentSchema, SubagentTo
 		}
 		return {
 			content: [{ type: "text", text: lines.join("\n").trimEnd() }],
-			details: { subagents: snapshots },
+			details: {
+				subagents: snapshots,
+				...(awaitOutcome ? { awaitOutcome } : {}),
+				...(awaitOutcome === "interrupted" ? { interrupted: true } : {}),
+			},
 		};
 	}
 
@@ -778,8 +823,15 @@ function previewJobOutput(
  * countdown ticking is sacrificed by design; every real transition still changes
  * the signature.
  */
-export function subagentAwaitRenderedStateSignature(subagents: readonly SubagentSnapshot[]): string {
-	return JSON.stringify(subagents.map(canonicalizeSnapshotForSignature));
+export function subagentAwaitRenderedStateSignature(
+	subagents: readonly SubagentSnapshot[],
+	receipt?: Pick<SubagentToolDetails, "awaitOutcome" | "interrupted">,
+): string {
+	return JSON.stringify({
+		awaitOutcome: receipt?.awaitOutcome ?? null,
+		interrupted: receipt?.interrupted === true,
+		subagents: subagents.map(canonicalizeSnapshotForSignature),
+	});
 }
 
 function canonicalizeSnapshotForSignature(snapshot: SubagentSnapshot): unknown {

package/src/utils/event-bus.ts

@@ -1,7 +1,7 @@
 import { logger } from "@gajae-code/utils";
 
 export class EventBus {
-	readonly #listeners = new Map<string, Set<(data: unknown) => void>>();
+	readonly #listeners = new Map<string, Set<(data: unknown) => void | PromiseLike<void>>>();
 
 	emit(channel: string, data: unknown): void {
 		const handlers = this.#listeners.get(channel);
@@ -12,13 +12,18 @@ export class EventBus {
 		}
 	}
 
-	on(channel: string, handler: (data: unknown) => void): () => void {
+	on(channel: string, handler: (data: unknown) => void | PromiseLike<void>): () => void {
 		if (!this.#listeners.has(channel)) {
 			this.#listeners.set(channel, new Set());
 		}
-		const safeHandler = async (data: unknown) => {
+		const safeHandler = (data: unknown): void => {
 			try {
-				await handler(data);
+				const result = handler(data);
+				if (result && typeof result.then === "function") {
+					Promise.resolve(result).catch(err => {
+						logger.error("Event handler error", { channel, error: String(err) });
+					});
+				}
 			} catch (err) {
 				logger.error("Event handler error", { channel, error: String(err) });
 			}

package/src/web/search/index.ts

@@ -91,7 +91,7 @@ function formatCount(label: string, count: number): string {
 }
 
 /** Format response for LLM consumption */
-function formatForLLM(response: SearchResponse): string {
+export function formatSearchResponseForLlm(response: SearchResponse): string {
 	const parts: string[] = [];
 
 	if (response.answer) {
@@ -138,7 +138,7 @@ function formatForLLM(response: SearchResponse): string {
 		}
 	}
 
-	return parts.join("\n");
+	return `<untrusted-content>\n${parts.join("\n").replace(/<\/untrusted-content>/gi, "&lt;/untrusted-content>")}\n</untrusted-content>`;
 }
 
 interface ExecuteSearchOptions {
@@ -248,7 +248,7 @@ async function executeSearch(
 					response = await provider.search({ ...baseSearchParams, signal });
 				}
 
-				const text = formatForLLM(response);
+				const text = formatSearchResponseForLlm(response);
 				const warning = failures.length > 0 ? formatFallbackWarning(failures, provider) : undefined;
 
 				return {

package/dist/types/discovery/plugin-dir-roots.d.ts

@@ -1,15 +0,0 @@
-/** Synthetic plugin root for a --plugin-dir path. Shape-compatible with Anthropic modelPluginRoot. */
-export interface PluginDirRoot {
-    id: string;
-    marketplace: string;
-    plugin: string;
-    version: string;
-    path: string;
-    scope: "user" | "project";
-}
-/**
- * Build a synthetic plugin root from a --plugin-dir resolved path.
- * @param resolvedPath Absolute path to the plugin directory
- * @param manifestName Plugin name from manifest; falls back to directory basename
- */
-export declare function buildPluginDirRoot(resolvedPath: string, manifestName?: string): PluginDirRoot;

package/dist/types/runtime-mcp/discoverable-tool-metadata.d.ts

@@ -1,7 +0,0 @@
-/**
- * Back-compat re-export layer.
- * All types and functions have moved to src/tool-discovery/tool-index.ts.
- * This file exists solely so existing imports continue to compile without changes.
- */
-export type { DiscoverableMCPSearchDocument, DiscoverableMCPSearchIndex, DiscoverableMCPSearchResult, DiscoverableMCPTool, DiscoverableMCPToolServerSummary, DiscoverableMCPToolSummary, } from "../tool-discovery/tool-index";
-export { buildDiscoverableMCPSearchIndex, collectDiscoverableMCPTools, formatDiscoverableMCPToolServerSummary, getDiscoverableMCPTool, isMCPBridgeTool, isMCPToolName, searchDiscoverableMCPTools, selectDiscoverableMCPToolNamesByServer, summarizeDiscoverableMCPTools, } from "../tool-discovery/tool-index";

package/src/discovery/plugin-dir-roots.ts

@@ -1,28 +0,0 @@
-import * as path from "node:path";
-
-/** Synthetic plugin root for a --plugin-dir path. Shape-compatible with Anthropic modelPluginRoot. */
-export interface PluginDirRoot {
-	id: string;
-	marketplace: string;
-	plugin: string;
-	version: string;
-	path: string;
-	scope: "user" | "project";
-}
-
-/**
- * Build a synthetic plugin root from a --plugin-dir resolved path.
- * @param resolvedPath Absolute path to the plugin directory
- * @param manifestName Plugin name from manifest; falls back to directory basename
- */
-export function buildPluginDirRoot(resolvedPath: string, manifestName?: string): PluginDirRoot {
-	const pluginName = manifestName || path.basename(resolvedPath);
-	return {
-		id: `${pluginName}@__local__`,
-		marketplace: "__local__",
-		plugin: pluginName,
-		version: "local",
-		path: resolvedPath,
-		scope: "user",
-	};
-}

package/src/runtime-mcp/discoverable-tool-metadata.ts

@@ -1,25 +0,0 @@
-/**
- * Back-compat re-export layer.
- * All types and functions have moved to src/tool-discovery/tool-index.ts.
- * This file exists solely so existing imports continue to compile without changes.
- */
-export type {
-	DiscoverableMCPSearchDocument,
-	DiscoverableMCPSearchIndex,
-	DiscoverableMCPSearchResult,
-	DiscoverableMCPTool,
-	DiscoverableMCPToolServerSummary,
-	DiscoverableMCPToolSummary,
-} from "../tool-discovery/tool-index";
-
-export {
-	buildDiscoverableMCPSearchIndex,
-	collectDiscoverableMCPTools,
-	formatDiscoverableMCPToolServerSummary,
-	getDiscoverableMCPTool,
-	isMCPBridgeTool,
-	isMCPToolName,
-	searchDiscoverableMCPTools,
-	selectDiscoverableMCPToolNamesByServer,
-	summarizeDiscoverableMCPTools,
-} from "../tool-discovery/tool-index";