@gajae-code/coding-agent 0.11.3 → 0.11.5

package/src/sdk/bus/telegram-daemon.ts

@@ -9,11 +9,33 @@ import { withFileLock } from "../../config/file-lock";
 import type { Settings } from "../../config/settings";
 import type { DaemonRuntimeInfo } from "../../daemon/control-types";
 import { resolveGjcRuntimeSpawnInfo } from "../../daemon/runtime";
+import { isProcessIncarnation, processIncarnation } from "../broker/process-incarnation";
 import { getNotificationConfig, isTelegramConfigured, tokenFingerprint } from "./config";
-import { parseInThreadConfigCommand, parseRichToggleCommand, parseTelegramControlCommand } from "./config-commands";
+import {
+	parseInThreadConfigCommand,
+	parseRichToggleCommand,
+	parseTelegramControlCommand,
+	parseToolActivityToggleCommand,
+} from "./config-commands";
 import { daemonPaths, HEARTBEAT_TTL_MS } from "./daemon-paths";
-import { sanitizeDiagnostic } from "./notification-service";
+import {
+	acquireDaemonTransitionLock,
+	type DaemonTransitionLock,
+	daemonTransitionLockIsHeld,
+	exactUnlinkNotificationFile,
+	type NotificationEndpointFile,
+	type NotificationEndpointFileIdentity,
+	type NotificationExactUnlinkResult,
+	readNotificationEndpointFile,
+	releaseDaemonTransitionLock,
+	sanitizeDiagnostic,
+} from "./notification-service";
 import { DAEMON_GENERATION, NOTIFICATION_PROTOCOL_VERSION } from "./telegram-daemon-contract";
+import {
+	type DaemonProcessReference,
+	type TelegramDaemonControlDeps,
+	TelegramDaemonController,
+} from "./telegram-daemon-control";
 import { withTelegramSetupLease } from "./telegram-setup";
 
 export { DAEMON_GENERATION, NOTIFICATION_PROTOCOL_VERSION } from "./telegram-daemon-contract";
@@ -79,9 +101,18 @@ export type EnsureDaemonResult = "owner_spawned" | "attached" | "disabled" | "bl
 /** Detailed result for orchestration that must distinguish a #2028 handoff from a fresh spawn. */
 export type EnsureTelegramDaemonDetailedResult = "spawned" | "reloaded" | "attached" | "disabled" | "blocked_identity";
 
+export type TelegramDaemonOwnershipPhase = "provisional" | "ready" | "retired";
+
 export interface DaemonState {
 	pid: number;
+	/** OS process-start provenance; mandatory for PID-authorized ownership actions. */
+	incarnation: string;
 	ownerId: string;
+	/** Unique, durable identity for one ownership acquisition. */
+	acquisitionId?: string;
+	/** A provisional owner is physical-live but MUST NOT be attached as ready. */
+	ownershipPhase?: TelegramDaemonOwnershipPhase;
+
 	tokenFingerprint: string;
 	chatId: string;
 	startedAt: number;
@@ -95,10 +126,8 @@ export interface DaemonState {
 	version: 1;
 	/**
 	 * Operational daemon generation of the process that owns the lock, distinct
-	 * from the persisted state-schema {@link DaemonState.version}. It records the
-	 * wire generation ({@link DAEMON_GENERATION}) the owning daemon speaks so a
-	 * freshly-upgraded host can detect — and reload — a still-live pre-upgrade
-	 * daemon whose schema version is unchanged. Absent on pre-generation state.
+	 * from both the persisted state-schema {@link DaemonState.version} and the
+	 * notification wire protocol version. Absent on pre-generation state.
 	 */
 	generation?: number;
 	stoppedAt?: number;
@@ -112,9 +141,13 @@ export interface TelegramDaemonFs {
 	open(path: string, flags: string, mode?: number): Promise<{ close(): Promise<void> }>;
 	readdir(path: string): Promise<string[]>;
 	chmod(path: string, mode: number): Promise<void>;
+	stat?(path: string): Promise<{ mtimeMs: number }>;
+	readEndpointFile?(path: string): Promise<NotificationEndpointFile>;
+	exactUnlink?(path: string, identity: NotificationEndpointFileIdentity): Promise<NotificationExactUnlinkResult>;
 }
 
 export interface SpawnResult {
+	pid?: number;
 	unref?: () => void;
 }
 
@@ -123,6 +156,10 @@ export interface TelegramDaemonDeps {
 	now?: () => number;
 	pid?: number;
 	pidAlive?: (pid: number) => boolean;
+	/** Opens an identity-stable process authority for destructive lifecycle operations. */
+	processReference?: (pid: number) => DaemonProcessReference | undefined;
+	/** Returns immutable process-start provenance, or undefined when unsupported. */
+	pidIncarnation?: (pid: number) => string | undefined;
 	spawn?: (
 		command: string,
 		args: string[],
@@ -140,6 +177,8 @@ export interface TelegramDaemonDeps {
 	sendSignal?: (pid: number, signal: NodeJS.Signals) => void;
 	sleep?: (ms: number) => Promise<void>;
 	waitStepMs?: number;
+	/** Bounded startup-readiness timeout; injectable for deterministic handoff tests. */
+	readinessTimeoutMs?: number;
 }
 
 export const HEARTBEAT_INTERVAL_MS = 5_000;
@@ -153,16 +192,22 @@ export const ASK_CONTROLS_CAPABILITY = "ask_controls_v1";
 /** Capability required for tool lifecycle and reasoning-summary frames. */
 export const TOOL_ACTIVITY_CAPABILITY = "tool_activity_v1";
 
-const nodeFs: TelegramDaemonFs = fs.promises as unknown as TelegramDaemonFs;
+const nodeFs: TelegramDaemonFs = {
+	...(fs.promises as unknown as TelegramDaemonFs),
+	readEndpointFile: readNotificationEndpointFile,
+	exactUnlink: async (file, identity) =>
+		exactUnlinkNotificationFile(file, identity, `.gjc-delete-daemon-transition-${crypto.randomUUID()}.json`),
+};
 
 /**
- * Durably persist a `/rich` toggle. A real {@link Settings} exposes
- * `flushOrThrow()`, which rejects on a failed config.yml write (its `set()` is a
- * fire-and-forget whose background save swallows errors). The lightweight daemon
- * settings has no `flushOrThrow` — its `set()` already wrote durably and throws
- * on failure — so its plain `flush()` no-op drain is sufficient.
+ * Durably persist a daemon-local Telegram delivery toggle. A real
+ * {@link Settings} exposes `flushOrThrow()`, which rejects on a failed config.yml
+ * write (its `set()` is a fire-and-forget whose background save swallows errors).
+ * The lightweight daemon settings has no `flushOrThrow` — its `set()` already
+ * wrote durably and throws on failure — so its plain `flush()` no-op drain is
+ * sufficient.
  */
-async function flushRichToggleSettings(settings: Settings): Promise<void> {
+async function flushTelegramToggleSettings(settings: Settings): Promise<void> {
 	if (typeof settings.flushOrThrow === "function") {
 		await settings.flushOrThrow();
 		return;
@@ -421,24 +466,14 @@ async function writeJsonAtomic(fsImpl: TelegramDaemonFs, file: string, data: unk
 	await fsImpl.rename(tmp, file);
 }
 
-async function tryOpenWx(fsImpl: TelegramDaemonFs, file: string): Promise<boolean> {
-	try {
-		const handle = await fsImpl.open(file, "wx", 0o600);
-		await handle.close();
-		return true;
-	} catch (error) {
-		if ((error as NodeJS.ErrnoException).code === "EEXIST") return false;
-		throw error;
-	}
-}
 function validDaemonPid(pid: unknown): pid is number {
 	return typeof pid === "number" && Number.isSafeInteger(pid) && pid > 0;
 }
 
-async function tryCreateOwnershipLock(
+export async function tryCreateOwnershipLock(
 	fsImpl: TelegramDaemonFs,
 	file: string,
-	initialization: { pid: number; startedAt: number },
+	initialization: OwnershipLockMetadata,
 ): Promise<boolean> {
 	try {
 		await fsImpl.writeFile(file, `${JSON.stringify(initialization)}\n`, { mode: 0o600, flag: "wx" });
@@ -450,6 +485,270 @@ async function tryCreateOwnershipLock(
 	}
 }
 
+type OwnershipLockMetadata = {
+	pid: number;
+	incarnation: string;
+	ownerId?: string;
+	acquisitionId?: string;
+	startedAt: number;
+};
+type LegacyOwnershipLockMetadata = {
+	pid: number;
+	incarnation?: string;
+	startedAt: number;
+};
+type OwnershipLockRead =
+	| { kind: "missing" }
+	| { kind: "malformed"; raw: string; mtimeMs?: number }
+	| { kind: "legacy"; metadata: LegacyOwnershipLockMetadata }
+	| { kind: "valid"; metadata: OwnershipLockMetadata };
+
+/** Read lock provenance without treating a corrupt legacy artifact as a filesystem failure. */
+export async function readOwnershipLock(fsImpl: TelegramDaemonFs, file: string): Promise<OwnershipLockRead> {
+	let raw: string;
+	try {
+		raw = await fsImpl.readFile(file, "utf8");
+	} catch (error) {
+		if ((error as NodeJS.ErrnoException).code === "ENOENT") return { kind: "missing" };
+		throw error;
+	}
+	try {
+		const value = JSON.parse(raw) as Partial<OwnershipLockMetadata>;
+		const pid = value.pid;
+		const startedAt = value.startedAt;
+		if (validDaemonPid(pid) && typeof startedAt === "number" && Number.isSafeInteger(startedAt)) {
+			if (isProcessIncarnation(value.incarnation))
+				return {
+					kind: "valid",
+					metadata: {
+						pid,
+						incarnation: value.incarnation,
+						...(typeof value.ownerId === "string" && value.ownerId.length > 0 ? { ownerId: value.ownerId } : {}),
+						...(typeof value.acquisitionId === "string" && value.acquisitionId.length > 0
+							? { acquisitionId: value.acquisitionId }
+							: {}),
+						startedAt,
+					},
+				};
+			return { kind: "legacy", metadata: { pid, startedAt } };
+		}
+	} catch {}
+	const mtimeMs = await fsImpl
+		.stat?.(file)
+		.then(stat => stat.mtimeMs)
+		.catch(() => undefined);
+	return { kind: "malformed", raw, ...(mtimeMs === undefined ? {} : { mtimeMs }) };
+}
+
+/**
+ * A live initializer lock only proves that a concurrent publisher is active.
+ * It never proves a ready daemon: legacy or unavailable provenance remains
+ * blocked, while a canonical mismatch proves PID reuse and can be reclaimed
+ * under the transition lock.
+ */
+export function liveOwnershipLockDecision(input: {
+	lock: OwnershipLockRead;
+	pidAlive: (pid: number) => boolean;
+	pidIncarnation: (pid: number) => string | undefined;
+}):
+	| { acquired: false; attached: false; blocked: true }
+	| { acquired: false; attached: false; provisional: true }
+	| undefined {
+	if (input.lock.kind !== "valid" && input.lock.kind !== "legacy") return undefined;
+	if (!input.pidAlive(input.lock.metadata.pid)) return undefined;
+	if (input.lock.kind === "legacy") {
+		if (!isProcessIncarnation(input.lock.metadata.incarnation))
+			return { acquired: false, attached: false, blocked: true };
+		const current = input.pidIncarnation(input.lock.metadata.pid);
+		if (!isProcessIncarnation(current)) return { acquired: false, attached: false, blocked: true };
+		if (current !== input.lock.metadata.incarnation) return undefined;
+		return { acquired: false, attached: false, blocked: true };
+	}
+	const current = input.pidIncarnation(input.lock.metadata.pid);
+	if (!isProcessIncarnation(current)) return { acquired: false, attached: false, blocked: true };
+	if (current !== input.lock.metadata.incarnation) return undefined;
+	return { acquired: false, attached: false, provisional: true };
+}
+
+function ownershipLockMatches(left: OwnershipLockRead, right: OwnershipLockRead): boolean {
+	if (left.kind !== right.kind) return false;
+	if (left.kind === "missing") return true;
+	if (left.kind === "malformed" && right.kind === "malformed")
+		return left.raw === right.raw && left.mtimeMs !== undefined && left.mtimeMs === right.mtimeMs;
+	if ((left.kind !== "valid" && left.kind !== "legacy") || (right.kind !== "valid" && right.kind !== "legacy"))
+		return false;
+	return JSON.stringify(left.metadata) === JSON.stringify(right.metadata);
+}
+
+function ownershipLockMatchesState(lock: OwnershipLockRead, state: DaemonState | undefined): boolean {
+	return Boolean(
+		lock.kind === "valid" &&
+			state &&
+			lock.metadata.ownerId === state.ownerId &&
+			lock.metadata.acquisitionId === state.acquisitionId &&
+			lock.metadata.pid === state.pid &&
+			lock.metadata.incarnation === state.incarnation,
+	);
+}
+
+function ownershipLockMatchesStoppedState(lock: OwnershipLockRead, state: DaemonState | undefined): boolean {
+	return Boolean(state && isExplicitlyStoppedDaemonState(state) && ownershipLockMatchesState(lock, state));
+}
+
+async function transitionLockIsHeldByCaller(input: {
+	fs: TelegramDaemonFs;
+	path: string;
+	lock: DaemonTransitionLock;
+}): Promise<boolean> {
+	return await daemonTransitionLockIsHeld(input);
+}
+
+function ownershipLockMatchesMetadata(lock: OwnershipLockRead, metadata: OwnershipLockMetadata): boolean {
+	return lock.kind === "valid" && JSON.stringify(lock.metadata) === JSON.stringify(metadata);
+}
+
+/**
+ * Replace an acquisition's lease only after proving the old lease is unchanged.
+ * The transition fence serializes lifecycle writers; the exact read-back prevents
+ * a stale binder from overwriting a newer owner if that fence is lost.
+ */
+async function rebindOwnershipLock(input: {
+	fs: TelegramDaemonFs;
+	path: string;
+	transitionPath: string;
+	transition: DaemonTransitionLock;
+	expected: OwnershipLockMetadata;
+	rebound: OwnershipLockMetadata;
+}): Promise<boolean> {
+	if (!(await transitionLockIsHeldByCaller({ fs: input.fs, path: input.transitionPath, lock: input.transition })))
+		return false;
+	if (!ownershipLockMatchesMetadata(await readOwnershipLock(input.fs, input.path), input.expected)) return false;
+	if (!(await transitionLockIsHeldByCaller({ fs: input.fs, path: input.transitionPath, lock: input.transition })))
+		return false;
+	try {
+		await writeJsonAtomic(input.fs, input.path, input.rebound);
+	} catch {
+		return false;
+	}
+	return (
+		(await transitionLockIsHeldByCaller({ fs: input.fs, path: input.transitionPath, lock: input.transition })) &&
+		ownershipLockMatchesMetadata(await readOwnershipLock(input.fs, input.path), input.rebound)
+	);
+}
+
+/** Restore the launcher lease only when the failed binder still owns the child lease. */
+async function rollbackOwnershipLockRebind(input: {
+	fs: TelegramDaemonFs;
+	path: string;
+	transitionPath: string;
+	transition: DaemonTransitionLock;
+	previous: OwnershipLockMetadata;
+	rebound: OwnershipLockMetadata;
+}): Promise<boolean> {
+	if (!(await transitionLockIsHeldByCaller({ fs: input.fs, path: input.transitionPath, lock: input.transition })))
+		return false;
+	if (!ownershipLockMatchesMetadata(await readOwnershipLock(input.fs, input.path), input.rebound)) return false;
+	if (!(await transitionLockIsHeldByCaller({ fs: input.fs, path: input.transitionPath, lock: input.transition })))
+		return false;
+	try {
+		await writeJsonAtomic(input.fs, input.path, input.previous);
+	} catch {
+		return false;
+	}
+	return (
+		(await transitionLockIsHeldByCaller({ fs: input.fs, path: input.transitionPath, lock: input.transition })) &&
+		ownershipLockMatchesMetadata(await readOwnershipLock(input.fs, input.path), input.previous)
+	);
+}
+
+async function ownershipLockIsReclaimable(input: {
+	fs: TelegramDaemonFs;
+	path: string;
+	lock: OwnershipLockRead;
+	now: number;
+	pidAlive: (pid: number) => boolean;
+	pidIncarnation: (pid: number) => string | undefined;
+}): Promise<boolean> {
+	if (input.lock.kind === "missing") return true;
+	if (input.lock.kind === "malformed") {
+		if (!input.fs.stat) return false;
+		const stat = await input.fs.stat(input.path).catch(() => undefined);
+		return stat !== undefined && input.now - stat.mtimeMs > HEARTBEAT_TTL_MS;
+	}
+	if (!input.pidAlive(input.lock.metadata.pid)) return true;
+	const current = input.pidIncarnation(input.lock.metadata.pid);
+	return (
+		isProcessIncarnation(input.lock.metadata.incarnation) &&
+		isProcessIncarnation(current) &&
+		current !== input.lock.metadata.incarnation
+	);
+}
+
+interface NotificationRootRegistration {
+	root?: string;
+	managed?: boolean;
+}
+
+async function readNotificationRootRegistration(input: {
+	settings: Settings;
+	sessionId: string;
+	fs?: TelegramDaemonFs;
+}): Promise<NotificationRootRegistration> {
+	const fsImpl = input.fs ?? nodeFs;
+	const current = await readJson<{ sessions?: Record<string, string>; managedRoots?: string[] }>(
+		fsImpl,
+		daemonPaths(input.settings.getAgentDir()).roots,
+	);
+	const root = current?.sessions?.[input.sessionId];
+	return { root, managed: root !== undefined && current?.managedRoots?.includes(root) === true };
+}
+
+/** Restore a session root only if this ensure operation still owns its registration. */
+async function restoreNotificationRootRegistration(input: {
+	settings: Settings;
+	sessionId: string;
+	registeredRoot: string;
+	previous: NotificationRootRegistration;
+	fs?: TelegramDaemonFs;
+}): Promise<void> {
+	const fsImpl = input.fs ?? nodeFs;
+	const paths = daemonPaths(input.settings.getAgentDir());
+	await ensureDir(fsImpl, paths.dir);
+	await withFileLock(
+		paths.roots,
+		async () => {
+			const current =
+				(await readJson<{ roots?: string[]; managedRoots?: string[]; sessions?: Record<string, string> }>(
+					fsImpl,
+					paths.roots,
+				)) ?? {};
+			const sessions = { ...(current.sessions ?? {}) };
+			if (sessions[input.sessionId] !== input.registeredRoot) return;
+			if (input.previous.root) sessions[input.sessionId] = input.previous.root;
+			else delete sessions[input.sessionId];
+			const referencedRoots = new Set(Object.values(sessions));
+			const roots = new Set(current.roots ?? []);
+			const managedRoots = new Set(current.managedRoots ?? []);
+			if (input.previous.root) {
+				roots.add(input.previous.root);
+				if (input.previous.managed) managedRoots.add(input.previous.root);
+				else managedRoots.delete(input.previous.root);
+			}
+			if (managedRoots.has(input.registeredRoot) && !referencedRoots.has(input.registeredRoot)) {
+				roots.delete(input.registeredRoot);
+				managedRoots.delete(input.registeredRoot);
+			}
+			await writeJsonAtomic(fsImpl, paths.roots, {
+				version: 1,
+				roots: Array.from(roots).sort(),
+				managedRoots: Array.from(managedRoots).sort(),
+				sessions,
+			});
+		},
+		{ staleMs: 10_000 },
+	);
+}
+
 export async function registerNotificationRoot(input: {
 	settings: Settings;
 	cwd: string;
@@ -464,13 +763,32 @@ export async function registerNotificationRoot(input: {
 		paths.roots,
 		async () => {
 			const current =
-				(await readJson<{ roots?: string[]; sessions?: Record<string, string> }>(fsImpl, paths.roots)) ?? {};
+				(await readJson<{ roots?: string[]; managedRoots?: string[]; sessions?: Record<string, string> }>(
+					fsImpl,
+					paths.roots,
+				)) ?? {};
 			const roots = new Set(current.roots ?? []);
+			const managedRoots = new Set(current.managedRoots ?? []);
+			const sessions = { ...(current.sessions ?? {}) };
+			const previousRoot = sessions[input.sessionId];
+			const rootAlreadyPresent = roots.has(root);
 			roots.add(root);
+			// Roots present before session registration are legacy/unmanaged and must
+			// survive a later session rollback or unregister.
+			if (!rootAlreadyPresent) managedRoots.add(root);
+			sessions[input.sessionId] = root;
+			if (previousRoot && previousRoot !== root && managedRoots.has(previousRoot)) {
+				const previousStillReferenced = Object.values(sessions).includes(previousRoot);
+				if (!previousStillReferenced) {
+					roots.delete(previousRoot);
+					managedRoots.delete(previousRoot);
+				}
+			}
 			await writeJsonAtomic(fsImpl, paths.roots, {
 				version: 1,
 				roots: Array.from(roots).sort(),
-				sessions: { ...(current.sessions ?? {}), [input.sessionId]: root },
+				managedRoots: Array.from(managedRoots).sort(),
+				sessions,
 			});
 		},
 		{ staleMs: 10_000 },
@@ -498,16 +816,31 @@ export async function unregisterNotificationRoot(input: {
 	await withFileLock(
 		paths.roots,
 		async () => {
-			const current = await readJson<{ roots?: string[]; sessions?: Record<string, string> }>(fsImpl, paths.roots);
+			const current = await readJson<{
+				roots?: string[];
+				managedRoots?: string[];
+				sessions?: Record<string, string>;
+			}>(fsImpl, paths.roots);
 			if (!current) return;
 			const sessions = { ...(current.sessions ?? {}) };
+			// A stale cleanup from a previous registration must not remove a newer
+			// registration for the same session under a different root.
+			if (sessions[input.sessionId] !== root) {
+				remainingRoots = (current.roots ?? []).length;
+				return;
+			}
 			delete sessions[input.sessionId];
 			const rootStillReferenced = Object.values(sessions).includes(root);
-			const roots = (current.roots ?? []).filter(candidate => candidate !== root || rootStillReferenced);
+			const managedRoots = new Set(current.managedRoots ?? []);
+			const roots = (current.roots ?? []).filter(
+				candidate => candidate !== root || rootStillReferenced || !managedRoots.has(root),
+			);
+			if (!rootStillReferenced) managedRoots.delete(root);
 			remainingRoots = roots.length;
 			await writeJsonAtomic(fsImpl, paths.roots, {
 				version: 1,
 				roots: Array.from(new Set(roots)).sort(),
+				managedRoots: Array.from(managedRoots).sort(),
 				sessions,
 			});
 		},
@@ -524,24 +857,212 @@ function validBotToken(token: unknown): token is string {
 	return typeof token === "string" && token.length > 0;
 }
 
-function ownerIdentityMatches(state: DaemonState, tokenFingerprint: string, chatId: string): boolean {
+function isExplicitlyStoppedDaemonState(state: unknown): state is DaemonState {
+	return Boolean(
+		hasSafeDaemonStateShape(state) &&
+			state.stoppedAt !== undefined &&
+			typeof state.acquisitionId === "string" &&
+			state.acquisitionId.length > 0,
+	);
+}
+
+function ownerIdentityMatches(
+	state: Pick<DaemonState, "tokenFingerprint" | "chatId">,
+	tokenFingerprint: string,
+	chatId: string,
+): boolean {
 	return state.tokenFingerprint === tokenFingerprint && state.chatId === chatId;
 }
 
-function liveOwnerUsesDifferentIdentity(input: {
+function ownerProvenanceMatches(state: DaemonState, pidIncarnation?: (pid: number) => string | undefined): boolean {
+	const current = (pidIncarnation ?? defaultPidIncarnation)(state.pid);
+	return isProcessIncarnation(state.incarnation) && isProcessIncarnation(current) && current === state.incarnation;
+}
+
+export function hasSafeDaemonStateShape(state: unknown): state is DaemonState {
+	if (!state || typeof state !== "object" || Array.isArray(state)) return false;
+	const candidate = state as Partial<DaemonState>;
+	return Boolean(
+		Number.isSafeInteger(candidate.pid) &&
+			(candidate.pid as number) > 0 &&
+			typeof candidate.ownerId === "string" &&
+			candidate.ownerId.length > 0 &&
+			(candidate.acquisitionId === undefined ||
+				(typeof candidate.acquisitionId === "string" && candidate.acquisitionId.length > 0)) &&
+			(candidate.ownershipPhase === undefined ||
+				candidate.ownershipPhase === "provisional" ||
+				candidate.ownershipPhase === "ready" ||
+				candidate.ownershipPhase === "retired") &&
+			typeof candidate.tokenFingerprint === "string" &&
+			typeof candidate.chatId === "string" &&
+			Number.isSafeInteger(candidate.startedAt) &&
+			Number.isSafeInteger(candidate.heartbeatAt) &&
+			isProcessIncarnation(candidate.incarnation) &&
+			(candidate.launcherPid === undefined ||
+				(Number.isSafeInteger(candidate.launcherPid) && (candidate.launcherPid as number) > 0)) &&
+			Array.isArray(candidate.roots) &&
+			candidate.roots.every(root => typeof root === "string") &&
+			candidate.version === DAEMON_VERSION &&
+			(candidate.generation === undefined ||
+				(Number.isSafeInteger(candidate.generation) && (candidate.generation as number) > 0)) &&
+			(candidate.stoppedAt === undefined || Number.isSafeInteger(candidate.stoppedAt)),
+	);
+}
+
+type LegacyParentDaemonState = Omit<DaemonState, "incarnation" | "acquisitionId" | "ownershipPhase" | "generation"> & {
+	incarnation?: undefined;
+	acquisitionId?: undefined;
+	ownershipPhase?: undefined;
+	generation?: undefined;
+};
+
+interface LegacyMigrationAttestation {
+	pid: number;
+	incarnation: string;
+	heartbeatAt: number;
+	observedAt: number;
+}
+
+function isLegacyParentDaemonState(state: unknown): state is LegacyParentDaemonState {
+	const candidate = state as Partial<LegacyParentDaemonState> | undefined;
+	return Boolean(
+		candidate &&
+			Number.isSafeInteger(candidate.pid) &&
+			(candidate.pid ?? 0) > 0 &&
+			typeof candidate.ownerId === "string" &&
+			candidate.ownerId.length > 0 &&
+			typeof candidate.tokenFingerprint === "string" &&
+			typeof candidate.chatId === "string" &&
+			Number.isSafeInteger(candidate.startedAt) &&
+			Number.isSafeInteger(candidate.heartbeatAt) &&
+			Array.isArray(candidate.roots) &&
+			candidate.roots.every(root => typeof root === "string") &&
+			candidate.version === DAEMON_VERSION &&
+			candidate.incarnation === undefined &&
+			candidate.acquisitionId === undefined &&
+			candidate.ownershipPhase === undefined &&
+			candidate.generation === undefined &&
+			candidate.stoppedAt === undefined,
+	);
+}
+
+function legacyMigrationAttestationPath(statePath: string): string {
+	return `${statePath}.legacy-migration.json`;
+}
+
+async function legacyParentHandoffDecision(input: {
+	fs: TelegramDaemonFs;
+	statePath: string;
+	state: LegacyParentDaemonState;
+	now: number;
+	pidAlive: (pid: number) => boolean;
+	pidIncarnation: (pid: number) => string | undefined;
+	tokenFingerprint: string;
+	chatId: string;
+}): Promise<
+	{ acquired: false; attached: false; provisional?: boolean; reloadRequired?: boolean; blocked?: boolean } | undefined
+> {
+	const { state } = input;
+	if (!input.pidAlive(state.pid)) return undefined;
+	if (!ownerIdentityMatches(state, input.tokenFingerprint, input.chatId))
+		return { acquired: false, attached: false, blocked: true };
+	const incarnation = input.pidIncarnation(state.pid);
+	if (!isProcessIncarnation(incarnation)) return { acquired: false, attached: false, blocked: true };
+	const attestationPath = legacyMigrationAttestationPath(input.statePath);
+	const previous = await readJson<LegacyMigrationAttestation>(input.fs, attestationPath);
+	const attested = Boolean(
+		previous &&
+			Number.isSafeInteger(previous.pid) &&
+			isProcessIncarnation(previous.incarnation) &&
+			Number.isSafeInteger(previous.heartbeatAt) &&
+			Number.isSafeInteger(previous.observedAt) &&
+			previous.pid === state.pid &&
+			previous.incarnation === incarnation &&
+			state.heartbeatAt > previous.heartbeatAt &&
+			input.now - previous.observedAt <= HEARTBEAT_TTL_MS,
+	);
+	await writeJsonAtomic(input.fs, attestationPath, {
+		pid: state.pid,
+		incarnation,
+		heartbeatAt: state.heartbeatAt,
+		observedAt: input.now,
+	} satisfies LegacyMigrationAttestation);
+	return attested
+		? { acquired: false, attached: false, reloadRequired: true }
+		: { acquired: false, attached: false, provisional: true };
+}
+
+function isRecognizedLegacyGeneration(generation: number | undefined): boolean {
+	return (
+		generation === undefined || (Number.isSafeInteger(generation) && generation > 0 && generation < DAEMON_GENERATION)
+	);
+}
+
+/**
+ * Classifies a physically live daemon record before any replacement action.
+ *
+ * A canonical, differing incarnation is the only authoritative proof that a
+ * live PID is no longer the recorded owner. This applies equally to matching
+ * and foreign Telegram identities: identity never substitutes for provenance.
+ */
+function classifyForeignLiveOwner(input: {
+	state: unknown;
+	tokenFingerprint: string;
+	chatId: string;
+	pidAlive: (pid: number) => boolean;
+	pidIncarnation?: (pid: number) => string | undefined;
+}): "identity_mismatch" | "ambiguous" | undefined {
+	const state = input.state as Partial<DaemonState> | undefined;
+	// Validate before probing so malformed PIDs never reach the liveness source.
+	if (!state || !validDaemonPid(state.pid) || !input.pidAlive(state.pid)) return undefined;
+	// A stopped tombstone with a canonical acquisition is not a live owner.
+	if (isExplicitlyStoppedDaemonState(state) || isLegacyParentDaemonState(state)) return undefined;
+	const currentIncarnation = input.pidIncarnation?.(state.pid) ?? defaultPidIncarnation(state.pid);
+	if (
+		!hasSafeDaemonStateShape(state) ||
+		!isProcessIncarnation(state.incarnation) ||
+		!isProcessIncarnation(currentIncarnation)
+	)
+		return "ambiguous";
+	if (currentIncarnation !== state.incarnation) return undefined;
+	return ownerIdentityMatches(state, input.tokenFingerprint, input.chatId) ? undefined : "identity_mismatch";
+}
+
+/** True for a physically live owner with this configuration, including legacy generations. */
+export function isPhysicalMatchingOwner(input: {
 	state: DaemonState | undefined;
 	tokenFingerprint: string;
 	chatId: string;
 	pidAlive: (pid: number) => boolean;
+	pidIncarnation?: (pid: number) => string | undefined;
 }): boolean {
 	const { state } = input;
 	return Boolean(
 		state &&
-			state.version === DAEMON_VERSION &&
+			hasSafeDaemonStateShape(state) &&
 			state.stoppedAt === undefined &&
-			!ownerIdentityMatches(state, input.tokenFingerprint, input.chatId) &&
-			validDaemonPid(state.pid) &&
-			input.pidAlive(state.pid),
+			ownerIdentityMatches(state, input.tokenFingerprint, input.chatId) &&
+			input.pidAlive(state.pid) &&
+			ownerProvenanceMatches(state, input.pidIncarnation),
+	);
+}
+
+/** True only for a signalable legacy owner or this generation's ready bound child. */
+export function isSignalableMatchingOwner(input: {
+	state: DaemonState | undefined;
+	tokenFingerprint: string;
+	chatId: string;
+	pidAlive: (pid: number) => boolean;
+	pidIncarnation?: (pid: number) => string | undefined;
+}): boolean {
+	const { state } = input;
+	return Boolean(
+		isPhysicalMatchingOwner(input) &&
+			(isRecognizedLegacyGeneration(state?.generation) ||
+				(state?.generation === DAEMON_GENERATION &&
+					state.ownershipPhase === "ready" &&
+					typeof state.acquisitionId === "string" &&
+					state.acquisitionId.length > 0)),
 	);
 }
 
@@ -551,16 +1072,37 @@ export function isFreshLiveOwner(input: {
 	tokenFingerprint: string;
 	chatId: string;
 	pidAlive: (pid: number) => boolean;
+	pidIncarnation?: (pid: number) => string | undefined;
 }): boolean {
 	const { state } = input;
 	return Boolean(
 		state &&
-			state.version === DAEMON_VERSION &&
+			hasSafeDaemonStateShape(state) &&
 			state.stoppedAt === undefined &&
 			ownerIdentityMatches(state, input.tokenFingerprint, input.chatId) &&
 			input.now - state.heartbeatAt <= HEARTBEAT_TTL_MS &&
-			validDaemonPid(state.pid) &&
-			input.pidAlive(state.pid),
+			input.pidAlive(state.pid) &&
+			ownerProvenanceMatches(state, input.pidIncarnation),
+	);
+}
+
+/** True only when a physically live matching owner can serve this build's daemon lifecycle contract. */
+export function isCurrentCompatibleOwner(input: {
+	state: DaemonState | undefined;
+	now: number;
+	tokenFingerprint: string;
+	chatId: string;
+	pidAlive: (pid: number) => boolean;
+	pidIncarnation?: (pid: number) => string | undefined;
+}): boolean {
+	const state = input.state;
+	return Boolean(
+		isFreshLiveOwner(input) &&
+			state?.ownershipPhase === "ready" &&
+			typeof state.acquisitionId === "string" &&
+			state.acquisitionId.length > 0 &&
+			Number.isSafeInteger(state.generation) &&
+			(state.generation as number) >= DAEMON_GENERATION,
 	);
 }
 
@@ -573,6 +1115,7 @@ export async function acquireDaemonOwnership(input: {
 	now?: () => number;
 	pid?: number;
 	pidAlive?: (pid: number) => boolean;
+	pidIncarnation?: (pid: number) => string | undefined;
 	randomId?: () => string;
 	/** Permit one Windows source launcher PID to daemon PID handoff. */
 	allowPidRebind?: boolean;
@@ -581,8 +1124,10 @@ export async function acquireDaemonOwnership(input: {
 }): Promise<{
 	acquired: boolean;
 	ownerId?: string;
+	acquisitionId?: string;
 	attached?: boolean;
 	blocked?: boolean;
+	provisional?: boolean;
 	reason?: "identity_mismatch";
 	reloadRequired?: boolean;
 }> {
@@ -591,190 +1136,672 @@ export async function acquireDaemonOwnership(input: {
 	const pid = input.pid ?? process.pid;
 	if (!validDaemonPid(pid)) return { acquired: false, attached: true };
 	const pidAlive = input.pidAlive ?? defaultPidAlive;
+	const pidIncarnation = input.pidIncarnation ?? defaultPidIncarnation;
+	const incarnation = pidIncarnation(pid);
+	if (!isProcessIncarnation(incarnation)) return { acquired: false, attached: false, provisional: true };
 	const paths = daemonPaths(input.settings.getAgentDir());
 	await ensureDir(fsImpl, paths.dir);
 	const ownerId =
 		input.ownerId ?? input.randomId?.() ?? `${pid}-${now().toString(36)}-${Math.random().toString(36).slice(2)}`;
 	const roots = input.roots ?? (await readJson<{ roots?: string[] }>(fsImpl, paths.roots))?.roots ?? [];
-	return withFileLock(paths.ownership, async () => {
-		const lockIsPositivelyStale = async (): Promise<boolean> => {
-			let initialization: { pid?: unknown; startedAt?: unknown } | undefined;
-			try {
-				initialization = await readJson<{ pid?: unknown; startedAt?: unknown }>(fsImpl, paths.lock);
-			} catch {
-				// Legacy daemons wrote an empty lock file. With no live state to
-				// identify an owner, malformed metadata must not wedge startup.
-				return true;
-			}
-			if (!initialization) return true;
+
+	// A fresh, identity-matching live owner running an OLDER generation than this
+	// build cannot serve our newer wire frames; signal a reload instead of a
+	// silent attach. Newer/equal generations attach as before (no downgrade).
+	const attachDecision = (
+		state: DaemonState | undefined,
+	):
+		| { acquired: false; attached: boolean; blocked?: boolean; provisional?: boolean; reloadRequired?: boolean }
+		| undefined => {
+		if (state && !hasSafeDaemonStateShape(state)) {
+			const malformed = state as Partial<DaemonState>;
 			if (
-				!validDaemonPid(initialization.pid) ||
-				typeof initialization.startedAt !== "number" ||
-				!Number.isFinite(initialization.startedAt)
+				!isExplicitlyStoppedDaemonState(malformed) &&
+				validDaemonPid(malformed.pid) &&
+				typeof malformed.incarnation === "string" &&
+				pidAlive(malformed.pid)
 			)
-				return true;
-			return now() - initialization.startedAt > HEARTBEAT_TTL_MS && !pidAlive(initialization.pid);
-		};
-		const ownershipIsPositivelyStale = async (state: DaemonState | undefined): Promise<boolean> => {
-			if (state?.stoppedAt !== undefined) return true;
-			if (state && validDaemonPid(state.pid)) return !pidAlive(state.pid);
-			return await lockIsPositivelyStale();
-		};
-		const writeState = async (): Promise<void> => {
-			const timestamp = now();
-			await writeJsonAtomic(fsImpl, paths.state, {
-				pid,
-				ownerId,
+				return { acquired: false, attached: false, blocked: true };
+			return undefined;
+		}
+		if (!state || state.stoppedAt !== undefined || !ownerIdentityMatches(state, input.tokenFingerprint, input.chatId))
+			return undefined;
+		// Unavailable provenance is ambiguous and must remain fail-closed. A
+		// different authoritative incarnation proves PID reuse, so allow only the
+		// transition-locked path below to reclaim the stale owner artifacts.
+		if (pidAlive(state.pid)) {
+			const currentIncarnation = pidIncarnation(state.pid);
+			if (!isProcessIncarnation(currentIncarnation) || !isProcessIncarnation(state.incarnation))
+				return { acquired: false, attached: false, blocked: true };
+			if (currentIncarnation !== state.incarnation) return undefined;
+		}
+		if (!pidAlive(state.pid)) return undefined;
+		if (
+			isCurrentCompatibleOwner({
+				state,
+				now: now(),
 				tokenFingerprint: input.tokenFingerprint,
 				chatId: input.chatId,
-				startedAt: timestamp,
-				heartbeatAt: timestamp,
-				roots,
-				version: DAEMON_VERSION,
-				generation: DAEMON_GENERATION,
-				...(input.allowPidRebind ? { launcherPid: pid } : {}),
-			} satisfies DaemonState);
-		};
-		const attachDecision = (
-			state: DaemonState | undefined,
-		): { acquired: false; attached: boolean; reloadRequired?: boolean } | undefined => {
-			if (
-				!isFreshLiveOwner({
-					state,
-					now: now(),
-					tokenFingerprint: input.tokenFingerprint,
-					chatId: input.chatId,
-					pidAlive,
-				})
-			) {
-				return undefined;
-			}
-			return (state?.generation ?? 0) < DAEMON_GENERATION
-				? { acquired: false, attached: false, reloadRequired: true }
-				: { acquired: false, attached: true };
-		};
-		const rejectLiveDifferentIdentity = (state: DaemonState | undefined) =>
-			liveOwnerUsesDifferentIdentity({
+				pidAlive,
+				pidIncarnation,
+			})
+		)
+			return { acquired: false, attached: true };
+		// A physical owner that cannot prove current compatibility is never safe to
+		// attach. Legacy, stale, and malformed generations require a handoff;
+		// otherwise retain the explicit provisional classification.
+		if (
+			state.version !== DAEMON_VERSION ||
+			!isFreshLiveOwner({
 				state,
+				now: now(),
 				tokenFingerprint: input.tokenFingerprint,
 				chatId: input.chatId,
 				pidAlive,
+				pidIncarnation,
+			}) ||
+			isRecognizedLegacyGeneration(state.generation)
+		)
+			return { acquired: false, attached: false, reloadRequired: true };
+		return { acquired: false, attached: false, provisional: true };
+	};
+	const existing = await readJson<DaemonState>(fsImpl, paths.state);
+	const foreignOwner = classifyForeignLiveOwner({
+		state: existing,
+		tokenFingerprint: input.tokenFingerprint,
+		chatId: input.chatId,
+		pidAlive,
+		pidIncarnation,
+	});
+	if (foreignOwner) {
+		return foreignOwner === "identity_mismatch"
+			? { acquired: false, attached: false, blocked: true, reason: "identity_mismatch" }
+			: { acquired: false, attached: false, blocked: true };
+	}
+
+	const transition = await acquireTransitionLock({ fs: fsImpl, path: paths.steal, pidAlive, pidIncarnation });
+	if (!transition) return { acquired: false, attached: false, provisional: true };
+	try {
+		const rechecked = await readJson<DaemonState>(fsImpl, paths.state);
+		const recheckedLock = await readOwnershipLock(fsImpl, paths.lock);
+		const recheckedDecision = isLegacyParentDaemonState(rechecked) ? undefined : attachDecision(rechecked);
+		if (
+			recheckedDecision &&
+			(recheckedDecision.attached ||
+				recheckedDecision.blocked ||
+				recheckedLock.kind === "missing" ||
+				ownershipLockMatchesState(recheckedLock, rechecked))
+		)
+			return recheckedDecision;
+		// A stopped tombstone authorizes removal only of its own canonical lock.
+		// A newer initializer may have replaced the pathname while that tombstone
+		// remained, and must receive the same liveness/freshness protection as any
+		// other live reservation.
+		const stoppedLockMatches = ownershipLockMatchesStoppedState(recheckedLock, rechecked);
+		const lockDecision = stoppedLockMatches
+			? undefined
+			: liveOwnershipLockDecision({ lock: recheckedLock, pidAlive, pidIncarnation });
+		if (lockDecision) return lockDecision;
+		if (
+			!stoppedLockMatches &&
+			!(await ownershipLockIsReclaimable({
+				fs: fsImpl,
+				path: paths.lock,
+				lock: recheckedLock,
+				now: now(),
+				pidAlive,
+				pidIncarnation,
+			}))
+		)
+			return { acquired: false, attached: false, provisional: true };
+		if (isLegacyParentDaemonState(rechecked)) {
+			const legacyDecision = await legacyParentHandoffDecision({
+				fs: fsImpl,
+				statePath: paths.state,
+				state: rechecked,
+				now: now(),
+				pidAlive,
+				pidIncarnation,
+				tokenFingerprint: input.tokenFingerprint,
+				chatId: input.chatId,
 			});
-		const existing = await readJson<DaemonState>(fsImpl, paths.state);
-		if (rejectLiveDifferentIdentity(existing)) {
-			return { acquired: false, blocked: true, reason: "identity_mismatch" } as const;
+			if (legacyDecision) return legacyDecision;
+		} else if (recheckedDecision) {
+			return recheckedDecision;
 		}
-		const existingDecision = attachDecision(existing);
-		if (existingDecision) return existingDecision;
-		const createdAt = now();
-		if (await tryCreateOwnershipLock(fsImpl, paths.lock, { pid, startedAt: createdAt })) {
-			await writeState();
-			return { acquired: true, ownerId };
+		const recheckedForeignOwner = classifyForeignLiveOwner({
+			state: rechecked,
+			tokenFingerprint: input.tokenFingerprint,
+			chatId: input.chatId,
+			pidAlive,
+			pidIncarnation,
+		});
+		if (recheckedForeignOwner) {
+			return recheckedForeignOwner === "identity_mismatch"
+				? { acquired: false, attached: false, blocked: true, reason: "identity_mismatch" }
+				: { acquired: false, attached: false, blocked: true };
 		}
-		const afterLock = await readJson<DaemonState>(fsImpl, paths.state);
-		if (rejectLiveDifferentIdentity(afterLock)) {
-			return { acquired: false, blocked: true, reason: "identity_mismatch" } as const;
+		if (
+			hasSafeDaemonStateShape(rechecked) &&
+			rechecked.stoppedAt === undefined &&
+			pidAlive(rechecked.pid) &&
+			ownerProvenanceMatches(rechecked, pidIncarnation)
+		)
+			return { acquired: false, attached: false, provisional: true };
+		const currentLock = await readOwnershipLock(fsImpl, paths.lock);
+		if (!ownershipLockMatches(recheckedLock, currentLock))
+			return { acquired: false, attached: false, provisional: true };
+		if (currentLock.kind !== "missing") {
+			if (!(await transitionLockIsHeldByCaller({ fs: fsImpl, path: paths.steal, lock: transition })))
+				return { acquired: false, attached: false, provisional: true };
+			await fsImpl.unlink(paths.lock);
 		}
-		const afterLockDecision = attachDecision(afterLock);
-		if (afterLockDecision) return afterLockDecision;
-		if (!afterLock && !(await lockIsPositivelyStale())) return { acquired: false, attached: true };
-		if (!(await tryOpenWx(fsImpl, paths.steal))) return { acquired: false, attached: true };
+		const ownershipLock: OwnershipLockMetadata = {
+			pid,
+			incarnation,
+			ownerId,
+			acquisitionId: ownerId,
+			startedAt: now(),
+		};
+		if (!(await transitionLockIsHeldByCaller({ fs: fsImpl, path: paths.steal, lock: transition })))
+			return { acquired: false, attached: false, provisional: true };
+		if (!(await tryCreateOwnershipLock(fsImpl, paths.lock, ownershipLock)))
+			return { acquired: false, attached: false, provisional: true };
+		if (
+			!(await transitionLockIsHeldByCaller({ fs: fsImpl, path: paths.steal, lock: transition })) ||
+			!ownershipLockMatchesMetadata(await readOwnershipLock(fsImpl, paths.lock), ownershipLock)
+		)
+			return { acquired: false, attached: false, provisional: true };
+		await writeJsonAtomic(fsImpl, paths.state, {
+			pid,
+			incarnation,
+			ownerId,
+			acquisitionId: ownerId,
+			ownershipPhase: "provisional",
+			tokenFingerprint: input.tokenFingerprint,
+			chatId: input.chatId,
+			startedAt: now(),
+			heartbeatAt: now(),
+			roots,
+			version: DAEMON_VERSION,
+			generation: DAEMON_GENERATION,
+		} satisfies DaemonState);
+		if (
+			!(await transitionLockIsHeldByCaller({ fs: fsImpl, path: paths.steal, lock: transition })) ||
+			!ownershipLockMatchesMetadata(await readOwnershipLock(fsImpl, paths.lock), ownershipLock)
+		)
+			return { acquired: false, attached: false, provisional: true };
+		return { acquired: true, ownerId, acquisitionId: ownerId };
+	} finally {
+		await releaseDaemonTransitionLock({ fs: fsImpl, path: paths.steal, lock: transition });
+	}
+}
+
+export async function renewDaemonHeartbeat(input: {
+	settings: Settings;
+	ownerId: string;
+	acquisitionId?: string;
+	tokenFingerprint?: string;
+	chatId?: string;
+	fs?: TelegramDaemonFs;
+	now?: () => number;
+	pid?: number;
+	generation?: number;
+	pidIncarnation?: (pid: number) => string | undefined;
+	sleep?: (ms: number) => Promise<void>;
+	stealRetries?: number;
+	stealRetryDelayMs?: number;
+}): Promise<boolean> {
+	const fsImpl = input.fs ?? nodeFs;
+	const paths = daemonPaths(input.settings.getAgentDir());
+	const acquisitionId = input.acquisitionId ?? input.ownerId;
+	// The steal lock is held only briefly by concurrent lifecycle operations.
+	// A contended lock never proves readiness: only the holder may validate and
+	// publish the exact ready PID/generation state.
+	const transition = await acquireTransitionLock({
+		fs: fsImpl,
+		path: paths.steal,
+		pidIncarnation: input.pidIncarnation,
+		sleep: input.sleep,
+		retries: input.stealRetries,
+		retryDelayMs: input.stealRetryDelayMs,
+	});
+	if (!transition) return false;
+	try {
+		const state = await readJson<DaemonState>(fsImpl, paths.state);
+		const pid = input.pid ?? state?.pid;
+		const generation = input.generation ?? state?.generation;
+		const incarnation = (input.pidIncarnation ?? defaultPidIncarnation)(pid ?? 0);
+		// A daemon child may atomically bind its own PID only while its launcher
+		// reservation is still provisional and carries the same acquisition secret.
+		const canBindProvisionalPid =
+			state?.ownershipPhase === "provisional" &&
+			state.pid !== pid &&
+			state.ownerId === input.ownerId &&
+			state.acquisitionId === acquisitionId;
+		if (
+			!state ||
+			!hasSafeDaemonStateShape(state) ||
+			typeof pid !== "number" ||
+			!Number.isSafeInteger(pid) ||
+			pid <= 0 ||
+			!isProcessIncarnation(incarnation) ||
+			generation !== DAEMON_GENERATION ||
+			state.ownerId !== input.ownerId ||
+			state.acquisitionId !== acquisitionId ||
+			(input.tokenFingerprint !== undefined && state.tokenFingerprint !== input.tokenFingerprint) ||
+			(input.chatId !== undefined && state.chatId !== input.chatId) ||
+			(!canBindProvisionalPid && state.incarnation !== incarnation) ||
+			(!canBindProvisionalPid && state.pid !== pid) ||
+			state.generation !== generation ||
+			state.stoppedAt !== undefined ||
+			state.ownershipPhase === "retired"
+		)
+			return false;
+		if (!(await transitionLockIsHeldByCaller({ fs: fsImpl, path: paths.steal, lock: transition }))) return false;
+		const previousLock = canBindProvisionalPid ? await readOwnershipLock(fsImpl, paths.lock) : undefined;
+		const expectedLock =
+			previousLock?.kind === "valid" &&
+			previousLock.metadata.pid === state.pid &&
+			previousLock.metadata.incarnation === state.incarnation &&
+			previousLock.metadata.ownerId === state.ownerId &&
+			previousLock.metadata.acquisitionId === state.acquisitionId
+				? previousLock.metadata
+				: undefined;
+		const reboundLock = expectedLock ? { ...expectedLock, pid, incarnation } : undefined;
+		if (
+			canBindProvisionalPid &&
+			(!expectedLock ||
+				!reboundLock ||
+				!(await rebindOwnershipLock({
+					fs: fsImpl,
+					path: paths.lock,
+					transitionPath: paths.steal,
+					transition,
+
+					expected: expectedLock,
+					rebound: reboundLock,
+				})))
+		)
+			return false;
 		try {
-			const rechecked = await readJson<DaemonState>(fsImpl, paths.state);
-			const recheckedDecision = attachDecision(rechecked);
-			if (recheckedDecision) return recheckedDecision;
-			if (rejectLiveDifferentIdentity(rechecked)) {
-				return { acquired: false, blocked: true, reason: "identity_mismatch" } as const;
-			}
-			if (
-				rechecked &&
-				rechecked.stoppedAt === undefined &&
-				validDaemonPid(rechecked.pid) &&
-				pidAlive(rechecked.pid)
-			) {
-				return { acquired: false, attached: true };
-			}
-			if (!rechecked && !(await lockIsPositivelyStale())) {
-				return { acquired: false, attached: true };
-			}
-			if (!(await ownershipIsPositivelyStale(rechecked))) {
-				return { acquired: false, attached: true };
-			}
-			await fsImpl.unlink(paths.lock).catch(() => undefined);
-			if (!(await tryCreateOwnershipLock(fsImpl, paths.lock, { pid, startedAt: createdAt }))) {
-				return { acquired: false, attached: true };
-			}
-			await writeState();
-			return { acquired: true, ownerId };
-		} finally {
-			await fsImpl.unlink(paths.steal).catch(() => undefined);
+			await writeJsonAtomic(fsImpl, paths.state, {
+				...state,
+				// Preserve the source launcher PID so concurrent ensures can recognize
+				// this ready PID as its child rather than excluding it as the launcher.
+				launcherPid: state.pid,
+				pid,
+				incarnation,
+				ownershipPhase: "ready",
+				heartbeatAt: (input.now ?? Date.now)(),
+			});
+		} catch {
+			if (expectedLock && reboundLock)
+				await rollbackOwnershipLockRebind({
+					fs: fsImpl,
+					path: paths.lock,
+					transitionPath: paths.steal,
+					transition,
+
+					previous: expectedLock,
+					rebound: reboundLock,
+				});
+			return false;
 		}
+		return true;
+	} finally {
+		await releaseDaemonTransitionLock({ fs: fsImpl, path: paths.steal, lock: transition });
+	}
+}
+
+/** Acquire the lifecycle transition lock with bounded retry for bind/retire races. */
+export async function acquireTransitionLock(input: {
+	fs: TelegramDaemonFs;
+	path: string;
+	pidAlive?: (pid: number) => boolean;
+	pidIncarnation?: (pid: number) => string | undefined;
+	sleep?: (ms: number) => Promise<void>;
+	retries?: number;
+	retryDelayMs?: number;
+}): Promise<DaemonTransitionLock | undefined> {
+	return await acquireDaemonTransitionLock({
+		fs: input.fs,
+		path: input.path,
+		pid: process.pid,
+		pidAlive: input.pidAlive ?? defaultPidAlive,
+		pidIncarnation: input.pidIncarnation ?? defaultPidIncarnation,
+		sleep: input.sleep,
+		retries: input.retries,
+		retryDelayMs: input.retryDelayMs,
 	});
 }
 
-export async function renewDaemonHeartbeat(input: {
+/** Retire only the unchanged provisional acquisition after bounded readiness fails. */
+export async function retireProvisionalDaemonOwnership(input: {
+	settings: Settings;
+	ownerId: string;
+	acquisitionId?: string;
+	pidIncarnation?: (pid: number) => string | undefined;
+	pidAlive?: (pid: number) => boolean;
+	/** Detached child PID, when the launcher successfully reported it. */
+	pid: number;
+	/** PID which created the provisional reservation before the child was bound. */
+	launcherPid?: number;
+	fs?: TelegramDaemonFs;
+	now?: () => number;
+	sleep?: (ms: number) => Promise<void>;
+	stealRetries?: number;
+	stealRetryDelayMs?: number;
+	/** Only no-child confirmation may retire a ready-like launcher publication. */
+	allowReadyWithoutChildPid?: boolean;
+}): Promise<boolean> {
+	const fsImpl = input.fs ?? nodeFs;
+	const paths = daemonPaths(input.settings.getAgentDir());
+	const transition = await acquireTransitionLock({
+		fs: fsImpl,
+		path: paths.steal,
+		pidAlive: input.pidAlive,
+		pidIncarnation: input.pidIncarnation,
+		sleep: input.sleep,
+		retries: input.stealRetries,
+		retryDelayMs: input.stealRetryDelayMs,
+	});
+	if (!transition) return false;
+	try {
+		const state = await readJson<DaemonState>(fsImpl, paths.state);
+		const acquisitionId = input.acquisitionId ?? input.ownerId;
+		const expectedPid = state?.pid === input.pid ? input.pid : input.launcherPid;
+		const pidAlive = input.pidAlive ?? defaultPidAlive;
+		const expectedPidAlive = expectedPid !== undefined && pidAlive(expectedPid);
+		const incarnation = (input.pidIncarnation ?? defaultPidIncarnation)(expectedPid ?? 0);
+		if (
+			!state ||
+			state.ownerId !== input.ownerId ||
+			state.acquisitionId !== acquisitionId ||
+			(expectedPidAlive &&
+				(!isProcessIncarnation(incarnation) ||
+					!isProcessIncarnation(state.incarnation) ||
+					state.incarnation !== incarnation)) ||
+			(state.pid !== input.pid && state.pid !== input.launcherPid) ||
+			state.generation !== DAEMON_GENERATION ||
+			!Number.isSafeInteger(state.generation) ||
+			(state.ownershipPhase !== "provisional" &&
+				!(input.allowReadyWithoutChildPid === true && state.ownershipPhase === "ready"))
+		)
+			return false;
+		if (!(await transitionLockIsHeldByCaller({ fs: fsImpl, path: paths.steal, lock: transition }))) return false;
+		await writeJsonAtomic(fsImpl, paths.state, {
+			...state,
+			ownershipPhase: "retired",
+			stoppedAt: (input.now ?? Date.now)(),
+		});
+		if (await transitionLockIsHeldByCaller({ fs: fsImpl, path: paths.steal, lock: transition }))
+			await fsImpl.unlink(paths.lock).catch(() => undefined);
+		return true;
+	} finally {
+		await releaseDaemonTransitionLock({ fs: fsImpl, path: paths.steal, lock: transition });
+	}
+}
+
+/** Bind a launcher-reserved provisional acquisition to its actual detached child. */
+async function bindProvisionalDaemonPid(input: {
 	settings: Settings;
 	ownerId: string;
-	/** Bind a daemon heartbeat to the Telegram identity that acquired the lock. */
-	tokenFingerprint: string;
-	chatId: string;
-	/** Require the current daemon PID after the launcher-to-daemon PID rebind. */
+	acquisitionId: string;
 	pid: number;
+	incarnation: string;
 	fs?: TelegramDaemonFs;
-	now?: () => number;
+	sleep?: (ms: number) => Promise<void>;
+	stealRetries?: number;
+	stealRetryDelayMs?: number;
 }): Promise<boolean> {
 	const fsImpl = input.fs ?? nodeFs;
 	const paths = daemonPaths(input.settings.getAgentDir());
-	return withFileLock(paths.ownership, async () => {
+	const transition = await acquireTransitionLock({
+		fs: fsImpl,
+		path: paths.steal,
+		sleep: input.sleep,
+		retries: input.stealRetries,
+		retryDelayMs: input.stealRetryDelayMs,
+	});
+	if (!transition) return false;
+	try {
 		const state = await readJson<DaemonState>(fsImpl, paths.state);
 		if (
 			!state ||
-			state.stoppedAt !== undefined ||
-			typeof input.tokenFingerprint !== "string" ||
-			typeof input.chatId !== "string" ||
-			!Number.isSafeInteger(input.pid) ||
-			input.pid <= 0 ||
 			state.ownerId !== input.ownerId ||
-			!ownerIdentityMatches(state, input.tokenFingerprint, input.chatId)
+			state.acquisitionId !== input.acquisitionId ||
+			state.ownershipPhase !== "provisional" ||
+			state.generation !== DAEMON_GENERATION ||
+			!isProcessIncarnation(state.incarnation) ||
+			!isProcessIncarnation(input.incarnation)
 		)
 			return false;
-		if (!validDaemonPid(state.pid)) return false;
-		if (state.pid !== input.pid && (!validDaemonPid(state.launcherPid) || state.pid !== state.launcherPid))
+		if (!(await transitionLockIsHeldByCaller({ fs: fsImpl, path: paths.steal, lock: transition }))) return false;
+		const previousLock = await readOwnershipLock(fsImpl, paths.lock);
+		if (
+			previousLock.kind !== "valid" ||
+			previousLock.metadata.pid !== state.pid ||
+			previousLock.metadata.incarnation !== state.incarnation ||
+			previousLock.metadata.ownerId !== state.ownerId ||
+			previousLock.metadata.acquisitionId !== state.acquisitionId
+		)
 			return false;
-		await writeJsonAtomic(fsImpl, paths.state, {
-			...state,
-			pid: input.pid,
-			heartbeatAt: (input.now ?? Date.now)(),
-		});
+		const reboundLock = { ...previousLock.metadata, pid: input.pid, incarnation: input.incarnation };
+		if (
+			!(await rebindOwnershipLock({
+				fs: fsImpl,
+				path: paths.lock,
+				transitionPath: paths.steal,
+				transition,
+
+				expected: previousLock.metadata,
+				rebound: reboundLock,
+			}))
+		)
+			return false;
+		try {
+			await writeJsonAtomic(fsImpl, paths.state, {
+				...state,
+				// This durable marker distinguishes a launcher reservation from a PID
+				// the launcher authoritatively rebound to its child.
+				launcherPid: state.launcherPid ?? state.pid,
+				pid: input.pid,
+				incarnation: input.incarnation,
+			});
+		} catch {
+			await rollbackOwnershipLockRebind({
+				fs: fsImpl,
+				path: paths.lock,
+				transitionPath: paths.steal,
+				transition,
+				previous: previousLock.metadata,
+				rebound: reboundLock,
+			});
+			return false;
+		}
 		return true;
-	});
+	} finally {
+		await releaseDaemonTransitionLock({ fs: fsImpl, path: paths.steal, lock: transition });
+	}
 }
 
-export async function releaseDaemonOwnership(input: {
+/** Wait for a matching current-generation daemon to publish a ready state. */
+export async function waitForTelegramDaemonReady(input: {
 	settings: Settings;
-	ownerId: string;
-	/** Bind release to the Telegram identity that acquired the lock. */
+	ownerId?: string;
+	acquisitionId?: string;
+	pid?: number;
+	excludedPid?: number;
+	tokenFingerprint: string;
+	chatId: string;
+	fs?: TelegramDaemonFs;
+	now?: () => number;
+	pidAlive?: (pid: number) => boolean;
+	pidIncarnation?: (pid: number) => string | undefined;
+	sleep?: (ms: number) => Promise<void>;
+	waitStepMs?: number;
+	timeoutMs?: number;
+}): Promise<boolean> {
+	const now = input.now ?? Date.now;
+	const pidAlive = input.pidAlive ?? defaultPidAlive;
+	const pidIncarnation = input.pidIncarnation ?? defaultPidIncarnation;
+	const sleep = input.sleep ?? (async (ms: number) => await Bun.sleep(ms));
+	const timeoutMs = Math.max(input.timeoutMs ?? 8_000, 0);
+	const waitStepMs = Math.max(input.waitStepMs ?? 25, 1);
+	const deadline = now() + timeoutMs;
+	const maxPolls = Math.ceil(timeoutMs / waitStepMs);
+	for (let poll = 0; poll <= maxPolls; poll++) {
+		const state = await readDaemonState(input.settings, input.fs);
+		if (
+			(!input.ownerId || state?.ownerId === input.ownerId) &&
+			(!input.acquisitionId || state?.acquisitionId === input.acquisitionId) &&
+			state?.ownershipPhase === "ready" &&
+			state.generation === DAEMON_GENERATION &&
+			ownerIdentityMatches(state, input.tokenFingerprint, input.chatId) &&
+			ownerProvenanceMatches(state, pidIncarnation) &&
+			pidAlive(state.pid) &&
+			(Number.isSafeInteger(input.pid) && (input.pid as number) > 0
+				? state.pid === input.pid
+				: !Number.isSafeInteger(input.excludedPid) || state.pid !== input.excludedPid) &&
+			isCurrentCompatibleOwner({
+				state,
+				now: now(),
+				tokenFingerprint: input.tokenFingerprint,
+				chatId: input.chatId,
+				pidAlive,
+				pidIncarnation,
+			})
+		)
+			return true;
+		if (now() >= deadline || poll === maxPolls) break;
+		await sleep(waitStepMs);
+	}
+	return false;
+}
+
+/** Confirm the provisional owner or retire only its unchanged acquisition. */
+export async function confirmTelegramDaemonSpawn(input: {
+	settings: Settings;
+	spawned: TelegramSpawnOwnerResult;
 	tokenFingerprint: string;
 	chatId: string;
-	/** Require the current daemon PID after the launcher-to-daemon PID rebind. */
 	pid: number;
 	fs?: TelegramDaemonFs;
 	now?: () => number;
+	pidAlive?: (pid: number) => boolean;
+	pidIncarnation?: (pid: number) => string | undefined;
+	sleep?: (ms: number) => Promise<void>;
+	waitStepMs?: number;
+	timeoutMs?: number;
+}): Promise<boolean> {
+	if (input.spawned.result !== "owner_spawned") return true;
+	const childPid = input.spawned.acquisition.pid;
+	const hasExactChildPid = Number.isSafeInteger(childPid) && (childPid as number) > 0;
+	const ready = await waitForTelegramDaemonReady({
+		settings: input.settings,
+		ownerId: input.spawned.acquisition.ownerId,
+		acquisitionId: input.spawned.acquisition.acquisitionId,
+		pid: hasExactChildPid ? childPid : undefined,
+		excludedPid: hasExactChildPid ? undefined : input.pid,
+		tokenFingerprint: input.tokenFingerprint,
+		chatId: input.chatId,
+		fs: input.fs,
+		now: input.now,
+		pidAlive: input.pidAlive,
+		pidIncarnation: input.pidIncarnation,
+		sleep: input.sleep,
+		waitStepMs: input.waitStepMs,
+		timeoutMs: input.timeoutMs,
+	});
+	if (ready) return true;
+	const launcherPid = input.spawned.acquisition.launcherPid ?? input.pid;
+	const retired = await retireProvisionalDaemonOwnership({
+		settings: input.settings,
+		ownerId: input.spawned.acquisition.ownerId,
+		acquisitionId: input.spawned.acquisition.acquisitionId,
+		pid: hasExactChildPid ? (childPid as number) : launcherPid,
+		launcherPid,
+		allowReadyWithoutChildPid: !hasExactChildPid,
+		fs: input.fs,
+		now: input.now,
+		pidAlive: input.pidAlive,
+		pidIncarnation: input.pidIncarnation,
+		sleep: input.sleep,
+	});
+	if (retired) return false;
+	const state = await readDaemonState(input.settings, input.fs);
+	if (
+		hasExactChildPid &&
+		isCurrentCompatibleOwner({
+			state,
+			now: (input.now ?? Date.now)(),
+			tokenFingerprint: input.tokenFingerprint,
+			chatId: input.chatId,
+			pidAlive: input.pidAlive ?? defaultPidAlive,
+			pidIncarnation: input.pidIncarnation ?? defaultPidIncarnation,
+		}) &&
+		(state?.ownerId !== input.spawned.acquisition.ownerId ||
+			state.acquisitionId !== input.spawned.acquisition.acquisitionId ||
+			state.pid === childPid)
+	)
+		return true;
+	if (
+		state?.ownerId === input.spawned.acquisition.ownerId &&
+		state.acquisitionId === input.spawned.acquisition.acquisitionId &&
+		(state.pid === childPid || state.pid === launcherPid || state.pid === input.pid) &&
+		state.ownershipPhase === "retired"
+	)
+		return false;
+	throw new Error("Telegram daemon provisional ownership could not be retired safely");
+}
+
+export async function releaseDaemonOwnership(input: {
+	settings: Settings;
+	ownerId: string;
+	acquisitionId?: string;
+	tokenFingerprint?: string;
+	chatId?: string;
+	pid?: number;
+	generation?: number;
+	pidIncarnation?: (pid: number) => string | undefined;
+	fs?: TelegramDaemonFs;
+	now?: () => number;
 }): Promise<void> {
 	const fsImpl = input.fs ?? nodeFs;
 	const paths = daemonPaths(input.settings.getAgentDir());
-	await withFileLock(paths.ownership, async () => {
+	const transition = await acquireTransitionLock({
+		fs: fsImpl,
+		path: paths.steal,
+		pidIncarnation: input.pidIncarnation,
+	});
+	if (!transition) return;
+	try {
 		const state = await readJson<DaemonState>(fsImpl, paths.state);
+		const acquisitionId = input.acquisitionId ?? input.ownerId;
+		const pid = input.pid ?? state?.pid;
+		const generation = input.generation ?? state?.generation;
+		const incarnation = (input.pidIncarnation ?? defaultPidIncarnation)(pid ?? 0);
 		if (
-			!state ||
+			!hasSafeDaemonStateShape(state) ||
 			state.ownerId !== input.ownerId ||
-			!ownerIdentityMatches(state, input.tokenFingerprint, input.chatId) ||
-			state.pid !== input.pid
+			state.acquisitionId !== acquisitionId ||
+			(input.tokenFingerprint !== undefined && state.tokenFingerprint !== input.tokenFingerprint) ||
+			(input.chatId !== undefined && state.chatId !== input.chatId) ||
+			state.pid !== pid ||
+			!isProcessIncarnation(incarnation) ||
+			state.incarnation !== incarnation ||
+			state.generation !== generation ||
+			!Number.isSafeInteger(generation)
 		)
 			return;
+		if (!(await transitionLockIsHeldByCaller({ fs: fsImpl, path: paths.steal, lock: transition }))) return;
 		await writeJsonAtomic(fsImpl, paths.state, { ...state, stoppedAt: (input.now ?? Date.now)() });
-		await fsImpl.unlink(paths.lock).catch(() => undefined);
-	});
+		if (await transitionLockIsHeldByCaller({ fs: fsImpl, path: paths.steal, lock: transition }))
+			await fsImpl.unlink(paths.lock).catch(() => undefined);
+	} finally {
+		await releaseDaemonTransitionLock({ fs: fsImpl, path: paths.steal, lock: transition });
+	}
 }
 
 /** Read the persisted daemon ownership state (or undefined when absent). */
@@ -803,6 +1830,15 @@ function defaultPidAlive(pid: number): boolean {
 	}
 }
 
+/**
+ * Use immutable process-start provenance on every supported OS. In particular,
+ * Windows is authorized by the native process API or PowerShell StartTime/FileTime;
+ * absent authority fails closed and never trusts the numeric PID alone.
+ */
+function defaultPidIncarnation(pid: number): string | undefined {
+	return processIncarnation(pid);
+}
+
 /** True for AbortError-shaped rejections raised when an in-flight fetch is aborted. */
 function isAbortError(err: unknown): boolean {
 	return err instanceof Error && (err.name === "AbortError" || /\baborted\b/i.test(err.message));
@@ -828,7 +1864,7 @@ function defaultDaemonSpawn(
 	const child = childProcessSpawn(command, args, { detached: opts.detached, stdio });
 	// Best-effort autostart: a spawn failure must never crash the host session.
 	child.on("error", () => undefined);
-	return { unref: () => child.unref() };
+	return { pid: child.pid, unref: () => child.unref() };
 }
 
 export interface TelegramSpawnOwnerInput {
@@ -838,19 +1874,20 @@ export interface TelegramSpawnOwnerInput {
 	chatId: string;
 }
 
-export interface TelegramSpawnOwnerResult {
-	result: EnsureDaemonResult;
-	ownerId?: string;
-	runtime: DaemonRuntimeInfo;
-	warnings: string[];
-	/**
-	 * Set when ownership was NOT acquired because a still-live owner is running an
-	 * older daemon generation. The caller must hand off via a reload rather than
-	 * attach; see {@link ensureTelegramDaemonRunning}.
-	 */
-	reloadRequired?: boolean;
+export interface TelegramSpawnAcquisition {
+	readonly ownerId: string;
+	readonly acquisitionId: string;
+	/** PID of the launcher which reserved provisional ownership before spawn. */
+	readonly launcherPid?: number;
+	/** Actual detached child which must publish the ready owner state. */
+	readonly pid?: number;
 }
 
+export type TelegramSpawnOwnerResult =
+	| { result: "owner_spawned"; acquisition: TelegramSpawnAcquisition; runtime: DaemonRuntimeInfo; warnings: string[] }
+	| { result: "attached"; runtime: DaemonRuntimeInfo; warnings: string[]; reloadRequired?: boolean }
+	| { result: "blocked"; runtime: DaemonRuntimeInfo; warnings: string[]; reloadRequired?: boolean };
+
 /**
  * Build the detached spawn command/args for the daemon-internal entrypoint.
  * Source mode prepends the entry script so the respawn loads edited source;
@@ -910,26 +1947,41 @@ export async function spawnTelegramDaemonOwner(
 		now: deps.now,
 		pid: deps.pid,
 		pidAlive: deps.pidAlive,
+		pidIncarnation: deps.pidIncarnation,
 		randomId: ownerId ? undefined : deps.randomId,
 		ownerId,
-		allowPidRebind: true,
-	});
-	// Build args from the shared runtime resolver.
-	const { command, args, runtime } = buildTelegramDaemonSpawnArgs({
-		execPath,
-		ownerId: ownership.ownerId ?? "",
-		agentDir,
 	});
 	if (!ownership.acquired) {
-		if (ownership.blocked) {
+		if (ownership.blocked || ownership.provisional) {
 			return {
 				result: "blocked",
-				runtime,
-				warnings: ["live telegram daemon uses a different bot token or chat; refusing to attach"],
+				runtime: buildTelegramDaemonSpawnArgs({ execPath, ownerId: "", agentDir }).runtime,
+				warnings: [
+					ownership.provisional
+						? "telegram daemon ownership is provisional; refusing to attach"
+						: "live telegram daemon uses a different bot token or chat; refusing to attach",
+				],
 			};
 		}
-		return { result: "attached", runtime, warnings: [], reloadRequired: ownership.reloadRequired };
+		return {
+			result: "attached",
+			runtime: buildTelegramDaemonSpawnArgs({ execPath, ownerId: "", agentDir }).runtime,
+			warnings: [],
+			reloadRequired: ownership.reloadRequired,
+		};
 	}
+	const launcherPid = deps.pid ?? process.pid;
+	const provisionalAcquisition: TelegramSpawnAcquisition = Object.freeze({
+		ownerId: ownership.ownerId as string,
+		acquisitionId: ownership.acquisitionId as string,
+		launcherPid,
+	});
+	// One source of truth for runtime detection + spawn args (no duplicate resolve).
+	const { command, args, runtime } = buildTelegramDaemonSpawnArgs({
+		execPath,
+		ownerId: provisionalAcquisition.ownerId,
+		agentDir,
+	});
 	const spawnImpl = deps.spawn ?? defaultDaemonSpawn;
 	const child = spawnImpl(command, args, {
 		detached: true,
@@ -937,7 +1989,25 @@ export async function spawnTelegramDaemonOwner(
 		logPath: path.join(daemonPaths(agentDir).dir, "daemon.log"),
 	});
 	child?.unref?.();
-	return { result: "owner_spawned", ownerId: ownership.ownerId, runtime, warnings: [] };
+	// A launcher can reserve ownership, but only the actual child can become
+	// ready. Missing PID provenance is intentionally non-ready and times out.
+	const childPid = child?.pid;
+	if (!Number.isSafeInteger(childPid) || (childPid as number) <= 0)
+		return { result: "owner_spawned", acquisition: provisionalAcquisition, runtime, warnings: [] };
+	const pid = childPid as number;
+	const acquisition: TelegramSpawnAcquisition = Object.freeze({ ...provisionalAcquisition, pid });
+	const incarnation = (deps.pidIncarnation ?? defaultPidIncarnation)(pid);
+	if (!incarnation) return { result: "owner_spawned", acquisition, runtime, warnings: [] };
+	await bindProvisionalDaemonPid({
+		settings: input.settings,
+		ownerId: acquisition.ownerId,
+		acquisitionId: acquisition.acquisitionId,
+		incarnation,
+		pid,
+		fs: deps.fs,
+		sleep: deps.sleep,
+	});
+	return { result: "owner_spawned", acquisition, runtime, warnings: [] };
 }
 
 /**
@@ -950,25 +2020,94 @@ export async function ensureTelegramDaemonRunningDetailed(
 ): Promise<EnsureTelegramDaemonDetailedResult> {
 	const cfg = getNotificationConfig(input.settings);
 	if (!isTelegramConfigured(cfg)) return "disabled";
-	return await withTelegramSetupLease(cfg.botToken, async () => {
-		const root = notificationRootForCwd(input.cwd);
-		const fp = tokenFingerprint(cfg.botToken);
-		const spawned = await spawnTelegramDaemonOwner(
-			{ settings: input.settings, roots: [root], tokenFingerprint: fp, chatId: cfg.chatId },
-			deps,
-		);
-		if (spawned.result === "blocked") {
-			logger.warn(`notifications: failed to ensure Telegram daemon: ${spawned.warnings.join("; ")}`);
-			return "blocked_identity";
+	const root = notificationRootForCwd(input.cwd);
+	const fp = tokenFingerprint(cfg.botToken);
+	let spawned = await withTelegramSetupLease(
+		cfg.botToken,
+		async () =>
+			await spawnTelegramDaemonOwner(
+				{ settings: input.settings, roots: [root], tokenFingerprint: fp, chatId: cfg.chatId },
+				deps,
+			),
+	);
+	if (spawned.result === "blocked" && spawned.warnings[0]?.includes("provisional")) {
+		const provisional = await readDaemonState(input.settings, deps.fs);
+		// A launcher-reserved PID can be rebound by the child heartbeat. Only a
+		// state marked by bindProvisionalDaemonPid has an authoritative child PID.
+		const hasAuthoritativeChildPid =
+			Number.isSafeInteger(provisional?.launcherPid) && (provisional?.launcherPid as number) > 0;
+		const ready = await waitForTelegramDaemonReady({
+			settings: input.settings,
+			ownerId: provisional?.ownerId,
+			acquisitionId: provisional?.acquisitionId,
+			pid: hasAuthoritativeChildPid ? provisional?.pid : undefined,
+			excludedPid: hasAuthoritativeChildPid ? undefined : provisional?.pid,
+			tokenFingerprint: fp,
+			chatId: cfg.chatId,
+			fs: deps.fs,
+			now: deps.now,
+			pidAlive: deps.pidAlive,
+			pidIncarnation: deps.pidIncarnation,
+			sleep: deps.sleep,
+			waitStepMs: deps.waitStepMs,
+			timeoutMs: deps.readinessTimeoutMs,
+		});
+		if (ready) {
+			spawned = await withTelegramSetupLease(
+				cfg.botToken,
+				async () =>
+					await spawnTelegramDaemonOwner(
+						{ settings: input.settings, roots: [root], tokenFingerprint: fp, chatId: cfg.chatId },
+						deps,
+					),
+			);
 		}
-		if (spawned.reloadRequired) {
-			await registerNotificationRoot({ ...input, fs: deps.fs });
-			await reloadStaleGenerationOwner(input.settings, deps);
-			return "reloaded";
+	}
+	if (spawned.result === "blocked") {
+		logger.warn(`notifications: failed to ensure Telegram daemon: ${spawned.warnings.join("; ")}`);
+		return "blocked_identity";
+	}
+	if (spawned.result === "attached" && spawned.reloadRequired) {
+		const previous = await readNotificationRootRegistration({ ...input, fs: deps.fs });
+		await registerNotificationRoot({ ...input, fs: deps.fs });
+		const controller = new TelegramDaemonController(input.settings, telegramControllerDeps(deps));
+		const upgrade = await controller.reloadForGenerationUpgrade();
+		if (upgrade.outcome !== "ready") {
+			await restoreNotificationRootRegistration({
+				settings: input.settings,
+				sessionId: input.sessionId,
+				registeredRoot: root,
+				previous,
+				fs: deps.fs,
+			});
+			throw new Error(`Unable to replace stale Telegram daemon: ${upgrade.operation.message}`);
 		}
+		return "reloaded";
+	}
+	if (spawned.result !== "owner_spawned") {
 		await registerNotificationRoot({ ...input, fs: deps.fs });
-		return spawned.result === "owner_spawned" ? "spawned" : "attached";
-	});
+		return "attached";
+	}
+	if (
+		await confirmTelegramDaemonSpawn({
+			settings: input.settings,
+			spawned,
+			tokenFingerprint: fp,
+			chatId: cfg.chatId,
+			pid: deps.pid ?? process.pid,
+			fs: deps.fs,
+			now: deps.now,
+			pidAlive: deps.pidAlive,
+			pidIncarnation: deps.pidIncarnation,
+			sleep: deps.sleep,
+			waitStepMs: deps.waitStepMs,
+			timeoutMs: deps.readinessTimeoutMs,
+		})
+	) {
+		await registerNotificationRoot({ ...input, fs: deps.fs });
+		return "spawned";
+	}
+	throw new Error("Telegram daemon did not become ready after spawning");
 }
 
 /**
@@ -993,26 +2132,21 @@ export async function ensureTelegramDaemonRunning(
 	}
 }
 
-/**
- * Reload a still-live owner running an older daemon generation through the
- * cooperative SIGTERM/control handoff. Lazily imports the controller to avoid a
- * static import cycle (the controller module imports ownership helpers here).
- */
-async function reloadStaleGenerationOwner(settings: Settings, deps: TelegramDaemonDeps): Promise<void> {
-	const { TelegramDaemonController } = await import("./telegram-daemon-control");
-	const controller = new TelegramDaemonController(settings, {
+function telegramControllerDeps(deps: TelegramDaemonDeps): TelegramDaemonControlDeps {
+	return {
 		fs: deps.fs,
 		now: deps.now,
 		pidAlive: deps.pidAlive,
-		sendSignal: deps.sendSignal,
+		processReference: deps.processReference,
+		pidIncarnation: deps.pidIncarnation,
 		spawn: deps.spawn,
 		execPath: deps.execPath,
 		ownerPid: deps.pid,
 		randomId: deps.randomId,
 		sleep: deps.sleep,
 		waitStepMs: deps.waitStepMs,
-	});
-	await controller.reload();
+		readinessTimeoutMs: deps.readinessTimeoutMs,
+	};
 }
 
 export interface BotApi {
@@ -1293,6 +2427,20 @@ export interface DaemonControlHooks {
 	clear?(ownerId: string): Promise<void>;
 }
 
+type BtwTerminalDeliveryOutcome = "accepted" | "not_delivered" | "uncertain" | "partial_accepted" | "stale";
+
+interface BtwTerminalDeliveryReceipt {
+	requestId: string;
+	logicalSessionId: string;
+	transportSessionId: string;
+	threadId: string;
+	updateId: number;
+	messageId: number;
+	outcome: BtwTerminalDeliveryOutcome;
+}
+
+const BTW_TERMINAL_DELIVERY_TEST_OBSERVER = Symbol.for("gjc.test.btw-terminal-delivery-observer");
+
 export interface TelegramDaemonOptions {
 	settings: Settings;
 	ownerId: string;
@@ -1313,6 +2461,7 @@ export interface TelegramDaemonOptions {
 	pid?: number;
 	/** Liveness probe for skipping dead-PID endpoint records in {@link TelegramNotificationDaemon.scanRoots}. */
 	pidAlive?: (pid: number) => boolean;
+	pidIncarnation?: (pid: number) => string | undefined;
 	botApi?: BotApi;
 	control?: DaemonControlHooks;
 	/**
@@ -1336,6 +2485,8 @@ export interface TelegramDaemonOptions {
 	rich?: { enabled: boolean };
 	/** Opt-in rich-draft streaming of live turn previews (off by default; see rich-draft.ts). */
 	richDraft?: { enabled: boolean };
+	/** Tool start/completion messages (enabled by default). */
+	toolActivity?: { enabled: boolean };
 	/**
 	 * Per-session Telegram forum-topic naming. `nameTemplate` supports the
 	 * `{repo}`, `{branch}`, and `{title}` placeholders; unset preserves the
@@ -1391,9 +2542,21 @@ interface TopicAuthorityLease {
 	authorityEpoch: number;
 }
 
+interface ToolActivityOwner {
+	sessionId: string;
+	toolCallId: string;
+	toolName: string;
+	endpointDigest: string;
+	session: SessionSocket;
+	phase: "started" | "terminal";
+	policyEpoch?: number;
+}
+
 interface PendingThreadedFrame {
 	send: ThreadedSend;
 	msg: Record<string, unknown>;
+	endpointDigest: string;
+	toolActivity?: ToolActivityOwner;
 }
 
 type SelectedAckOutcome =
@@ -1427,6 +2590,7 @@ interface TelegramQueuePayload {
 	topicLease?: TopicAuthorityLease;
 	selectedAck?: SelectedAckQueueItem;
 	btwDelivery?: BtwQueuedDelivery;
+	toolActivity?: ToolActivityOwner;
 }
 
 interface PendingBtwTurn {
@@ -1517,6 +2681,16 @@ export class TelegramNotificationDaemon {
 	readonly messageRoutes = new Map<string | number, CallbackRoute | Omit<CallbackRoute, "answer">>();
 	/** Telegram message id backing each streamed `${sessionId}:${coalesceKey}`, for in-place edits. */
 	private readonly liveMessages = new Map<string, number>();
+	/** Endpoint-bound ownership for visible or dispatching tool bubbles. */
+	private readonly toolActivityOwners = new Map<string, ToolActivityOwner>();
+	private readonly revokedToolEndpoints = new Set<string>();
+	private readonly unresolvedToolTerminalizations = new Map<string, { messageId: number; owner: ToolActivityOwner }>();
+	private toolTerminalizationChain: Promise<void> = Promise.resolve();
+	private toolActivityPolicyEpoch = 0;
+	private toolActivityStopping = false;
+	private readonly replayToolActivityEpochs = new WeakMap<Record<string, unknown>, number>();
+	private toolShutdownBarrier: Promise<void> = Promise.resolve();
+	private toolActivityAmbiguous = false;
 	readonly sessions = new Map<string, SessionSocket>();
 	/** Ephemeral aliases for model choices; deliberately never serialized across daemon restarts. */
 	#modelChoiceAliases = new Map<string, ModelChoiceRoute>();
@@ -1626,7 +2800,13 @@ export class TelegramNotificationDaemon {
 	 * ~25s getUpdates timeout. Safe to call from a signal handler.
 	 */
 	requestStop(_reason?: "reload" | "stop" | "signal"): void {
-		this.effects.beginShutdown();
+		const toolShutdown = this.beginToolActivityShutdown();
+		void toolShutdown
+			.finally(() => {
+				this.effects.beginShutdown();
+				this.#deliveryAbort.abort();
+			})
+			.catch(() => undefined);
 		for (const item of new Set(this.selectedAckPending.values())) {
 			if (item.state === "queued") this.pool.removeById(item.itemId);
 			else item.controller?.abort();
@@ -1637,7 +2817,6 @@ export class TelegramNotificationDaemon {
 			delivery.invalidated = true;
 			delivery.controller.abort("daemon_shutdown");
 		}
-		this.#deliveryAbort.abort();
 		this.runtime.requestStop();
 		this.running = false;
 	}
@@ -2444,7 +3623,131 @@ export class TelegramNotificationDaemon {
 	 * (so a delayed old close cannot delete a replacement), and best-effort closes
 	 * the socket. `scanRoots()` then reconnects the session.
 	 */
+	private enqueueToolTerminalization(
+		claimed:
+			| Array<{ messageId: number; owner: ToolActivityOwner }>
+			| (() => Array<{ messageId: number; owner: ToolActivityOwner }>),
+		awaitDispatch: boolean,
+		strict = false,
+	): Promise<void> {
+		const terminalize = (): Promise<void> =>
+			this.effects.allowTerminal(async () => {
+				if (awaitDispatch) await this.flushChain;
+				const strictFailures: Error[] = [];
+				const claimedItems = typeof claimed === "function" ? claimed() : claimed;
+				for (const item of claimedItems) {
+					const { messageId, owner } = item;
+					const backlogKey = `${owner.endpointDigest}\0${owner.sessionId}\0${owner.toolCallId}\0${messageId}`;
+					const send = renderThreadedFrame({
+						type: "tool_activity",
+						sessionId: owner.sessionId,
+						toolCallId: owner.toolCallId,
+						toolName: owner.toolName,
+						phase: "unknown",
+					});
+					if (!send?.text) continue;
+					let failure: unknown;
+					let delivered = false;
+					for (let attempt = 0; attempt < (strict ? 5 : 1); attempt++) {
+						try {
+							const response = (await this.botApi.call("editMessageText", {
+								chat_id: this.opts.chatId,
+								message_id: messageId,
+								text: send.text,
+								parse_mode: TELEGRAM_PARSE_MODE,
+							})) as { ok?: boolean; description?: string } | undefined;
+							delivered = response?.ok === true || /not modified/i.test(String(response?.description ?? ""));
+							if (delivered) break;
+							failure = new Error(String(response?.description ?? "Telegram rejected tool terminalization."));
+						} catch (error) {
+							failure = error;
+						}
+						if (strict && attempt < 4) await this.runtime.sleep(50 * 2 ** attempt);
+					}
+					if (delivered) {
+						this.unresolvedToolTerminalizations.delete(backlogKey);
+						continue;
+					}
+					this.unresolvedToolTerminalizations.set(backlogKey, item);
+					if (strict) {
+						const key = `${owner.sessionId}:tool:${owner.toolCallId}`;
+						if (!this.toolActivityOwners.has(key)) {
+							this.toolActivityOwners.set(key, owner);
+							this.liveMessages.set(key, messageId);
+						}
+						strictFailures.push(failure instanceof Error ? failure : new Error("Tool terminalization failed."));
+					}
+				}
+				if (strictFailures.length > 0) {
+					throw new AggregateError(strictFailures, strictFailures.map(failure => failure.message).join("; "));
+				}
+			});
+		const next = this.toolTerminalizationChain.then(terminalize);
+		this.toolTerminalizationChain = next.catch(() => {});
+		return next;
+	}
+
+	private scheduleVisibleToolTerminalization(endpointDigest?: string, strict = false): Promise<void> {
+		if (endpointDigest !== undefined) this.revokedToolEndpoints.add(endpointDigest);
+		const claimVisible = (): Array<{ messageId: number; owner: ToolActivityOwner }> => {
+			const claimedByKey = new Map<string, { messageId: number; owner: ToolActivityOwner }>();
+			for (const [backlogKey, item] of this.unresolvedToolTerminalizations) {
+				if (endpointDigest !== undefined && item.owner.endpointDigest !== endpointDigest) continue;
+				this.unresolvedToolTerminalizations.delete(backlogKey);
+				claimedByKey.set(backlogKey, item);
+			}
+			for (const [key, owner] of this.toolActivityOwners) {
+				if (endpointDigest !== undefined && owner.endpointDigest !== endpointDigest) continue;
+				this.toolActivityOwners.delete(key);
+				const messageId = this.liveMessages.get(key);
+				this.liveMessages.delete(key);
+				if (messageId !== undefined) {
+					const backlogKey = `${owner.endpointDigest}\0${owner.sessionId}\0${owner.toolCallId}\0${messageId}`;
+					claimedByKey.set(backlogKey, { messageId, owner });
+				}
+			}
+			return [...claimedByKey.values()];
+		};
+		this.pool.removeWhere(
+			item =>
+				item.payload.toolActivity !== undefined &&
+				(endpointDigest === undefined || item.payload.toolActivity.endpointDigest === endpointDigest),
+		);
+		const next = this.enqueueToolTerminalization(claimVisible, false, strict);
+		if (endpointDigest !== undefined) {
+			void next.then(
+				() => this.revokedToolEndpoints.delete(endpointDigest),
+				() => this.revokedToolEndpoints.delete(endpointDigest),
+			);
+		}
+		return next;
+	}
+
+	private beginToolActivityShutdown(): Promise<void> {
+		if (this.toolActivityStopping) return this.toolShutdownBarrier;
+		this.toolActivityStopping = true;
+		this.toolActivityPolicyEpoch++;
+		this.toolShutdownBarrier = (async () => {
+			await this.flushChain;
+			const failures: Error[] = [];
+			if (this.toolActivityAmbiguous) {
+				failures.push(new Error("Tool activity delivery became ambiguous during daemon shutdown."));
+			}
+			try {
+				await this.scheduleVisibleToolTerminalization(undefined, true);
+			} catch (error) {
+				failures.push(error instanceof Error ? error : new Error(String(error)));
+			}
+			if (failures.length > 0) {
+				throw new AggregateError(failures, failures.map(failure => failure.message).join("; "));
+			}
+		})();
+		return this.toolShutdownBarrier;
+	}
+
 	private dropSession(session: SessionSocket, reason: string): void {
+		const isCurrentSession = this.sessions.get(session.sessionId) === session;
+		if (isCurrentSession) this.scheduleVisibleToolTerminalization(session.endpointDigest).catch(() => undefined);
 		const clearIntervalImpl = this.opts.clearIntervalImpl ?? clearInterval;
 		if (session.pingTimer) {
 			clearIntervalImpl(session.pingTimer);
@@ -2455,7 +3758,6 @@ export class TelegramNotificationDaemon {
 		} else {
 			void this.#terminalizeBtwTurnsForSession(session).catch(() => undefined);
 		}
-		const isCurrentSession = this.sessions.get(session.sessionId) === session;
 		if (isCurrentSession || reason === "session_closed") {
 			this.deleteMessageRoutes(session.sessionId);
 		}
@@ -2915,16 +4217,39 @@ export class TelegramNotificationDaemon {
 		return !ownerId || ownerId === session.sessionId;
 	}
 
+	private toolActivityOwner(session: SessionSocket, msg: Record<string, unknown>): ToolActivityOwner | undefined {
+		if (msg.type !== "tool_activity") return undefined;
+		const toolCallId = typeof msg.toolCallId === "string" ? msg.toolCallId : undefined;
+		const toolName = typeof msg.toolName === "string" ? msg.toolName : undefined;
+		const phase = typeof msg.phase === "string" ? msg.phase : undefined;
+		if (!toolCallId || !toolName || !phase) return undefined;
+		return {
+			sessionId: session.sessionId,
+			toolCallId,
+			toolName,
+			endpointDigest: session.endpointDigest,
+			session,
+			phase: phase === "started" ? "started" : "terminal",
+		};
+	}
+
+	private toolActivityAuthorityIsCurrent(toolActivity: ToolActivityOwner): boolean {
+		if (this.revokedToolEndpoints.has(toolActivity.endpointDigest)) return false;
+		const session = this.sessions.get(toolActivity.sessionId);
+		if (toolActivity.endpointDigest === undefined) return session === undefined;
+		return session === toolActivity.session && session.endpointDigest === toolActivity.endpointDigest;
+	}
 	private async submitThreadedFrame(
 		sessionId: string,
 		send: ThreadedSend,
 		topicLease: TopicAuthorityLease,
+		toolActivity?: ToolActivityOwner,
 	): Promise<void> {
 		this.submitPool({
 			sessionId,
 			lane: send.lane,
 			coalesceKey: send.coalesceKey,
-			payload: { send, topicLease },
+			payload: { send, topicLease, ...(toolActivity ? { toolActivity } : {}) },
 		});
 		await this.flushPool();
 	}
@@ -2986,18 +4311,33 @@ export class TelegramNotificationDaemon {
 		}
 	}
 
-	private rememberPendingThreadedFrame(sessionId: string, send: ThreadedSend, msg: Record<string, unknown>): void {
-		const frames = this.pendingThreadedFrames.get(sessionId) ?? [];
-		frames.push({ send, msg });
+	private rememberPendingThreadedFrame(
+		session: SessionSocket,
+		send: ThreadedSend,
+		msg: Record<string, unknown>,
+		toolActivity?: ToolActivityOwner,
+	): void {
+		const frames = this.pendingThreadedFrames.get(session.sessionId) ?? [];
+		frames.push({
+			send,
+			msg,
+			endpointDigest: session.endpointDigest,
+			...(toolActivity ? { toolActivity } : {}),
+		});
 		if (frames.length > PENDING_TOPIC_FRAME_LIMIT) frames.shift();
-		this.pendingThreadedFrames.set(sessionId, frames);
+		this.pendingThreadedFrames.set(session.sessionId, frames);
 	}
 
 	private async flushPendingThreadedFrames(sessionId: string, topicLease: TopicAuthorityLease): Promise<void> {
 		const frames = this.pendingThreadedFrames.get(sessionId);
 		if (!frames || frames.length === 0) return;
 		this.pendingThreadedFrames.delete(sessionId);
-		for (const frame of frames) await this.submitThreadedFrame(sessionId, frame.send, topicLease);
+		const session = this.sessions.get(sessionId);
+		for (const frame of frames) {
+			if (session && session.endpointDigest !== frame.endpointDigest) continue;
+			if (frame.msg.type === "tool_activity" && this.opts.toolActivity?.enabled === false) continue;
+			await this.submitThreadedFrame(sessionId, frame.send, topicLease, frame.toolActivity);
+		}
 	}
 
 	/**
@@ -3082,7 +4422,11 @@ export class TelegramNotificationDaemon {
 			})) as { ok?: boolean };
 			if (!topicDeleteSettled(res)) return;
 			this.topics.settleDelete(sessionId, record.topicId);
-			for (const k of [...this.liveMessages.keys()]) if (k.startsWith(`${sessionId}:`)) this.liveMessages.delete(k);
+			for (const k of [...this.liveMessages.keys()])
+				if (k.startsWith(`${sessionId}:`)) {
+					this.liveMessages.delete(k);
+					this.toolActivityOwners.delete(k);
+				}
 			this.topicOwnerByIdentity.forEach((ownerSessionId, identityKey) => {
 				if (ownerSessionId === sessionId) this.topicOwnerByIdentity.delete(identityKey);
 			});
@@ -3266,6 +4610,21 @@ export class TelegramNotificationDaemon {
 			);
 		}
 		for (const item of batch) {
+			const toolActivity = item.payload.toolActivity;
+			if (
+				toolActivity?.phase === "started" &&
+				(this.toolActivityStopping ||
+					this.opts.toolActivity?.enabled === false ||
+					toolActivity.policyEpoch !== this.toolActivityPolicyEpoch ||
+					!this.toolActivityAuthorityIsCurrent(toolActivity))
+			) {
+				const key = `${toolActivity.sessionId}:tool:${toolActivity.toolCallId}`;
+				const owner = this.toolActivityOwners.get(key);
+				if (!this.liveMessages.has(key) && owner?.session === toolActivity.session)
+					this.toolActivityOwners.delete(key);
+				this.pool.settle(item.itemId!, "removed");
+				continue;
+			}
 			const btwDelivery = item.payload.btwDelivery;
 			if (btwDelivery) {
 				if (!btwDelivery.isAuthoritative()) {
@@ -3360,6 +4719,10 @@ export class TelegramNotificationDaemon {
 				this.pool.settle(item.itemId!, "rejected");
 				continue;
 			}
+			if (item.payload.toolActivity && !this.toolActivityAuthorityIsCurrent(item.payload.toolActivity)) {
+				this.pool.settle(item.itemId!, "removed");
+				continue;
+			}
 			// Threaded topic when available; otherwise deliver flat to the paired chat.
 			const threadField = topicId ? { message_thread_id: Number(topicId) } : {};
 			const ckey = send.editable ? item.coalesceKey : undefined;
@@ -3558,19 +4921,25 @@ export class TelegramNotificationDaemon {
 							}
 						}
 						if (editKey && ckey !== undefined && firstMessageId !== undefined && !send.terminal) {
-							this.recordLiveMessage(item.sessionId, ckey, firstMessageId);
+							this.recordLiveMessage(item.sessionId, ckey, firstMessageId, item.payload.toolActivity);
 						}
 					}
 				}
 			} catch {
 				// Best-effort: a failed send/edit must never stop the daemon.
 				disposition = "ambiguous";
+				if (item.payload.toolActivity?.phase === "started") this.toolActivityAmbiguous = true;
 			} finally {
 				this.pool.settle(item.itemId!, disposition);
 				// A terminal tool frame owns the end of this coalescing key even when both
 				// edit and fallback delivery fail. Retaining the old message id would leak
 				// one entry per failure and let a later reused key edit stale Telegram state.
-				if (send.terminal && editKey) this.liveMessages.delete(editKey);
+				if (send.terminal && editKey) {
+					this.liveMessages.delete(editKey);
+					const owner = this.toolActivityOwners.get(editKey);
+					if (!item.payload.toolActivity || owner?.session === item.payload.toolActivity.session)
+						this.toolActivityOwners.delete(editKey);
+				}
 			}
 		}
 	}
@@ -3580,7 +4949,12 @@ export class TelegramNotificationDaemon {
 	 * so later live/finalized frames edit it in place. Evicts this session's stale
 	 * same-category entries (e.g. prior turns) so the map stays bounded.
 	 */
-	private recordLiveMessage(sessionId: string, coalesceKey: string, messageId: number): void {
+	private recordLiveMessage(
+		sessionId: string,
+		coalesceKey: string,
+		messageId: number,
+		toolActivity?: ToolActivityOwner,
+	): void {
 		const mapKey = `${sessionId}:${coalesceKey}`;
 		const category = coalesceKey.split(":")[0] ?? "";
 		// Single-slot categories (rolling turn/context/reasoning previews) evict prior
@@ -3595,7 +4969,15 @@ export class TelegramNotificationDaemon {
 				if (k !== mapKey && k.startsWith(prefix)) this.liveMessages.delete(k);
 			}
 		}
+		if (toolActivity) {
+			const owner = this.toolActivityOwners.get(mapKey);
+			if (this.revokedToolEndpoints.has(toolActivity.endpointDigest) || owner?.session !== toolActivity.session) {
+				void this.enqueueToolTerminalization([{ messageId, owner: toolActivity }], false);
+				return;
+			}
+		}
 		this.liveMessages.set(mapKey, messageId);
+		if (toolActivity) this.toolActivityOwners.set(mapKey, toolActivity);
 	}
 
 	/**
@@ -3607,11 +4989,20 @@ export class TelegramNotificationDaemon {
 	 * content never lands in a shared chat. Identity headers are sent at most once per
 	 * session in flat mode.
 	 */
-	private async deliverFlatFallback(sessionId: string, send: ThreadedSend): Promise<void> {
+	private async deliverFlatFallback(
+		sessionId: string,
+		send: ThreadedSend,
+		toolActivity?: ToolActivityOwner,
+	): Promise<void> {
 		if (!(await this.pairedChatIsPrivate())) return;
 		await this.notifyThreadedFallback();
 		if (send.identity && this.flatIdentitySent.has(sessionId)) return;
-		this.submitPool({ sessionId, lane: send.lane, coalesceKey: send.coalesceKey, payload: { send } });
+		this.submitPool({
+			sessionId,
+			lane: send.lane,
+			coalesceKey: send.coalesceKey,
+			payload: { send, ...(toolActivity ? { toolActivity } : {}) },
+		});
 		await this.flushPool();
 		if (send.identity) this.flatIdentitySent.add(sessionId);
 	}
@@ -3683,11 +5074,13 @@ export class TelegramNotificationDaemon {
 		return renewDaemonHeartbeat({
 			settings: this.opts.settings,
 			ownerId: this.opts.ownerId,
+			acquisitionId: this.opts.ownerId,
 			tokenFingerprint: tokenFingerprint(this.opts.botToken),
 			chatId: this.opts.chatId,
 			fs: this.fsImpl,
 			now: this.opts.now,
 			pid: this.opts.pid ?? process.pid,
+			pidIncarnation: this.opts.pidIncarnation,
 		});
 	}
 
@@ -3834,9 +5227,13 @@ export class TelegramNotificationDaemon {
 
 	async handleSessionMessage(session: SessionSocket, msg: any): Promise<void> {
 		if (session.replayPending) {
+			if (msg?.type === "tool_activity" && (this.opts.toolActivity?.enabled === false || this.toolActivityStopping))
+				return;
 			const matchingReplay = msg?.type === "event_replay_result" && msg.id === session.replayId;
 			if (!matchingReplay) {
-				session.replayQueue.push(msg as Record<string, unknown>);
+				const frame = msg as Record<string, unknown>;
+				if (frame.type === "tool_activity") this.replayToolActivityEpochs.set(frame, this.toolActivityPolicyEpoch);
+				session.replayQueue.push(frame);
 				return;
 			}
 			session.replayPending = false;
@@ -3881,6 +5278,11 @@ export class TelegramNotificationDaemon {
 			}
 			const queued = session.replayQueue.splice(0);
 			for (const frame of queued) {
+				if (
+					frame.type === "tool_activity" &&
+					this.replayToolActivityEpochs.get(frame) !== this.toolActivityPolicyEpoch
+				)
+					continue;
 				const fingerprint = JSON.stringify(frame);
 				const remaining = replayCounts.get(fingerprint) ?? 0;
 				if (remaining > 0) {
@@ -3958,6 +5360,7 @@ export class TelegramNotificationDaemon {
 			};
 			this.#btwTerminalDeliveries.set(requestId, terminalDelivery);
 			let deliveryOutcome: "accepted" | "not_delivered" | "uncertain" | "partial_accepted" = "not_delivered";
+			let observerOutcome: BtwTerminalDeliveryOutcome = deliveryOutcome;
 			try {
 				if (msg.status !== "ok") {
 					const text =
@@ -4023,7 +5426,7 @@ export class TelegramNotificationDaemon {
 					}
 				};
 				const html = markdownToTelegramHtml(markdown);
-				const fallback = async (): Promise<typeof deliveryOutcome> => {
+				const fallback = async (): Promise<BtwTerminalDeliveryOutcome> => {
 					let acceptedChunks = 0;
 					for (const [index, text] of splitTelegramHtml(html).entries()) {
 						const outcome = await this.#queueBtwFallbackChunk({
@@ -4045,6 +5448,7 @@ export class TelegramNotificationDaemon {
 							continue;
 						}
 						if (outcome === "partial_accepted" || acceptedChunks > 0) return "partial_accepted";
+						if (outcome === "stale") return "stale";
 						return outcome === "uncertain" ? "uncertain" : "not_delivered";
 					}
 					return "accepted";
@@ -4056,16 +5460,21 @@ export class TelegramNotificationDaemon {
 						reply_parameters: { message_id: pending.messageId },
 						rich_message: { markdown, skip_entity_detection: true },
 					});
-					deliveryOutcome =
-						outcome === "accepted"
-							? "accepted"
-							: outcome === "rejected"
-								? await fallback()
-								: outcome === "uncertain"
-									? "uncertain"
-									: "not_delivered";
+					if (outcome === "accepted") {
+						deliveryOutcome = "accepted";
+						observerOutcome = "accepted";
+					} else if (outcome === "rejected") {
+						const fallbackOutcome = await fallback();
+						observerOutcome = fallbackOutcome;
+						deliveryOutcome = fallbackOutcome === "stale" ? "not_delivered" : fallbackOutcome;
+					} else {
+						deliveryOutcome = outcome === "uncertain" ? "uncertain" : "not_delivered";
+						observerOutcome = outcome === "stale" ? "stale" : deliveryOutcome;
+					}
 				} else {
-					deliveryOutcome = await fallback();
+					const fallbackOutcome = await fallback();
+					observerOutcome = fallbackOutcome;
+					deliveryOutcome = fallbackOutcome === "stale" ? "not_delivered" : fallbackOutcome;
 				}
 			} finally {
 				if (this.#btwTerminalDeliveries.get(requestId) === terminalDelivery) {
@@ -4084,17 +5493,87 @@ export class TelegramNotificationDaemon {
 					}
 				} finally {
 					terminalDelivery.finish();
+					observerOutcome = observerOutcome === "stale" ? "stale" : deliveryOutcome;
+					if (this.#pendingBtwTurns.get(requestId) !== pending) {
+						try {
+							const observer = (
+								this as unknown as Record<symbol, ((receipt: BtwTerminalDeliveryReceipt) => void) | undefined>
+							)[BTW_TERMINAL_DELIVERY_TEST_OBSERVER];
+							observer?.({
+								requestId,
+								logicalSessionId: pending.logicalSessionId,
+								transportSessionId: pending.transportSessionId,
+								threadId: pending.threadId,
+								updateId: pending.updateId,
+								messageId: pending.messageId,
+								outcome: observerOutcome,
+							});
+						} catch {
+							logger.warn("notifications: /btw terminal delivery observer failed");
+						}
+					}
 				}
 			}
 			return;
 		}
 		if (typeof msg?.type === "string" && TelegramNotificationDaemon.THREADED_FRAMES.has(msg.type)) {
+			const threadedFrame = msg as Record<string, unknown>;
+			const toolActivity = this.toolActivityOwner(session, threadedFrame);
+			const toolAdmissionEpoch = toolActivity
+				? (this.replayToolActivityEpochs.get(threadedFrame) ?? this.toolActivityPolicyEpoch)
+				: undefined;
+			if (toolActivity) toolActivity.policyEpoch = toolAdmissionEpoch;
+			const toolStartIsCurrent = (): boolean =>
+				toolActivity?.phase !== "started" ||
+				(this.toolActivityAuthorityIsCurrent(toolActivity) &&
+					!this.toolActivityStopping &&
+					this.opts.toolActivity?.enabled !== false &&
+					toolAdmissionEpoch === this.toolActivityPolicyEpoch);
+			const abandonStaleToolStart = (): void => {
+				if (toolActivity?.phase !== "started") return;
+				const key = `${session.sessionId}:tool:${toolActivity.toolCallId}`;
+				const owner = this.toolActivityOwners.get(key);
+				if (!this.liveMessages.has(key) && owner?.session === toolActivity.session)
+					this.toolActivityOwners.delete(key);
+			};
+			if (toolActivity) {
+				const liveKey = `${session.sessionId}:tool:${toolActivity.toolCallId}`;
+				const currentOwner = this.toolActivityOwners.get(liveKey);
+				if (toolActivity.phase === "started") {
+					if (!toolStartIsCurrent()) return;
+					this.toolActivityOwners.set(liveKey, toolActivity);
+				} else {
+					if (currentOwner && currentOwner.session !== session) return;
+					if (this.opts.toolActivity?.enabled === false) {
+						if (!currentOwner) return;
+						if (!this.liveMessages.has(liveKey)) {
+							// A start may already be granted to the serialized dispatcher but not
+							// yet recorded as visible. Wait for that exact dispatch boundary before
+							// deciding whether its terminal frame must close a visible message.
+							await this.flushChain;
+						}
+						const settledOwner = this.toolActivityOwners.get(liveKey);
+						if (!this.liveMessages.has(liveKey) || settledOwner?.session !== session) {
+							if (settledOwner?.session === session) this.toolActivityOwners.delete(liveKey);
+							return;
+						}
+					}
+				}
+			}
 			const send = renderThreadedFrame(msg);
 			if (!send) return;
 			const existingTopic = await this.existingTopicForPrivateChat(session.sessionId);
+			if (!toolStartIsCurrent()) {
+				abandonStaleToolStart();
+				return;
+			}
 			if (this.topics.get(session.sessionId)?.authorityState === "delete_pending") return;
 			if (!send.identity && !existingTopic && !this.flatIdentitySent.has(session.sessionId)) {
-				this.rememberPendingThreadedFrame(session.sessionId, send, msg as Record<string, unknown>);
+				if (!toolStartIsCurrent()) {
+					abandonStaleToolStart();
+					return;
+				}
+				this.rememberPendingThreadedFrame(session, send, threadedFrame, toolActivity);
 				return;
 			}
 			if (send.identity && !this.sessionCanClaimIdentity(session, msg)) {
@@ -4108,9 +5587,13 @@ export class TelegramNotificationDaemon {
 			const topicId =
 				existingTopic ?? (await this.ensureTopic(session.sessionId, this.topicNameFor(session.sessionId, msg)));
 			const topicLease = await this.topicAuthorityLease(session.sessionId);
+			if (!toolStartIsCurrent()) {
+				abandonStaleToolStart();
+				return;
+			}
 			if (!topicId || !topicLease || topicLease.topicId !== topicId) {
 				if (this.topics.get(session.sessionId)?.authorityState === "delete_pending") return;
-				await this.deliverFlatFallback(session.sessionId, send);
+				await this.deliverFlatFallback(session.sessionId, send, toolActivity);
 				return;
 			}
 			if (send.identity) {
@@ -4158,7 +5641,11 @@ export class TelegramNotificationDaemon {
 				await this.persistTopics();
 				return;
 			}
-			await this.submitThreadedFrame(session.sessionId, send, topicLease);
+			if (!toolStartIsCurrent()) {
+				abandonStaleToolStart();
+				return;
+			}
+			await this.submitThreadedFrame(session.sessionId, send, topicLease, toolActivity);
 			return;
 		}
 		if (msg.type === "action_needed" && msg.id) {
@@ -4473,28 +5960,32 @@ export class TelegramNotificationDaemon {
 				}
 			}
 		}
-		// Rich-message toggle (/rich on|off): daemon-local delivery policy, NOT a
-		// session config forward. Handled at paired-chat pre-routing, before threaded
-		// injection and independent of any session WebSocket, so it works even when
-		// no session is connected and never becomes an ask answer.
+		// Telegram delivery toggles are daemon-local policy, NOT session config
+		// forwards. Handle them before threaded injection and independently of any
+		// session WebSocket, so they work even when no session is connected.
 		{
 			const m = (update as { update_id?: number; message?: Record<string, unknown> }).message;
 			const chat = m?.chat as { id?: unknown } | undefined;
 			const cmdText = typeof m?.text === "string" ? m.text : undefined;
-			const rawFirst = cmdText?.trim().split(/\s+/)[0]?.toLowerCase();
-			// Fail-closed: intercept ANY "/rich" or "/rich@<anything>" form (Telegram
-			// appends @botname in groups; the bot username may be unknown if getMe
-			// failed) so a rich command is never leaked into threaded injection / an
-			// ask answer. Argument validity is decided by parseRichToggleCommand below.
-			const isRichCommand = rawFirst?.split("@")[0] === "/rich";
-			if (m !== undefined && String(chat?.id) === String(this.opts.chatId) && isRichCommand) {
-				// Fail-closed: /rich mutates global config, so honor it ONLY in a PRIVATE
-				// paired chat — the same contract as session delivery and lifecycle
-				// commands. A group/supergroup chatId (legacy or hand-edited) must never
-				// let an arbitrary chat member toggle the owner's notification config.
+			const commandToken = cmdText?.trim().split(/\s+/)[0]?.toLowerCase();
+			const [command, commandSuffix] = commandToken?.split("@", 2) ?? [];
+			const isRichCommand = command === "/rich";
+			const isToolActivityCommand = command === "/toolactivity";
+			if (
+				isToolActivityCommand &&
+				commandSuffix &&
+				(!this.botUsername || commandSuffix !== this.botUsername.toLowerCase())
+			)
+				return;
+			if (
+				m !== undefined &&
+				String(chat?.id) === String(this.opts.chatId) &&
+				(isRichCommand || isToolActivityCommand)
+			) {
+				// These commands mutate global config, so honor them ONLY in the
+				// configured private chat. Fail closed for legacy or hand-edited group IDs.
 				if (!(await this.pairedChatIsPrivate())) return;
 				const updateId = (update as { update_id?: number }).update_id;
-				// Dedupe redelivered updates so a toggle+confirmation runs at most once.
 				if (typeof updateId === "number") {
 					if (this.dispatchState.seenUpdateIds.has(updateId)) return;
 					await this.rememberSeenUpdateId(updateId);
@@ -4513,31 +6004,70 @@ export class TelegramNotificationDaemon {
 						// Best-effort confirmation; never block on the notice.
 					}
 				};
-				const desired = parseRichToggleCommand(cmdText ?? "");
+				const desired = isRichCommand
+					? parseRichToggleCommand(cmdText ?? "")
+					: parseToolActivityToggleCommand(cmdText ?? "", this.botUsername);
+				const usage = isRichCommand ? "Usage: /rich on|off" : "Usage: /toolactivity on|off";
 				if (desired === undefined) {
-					await reply("Usage: /rich on|off");
+					await reply(usage);
 					return;
 				}
+				const settingPath = isRichCommand
+					? "notifications.telegram.rich.enabled"
+					: "notifications.telegram.toolActivity.enabled";
+				const label = isRichCommand ? "Rich messages" : "Tool activity";
 				try {
-					await this.opts.settings.set("notifications.telegram.rich.enabled", desired);
-					// Confirm success only after a DURABLE write. The real Settings.set is
-					// a synchronous fire-and-forget whose queued save (Settings.#saveNow)
-					// swallows write errors, and Settings.flush() inherits that — neither
-					// rejects on a failed config.yml write. flushOrThrow() rethrows the
-					// durable-write failure so it lands in the catch below (in-memory
-					// isolated Settings short-circuit and never throw). The lightweight
-					// daemon settings has no flushOrThrow: its set() already wrote durably
-					// (and throws on failure), so its flush() is only a no-op drain.
-					await flushRichToggleSettings(this.opts.settings);
+					await this.opts.settings.set(settingPath, desired);
+					// Confirm only after the global config write is durable.
+					await flushTelegramToggleSettings(this.opts.settings);
 				} catch (err) {
 					logger.warn(
-						`notifications: /rich settings write failed (${err instanceof Error ? err.message : String(err)}); runtime unchanged`,
+						`notifications: ${command} settings write failed (${err instanceof Error ? err.message : String(err)}); runtime unchanged`,
 					);
-					await reply("Rich messages: unchanged (settings write failed)");
+					await reply(`${label}: unchanged (settings write failed)`);
 					return;
 				}
-				this.opts.rich = { enabled: desired };
-				await reply(desired ? "Rich messages: on" : "Rich messages: off");
+				if (isRichCommand) {
+					this.opts.rich = { enabled: desired };
+				} else {
+					this.toolActivityPolicyEpoch++;
+					this.opts.toolActivity = { enabled: desired };
+					if (!desired) {
+						const removedTools = this.pool.removeWhere(
+							item => item.lane === "live" && item.coalesceKey?.startsWith("tool:") === true,
+						);
+						for (const item of removedTools) {
+							const toolActivity = item.payload.toolActivity;
+							if (!toolActivity) continue;
+							const key = `${toolActivity.sessionId}:tool:${toolActivity.toolCallId}`;
+							const owner = this.toolActivityOwners.get(key);
+							if (!this.liveMessages.has(key) && owner?.session === toolActivity.session)
+								this.toolActivityOwners.delete(key);
+						}
+						for (const [sessionId, frames] of this.pendingThreadedFrames) {
+							for (const frame of frames) {
+								const toolActivity = frame.toolActivity;
+								if (!toolActivity || frame.msg.type !== "tool_activity") continue;
+								const key = `${toolActivity.sessionId}:tool:${toolActivity.toolCallId}`;
+								const owner = this.toolActivityOwners.get(key);
+								if (!this.liveMessages.has(key) && owner?.session === toolActivity.session)
+									this.toolActivityOwners.delete(key);
+							}
+							const retained = frames.filter(frame => frame.msg.type !== "tool_activity");
+							if (retained.length === 0) this.pendingThreadedFrames.delete(sessionId);
+							else this.pendingThreadedFrames.set(sessionId, retained);
+						}
+						for (const session of this.sessions.values()) {
+							session.replayQueue = session.replayQueue.filter(frame => frame.type !== "tool_activity");
+						}
+					}
+					// The policy flips before joining the serialized dispatch chain:
+					// future starts are rejected immediately, queued starts are removed,
+					// and any already-granted Bot API effect settles before the off
+					// acknowledgement. Visible starts may still receive their terminal edit.
+					await this.flushChain;
+				}
+				await reply(`${label}: ${desired ? "on" : "off"}`);
 				return;
 			}
 		}
@@ -4855,6 +6385,10 @@ export class TelegramNotificationDaemon {
 					{ command: "lean", description: "Mirror assistant text + tool names only (default)" },
 					{ command: "redact", description: "Toggle redaction of streamed content: /redact <on|off>" },
 					{ command: "rich", description: "Toggle rich Telegram delivery: /rich <on|off>" },
+					{
+						command: "toolactivity",
+						description: "Toggle tool activity updates: /toolactivity <on|off>",
+					},
 					{ command: "reasoning", description: "Show or change reasoning effort in this session" },
 					{ command: "usage", description: "Show provider/local usage for this session" },
 					{ command: "model", description: "Select a model for this session" },
@@ -4883,11 +6417,13 @@ export class TelegramNotificationDaemon {
 		this.running = await renewDaemonHeartbeat({
 			settings: this.opts.settings,
 			ownerId: this.opts.ownerId,
+			acquisitionId: this.opts.ownerId,
 			tokenFingerprint: tokenFingerprint(this.opts.botToken),
 			chatId: this.opts.chatId,
 			fs: this.fsImpl,
 			now: this.opts.now,
 			pid: this.opts.pid ?? process.pid,
+			pidIncarnation: this.opts.pidIncarnation,
 		});
 		if (!this.running) return;
 		this.runtime.start();
@@ -4909,7 +6445,20 @@ export class TelegramNotificationDaemon {
 			let idleSince = this.runtime.now();
 			while (this.running) {
 				if (await this.controlStopRequested()) break;
-				if (!(await this.renewOwnershipHeartbeat())) break;
+				if (
+					!(await renewDaemonHeartbeat({
+						settings: this.opts.settings,
+						ownerId: this.opts.ownerId,
+						acquisitionId: this.opts.ownerId,
+						tokenFingerprint: tokenFingerprint(this.opts.botToken),
+						chatId: this.opts.chatId,
+						fs: this.fsImpl,
+						now: this.opts.now,
+						pid: this.opts.pid ?? process.pid,
+						pidIncarnation: this.opts.pidIncarnation,
+					}))
+				)
+					break;
 				await this.runScan();
 				if (await this.controlStopRequested()) break;
 				const idleElapsed = this.runtime.now() - idleSince >= (this.opts.idleTimeoutMs ?? 60_000);
@@ -4944,10 +6493,19 @@ export class TelegramNotificationDaemon {
 				await this.runtime.sleep(10);
 			}
 		} finally {
+			let toolShutdownError: unknown;
+			try {
+				await this.beginToolActivityShutdown();
+			} catch (error) {
+				toolShutdownError = error;
+			}
 			this.effects.beginShutdown();
+			this.#deliveryAbort.abort();
 			let persisted = false;
 			const shutdown = this.effects.allowTerminal(async () => {
+				if (toolShutdownError) throw toolShutdownError;
 				await this.#drainBtwTurns();
+				await this.toolTerminalizationChain;
 				this.runtime.stop();
 				this.stopOwnershipHeartbeatTimer();
 				this.stopFlushTimer();
@@ -4981,9 +6539,12 @@ export class TelegramNotificationDaemon {
 				await releaseDaemonOwnership({
 					settings: this.opts.settings,
 					ownerId: this.opts.ownerId,
+					acquisitionId: this.opts.ownerId,
 					tokenFingerprint: tokenFingerprint(this.opts.botToken),
 					chatId: this.opts.chatId,
 					pid: this.opts.pid ?? process.pid,
+					generation: DAEMON_GENERATION,
+					pidIncarnation: this.opts.pidIncarnation,
 					fs: this.fsImpl,
 					now: this.opts.now,
 				});