agent-transport-system 0.2.6 → 0.2.8

package/dist/ats.js

@@ -11,7 +11,7 @@ import * as clackPrompts from "@clack/prompts";
 import { cancel, confirm, intro, isCancel, multiselect, note, outro, password, select, spinner, text } from "@clack/prompts";
 import { execFile, spawn } from "node:child_process";
 import { access, appendFile, chmod, copyFile, cp, lstat, mkdir, mkdtemp, open, readFile, readdir, readlink, realpath, rename, rm, stat, symlink, writeFile } from "node:fs/promises";
-import crypto, { createHash, randomBytes, randomUUID } from "node:crypto";
+import crypto$1, { createHash, randomBytes, randomUUID } from "node:crypto";
 import pc from "picocolors";
 import { promisify, stripVTControlCharacters } from "node:util";
 import stringWidth from "string-width";
@@ -23,7 +23,7 @@ import wrapAnsi from "wrap-ansi";
 import { Box, Container, Editor, Key, ProcessTerminal, TUI, Text, getEditorKeybindings, matchesKey } from "@mariozechner/pi-tui";
 
 //#region package.json
-var version$1 = "0.2.6";
+var version$1 = "0.2.8";
 var package_default = {
 	name: "agent-transport-system",
 	version: version$1,
@@ -2155,7 +2155,7 @@ async function requestLatestPackageVersion(packageName) {
 		if (!version) throw new Error("missing version");
 		return version;
 	} catch (error) {
-		throw new Error(`version check failed: invalid registry response: ${toErrorMessage$17(error)}`);
+		throw new Error(`version check failed: invalid registry response: ${toErrorMessage$18(error)}`);
 	}
 }
 function compareSemver(a, b) {
@@ -2220,7 +2220,7 @@ function toNonEmptyString(value) {
 	const normalized = value.trim();
 	return normalized.length > 0 ? normalized : null;
 }
-function toErrorMessage$17(error) {
+function toErrorMessage$18(error) {
 	if (error instanceof Error) return error.message;
 	return String(error);
 }
@@ -2934,6 +2934,9 @@ async function getDaemonRuntimeStatus(pathInput = {}) {
 		autoStart: state.autoStart
 	};
 }
+async function readDaemonServiceRuntimeSnapshot(pathInput = {}) {
+	return await readDaemonServiceRuntimeState(pathInput);
+}
 function resolveDaemonServiceRuntimeMetadata(input = {}) {
 	const env = input.env ?? process.env;
 	const managedBySystemService = input.managedBySystemService === true || env[DAEMON_SERVICE_RUNTIME_SYSTEM_SERVICE_ENV] === "1";
@@ -3415,7 +3418,7 @@ async function storeAccessToken(input) {
 				key
 			};
 		}
-		throw new Error(`failed to store access token in macOS Keychain: ${toErrorMessage$16(error)}`);
+		throw new Error(`failed to store access token in macOS Keychain: ${toErrorMessage$17(error)}`);
 	}
 	if (process.platform === "win32") try {
 		await setWindowsDpapiToken({
@@ -3437,7 +3440,7 @@ async function storeAccessToken(input) {
 				key
 			};
 		}
-		throw new Error(`failed to store access token via Windows DPAPI: ${toErrorMessage$16(error)}`);
+		throw new Error(`failed to store access token via Windows DPAPI: ${toErrorMessage$17(error)}`);
 	}
 	if (allowInsecureFallback()) {
 		await setInsecureFileToken({
@@ -3678,7 +3681,7 @@ function normalizeToken(value) {
 	const normalized = value.trim();
 	return normalized.length > 0 ? normalized : null;
 }
-function toErrorMessage$16(error) {
+function toErrorMessage$17(error) {
 	if (error instanceof Error) return error.message;
 	return String(error);
 }
@@ -8470,7 +8473,7 @@ var ZodFirstPartyTypeKind;
 (function(ZodFirstPartyTypeKind) {})(ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {}));
 
 //#endregion
-//#region ../../packages/schemas/dist/envelope-IeNocT0x.js
+//#region ../../packages/schemas/dist/envelope-BjKosHeX.js
 const providerConversationExternalImportCapabilitySchema = _enum(["unsupported", "by_ref_id"]);
 const providerConversationResumeCapabilitySchema = _enum(["unsupported", "by_ref_id"]);
 const providerConversationDiscoverCapabilitySchema = literal("unsupported");
@@ -9142,6 +9145,97 @@ const spacePasswordSchema = string().min(SPACE_PASSWORD_MIN_LENGTH);
 const createSpacePasswordBodySchema = strictObject({ password: spacePasswordSchema.optional() });
 const upsertSpacePasswordBodySchema = strictObject({ password: spacePasswordSchema });
 const spacePasswordStateSchema = strictObject({ passwordProtected: boolean() });
+const MAX_SIGNAL_REPLY_TO_PREVIEW_LENGTH = 120;
+const SPACE_MEMBER_JOIN_NOTICE_PURPOSE = "space_membership_join_notice";
+const SPACE_MEMBER_REMOVE_NOTICE_PURPOSE = "space_membership_remove_notice";
+const SPACE_MENTION_REJECT_NOTICE_PURPOSE = "space_mention_reject_notice";
+const AGENT_REPLYING_PURPOSE = "agent_replying";
+const AGENT_REPLYING_END_PURPOSE = "agent_replying_end";
+const AGENT_REPLY_PREVIEW_PURPOSE = "agent_reply_preview";
+const AGENT_REPLY_PREVIEW_END_PURPOSE = "agent_reply_preview_end";
+const DISPATCH_ACTIVITY_DISPATCHING_PURPOSE = "dispatch_activity_dispatching";
+const DISPATCH_ACTIVITY_RETRYING_PURPOSE = "dispatch_activity_retrying";
+const DISPATCH_ACTIVITY_FAILED_PURPOSE = "dispatch_activity_failed";
+const CONVERSATION_CONTINUITY_WARNING_PURPOSE = "conversation_continuity_warning";
+const MENTION_TOKEN_PATTERN$3 = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
+const normalizeMentionToken$1 = (value) => {
+	const normalized = trimmedStringFromUnknown(value);
+	if (!normalized) return;
+	return MENTION_TOKEN_PATTERN$3.test(normalized) ? normalized : void 0;
+};
+const signalTextReplyToSchema = object({
+	signalId: preprocess(trimmedStringFromUnknown, string().min(1)),
+	profileId: atsRuntimeProfileIdSchema,
+	profileKind: _enum([
+		"human",
+		"agent",
+		"system"
+	]).nullable(),
+	profileName: preprocess(trimmedStringFromUnknown, string().min(1).max(MAX_PROFILE_NAME_LENGTH)),
+	previewText: preprocess(trimmedStringFromUnknown, string().min(1).max(MAX_SIGNAL_REPLY_TO_PREVIEW_LENGTH))
+});
+const signalTextMetaSchema = object({
+	transient: literal(true).optional(),
+	clientMessageId: preprocess(trimmedStringFromUnknown, string().max(200)).optional(),
+	sourceEventId: preprocess(trimmedStringFromUnknown, string().max(200)).optional(),
+	purpose: preprocess(trimmedStringFromUnknown, string().min(1).max(80)).optional(),
+	dispatchId: preprocess(trimmedStringFromUnknown, string().max(200)).optional(),
+	targetProfileId: atsRuntimeProfileIdSchema.optional(),
+	targetProfileKind: _enum(["human", "agent"]).optional(),
+	targetProfileName: preprocess(trimmedStringFromUnknown, string().min(1).max(MAX_PROFILE_NAME_LENGTH)).optional(),
+	targetProfileHandle: preprocess(normalizeMentionToken$1, string().regex(MENTION_TOKEN_PATTERN$3).max(128)).optional(),
+	targetWakeToken: preprocess(normalizeMentionToken$1, string().regex(MENTION_TOKEN_PATTERN$3).max(128)).optional(),
+	addedByProfileId: atsRuntimeProfileIdSchema.optional(),
+	addedByDisplayName: preprocess(trimmedStringFromUnknown, string().min(1).max(MAX_PROFILE_NAME_LENGTH)).optional(),
+	removedByProfileId: atsRuntimeProfileIdSchema.optional(),
+	removedByDisplayName: preprocess(trimmedStringFromUnknown, string().min(1).max(MAX_PROFILE_NAME_LENGTH)).optional()
+});
+const postedSignalTextMetaSchema = signalTextMetaSchema.superRefine((meta, context) => {
+	if (meta.purpose !== SPACE_MEMBER_JOIN_NOTICE_PURPOSE && meta.purpose !== SPACE_MEMBER_REMOVE_NOTICE_PURPOSE) return;
+	if (!meta.targetProfileId) context.addIssue({
+		code: "custom",
+		message: "targetProfileId is required for space member notices",
+		path: ["targetProfileId"]
+	});
+	if (!meta.targetProfileKind) context.addIssue({
+		code: "custom",
+		message: "targetProfileKind is required for space member notices",
+		path: ["targetProfileKind"]
+	});
+	if (meta.purpose === SPACE_MEMBER_JOIN_NOTICE_PURPOSE && !meta.addedByProfileId) context.addIssue({
+		code: "custom",
+		message: "addedByProfileId is required for space member notices",
+		path: ["addedByProfileId"]
+	});
+	if (meta.purpose === SPACE_MEMBER_JOIN_NOTICE_PURPOSE && !meta.addedByDisplayName) context.addIssue({
+		code: "custom",
+		message: "addedByDisplayName is required for space member notices",
+		path: ["addedByDisplayName"]
+	});
+	if (meta.purpose === SPACE_MEMBER_REMOVE_NOTICE_PURPOSE && !meta.removedByProfileId) context.addIssue({
+		code: "custom",
+		message: "removedByProfileId is required for space member notices",
+		path: ["removedByProfileId"]
+	});
+	if (meta.purpose === SPACE_MEMBER_REMOVE_NOTICE_PURPOSE && !meta.removedByDisplayName) context.addIssue({
+		code: "custom",
+		message: "removedByDisplayName is required for space member notices",
+		path: ["removedByDisplayName"]
+	});
+});
+const signalTextDataSchema = object({
+	text: preprocess(trimmedStringFromUnknown, string().min(1).max(MAX_TEXT_LENGTH$1)),
+	replyTo: signalTextReplyToSchema.optional(),
+	meta: signalTextMetaSchema.optional()
+});
+const signalTextSchema = object({
+	type: literal("signal.text"),
+	data: object({
+		text: preprocess(trimmedStringFromUnknown, string().min(1).max(MAX_TEXT_LENGTH$1)),
+		replyTo: signalTextReplyToSchema.optional(),
+		meta: postedSignalTextMetaSchema.optional()
+	})
+});
 const ATSD_MENTION_DISPATCH_RESULT_SCHEMA_VERSION = 2;
 const atsdMentionDispatchStatusSchema = _enum([
 	"dispatch_ready",
@@ -9214,6 +9308,7 @@ const atsdDispatchSourceSignalSnapshotSchema = strictObject({
 	]).nullable(),
 	profileWakeToken: string().regex(MENTION_TOKEN_PATTERN$2).max(128).optional()
 });
+const atsdDispatchReplyToSnapshotSchema = signalTextReplyToSchema;
 const atsdDispatchQueueLegacyMessageSchemaV1 = strictObject({
 	v: literal(1),
 	dispatchId: string().min(1),
@@ -9228,6 +9323,7 @@ const atsdDispatchQueueMessageSchema = strictObject({
 	dispatchId: string().min(1),
 	spaceId: string().min(1),
 	sourceEventId: string().min(1),
+	sourceClientMessageId: string().min(1).max(200).nullable().optional(),
 	targetProfileId: string().min(1),
 	targetProfileWakeToken: string().regex(MENTION_TOKEN_PATTERN$2).max(128).optional(),
 	dispatchChainId: string().min(1),
@@ -9247,6 +9343,7 @@ const atsdDispatchQueueMessageSchema = strictObject({
 	dispatchRulesSnapshot: atsdDispatchRulesSnapshotSchema,
 	dispatchSnapshot: atsdDispatchSnapshotSchema,
 	sourceSignalSnapshot: atsdDispatchSourceSignalSnapshotSchema.optional(),
+	replyToSnapshot: atsdDispatchReplyToSnapshotSchema.optional(),
 	spaceNameSnapshot: string().min(1).nullable().optional(),
 	sourceProfileNameSnapshot: string().min(1).nullable().optional(),
 	targetProfileNameSnapshot: string().min(1).nullable().optional(),
@@ -9285,6 +9382,7 @@ const atsdDispatchQueueMessageSchema = strictObject({
 		message: "controllerSnapshot target binding fields must match dispatchSnapshot"
 	});
 });
+const atsdDispatchQueueIngressSchema = discriminatedUnion("v", [atsdDispatchQueueLegacyMessageSchemaV1, atsdDispatchQueueMessageSchema]);
 const ATSD_TASK_RESULT_SCHEMA_VERSION = 3;
 const ATSD_TASK_RESULT_SCHEMA_VERSION_PREVIOUS = 2;
 const ATSD_TASK_RESULT_SCHEMA_VERSION_LEGACY = 1;
@@ -9404,6 +9502,7 @@ const atsdTaskResultEnvelopeSchema = union([
 	atsdTaskResultEnvelopeSchemaV1
 ]);
 const DAEMON_HUB_SCHEMA_VERSION = 1;
+const MENTION_TOKEN_PATTERN$1 = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
 const daemonHubErrorCodeSchema = _enum([
 	"daemon.session.reject_conflict",
 	"daemon.session.not_found",
@@ -9468,6 +9567,46 @@ const daemonHubLookupRouteResponseSchema = discriminatedUnion("online", [strictO
 	online: literal(false),
 	reasonCode: daemonHubErrorCodeSchema
 })]);
+const daemonHubDispatchSourceSignalSchema = strictObject({
+	profileId: string().min(1).nullable(),
+	profileKind: _enum([
+		"agent",
+		"human",
+		"system"
+	]).nullable(),
+	profileHandle: string().regex(MENTION_TOKEN_PATTERN$1).max(128).optional(),
+	profileWakeToken: string().regex(MENTION_TOKEN_PATTERN$1).max(128).optional(),
+	text: string().min(1).max(MAX_TEXT_LENGTH$1)
+});
+const daemonHubDeliverDispatchPayloadSchema = strictObject({
+	attemptId: string().min(1),
+	dispatchId: string().min(1),
+	taskId: string().min(1),
+	spaceId: string().min(1),
+	sourceEventId: string().min(1),
+	sourceSignal: daemonHubDispatchSourceSignalSchema,
+	targetProfileId: string().min(1),
+	dispatchContractVersion: number().int().positive(),
+	dispatchPolicy: runtimeDispatchPolicySchema,
+	controllerSnapshot: atsdDispatchControllerSnapshotSchema,
+	contextIdMappingSpec: runtimeAgentContextIdMappingSpecSchema.nullable(),
+	dispatchRulesSnapshot: atsdDispatchRulesSnapshotSchema,
+	enqueuedAtMs: number().int().nonnegative(),
+	idempotencyKey: string().min(1),
+	spacePassword: spacePasswordSchema.optional(),
+	targetProfileName: string().min(1).max(MAX_PROFILE_NAME_LENGTH).optional(),
+	targetProfileHandle: string().regex(MENTION_TOKEN_PATTERN$1).max(128).optional(),
+	targetProfileWakeToken: string().regex(MENTION_TOKEN_PATTERN$1).max(128).optional(),
+	conversationBinding: conversationBindingRecordSchema.optional(),
+	deliveryRecoveryReason: atsdDispatchDeliveryRecoveryReasonSchema.optional(),
+	dispatchChainId: string().min(1).optional(),
+	autoRelayDepth: number().int().nonnegative().optional(),
+	visitedProfileIds: array(string().min(1)).max(256).optional(),
+	visitedProfileIdsHash: string().min(1).optional(),
+	transportMode: runtimeTransportModeSchema.nullable().optional(),
+	streamingMode: runtimeStreamingModeSchema.optional(),
+	sourceSignalSnapshot: atsdDispatchSourceSignalSnapshotSchema.optional()
+});
 const daemonHubDeliverDispatchRequestSchema = strictObject({
 	v: literal(DAEMON_HUB_SCHEMA_VERSION),
 	dispatchId: string().min(1),
@@ -9478,7 +9617,7 @@ const daemonHubDeliverDispatchRequestSchema = strictObject({
 	connectionGeneration: number().int().positive(),
 	leaseEpoch: number().int().positive(),
 	deliveryRecoveryReason: atsdDispatchDeliveryRecoveryReasonSchema.optional(),
-	payload: record(string(), unknown())
+	payload: daemonHubDeliverDispatchPayloadSchema
 });
 const daemonHubDeliverDispatchResponseSchema = strictObject({
 	accepted: boolean(),
@@ -10066,76 +10205,6 @@ const helloAckSchema = object({
 	type: literal("system.hello.ack"),
 	profile: profileSchema
 });
-const SPACE_MEMBER_JOIN_NOTICE_PURPOSE = "space_membership_join_notice";
-const SPACE_MEMBER_REMOVE_NOTICE_PURPOSE = "space_membership_remove_notice";
-const SPACE_MENTION_REJECT_NOTICE_PURPOSE = "space_mention_reject_notice";
-const AGENT_REPLY_PREVIEW_PURPOSE = "agent_reply_preview";
-const AGENT_REPLY_PREVIEW_END_PURPOSE = "agent_reply_preview_end";
-const CONVERSATION_CONTINUITY_WARNING_PURPOSE = "conversation_continuity_warning";
-const MENTION_TOKEN_PATTERN$1 = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
-const normalizeMentionToken$1 = (value) => {
-	const normalized = trimmedStringFromUnknown(value);
-	if (!normalized) return;
-	return MENTION_TOKEN_PATTERN$1.test(normalized) ? normalized : void 0;
-};
-const signalTextMetaSchema = object({
-	transient: literal(true).optional(),
-	purpose: preprocess(trimmedStringFromUnknown, string().min(1).max(80)).optional(),
-	dispatchId: preprocess(trimmedStringFromUnknown, string().max(200)).optional(),
-	targetProfileId: atsRuntimeProfileIdSchema.optional(),
-	targetProfileKind: _enum(["human", "agent"]).optional(),
-	targetProfileName: preprocess(trimmedStringFromUnknown, string().min(1).max(MAX_PROFILE_NAME_LENGTH)).optional(),
-	targetProfileHandle: preprocess(normalizeMentionToken$1, string().regex(MENTION_TOKEN_PATTERN$1).max(128)).optional(),
-	targetWakeToken: preprocess(normalizeMentionToken$1, string().regex(MENTION_TOKEN_PATTERN$1).max(128)).optional(),
-	addedByProfileId: atsRuntimeProfileIdSchema.optional(),
-	addedByDisplayName: preprocess(trimmedStringFromUnknown, string().min(1).max(MAX_PROFILE_NAME_LENGTH)).optional(),
-	removedByProfileId: atsRuntimeProfileIdSchema.optional(),
-	removedByDisplayName: preprocess(trimmedStringFromUnknown, string().min(1).max(MAX_PROFILE_NAME_LENGTH)).optional()
-});
-const postedSignalTextMetaSchema = signalTextMetaSchema.superRefine((meta, context) => {
-	if (meta.purpose !== SPACE_MEMBER_JOIN_NOTICE_PURPOSE && meta.purpose !== SPACE_MEMBER_REMOVE_NOTICE_PURPOSE) return;
-	if (!meta.targetProfileId) context.addIssue({
-		code: "custom",
-		message: "targetProfileId is required for space member notices",
-		path: ["targetProfileId"]
-	});
-	if (!meta.targetProfileKind) context.addIssue({
-		code: "custom",
-		message: "targetProfileKind is required for space member notices",
-		path: ["targetProfileKind"]
-	});
-	if (meta.purpose === SPACE_MEMBER_JOIN_NOTICE_PURPOSE && !meta.addedByProfileId) context.addIssue({
-		code: "custom",
-		message: "addedByProfileId is required for space member notices",
-		path: ["addedByProfileId"]
-	});
-	if (meta.purpose === SPACE_MEMBER_JOIN_NOTICE_PURPOSE && !meta.addedByDisplayName) context.addIssue({
-		code: "custom",
-		message: "addedByDisplayName is required for space member notices",
-		path: ["addedByDisplayName"]
-	});
-	if (meta.purpose === SPACE_MEMBER_REMOVE_NOTICE_PURPOSE && !meta.removedByProfileId) context.addIssue({
-		code: "custom",
-		message: "removedByProfileId is required for space member notices",
-		path: ["removedByProfileId"]
-	});
-	if (meta.purpose === SPACE_MEMBER_REMOVE_NOTICE_PURPOSE && !meta.removedByDisplayName) context.addIssue({
-		code: "custom",
-		message: "removedByDisplayName is required for space member notices",
-		path: ["removedByDisplayName"]
-	});
-});
-const signalTextDataSchema = object({
-	text: preprocess(trimmedStringFromUnknown, string().min(1).max(MAX_TEXT_LENGTH$1)),
-	meta: signalTextMetaSchema.optional()
-});
-const signalTextSchema = object({
-	type: literal("signal.text"),
-	data: object({
-		text: preprocess(trimmedStringFromUnknown, string().min(1).max(MAX_TEXT_LENGTH$1)),
-		meta: postedSignalTextMetaSchema.optional()
-	})
-});
 const baseEnvelopeShape = {
 	v: literal(1),
 	id: nonEmptyTrimmedStringFromUnknown,
@@ -12440,15 +12509,6 @@ function parseRuntimeTransportMode(value) {
 	if (value === "local-cli") return value;
 	return null;
 }
-function parseControllerKind(value) {
-	if (value === "builtin" || value === "custom") return value;
-	return null;
-}
-function parseDispatchSourceProfileKind(value) {
-	const normalized = normalizeText$12(value).toLowerCase();
-	if (normalized === "agent" || normalized === "human" || normalized === "system") return normalized;
-	return null;
-}
 function parseContextIdMappingSpec(value) {
 	const record = asRecord(value);
 	if (!record) return null;
@@ -12485,7 +12545,7 @@ function normalizeOptionalText$21(value) {
 function nowIsoString() {
 	return (/* @__PURE__ */ new Date()).toISOString();
 }
-function toErrorMessage$15(error) {
+function toErrorMessage$16(error) {
 	if (error instanceof Error) return error.message;
 	return String(error);
 }
@@ -14342,12 +14402,26 @@ function matchesDaemonCliLane(normalizedCommand, preset, pathInput) {
 	return normalizedCommand.includes(ATS_PACKAGE_INSTALL_ENTRY_SEGMENT) && !normalizedCommand.includes(canaryPackageInstallRoot) && !normalizedCommand.includes(ATS_DEV_LOCAL_ENTRY_SEGMENT);
 }
 function collapseLauncherWrapperProcesses(processes) {
-	const launcherPidSet = new Set(processes.filter((processInfo) => processInfo.ownership === "stable_launcher").map((processInfo) => processInfo.pid));
+	const launcherPidSet = /* @__PURE__ */ new Set();
+	for (const processInfo of processes) if (processInfo.ownership === "stable_launcher") launcherPidSet.add(processInfo.pid);
 	if (launcherPidSet.size === 0) return processes;
-	return processes.filter((processInfo) => {
-		if (processInfo.ownership !== "stable_launcher") return true;
-		return !processes.some((candidate) => candidate.pid !== processInfo.pid && candidate.parentPid === processInfo.pid && candidate.ownership !== "stable_launcher" && launcherPidSet.has(processInfo.pid));
-	});
+	const collapsedProcesses = [];
+	for (const processInfo of processes) {
+		if (processInfo.ownership === "stable_launcher") {
+			if (processes.some((candidate) => candidate.pid !== processInfo.pid && candidate.parentPid === processInfo.pid && candidate.ownership !== "stable_launcher")) continue;
+			collapsedProcesses.push(processInfo);
+			continue;
+		}
+		if (processInfo.parentPid !== null && launcherPidSet.has(processInfo.parentPid)) {
+			collapsedProcesses.push({
+				...processInfo,
+				ownership: processInfo.ownership === "unknown" ? processInfo.ownership : "stable_launcher"
+			});
+			continue;
+		}
+		collapsedProcesses.push(processInfo);
+	}
+	return collapsedProcesses;
 }
 async function listWindowsProcesses() {
 	const output = await runCommand$1("powershell", [
@@ -15015,6 +15089,58 @@ async function readObservedRuntimeState() {
 	});
 }
 
+//#endregion
+//#region src/system/daemon-service-start-recovery.ts
+const ROOT_ERROR_PATTERN$1 = /\s*Try re-running the command as root for richer errors\.?/i;
+async function startDaemonSystemServiceWithAutoRepair(input) {
+	let autoRepairAttempted = false;
+	try {
+		await input.systemManager.start();
+		return { autoRepairAttempted };
+	} catch (error) {
+		if (!shouldAttemptLaunchdAutoRepair({
+			controller: input.systemManager.controller,
+			error
+		})) throw error;
+		autoRepairAttempted = true;
+		await input.onAutoRepairAttempt?.();
+		try {
+			await input.systemManager.uninstall().catch(() => void 0);
+			await input.systemManager.install(input.serviceCommandSpec);
+			await input.systemManager.start();
+			await input.onAutoRepairRecovered?.();
+			return { autoRepairAttempted };
+		} catch (retryError) {
+			throw buildLaunchdAutoRepairFailureError({
+				initialError: error,
+				retryError
+			});
+		}
+	}
+}
+function sanitizeSystemServiceErrorMessage$1(message) {
+	return message.replace(ROOT_ERROR_PATTERN$1, "");
+}
+function isLaunchdBootstrapIosError$1(message) {
+	const normalized = message.toLowerCase();
+	return normalized.includes("bootstrap failed") && normalized.includes("input/output error");
+}
+function shouldAttemptLaunchdAutoRepair(input) {
+	if (input.controller !== "launchd") return false;
+	return isLaunchdBootstrapIosError$1(sanitizeSystemServiceErrorMessage$1(toErrorMessage$15(input.error)));
+}
+function buildLaunchdAutoRepairFailureError(input) {
+	return new Error([
+		"launchd auto-repair retry failed.",
+		`initial error: ${toErrorMessage$15(input.initialError)}`,
+		`retry error: ${toErrorMessage$15(input.retryError)}`
+	].join(" "));
+}
+function toErrorMessage$15(error) {
+	if (error instanceof Error) return error.message;
+	return String(error);
+}
+
 //#endregion
 //#region src/system/daemon-service-alignment-executor.ts
 const ALIGNMENT_STOP_WAIT_MS = 3e3;
@@ -15138,7 +15264,10 @@ async function runDaemonServiceFullAlignmentLocked(input) {
 	}
 	if (shouldRestoreBackground) {
 		await input.emitProgress("starting_background_service");
-		await serviceManager.start();
+		await startDaemonSystemServiceWithAutoRepair({
+			serviceCommandSpec: buildDaemonSystemServiceCommandSpec({ controller: serviceManager.controller }),
+			systemManager: serviceManager
+		});
 		await waitForAlignmentBackgroundStartup({ manager: serviceManager });
 		input.state.restoredBackground = true;
 	}
@@ -15195,8 +15324,9 @@ function buildBlockedAlignmentResult(input) {
 	};
 }
 async function resolveAlignmentCommandOptions(input) {
-	const [currentContract, runtimePaths, fallbackProfile] = await Promise.all([
+	const [currentContract, runtimeSnapshot, runtimePaths, fallbackProfile] = await Promise.all([
 		Promise.resolve(input.inventory.serviceContract ?? readDaemonServiceContract()).catch(() => null),
+		readDaemonServiceRuntimeSnapshot().catch(() => null),
 		ensureDaemonRuntimePaths().catch(() => null),
 		resolveAtsProfileOrNull({
 			allowDefaultFallback: true,
@@ -15204,8 +15334,8 @@ async function resolveAlignmentCommandOptions(input) {
 			persistSelection: false
 		}).catch(() => null)
 	]);
-	const gatewayUrl = await Promise.resolve(resolveBaseUrl(input.gatewayUrl ?? currentContract?.gatewayUrl ?? void 0)).catch(() => input.gatewayUrl ?? currentContract?.gatewayUrl);
-	const profile = normalizeText$12(input.profile) ?? currentContract?.profileId ?? fallbackProfile?.atsProfileId;
+	const gatewayUrl = await Promise.resolve(resolveBaseUrl(input.gatewayUrl ?? currentContract?.gatewayUrl ?? runtimeSnapshot?.gatewayUrl ?? void 0)).catch(() => input.gatewayUrl ?? currentContract?.gatewayUrl ?? runtimeSnapshot?.gatewayUrl);
+	const profile = normalizeOptionalText$21(input.profile) ?? currentContract?.profileId ?? normalizeOptionalText$21(runtimeSnapshot?.profile) ?? fallbackProfile?.atsProfileId;
 	const deviceId = runtimePaths ? await resolveDaemonDeviceId({
 		deviceId: input.deviceId ?? currentContract?.deviceId,
 		deviceIdPath: runtimePaths.deviceIdPath
@@ -20372,7 +20502,7 @@ const ATS_HEADER_VISITED_PROFILE_IDS = "x-ats-visited-profile-ids";
 const ATS_HEADER_VISITED_PROFILE_IDS_HASH = "x-ats-visited-profile-ids-hash";
 function buildAtsRequestHeaders(input) {
 	const headers = {};
-	headers[ATS_HEADER_REQUEST_ID] = normalize$1(input.requestId) || crypto.randomUUID();
+	headers[ATS_HEADER_REQUEST_ID] = normalize$1(input.requestId) || crypto$1.randomUUID();
 	const profile = normalize$1(input.profile);
 	if (profile) headers[ATS_HEADER_PROFILE] = profile;
 	const profileId = normalize$1(input.profileId);
@@ -22587,6 +22717,11 @@ const classifyCodexFailure = (input) => {
 			errorType: "adapter",
 			message: providerMessage
 		};
+		if (isConfigFailure(lowered)) return {
+			code: "config.invalid",
+			errorType: "config",
+			message: toConfigInvalidMessage(providerMessage)
+		};
 	}
 	const stderrText = normalizeOptionalText$12(input.stderrText);
 	if (stderrText) return {
@@ -22618,6 +22753,12 @@ const isQuotaFailure$1 = (value) => {
 const isRateLimitFailure$1 = (value) => {
 	return value.includes("429") || value.includes("rate limit") || value.includes("too many requests");
 };
+const isConfigFailure = (value) => {
+	return value.includes("model_not_found") || value.includes("requested model") || value.includes("unknown model") || value.includes("invalid model") || value.includes("does not exist") && value.includes("model") || value.includes("invalid_request_error") && value.includes("model") || value.includes("\"param\": \"model\"");
+};
+const toConfigInvalidMessage = (value) => {
+	return value.toLowerCase().startsWith("config.invalid:") ? value : `config.invalid: ${value}`;
+};
 function normalizeText$4(value) {
 	return String(value ?? "").trim();
 }
@@ -24120,18 +24261,15 @@ const MENTION_TOKEN_REGEX$1 = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
 const COMPACT_DISPATCH_BOOTSTRAP_TEMPLATE_VERSION = "compact-dispatch-bootstrap-v1";
 function parseDispatchTask(input) {
 	const payload = resolveDispatchTaskPayload(input.deliverRequest);
-	if (!payload) return null;
 	const requiredFields = resolveDispatchTaskRequiredFields({
 		deliverRequest: input.deliverRequest,
 		payload
 	});
 	if (!requiredFields) return null;
-	const sourceSignal = asRecord(payload.sourceSignal);
-	const sourceSignalSnapshot = asRecord(payload.sourceSignalSnapshot);
-	const mentionSourceProfileId = normalizeOptionalText$21(sourceSignal?.profileId) ?? normalizeOptionalText$21(sourceSignalSnapshot?.profileId);
-	const mentionSourceProfileKind = parseDispatchSourceProfileKind(sourceSignal?.profileKind ?? sourceSignalSnapshot?.profileKind);
-	const mentionSourceProfileWakeToken = normalizeOptionalText$21(sourceSignal?.profileWakeToken) ?? normalizeOptionalText$21(sourceSignalSnapshot?.profileWakeToken);
-	const prompt = normalizeOptionalText$21(sourceSignal?.text) ?? normalizeOptionalText$21(sourceSignalSnapshot?.text);
+	const mentionSourceProfileId = normalizeOptionalText$21(payload.sourceSignal.profileId) ?? normalizeOptionalText$21(payload.sourceSignalSnapshot?.profileId);
+	const mentionSourceProfileKind = payload.sourceSignal.profileKind ?? payload.sourceSignalSnapshot?.profileKind ?? null;
+	const mentionSourceProfileWakeToken = normalizeOptionalText$21(payload.sourceSignal.profileWakeToken) ?? normalizeOptionalText$21(payload.sourceSignalSnapshot?.profileWakeToken);
+	const prompt = normalizeOptionalText$21(payload.sourceSignal.text) ?? normalizeOptionalText$21(payload.sourceSignalSnapshot?.text);
 	const targetProfileWakeToken = normalizeOptionalText$21(payload.targetProfileWakeToken);
 	const triggerMode = "mention_only";
 	const sequence = normalizeNonNegativeInteger$1(payload.enqueuedAtMs) ?? Date.now();
@@ -24142,11 +24280,11 @@ function parseDispatchTask(input) {
 	});
 	if (!(prompt && controllerSelection)) return null;
 	const fallbackControllerSettings = createDefaultRuntimeAgentControllerSettings(controllerSelection.controllerRef);
-	const conversationBinding = resolveConversationBindingSnapshot(payload);
+	const conversationBinding = payload.conversationBinding ?? null;
 	const deliveryRecoveryReason = resolveDeliveryRecoveryReason(payload);
-	const transportMode = parseTransportMode(payload.transportMode) ?? input.fallbackRouteConfig?.transportMode ?? fallbackControllerSettings.transportMode;
-	const streamingMode = parseStreamingMode(payload.streamingMode) ?? input.fallbackRouteConfig?.streamingMode ?? fallbackControllerSettings.streamingMode;
-	const contextIdMappingSpec = parseContextIdMappingSpec(payload.contextIdMappingSpec) ?? input.fallbackRouteConfig?.contextIdMappingSpec ?? fallbackControllerSettings.contextIdMappingSpec;
+	const transportMode = payload.transportMode ?? input.fallbackRouteConfig?.transportMode ?? fallbackControllerSettings.transportMode;
+	const streamingMode = payload.streamingMode ?? input.fallbackRouteConfig?.streamingMode ?? fallbackControllerSettings.streamingMode;
+	const contextIdMappingSpec = payload.contextIdMappingSpec ?? input.fallbackRouteConfig?.contextIdMappingSpec ?? fallbackControllerSettings.contextIdMappingSpec;
 	return {
 		...requiredFields,
 		conversationBinding,
@@ -24169,16 +24307,8 @@ function resolveDeliveryRecoveryReason(payload) {
 	if (normalized === "connection_replaced" || normalized === "route_lost") return normalized;
 	return null;
 }
-function resolveConversationBindingSnapshot(payload) {
-	const candidate = payload.conversationBinding;
-	if (!candidate) return null;
-	const parsed = conversationBindingRecordSchema.safeParse(candidate);
-	return parsed.success ? parsed.data : null;
-}
 function resolveDispatchTaskPayload(request) {
-	const { payload } = request;
-	if (!payload || typeof payload !== "object" || Array.isArray(payload)) return null;
-	return payload;
+	return request.payload;
 }
 function resolveDispatchTaskRequiredFields(input) {
 	const dispatchId = normalizeOptionalText$21(input.payload.dispatchId) ?? input.deliverRequest.dispatchId;
@@ -24198,9 +24328,8 @@ function resolveDispatchTaskRequiredFields(input) {
 	};
 }
 function resolveDispatchTaskControllerSelection(input) {
-	const controllerSnapshot = asRecord(input.payload.controllerSnapshot);
-	const controllerRef = normalizeOptionalText$21(controllerSnapshot?.controllerRef) ?? input.fallbackControllerRef;
-	const controllerKind = parseControllerKind(controllerSnapshot?.controllerKind) ?? input.fallbackControllerKind;
+	const controllerRef = normalizeOptionalText$21(input.payload.controllerSnapshot.controllerRef) ?? input.fallbackControllerRef;
+	const controllerKind = input.payload.controllerSnapshot.controllerKind ?? input.fallbackControllerKind;
 	if (!(controllerRef && controllerKind)) return null;
 	return {
 		controllerKind,
@@ -24414,10 +24543,10 @@ async function resolveDispatchMentionSourceContext(input) {
 	}
 }
 function buildDispatchCorrelation(input) {
-	const payload = input.deliverRequest.payload && typeof input.deliverRequest.payload === "object" && !Array.isArray(input.deliverRequest.payload) ? input.deliverRequest.payload : {};
+	const payload = input.deliverRequest.payload;
 	return {
 		attemptId: input.parsedTask?.attemptId ?? normalizeOptionalText$21(payload.attemptId) ?? normalizeOptionalText$21(input.deliverRequest.attemptId) ?? "unknown-attempt",
-		controllerRef: input.parsedTask?.controllerRef ?? normalizeOptionalText$21(asRecord(payload.controllerSnapshot)?.controllerRef),
+		controllerRef: input.parsedTask?.controllerRef ?? normalizeOptionalText$21(payload.controllerSnapshot.controllerRef),
 		dispatchId: input.parsedTask?.dispatchId ?? normalizeOptionalText$21(payload.dispatchId) ?? input.deliverRequest.dispatchId,
 		sourceEventId: input.parsedTask?.sourceEventId ?? normalizeOptionalText$21(payload.sourceEventId) ?? "unknown-source-event",
 		targetProfileId: input.parsedTask?.targetProfileId ?? normalizeOptionalText$21(payload.targetProfileId) ?? input.deliverRequest.profileId,
@@ -24710,7 +24839,7 @@ async function syncDaemonRouteCatalogState(input) {
 		return {
 			status: "failed",
 			reason: "load_failed",
-			errorMessage: toErrorMessage$15(error)
+			errorMessage: toErrorMessage$16(error)
 		};
 	}
 	const nextFingerprint = buildRouteCatalogFingerprint(nextCatalog);
@@ -24725,7 +24854,7 @@ async function syncDaemonRouteCatalogState(input) {
 		return {
 			status: "failed",
 			reason: "register_failed",
-			errorMessage: toErrorMessage$15(error)
+			errorMessage: toErrorMessage$16(error)
 		};
 	}
 	const diff = buildRouteCatalogDiff({
@@ -24829,7 +24958,9 @@ function createDispatchBackpressureQueue(input) {
 				controllerKey: selectedTask.controllerKey,
 				dispatchId: selectedTask.dispatchId,
 				profileId: selectedTask.profileId,
+				spaceId: selectedTask.spaceId,
 				taskId: selectedTask.taskId,
+				targetLabel: selectedTask.targetLabel,
 				transportMode: selectedTask.transportMode,
 				...buildSnapshot(selectedTask.profileId, selectedTask.controllerKey)
 			};
@@ -24847,7 +24978,9 @@ function createDispatchBackpressureQueue(input) {
 					errorMessage: completionResult.errorMessage,
 					profileId: selectedTask.profileId,
 					result: completionResult.result,
+					spaceId: selectedTask.spaceId,
 					taskId: selectedTask.taskId,
+					targetLabel: selectedTask.targetLabel,
 					transportMode: selectedTask.transportMode
 				});
 			}).catch((error) => {
@@ -24861,7 +24994,9 @@ function createDispatchBackpressureQueue(input) {
 					errorMessage: toErrorMessage$8(error),
 					profileId: selectedTask.profileId,
 					result: "failed",
+					spaceId: selectedTask.spaceId,
 					taskId: selectedTask.taskId,
+					targetLabel: selectedTask.targetLabel,
 					transportMode: selectedTask.transportMode
 				});
 			}).finally(() => {
@@ -26836,7 +26971,9 @@ function enqueueDispatchDeliverFrame(input) {
 		controllerKey: queueLogMeta.controllerKey,
 		dispatchId: correlation.dispatchId,
 		profileId: deliverRequest.profileId,
+		spaceId: queueLogMeta.spaceId,
 		taskId: correlation.taskId,
+		targetLabel: queueLogMeta.targetLabel,
 		transportMode: queueLogMeta.transportMode,
 		run: async () => {
 			return await handleDispatchDeliverFrame({
@@ -26878,7 +27015,7 @@ function enqueueDispatchDeliverFrame(input) {
 		emitRunLine({
 			presenter: input.presenter,
 			code: "daemon.run.dispatch_queue_rejected",
-			text: `dispatch queue rejected task ${correlation.taskId}: queue is full`,
+			text: `dispatch queue rejected task ${correlation.taskId} for ${queueLogMeta.targetLabel}: queue is full`,
 			payload: {
 				adapterId: queueLogMeta.adapterId,
 				activeForController: enqueueResult.snapshot.activeForController,
@@ -26895,8 +27032,10 @@ function enqueueDispatchDeliverFrame(input) {
 				queueDepth: enqueueResult.snapshot.queueDepth,
 				queueMax: enqueueResult.snapshot.limits.queueMax,
 				result: "failed",
+				spaceId: queueLogMeta.spaceId,
 				step: "rejected",
 				taskId: correlation.taskId,
+				targetLabel: queueLogMeta.targetLabel,
 				transportMode: queueLogMeta.transportMode
 			}
 		});
@@ -26905,7 +27044,7 @@ function enqueueDispatchDeliverFrame(input) {
 	emitRunLine({
 		presenter: input.presenter,
 		code: "daemon.run.dispatch_queue_enqueued",
-		text: `dispatch queue enqueued task ${correlation.taskId}`,
+		text: `dispatch queue enqueued task ${correlation.taskId} for ${queueLogMeta.targetLabel}`,
 		payload: {
 			adapterId: queueLogMeta.adapterId,
 			activeForController: enqueueResult.snapshot.activeForController,
@@ -26924,8 +27063,10 @@ function enqueueDispatchDeliverFrame(input) {
 			queueDepth: enqueueResult.snapshot.queueDepth,
 			queueMax: enqueueResult.snapshot.limits.queueMax,
 			result: null,
+			spaceId: queueLogMeta.spaceId,
 			step: "enqueued",
 			taskId: correlation.taskId,
+			targetLabel: queueLogMeta.targetLabel,
 			transportMode: queueLogMeta.transportMode
 		}
 	});
@@ -27684,7 +27825,7 @@ function toTaskExecutionError(error) {
 	return {
 		errorCode: "dispatch.execution_failed",
 		errorType: "internal",
-		message: toErrorMessage$15(error)
+		message: toErrorMessage$16(error)
 	};
 }
 function normalizeOptionalContextId(contextId) {
@@ -27863,6 +28004,8 @@ function resolveDispatchQueueLogMeta(input) {
 	if (!parsedTask) return {
 		adapterId: null,
 		controllerKey: `profile:${input.deliverRequest.profileId}`,
+		spaceId: null,
+		targetLabel: `profile:${input.deliverRequest.profileId}`,
 		transportMode: null
 	};
 	const support = resolveLocalRuntimeControllerSupport({
@@ -27876,9 +28019,16 @@ function resolveDispatchQueueLogMeta(input) {
 			controllerRef: parsedTask.controllerRef,
 			profileId: input.deliverRequest.profileId
 		}),
+		spaceId: parsedTask.spaceId,
+		targetLabel: resolveDispatchQueueTargetLabel(parsedTask),
 		transportMode: parsedTask.transportMode
 	};
 }
+function resolveDispatchQueueTargetLabel(parsedTask) {
+	const wakeToken = normalizeOptionalText$21(parsedTask.targetProfileWakeToken);
+	if (wakeToken) return wakeToken.startsWith("@") ? wakeToken : `@${wakeToken}`;
+	return `profile:${parsedTask.targetProfileId}`;
+}
 function buildDispatchControllerKey(input) {
 	const normalizedControllerKind = typeof input.controllerKind === "string" ? input.controllerKind.trim() : "";
 	const normalizedControllerRef = typeof input.controllerRef === "string" ? input.controllerRef.trim() : "";
@@ -28202,7 +28352,7 @@ async function runDaemonSocketSession(input) {
 			emitRunLine({
 				presenter: input.presenter,
 				code: "daemon.run.dispatch_queue_started",
-				text: `dispatch queue started task ${event.taskId}`,
+				text: `dispatch queue started task ${event.taskId} for ${event.targetLabel}`,
 				payload: {
 					adapterId: event.adapterId,
 					activeForController: event.activeForController,
@@ -28219,16 +28369,18 @@ async function runDaemonSocketSession(input) {
 					queueDepth: event.queueDepth,
 					queueMax: event.limits.queueMax,
 					result: null,
+					spaceId: event.spaceId,
 					step: "started",
 					taskId: event.taskId,
+					targetLabel: event.targetLabel,
 					transportMode: event.transportMode
 				}
 			});
 		},
 		onTaskCompleted: (event) => {
-			let completionText = `dispatch queue failed task ${event.taskId}`;
-			if (event.result === "success") completionText = `dispatch queue completed task ${event.taskId}`;
-			else if (event.result === "partial_success") completionText = `dispatch queue partially completed task ${event.taskId}`;
+			let completionText = `dispatch queue failed task ${event.taskId} for ${event.targetLabel}`;
+			if (event.result === "success") completionText = `dispatch queue completed task ${event.taskId} for ${event.targetLabel}`;
+			else if (event.result === "partial_success") completionText = `dispatch queue partially completed task ${event.taskId} for ${event.targetLabel}`;
 			emitRunLine({
 				presenter: input.presenter,
 				code: "daemon.run.dispatch_queue_completed",
@@ -28250,8 +28402,10 @@ async function runDaemonSocketSession(input) {
 					queueDepth: event.queueDepth,
 					queueMax: event.limits.queueMax,
 					result: event.result,
+					spaceId: event.spaceId,
 					step: "completed",
 					taskId: event.taskId,
+					targetLabel: event.targetLabel,
 					transportMode: event.transportMode
 				}
 			});
@@ -28370,7 +28524,7 @@ async function runDaemonSocketSession(input) {
 			emitRunLine({
 				presenter: input.presenter,
 				code: "daemon.run.heartbeat_failed",
-				text: `heartbeat failed (${String(consecutiveHeartbeatFailures)}/${String(HEARTBEAT_CONSECUTIVE_FAILURES_BEFORE_CLOSE)}): ${toErrorMessage$15(error)}`
+				text: `heartbeat failed (${String(consecutiveHeartbeatFailures)}/${String(HEARTBEAT_CONSECUTIVE_FAILURES_BEFORE_CLOSE)}): ${toErrorMessage$16(error)}`
 			});
 			if (shouldCloseSocket) {
 				input.socket.close(1011, "heartbeat_failed");
@@ -28402,7 +28556,7 @@ async function runDaemonSocketSession(input) {
 				emitRunLine({
 					presenter: input.presenter,
 					code: "daemon.run.heartbeat_failed",
-					text: `heartbeat failed: ${toErrorMessage$15(error)}`
+					text: `heartbeat failed: ${toErrorMessage$16(error)}`
 				});
 			});
 		}, normalizedDelayMs);
@@ -28444,7 +28598,7 @@ async function runDaemonSocketSession(input) {
 				emitRunLine({
 					presenter: input.presenter,
 					code: "daemon.run.catalog_sync_signal_read_failed",
-					text: `catalog sync signal read failed: ${toErrorMessage$15(error)}`
+					text: `catalog sync signal read failed: ${toErrorMessage$16(error)}`
 				});
 			}).finally(() => {
 				scheduleCatalogSyncSignalPoll();
@@ -28618,7 +28772,7 @@ async function runDaemonSocketSession(input) {
 		emitRunLine({
 			presenter: input.presenter,
 			code: "daemon.run.socket_error",
-			text: `daemon stream socket error: ${toErrorMessage$15(error)}`
+			text: `daemon stream socket error: ${toErrorMessage$16(error)}`
 		});
 	});
 	input.socket.onMessage((raw) => {
@@ -28994,7 +29148,7 @@ const backupAndCleanRuntimeState = async (input) => {
 			appliedAt: input.nowIso,
 			backupPaths,
 			cleanedPaths,
-			errorMessage: toErrorMessage$15(error),
+			errorMessage: toErrorMessage$16(error),
 			fromEpoch: input.fromEpoch,
 			reason: input.reason,
 			status: "failed",
@@ -29168,7 +29322,7 @@ const runDaemonServiceLoop = async (input) => {
 		emitRunLine({
 			presenter: input.presenter,
 			code: "daemon.run.projection_sync_failed",
-			text: `local projection repair failed before route registration: ${toErrorMessage$15(error)}`
+			text: `local projection repair failed before route registration: ${toErrorMessage$16(error)}`
 		});
 		return null;
 	});
@@ -29292,7 +29446,7 @@ const runDaemonServiceLoop = async (input) => {
 				action: reconcileDecision.action,
 				backoffMs,
 				driftClass: reconcileDecision.driftClass,
-				error: toErrorMessage$15(error),
+				error: toErrorMessage$16(error),
 				foregroundActive: reconcileDecision.foregroundActive,
 				lifecycleLocked: reconcileDecision.lifecycleLocked,
 				owner: reconcileDecision.owner,
@@ -29303,7 +29457,7 @@ const runDaemonServiceLoop = async (input) => {
 				action: reconcileDecision.action,
 				backoffMs,
 				driftClass: reconcileDecision.driftClass,
-				error: toErrorMessage$15(error),
+				error: toErrorMessage$16(error),
 				foregroundActive: reconcileDecision.foregroundActive,
 				lifecycleLocked: reconcileDecision.lifecycleLocked,
 				owner: reconcileDecision.owner,
@@ -29313,11 +29467,11 @@ const runDaemonServiceLoop = async (input) => {
 			emitRunLine({
 				presenter: input.presenter,
 				code: "daemon.run.reconnect",
-				text: `daemon stream reconnect scheduled in ${String(backoffMs)}ms (${toErrorMessage$15(error)})`,
+				text: `daemon stream reconnect scheduled in ${String(backoffMs)}ms (${toErrorMessage$16(error)})`,
 				payload: {
 					attempt: reconnectAttempt,
 					backoffMs,
-					error: toErrorMessage$15(error)
+					error: toErrorMessage$16(error)
 				}
 			});
 			await sleep$5(backoffMs);
@@ -29766,12 +29920,6 @@ const QUIET_PRESENTER = {
 	line: () => void 0,
 	data: () => void 0
 };
-const AUTO_STOP_WAIT_MS = 3e3;
-const AUTO_STOP_POLL_MS = 200;
-const NOT_INSTALLED_DAEMON_STATUS$1 = {
-	installed: false,
-	state: null
-};
 async function resolveDaemonLocalServiceDemand(input) {
 	const projection = await syncDeviceRuntimeStateProjection({ mode: "check" }).catch(() => null);
 	const ownerUserId = normalizeOptionalString$7(input.ownerUserId);
@@ -29803,7 +29951,7 @@ async function resolveDaemonLocalServiceDemand(input) {
 		return {
 			decision: "indeterminate",
 			hasWakeableLocalRoute: false,
-			reason: `failed to load local daemon routes: ${toErrorMessage$15(error)}`,
+			reason: `failed to load local daemon routes: ${toErrorMessage$16(error)}`,
 			wakeableLocalRouteCount: 0,
 			projection
 		};
@@ -29823,84 +29971,6 @@ async function resolveDaemonLocalServiceDemand(input) {
 		projection
 	};
 }
-async function maybeAutoStopIdleBackgroundDaemonService(input) {
-	const localDemand = await resolveDaemonLocalServiceDemand({
-		ownerUserId: input.ownerUserId,
-		runtimeWorkdir: input.runtimeWorkdir
-	});
-	if (localDemand.decision !== "allow_auto_stop") return {
-		autoStopped: false,
-		effectiveRuntimeStatus: null,
-		localDemand
-	};
-	const status = await getDaemonStatus().catch(() => NOT_INSTALLED_DAEMON_STATUS$1);
-	if (!status.installed) return {
-		autoStopped: false,
-		effectiveRuntimeStatus: null,
-		localDemand
-	};
-	const runtimeState = await resolveDaemonRuntimeState(status);
-	if (!runtimeState || runtimeState.status !== "running" || runtimeState.mode !== "background" || runtimeState.managedBySystemService !== true) return {
-		autoStopped: false,
-		effectiveRuntimeStatus: runtimeState?.status ?? null,
-		localDemand
-	};
-	const { serviceManager, serviceManagerStatus } = await resolveDaemonServiceManagerForRuntimeState({
-		runtimeState,
-		status
-	});
-	const effectiveRuntimeStatus = getEffectiveDaemonRuntimeStatus({
-		runtimeState,
-		serviceManagerStatus
-	});
-	if (!serviceManager || effectiveRuntimeStatus !== "running") return {
-		autoStopped: false,
-		effectiveRuntimeStatus,
-		localDemand
-	};
-	try {
-		await serviceManager.stop();
-		if (!await waitForDaemonSystemServiceToStop({
-			manager: serviceManager,
-			waitMs: AUTO_STOP_WAIT_MS,
-			pollMs: AUTO_STOP_POLL_MS
-		})) {
-			input.presenter.line({
-				code: `${input.codePrefix}.auto_stop_failed`,
-				text: "ATS could not auto-stop the background service. Run `ats service stop` if you want it off right now."
-			});
-			return {
-				autoStopped: false,
-				effectiveRuntimeStatus,
-				localDemand
-			};
-		}
-		await clearDaemonServiceRuntimeState();
-		input.presenter.line({
-			code: `${input.codePrefix}.auto_stopped`,
-			text: formatDaemonAutoStoppedMessage(localDemand)
-		});
-		return {
-			autoStopped: true,
-			effectiveRuntimeStatus: "not_running",
-			localDemand
-		};
-	} catch (error) {
-		input.presenter.line({
-			code: `${input.codePrefix}.auto_stop_failed`,
-			text: `ATS could not auto-stop the background service. ${toErrorMessage$15(error)}`
-		});
-		return {
-			autoStopped: false,
-			effectiveRuntimeStatus,
-			localDemand
-		};
-	}
-}
-function formatDaemonAutoStoppedMessage(localDemand) {
-	if (localDemand.projection?.status === "ok" && localDemand.projection.projectedControllerIds.length === 0) return "ATS stopped the background service because this device currently has no projected local agents to wake.";
-	return "ATS stopped the background service because this device currently has no wakeable local agents.";
-}
 function normalizeOptionalString$7(value) {
 	const normalized = String(value ?? "").trim();
 	return normalized.length > 0 ? normalized : null;
@@ -31507,6 +31577,7 @@ async function completeDaemonReinstallStart(input) {
 		targetDesiredState: input.targetDesiredState,
 		startAfterInstallMode: input.resolved.startAfterInstallMode
 	}) === "never") {
+		if (await maybePromptToRunDaemonAfterStoppedReinstall({ runtime: input.runtime })) return await autoStartDaemonAfterReinstall(input);
 		await clearDaemonStartFailureStateSafely();
 		if (input.resolved.emitStatusAfterSuccess) await input.resolved.runStatus({
 			agentOverviewHandled: true,
@@ -31530,10 +31601,19 @@ async function completeDaemonReinstallStart(input) {
 	}
 	return await autoStartDaemonAfterReinstall(input);
 }
+async function maybePromptToRunDaemonAfterStoppedReinstall(input) {
+	if (input.runtime.resolvedView !== "human" || !canUseInteractivePrompts(input.runtime)) return false;
+	const selected = await confirm({
+		message: "ATS Service is repaired and currently stopped. Run it now in the background?",
+		initialValue: true
+	});
+	return !(isCancel(selected) || !selected);
+}
 async function autoStartDaemonAfterReinstall(input) {
 	if (await runDaemonAfterReinstallStartWithRetry({
 		presenter: input.presenter,
 		resolved: input.resolved,
+		startRetryDelayMs: input.resolved.startRetryDelayMs,
 		view: input.runtime.resolvedView
 	}) !== "started") return {
 		ok: false,
@@ -31578,7 +31658,7 @@ async function runDaemonAfterReinstallStartWithRetry(input) {
 		})).ok ? "started" : "failed_with_card";
 	} catch (error) {
 		if (attempt < REINSTALL_START_RETRY_ATTEMPTS) {
-			await sleep(REINSTALL_START_RETRY_DELAY_MS);
+			await sleep(input.startRetryDelayMs);
 			continue;
 		}
 		const startupDiagnostic = await readDaemonStartFailureLogDiagnostic({ cursor: startFailureLogCursor });
@@ -31673,6 +31753,7 @@ function resolveDaemonReinstallOptions(options) {
 		timeoutPolicy: options.timeoutPolicy ?? "abort",
 		skipConfirm: options.skipConfirm ?? false,
 		verifyWaitMs: options.verifyWaitMs ?? REINSTALL_VERIFY_WAIT_MS,
+		startRetryDelayMs: options.startRetryDelayMs ?? REINSTALL_START_RETRY_DELAY_MS,
 		startAfterInstallMode: options.startAfterInstallMode ?? "default",
 		emitStatusAfterSuccess: options.emitStatusAfterSuccess ?? true
 	};
@@ -32520,22 +32601,6 @@ function isPermissionOrAuthorizationError(message) {
 	const normalized = message.toLowerCase();
 	return normalized.includes("permission") || normalized.includes("operation not permitted") || normalized.includes("access is denied") || normalized.includes("requires admin") || normalized.includes("elevation") || normalized.includes("access denied") || normalized.includes("not authorized");
 }
-function shouldAttemptLaunchdAutoRepair(input) {
-	if (input.controller !== "launchd") return false;
-	return isLaunchdBootstrapIosError(sanitizeSystemServiceErrorMessage(toErrorMessage$6(input.error)));
-}
-async function runLaunchdAutoRepairRetry(input) {
-	await input.systemManager.uninstall().catch(() => void 0);
-	await input.systemManager.install(input.serviceCommandSpec);
-	await input.systemManager.start();
-}
-function buildLaunchdAutoRepairFailureError(input) {
-	return new Error([
-		"launchd auto-repair retry failed.",
-		`initial error: ${toErrorMessage$6(input.initialError)}`,
-		`retry error: ${toErrorMessage$6(input.retryError)}`
-	].join(" "));
-}
 async function waitForSystemServiceStartup(input) {
 	const deadlineMs = Date.now() + input.waitMs;
 	while (Date.now() < deadlineMs) {
@@ -33136,7 +33201,7 @@ function buildDaemonStopWarningText(input) {
 	if (input.reason === "process_timeout") return formatInlineAtsCliCommands(`Service process (pid=${String(input.pid)}) did not exit after ${String(STOP_WAIT_MS)}ms. Run \`ats service stop --force\` to kill.`);
 	return formatInlineAtsCliCommands(`ATS could not stop the local service cleanly.${input.errorMessage ? ` ${input.errorMessage}` : ""} Run \`ats service stop --force\` and retry.`);
 }
-async function runDaemonRun(input) {
+async function runDaemonRun(input, options = {}) {
 	const runtime = await resolveRuntimeContext({ view: input.view });
 	const presenter = createPresenter(runtime);
 	emitDaemonOverviewIfAgent({
@@ -33218,6 +33283,8 @@ async function runDaemonRun(input) {
 	}
 	if (isDetachedDaemonServiceRun()) return await runSystemDaemonCore({
 		input,
+		systemServiceStartupPollMs: options.systemServiceStartupPollMs,
+		systemServiceStartupWaitMs: options.systemServiceStartupWaitMs,
 		runtime,
 		presenter,
 		mode,
@@ -33226,6 +33293,8 @@ async function runDaemonRun(input) {
 	return await withDaemonServiceRunLock(async () => {
 		return await runSystemDaemonCore({
 			input,
+			systemServiceStartupPollMs: options.systemServiceStartupPollMs,
+			systemServiceStartupWaitMs: options.systemServiceStartupWaitMs,
 			runtime,
 			presenter,
 			mode,
@@ -33244,7 +33313,7 @@ async function runDaemonBackgroundStartForDecision(input) {
 	})).ok ? "started" : "failed_with_card";
 }
 async function runSystemDaemonCore(context) {
-	const { input, presenter, runtime, mode, daemonVersion } = context;
+	const { input, presenter, runtime, mode, daemonVersion, systemServiceStartupPollMs, systemServiceStartupWaitMs } = context;
 	await cleanupDaemonServiceRuntimeState();
 	const isSystemServiceBootstrap = isManagedSystemServiceBootstrapRun();
 	const runConfig = await resolveContractFirstDaemonRunConfig({
@@ -33369,6 +33438,8 @@ async function runSystemDaemonCore(context) {
 	});
 	return await runDaemonBackgroundStart({
 		daemonVersion,
+		systemServiceStartupPollMs,
+		systemServiceStartupWaitMs,
 		runtime,
 		presenter,
 		mode,
@@ -33421,6 +33492,8 @@ async function runDaemonBackgroundStart(input) {
 	});
 	const runResult = await runSystemServiceManager({
 		daemonVersion: input.daemonVersion,
+		startupPollMs: input.systemServiceStartupPollMs,
+		startupWaitMs: input.systemServiceStartupWaitMs,
 		runtime: input.runtime,
 		presenter: input.presenter,
 		mode: input.mode,
@@ -33508,11 +33581,11 @@ function emitDaemonRecoveredStartedState(input) {
 	});
 }
 async function resolveDaemonServiceProfileId(input) {
-	const explicitProfile = normalizeText(input.explicitProfile);
+	const explicitProfile = normalizeOptionalText$21(input.explicitProfile);
 	if (explicitProfile) return explicitProfile;
-	const sessionProfile = normalizeText(input.runtime.profile) ?? normalizeText(input.runtime.atsProfileId);
+	const sessionProfile = normalizeOptionalText$21(input.runtime.profile) ?? normalizeOptionalText$21(input.runtime.atsProfileId);
 	if (sessionProfile) return sessionProfile;
-	const selectedProfileId = normalizeText(getCurrentCommandCheckState().selectedProfile?.atsProfileId);
+	const selectedProfileId = normalizeOptionalText$21(getCurrentCommandCheckState().selectedProfile?.atsProfileId);
 	if (selectedProfileId) return selectedProfileId;
 	return (await resolveAtsProfileOrNull({
 		allowDefaultFallback: input.runtime.resolvedView === "human",
@@ -33665,27 +33738,18 @@ async function runSystemServiceManager(input) {
 	startSpinner?.start("Starting ATS Service...");
 	try {
 		await input.systemManager.install(serviceCommandSpec);
-		await input.systemManager.start();
-	} catch (error) {
-		if (shouldAttemptLaunchdAutoRepair({
-			controller: input.systemManager.controller,
-			error
-		})) {
-			autoRepairAttempted = true;
-			startSpinner?.message("ATS is repairing a local service issue...");
-			try {
-				await runLaunchdAutoRepairRetry({
-					systemManager: input.systemManager,
-					serviceCommandSpec
-				});
+		autoRepairAttempted = (await startDaemonSystemServiceWithAutoRepair({
+			serviceCommandSpec,
+			systemManager: input.systemManager,
+			onAutoRepairAttempt: () => {
+				startSpinner?.message("ATS is repairing a local service issue...");
+			},
+			onAutoRepairRecovered: () => {
 				startSpinner?.message("Starting ATS Service...");
-			} catch (retryError) {
-				startupError = buildLaunchdAutoRepairFailureError({
-					initialError: error,
-					retryError
-				});
 			}
-		} else startupError = error;
+		})).autoRepairAttempted;
+	} catch (error) {
+		startupError = error;
 	}
 	if (startupError) {
 		startSpinner?.clear();
@@ -33706,8 +33770,8 @@ async function runSystemServiceManager(input) {
 		const startupStatus = await waitForSystemServiceStartup({
 			expectedVersion: input.daemonVersion,
 			manager: input.systemManager,
-			waitMs: resolveSystemServiceStartupWaitMs(input.systemManager.controller),
-			pollMs: SERVICE_STARTUP_POLL_MS
+			waitMs: input.startupWaitMs ?? resolveSystemServiceStartupWaitMs(input.systemManager.controller),
+			pollMs: input.startupPollMs ?? SERVICE_STARTUP_POLL_MS
 		});
 		await cleanupInactiveDaemonServiceBundles();
 		await clearDaemonStartFailureStateSafely();
@@ -34615,7 +34679,7 @@ async function resolveServiceStatus() {
 		installedVersion: daemonStatus.state.daemonVersion
 	};
 	const runtime = await readCurrentDaemonRuntimeContext({ status: daemonStatus }).catch(() => null);
-	if (!runtime || runtime.effectiveRuntimeStatus !== "running" || runtime.runtimeStatus.status !== "running") return {
+	if (!runtime || runtime.effectiveRuntimeStatus !== "running") return {
 		kind: "not_running",
 		runtimeStatus: runtime?.runtimeStatus ?? null
 	};
@@ -45318,10 +45382,13 @@ function makeHello(profile) {
 		profile
 	};
 }
-function makeTextSignal(text) {
+function makeTextSignal(text, options) {
 	return {
 		type: "signal.text",
-		data: { text }
+		data: {
+			text,
+			...options?.meta ? { meta: options.meta } : {}
+		}
 	};
 }
 function sanitizeText(value) {
@@ -45450,6 +45517,94 @@ function appendOptionalBooleanField(payload, key, value) {
 	if (typeof value === "boolean") payload[key] = value;
 }
 
+//#endregion
+//#region src/space/space-display-projection.ts
+function buildSpaceDisplayProjection(input) {
+	const currentProfileId = normalizeSpaceDisplayText(input.currentProfileId);
+	const currentProfileName = normalizeSpaceDisplayText(input.currentProfileName);
+	const creatorProfileName = normalizeSpaceDisplayText(input.creatorProfileName);
+	const creatorProfileId = normalizeSpaceDisplayText(input.creatorProfileId);
+	const availableViaProfileName = normalizeSpaceDisplayText(input.availableViaProfileName);
+	const availableViaProfileId = normalizeSpaceDisplayText(input.availableViaProfileId);
+	return {
+		spaceId: normalizeSpaceDisplayText(input.spaceId),
+		spaceName: normalizeSpaceDisplayText(input.spaceName),
+		creatorProfileName,
+		creatorProfileId,
+		creatorDisplayName: resolveSpaceProfileDisplayName({
+			currentProfileId,
+			currentProfileName,
+			profileId: creatorProfileId,
+			profileName: creatorProfileName
+		}),
+		availableViaProfileName,
+		availableViaProfileId,
+		availableViaDisplayName: resolveSpaceProfileDisplayName({
+			currentProfileId,
+			currentProfileName,
+			profileId: availableViaProfileId,
+			profileName: availableViaProfileName
+		}),
+		spaceCreatedAt: normalizeSpaceDisplayText(input.spaceCreatedAt),
+		lastJoinedAt: normalizeSpaceDisplayText(input.lastJoinedAt),
+		passwordProtected: typeof input.passwordProtected === "boolean" ? input.passwordProtected : null
+	};
+}
+function buildSpaceMetadataFields(input) {
+	const fields = [
+		{
+			id: "spaceId",
+			label: "Space ID",
+			value: formatSpaceDisplayValue(input.projection.spaceId)
+		},
+		{
+			id: "spaceCreator",
+			label: "Space Creator",
+			value: formatSpaceDisplayValue(input.projection.creatorDisplayName, "unknown-profile")
+		},
+		{
+			id: "spaceCreatorProfileId",
+			label: "Space Creator Profile ID",
+			value: formatSpaceDisplayValue(input.projection.creatorProfileId, "unknown-profile")
+		}
+	];
+	if (input.includeAvailableVia === true) fields.push({
+		id: "availableVia",
+		label: "Available via",
+		value: formatSpaceDisplayValue(input.projection.availableViaDisplayName)
+	}, {
+		id: "availableViaProfileId",
+		label: "Available via Profile ID",
+		value: formatSpaceDisplayValue(input.projection.availableViaProfileId)
+	});
+	if (input.includeCreatedAt === true) fields.push({
+		id: "spaceCreatedAt",
+		label: "Space Created",
+		value: formatSpaceDisplayValue(input.projection.spaceCreatedAt)
+	});
+	if (input.includeLastJoinedAt === true) fields.push({
+		id: "lastJoinedAt",
+		label: "Last joined",
+		value: formatSpaceDisplayValue(input.projection.lastJoinedAt)
+	});
+	return fields;
+}
+function formatSpaceDisplayValue(value, fallback = "unknown") {
+	return value ?? fallback;
+}
+function resolveSpaceDisplayName(value, fallback) {
+	return value ?? fallback;
+}
+function normalizeSpaceDisplayText(value) {
+	const normalized = sanitizeTerminalDisplayText(value, "single-line").trim();
+	return normalized.length > 0 ? normalized : null;
+}
+function resolveSpaceProfileDisplayName(input) {
+	if (input.profileName) return input.profileName;
+	if (input.profileId && input.currentProfileId && input.profileId === input.currentProfileId) return input.currentProfileName ?? input.profileId;
+	return input.profileId;
+}
+
 //#endregion
 //#region src/ui/controller-display.ts
 function resolveControllerDisplayName(controllerRef) {
@@ -45964,6 +46119,17 @@ function findMatchingAgentSnapshot(input) {
 //#endregion
 //#region src/space/mention-token.ts
 const MENTION_TOKEN_VALUE_PATTERN$1 = /^[a-z0-9][a-z0-9._-]{0,127}$/;
+const MENTION_TOKEN_TEXT_PATTERN = /(^|[^\w\\])@([A-Za-z0-9][A-Za-z0-9._-]{0,127})/g;
+const TRAILING_MENTION_PUNCTUATION_PATTERN$1 = /[.,!?;:，。！？；：]+$/u;
+function extractMentionTokensFromText(text) {
+	const mentions = [];
+	for (const match of text.matchAll(MENTION_TOKEN_TEXT_PATTERN)) {
+		const mentionToken = stripTrailingMentionTokenPunctuation(String(match[2] ?? "").trim());
+		if (!mentionToken) continue;
+		mentions.push(mentionToken);
+	}
+	return mentions;
+}
 function resolvePreferredSpaceMemberMentionToken(input) {
 	const tokenOwners = buildMentionTokenOwners(input.snapshot);
 	const explicitToken = input.member.profileKind === "agent" ? normalizeMentionTokenValue(input.member.wakeToken) : null;
@@ -46023,6 +46189,11 @@ function normalizeMentionTokenValue(value) {
 	if (!(normalized && MENTION_TOKEN_VALUE_PATTERN$1.test(normalized))) return null;
 	return normalized;
 }
+function stripTrailingMentionTokenPunctuation(value) {
+	const normalized = value.trim();
+	if (!normalized) return "";
+	return normalized.replace(TRAILING_MENTION_PUNCTUATION_PATTERN$1, "") || normalized;
+}
 
 //#endregion
 //#region src/ui/space-mention-highlight.ts
@@ -46119,8 +46290,6 @@ const AGENT_CONTEXT_HIDDEN_TOKENS = new Set([
 ]);
 const CLAUDE_CONTROLLER_REF_PATTERN = /claude/i;
 const DAEMON_WORKING_DIRECTORY_CACHE_TTL_MS = 5e3;
-const TRANSIENT_HINT_START_PURPOSE$1 = "agent_replying";
-const TRANSIENT_HINT_END_PURPOSE$1 = "agent_replying_end";
 const MENTION_DISPATCH_HINT_META_PURPOSE = "mention_dispatch_hint";
 const MENTION_FAILURE_HINT_PREFIX = "Mention skipped for \"";
 const MENTION_FAILURE_HINT_LEGACY_PREFIX = "Mention skipped. Try this:";
@@ -46189,38 +46358,38 @@ function buildSpaceInfoCardLines(input) {
 	});
 }
 function buildSpaceInfoData(input) {
-	const spaceName = sanitizeTrimmedSingleLineText(input.spaceName);
-	const spaceCreatedAt = sanitizeTrimmedSingleLineText(input.spaceCreatedAt);
-	const spaceCreatorName = sanitizeTrimmedSingleLineText(input.spaceCreatorName);
-	const spaceCreatorId = sanitizeTrimmedSingleLineText(input.spaceCreatorId);
-	const spaceId = sanitizeTrimmedSingleLineText(input.spaceId);
+	const projection = buildSpaceDisplayProjection({
+		spaceId: input.spaceId,
+		spaceName: input.spaceName,
+		creatorProfileId: input.spaceCreatorId,
+		creatorProfileName: input.spaceCreatorName,
+		spaceCreatedAt: input.spaceCreatedAt,
+		passwordProtected: input.passwordProtected
+	});
 	const gatewayUrl = sanitizeTrimmedSingleLineText(input.gatewayUrl);
+	const metadataFacts = buildSpaceMetadataFields({
+		projection,
+		includeCreatedAt: true
+	}).map((field) => {
+		if (field.id !== "spaceCreator") return {
+			label: field.label,
+			value: field.value
+		};
+		return {
+			label: field.label,
+			value: projection.creatorDisplayName && projection.creatorProfileId ? colorizePersonLabel(projection.creatorDisplayName, {
+				profileId: projection.creatorProfileId,
+				profileName: projection.creatorDisplayName
+			}, { spaceMembersSnapshot: input.spaceMembersSnapshot }) : formatSpaceDisplayValue(projection.creatorDisplayName, "(unknown)")
+		};
+	});
 	return {
 		facts: [
 			{
 				label: "Space Name",
-				value: spaceName || "(unnamed)"
-			},
-			{
-				label: "Space ID",
-				value: spaceId
-			},
-			{
-				label: "Space Created",
-				value: spaceCreatedAt || "(unknown)"
-			},
-			{
-				label: "Space Creator",
-				value: spaceCreatorName && spaceCreatorId ? colorizePersonLabel(spaceCreatorName, {
-					ownerUserId: spaceCreatorId,
-					profileId: spaceCreatorId,
-					profileName: spaceCreatorName
-				}, { spaceMembersSnapshot: input.spaceMembersSnapshot }) : spaceCreatorName || "(unknown)"
-			},
-			{
-				label: "Space Creator ID",
-				value: spaceCreatorId || "(unknown)"
+				value: resolveSpaceDisplayName(projection.spaceName, "(unnamed)")
 			},
+			...metadataFacts,
 			{
 				label: "Security",
 				value: resolveSpaceSecurityLabel(input.passwordProtected)
@@ -46234,7 +46403,7 @@ function buildSpaceInfoData(input) {
 				value: sanitizeTrimmedSingleLineText(input.modeLabel) || "(unknown)"
 			}
 		],
-		joinCommand: formatAtsCliCommand(`ats space join ${spaceId}`),
+		joinCommand: formatAtsCliCommand(`ats space join ${input.spaceId}`),
 		publicWarningLines: isPublicSpace(input.passwordProtected) ? buildPublicSpaceWarningLines() : []
 	};
 }
@@ -46365,15 +46534,15 @@ function buildSpaceMembersPanelLines(snapshot) {
 }
 function buildSpaceMembersPanelSource(snapshot) {
 	return { sections: [buildSpaceMembersPanelSectionSource({
-		id: "humans",
-		members: snapshot.humans,
-		snapshot,
-		title: "👤 Humans"
-	}), buildSpaceMembersPanelSectionSource({
 		id: "agents",
 		members: snapshot.agents,
 		snapshot,
 		title: "🤖 Agents"
+	}), buildSpaceMembersPanelSectionSource({
+		id: "humans",
+		members: snapshot.humans,
+		snapshot,
+		title: "👤 Humans"
 	})].filter((section) => section.items.length > 0) };
 }
 function buildSpaceMembersLoadingPanelLines() {
@@ -46658,13 +46827,13 @@ function isTransientSignalTextHint(event) {
 	if (rawMeta.transient !== true) return false;
 	const purpose = String(rawMeta.purpose ?? "").trim();
 	if (!purpose) return true;
-	return purpose === TRANSIENT_HINT_START_PURPOSE$1 || purpose === CONVERSATION_CONTINUITY_WARNING_PURPOSE || purpose === AGENT_REPLY_PREVIEW_PURPOSE;
+	return purpose === AGENT_REPLYING_PURPOSE || purpose === CONVERSATION_CONTINUITY_WARNING_PURPOSE || purpose === AGENT_REPLY_PREVIEW_PURPOSE || purpose === DISPATCH_ACTIVITY_DISPATCHING_PURPOSE || purpose === DISPATCH_ACTIVITY_RETRYING_PURPOSE || purpose === DISPATCH_ACTIVITY_FAILED_PURPOSE;
 }
 function isTransientSignalTextHintClearEvent(event) {
 	const rawMeta = resolveSignalTextMeta$1(event);
 	if (!rawMeta || rawMeta.transient !== true) return false;
 	const purpose = String(rawMeta.purpose ?? "").trim();
-	return purpose === TRANSIENT_HINT_END_PURPOSE$1 || purpose === AGENT_REPLY_PREVIEW_END_PURPOSE;
+	return purpose === AGENT_REPLYING_END_PURPOSE || purpose === AGENT_REPLY_PREVIEW_END_PURPOSE;
 }
 function resolveSignalTextMeta$1(event) {
 	if (!event.data || typeof event.data !== "object" || Array.isArray(event.data)) return null;
@@ -47426,6 +47595,9 @@ const SPACE_INFO_FULL_WIDTH_LABELS = new Set(["Space Name", "Space ID"]);
 const MEMBERS_SEARCH_LABEL = "Type to search";
 const MEMBERS_SEARCH_PLACEHOLDER = "Filter members by name, @wake, ID, or owner";
 const MEMBERS_NO_MATCHES_LINE = pc.dim("No matching members found.");
+const LOGS_SEARCH_LABEL = "Type to search";
+const LOGS_SEARCH_PLACEHOLDER = "Filter logs by actor, action, or text";
+const LOGS_NO_MATCHES_LINE = pc.dim("No matching logs found.");
 function buildHelpPanelBlocks() {
 	return buildPanelBodyBlocks([buildPanelLinesSection(listSpaceSlashCommands().map((command) => {
 		return `${pc.cyan(command.trigger)}  ${pc.dim(command.description)}`;
@@ -47458,6 +47630,31 @@ function buildLogsPanelBlocks(input) {
 	if (sections.length > 0) return sections;
 	return buildPanelBodyBlocks([buildPanelLinesSection([pc.dim("No logs yet.")])]);
 }
+function buildLogsSearchableListViewState(input) {
+	const normalizedQuery = normalizeSearchQuery(input.query);
+	const filteredSections = filterLogsSections(input.sections, normalizedQuery);
+	return {
+		activeItemId: resolveLogsSearchableActiveItemId({
+			preferredActiveItemId: input.activeItemId,
+			query: input.query,
+			sections: input.sections
+		}),
+		control: {
+			label: LOGS_SEARCH_LABEL,
+			placeholder: LOGS_SEARCH_PLACEHOLDER,
+			query: input.query
+		},
+		emptyLines: resolveLogsEmptyLines(filteredSections.length, normalizedQuery),
+		sections: filteredSections.map((section) => ({
+			id: section.id,
+			title: section.title,
+			items: section.items.map((item) => ({
+				id: item.id,
+				lines: item.lines
+			}))
+		}))
+	};
+}
 function buildMembersSearchableListViewState(input) {
 	const normalizedQuery = normalizeSearchQuery(input.query);
 	if (!input.snapshot) return {
@@ -47503,6 +47700,11 @@ function resolveMembersSearchableActiveItemId(input) {
 	if (itemIds.length === 0) return null;
 	return itemIds.includes(input.preferredActiveItemId ?? "") ? input.preferredActiveItemId : itemIds[0] ?? null;
 }
+function resolveLogsSearchableActiveItemId(input) {
+	const itemIds = filterLogsSections(input.sections, normalizeSearchQuery(input.query)).flatMap((section) => section.items.map((item) => item.id));
+	if (itemIds.length === 0) return null;
+	return itemIds.includes(input.preferredActiveItemId ?? "") ? input.preferredActiveItemId : itemIds[0] ?? null;
+}
 function buildMembersPanelLines(input) {
 	if (!input.snapshot) {
 		if (input.refreshError) return ["Couldn't load the current Space members.", pc.dim("Try /members again in a few seconds.")];
@@ -47511,8 +47713,24 @@ function buildMembersPanelLines(input) {
 	return buildSpaceMembersPanelLines(input.snapshot);
 }
 function buildLogsPanelSection(section) {
-	if (section.lines.length === 0) return null;
-	return buildPanelLinesSection([pc.bold(section.title), ...section.lines]);
+	if (section.items.length === 0) return null;
+	return buildPanelLinesSection([pc.bold(section.title), ...section.items.flatMap((item) => item.lines)]);
+}
+function filterLogsSections(sections, normalizedQuery) {
+	const sourceSections = sections.map((section) => ({
+		id: section.kind,
+		title: section.title,
+		items: section.items.map((item) => ({
+			id: item.id,
+			lines: item.lines,
+			searchKey: buildLogsSearchKey(section.title, item.lines)
+		}))
+	}));
+	if (!normalizedQuery) return sourceSections;
+	return sourceSections.map((section) => ({
+		...section,
+		items: section.items.filter((item) => item.searchKey.includes(normalizedQuery))
+	})).filter((section) => section.items.length > 0);
 }
 function filterMembersPanelSections(sections, normalizedQuery) {
 	if (!normalizedQuery) return [...sections];
@@ -47525,6 +47743,13 @@ function filterMembersPanelSections(sections, normalizedQuery) {
 function normalizeSearchQuery(query) {
 	return query.trim().toLowerCase();
 }
+function resolveLogsEmptyLines(sectionCount, normalizedQuery) {
+	if (sectionCount > 0) return [];
+	return normalizedQuery ? [LOGS_NO_MATCHES_LINE] : [pc.dim("No logs yet.")];
+}
+function buildLogsSearchKey(title, lines) {
+	return normalizeSearchQuery([title, ...lines].map((line) => stripVTControlCharacters(line)).join(" "));
+}
 function resolveConnectionModeLabel(connectionMode) {
 	if (connectionMode === "watch") return "watch-only stream";
 	if (connectionMode === "history") return "history viewer";
@@ -47606,10 +47831,10 @@ const SPACE_PANEL_DEFINITION_BY_KIND = new Map([
 		contentAlign: "left",
 		kind: "logs",
 		title: "🗒️ Space Logs",
-		mode: "readonly",
+		mode: "searchable_list",
 		layout: "centered_modal",
 		surfaceVariant: "dark",
-		instructionPreset: "readonly-close"
+		instructionPreset: "searchable-list-close"
 	}
 ].map((definition) => [definition.kind, definition]));
 const PANEL_INSTRUCTION_PRESETS = {
@@ -47887,6 +48112,79 @@ function assertUnreachable$1(value) {
 	throw new Error(`Unknown panel body block: ${JSON.stringify(value)}`);
 }
 
+//#endregion
+//#region src/space/pending-outbound-status.ts
+const PREVIEW_MAX_VISIBLE_CHARS$1 = 240;
+const PREVIEW_MIN_VISIBLE_CHARS$1 = 24;
+const PREVIEW_ELLIPSIS$1 = "...";
+const STATUS_SYSTEM_PREFIX = "* 📣 system · ";
+const STATUS_PREVIEW_PREFIX = "sending: ";
+function formatPendingOutboundStatusText(input) {
+	const normalizedText = normalizePendingOutboundText(input.pendingText);
+	if (!normalizedText) return "sending...";
+	const targetLabel = resolveSingleMentionTargetLabel(normalizedText);
+	if (targetLabel) return `Sending to ${targetLabel}...`;
+	return `${STATUS_PREVIEW_PREFIX}${truncatePreviewHead$1(normalizedText, resolvePendingOutboundPreviewWidth({ terminalColumns: input.terminalColumns }))}`;
+}
+function buildPendingOutboundDispatchRowDrafts(input) {
+	const normalizedText = normalizePendingOutboundText(input.pendingText);
+	if (!normalizedText) return [{
+		statusText: "sending...",
+		targetLabel: "",
+		targetWakeToken: null
+	}];
+	const uniqueMentionTokens = resolveUniqueMentionTokens(normalizedText);
+	if (uniqueMentionTokens.length === 0) return [{
+		statusText: formatPendingOutboundStatusText(input),
+		targetLabel: "",
+		targetWakeToken: null
+	}];
+	return uniqueMentionTokens.map((mentionToken) => {
+		const targetLabel = `@${mentionToken}`;
+		return {
+			statusText: `Sending to ${targetLabel}...`,
+			targetLabel,
+			targetWakeToken: mentionToken
+		};
+	});
+}
+function normalizePendingOutboundText(value) {
+	return sanitizeTerminalDisplayText(value, "single-line").replace(/\s+/g, " ").trim();
+}
+function resolveSingleMentionTargetLabel(value) {
+	const uniqueMentionTokens = resolveUniqueMentionTokens(value);
+	const mentionToken = uniqueMentionTokens.length === 1 ? uniqueMentionTokens[0] : null;
+	if (!mentionToken) return null;
+	return mentionToken.startsWith("@") ? mentionToken : `@${mentionToken}`;
+}
+function resolvePendingOutboundPreviewWidth(input) {
+	const prefixWidth = stringWidth(`${STATUS_SYSTEM_PREFIX}${STATUS_PREVIEW_PREFIX}`);
+	if (input.terminalColumns === null) return PREVIEW_MAX_VISIBLE_CHARS$1;
+	const availableWidth = input.terminalColumns - prefixWidth;
+	return Math.max(PREVIEW_MIN_VISIBLE_CHARS$1, Math.min(PREVIEW_MAX_VISIBLE_CHARS$1, availableWidth));
+}
+function truncatePreviewHead$1(value, maxWidth) {
+	if (stringWidth(value) <= maxWidth) return value;
+	const truncatedWidth = Math.max(0, maxWidth - stringWidth(PREVIEW_ELLIPSIS$1));
+	let head = "";
+	for (const char of value) {
+		if (stringWidth(head) + stringWidth(char) > truncatedWidth) break;
+		head += char;
+	}
+	return `${head}${PREVIEW_ELLIPSIS$1}`;
+}
+function resolveUniqueMentionTokens(value) {
+	const seenMentionTokens = /* @__PURE__ */ new Set();
+	const uniqueMentionTokens = [];
+	for (const mentionToken of extractMentionTokensFromText(value)) {
+		const dedupeKey = mentionToken.toLowerCase();
+		if (seenMentionTokens.has(dedupeKey)) continue;
+		seenMentionTokens.add(dedupeKey);
+		uniqueMentionTokens.push(mentionToken);
+	}
+	return uniqueMentionTokens;
+}
+
 //#endregion
 //#region src/space/preflight.ts
 const HTTP_STATUS_PREFIX_RE = /^HTTP\s+(\d{3}):\s*(.*)$/i;
@@ -48218,7 +48516,7 @@ var SpaceSessionRuntime = class {
 	#input;
 	#listeners = /* @__PURE__ */ new Set();
 	#bufferedLiveEvents = [];
-	#pendingSentTexts = [];
+	#pendingSentMessages = [];
 	#ws = null;
 	#started = false;
 	#stopRequested = false;
@@ -48290,22 +48588,29 @@ var SpaceSessionRuntime = class {
 		if (!this.#ws) {
 			this.#emit({
 				type: "send.failed",
+				clientMessageId: "unknown-client-message",
 				text,
 				error: "space connection is not started"
 			});
 			return false;
 		}
+		const clientMessageId = crypto.randomUUID();
 		try {
-			this.#ws.send(JSON.stringify(makeTextSignal(text)));
-			this.#rememberPendingSentText(text);
+			this.#ws.send(JSON.stringify(makeTextSignal(text, { meta: { clientMessageId } })));
+			this.#rememberPendingSentMessage({
+				clientMessageId,
+				text
+			});
 			this.#emit({
 				type: "send.queued",
+				clientMessageId,
 				text
 			});
 			return true;
 		} catch (error) {
 			this.#emit({
 				type: "send.failed",
+				clientMessageId,
 				text,
 				error: this.#input.formatError(error)
 			});
@@ -48364,20 +48669,34 @@ var SpaceSessionRuntime = class {
 			source
 		});
 	}
-	#rememberPendingSentText(text) {
+	#rememberPendingSentMessage(message) {
 		const pendingLimit = this.#input.pendingSendLimit ?? DEFAULT_PENDING_SEND_LIMIT;
-		if (this.#pendingSentTexts.length >= pendingLimit) this.#pendingSentTexts.shift();
-		this.#pendingSentTexts.push(text);
+		if (this.#pendingSentMessages.length >= pendingLimit) this.#pendingSentMessages.shift();
+		this.#pendingSentMessages.push(message);
 	}
 	#maybeEmitSendConfirmed(event) {
 		if (event.type !== "signal.text") return;
 		const profileId = String(event.profile?.profileId ?? "").trim();
 		if (!profileId || profileId !== this.#input.selfProfileId) return;
 		const text = typeof event.data?.text === "string" ? event.data.text : "";
-		if (this.#pendingSentTexts[0] !== text) return;
-		this.#pendingSentTexts.shift();
+		const clientMessageId = resolveClientMessageId(event);
+		if (clientMessageId) {
+			const matchingIndex = this.#pendingSentMessages.findIndex((message) => message.clientMessageId === clientMessageId);
+			if (matchingIndex < 0) return;
+			this.#pendingSentMessages.splice(matchingIndex, 1);
+			this.#emit({
+				type: "send.confirmed",
+				clientMessageId,
+				text,
+				event
+			});
+			return;
+		}
+		if (this.#pendingSentMessages[0]?.text !== text) return;
+		const pendingMessage = this.#pendingSentMessages.shift() ?? null;
 		this.#emit({
 			type: "send.confirmed",
+			clientMessageId: pendingMessage?.clientMessageId ?? null,
 			text,
 			event
 		});
@@ -48406,6 +48725,12 @@ function safeJsonParse$2(value) {
 		return null;
 	}
 }
+function resolveClientMessageId(event) {
+	const meta = event.data && typeof event.data === "object" && !Array.isArray(event.data) ? event.data.meta : null;
+	if (!(meta && typeof meta === "object") || Array.isArray(meta)) return null;
+	const clientMessageId = String(meta.clientMessageId ?? "").trim();
+	return clientMessageId.length > 0 ? clientMessageId : null;
+}
 
 //#endregion
 //#region src/space/session-profile.ts
@@ -48777,11 +49102,15 @@ const TRANSCRIPT_BUBBLE_VERTICAL_PADDING = 1;
 const TRANSCRIPT_BUBBLE_META_GAP_LINES = 1;
 const TRANSCRIPT_BUBBLE_BODY_PREFIX = "› ";
 const TRANSCRIPT_BUBBLE_BODY_CONTINUATION_PREFIX = "  ";
+const TRANSCRIPT_BUBBLE_REPLY_CONNECTED_BODY_PREFIX = "╰─› ";
+const TRANSCRIPT_BUBBLE_REPLY_CONNECTED_BODY_CONTINUATION_PREFIX = "    ";
+const TRANSCRIPT_REPLY_PREVIEW_MAX_VISIBLE_WIDTH = 24;
 const TRANSCRIPT_HUMAN_BUBBLE_BACKGROUND = buildAnsiBackgroundColor(ATS_COMPOSER_SURFACE_BG_RGB);
 const TRANSCRIPT_NEUTRAL_BUBBLE_BACKGROUND = "\x1B[48;2;33;33;33m";
 const ANSI_BACKGROUND_RESET = "\x1B[49m";
 const ANSI_ESCAPE_PATTERN = "(?:\\u001B\\[[0-9;]*m)*";
 const TRANSCRIPT_GROUP_KIND_PATTERN = /^profile:(human|agent|unknown):/u;
+const PROFILE_GROUP_KEY_PATTERN = /^profile:(human|agent|unknown):(.+)$/u;
 const PRESENCE_TRACE_JOINED_LABEL = "joined";
 const PRESENCE_TRACE_LEFT_LABEL = "left";
 const PRESENCE_TRACE_JOIN_LABEL = "join";
@@ -48945,60 +49274,119 @@ function canCoalesceAdjacentHumanPlainTextBlocks(previousBlock, nextBlock) {
 	return previousBlock.groupKey === nextBlock.groupKey && previousBlock.speakerProfileId === nextBlock.speakerProfileId && previousBlock.speakerKind === nextBlock.speakerKind && previousBlock.highlightKind === nextBlock.highlightKind;
 }
 function buildHumanLogsSections(input) {
-	const presenceLines = [...input.firstJoinBlocks.flatMap((block) => buildPresenceFirstJoinRows(block)), ...input.allBlocks.flatMap((block) => {
+	const presenceItems = [...input.firstJoinBlocks.map((block, index) => ({
+		id: `presence:first-join:${String(index)}`,
+		lines: buildPresenceFirstJoinRows(block)
+	})), ...input.allBlocks.flatMap((block, index) => {
 		if (block.kind !== "presence_trace_group") return [];
-		return [buildPresenceTraceRowText(block)];
+		return [{
+			id: `presence:trace:${String(index)}`,
+			lines: [buildPresenceTraceRowText(block)]
+		}];
 	})];
-	const membershipLines = input.allBlocks.flatMap((block) => {
+	const membershipItems = input.allBlocks.flatMap((block, index) => {
 		if (block.kind !== "membership_trace_group") return [];
-		return buildMembershipTraceRows(block);
-	});
-	const systemLines = input.allBlocks.flatMap((block) => {
-		if (block.kind !== "system_group") return [];
-		return buildSystemClusterRowsFromSystemLines(block.lines);
+		return [{
+			id: `membership:${String(index)}`,
+			lines: buildMembershipTraceRows(block)
+		}];
 	});
 	return [
-		{
-			kind: "presence",
-			title: "Presence",
-			lines: presenceLines
-		},
-		{
-			kind: "membership",
-			title: "Membership",
-			lines: membershipLines
-		},
-		{
-			kind: "system",
-			title: "System",
-			lines: systemLines
-		}
+		buildHumanLogsSection("system", "System", input.allBlocks.flatMap((block, index) => {
+			if (block.kind !== "system_group") return [];
+			return [{
+				id: `system:${String(index)}`,
+				lines: buildSystemClusterRowsFromSystemLines(block.lines)
+			}];
+		})),
+		buildHumanLogsSection("membership", "Membership", membershipItems),
+		buildHumanLogsSection("presence", "Presence", presenceItems)
 	];
 }
+function buildHumanLogsSection(kind, title, items) {
+	return {
+		kind,
+		title,
+		items,
+		lines: items.flatMap((item) => item.lines)
+	};
+}
 function buildPresenceFirstJoinBlocks(items, membersSnapshot) {
 	const blocks = [];
 	const seenActorKeys = /* @__PURE__ */ new Set();
+	const actorKeysWithPriorTranscriptActivity = /* @__PURE__ */ new Set();
 	for (const item of items) {
-		if (!(isPresenceTranscriptItem(item) && item.presenceAction === "join")) continue;
-		const actorKey = resolvePresenceActorKey(item);
-		if (!(actorKey && !seenActorKeys.has(actorKey))) continue;
-		const actorIdentity = resolvePresenceActorIdentity(item, membersSnapshot);
-		blocks.push({
-			kind: "presence_first_join_group",
-			groupKey: item.groupKey,
-			actorKey,
-			actorProfileId: item.actorProfileId?.trim() || null,
-			actorKind: item.actorKind ?? "unknown",
-			actorAvatar: item.actorAvatar?.trim() || resolvePresenceActorAvatar(item),
-			actorLabel: item.actorLabel?.trim() || "unknown",
-			actorOwnerUserId: actorIdentity.ownerUserId,
-			actorOwnerName: actorIdentity.ownerName,
-			ts: typeof item.ts === "number" ? item.ts : 0
-		});
-		seenActorKeys.add(actorKey);
+		const nextBlock = buildPresenceFirstJoinBlock({
+			item,
+			membersSnapshot,
+			seenActorKeys,
+			actorKeysWithPriorTranscriptActivity
+		});
+		if (nextBlock) blocks.push(nextBlock);
+		registerTranscriptActorActivity(item, actorKeysWithPriorTranscriptActivity);
 	}
 	return blocks;
 }
+function buildPresenceFirstJoinBlock(input) {
+	if (!(isPresenceTranscriptItem(input.item) && input.item.presenceAction === "join")) return null;
+	const actorKey = resolvePresenceActorKey(input.item);
+	if (!actorKey || input.seenActorKeys.has(actorKey)) return null;
+	input.seenActorKeys.add(actorKey);
+	if (!shouldRenderPresenceFirstJoinBlock({
+		item: input.item,
+		actorKey,
+		membersSnapshot: input.membersSnapshot,
+		actorKeysWithPriorTranscriptActivity: input.actorKeysWithPriorTranscriptActivity
+	})) return null;
+	const actorIdentity = resolvePresenceActorIdentity(input.item, input.membersSnapshot);
+	return {
+		kind: "presence_first_join_group",
+		groupKey: input.item.groupKey,
+		actorKey,
+		actorProfileId: input.item.actorProfileId?.trim() || null,
+		actorKind: input.item.actorKind ?? "unknown",
+		actorAvatar: input.item.actorAvatar?.trim() || resolvePresenceActorAvatar(input.item),
+		actorLabel: input.item.actorLabel?.trim() || "unknown",
+		actorOwnerUserId: actorIdentity.ownerUserId,
+		actorOwnerName: actorIdentity.ownerName,
+		ts: typeof input.item.ts === "number" ? input.item.ts : 0
+	};
+}
+function shouldRenderPresenceFirstJoinBlock(input) {
+	if (input.actorKeysWithPriorTranscriptActivity.has(input.actorKey)) return false;
+	const knownFirstEnteredAtMs = resolvePresenceActorFirstEnteredAtMs(input.item, input.membersSnapshot);
+	if (knownFirstEnteredAtMs === null) return true;
+	const joinTs = typeof input.item.ts === "number" ? input.item.ts : null;
+	return joinTs !== null && joinTs === knownFirstEnteredAtMs;
+}
+function registerTranscriptActorActivity(item, actorKeys) {
+	for (const actorKey of resolveTranscriptActorActivityKeys(item)) actorKeys.add(actorKey);
+}
+function resolveTranscriptActorActivityKeys(item) {
+	if (isPresenceTranscriptItem(item)) {
+		const actorKey = resolvePresenceActorKey(item);
+		return actorKey ? [actorKey] : [];
+	}
+	if (isMembershipNoticeTranscriptItem(item)) {
+		const notice = resolveMembershipNoticePayload(item);
+		if (!notice) return [];
+		const actorKey = resolveMembershipActorKey(notice);
+		return actorKey ? [actorKey] : [];
+	}
+	const actorKey = resolveTranscriptContentActorKey(item);
+	return actorKey ? [actorKey] : [];
+}
+function resolveTranscriptContentActorKey(item) {
+	const itemProfileId = item.profile?.profileId?.trim();
+	if (itemProfileId) return itemProfileId;
+	const groupProfileId = resolveProfileIdFromGroupKey(item.groupKey);
+	if (groupProfileId) return groupProfileId;
+	const itemProfileName = item.profile?.profileName?.trim();
+	if ((item.profile?.kind === "human" || item.profile?.kind === "agent" || item.profile?.kind === "unknown") && itemProfileName) return `${item.profile.kind}:${itemProfileName}`;
+	const fallbackMatch = PROFILE_GROUP_KEY_PATTERN.exec(item.groupKey);
+	if (!fallbackMatch) return "";
+	return `${fallbackMatch[1]}:${fallbackMatch[2]}`;
+}
 function attachCurrentPresenceStatusToLastMessageCards(blocks, membersSnapshot, items) {
 	const lastMessageLocationByActorKey = /* @__PURE__ */ new Map();
 	const currentStatusByActorKey = buildCurrentPresenceStatusByActorKey({
@@ -49356,6 +49744,10 @@ function createTranscriptBubbleMessage(input) {
 		speakerIdentity: input.speakerIdentity,
 		spaceMembersSnapshot: input.spaceMembersSnapshot
 	});
+	const replyLine = resolveTranscriptBubbleReplyLine({
+		replyRef: input.item.replyRef,
+		membersSnapshot: input.spaceMembersSnapshot ?? null
+	});
 	return {
 		primaryLine: rawLines[0] ?? "",
 		headerBaseLeading,
@@ -49367,6 +49759,7 @@ function createTranscriptBubbleMessage(input) {
 		}),
 		headerStatusBadge: null,
 		headerTrailing: header.trailing,
+		...replyLine ? { replyLine } : {},
 		bodyLines,
 		bodyDetailLines,
 		metaLines,
@@ -49465,12 +49858,18 @@ function renderTranscriptBubbleMessage(message, block, contentWidth) {
 		contentWidth
 	});
 	for (const headerLine of headerLines) lines.push(renderBubbleLine(headerLine, block, contentWidth));
-	if (message.bodyLines.length > 0 && headerLines.length > 0) appendBubblePaddingLines(lines, TRANSCRIPT_BUBBLE_META_GAP_LINES, block, contentWidth);
+	if (message.replyLine) {
+		if (headerLines.length > 0) appendBubblePaddingLines(lines, TRANSCRIPT_BUBBLE_META_GAP_LINES, block, contentWidth);
+		for (const wrappedLine of wrapBubbleLine(pc.dim(message.replyLine), contentWidth)) lines.push(renderBubbleLine(wrappedLine, block, contentWidth));
+	}
+	if (message.bodyLines.length > 0 && headerLines.length > 0 && !message.replyLine) appendBubblePaddingLines(lines, TRANSCRIPT_BUBBLE_META_GAP_LINES, block, contentWidth);
+	const bodyPrefixes = resolveTranscriptBubbleBodyPrefixes(Boolean(message.replyLine));
 	for (const [index, bodyLine] of message.bodyLines.entries()) {
 		const wrappedBodyLines = wrapBubbleBodyLine({
 			line: bodyLine,
 			contentWidth,
-			withLeadPrefix: index === 0
+			leadPrefix: index === 0 ? bodyPrefixes.firstLinePrefix : bodyPrefixes.otherLinePrefix,
+			continuationPrefix: bodyPrefixes.otherLinePrefix
 		});
 		for (const wrappedLine of wrappedBodyLines) lines.push(renderBubbleLine(wrappedLine, block, contentWidth));
 	}
@@ -49513,6 +49912,49 @@ function buildTranscriptBubbleHeaderAuxLeading(input) {
 	}, { spaceMembersSnapshot: input.spaceMembersSnapshot }));
 	return headerSegments.length > 0 ? headerSegments.join("") : null;
 }
+function resolveTranscriptBubbleReplyLine(input) {
+	const replyRef = input.replyRef;
+	if (!replyRef) return null;
+	const profileLabel = resolveTranscriptReplyProfileLabel({
+		replyRef,
+		membersSnapshot: input.membersSnapshot
+	});
+	const previewText = resolveTranscriptReplyPreviewText(replyRef.previewText);
+	return previewText ? `reply to ${profileLabel} · ${previewText}` : `reply to ${profileLabel}`;
+}
+function resolveTranscriptReplyProfileLabel(input) {
+	const profileId = sanitizeTranscriptReplyDisplayText(input.replyRef.profileId);
+	if (profileId && input.membersSnapshot) {
+		const humanMatch = input.membersSnapshot.humans.find((member) => member.profileId === profileId);
+		const agentMatch = input.membersSnapshot.agents.find((member) => member.profileId === profileId);
+		const snapshotName = humanMatch?.profileName?.trim() || agentMatch?.profileName?.trim() || "";
+		if (snapshotName) return snapshotName;
+	}
+	return sanitizeTranscriptReplyDisplayText(input.replyRef.profileName) || profileId || "unknown";
+}
+function resolveTranscriptReplyPreviewText(value) {
+	const sanitizedPreview = sanitizeTranscriptReplyDisplayText(value);
+	if (!sanitizedPreview) return "";
+	return truncateTranscriptReplyPreview(sanitizedPreview, TRANSCRIPT_REPLY_PREVIEW_MAX_VISIBLE_WIDTH);
+}
+function sanitizeTranscriptReplyDisplayText(value) {
+	return sanitizeTerminalDisplayText(value, "single-line").replace(/\s+/gu, " ").trim();
+}
+function truncateTranscriptReplyPreview(value, maxVisibleWidth) {
+	if (measureVisibleWidth$1(value) <= maxVisibleWidth) return value;
+	if (maxVisibleWidth <= 1) return "…";
+	const ellipsis = "…";
+	const targetWidth = maxVisibleWidth - measureVisibleWidth$1(ellipsis);
+	let result = "";
+	let currentWidth = 0;
+	for (const char of value) {
+		const nextWidth = currentWidth + stringWidth(char);
+		if (nextWidth > targetWidth) break;
+		result += char;
+		currentWidth = nextWidth;
+	}
+	return `${result.trimEnd()}${ellipsis}`;
+}
 function joinTranscriptBubbleHeaderLeading(input) {
 	const segments = [input.baseLeading];
 	if (input.auxLeading) segments.push(input.auxLeading);
@@ -49616,7 +50058,7 @@ function buildPresenceFirstJoinRows(block) {
 }
 function buildPresenceFirstJoinRowText(block) {
 	return [
-		formatPresenceTraceClock(block.ts),
+		formatPresenceTraceDateTime(block.ts),
 		"·",
 		buildSystemActorLabel({
 			actorAvatar: block.actorAvatar,
@@ -49709,10 +50151,20 @@ function buildSystemActorLabel(input) {
 	return `${input.actorAvatar ? `${input.actorAvatar} ` : ""}${input.actorLabel}`;
 }
 function resolvePresenceTraceTimeLabel(block) {
-	const startLabel = formatPresenceTraceClock(block.startTs);
-	const endLabel = formatPresenceTraceClock(block.endTs);
-	if ((block.count ?? 1) <= 1 || startLabel === endLabel) return startLabel;
-	return `${startLabel}–${endLabel}`;
+	const startDateLabel = formatPresenceTraceDate(block.startTs);
+	const startClockLabel = formatPresenceTraceClock(block.startTs);
+	const endDateLabel = formatPresenceTraceDate(block.endTs);
+	const endClockLabel = formatPresenceTraceClock(block.endTs);
+	if ((block.count ?? 1) <= 1 || startDateLabel === endDateLabel && startClockLabel === endClockLabel) return `${startDateLabel} ${startClockLabel}`;
+	if (startDateLabel === endDateLabel) return `${startDateLabel} ${startClockLabel}–${endClockLabel}`;
+	return `${startDateLabel} ${startClockLabel}–${endDateLabel} ${endClockLabel}`;
+}
+function formatPresenceTraceDateTime(ts) {
+	return `${formatPresenceTraceDate(ts)} ${formatPresenceTraceClock(ts)}`;
+}
+function formatPresenceTraceDate(ts) {
+	const date = new Date(ts);
+	return `${`${date.getFullYear()}`}${`${date.getMonth() + 1}`.padStart(2, "0")}${`${date.getDate()}`.padStart(2, "0")}`;
 }
 function formatPresenceTraceClock(ts) {
 	const date = new Date(ts);
@@ -49734,14 +50186,23 @@ function wrapBubbleLine(line, contentWidth) {
 	}).split("\n");
 }
 function wrapBubbleBodyLine(input) {
-	const leadPrefix = input.withLeadPrefix ? renderAtsBrandAccent(TRANSCRIPT_BUBBLE_BODY_PREFIX) : TRANSCRIPT_BUBBLE_BODY_CONTINUATION_PREFIX;
-	const prefixWidth = input.withLeadPrefix ? stringWidth(TRANSCRIPT_BUBBLE_BODY_PREFIX) : stringWidth(TRANSCRIPT_BUBBLE_BODY_CONTINUATION_PREFIX);
+	const leadPrefix = input.leadPrefix === TRANSCRIPT_BUBBLE_BODY_CONTINUATION_PREFIX || input.leadPrefix === TRANSCRIPT_BUBBLE_REPLY_CONNECTED_BODY_CONTINUATION_PREFIX ? input.leadPrefix : renderAtsBrandAccent(input.leadPrefix);
+	const prefixWidth = stringWidth(input.leadPrefix);
 	const prefixedContentWidth = Math.max(1, input.contentWidth - prefixWidth);
 	return wrapAnsi(input.line, prefixedContentWidth, {
 		hard: true,
 		trim: false,
 		wordWrap: true
-	}).split("\n").map((wrappedLine, index) => index === 0 ? `${leadPrefix}${wrappedLine}` : `${TRANSCRIPT_BUBBLE_BODY_CONTINUATION_PREFIX}${wrappedLine}`);
+	}).split("\n").map((wrappedLine, index) => index === 0 ? `${leadPrefix}${wrappedLine}` : `${input.continuationPrefix}${wrappedLine}`);
+}
+function resolveTranscriptBubbleBodyPrefixes(hasReplyLine) {
+	return hasReplyLine ? {
+		firstLinePrefix: TRANSCRIPT_BUBBLE_REPLY_CONNECTED_BODY_PREFIX,
+		otherLinePrefix: TRANSCRIPT_BUBBLE_REPLY_CONNECTED_BODY_CONTINUATION_PREFIX
+	} : {
+		firstLinePrefix: TRANSCRIPT_BUBBLE_BODY_PREFIX,
+		otherLinePrefix: TRANSCRIPT_BUBBLE_BODY_CONTINUATION_PREFIX
+	};
 }
 function renderBubbleLine(line, block, contentWidth) {
 	const visibleWidth = measureVisibleWidth$1(line);
@@ -49894,25 +50355,26 @@ function resolvePresenceActorKey(item) {
 	return "";
 }
 function resolvePresenceActorIdentity(item, membersSnapshot) {
-	const actorProfileId = item.actorProfileId?.trim();
-	if (!(actorProfileId && membersSnapshot)) return {};
-	if (item.actorKind === "agent") {
-		const agentSnapshot = membersSnapshot.agents.find((member) => member.profileId === actorProfileId) ?? null;
-		if (!agentSnapshot) return {};
-		return {
-			ownerUserId: agentSnapshot.ownerUserId,
-			ownerName: agentSnapshot.ownerName
-		};
-	}
-	if (item.actorKind === "human") {
-		const humanSnapshot = membersSnapshot.humans.find((member) => member.profileId === actorProfileId) ?? null;
-		if (!humanSnapshot) return {};
-		return {
-			ownerUserId: humanSnapshot.ownerUserId,
-			ownerName: humanSnapshot.ownerName
-		};
-	}
-	return {};
+	const matchedSnapshot = resolvePresenceActorMemberSnapshot(item, membersSnapshot);
+	if (!matchedSnapshot) return {};
+	return {
+		ownerUserId: matchedSnapshot.ownerUserId,
+		ownerName: matchedSnapshot.ownerName
+	};
+}
+function resolvePresenceActorFirstEnteredAtMs(item, membersSnapshot) {
+	const firstEnteredAt = resolvePresenceActorMemberSnapshot(item, membersSnapshot)?.firstEnteredAt ?? null;
+	if (!firstEnteredAt) return null;
+	const parsed = Date.parse(firstEnteredAt);
+	return Number.isFinite(parsed) ? parsed : null;
+}
+function resolvePresenceActorMemberSnapshot(item, membersSnapshot) {
+	if (!membersSnapshot) return null;
+	const actorProfileId = item.actorProfileId?.trim() || "";
+	const actorLabel = item.actorLabel?.trim().toLowerCase() || "";
+	if (item.actorKind === "agent") return membersSnapshot.agents.find((member) => member.profileId === actorProfileId || !actorProfileId && actorLabel.length > 0 && member.profileName.trim().toLowerCase() === actorLabel) ?? null;
+	if (item.actorKind === "human") return membersSnapshot.humans.find((member) => member.profileId === actorProfileId || !actorProfileId && actorLabel.length > 0 && member.profileName.trim().toLowerCase() === actorLabel) ?? null;
+	return null;
 }
 function resolveMembershipActorKey(notice) {
 	if (notice.actorProfileId?.trim()) return notice.actorProfileId.trim();
@@ -49996,69 +50458,125 @@ function resolveSystemClusterContentWidth(width) {
 
 //#endregion
 //#region src/space/view/build-composer-activity-view-state.ts
+const MAX_COMPOSER_ACTIVITY_ROWS = 2;
 function buildComposerActivityViewState(source, spaceMembersSnapshot) {
-	const actors = buildReplyingActors(source.replyingDispatches);
-	const leadActor = selectLeadActor(actors);
-	const hasReplyingActors = actors.length > 0;
-	const pendingOutboundText = source.pendingOutboundText.trim();
-	if (!hasReplyingActors) return {
-		visible: pendingOutboundText.length > 0,
-		mode: pendingOutboundText.length > 0 ? "sending" : "idle",
+	const rowCandidates = buildComposerActivityRowCandidates({
+		nowMs: source.nowMs,
+		rows: source.rows
+	});
+	const visibleRows = selectVisibleRows(rowCandidates);
+	const leadRow = visibleRows.at(-1) ?? null;
+	const actors = visibleRows.flatMap((row) => row.actors);
+	const overflowCount = Math.max(0, rowCandidates.length - visibleRows.length);
+	if (!leadRow) return {
+		visible: false,
+		mode: "idle",
+		rows: [],
+		overflowCount: 0,
 		actors: [],
 		leadActor: null,
 		elapsedSeconds: null,
 		previewText: "",
 		hint: null,
-		pendingOutboundText,
 		spaceMembersSnapshot: spaceMembersSnapshot ?? null
 	};
-	const previewText = leadActor?.latestPreviewText.trim() ?? "";
 	return {
 		visible: true,
-		mode: previewText ? "streaming" : "replying",
+		mode: leadRow.mode,
+		rows: visibleRows,
+		overflowCount,
 		actors,
-		leadActor,
-		elapsedSeconds: leadActor ? Math.max(0, Math.floor((source.nowMs - leadActor.startedAtMs) / 1e3)) : null,
-		previewText,
-		hint: null,
-		pendingOutboundText,
+		leadActor: leadRow.leadActor,
+		elapsedSeconds: leadRow.elapsedSeconds,
+		previewText: leadRow.previewText,
+		hint: leadRow.hint,
 		spaceMembersSnapshot: spaceMembersSnapshot ?? null
 	};
 }
-function buildReplyingActors(replyingDispatches) {
-	const actorByProfileId = /* @__PURE__ */ new Map();
-	for (const dispatch of replyingDispatches) {
-		const existing = actorByProfileId.get(dispatch.targetProfileId);
-		if (!existing) {
-			actorByProfileId.set(dispatch.targetProfileId, {
-				profileId: dispatch.targetProfileId,
-				label: dispatch.targetLabel,
-				startedAtMs: dispatch.startedAtMs,
-				updatedAtMs: dispatch.updatedAtMs,
-				latestPreviewText: dispatch.latestPreviewText,
-				latestPreviewUpdatedAtMs: dispatch.latestPreviewUpdatedAtMs
-			});
-			continue;
-		}
-		const nextPreviewIsNewer = (dispatch.latestPreviewUpdatedAtMs ?? Number.NEGATIVE_INFINITY) > (existing.latestPreviewUpdatedAtMs ?? Number.NEGATIVE_INFINITY);
-		actorByProfileId.set(dispatch.targetProfileId, {
-			profileId: existing.profileId,
-			label: existing.label || dispatch.targetLabel,
-			startedAtMs: Math.min(existing.startedAtMs, dispatch.startedAtMs),
-			updatedAtMs: Math.max(existing.updatedAtMs, dispatch.updatedAtMs),
-			latestPreviewText: nextPreviewIsNewer ? dispatch.latestPreviewText : existing.latestPreviewText,
-			latestPreviewUpdatedAtMs: nextPreviewIsNewer ? dispatch.latestPreviewUpdatedAtMs : existing.latestPreviewUpdatedAtMs
-		});
+function buildComposerActivityRowCandidates(input) {
+	return input.rows.map((row) => toComposerActivityRowCandidate({
+		nowMs: input.nowMs,
+		row
+	}));
+}
+function toComposerActivityRowCandidate(input) {
+	const actor = toDispatchActivityActor(input.row);
+	if (input.row.stage === "replying") {
+		const previewText = input.row.latestPreviewText.trim();
+		return {
+			key: input.row.rowId,
+			mode: previewText ? "streaming" : "replying",
+			targetLabel: input.row.targetLabel,
+			actors: actor ? [actor] : [],
+			leadActor: actor,
+			elapsedSeconds: Math.max(0, Math.floor((input.nowMs - input.row.createdAtMs) / 1e3)),
+			previewText,
+			hint: null,
+			previewUpdatedAtMs: input.row.latestPreviewUpdatedAtMs ?? Number.NEGATIVE_INFINITY,
+			startedAtMs: input.row.createdAtMs,
+			updatedAtMs: input.row.updatedAtMs
+		};
 	}
-	return [...actorByProfileId.values()].sort((left, right) => {
-		const previewDelta = (right.latestPreviewUpdatedAtMs ?? Number.NEGATIVE_INFINITY) - (left.latestPreviewUpdatedAtMs ?? Number.NEGATIVE_INFINITY);
-		if (previewDelta !== 0) return previewDelta;
-		if (right.updatedAtMs !== left.updatedAtMs) return right.updatedAtMs - left.updatedAtMs;
-		return left.label.localeCompare(right.label);
-	});
+	if (input.row.stage === "sending") return {
+		key: input.row.rowId,
+		mode: "sending",
+		targetLabel: input.row.targetLabel,
+		actors: [],
+		leadActor: null,
+		elapsedSeconds: Math.max(0, Math.floor((input.nowMs - input.row.createdAtMs) / 1e3)),
+		previewText: "",
+		hint: input.row.statusText || "sending...",
+		previewUpdatedAtMs: Number.NEGATIVE_INFINITY,
+		startedAtMs: input.row.createdAtMs,
+		updatedAtMs: input.row.updatedAtMs
+	};
+	let mode = "warning";
+	if (input.row.stage === "dispatching") mode = "dispatching";
+	else if (input.row.stage === "retrying") mode = "retrying";
+	return {
+		key: input.row.rowId,
+		mode,
+		targetLabel: input.row.targetLabel,
+		actors: actor ? [actor] : [],
+		leadActor: actor,
+		elapsedSeconds: Math.max(0, Math.floor((input.nowMs - input.row.createdAtMs) / 1e3)),
+		previewText: "",
+		hint: input.row.warningText || input.row.statusText || resolveDispatchActivityHintFallback(input.row),
+		previewUpdatedAtMs: Number.NEGATIVE_INFINITY,
+		startedAtMs: input.row.createdAtMs,
+		updatedAtMs: input.row.updatedAtMs
+	};
+}
+function selectVisibleRows(rowCandidates) {
+	return [...rowCandidates].sort(compareComposerActivityRowsByRecencyDesc).slice(0, MAX_COMPOSER_ACTIVITY_ROWS).sort(compareComposerActivityRowsByRenderOrderAsc).map(({ previewUpdatedAtMs, startedAtMs, updatedAtMs, ...row }) => row);
+}
+function compareComposerActivityRowsByRecencyDesc(left, right) {
+	if (right.updatedAtMs !== left.updatedAtMs) return right.updatedAtMs - left.updatedAtMs;
+	if (right.previewUpdatedAtMs !== left.previewUpdatedAtMs) return right.previewUpdatedAtMs - left.previewUpdatedAtMs;
+	if (right.startedAtMs !== left.startedAtMs) return right.startedAtMs - left.startedAtMs;
+	return left.key.localeCompare(right.key);
 }
-function selectLeadActor(actors) {
-	return actors[0] ?? null;
+function compareComposerActivityRowsByRenderOrderAsc(left, right) {
+	if (left.updatedAtMs !== right.updatedAtMs) return left.updatedAtMs - right.updatedAtMs;
+	if (left.previewUpdatedAtMs !== right.previewUpdatedAtMs) return left.previewUpdatedAtMs - right.previewUpdatedAtMs;
+	if (left.startedAtMs !== right.startedAtMs) return left.startedAtMs - right.startedAtMs;
+	return left.key.localeCompare(right.key);
+}
+function toDispatchActivityActor(row) {
+	if (!row.targetProfileId) return null;
+	return {
+		profileId: row.targetProfileId,
+		label: row.targetLabel,
+		startedAtMs: row.createdAtMs,
+		updatedAtMs: row.updatedAtMs,
+		latestPreviewText: row.latestPreviewText,
+		latestPreviewUpdatedAtMs: row.latestPreviewUpdatedAtMs
+	};
+}
+function resolveDispatchActivityHintFallback(row) {
+	if (row.stage === "dispatching") return `${row.targetLabel} is dispatching...`;
+	if (row.stage === "retrying") return `${row.targetLabel} is retrying...`;
+	return `${row.targetLabel} couldn't reply right now`;
 }
 
 //#endregion
@@ -50185,6 +50703,11 @@ function buildSpaceSessionViewState(input) {
 		sessionProfile: context.profile
 	});
 	const logsBlocks = buildLogsPanelBlocks({ sections: humanTranscriptProjection.logsSections });
+	const logsSearchableList = buildLogsSearchableListViewState({
+		activeItemId: screenState.overlay.interaction.activeItemId,
+		query: screenState.overlay.interaction.query,
+		sections: humanTranscriptProjection.logsSections
+	});
 	const membersBlocks = buildMembersPanelBlocks({
 		snapshot: screenState.members.snapshot,
 		refreshError: screenState.members.refreshError
@@ -50204,7 +50727,10 @@ function buildSpaceSessionViewState(input) {
 			space: spaceBlocks
 		},
 		headerMetaTextByKind: { members: buildMembersPanelUpdatedAtLabel(screenState.members.updatedAtMs) },
-		searchableListByKind: { members: membersSearchableList }
+		searchableListByKind: {
+			logs: logsSearchableList,
+			members: membersSearchableList
+		}
 	});
 	const transcriptBlocks = humanTranscriptProjection.transcriptBlocks;
 	const spaceSummary = buildSpaceSummaryViewState({
@@ -50213,8 +50739,7 @@ function buildSpaceSessionViewState(input) {
 	});
 	const composerActivity = buildComposerActivityViewState(resources?.composerActivity ?? {
 		nowMs: Date.now(),
-		pendingOutboundText: "",
-		replyingDispatches: []
+		rows: []
 	}, screenState.members.snapshot);
 	const visibleComposerActivity = composerVisible ? composerActivity : {
 		...composerActivity,
@@ -50465,19 +50990,20 @@ const STATUS_TRAILING_DOT_FRAMES = [
 	"..."
 ];
 const PREVIEW_GAP = "   ";
+const ACTIVITY_TARGET_LABEL_PREFIX_REGEX = /^@/u;
 var ComposerActivityStrip = class {
 	#tui;
 	#activity = {
 		visible: false,
 		mode: "idle",
+		rows: [],
+		overflowCount: 0,
 		actors: [],
 		leadActor: null,
 		elapsedSeconds: null,
 		previewText: "",
-		hint: null,
-		pendingOutboundText: ""
+		hint: null
 	};
-	#activityBaseElapsedSeconds = 0;
 	#activityBaseSetAtMs = Date.now();
 	#tick = 0;
 	#timer = null;
@@ -50489,7 +51015,6 @@ var ComposerActivityStrip = class {
 		const isWaiting = isWaitingComposerActivity(activity);
 		if (!wasWaiting && isWaiting) this.#tick = 0;
 		this.#activity = activity;
-		this.#activityBaseElapsedSeconds = activity.elapsedSeconds ?? 0;
 		this.#activityBaseSetAtMs = Date.now();
 		this.#syncTimer();
 		this.#tui.requestRender();
@@ -50502,16 +51027,12 @@ var ComposerActivityStrip = class {
 	invalidate() {}
 	render(width) {
 		if (!shouldRenderComposerActivity(this.#activity)) return [];
-		return ["", ...wrapAnsi(buildInlineActivityLine({
+		return ["", ...buildActivityLines({
 			activity: this.#activity,
 			tick: this.#tick,
-			elapsedSeconds: this.#resolveElapsedSeconds(),
+			elapsedDeltaSeconds: this.#resolveElapsedDeltaSeconds(),
 			width
-		}), Math.max(1, width), {
-			hard: true,
-			trim: false,
-			wordWrap: true
-		}).split("\n")];
+		})];
 	}
 	#syncTimer() {
 		if (shouldAnimateComposerActivity(this.#activity)) {
@@ -50524,55 +51045,83 @@ var ComposerActivityStrip = class {
 		}
 		this.stop();
 	}
-	#resolveElapsedSeconds() {
+	#resolveElapsedDeltaSeconds() {
 		if (!shouldRenderComposerActivity(this.#activity)) return 0;
-		const deltaSeconds = Math.max(0, Math.floor((Date.now() - this.#activityBaseSetAtMs) / 1e3));
-		return this.#activityBaseElapsedSeconds + deltaSeconds;
+		return Math.max(0, Math.floor((Date.now() - this.#activityBaseSetAtMs) / 1e3));
 	}
 };
 function shouldRenderComposerActivity(activity) {
-	return activity.visible && activity.mode !== "idle";
+	return activity.visible && activity.mode !== "idle" && activity.rows.length > 0;
 }
 function shouldAnimateComposerActivity(activity) {
-	return shouldRenderComposerActivity(activity);
+	return shouldRenderComposerActivity(activity) && activity.rows.some((row) => row.mode !== "warning");
 }
 function isWaitingComposerActivity(activity) {
-	return shouldRenderComposerActivity(activity) && activity.previewText.trim().length === 0;
+	return shouldRenderComposerActivity(activity) && activity.rows.some((row) => row.mode !== "warning" && row.previewText.trim().length === 0);
 }
-function buildStatusLine(input) {
-	const actors = input.activity.actors.map((actor) => {
-		const matchingAgent = input.activity.spaceMembersSnapshot?.agents.find((candidate) => candidate.profileId === actor.profileId) ?? null;
+function buildReplyingStatusLine(input) {
+	const actors = input.row.actors.map((actor) => {
+		const matchingAgent = input.spaceMembersSnapshot?.agents.find((candidate) => candidate.profileId === actor.profileId) ?? null;
 		return colorizeAgentLabel(actor.label, {
 			controllerRef: matchingAgent?.controllerRef,
 			profileId: actor.profileId,
 			profileName: actor.label
-		}, { spaceMembersSnapshot: input.activity.spaceMembersSnapshot });
+		}, { spaceMembersSnapshot: input.spaceMembersSnapshot });
 	}).join(pc.dim(", "));
-	const linkingVerb = input.activity.actors.length > 1 ? "are" : "is";
+	const linkingVerb = input.row.actors.length > 1 ? "are" : "is";
 	const modeLabel = resolveStatusModeLabel({
 		elapsedSeconds: input.elapsedSeconds,
-		previewText: input.activity.previewText
+		previewText: input.row.previewText
 	});
-	const modeSuffix = input.activity.previewText.trim().length > 0 ? "" : resolveAnimatedStatusDots(input.tick);
+	const modeSuffix = input.row.previewText.trim().length > 0 ? "" : resolveAnimatedStatusDots(input.tick);
 	return `${actors} ${pc.dim(linkingVerb)} ${pc.dim(`${modeLabel}${modeSuffix}`)}`;
 }
-function buildInlineActivityLine(input) {
+function buildActivityLines(input) {
+	const lines = [];
+	if (input.activity.overflowCount > 0) lines.push(pc.dim(`+${input.activity.overflowCount} more active`));
+	for (const row of input.activity.rows) {
+		const wrappedLines = wrapAnsi(buildActivityRowLine({
+			row,
+			spaceMembersSnapshot: input.activity.spaceMembersSnapshot,
+			tick: input.tick,
+			elapsedSeconds: resolveRowElapsedSeconds({
+				row,
+				elapsedDeltaSeconds: input.elapsedDeltaSeconds
+			}),
+			width: input.width
+		}), Math.max(1, input.width), {
+			hard: true,
+			trim: false,
+			wordWrap: true
+		}).split("\n");
+		lines.push(...wrappedLines);
+	}
+	return lines;
+}
+function buildActivityRowLine(input) {
 	const spinner = STRIP_SPINNER_FRAMES[input.tick % STRIP_SPINNER_FRAMES.length] ?? "⠋";
-	if (input.activity.mode === "sending") return [
-		spacePiTuiTheme.accentText(spinner),
-		pc.white("sending"),
-		pc.dim(input.activity.pendingOutboundText || "sending...")
-	].join(` ${pc.dim("·")} `);
+	if (input.row.mode === "sending") return buildSendingStatusLine({
+		row: input.row,
+		spaceMembersSnapshot: input.spaceMembersSnapshot,
+		spinner
+	});
+	if (input.row.mode === "dispatching" || input.row.mode === "retrying" || input.row.mode === "warning") return buildStatusHintLine({
+		glyph: input.row.mode === "warning" ? pc.yellow("!") : spacePiTuiTheme.accentText(spinner),
+		elapsedLabel: input.row.mode === "warning" ? pc.dim("now") : pc.dim(`${input.elapsedSeconds}s`),
+		row: input.row,
+		spaceMembersSnapshot: input.spaceMembersSnapshot
+	});
 	const statusLine = [
 		spacePiTuiTheme.accentText(spinner),
 		pc.dim(`${input.elapsedSeconds}s`),
-		buildStatusLine({
-			activity: input.activity,
+		buildReplyingStatusLine({
+			row: input.row,
+			spaceMembersSnapshot: input.spaceMembersSnapshot,
 			elapsedSeconds: input.elapsedSeconds,
 			tick: input.tick
 		})
 	].join(` ${pc.dim("·")} `);
-	const previewText = input.activity.previewText.trim();
+	const previewText = input.row.previewText.trim();
 	if (!previewText) return statusLine;
 	const separator = ` ${pc.dim("·")} `;
 	const availableWidth = Math.max(0, input.width - stringWidth(stripVTControlCharacters(statusLine)) - stringWidth(stripVTControlCharacters(separator)));
@@ -50584,6 +51133,57 @@ function buildInlineActivityLine(input) {
 	});
 	return `${statusLine}${separator}${pc.dim(windowText)}`;
 }
+function buildSendingStatusLine(input) {
+	const sendingText = input.row.hint || "sending...";
+	return [spacePiTuiTheme.accentText(input.spinner), formatHintWithColoredTargetLabel({
+		hint: sendingText,
+		targetLabel: input.row.targetLabel,
+		spaceMembersSnapshot: input.spaceMembersSnapshot
+	})].join(` ${pc.dim("·")} `);
+}
+function buildStatusHintLine(input) {
+	return [
+		input.glyph,
+		input.elapsedLabel,
+		formatHintWithColoredTargetLabel({
+			hint: input.row.hint ?? "",
+			targetLabel: input.row.targetLabel,
+			spaceMembersSnapshot: input.spaceMembersSnapshot
+		})
+	].join(` ${pc.dim("·")} `);
+}
+function formatHintWithColoredTargetLabel(input) {
+	const targetLabel = input.targetLabel?.trim() ?? "";
+	if (!(targetLabel && input.hint.includes(targetLabel))) return pc.white(input.hint);
+	const coloredTargetLabel = resolveColoredTargetLabel({
+		spaceMembersSnapshot: input.spaceMembersSnapshot,
+		targetLabel
+	});
+	const [prefix, suffix = ""] = input.hint.split(targetLabel, 2);
+	return `${pc.white(prefix)}${coloredTargetLabel}${pc.white(suffix)}`;
+}
+function resolveColoredTargetLabel(input) {
+	const normalizedTargetLabel = normalizeActivityTargetLabel(input.targetLabel);
+	const matchingAgent = input.spaceMembersSnapshot?.agents.find((candidate) => {
+		return [
+			candidate.wakeToken,
+			candidate.wakeLabel,
+			candidate.profileName,
+			candidate.profileId
+		].some((value) => normalizeActivityTargetLabel(value) === normalizedTargetLabel);
+	}) ?? null;
+	return colorizeAgentLabel(input.targetLabel, {
+		controllerRef: matchingAgent?.controllerRef,
+		profileId: matchingAgent?.profileId,
+		profileName: matchingAgent?.profileName || normalizedTargetLabel || input.targetLabel
+	}, { spaceMembersSnapshot: input.spaceMembersSnapshot });
+}
+function normalizeActivityTargetLabel(value) {
+	return stripVTControlCharacters(String(value ?? "")).trim().replace(ACTIVITY_TARGET_LABEL_PREFIX_REGEX, "");
+}
+function resolveRowElapsedSeconds(input) {
+	return (input.row.elapsedSeconds ?? 0) + input.elapsedDeltaSeconds;
+}
 function resolveStatusModeLabel(input) {
 	if (input.previewText.trim().length > 0) return "streaming";
 	return STATUS_LABELS[Math.floor(input.elapsedSeconds / STATUS_LABEL_CYCLE_SECONDS) % STATUS_LABELS.length] ?? STATUS_LABELS[0];
@@ -52718,6 +53318,7 @@ function buildSpaceTranscriptItem(input) {
 	const groupKey = resolveTextLineGroupKey(input.event);
 	const profile = buildTranscriptItemProfileSnapshot(input.event);
 	const systemPurpose = resolveTranscriptItemSystemPurpose(input.event);
+	const replyRef = isSignalEnvelope$1(input.event) ? resolveTranscriptReplyRef(input.event) : void 0;
 	if (isSignalEnvelope$1(input.event)) {
 		if (input.event.type === "presence.join" || input.event.type === "presence.quit") return {
 			line: input.line,
@@ -52751,7 +53352,8 @@ function buildSpaceTranscriptItem(input) {
 			formattedMessage: input.formattedMessage ?? void 0,
 			profile,
 			systemPurpose,
-			ts: input.event.ts
+			ts: input.event.ts,
+			...groupKey === SYSTEM_MESSAGE_GROUP_KEY || !replyRef ? {} : { replyRef }
 		};
 	}
 	return {
@@ -52894,6 +53496,31 @@ function resolveTranscriptItemSystemPurpose(event) {
 	const meta = resolveSignalTextMetaFromEnvelope$1(event);
 	return typeof meta?.purpose === "string" ? meta.purpose : null;
 }
+function resolveTranscriptReplyRef(event) {
+	if (event.type !== "signal.text") return;
+	const replyToRecord = resolveSignalTextReplyToRecord(event.data);
+	if (!replyToRecord) return;
+	const signalId = sanitizeTranscriptReplyText(replyToRecord.signalId);
+	const profileId = sanitizeTranscriptReplyText(replyToRecord.profileId);
+	const profileName = sanitizeTranscriptReplyText(replyToRecord.profileName);
+	if (!(signalId && (profileName || profileId))) return;
+	return {
+		signalId,
+		profileId,
+		profileKind: replyToRecord.profileKind === "human" || replyToRecord.profileKind === "agent" || replyToRecord.profileKind === "system" ? replyToRecord.profileKind : null,
+		profileName,
+		previewText: sanitizeTranscriptReplyText(replyToRecord.previewText)
+	};
+}
+function resolveSignalTextReplyToRecord(data) {
+	if (!(data && typeof data === "object" && !Array.isArray(data))) return null;
+	const replyTo = data.replyTo;
+	if (!(replyTo && typeof replyTo === "object" && !Array.isArray(replyTo))) return null;
+	return replyTo;
+}
+function sanitizeTranscriptReplyText(value) {
+	return sanitizeTerminalDisplayText(typeof value === "string" ? value : "", "single-line").replace(/\s+/gu, " ").trim();
+}
 function resolveTranscriptActorKind(kind) {
 	return kind === "human" || kind === "agent" ? kind : "unknown";
 }
@@ -52919,8 +53546,6 @@ const HTTP_ERROR_MESSAGE_REGEX$1 = /^HTTP\s+(\d{3}):\s*(.*)$/i;
 const WS_UNEXPECTED_SERVER_RESPONSE_REGEX = /unexpected server response:\s*(\d{3})/i;
 const LAST_SEEN_FUTURE_SKEW_TOLERANCE_MS = 3e4;
 const MENTION_ALIAS_TOKEN_REGEX$1 = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
-const TRANSIENT_HINT_START_PURPOSE = "agent_replying";
-const TRANSIENT_HINT_END_PURPOSE = "agent_replying_end";
 const REPLYING_HINT_FALLBACK_CLEAR_MS = 18e4;
 const REPLYING_STATUS_SYSTEM_LABEL = "📣 system";
 const REPLYING_STATUS_AGENT_LABEL = "🤖";
@@ -52985,14 +53610,31 @@ function handleInteractiveRuntimeEvent(input) {
 			input.handleMembersUpdatedEvent(input.event);
 			return;
 		case "send.queued":
-			enqueuePendingOutboundConfirmation(input.pendingOutboundConfirmationQueue, input.event.text);
-			input.syncOverlayLine();
+			upsertPendingOutboundRows({
+				enableLocalEcho: input.enableLocalEcho,
+				rowsById: input.rowsById,
+				text: input.event.text,
+				clientMessageId: input.event.clientMessageId,
+				terminalColumns: resolveReplyingStatusColumns(),
+				nowMs: Date.now()
+			});
+			input.syncActivityPresentation();
 			return;
 		case "send.confirmed":
-			dequeuePendingOutboundConfirmationIfHeadMatch(input.pendingOutboundConfirmationQueue, input.event.text);
-			input.syncOverlayLine();
+			confirmPendingOutboundRows({
+				rowsById: input.rowsById,
+				clientMessageId: input.event.clientMessageId,
+				sourceEventId: input.event.event.id,
+				nowMs: Date.now()
+			});
+			input.syncActivityPresentation();
 			return;
 		case "send.failed":
+			clearPendingOutboundRowsByClientMessageId({
+				rowsById: input.rowsById,
+				clientMessageId: input.event.clientMessageId
+			});
+			input.syncActivityPresentation();
 			input.reportOutboundSendFailure({
 				error: `couldn't send the message: ${input.event.error}`,
 				hint: "rejoin the space and try sending it again"
@@ -53243,7 +53885,7 @@ async function runConnect(input) {
 		let liveFloorTs = initialLiveFloorTs;
 		let pendingLastSeen = null;
 		let pendingTimer = null;
-		const pendingOutboundConfirmationQueue = [];
+		const activityRowsById = /* @__PURE__ */ new Map();
 		let rl = null;
 		let hasPrintedTextLine = false;
 		let lastPrintedTextLineGroupKey = null;
@@ -53259,21 +53901,17 @@ async function runConnect(input) {
 		const enableReplyingPromptStatus = shouldHideSubmittedInputLine;
 		const composePromptPrefix = pc.dim("[draft] ");
 		let composeDraftState = emptyComposeDraft();
-		const replyingStatusByDispatchId = /* @__PURE__ */ new Map();
 		let replyingStatusSweepTimer = null;
 		const pruneExpiredReplyingStatuses = () => {
-			if (!enableReplyingPromptStatus || replyingStatusByDispatchId.size === 0) return;
-			const now = Date.now();
-			for (const [dispatchId, state] of replyingStatusByDispatchId) if (state.expiresAtMs <= now) replyingStatusByDispatchId.delete(dispatchId);
+			if (!enableReplyingPromptStatus || activityRowsById.size === 0) return;
+			pruneExpiredDispatchRows(activityRowsById, Date.now());
 		};
 		const resolveReplyingStatusTexts = () => {
 			pruneExpiredReplyingStatuses();
-			if (replyingStatusByDispatchId.size === 0) return [];
-			const terminalColumns = resolveReplyingStatusColumns();
-			return [...replyingStatusByDispatchId.values()].sort((a, b) => b.updatedAtMs - a.updatedAtMs).map((status) => formatReplyingStatusText({
-				state: status,
-				terminalColumns
-			}));
+			return resolveDispatchRowStatusTexts({
+				rowsById: activityRowsById,
+				terminalColumns: resolveReplyingStatusColumns()
+			});
 		};
 		const resolveInputPrompt = () => {
 			const baseInputPrompt = formatInputPrompt(profileIdentity, { spaceMembersSnapshot });
@@ -53342,12 +53980,6 @@ async function runConnect(input) {
 			visibleReplyingStatusLineRows = countRenderedTerminalRows(normalizedText);
 		};
 		const syncReplyingStatusPresentation = () => {
-			const pendingOutboundStatus = resolvePendingOutboundStatus();
-			if (pendingOutboundStatus) {
-				renderVisibleReplyingStatusLine(`${pc.dim(`* ${REPLYING_STATUS_SYSTEM_LABEL}`)} ${pc.dim("·")} ${pc.dim(pendingOutboundStatus)}`);
-				refreshInputPrompt();
-				return;
-			}
 			const promptStatuses = resolveReplyingStatusTexts();
 			if (promptStatuses.length > 0) {
 				const decoratedReplyingStatus = promptStatuses.map((statusText) => {
@@ -53362,10 +53994,9 @@ async function runConnect(input) {
 				clearTimeout(replyingStatusSweepTimer);
 				replyingStatusSweepTimer = null;
 			}
-			if (!enableReplyingPromptStatus || replyingStatusByDispatchId.size === 0) return;
-			let nearestExpiryMs = Number.POSITIVE_INFINITY;
-			for (const state of replyingStatusByDispatchId.values()) if (state.expiresAtMs < nearestExpiryMs) nearestExpiryMs = state.expiresAtMs;
-			if (!Number.isFinite(nearestExpiryMs)) return;
+			if (!enableReplyingPromptStatus || activityRowsById.size === 0) return;
+			const nearestExpiryMs = resolveNearestDispatchRowExpiryMs(activityRowsById);
+			if (nearestExpiryMs === null) return;
 			const delayMs = Math.max(250, nearestExpiryMs - Date.now());
 			replyingStatusSweepTimer = setTimeout(() => {
 				pruneExpiredReplyingStatuses();
@@ -53375,15 +54006,15 @@ async function runConnect(input) {
 		};
 		const handleReplyingHintStatusEvent = (event) => {
 			if (!enableReplyingPromptStatus || event.type !== "signal.text") return;
-			const replyingHintEvent = resolveReplyingHintEvent(event);
+			const replyingHintEvent = resolveDispatchActivityEvent(event);
 			let statusChanged = false;
-			if (replyingHintEvent) statusChanged = upsertReplyingStatusState({
-				replyingStatusByDispatchId,
+			if (replyingHintEvent) statusChanged = upsertDispatchActivityStatusState({
+				rowsById: activityRowsById,
 				event: replyingHintEvent,
 				nowMs: Date.now()
 			});
-			else statusChanged = clearReplyingStatusesForSignal({
-				replyingStatusByDispatchId,
+			else statusChanged = clearDispatchActivitiesForSignal({
+				rowsById: activityRowsById,
 				event
 			});
 			if (!statusChanged) return;
@@ -53442,7 +54073,12 @@ async function runConnect(input) {
 		};
 		const consumePendingOutboundConfirmation = (event) => {
 			if (event.type !== "signal.text" || event.profile?.profileId !== profileIdentity.profileId) return;
-			if (!dequeuePendingOutboundConfirmationIfHeadMatch(pendingOutboundConfirmationQueue, typeof event.data?.text === "string" ? event.data.text : "")) return;
+			if (!confirmPendingOutboundRows({
+				rowsById: activityRowsById,
+				clientMessageId: resolveSignalClientMessageId(event),
+				sourceEventId: event.id,
+				nowMs: Date.now()
+			})) return;
 			syncReplyingStatusPresentation();
 		};
 		const resolveTextRenderEvent = (event) => {
@@ -53585,7 +54221,7 @@ async function runConnect(input) {
 					processIgnoredOlderThanLiveFloorSignal({
 						event,
 						seenSignalIds: catchupSeenSignalIds,
-						onReplyingHintEvent: handleReplyingHintStatusEvent
+						onDispatchActivityEvent: handleReplyingHintStatusEvent
 					});
 					return;
 				}
@@ -53793,8 +54429,7 @@ async function runConnect(input) {
 			if (runtime.resolvedView === "human") refreshInputPrompt();
 		}
 		function reportPendingOutboundUnconfirmed(inputPending) {
-			if (pendingOutboundConfirmationQueue.length === 0) return;
-			pendingOutboundConfirmationQueue.length = 0;
+			if (!clearUnconfirmedPendingOutboundRows(activityRowsById)) return;
 			syncReplyingStatusPresentation();
 			const reasonSuffix = inputPending.reason ? ` (${inputPending.reason})` : "";
 			presenter.event("error", "connect.error", {
@@ -53803,18 +54438,6 @@ async function runConnect(input) {
 			});
 			process.exitCode = 1;
 		}
-		function resolvePendingOutboundStatus() {
-			if (!enableLocalEcho) return "";
-			const pendingText = pendingOutboundConfirmationQueue[0];
-			if (!pendingText) return "";
-			const normalizedText = normalizePreviewDisplayText(pendingText);
-			if (!normalizedText) return "sending...";
-			const statusPrefix = "sending: ";
-			return `${statusPrefix}${truncatePreviewHead(normalizedText, resolvePreviewContentWidth({
-				previewPrefix: statusPrefix,
-				terminalColumns: resolveReplyingStatusColumns()
-			}))}`;
-		}
 		const sendOutboundText = (outboundText) => {
 			if (isClosing || wsEnded) {
 				reportOutboundSendFailure({
@@ -53823,8 +54446,9 @@ async function runConnect(input) {
 				});
 				return;
 			}
+			const clientMessageId = crypto.randomUUID();
 			try {
-				ws.send(JSON.stringify(makeTextSignal(outboundText)));
+				ws.send(JSON.stringify(makeTextSignal(outboundText, { meta: { clientMessageId } })));
 			} catch (error) {
 				reportOutboundSendFailure({
 					error: `couldn't send the message: ${toErrorMessage$3(error)}`,
@@ -53832,7 +54456,14 @@ async function runConnect(input) {
 				});
 				return;
 			}
-			enqueuePendingOutboundConfirmation(pendingOutboundConfirmationQueue, outboundText);
+			upsertPendingOutboundRows({
+				enableLocalEcho,
+				rowsById: activityRowsById,
+				text: outboundText,
+				clientMessageId,
+				terminalColumns: resolveReplyingStatusColumns(),
+				nowMs: Date.now()
+			});
 			syncReplyingStatusPresentation();
 			if (runtime.resolvedView === "human") refreshInputPrompt();
 		};
@@ -53906,8 +54537,7 @@ async function runInteractiveHumanTextSession(input) {
 		resources: {
 			composerActivity: {
 				nowMs: Date.now(),
-				pendingOutboundText: resolvePendingOutboundStatus(),
-				replyingDispatches: toReplyingDispatchStates(replyingStatusByDispatchId)
+				rows: toComposerDispatchRows(activityRowsById)
 			},
 			sessionDiagnostics
 		},
@@ -53928,8 +54558,7 @@ async function runInteractiveHumanTextSession(input) {
 				getResources: () => ({
 					composerActivity: {
 						nowMs: Date.now(),
-						pendingOutboundText: resolvePendingOutboundStatus(),
-						replyingDispatches: toReplyingDispatchStates(replyingStatusByDispatchId)
+						rows: toComposerDispatchRows(activityRowsById)
 					},
 					sessionDiagnostics
 				}),
@@ -53944,8 +54573,7 @@ async function runInteractiveHumanTextSession(input) {
 			shell.render(buildCurrentViewState());
 		});
 	};
-	const pendingOutboundConfirmationQueue = [];
-	const replyingStatusByDispatchId = /* @__PURE__ */ new Map();
+	const activityRowsById = /* @__PURE__ */ new Map();
 	const catchupSeenSignalIds = /* @__PURE__ */ new Set();
 	let mentionHighlightIndex = null;
 	let liveFloorTs = input.initialLiveFloorTs;
@@ -54156,40 +54784,17 @@ async function runInteractiveHumanTextSession(input) {
 		input.presenter.event("info", "connect.warn.cursor_sync_paused");
 	};
 	const pruneExpiredReplyingStatuses = () => {
-		if (replyingStatusByDispatchId.size === 0) return;
-		const now = Date.now();
-		for (const [dispatchId, state] of replyingStatusByDispatchId) if (state.expiresAtMs <= now) replyingStatusByDispatchId.delete(dispatchId);
+		if (activityRowsById.size === 0) return;
+		pruneExpiredDispatchRows(activityRowsById, Date.now());
 	};
 	const resolveReplyingStatusTexts = () => {
 		pruneExpiredReplyingStatuses();
-		if (replyingStatusByDispatchId.size === 0) return [];
-		const terminalColumns = resolveReplyingStatusColumns();
-		return [...replyingStatusByDispatchId.values()].sort((left, right) => right.updatedAtMs - left.updatedAtMs).map((status) => formatReplyingStatusText({
-			state: status,
-			terminalColumns
-		}));
-	};
-	const resolvePendingOutboundStatus = () => {
-		if (!input.enableLocalEcho) return "";
-		const pendingText = pendingOutboundConfirmationQueue[0];
-		if (!pendingText) return "";
-		const normalizedText = normalizePreviewDisplayText(pendingText);
-		if (!normalizedText) return "sending...";
-		const statusPrefix = "sending: ";
-		return `${statusPrefix}${truncatePreviewHead(normalizedText, resolvePreviewContentWidth({
-			previewPrefix: statusPrefix,
+		return resolveDispatchRowStatusTexts({
+			rowsById: activityRowsById,
 			terminalColumns: resolveReplyingStatusColumns()
-		}))}`;
+		});
 	};
 	const syncOverlayLine = () => {
-		const pendingOutboundStatus = resolvePendingOutboundStatus();
-		if (pendingOutboundStatus) {
-			store.dispatch({
-				type: "status.overlay.updated",
-				line: `* ${REPLYING_STATUS_SYSTEM_LABEL} · ${pendingOutboundStatus}`
-			});
-			return;
-		}
 		const replyingStatuses = resolveReplyingStatusTexts();
 		if (replyingStatuses.length === 0) {
 			store.dispatch({
@@ -54206,37 +54811,40 @@ async function runInteractiveHumanTextSession(input) {
 			line: decoratedReplyingStatus
 		});
 	};
+	const syncComposerActivityPresentation = () => {
+		syncOverlayLine();
+		if (piTuiSessionMount) piTuiSessionMount.renderCurrentViewState();
+	};
 	const scheduleReplyingStatusSweep = () => {
 		if (replyingStatusSweepTimer) {
 			clearTimeout(replyingStatusSweepTimer);
 			replyingStatusSweepTimer = null;
 		}
-		if (replyingStatusByDispatchId.size === 0) return;
-		let nearestExpiryMs = Number.POSITIVE_INFINITY;
-		for (const state of replyingStatusByDispatchId.values()) if (state.expiresAtMs < nearestExpiryMs) nearestExpiryMs = state.expiresAtMs;
-		if (!Number.isFinite(nearestExpiryMs)) return;
+		if (activityRowsById.size === 0) return;
+		const nearestExpiryMs = resolveNearestDispatchRowExpiryMs(activityRowsById);
+		if (nearestExpiryMs === null) return;
 		const delayMs = Math.max(250, nearestExpiryMs - Date.now());
 		replyingStatusSweepTimer = setTimeout(() => {
 			pruneExpiredReplyingStatuses();
-			syncOverlayLine();
+			syncComposerActivityPresentation();
 			scheduleReplyingStatusSweep();
 		}, delayMs);
 	};
 	const handleReplyingHintStatusEvent = (event) => {
-		const replyingHintEvent = resolveReplyingHintEvent(event);
+		const replyingHintEvent = resolveDispatchActivityEvent(event);
 		let statusChanged = false;
-		if (replyingHintEvent) statusChanged = upsertReplyingStatusState({
-			replyingStatusByDispatchId,
+		if (replyingHintEvent) statusChanged = upsertDispatchActivityStatusState({
+			rowsById: activityRowsById,
 			event: replyingHintEvent,
 			nowMs: Date.now()
 		});
-		else statusChanged = clearReplyingStatusesForSignal({
-			replyingStatusByDispatchId,
+		else statusChanged = clearDispatchActivitiesForSignal({
+			rowsById: activityRowsById,
 			event
 		});
 		if (!statusChanged) return;
 		scheduleReplyingStatusSweep();
-		syncOverlayLine();
+		syncComposerActivityPresentation();
 	};
 	const flushLastSeen = async () => {
 		if (!pendingLastSeen) return;
@@ -54291,15 +54899,14 @@ async function runInteractiveHumanTextSession(input) {
 		scheduleLastSeen(event.ts);
 	};
 	const reportOutboundSendFailure = (failure) => {
-		syncOverlayLine();
+		syncComposerActivityPresentation();
 		shell.prepareExternalWrite();
 		input.presenter.event("error", "connect.error", failure);
 		process.exitCode = 1;
 	};
 	const reportPendingOutboundUnconfirmed = (pending) => {
-		if (pendingOutboundConfirmationQueue.length === 0) return;
-		pendingOutboundConfirmationQueue.length = 0;
-		syncOverlayLine();
+		if (!clearUnconfirmedPendingOutboundRows(activityRowsById)) return;
+		syncComposerActivityPresentation();
 		const reasonSuffix = pending.reason ? ` (${pending.reason})` : "";
 		shell.prepareExternalWrite();
 		input.presenter.event("error", "connect.error", {
@@ -54338,7 +54945,7 @@ async function runInteractiveHumanTextSession(input) {
 				processIgnoredOlderThanLiveFloorSignal({
 					event: ignoredEvent,
 					seenSignalIds: catchupSeenSignalIds,
-					onReplyingHintEvent: handleReplyingHintStatusEvent
+					onDispatchActivityEvent: handleReplyingHintStatusEvent
 				});
 			},
 			scheduleMembersSnapshotRefresh,
@@ -54475,10 +55082,11 @@ async function runInteractiveHumanTextSession(input) {
 			handleHistoryLoadedEvent,
 			handleIncomingEvent,
 			handleMembersUpdatedEvent,
-			pendingOutboundConfirmationQueue,
+			rowsById: activityRowsById,
+			enableLocalEcho: input.enableLocalEcho,
 			reportOutboundSendFailure,
 			store,
-			syncOverlayLine
+			syncActivityPresentation: syncComposerActivityPresentation
 		});
 	});
 	function cleanup(why) {
@@ -55050,109 +55658,322 @@ function emitReplaySignals(input, signals) {
 		rememberSeenSignalId(input.seenSignalIds, event.id);
 	}
 }
-function enqueuePendingOutboundConfirmation(queue, text) {
-	if (queue.length >= PENDING_OUTBOUND_CONFIRMATION_MAX) queue.shift();
-	queue.push(text);
+function buildPendingDispatchRowId(clientMessageId, targetWakeToken) {
+	return `pending:${clientMessageId}:${targetWakeToken ?? "__generic__"}`;
 }
-function dequeuePendingOutboundConfirmationIfHeadMatch(queue, text) {
-	if (queue[0] !== text) return false;
-	queue.splice(0, 1);
+function upsertPendingOutboundRows(input) {
+	if (!input.enableLocalEcho) return false;
+	const drafts = buildPendingOutboundDispatchRowDrafts({
+		pendingText: input.text,
+		terminalColumns: input.terminalColumns
+	});
+	if (drafts.length === 0) return false;
+	for (const draft of drafts) input.rowsById.set(buildPendingDispatchRowId(input.clientMessageId, draft.targetWakeToken), {
+		rowId: buildPendingDispatchRowId(input.clientMessageId, draft.targetWakeToken),
+		dispatchId: null,
+		sourceEventId: null,
+		sourceClientMessageId: input.clientMessageId,
+		targetProfileId: null,
+		targetWakeToken: draft.targetWakeToken,
+		targetLabel: draft.targetLabel,
+		stage: "sending",
+		createdAtMs: input.nowMs,
+		updatedAtMs: input.nowMs,
+		expiresAtMs: null,
+		latestPreviewText: "",
+		latestPreviewUpdatedAtMs: null,
+		statusText: draft.statusText,
+		warningText: ""
+	});
+	trimPendingOutboundRows(input.rowsById);
 	return true;
 }
-function clearReplyingStatusesForSignal(input) {
-	if (input.replyingStatusByDispatchId.size === 0) return false;
+function trimPendingOutboundRows(rowsById) {
+	if (rowsById.size <= PENDING_OUTBOUND_CONFIRMATION_MAX) return;
+	const removableRows = [...rowsById.values()].filter((row) => row.stage === "sending" && row.dispatchId === null && row.sourceEventId === null).sort((left, right) => left.createdAtMs - right.createdAtMs);
+	while (rowsById.size > PENDING_OUTBOUND_CONFIRMATION_MAX && removableRows.length > 0) {
+		const oldestRow = removableRows.shift();
+		if (!oldestRow) break;
+		rowsById.delete(oldestRow.rowId);
+	}
+}
+function confirmPendingOutboundRows(input) {
+	if (!input.clientMessageId) return false;
+	let changed = false;
+	for (const [rowId, row] of input.rowsById) {
+		if (row.sourceClientMessageId !== input.clientMessageId) continue;
+		if (row.targetWakeToken === null) {
+			input.rowsById.delete(rowId);
+			changed = true;
+			continue;
+		}
+		input.rowsById.set(rowId, {
+			...row,
+			sourceEventId: input.sourceEventId,
+			updatedAtMs: input.nowMs
+		});
+		changed = true;
+	}
+	return changed;
+}
+function clearPendingOutboundRowsByClientMessageId(input) {
+	if (!input.clientMessageId) return false;
+	let changed = false;
+	for (const [rowId, row] of input.rowsById) {
+		if (row.sourceClientMessageId !== input.clientMessageId) continue;
+		input.rowsById.delete(rowId);
+		changed = true;
+	}
+	return changed;
+}
+function clearUnconfirmedPendingOutboundRows(rowsById) {
+	let changed = false;
+	for (const [rowId, row] of rowsById) if (row.stage === "sending" && row.dispatchId === null && row.sourceEventId === null) {
+		rowsById.delete(rowId);
+		changed = true;
+	}
+	return changed;
+}
+function pruneExpiredDispatchRows(rowsById, nowMs) {
+	let changed = false;
+	for (const [rowId, row] of rowsById) {
+		if (typeof row.expiresAtMs !== "number" || row.expiresAtMs > nowMs) continue;
+		rowsById.delete(rowId);
+		changed = true;
+	}
+	return changed;
+}
+function resolveNearestDispatchRowExpiryMs(rowsById) {
+	let nearestExpiryMs = null;
+	for (const row of rowsById.values()) {
+		if (typeof row.expiresAtMs !== "number") continue;
+		if (nearestExpiryMs === null || row.expiresAtMs < nearestExpiryMs) nearestExpiryMs = row.expiresAtMs;
+	}
+	return nearestExpiryMs;
+}
+function resolveDispatchRowStatusTexts(input) {
+	if (input.rowsById.size === 0) return [];
+	return [...input.rowsById.values()].sort((left, right) => right.updatedAtMs - left.updatedAtMs).map((state) => formatReplyingStatusText({
+		state,
+		terminalColumns: input.terminalColumns
+	}));
+}
+function toDispatchActivityIdentity(event) {
+	return {
+		dispatchId: event.dispatchId,
+		sourceClientMessageId: event.sourceClientMessageId,
+		sourceEventId: event.sourceEventId,
+		targetLabel: "targetLabel" in event ? event.targetLabel : event.targetProfileId,
+		targetProfileId: event.targetProfileId,
+		targetWakeToken: event.targetWakeToken
+	};
+}
+function buildDispatchActivityRowId(input) {
+	const { identity } = input;
+	if (identity.dispatchId) return `dispatch:${identity.dispatchId}`;
+	if (identity.sourceEventId && identity.targetWakeToken) return `event:${identity.sourceEventId}:${identity.targetWakeToken}`;
+	if (identity.sourceClientMessageId && identity.targetWakeToken) return `client:${identity.sourceClientMessageId}:${identity.targetWakeToken}`;
+	if (identity.targetProfileId) return `profile:${identity.targetProfileId}`;
+	return `label:${identity.targetLabel}`;
+}
+function findMatchingDispatchActivityRowEntry(input) {
+	for (const entry of input.rowsById) if (entry[1].dispatchId === input.identity.dispatchId) return entry;
+	if (input.identity.sourceEventId && input.identity.targetWakeToken) {
+		for (const entry of input.rowsById) if (entry[1].sourceEventId === input.identity.sourceEventId && entry[1].targetWakeToken === input.identity.targetWakeToken) return entry;
+	}
+	if (input.identity.sourceClientMessageId && input.identity.targetWakeToken) {
+		for (const entry of input.rowsById) if (entry[1].sourceClientMessageId === input.identity.sourceClientMessageId && entry[1].targetWakeToken === input.identity.targetWakeToken) return entry;
+	}
+	return null;
+}
+function mergeDispatchActivityIdentity(input) {
+	return {
+		rowId: input.rowId,
+		dispatchId: input.event.dispatchId,
+		sourceEventId: input.event.sourceEventId ?? input.existing?.sourceEventId ?? null,
+		sourceClientMessageId: input.event.sourceClientMessageId ?? input.existing?.sourceClientMessageId ?? null,
+		targetProfileId: input.event.targetProfileId ?? input.existing?.targetProfileId ?? null,
+		targetWakeToken: input.event.targetWakeToken ?? input.existing?.targetWakeToken ?? null,
+		targetLabel: ("targetLabel" in input.event ? input.event.targetLabel : null) ?? input.existing?.targetLabel ?? input.event.targetProfileId,
+		stage: input.existing?.stage ?? "dispatching",
+		createdAtMs: input.existing?.createdAtMs ?? input.nowMs,
+		updatedAtMs: input.nowMs,
+		expiresAtMs: input.existing?.expiresAtMs ?? null,
+		latestPreviewText: input.existing?.latestPreviewText ?? "",
+		latestPreviewUpdatedAtMs: input.existing?.latestPreviewUpdatedAtMs ?? null,
+		statusText: input.existing?.statusText ?? "",
+		warningText: input.existing?.warningText ?? ""
+	};
+}
+function clearDispatchActivitiesForSignal(input) {
+	if (input.rowsById.size === 0) return false;
 	if (!resolveNonTransientSignalText(input.event)) return false;
 	const senderProfileId = String(input.event.profile?.profileId ?? "").trim();
 	if (!senderProfileId) return false;
 	const dispatchId = resolveReplyingSignalDispatchId(input.event);
-	if (dispatchId && input.replyingStatusByDispatchId.has(dispatchId)) {
-		input.replyingStatusByDispatchId.delete(dispatchId);
+	if (dispatchId) for (const [rowId, row] of input.rowsById) {
+		if (row.dispatchId !== dispatchId) continue;
+		input.rowsById.delete(rowId);
 		return true;
 	}
-	let latestDispatchId = null;
+	let latestRowId = null;
 	let latestUpdatedAtMs = Number.NEGATIVE_INFINITY;
-	for (const [dispatchId, state] of input.replyingStatusByDispatchId) {
-		if (state.targetProfileId !== senderProfileId) continue;
-		if (state.updatedAtMs > latestUpdatedAtMs) {
-			latestUpdatedAtMs = state.updatedAtMs;
-			latestDispatchId = dispatchId;
+	for (const [rowId, row] of input.rowsById) {
+		if (row.targetProfileId !== senderProfileId || row.stage === "sending") continue;
+		if (row.updatedAtMs > latestUpdatedAtMs) {
+			latestUpdatedAtMs = row.updatedAtMs;
+			latestRowId = rowId;
 		}
 	}
-	if (!latestDispatchId) return false;
-	input.replyingStatusByDispatchId.delete(latestDispatchId);
+	if (!latestRowId) return false;
+	input.rowsById.delete(latestRowId);
 	return true;
 }
-function upsertReplyingStatusState(input) {
-	if (input.event.kind === "end") return input.replyingStatusByDispatchId.delete(input.event.dispatchId);
-	const existing = input.replyingStatusByDispatchId.get(input.event.dispatchId) ?? null;
-	if (input.event.kind === "preview_end") {
-		if (!existing) return false;
-		input.replyingStatusByDispatchId.set(input.event.dispatchId, {
-			...existing,
-			updatedAtMs: input.nowMs,
-			latestPreviewText: "",
-			latestPreviewUpdatedAtMs: null,
-			expiresAtMs: input.nowMs + REPLYING_HINT_FALLBACK_CLEAR_MS,
-			warningText: ""
+function upsertDispatchActivityStatusState(input) {
+	const existingEntry = findMatchingDispatchActivityRowEntry({
+		identity: toDispatchActivityIdentity(input.event),
+		rowsById: input.rowsById
+	});
+	const existing = existingEntry?.[1] ?? null;
+	const rowId = existingEntry?.[0] ?? buildDispatchActivityRowId({ identity: toDispatchActivityIdentity(input.event) });
+	switch (input.event.kind) {
+		case "end": return existingEntry ? input.rowsById.delete(existingEntry[0]) : false;
+		case "preview_end": return applyPreviewEndDispatchActivityState({
+			existing,
+			map: input.rowsById,
+			rowId,
+			nowMs: input.nowMs
 		});
-		return true;
+		case "warning": return applyWarningDispatchActivityState({
+			existing,
+			event: input.event,
+			map: input.rowsById,
+			rowId,
+			nowMs: input.nowMs
+		});
+		case "dispatching":
+		case "retrying": return applyStatusDispatchActivityState({
+			existing,
+			event: input.event,
+			map: input.rowsById,
+			rowId,
+			nowMs: input.nowMs
+		});
+		case "replying_start": return applyReplyingStartDispatchActivityState({
+			existing,
+			event: input.event,
+			map: input.rowsById,
+			rowId,
+			nowMs: input.nowMs
+		});
+		case "preview": return applyPreviewDispatchActivityState({
+			existing,
+			event: input.event,
+			map: input.rowsById,
+			rowId,
+			nowMs: input.nowMs
+		});
+		default: return false;
 	}
-	if (input.event.kind === "warning") {
-		if (existing?.displayKind === "replying") {
-			input.replyingStatusByDispatchId.set(input.event.dispatchId, {
-				...existing,
-				updatedAtMs: input.nowMs,
-				expiresAtMs: input.nowMs + REPLYING_HINT_FALLBACK_CLEAR_MS,
-				statusText: input.event.text,
-				warningText: input.event.text
-			});
-			return true;
-		}
-		input.replyingStatusByDispatchId.set(input.event.dispatchId, {
-			displayKind: "warning",
-			targetProfileId: input.event.targetProfileId,
-			targetLabel: input.event.targetLabel,
-			startedAtMs: existing?.startedAtMs ?? input.nowMs,
+}
+function applyPreviewEndDispatchActivityState(input) {
+	if (!input.existing) return false;
+	input.map.set(input.rowId, {
+		...input.existing,
+		updatedAtMs: input.nowMs,
+		latestPreviewText: "",
+		latestPreviewUpdatedAtMs: null,
+		expiresAtMs: input.nowMs + REPLYING_HINT_FALLBACK_CLEAR_MS,
+		warningText: ""
+	});
+	return true;
+}
+function applyWarningDispatchActivityState(input) {
+	if (input.event.preserveActivityMode && input.existing?.stage === "replying") {
+		input.map.set(input.rowId, {
+			...input.existing,
 			updatedAtMs: input.nowMs,
-			latestPreviewText: "",
-			latestPreviewUpdatedAtMs: null,
 			expiresAtMs: input.nowMs + REPLYING_HINT_FALLBACK_CLEAR_MS,
 			statusText: input.event.text,
 			warningText: input.event.text
 		});
 		return true;
 	}
-	if (input.event.kind === "replying_start") {
-		input.replyingStatusByDispatchId.set(input.event.dispatchId, {
-			displayKind: "replying",
-			targetProfileId: input.event.targetProfileId,
-			targetLabel: input.event.targetLabel,
-			startedAtMs: existing?.startedAtMs ?? input.nowMs,
-			updatedAtMs: input.nowMs,
-			latestPreviewText: existing?.latestPreviewText ?? "",
-			latestPreviewUpdatedAtMs: existing?.latestPreviewUpdatedAtMs ?? null,
-			expiresAtMs: input.nowMs + REPLYING_HINT_FALLBACK_CLEAR_MS,
-			statusText: existing?.statusText ?? "",
-			warningText: ""
-		});
-		return true;
-	}
-	input.replyingStatusByDispatchId.set(input.event.dispatchId, {
-		displayKind: "replying",
-		targetProfileId: input.event.targetProfileId,
-		targetLabel: input.event.targetLabel,
-		startedAtMs: existing?.startedAtMs ?? input.nowMs,
+	input.map.set(input.rowId, {
+		...mergeDispatchActivityIdentity({
+			event: input.event,
+			existing: input.existing,
+			nowMs: input.nowMs,
+			rowId: input.rowId
+		}),
+		stage: "warning",
+		updatedAtMs: input.nowMs,
+		latestPreviewText: "",
+		latestPreviewUpdatedAtMs: null,
+		expiresAtMs: input.nowMs + REPLYING_HINT_FALLBACK_CLEAR_MS,
+		statusText: input.event.text,
+		warningText: input.event.text
+	});
+	return true;
+}
+function applyStatusDispatchActivityState(input) {
+	input.map.set(input.rowId, {
+		...mergeDispatchActivityIdentity({
+			event: input.event,
+			existing: input.existing,
+			nowMs: input.nowMs,
+			rowId: input.rowId
+		}),
+		stage: input.event.kind === "dispatching" ? "dispatching" : "retrying",
+		updatedAtMs: input.nowMs,
+		latestPreviewText: "",
+		latestPreviewUpdatedAtMs: null,
+		expiresAtMs: input.nowMs + REPLYING_HINT_FALLBACK_CLEAR_MS,
+		statusText: input.event.text,
+		warningText: ""
+	});
+	return true;
+}
+function applyReplyingStartDispatchActivityState(input) {
+	input.map.set(input.rowId, {
+		...mergeDispatchActivityIdentity({
+			event: input.event,
+			existing: input.existing,
+			nowMs: input.nowMs,
+			rowId: input.rowId
+		}),
+		stage: "replying",
+		updatedAtMs: input.nowMs,
+		latestPreviewText: input.existing?.latestPreviewText ?? "",
+		latestPreviewUpdatedAtMs: input.existing?.latestPreviewUpdatedAtMs ?? null,
+		expiresAtMs: input.nowMs + REPLYING_HINT_FALLBACK_CLEAR_MS,
+		statusText: input.existing?.statusText ?? "",
+		warningText: ""
+	});
+	return true;
+}
+function applyPreviewDispatchActivityState(input) {
+	input.map.set(input.rowId, {
+		...mergeDispatchActivityIdentity({
+			event: input.event,
+			existing: input.existing,
+			nowMs: input.nowMs,
+			rowId: input.rowId
+		}),
+		stage: "replying",
 		updatedAtMs: input.nowMs,
 		latestPreviewText: input.event.previewText,
 		latestPreviewUpdatedAtMs: input.nowMs,
 		expiresAtMs: input.nowMs + REPLYING_HINT_FALLBACK_CLEAR_MS,
-		statusText: existing?.statusText ?? "",
+		statusText: input.existing?.statusText ?? "",
 		warningText: ""
 	});
 	return true;
 }
 function formatReplyingStatusText(input) {
-	if (input.state.displayKind === "warning") return input.state.warningText || input.state.statusText;
+	if (input.state.stage === "sending") return input.state.statusText || "sending...";
+	if (input.state.stage === "warning") return input.state.warningText || input.state.statusText;
+	if (input.state.stage === "dispatching" || input.state.stage === "retrying") return input.state.statusText || `${input.state.targetLabel} ${input.state.stage === "dispatching" ? "is dispatching..." : "is retrying..."}`;
 	if (input.state.warningText) return input.state.warningText;
 	const previewText = input.state.latestPreviewText.trim();
 	if (!previewText) return `${input.state.targetLabel} is replying...`;
@@ -55162,17 +55983,8 @@ function formatReplyingStatusText(input) {
 		terminalColumns: input.terminalColumns
 	}))}`;
 }
-function toReplyingDispatchStates(replyingStatusByDispatchId) {
-	return [...replyingStatusByDispatchId.entries()].filter(([, state]) => state.displayKind === "replying").map(([dispatchId, state]) => ({
-		dispatchId,
-		targetProfileId: state.targetProfileId,
-		targetLabel: state.targetLabel,
-		startedAtMs: state.startedAtMs,
-		updatedAtMs: state.updatedAtMs,
-		latestPreviewText: state.latestPreviewText,
-		latestPreviewUpdatedAtMs: state.latestPreviewUpdatedAtMs,
-		expiresAtMs: state.expiresAtMs
-	}));
+function toComposerDispatchRows(rowsById) {
+	return [...rowsById.values()];
 }
 async function replayRecentSignals(input) {
 	if (input.limit <= 0) return;
@@ -55295,8 +56107,8 @@ function shouldIgnoreIncomingSignal(input) {
 function processIgnoredOlderThanLiveFloorSignal(input) {
 	if (!isSignalEnvelope(input.event)) return false;
 	rememberSeenSignalId(input.seenSignalIds, input.event.id);
-	if (!resolveReplyingHintEvent(input.event)) return false;
-	input.onReplyingHintEvent(input.event);
+	if (!resolveDispatchActivityEvent(input.event)) return false;
+	input.onDispatchActivityEvent(input.event);
 	return true;
 }
 function resolveReplyingSignalDispatchId(event) {
@@ -55624,15 +56436,15 @@ function shouldRefreshSpaceMetaForEvent(event) {
 function ignoreAsyncResult(promise) {
 	promise.catch(() => void 0);
 }
-function isReplyingHintPurpose(purpose) {
-	return purpose === TRANSIENT_HINT_START_PURPOSE || purpose === TRANSIENT_HINT_END_PURPOSE || purpose === CONVERSATION_CONTINUITY_WARNING_PURPOSE || purpose === AGENT_REPLY_PREVIEW_PURPOSE || purpose === AGENT_REPLY_PREVIEW_END_PURPOSE;
+function isDispatchActivityPurpose(purpose) {
+	return purpose === AGENT_REPLYING_PURPOSE || purpose === AGENT_REPLYING_END_PURPOSE || purpose === CONVERSATION_CONTINUITY_WARNING_PURPOSE || purpose === AGENT_REPLY_PREVIEW_PURPOSE || purpose === AGENT_REPLY_PREVIEW_END_PURPOSE || purpose === DISPATCH_ACTIVITY_DISPATCHING_PURPOSE || purpose === DISPATCH_ACTIVITY_RETRYING_PURPOSE || purpose === DISPATCH_ACTIVITY_FAILED_PURPOSE;
 }
-function resolveReplyingHintBase(event) {
+function resolveDispatchActivityBase(event) {
 	if (event.type !== "signal.text") return null;
 	const meta = resolveSignalTextMetaFromEnvelope(event);
 	if (!meta || meta.transient !== true) return null;
 	const purpose = String(meta.purpose ?? "").trim();
-	if (!isReplyingHintPurpose(purpose)) return null;
+	if (!isDispatchActivityPurpose(purpose)) return null;
 	const dispatchId = String(meta.dispatchId ?? "").trim();
 	if (!dispatchId) return null;
 	const targetProfileId = String(meta.targetProfileId ?? "").trim();
@@ -55641,45 +56453,85 @@ function resolveReplyingHintBase(event) {
 		meta,
 		purpose,
 		dispatchId,
-		targetProfileId
+		sourceClientMessageId: normalizeOptionalMetaText(meta.sourceClientMessageId),
+		sourceEventId: normalizeOptionalMetaText(meta.sourceEventId),
+		targetProfileId,
+		targetWakeToken: normalizeOptionalMetaText(meta.targetWakeToken)
 	};
 }
-function resolveReplyingHintTargetLabel(input) {
-	return (input.purpose === TRANSIENT_HINT_START_PURPOSE ? extractReplyingTargetLabelFromText(String(input.event.data?.text ?? "")) : null) ?? normalizeOptionalMetaText(input.meta.targetProfileName) ?? normalizeOptionalMetaText(input.event.profile?.profileName) ?? input.targetProfileId;
+function resolveDispatchActivityTargetLabel(input) {
+	return resolveMentionTokenLabel(normalizeOptionalMetaText(input.meta.targetWakeToken)) ?? (input.purpose === AGENT_REPLYING_PURPOSE ? extractReplyingTargetLabelFromText(String(input.event.data?.text ?? "")) : null) ?? normalizeOptionalMetaText(input.meta.targetProfileName) ?? normalizeOptionalMetaText(input.event.profile?.profileName) ?? input.targetProfileId;
 }
 function resolveContinuityWarningText(event) {
 	return sanitizeTerminalDisplayText(String(event.data?.text ?? ""), "single-line").trim() || null;
 }
-function resolveReplyingHintEvent(event) {
-	const base = resolveReplyingHintBase(event);
+function resolveDispatchActivityEvent(event) {
+	const base = resolveDispatchActivityBase(event);
 	if (!base) return null;
-	const { dispatchId, meta, purpose, targetProfileId } = base;
-	if (purpose === TRANSIENT_HINT_END_PURPOSE) return {
+	const { dispatchId, meta, purpose, sourceClientMessageId, sourceEventId, targetProfileId, targetWakeToken } = base;
+	if (purpose === AGENT_REPLYING_END_PURPOSE) return {
 		kind: "end",
 		dispatchId,
-		targetProfileId
+		sourceClientMessageId,
+		sourceEventId,
+		targetProfileId,
+		targetWakeToken
 	};
-	const targetLabel = resolveReplyingHintTargetLabel({
+	const targetLabel = resolveDispatchActivityTargetLabel({
 		event,
 		purpose,
 		meta,
 		targetProfileId
 	});
+	if (purpose === DISPATCH_ACTIVITY_DISPATCHING_PURPOSE) {
+		const text = resolveContinuityWarningText(event);
+		if (!text) return null;
+		return {
+			kind: "dispatching",
+			dispatchId,
+			sourceClientMessageId,
+			sourceEventId,
+			targetProfileId,
+			targetLabel,
+			targetWakeToken,
+			text
+		};
+	}
+	if (purpose === DISPATCH_ACTIVITY_RETRYING_PURPOSE) {
+		const text = resolveContinuityWarningText(event);
+		if (!text) return null;
+		return {
+			kind: "retrying",
+			dispatchId,
+			sourceClientMessageId,
+			sourceEventId,
+			targetProfileId,
+			targetLabel,
+			targetWakeToken,
+			text
+		};
+	}
 	if (purpose === AGENT_REPLY_PREVIEW_PURPOSE) {
 		const previewText = normalizePreviewDisplayText(String(event.data?.text ?? ""));
 		if (!previewText) return null;
 		return {
 			kind: "preview",
 			dispatchId,
+			sourceClientMessageId,
+			sourceEventId,
 			targetProfileId,
 			targetLabel,
+			targetWakeToken,
 			previewText
 		};
 	}
 	if (purpose === AGENT_REPLY_PREVIEW_END_PURPOSE) return {
 		kind: "preview_end",
 		dispatchId,
-		targetProfileId
+		sourceClientMessageId,
+		sourceEventId,
+		targetProfileId,
+		targetWakeToken
 	};
 	if (purpose === CONVERSATION_CONTINUITY_WARNING_PURPOSE) {
 		const text = resolveContinuityWarningText(event);
@@ -55687,16 +56539,38 @@ function resolveReplyingHintEvent(event) {
 		return {
 			kind: "warning",
 			dispatchId,
+			sourceClientMessageId,
+			sourceEventId,
 			targetProfileId,
 			targetLabel,
-			text
+			targetWakeToken,
+			text,
+			preserveActivityMode: true
+		};
+	}
+	if (purpose === DISPATCH_ACTIVITY_FAILED_PURPOSE) {
+		const text = resolveContinuityWarningText(event);
+		if (!text) return null;
+		return {
+			kind: "warning",
+			dispatchId,
+			sourceClientMessageId,
+			sourceEventId,
+			targetProfileId,
+			targetLabel,
+			targetWakeToken,
+			text,
+			preserveActivityMode: false
 		};
 	}
 	return {
 		kind: "replying_start",
 		dispatchId,
+		sourceClientMessageId,
+		sourceEventId,
 		targetProfileId,
-		targetLabel
+		targetLabel,
+		targetWakeToken
 	};
 }
 function resolveNonTransientSignalText(event) {
@@ -55710,6 +56584,9 @@ function resolveSignalTextMetaFromEnvelope(event) {
 	if (!meta || typeof meta !== "object" || Array.isArray(meta)) return null;
 	return meta;
 }
+function resolveSignalClientMessageId(event) {
+	return normalizeOptionalMetaText(resolveSignalTextMetaFromEnvelope(event)?.clientMessageId);
+}
 function normalizePreviewDisplayText(value) {
 	return sanitizeTerminalDisplayText(value, "single-line").replace(/\s+/g, " ").trim();
 }
@@ -55747,6 +56624,10 @@ function normalizeOptionalMetaText(value) {
 	const normalized = value.trim();
 	return normalized.length > 0 ? normalized : null;
 }
+function resolveMentionTokenLabel(value) {
+	if (!value) return null;
+	return value.startsWith("@") ? value : `@${value}`;
+}
 function extractReplyingTargetLabelFromText(text) {
 	const normalized = sanitizeTerminalDisplayText(text, "single-line").trim();
 	return REPLYING_TARGET_LABEL_REGEX.exec(normalized)?.[1] ?? null;
@@ -58338,11 +59219,7 @@ async function resolveSpaceJoinTarget(input) {
 	});
 }
 async function prepareSpaceJoinServiceState(input) {
-	const autoStopResult = input.interactiveHuman ? await maybeAutoStopIdleBackgroundDaemonService({
-		codePrefix: "space.join.service",
-		ownerUserId: input.atsProfile.ownerUserId,
-		presenter: input.presenter
-	}) : null;
+	const localDemand = input.interactiveHuman ? await resolveDaemonLocalServiceDemand({ ownerUserId: input.atsProfile.ownerUserId }).catch(() => null) : null;
 	const hasExplicitBaseUrlInput = String(input.input.baseUrl ?? "").trim().length > 0;
 	const baseUrl = input.input.resolvedBaseUrl ?? await resolveBaseUrl(input.input.baseUrl);
 	await emitSpaceCommandPreflight({
@@ -58353,7 +59230,7 @@ async function prepareSpaceJoinServiceState(input) {
 		resolvedView: input.resolvedView
 	});
 	await maybeOfferDaemonStartBeforeSpaceJoin({
-		autoStopLocalDemand: autoStopResult?.localDemand ?? null,
+		localDemand,
 		presenter: input.presenter,
 		view: input.input.view
 	});
@@ -58365,7 +59242,7 @@ async function prepareSpaceJoinServiceState(input) {
 async function maybeOfferDaemonStartBeforeSpaceJoin(input) {
 	const runtime = await resolveRuntimeContext({ view: input.view });
 	if (runtime.resolvedView !== "human" || !canUseInteractivePrompts(runtime)) return;
-	if (input.autoStopLocalDemand?.decision !== "keep_running") return;
+	if (input.localDemand?.decision !== "keep_running") return;
 	const daemonStatus = await getDaemonStatus().catch(() => NOT_INSTALLED_DAEMON_STATUS);
 	if (!daemonStatus.installed) return;
 	const runtimeState = await resolveDaemonRuntimeState(daemonStatus);
@@ -59049,6 +59926,7 @@ async function runSpaceDelete(input) {
 		const outcome = await runSpaceDeleteAttempt({
 			targets: targets.targets,
 			currentProfileId: profile,
+			currentProfileName: atsProfile.profileName,
 			allowBackToSelection: targets.allowBackToSelection,
 			runtime,
 			presenter,
@@ -59067,6 +59945,7 @@ async function runSpaceDeleteAttempt(input) {
 	const confirmation = await confirmDeleteTargets({
 		targets: input.targets,
 		currentProfileId: input.currentProfileId,
+		currentProfileName: input.currentProfileName,
 		allowBack: input.allowBackToSelection
 	});
 	if (confirmation === "cancelled") return "cancelled";
@@ -59138,7 +60017,8 @@ async function confirmDeleteTargets(input) {
 		const confirmed = await confirm({
 			message: buildDeleteConfirmationMessage({
 				targets: input.targets,
-				currentProfileId: input.currentProfileId
+				currentProfileId: input.currentProfileId,
+				currentProfileName: input.currentProfileName
 			}),
 			initialValue: false
 		});
@@ -59164,7 +60044,8 @@ async function confirmDeleteTargets(input) {
 		const decision = await select({
 			message: buildDeleteConfirmationMessage({
 				targets: input.targets,
-				currentProfileId: input.currentProfileId
+				currentProfileId: input.currentProfileId,
+				currentProfileName: input.currentProfileName
 			}),
 			options: [
 				{
@@ -60683,6 +61564,48 @@ async function resolveOwnedKnownSpacesForDelete(input) {
 	}
 	return owned;
 }
+async function resolveExplicitSpaceDeleteTarget(input) {
+	const matchedKnown = await findKnownSpaceForDeleteBySpaceId({
+		atsProfile: input.atsProfile,
+		baseUrl: input.baseUrl,
+		space: input.space
+	});
+	if (matchedKnown) return toSpaceDeleteTarget(matchedKnown);
+	const matchedLocal = (await listSpaceConfigs({ profile: input.atsProfile.atsProfileId })).find((item) => item.space === input.space);
+	if (matchedLocal) return toSpaceDeleteTarget(toKnownSpaceOptionFromLocal(matchedLocal, input.atsProfile));
+	return toSpaceDeleteTarget(await hydrateKnownSpaceForDeleteFromMeta({
+		item: {
+			source: "local",
+			space: input.space,
+			baseUrl: input.baseUrl
+		},
+		profile: input.atsProfile.atsProfileId,
+		profileName: input.atsProfile.profileName,
+		baseUrl: input.baseUrl
+	}));
+}
+async function findKnownSpaceForDeleteBySpaceId(input) {
+	const matched = (await resolveKnownSpacesForSelection({
+		atsProfile: input.atsProfile,
+		baseUrl: input.baseUrl,
+		command: "delete"
+	}).catch(() => null))?.items.find((item) => item.space === input.space);
+	if (!matched) return null;
+	const [authorized] = await resolveOwnedKnownSpacesForDelete({
+		known: [matched],
+		profile: input.atsProfile.atsProfileId,
+		profileName: input.atsProfile.profileName,
+		ownerUserId: input.atsProfile.ownerUserId,
+		baseUrl: input.baseUrl
+	});
+	if (authorized) return authorized;
+	return await hydrateKnownSpaceForDeleteFromMeta({
+		item: matched,
+		profile: input.atsProfile.atsProfileId,
+		profileName: input.atsProfile.profileName,
+		baseUrl: input.baseUrl
+	});
+}
 async function resolveKnownSpacesForPasswordSelection(input) {
 	return (await Promise.all(input.known.map((item) => hydrateKnownSpacePasswordProtection({
 		item,
@@ -61336,19 +62259,14 @@ async function resolveSpaceDeleteTargets(input) {
 			space: explicitSpace,
 			resolvedView: input.resolvedView
 		});
-		const matched = (await listSpaceConfigs({ profile: input.atsProfile.atsProfileId })).find((item) => item.space === explicitSpace);
 		return {
 			status: "submitted",
 			allowBackToSelection: false,
-			targets: [{
-				space: explicitSpace,
-				...matched?.baseUrl ? { baseUrl: matched.baseUrl } : {},
-				...matched?.name ? { name: matched.name } : {},
-				...matched?.creator?.profileName ? { creatorProfileName: matched.creator.profileName } : {},
-				...resolveLocalCreatorProfileId(matched?.creator) ? { creatorProfileId: resolveLocalCreatorProfileId(matched?.creator) } : {},
-				...resolveLocalCreatorOwnerUserId(matched?.creator) ? { creatorOwnerUserId: resolveLocalCreatorOwnerUserId(matched?.creator) } : {},
-				...typeof matched?.creator?.kind === "string" ? { creatorKind: matched.creator.kind } : {}
-			}]
+			targets: [await resolveExplicitSpaceDeleteTarget({
+				atsProfile: input.atsProfile,
+				baseUrl: input.baseUrl,
+				space: explicitSpace
+			})]
 		};
 	}
 	if (!input.allowPrompt) {
@@ -61831,7 +62749,7 @@ function buildKnownSpaceProfileMap(profiles) {
 	return byId;
 }
 function resolveKnownSpaceVisibilityScope(input) {
-	if (input.atsProfile.profileKind === "human" && input.atsProfile.isDefault === true && (input.command === "join" || input.command === "watch" || input.command === "guidelines")) return "owner";
+	if (input.atsProfile.profileKind === "human" && input.atsProfile.isDefault === true && (input.command === "join" || input.command === "watch" || input.command === "guidelines" || input.command === "delete")) return "owner";
 	return "profile";
 }
 async function resolveKnownSpacesForSelectionByProfile(input) {
@@ -62857,17 +63775,14 @@ function buildHumanKnownSpaceSearchItems(input) {
 	}];
 }
 function buildHumanKnownSpaceDetailLine(input) {
-	const idLabel = `ID ${shortenSpaceId(input.space.space)}`;
-	const creatorLabel = resolveHumanKnownSpaceCreatorDisplay({
-		space: input.space,
-		currentProfileId: input.currentProfileId,
-		currentProfileName: input.currentProfileName
-	});
-	const viaLabel = resolveHumanKnownSpaceAvailableViaDisplay({
+	const projection = buildKnownSpaceDisplayProjection({
 		space: input.space,
 		currentProfileId: input.currentProfileId,
 		currentProfileName: input.currentProfileName
 	});
+	const idLabel = `ID ${shortenSpaceId(formatSpaceDisplayValue(projection.spaceId))}`;
+	const creatorLabel = projection.creatorDisplayName;
+	const viaLabel = projection.availableViaDisplayName;
 	const parts = [idLabel];
 	if (creatorLabel) parts.push(`Created by ${creatorLabel}`);
 	if (viaLabel && viaLabel !== creatorLabel) parts.push(`via ${viaLabel}`);
@@ -62876,45 +63791,22 @@ function buildHumanKnownSpaceDetailLine(input) {
 	return parts.join(" · ");
 }
 function buildHumanKnownSpaceSearchText(input) {
-	return [
-		sanitizeSingleLinePromptText(input.space.space),
-		sanitizeSingleLinePromptText(normalizeOptionalString$2(input.space.name)),
-		sanitizeSingleLinePromptText(normalizeOptionalString$2(input.space.creatorProfileName)),
-		sanitizeSingleLinePromptText(normalizeOptionalString$2(input.space.creatorProfileId)),
-		sanitizeSingleLinePromptText(normalizeOptionalString$2(input.space.creatorOwnerUserId)),
-		sanitizeSingleLinePromptText(normalizeOptionalString$2(input.space.availableViaProfileName)),
-		sanitizeSingleLinePromptText(normalizeOptionalString$2(input.space.availableViaProfileId)),
-		resolveHumanKnownSpaceCreatorDisplay({
-			space: input.space,
-			currentProfileId: input.currentProfileId,
-			currentProfileName: input.currentProfileName
-		}),
-		resolveHumanKnownSpaceAvailableViaDisplay({
-			space: input.space,
-			currentProfileId: input.currentProfileId,
-			currentProfileName: input.currentProfileName
-		})
-	].filter((value) => typeof value === "string").join("\n");
-}
-function resolveHumanKnownSpaceCreatorDisplay(input) {
-	const creator = formatCreatorNameForDisplay({
-		creatorProfileName: input.space.creatorProfileName,
-		creatorProfileId: input.space.creatorProfileId,
-		currentProfileId: input.currentProfileId,
-		currentProfileName: input.currentProfileName
-	});
-	if (creator !== "unknown-profile") return sanitizeSingleLinePromptText(creator);
-	return sanitizeSingleLinePromptText(normalizeOptionalString$2(input.space.creatorOwnerUserId));
-}
-function resolveHumanKnownSpaceAvailableViaDisplay(input) {
-	const via = formatCreatorNameForDisplay({
-		creatorProfileName: input.space.availableViaProfileName,
-		creatorProfileId: input.space.availableViaProfileId,
+	const projection = buildKnownSpaceDisplayProjection({
+		space: input.space,
 		currentProfileId: input.currentProfileId,
 		currentProfileName: input.currentProfileName
 	});
-	if (via === "unknown-profile") return null;
-	return sanitizeSingleLinePromptText(via);
+	return [
+		formatSpaceDisplayValue(projection.spaceId, ""),
+		formatSpaceDisplayValue(projection.spaceName, ""),
+		formatSpaceDisplayValue(projection.creatorProfileName, ""),
+		formatSpaceDisplayValue(projection.creatorProfileId, ""),
+		sanitizeSingleLinePromptText(normalizeOptionalString$2(input.space.creatorOwnerUserId)),
+		formatSpaceDisplayValue(projection.availableViaProfileName, ""),
+		formatSpaceDisplayValue(projection.availableViaProfileId, ""),
+		formatSpaceDisplayValue(projection.creatorDisplayName, ""),
+		formatSpaceDisplayValue(projection.availableViaDisplayName, "")
+	].filter((value) => typeof value === "string").join("\n");
 }
 function resolveKnownSpaceJoinedTimestamp(space) {
 	return normalizeOptionalString$2(space.lastJoinedAt) ?? resolveKnownSpaceLastSeenTimestamp(space.lastSeenTs);
@@ -62964,7 +63856,7 @@ async function promptSpaceDeleteSelection(input) {
 	if (input.known.length === 0) {
 		if (input.resolvedView === "human") {
 			const manual = await promptHumanManualSpaceId({
-				message: "No spaces created by your user were found. Enter a space ID manually",
+				message: "No spaces you can delete were found. Enter a space ID manually",
 				description: "Paste a 64-character hex space ID to delete it.",
 				allowBack: input.allowBack === true
 			});
@@ -62975,7 +63867,7 @@ async function promptSpaceDeleteSelection(input) {
 				targets: [{ space: manual.value }]
 			};
 		}
-		const manual = await promptManualSpace("No spaces created by your user were found. Enter a space ID (64-character hex):", input.resolvedView);
+		const manual = await promptManualSpace("No spaces you can delete were found. Enter a space ID (64-character hex):", input.resolvedView);
 		return manual ? {
 			status: "submitted",
 			allowBackToSelection: true,
@@ -63141,6 +64033,18 @@ function toSpaceDeleteTarget(space) {
 		...space.creatorKind === void 0 ? {} : { creatorKind: space.creatorKind }
 	};
 }
+function toKnownSpaceOptionFromDeleteTarget(target) {
+	return {
+		source: "local",
+		space: target.space,
+		...target.baseUrl ? { baseUrl: target.baseUrl } : {},
+		...target.name === void 0 ? {} : { name: target.name },
+		...target.creatorProfileName === void 0 ? {} : { creatorProfileName: target.creatorProfileName },
+		...target.creatorProfileId === void 0 ? {} : { creatorProfileId: target.creatorProfileId },
+		...target.creatorOwnerUserId === void 0 ? {} : { creatorOwnerUserId: target.creatorOwnerUserId },
+		...target.creatorKind === void 0 ? {} : { creatorKind: target.creatorKind }
+	};
+}
 function normalizeSpaceDeleteSelection(value) {
 	if (!Array.isArray(value)) return [];
 	const selected = [];
@@ -63196,7 +64100,10 @@ function normalizeKnownSpaceVisibilityScope(visibilityScope) {
 	return visibilityScope === "owner" ? "owner" : "profile";
 }
 function formatKnownSpaceName(input) {
-	const name = sanitizeSingleLinePromptText(input.space.name) || "untitled-space";
+	const name = resolveSpaceDisplayName(buildKnownSpaceDisplayProjection({
+		space: input.space,
+		currentProfileId: input.currentProfileId
+	}).spaceName, "untitled-space");
 	if (input.command === "password") return input.space.passwordProtected === true ? `🔒 ${name}` : name;
 	return input.resolvedView === "human" && input.space.passwordProtected === true ? `🔒 - ${name}` : name;
 }
@@ -63253,35 +64160,19 @@ function buildKnownSpaceData(item, index) {
 	};
 }
 function formatKnownSpaceDetailLines(input) {
-	const creatorProfileName = formatCreatorNameForDisplay({
-		creatorProfileName: input.space.creatorProfileName,
-		creatorProfileId: input.space.creatorProfileId,
-		currentProfileId: input.currentProfileId,
-		currentProfileName: input.currentProfileName
-	});
-	const availableViaProfileName = formatCreatorNameForDisplay({
-		creatorProfileName: input.space.availableViaProfileName,
-		creatorProfileId: input.space.availableViaProfileId,
+	const projection = buildKnownSpaceDisplayProjection({
+		space: input.space,
 		currentProfileId: input.currentProfileId,
 		currentProfileName: input.currentProfileName
 	});
-	const creatorId = resolveCreatorIdForDisplay({
-		creatorOwnerUserId: input.space.creatorOwnerUserId,
-		creatorProfileId: input.space.creatorProfileId
-	});
-	const creatorProfileId = normalizeDisplayValue(input.space.creatorProfileId, "unknown-profile");
-	const createdAt = normalizeDisplayValue(input.space.spaceCreatedAt);
-	const lastJoined = normalizeDisplayValue(resolveKnownSpaceJoinedTimestamp(input.space));
-	const lines = [
-		`Space ID: ${normalizeDisplayValue(input.space.space)}`,
-		`Creator: ${creatorProfileName}`,
-		`Creator ID: ${creatorId}`,
-		`Creator Profile ID: ${creatorProfileId}`,
-		`Available via: ${normalizeDisplayValue(availableViaProfileName)}`,
-		`Available via Profile ID: ${normalizeDisplayValue(input.space.availableViaProfileId)}`,
-		`Created: ${createdAt}`,
-		`Last joined: ${lastJoined}`
-	];
+	const detailVariant = input.detailVariant ?? "full";
+	const lines = buildSpaceMetadataFields({
+		projection,
+		includeAvailableVia: detailVariant !== "delete_confirmation",
+		includeCreatedAt: detailVariant !== "delete_confirmation",
+		includeLastJoinedAt: detailVariant !== "delete_confirmation"
+	}).map((field) => `${field.label}: ${field.value}`);
+	if (detailVariant === "delete_confirmation") return lines;
 	if (input.resolvedView === "human") {
 		if (input.space.source === "local") lines.push("Source: local cache");
 		return lines;
@@ -63364,40 +64255,44 @@ function resolveGatewayHost(baseUrl) {
 		return null;
 	}
 }
-function formatCreatorNameForDisplay(input) {
-	const creatorProfileName = sanitizeSingleLinePromptText(normalizeOptionalString$2(input.creatorProfileName));
-	if (creatorProfileName) return creatorProfileName;
-	const creatorProfileId = sanitizeSingleLinePromptText(normalizeOptionalString$2(input.creatorProfileId));
-	if (creatorProfileId === sanitizeSingleLinePromptText(normalizeOptionalString$2(input.currentProfileId)) && sanitizeSingleLinePromptText(normalizeOptionalString$2(input.currentProfileName))) return sanitizeSingleLinePromptText(normalizeOptionalString$2(input.currentProfileName)) || "unknown-profile";
-	return normalizeDisplayValue(creatorProfileId, "unknown-profile");
-}
-function resolveCreatorIdForDisplay(input) {
-	return sanitizeSingleLinePromptText(normalizeOptionalString$2(input.creatorOwnerUserId)) || sanitizeSingleLinePromptText(normalizeOptionalString$2(input.creatorProfileId)) || "unknown-owner";
-}
 function normalizeDisplayValue(value, fallback = "unknown") {
 	const normalized = sanitizeSingleLinePromptText(String(value ?? ""));
 	return normalized.length > 0 ? normalized : fallback;
 }
+function buildKnownSpaceDisplayProjection(input) {
+	return buildSpaceDisplayProjection({
+		currentProfileId: input.currentProfileId,
+		currentProfileName: input.currentProfileName,
+		spaceId: input.space.space,
+		spaceName: input.space.name,
+		creatorProfileId: input.space.creatorProfileId,
+		creatorProfileName: input.space.creatorProfileName,
+		availableViaProfileId: input.space.availableViaProfileId,
+		availableViaProfileName: input.space.availableViaProfileName,
+		spaceCreatedAt: input.space.spaceCreatedAt,
+		lastJoinedAt: resolveKnownSpaceJoinedTimestamp(input.space),
+		passwordProtected: input.space.passwordProtected
+	});
+}
 function buildDeleteConfirmationMessage(input) {
 	const count = input.targets.length;
 	const lines = [count === 1 ? "Delete this space permanently?" : `Delete ${String(count)} spaces permanently?`, "This action permanently deletes space data for everyone."];
 	for (const [index, target] of input.targets.entries()) {
-		const spaceName = normalizeDisplayValue(target.name, "untitled-space");
-		const creator = formatCreatorNameForDisplay({
-			creatorProfileName: target.creatorProfileName,
-			creatorProfileId: target.creatorProfileId,
-			currentProfileId: input.currentProfileId
-		});
-		const creatorId = resolveCreatorIdForDisplay({
-			creatorOwnerUserId: target.creatorOwnerUserId,
-			creatorProfileId: target.creatorProfileId
-		});
-		const creatorProfileId = normalizeDisplayValue(target.creatorProfileId, "unknown-profile");
-		lines.push(`${String(index + 1)}. ${spaceName}`);
-		lines.push(`   Space ID: ${target.space}`);
-		lines.push(`   Creator: ${creator}`);
-		lines.push(`   Creator ID: ${creatorId}`);
-		lines.push(`   Creator Profile ID: ${creatorProfileId}`);
+		const knownSpace = toKnownSpaceOptionFromDeleteTarget(target);
+		lines.push(`${String(index + 1)}. ${formatKnownSpaceName({
+			space: knownSpace,
+			resolvedView: "human",
+			currentProfileId: input.currentProfileId,
+			command: "delete"
+		})}`);
+		lines.push(...formatKnownSpaceDetailLines({
+			space: knownSpace,
+			resolvedView: "human",
+			currentProfileId: input.currentProfileId,
+			currentProfileName: input.currentProfileName,
+			detailVariant: "delete_confirmation",
+			command: "delete"
+		}).map((line) => `   ${line}`));
 	}
 	return lines.join("\n");
 }
@@ -63408,7 +64303,7 @@ function buildHumanSpaceDeleteBlockedError(input) {
 	if (resolveUpstreamStatus(parsed) !== 403) return null;
 	if (!isSpaceDeleteOwnerRestrictionError(parsed)) return null;
 	const spaceName = normalizeDisplayValue(input.target.name, "this space");
-	return /* @__PURE__ */ new Error(`Delete blocked: you can only delete spaces you created (${spaceName}).`);
+	return /* @__PURE__ */ new Error(`Delete blocked: this human profile can only delete its own spaces or your owned agent-created spaces (${spaceName}).`);
 }
 function isSpaceDeleteOwnerRestrictionError(input) {
 	const code = input.code.toLowerCase();
@@ -63432,11 +64327,11 @@ function renderHumanSpaceDeleteBlockedCard(input) {
 			},
 			{
 				label: "Reason",
-				value: "You can only delete spaces created by your user."
+				value: "This human profile can only delete its own spaces or your owned agent-created spaces."
 			},
 			{
 				label: "Try",
-				value: "Select a space created by your user, then retry."
+				value: "Switch to the human creator profile, or choose an agent-created space your user owns."
 			}
 		],
 		sanitize: true,
@@ -64154,13 +65049,9 @@ async function runStartServiceStep(input) {
 	return "continue";
 }
 async function runInstalledCurrentStartServiceStep(input) {
-	const localDemandResult = input.runtime.resolvedView === "human" && input.interactive ? await maybeAutoStopIdleBackgroundDaemonService({
-		codePrefix: "start.service",
-		ownerUserId: input.ownerUserId,
-		presenter: input.presenter
-	}) : null;
+	const localDemand = input.runtime.resolvedView === "human" && input.interactive ? await resolveDaemonLocalServiceDemand({ ownerUserId: input.ownerUserId }).catch(() => null) : null;
 	if (input.readiness.service.runtime?.status === "running") return "continue";
-	if (localDemandResult && localDemandResult.localDemand.decision !== "keep_running") return "continue";
+	if (localDemand && localDemand.decision !== "keep_running") return "continue";
 	if (!input.interactive) {
 		input.presenter.line({
 			code: "start.service.non_interactive",
@@ -67148,9 +68039,9 @@ withSpaceProfileOption(spaceCmd.command("delete").description("Delete one or mor
 		}
 	});
 });
-withSpaceProfileOption(spaceCmd.command("join").description("Join a space and chat interactively.").argument("[space]", "Space ID (64-character hex)").option("--local-echo", "Show local optimistic echo before server events (disabled by default)", false).option("--no-local-echo", "Clean mode: only render server events (default)", false).option("--history-limit <n>", "Recent history preload size on join (default: 100; 0 disables preload)", "100").option("--role <text>", "Role in this space").option("--role-instructions <text>", "Role instructions for this space").option("--mention-alias <token>", "Space-level mention alias (used by @alias in this space)").option("--password <value>", "Space password for protected access").option("--output <mode>", "Output mode: ndjson|text (default: text)", "text").option("--raw-stream", AGENT_RAW_STREAM_OPTION_DESCRIPTION, false)).action(async (space, opts, command) => {
+withSpaceProfileOption(spaceCmd.command("join").description("Join a space and chat interactively.").argument("[space]", "Space ID (64-character hex)").option("--local-echo", "Show local optimistic echo before server events (enabled by default in human interactive join)").option("--no-local-echo", "Clean mode: only render server events").option("--history-limit <n>", "Recent history preload size on join (default: 100; 0 disables preload)", "100").option("--role <text>", "Role in this space").option("--role-instructions <text>", "Role instructions for this space").option("--mention-alias <token>", "Space-level mention alias (used by @alias in this space)").option("--password <value>", "Space password for protected access").option("--output <mode>", "Output mode: ndjson|text (default: text)", "text").option("--raw-stream", AGENT_RAW_STREAM_OPTION_DESCRIPTION, false)).action(async (space, opts, command) => {
 	const cliOptions = resolveSpaceCommandCliOptions(command, opts);
-	const localEcho = opts.noLocalEcho === true ? false : opts.localEcho === true;
+	const localEcho = opts.noLocalEcho !== true;
 	const view = getGlobalViewOption();
 	if (view === "agent" && normalizeOptionalString(space) === null) {
 		await runSpaceJoin({