@bastani/atomic 0.9.12-alpha.1 → 0.9.13-alpha.1

package/dist/builtin/subagents/src/extension/startup-maintenance.ts

@@ -1,15 +1,12 @@
 import * as path from "node:path";
-import type { ExtensionAPI, ExtensionContext } from "@bastani/atomic";
-import { createResultWatcher } from "../runs/background/result-watcher.ts";
-import { cleanupOldNestedRuntimeDirs } from "../runs/shared/nested-events.ts";
+import type { ExtensionContext } from "@bastani/atomic";
+import { cleanupOldNestedRuntimeDirs } from "../runs/inprocess/runtime-support/nested-api.ts";
 import { cleanupAllArtifactDirs, cleanupOldArtifacts, getArtifactsDir } from "../shared/artifacts.ts";
 import { cleanupOldChainDirs } from "../shared/settings.ts";
 import type { SubagentState } from "../shared/types.ts";
 
 export interface SubagentStartupMaintenance {
 	scheduleStartupCleanup(): void;
-	startResultWatcherDeferred(): void;
-	primeExistingResultsDeferred(): void;
 	cleanupSessionArtifactsDeferred(ctx: ExtensionContext): void;
 	stop(): void;
 }
@@ -47,54 +44,48 @@ function swallowCleanup(task: () => void): void {
 	} catch {}
 }
 
+interface StartupMaintenanceOptions {
+	artifactCleanupDays: number;
+	resultsDir?: string;
+	resultTtlMs?: number;
+	scheduleMacrotask?: (task: () => void) => () => void;
+	scheduleDelayed?: (task: () => void, delayMs: number) => () => void;
+}
+
+export function createSubagentStartupMaintenance(
+	state: SubagentState,
+	options: StartupMaintenanceOptions,
+): SubagentStartupMaintenance;
 export function createSubagentStartupMaintenance(
-	pi: ExtensionAPI,
+	_pi: unknown,
 	state: SubagentState,
-	options: {
-		resultsDir: string;
-		artifactCleanupDays: number;
-		resultTtlMs: number;
-		scheduleMacrotask?: (task: () => void) => () => void;
-		scheduleDelayed?: (task: () => void, delayMs: number) => () => void;
-	},
+	options: StartupMaintenanceOptions,
+): SubagentStartupMaintenance;
+export function createSubagentStartupMaintenance(
+	_first: SubagentState | unknown,
+	second: StartupMaintenanceOptions | SubagentState,
+	third?: StartupMaintenanceOptions,
 ): SubagentStartupMaintenance {
-	const { startResultWatcher, primeExistingResults, stopResultWatcher } = createResultWatcher(
-		pi,
-		state,
-		options.resultsDir,
-		options.resultTtlMs,
-	);
+	const options = third ?? (second as StartupMaintenanceOptions);
 	const cancelTasks = new Set<() => void>();
-	// The sessions root derived from a host-provided (non-default, e.g. isolated
-	// programmatic agentDir) session directory. When set, the global artifact scan
-	// stays inside it instead of touching the real global/legacy sessions roots.
-	// A custom session dir that does not follow the <agentDir>/sessions/<safe-cwd>
-	// layout (the default layout the SDK derives for a programmatic agentDir, with
-	// <safe-cwd> encoding the current working directory) yields no roots at all, so
-	// cleanup never broadens into an arbitrary directory's siblings.
 	let contextSessionsRoots: readonly string[] | undefined;
 	const noteSessionContext = (ctx: ExtensionContext): void => {
 		try {
 			if (ctx.sessionManager.usesDefaultSessionDir()) {
-				// Only a valid default-session context intentionally restores the
-				// env/global cleanup roots.
 				contextSessionsRoots = undefined;
 				return;
 			}
 			const sessionDir = ctx.sessionManager.getSessionDir();
-			// A partial or throwing context keeps the last validated root: destructive
-			// cleanup must never broaden from an isolated root to the global roots on
-			// the strength of an unusable context.
 			if (!sessionDir) return;
 			const parent = path.dirname(sessionDir);
 			const safeCwd = `--${path
 				.resolve(ctx.cwd)
 				.replace(/^[/\\]/, "")
 				.replace(/[/\\:]/g, "-")}--`;
-			const followsAgentDirLayout = path.basename(parent) === "sessions" && path.basename(sessionDir) === safeCwd;
-			contextSessionsRoots = followsAgentDirLayout ? [parent] : [];
+			contextSessionsRoots =
+				path.basename(parent) === "sessions" && path.basename(sessionDir) === safeCwd ? [parent] : [];
 		} catch {
-			// A stale or partial context leaves cleanup on the env/global fallback.
+			// A stale or partial context leaves cleanup on the last validated root.
 		}
 	};
 	const schedule = (task: () => void): void => {
@@ -117,21 +108,12 @@ export function createSubagentStartupMaintenance(
 			schedule(() => {
 				swallowCleanup(cleanupOldChainDirs);
 				swallowCleanup(() => cleanupOldNestedRuntimeDirs(options.artifactCleanupDays));
-				// The global session-artifact scan can touch thousands of historical session
-				// directories, so it waits until well after startup instead of running on the
-				// activation macrotask.
 				scheduleDelayed(
 					() => swallowCleanup(() => cleanupAllArtifactDirs(options.artifactCleanupDays, contextSessionsRoots)),
 					STARTUP_ARTIFACT_SCAN_DELAY_MS,
 				);
 			});
 		},
-		startResultWatcherDeferred() {
-			schedule(startResultWatcher);
-		},
-		primeExistingResultsDeferred() {
-			schedule(primeExistingResults);
-		},
 		cleanupSessionArtifactsDeferred(ctx) {
 			noteSessionContext(ctx);
 			let sessionFile: string | null | undefined;
@@ -148,7 +130,6 @@ export function createSubagentStartupMaintenance(
 		stop() {
 			for (const cancel of cancelTasks) cancel();
 			cancelTasks.clear();
-			stopResultWatcher();
 		},
 	};
 }

package/dist/builtin/subagents/src/intercom/result-intercom.ts

@@ -9,6 +9,7 @@ import {
 	type SingleResult,
 	SUBAGENT_RESULT_INTERCOM_DELIVERY_EVENT,
 	SUBAGENT_RESULT_INTERCOM_EVENT,
+	type SubagentAttemptStatus,
 	type SubagentResultIntercomChild,
 	type SubagentResultIntercomPayload,
 	type SubagentResultStatus,
@@ -16,18 +17,17 @@ import {
 } from "../shared/types.ts";
 
 export function resolveSubagentResultStatus(input: {
-	exitCode?: number;
+	status?: SubagentAttemptStatus;
 	success?: boolean;
 	state?: string;
 	interrupted?: boolean;
 	detached?: boolean;
 }): SubagentResultStatus {
-	if (input.detached) return "detached";
-	if (input.interrupted || input.state === "paused") return "paused";
-	if (typeof input.success === "boolean") return input.success ? "completed" : "failed";
-	if (input.state === "complete") return "completed";
-	if (input.state === "failed") return "failed";
-	if (typeof input.exitCode === "number") return input.exitCode === 0 ? "completed" : "failed";
+	if (input.detached || input.status === "continued") return "detached";
+	if (input.interrupted || input.status === "interrupted" || input.state === "paused") return "paused";
+	if (input.status === "ok" || input.success === true || input.state === "complete") return "completed";
+	if (input.status === "error" || input.status === "skipped" || input.success === false || input.state === "failed")
+		return "failed";
 	return "failed";
 }