agent-transport-system 0.7.5 → 0.7.6

package/dist/ats.js

@@ -27,7 +27,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 = "0.7.5";
+var version = "0.7.6";
 var package_default = {
 	$schema: "https://www.schemastore.org/package.json",
 	name: "agent-transport-system",
@@ -2510,6 +2510,14 @@ const SPACE_ADD_MEMBERS_PROGRESS_PHASES = [
 	}
 ];
 const SPACE_ADD_MEMBERS_PROGRESS_OVERVIEW_STAGES = SPACE_ADD_MEMBERS_PROGRESS_PHASES.map((phase) => `${phase.stage}/${phase.phase}`);
+const SPACE_ADD_MEMBERS_AGENT_OVERVIEW_STAGES = [
+	"check_arguments",
+	"authenticate",
+	"check_profile",
+	"resolve_target",
+	"add_members/write_membership",
+	"record_join_notices/write_join_notices"
+];
 function resolveSpaceAddMembersProgressPhase(input) {
 	const contract = SPACE_ADD_MEMBERS_PROGRESS_PHASES.find((phase) => phase.stage === input.stage && phase.phase === input.phase);
 	if (!contract) throw new Error(`unknown space add-members progress phase: ${input.stage}/${input.phase}`);
@@ -3273,7 +3281,7 @@ const COMMAND_ENTRY_CONTRACTS = {
 			},
 			notes: ["space is single-select; members support one or many selections.", "already-joined profiles are skipped automatically."],
 			pattern: getSpaceMemberSelectionPatternContract("add-members"),
-			stages: SPACE_ADD_MEMBERS_PROGRESS_OVERVIEW_STAGES,
+			stages: [...SPACE_ADD_MEMBERS_AGENT_OVERVIEW_STAGES],
 			summary: "Use `ats space add-members --profile <profile-id> <space-id> --member <profile-id...> --view agent` with explicit acting profile, Space ID, and member selection."
 		},
 		buildHints: (context) => getSpaceMemberSelectionPatternContract("add-members").buildHints?.({
@@ -60440,13 +60448,7 @@ function renderProfileSummaryCard(input) {
 	});
 }
 function buildAgentCreateNextSteps(profile) {
-	if (profile.profileKind === "agent") return [
-		formatAtsCliCommand(`ats setup --profile ${profile.atsProfileId} --local-agent <local-agent-id> --view agent`),
-		formatAtsCliCommand(`ats setup --profile ${profile.atsProfileId} --view agent`),
-		formatAtsCliCommand(`ats service status --profile ${profile.atsProfileId} --view agent`),
-		formatAtsCliCommand(`ats profiles show ${profile.atsProfileId} --view agent`),
-		formatAtsCliCommand(`ats whoami --profile ${profile.atsProfileId} --view agent`)
-	];
+	if (profile.profileKind === "agent") return [formatAtsCliCommand(`ats space add-members <space-id> --member ${profile.atsProfileId} --profile <human-profile-id> --view agent`)];
 	return [
 		formatAtsCliCommand("ats profiles list --view agent"),
 		formatAtsCliCommand(`ats profiles set ${profile.atsProfileId} --view agent`),
@@ -60460,28 +60462,24 @@ function buildAgentCreateWakeReadinessData(profile) {
 	return {
 		identityCreated: true,
 		wakeReadinessVerified: false,
-		wakeReadinessNote: "This command created the Agent Profile identity. It did not verify that this profile can be woken from a Space or reply from this computer."
+		wakeReadinessNote: "Profile creation creates the Space identity. Add it to a Space when the user wants this teammate to participate."
 	};
 }
 function buildProfileCreateWakeReadinessRows(input) {
 	if (input.state !== "created" || input.profile.profileKind !== "agent") return [];
 	return [{
-		label: "Wake availability",
-		value: "Not verified by profile creation"
+		label: "Space identity",
+		value: "Created"
 	}, {
 		label: "Next",
-		value: `Run ${formatAtsCliCommand(`ats setup --profile ${input.profile.atsProfileId} --local-agent <local-agent-id>`)} before expecting this Agent Profile to reply from a Space.`
+		value: "Add this profile to a Space when the user wants this teammate to participate."
 	}];
 }
 function buildAgentUpdateNextSteps(profile) {
+	if (profile.profileKind === "agent") return [formatAtsCliCommand(`ats profiles show ${profile.atsProfileId} --view agent`), formatAtsCliCommand(`ats space add-members <space-id> --member ${profile.atsProfileId} --profile <human-profile-id> --view agent`)];
 	return [
 		formatAtsCliCommand(`ats profiles show ${profile.atsProfileId} --view agent`),
 		formatAtsCliCommand(`ats profiles update ${profile.atsProfileId} --name <new-name> --view agent`),
-		formatAtsCliCommand(`ats setup --profile ${profile.atsProfileId} --local-agent <local-agent-id> --view agent`),
-		formatAtsCliCommand(`ats setup --profile ${profile.atsProfileId} --view agent`),
-		formatAtsCliCommand(`ats profiles update ${profile.atsProfileId} --workspace-mode ats-managed --view agent`),
-		formatAtsCliCommand(`ats profiles update ${profile.atsProfileId} --workspace-mode custom --workspace-path /absolute/path --view agent`),
-		formatAtsCliCommand(`ats whoami --profile ${profile.atsProfileId} --view agent`),
 		formatAtsCliCommand("ats profiles list --view agent")
 	];
 }
@@ -69476,7 +69474,7 @@ const STAGES_BY_COMMAND = {
 		"resolve_target",
 		"read_or_update_guide"
 	],
-	add_members: SPACE_ADD_MEMBERS_PROGRESS_OVERVIEW_STAGES,
+	add_members: SPACE_ADD_MEMBERS_AGENT_OVERVIEW_STAGES,
 	remove_members: [
 		"check_arguments",
 		"authenticate",
@@ -83782,13 +83780,13 @@ function handleBlockedSpaceJoinLocalParticipation(input) {
 	if (input.assessmentState === "not_needed") {
 		input.presenter.line({
 			code: "space.join.service.not_needed",
-			text: formatInlineAtsCliCommands("ATS will keep joining this space without local Wake participation on this device. Space membership is separate from whether a local agent can reply from this computer. If you later want local agents from this device to reply, run `ats service status` and follow its recovery guidance.")
+			text: formatInlineAtsCliCommands("ATS will join this space. Local agent participation on this device can be checked later with `ats service status`.")
 		});
 		return "continue";
 	}
 	input.presenter.line({
 		code: "space.join.service.pending",
-		text: formatInlineAtsCliCommands("ATS will keep joining this space without local Wake participation on this device. Space membership is separate from whether a local agent can reply from this computer. Run `ats service status` to inspect local participation before expecting background replies.")
+		text: formatInlineAtsCliCommands("ATS will join this space. Local agent participation on this device can be checked separately with `ats service status`.")
 	});
 	return "continue";
 }
@@ -83801,10 +83799,10 @@ function buildSpaceJoinMembershipOnlyMessage(input) {
 	const profileId = input.atsProfile.atsProfileId;
 	const reasonCodes = input.reasonCodes;
 	const statusCommand = formatAtsCliCommand(`ats service status --profile ${profileId}`);
-	if (reasonCodes.includes("profile.unbound")) return `${profileName} will join this space, but it is not connected to a local agent on this device yet. It can appear here now, but it will not wake or reply from this device until you choose a local agent in ATS Web.`;
-	if (reasonCodes.some((reasonCode) => LOCAL_SERVICE_ONLY_JOIN_BLOCK_REASON_CODES.has(reasonCode)) || reasonCodes.includes("dispatch.storage_not_ready") || reasonCodes.includes("service.gateway_chain_unhealthy") || reasonCodes.includes("route.offline") || reasonCodes.includes("route.not_registered")) return formatInlineAtsCliCommands(`${profileName} will join this space, but it will not wake or reply from this device yet. Space membership is separate from local Wake participation. Use \`${statusCommand}\` to check this device; if local participation is unhealthy, follow the status or repair guidance before expecting background replies.`);
+	if (reasonCodes.includes("profile.unbound")) return `${profileName} will join this space. Choose its local agent in ATS Web when you want it to handle work from this device.`;
+	if (reasonCodes.some((reasonCode) => LOCAL_SERVICE_ONLY_JOIN_BLOCK_REASON_CODES.has(reasonCode)) || reasonCodes.includes("dispatch.storage_not_ready") || reasonCodes.includes("service.gateway_chain_unhealthy") || reasonCodes.includes("route.offline") || reasonCodes.includes("route.not_registered")) return formatInlineAtsCliCommands(`${profileName} will join this space. ATS has not confirmed its local reply path on this device yet. Use \`${statusCommand}\` to check this device.`);
 	if (reasonCodes.includes("controller.launch.needs_repair") || reasonCodes.includes("controller.launch.choice_required") || reasonCodes.includes("workspace.missing") || reasonCodes.includes("workspace.invalid")) return formatInlineAtsCliCommands(`${profileName} will join this space, but its local agent setup on this device needs attention. Use \`ats agents list\` to find the local agent, then run \`ats agents repair --agent <agent-id>\`.`);
-	return `${profileName} will join this space, but local setup on this device is still incomplete. It can appear here now, but it will not wake or reply from this device until you check Local Agents in ATS Web.`;
+	return `${profileName} will join this space. Check Local Agents in ATS Web when you want it to handle work from this device.`;
 }
 function buildJoinTargetMissingMessage(input) {
 	return formatMessage(input.resolvedView, "space.target.missing", { command: "join" });
@@ -85054,6 +85052,8 @@ const SPACE_MEMBER_PROFILE_RECONNECT_REASON_CODES = new Set([
 	"local_service.identity_mismatch"
 ]);
 const SPACE_MEMBER_SERVICE_STATUS_REASON_CODES = new Set([
+	"agent_profile_binding.local_service_not_connected",
+	"agent_profile_binding.execution_readiness_pending",
 	"route.offline",
 	"route.not_registered",
 	"service.gateway_chain_unhealthy",
@@ -85617,6 +85617,11 @@ function toAuthEndpoint(baseUrl, pathname) {
 function buildSpaceWebUrl(baseUrl, spaceId) {
 	const url = new URL(baseUrl);
 	if (isLoopbackHostname(url.hostname) && url.port === "8080") url.port = "3000";
+	if (url.hostname === "gateway.ats.sh") {
+		url.hostname = "ats.sh";
+		url.port = "";
+		url.protocol = "https:";
+	}
 	url.pathname = `/app/spaces/${encodeURIComponent(spaceId)}`;
 	url.search = "";
 	url.hash = "";
@@ -86129,7 +86134,7 @@ async function runSpaceAddMembers(input) {
 		resolvedView: runtime.resolvedView,
 		interactive
 	});
-	await emitSpaceCommandPreflight({
+	if (shouldRunSpaceAddMembersDiagnosticPreflight(input, explicitMemberIds)) await emitSpaceCommandPreflight({
 		presenter,
 		command: "add_members",
 		profile: atsProfile,
@@ -86321,6 +86326,12 @@ async function runSpaceLeave(input) {
 		throw error;
 	}
 }
+function shouldRunSpaceAddMembersDiagnosticPreflight(input, explicitMemberIds) {
+	return input.details === true || input.all === true || explicitMemberIds.length === 0;
+}
+function shouldUseFastExplicitSpaceAddMembers(input) {
+	return input.details !== true && input.explicitMemberIds.length > 0;
+}
 async function runSpaceAddMembersForTarget(input) {
 	const targetBaseUrl = input.hasExplicitBaseUrlInput ? input.baseUrl : input.target.baseUrl ?? input.baseUrl;
 	const authenticatedGatewayUrl = await ensureSpaceCommandGatewayAuthenticationOrCancel({
@@ -86338,6 +86349,7 @@ async function runSpaceAddMembersForTarget(input) {
 	};
 	const explicitMemberIds = normalizeRequestedMemberIds(input.explicitMembers);
 	const progress = input.details || explicitMemberIds.length === 0 ? addMembersProgress : void 0;
+	const includeLocalParticipation = progress !== void 0 || explicitMemberIds.length === 0;
 	const candidates = await resolveSpaceMemberCandidatesForAdd({
 		currentProfile: input.atsProfile,
 		currentOwnerUserId: input.atsProfile.ownerUserId,
@@ -86345,7 +86357,12 @@ async function runSpaceAddMembersForTarget(input) {
 		baseUrl: targetBaseUrl,
 		password: input.password,
 		explicitMemberIds,
-		progress
+		progress,
+		fastExplicitMembers: shouldUseFastExplicitSpaceAddMembers({
+			details: input.details,
+			explicitMemberIds
+		}),
+		includeLocalParticipation
 	});
 	if (candidates.length === 0 && explicitMemberIds.length === 0) {
 		input.presenter.line({
@@ -86377,15 +86394,10 @@ async function runSpaceAddMembersForTarget(input) {
 		selectedProfileIds
 	});
 	if (selectedCandidates.length === 0) return { status: "completed" };
-	emitSpaceAddMembersProgressIfRequested(progress, {
-		stage: "check_local_wake_readiness",
-		phase: "start",
-		summary: "Checking whether selected agent profiles can wake from this computer. Members can still be added if local Wake setup needs attention.",
-		profileIds: selectedCandidates.map((candidate) => candidate.profileId)
-	});
-	const servicePreparationResult = await ensureSpaceMemberCandidatesLocalParticipationReady({
+	const servicePreparationResult = await prepareSpaceAddMembersLocalParticipationIfRequested({
 		atsProfile: input.atsProfile,
 		candidates: selectedCandidates,
+		enabled: includeLocalParticipation,
 		progress,
 		presenter: input.presenter,
 		resolvedView: input.runtime.resolvedView,
@@ -86455,6 +86467,28 @@ async function runSpaceAddMembersForTarget(input) {
 	});
 	return { status: "completed" };
 }
+async function prepareSpaceAddMembersLocalParticipationIfRequested(input) {
+	if (!input.enabled) return {
+		status: "continue",
+		candidates: input.candidates
+	};
+	emitSpaceAddMembersProgressIfRequested(input.progress, {
+		stage: "check_local_wake_readiness",
+		phase: "start",
+		summary: "Checking whether selected agent profiles can handle work from this computer. Members can still be added if local setup needs attention.",
+		profileIds: input.candidates.map((candidate) => candidate.profileId)
+	});
+	return await ensureSpaceMemberCandidatesLocalParticipationReady({
+		atsProfile: input.atsProfile,
+		candidates: input.candidates,
+		progress: input.progress,
+		presenter: input.presenter,
+		resolvedView: input.resolvedView,
+		allowPrompt: input.allowPrompt,
+		spaceId: input.spaceId,
+		view: input.view
+	});
+}
 function emitSpaceAddMembersProgressIfRequested(progress, input) {
 	if (!progress) return;
 	emitAgentSpaceAddMembersProgress({
@@ -86503,13 +86537,13 @@ function buildSpaceAddMembersLocalWakePlanSummary(plan) {
 		if (assessment.profileKind !== "agent") continue;
 		counts.set(assessment.localParticipationState, (counts.get(assessment.localParticipationState) ?? 0) + 1);
 	}
-	return `Local Wake plan: ${[
-		formatLocalWakePlanCount(counts.get("ready") ?? 0, "available for local Wake"),
+	return `Local agent plan: ${[
+		formatLocalWakePlanCount(counts.get("ready") ?? 0, "can handle work from this device"),
 		formatLocalWakePlanCount(counts.get("needs_agent_prepare") ?? 0, "need agent preparation"),
 		formatLocalWakePlanCount(counts.get("needs_ats_service") ?? 0, "need ATS Service"),
 		formatLocalWakePlanCount(counts.get("membership_only") ?? 0, "will be added as members only"),
-		formatLocalWakePlanCount(counts.get("not_needed") ?? 0, "do not need local Wake setup")
-	].filter((part) => Boolean(part)).join(", ")}. Adding members is separate from making them available for Wake on this computer.`;
+		formatLocalWakePlanCount(counts.get("not_needed") ?? 0, "do not need local agent setup")
+	].filter((part) => Boolean(part)).join(", ")}. Adding members is separate from local agent participation on this computer.`;
 }
 function formatLocalWakePlanCount(count, label) {
 	return count > 0 ? `${String(count)} ${label}` : null;
@@ -86672,7 +86706,7 @@ async function ensureSpaceMemberCandidatesLocalParticipationReady(input) {
 		candidates: preparedCandidates.map(toActionParticipationCandidateFromSpaceMemberCandidate)
 	}).shouldOfferServiceGate) input.presenter.line({
 		code: input.resolvedView === "human" && input.allowPrompt ? "space.add_members.service.declined" : "space.add_members.service.deferred",
-		text: formatInlineAtsCliCommands("ATS will continue adding these profiles without local Wake participation on this device. Space membership is separate from whether a local agent can reply from this computer. Run `ats service status` to inspect local participation before expecting background replies.")
+		text: formatInlineAtsCliCommands("ATS will add these profiles to the Space. Local agent participation can be checked separately with `ats service status`.")
 	});
 	return {
 		status: "continue",
@@ -86746,17 +86780,18 @@ function emitSpaceMemberJoinOnlyWarnings(input) {
 }
 function buildSpaceMemberJoinOnlyWarning(candidate) {
 	if (candidate.profileKind !== "agent") return null;
+	if (candidate.localParticipationChecked !== true) return null;
 	if (isSpaceMemberCandidateBackgroundReplyReady(candidate)) return null;
 	const profileLabel = resolveSpaceMemberTerminalProfileLabel(candidate.profileName);
-	if (isSpaceMemberCandidateRepairableLocalParticipationCandidate(candidate)) return `${profileLabel} can join this space now, but ${resolveSpaceMemberTerminalLocalTargetLabel({
+	if (isSpaceMemberCandidateRepairableLocalParticipationCandidate(candidate)) return `${profileLabel} can join this space now. ${resolveSpaceMemberTerminalLocalTargetLabel({
 		displayName: candidate.localTargetDisplayName,
 		agentId: candidate.localTargetAgentId
-	})} still needs local setup on this device before it can wake or reply in the background. Use \`${buildSpaceMemberRepairCommand({
+	})} still needs local setup on this device before it can handle work from the Space. Use \`${buildSpaceMemberRepairCommand({
 		agentId: candidate.localTargetAgentId,
 		profileId: candidate.profileId
-	})}\` before expecting background replies.`;
+	})}\` to repair the local agent.`;
 	const nextAction = resolveSpaceMemberJoinOnlyNextAction(candidate);
-	return `${profileLabel} can join this space now, but it will not wake or reply from this device yet. ${resolveSpaceMemberJoinOnlyReason(candidate)} ${formatSpaceMemberRecoveryNextAction(nextAction)}`;
+	return `${profileLabel} can join this space now. ATS has not confirmed its local reply path on this device yet. ${resolveSpaceMemberJoinOnlyReason(candidate)} ${formatSpaceMemberRecoveryNextAction(nextAction)}`;
 }
 function resolveSpaceMemberJoinOnlyNextAction(candidate) {
 	if (candidate.localParticipationReadiness === "not_running") return {
@@ -86834,6 +86869,7 @@ async function refreshSpaceMemberCandidatesLocalReadiness(candidates, progress,
 async function enrichSpaceMemberCandidateLocalParticipationReadiness(candidate, progress, options = {}) {
 	if (candidate.profileKind !== "agent" || !candidate.atsProfile || candidate.controllerEnabled !== true || typeof candidate.controllerRef !== "string" || candidate.controllerRef.trim().length === 0) return {
 		...candidate,
+		localParticipationChecked: true,
 		localParticipationReadiness: null,
 		localParticipationReasonCodes: [],
 		localParticipationReasonText: null
@@ -86872,6 +86908,7 @@ async function enrichSpaceMemberCandidateLocalParticipationReadiness(candidate,
 	}
 	if (!snapshot) return {
 		...candidate,
+		localParticipationChecked: true,
 		localParticipationReadiness: null,
 		localParticipationReasonCodes: [],
 		localParticipationReasonText: null
@@ -86883,6 +86920,7 @@ async function enrichSpaceMemberCandidateLocalParticipationReadiness(candidate,
 	});
 	return {
 		...candidate,
+		localParticipationChecked: true,
 		localParticipationReadiness: readinessSummary.serviceReadiness,
 		localParticipationReasonCodes: [...snapshot.deviceReplyReadiness.reasonCodes],
 		localParticipationReasonText: snapshot.deviceReplyReadiness.reasonText
@@ -88159,6 +88197,9 @@ function mapSpaceLeaveFailureToGuideError(input) {
 	return input.error instanceof Error ? input.error : new Error(String(input.error));
 }
 async function resolveSpaceMemberCandidatesForAdd(input) {
+	const explicitMemberIds = normalizeRequestedMemberIds(input.explicitMemberIds);
+	const includeLocalParticipation = input.includeLocalParticipation !== false;
+	if (input.fastExplicitMembers === true && explicitMemberIds.length > 0) return explicitMemberIds.map(buildFastExplicitSpaceMemberCandidate);
 	if (input.progress) emitAgentSpaceAddMembersProgress({
 		...input.progress,
 		stage: "resolve_candidates",
@@ -88166,23 +88207,19 @@ async function resolveSpaceMemberCandidatesForAdd(input) {
 		summary: "Reading active local profile identities for this Space."
 	});
 	const profiles = await listAtsProfiles();
-	if (input.progress) emitAgentSpaceAddMembersProgress({
+	if (input.progress && includeLocalParticipation) emitAgentSpaceAddMembersProgress({
 		...input.progress,
 		stage: "resolve_candidates",
 		phase: "read_local_targets",
 		summary: "Reading local agent controller state for candidate profiles before selection."
 	});
-	const localTargetStates = input.progress ? await runSpaceAddMembersProgressHeartbeat({
-		...input.progress,
-		stage: "resolve_candidates",
-		phase: "read_local_targets_wait",
-		summary: "Still reading local agent controller state for candidate profiles before selection.",
-		operation: async () => await listAgentTargetStates().catch(() => [])
-	}) : await listAgentTargetStates().catch(() => []);
+	const localTargetStates = await listSpaceAddMembersLocalTargetStatesIfRequested({
+		includeLocalParticipation,
+		progress: input.progress
+	});
 	const localTargetStateById = new Map(localTargetStates.map((state) => [state.agentId, state]));
 	const ownerProfileNameByOwnerUserId = buildOwnerProfileNameByOwnerUserId(profiles);
 	const candidateProfiles = profiles.filter((profile) => profile.status === "active" && isSpaceMembershipProfileKind(profile.profileKind) && profile.atsProfileId !== input.currentProfile.atsProfileId).filter((profile) => {
-		const explicitMemberIds = input.explicitMemberIds ?? [];
 		if (explicitMemberIds.length > 0 && !explicitMemberIds.includes(profile.atsProfileId)) return false;
 		return typeof input.currentOwnerUserId !== "string" || input.currentOwnerUserId.trim().length === 0 || profile.ownerUserId === input.currentOwnerUserId;
 	});
@@ -88199,29 +88236,58 @@ async function resolveSpaceMemberCandidatesForAdd(input) {
 		...input.password === void 0 ? {} : { spacePassword: input.password }
 	});
 	const memberProfileIds = new Set([...membersSnapshot.humans, ...membersSnapshot.agents].map((member) => member.profileId));
-	return await refreshSpaceMemberCandidatesLocalReadiness((await Promise.all(candidateProfiles.map((profile) => buildSpaceMemberCandidateFromProfile({
+	const candidates = (await Promise.all(candidateProfiles.map((profile) => buildSpaceMemberCandidateFromProfile({
 		baseUrl: input.baseUrl,
 		profile,
 		localTargetStateById,
 		ownerProfileName: ownerProfileNameByOwnerUserId.get(profile.ownerUserId) ?? void 0,
 		alreadyJoined: memberProfileIds.has(profile.atsProfileId),
-		progress: input.progress
+		progress: input.progress,
+		includeLocalParticipation
 	})))).sort((left, right) => {
 		const byName = left.profileName.localeCompare(right.profileName);
 		if (byName !== 0) return byName;
 		return left.profileId.localeCompare(right.profileId);
-	}), input.progress, { stage: "resolve_candidates" });
+	});
+	if (!includeLocalParticipation) return candidates;
+	return await refreshSpaceMemberCandidatesLocalReadiness(candidates, input.progress, { stage: "resolve_candidates" });
 }
-async function buildSpaceMemberCandidateFromProfile(input) {
-	if (input.progress) emitAgentSpaceAddMembersProgress({
+function buildFastExplicitSpaceMemberCandidate(profileId) {
+	return {
+		profileId,
+		profileName: profileId,
+		profileKind: profileId.startsWith("agt_") ? "agent" : "human",
+		targetMentionLabel: null,
+		localTargetAgentId: null,
+		localTargetDisplayName: null,
+		localTargetLaunchStatus: null,
+		localTargetSelectable: false,
+		localParticipationReadiness: null,
+		localParticipationChecked: false,
+		localParticipationReasonCodes: [],
+		localParticipationReasonText: null,
+		alreadyJoined: false,
+		needsActivation: false
+	};
+}
+async function listSpaceAddMembersLocalTargetStatesIfRequested(input) {
+	if (!input.includeLocalParticipation) return [];
+	if (!input.progress) return await listAgentTargetStates().catch(() => []);
+	return await runSpaceAddMembersProgressHeartbeat({
 		...input.progress,
 		stage: "resolve_candidates",
-		phase: "read_runtime_capability",
-		summary: `Reading runtime capability projection for ${resolveSpaceMemberTerminalProfileLabel(input.profile.profileName)}.`,
-		profileId: input.profile.atsProfileId,
-		profileIds: [input.profile.atsProfileId]
+		phase: "read_local_targets_wait",
+		summary: "Still reading local agent controller state for candidate profiles before selection.",
+		operation: async () => await listAgentTargetStates().catch(() => [])
 	});
-	const runtimeCapability = input.progress ? await runSpaceAddMembersProgressHeartbeat({
+}
+async function resolveSpaceMemberCandidateRuntimeCapabilityIfRequested(input) {
+	if (!input.includeLocalParticipation) return null;
+	if (!input.progress) return await resolveAgentProfilePrimaryRuntimeCapability({
+		baseUrl: input.baseUrl,
+		profile: input.profile
+	}).catch(() => null);
+	return await runSpaceAddMembersProgressHeartbeat({
 		...input.progress,
 		stage: "resolve_candidates",
 		phase: "read_runtime_capability_wait",
@@ -88232,10 +88298,24 @@ async function buildSpaceMemberCandidateFromProfile(input) {
 			baseUrl: input.baseUrl,
 			profile: input.profile
 		}).catch(() => null)
-	}) : await resolveAgentProfilePrimaryRuntimeCapability({
+	});
+}
+async function buildSpaceMemberCandidateFromProfile(input) {
+	const includeLocalParticipation = input.includeLocalParticipation !== false;
+	if (input.progress && includeLocalParticipation) emitAgentSpaceAddMembersProgress({
+		...input.progress,
+		stage: "resolve_candidates",
+		phase: "read_runtime_capability",
+		summary: `Reading runtime capability projection for ${resolveSpaceMemberTerminalProfileLabel(input.profile.profileName)}.`,
+		profileId: input.profile.atsProfileId,
+		profileIds: [input.profile.atsProfileId]
+	});
+	const runtimeCapability = await resolveSpaceMemberCandidateRuntimeCapabilityIfRequested({
 		baseUrl: input.baseUrl,
-		profile: input.profile
-	}).catch(() => null);
+		includeLocalParticipation,
+		profile: input.profile,
+		progress: input.progress
+	});
 	const controllerRef = runtimeCapability?.capabilityRef ?? void 0;
 	const controllerEnabled = runtimeCapability?.bindingState === "enabled_primary" && runtimeCapability.routable;
 	const localTargetAgentId = resolveSpaceMemberCandidateLocalTargetAgentId({
@@ -88260,6 +88340,7 @@ async function buildSpaceMemberCandidateFromProfile(input) {
 		localTargetLaunchStatus: localTargetState?.launchStatus ?? null,
 		localTargetSelectable: localTargetState?.selectable ?? false,
 		localParticipationReadiness: null,
+		localParticipationChecked: false,
 		localParticipationReasonCodes: [],
 		localParticipationReasonText: null,
 		alreadyJoined: input.alreadyJoined,
@@ -88588,14 +88669,19 @@ async function applySpaceAddMembers(input) {
 	}
 	const addedProfileIds = new Set(response.addedMemberIds);
 	const alreadyMemberProfileIds = new Set(response.alreadyMemberIds);
+	const responseItemByProfileId = new Map(response.items.map((item) => [item.profileId, item]));
 	const lastJoinedAt = (/* @__PURE__ */ new Date()).toISOString();
 	const spaceName = normalizeOptionalString$1(input.spaceName);
 	for (const candidate of selectedCandidates) {
+		const nextCandidate = hydrateSpaceMemberCandidateFromResponseItem({
+			candidate,
+			item: responseItemByProfileId.get(candidate.profileId)
+		});
 		if (addedProfileIds.has(candidate.profileId)) {
-			result.added.push(candidate);
+			result.added.push(nextCandidate);
 			continue;
 		}
-		if (alreadyMemberProfileIds.has(candidate.profileId)) result.alreadyJoined.push(candidate);
+		if (alreadyMemberProfileIds.has(candidate.profileId)) result.alreadyJoined.push(nextCandidate);
 	}
 	for (const candidate of result.added) try {
 		await upsertProfileSpaceHistory({
@@ -88622,6 +88708,27 @@ async function applySpaceAddMembers(input) {
 	}
 	return result;
 }
+function hydrateSpaceMemberCandidateFromResponseItem(input) {
+	if (!input.item) return input.candidate;
+	return {
+		...input.candidate,
+		profileName: input.item.profileName,
+		profileKind: input.item.profileKind,
+		ownerUserId: normalizeOptionalString$1(input.item.ownerUserId) ?? void 0,
+		ownerName: normalizeOptionalString$1(input.item.ownerName) ?? void 0,
+		targetMentionLabel: resolvePrimaryMentionLabelFromSpaceMemberItem(input.item),
+		...input.item.profileKind === "agent" ? { controllerRef: normalizeOptionalString$1(input.item.controllerRef) ?? input.candidate.controllerRef } : {}
+	};
+}
+function resolvePrimaryMentionLabelFromSpaceMemberItem(item) {
+	const mentionAlias = normalizeOptionalString$1(item.mentionAlias);
+	if (mentionAlias) return mentionAlias;
+	return resolveSingleSpaceMentionLabels({
+		mentionAlias,
+		profileId: item.profileId,
+		profileName: item.profileName
+	}).primaryMentionLabel;
+}
 async function waitForAddedMembersWakeProjection(input) {
 	const expectedWakeableProfileIds = resolveExpectedWakeProjectionProfileIds(input.result);
 	if (expectedWakeableProfileIds.length === 0) return;
@@ -88728,6 +88835,7 @@ function emitSpaceAddMembersResult(input) {
 }
 function buildSpaceMemberJoinedFollowUp(candidate) {
 	if (candidate.profileKind !== "agent") return null;
+	if (candidate.localParticipationChecked !== true) return null;
 	if (isSpaceMemberCandidateRepairableLocalParticipationCandidate(candidate)) {
 		const repairCommand = buildSpaceMemberRepairCommand({
 			agentId: candidate.localTargetAgentId,
@@ -88741,7 +88849,7 @@ function buildSpaceMemberJoinedFollowUp(candidate) {
 		return {
 			profileId: candidate.profileId,
 			reasonCodes: candidate.localParticipationReasonCodes ?? [],
-			text: `${profileLabel} joined this space, but ${agentLabel} still needs repair on this device before it can wake or reply in the background. Use \`${repairCommand}\` before expecting background replies.`
+			text: `${profileLabel} joined this space. ${agentLabel} still needs repair on this device before it can handle work from the Space. Use \`${repairCommand}\` to repair the local agent.`
 		};
 	}
 	if (!isSpaceMemberCandidateRunnableLocalParticipationCandidate(candidate)) {
@@ -88750,7 +88858,7 @@ function buildSpaceMemberJoinedFollowUp(candidate) {
 		return {
 			profileId: candidate.profileId,
 			reasonCodes: candidate.localParticipationReasonCodes ?? [],
-			text: `${profileLabel} joined this space, but it is not connected to a local agent on this device yet. It can appear here now, but it will not wake or reply from this device until you choose a local agent. ${formatSpaceMemberRecoveryNextAction(nextAction)}`
+			text: `${profileLabel} joined this space. ATS has not confirmed its local reply path on this device yet. ${formatSpaceMemberRecoveryNextAction(nextAction)}`
 		};
 	}
 	return null;
@@ -88985,8 +89093,8 @@ async function persistSpaceAddMembersJoinNotices(input) {
 		failedCount: 0
 	};
 	const failures = [];
-	let targetMentionLabelByProfileId;
-	try {
+	let targetMentionLabelByProfileId = buildKnownMentionLabelByProfileId(input.addedMembers);
+	if (!hasMentionLabelsForAllMembers(input.addedMembers, targetMentionLabelByProfileId)) try {
 		targetMentionLabelByProfileId = buildSpacePrimaryMentionLabelByProfileId(await createCliSpaceApi(input.baseUrl).getMembersSnapshot({
 			spaceId: input.space,
 			requestContext: buildAtsRequestContextFromProfile({ atsProfile: input.actorProfile }),
@@ -89032,6 +89140,17 @@ async function persistSpaceAddMembersJoinNotices(input) {
 		...failures[0] ? { firstFailure: toStructuredGatewayFailure(failures[0].error) } : {}
 	};
 }
+function buildKnownMentionLabelByProfileId(members) {
+	const labelsByProfileId = /* @__PURE__ */ new Map();
+	for (const member of members) {
+		const targetMentionLabel = normalizeOptionalString$1(member.targetMentionLabel);
+		if (targetMentionLabel) labelsByProfileId.set(member.profileId, targetMentionLabel);
+	}
+	return labelsByProfileId;
+}
+function hasMentionLabelsForAllMembers(members, labelsByProfileId) {
+	return members.every((member) => labelsByProfileId.has(member.profileId));
+}
 async function postSpaceAddMemberJoinNotice(input) {
 	const requestContext = buildAtsRequestContextFromProfile({ atsProfile: input.actorProfile });
 	await createCliSpaceApi(input.baseUrl).postNormalMessage({
@@ -89217,8 +89336,9 @@ function resolveSpaceMemberCandidateStatusLabel(candidate) {
 const TRAILING_PERIOD_RE = /\.$/u;
 function resolveSpaceMemberCandidateStatusBadges(candidate) {
 	if (candidate.profileKind !== "agent") return [];
+	if (candidate.localParticipationChecked !== true) return [];
 	if (isSpaceMemberCandidateBackgroundReplyReady(candidate)) return ["Local setup connected"];
-	if (isSpaceMemberCandidateRepairableLocalParticipationCandidate(candidate)) return ["Needs repair before background replies"];
+	if (isSpaceMemberCandidateRepairableLocalParticipationCandidate(candidate)) return ["Needs repair"];
 	return [resolveSpaceMemberJoinOnlyReason(candidate).replace(TRAILING_PERIOD_RE, ""), "Joins only for now"];
 }
 function isSpaceMemberCandidateBackgroundReplyReady(candidate) {
@@ -89242,7 +89362,7 @@ function resolveSpaceMemberProfileConnectionAction(candidate) {
 		kind: "instruction"
 	};
 	if (candidate.controllerEnabled !== true || typeof candidate.controllerRef !== "string" || candidate.controllerRef.trim().length === 0 || reasonCodes.some((reasonCode) => SPACE_MEMBER_PROFILE_CONNECTION_REASON_CODES.has(reasonCode))) return {
-		instruction: "Open this Agent in ATS Web and choose the local agent that should handle Wake work.",
+		instruction: "Open this Agent in ATS Web and choose the local agent that should handle work from the Space.",
 		kind: "instruction"
 	};
 	if (reasonCodes.includes("controller.binding.disabled")) return {
@@ -89255,9 +89375,9 @@ function hasSpaceMemberReasonCode(candidate, reasonCodes) {
 	return (candidate.localParticipationReasonCodes ?? []).some((reasonCode) => reasonCodes.has(reasonCode));
 }
 function formatSpaceMemberRecoveryNextAction(action) {
-	if (action.kind === "instruction") return `${action.instruction} Do this before expecting background replies.`;
-	if (action.command === "ats agents list") return formatInlineAtsCliCommands("Use `ats agents list` to find the local agent that needs repair before expecting background replies.");
-	return `Use \`${formatAtsCliCommand(action.command)}\` before expecting background replies.`;
+	if (action.kind === "instruction") return action.instruction;
+	if (action.command === "ats agents list") return formatInlineAtsCliCommands("Use `ats agents list` to find the local agent that needs repair.");
+	return `Use \`${formatAtsCliCommand(action.command)}\` to check the local reply path.`;
 }
 function resolveSpaceMemberTerminalProfileLabel(profileName) {
 	return sanitizeSingleLinePromptText(normalizeOptionalString$1(profileName)) || "This agent";