opencode-zellij 0.0.13 → 0.0.15

package/dist/index.mjs

@@ -39,7 +39,7 @@ async function installedPackageMetadata(installRoot) {
 	try {
 		const content = await readFile(join(packageDir(installRoot), "package.json"), "utf8");
 		const pkg = JSON.parse(content);
-		if (isRecord$1(pkg)) return {
+		if (isRecord$2(pkg)) return {
 			name: typeof pkg.name === "string" ? pkg.name : void 0,
 			version: typeof pkg.version === "string" ? pkg.version : void 0,
 			main: typeof pkg.main === "string" ? pkg.main : void 0
@@ -107,7 +107,7 @@ async function findInstallContext(importMetaUrl) {
 			try {
 				const content = await readFile(packageJsonPath, "utf8");
 				const pkg = JSON.parse(content);
-				if (isRecord$1(pkg) && pkg.name === "opencode-zellij" && typeof pkg.version === "string" && pkg.version.length > 0) {
+				if (isRecord$2(pkg) && pkg.name === "opencode-zellij" && typeof pkg.version === "string" && pkg.version.length > 0) {
 					const installRoot = dirname(dirname(dir));
 					if (existsSync(join(installRoot, "package.json"))) return {
 						installRoot,
@@ -124,7 +124,7 @@ async function findInstallContext(importMetaUrl) {
 		dir = parent;
 	}
 }
-function isRecord$1(value) {
+function isRecord$2(value) {
 	return typeof value === "object" && value !== null;
 }
 function isAutoUpdatableSpec(spec) {
@@ -143,7 +143,7 @@ async function fetchLatestVersion(fetchImpl = globalThis.fetch) {
 			return;
 		}
 		const data = await response.json();
-		if (isRecord$1(data) && typeof data.latest === "string") return data.latest;
+		if (isRecord$2(data) && typeof data.latest === "string") return data.latest;
 		debug("npm registry response missing latest tag");
 		return;
 	} catch (cause) {
@@ -584,7 +584,7 @@ function numericProperty(object, keys) {
 		}
 	}
 }
-function stringProperty$1(object, keys) {
+function stringProperty$2(object, keys) {
 	for (const key of keys) {
 		const value = object[key];
 		if (typeof value === "string") return value;
@@ -643,7 +643,7 @@ function parsePaneExists(listPanesJson, paneId) {
 function tabNameProperty(object, tabId) {
 	if (tabId === void 0) return void 0;
 	if (numericProperty(object, ["tab_id", "tabId"]) !== tabId) return void 0;
-	const name = stringProperty$1(object, ["name", "title"]);
+	const name = stringProperty$2(object, ["name", "title"]);
 	return typeof name === "string" ? name : void 0;
 }
 function findTabName(value, tabId) {
@@ -1099,6 +1099,7 @@ var SubscriberManager = class {
 	startingSessions = /* @__PURE__ */ new Map();
 	spawnProcess;
 	dumpScreen;
+	paneExists;
 	closePane;
 	lifecycleHooks;
 	terminalTailLines;
@@ -1107,6 +1108,7 @@ var SubscriberManager = class {
 		this.maxBufferLines = maxBufferLines;
 		this.spawnProcess = dependencies.spawn ?? spawn;
 		this.dumpScreen = dependencies.dumpScreen ?? zellijCli.dumpScreen;
+		this.paneExists = dependencies.paneExists ?? zellijCli.paneExists;
 		this.closePane = dependencies.closePane ?? zellijCli.closePane;
 		this.lifecycleHooks = dependencies.lifecycleHooks;
 		this.terminalTailLines = dependencies.terminalTailLines ?? 200;
@@ -1276,8 +1278,7 @@ var SubscriberManager = class {
 	handleStderr(sessionId, child, chunk) {
 		const state = this.subscribers.get(sessionId);
 		if (!state || state.child !== child) return;
-		state.stderr.push(...splitLines(chunk));
-		if (state.stderr.length > maxStderrLines) state.stderr = state.stderr.slice(state.stderr.length - maxStderrLines);
+		this.appendStderr(state, ...splitLines(chunk));
 	}
 	handleSubscriberExit(sessionId, child) {
 		const state = this.subscribers.get(sessionId);
@@ -1285,18 +1286,46 @@ var SubscriberManager = class {
 		if (state.child !== child) return;
 		state.child = null;
 		state.lastExitedAt = (/* @__PURE__ */ new Date()).toISOString();
-		if (this.sessions.find(sessionId)?.status !== "terminal") state.stderr.push(`[zellij-pty] subscriber exited at ${state.lastExitedAt}; last buffered output is retained.`);
-		if (state.stderr.length > maxStderrLines) state.stderr = state.stderr.slice(state.stderr.length - maxStderrLines);
+		if (this.sessions.find(sessionId)?.status !== "terminal") this.appendStderr(state, `[zellij-pty] subscriber exited at ${state.lastExitedAt}; last buffered output is retained.`);
+		this.reconcileSubscriberTermination(sessionId, state, "subscriber_exit");
 	}
 	handleSubscriberError(sessionId, child, error) {
 		const state = this.subscribers.get(sessionId);
 		if (state?.child === child) {
-			state.stderr.push(error.message);
+			this.appendStderr(state, error.message);
 			state.child = null;
 			state.lastExitedAt = (/* @__PURE__ */ new Date()).toISOString();
-			this.sessions.updateStatus(sessionId, "unknown");
+			if (this.sessions.find(sessionId)?.status !== "terminal") this.sessions.updateStatus(sessionId, "unknown");
+			this.reconcileSubscriberTermination(sessionId, state, "subscriber_error");
 		}
 	}
+	appendStderr(state, ...lines) {
+		state.stderr.push(...lines);
+		if (state.stderr.length > maxStderrLines) state.stderr = state.stderr.slice(state.stderr.length - maxStderrLines);
+	}
+	async reconcileSubscriberTermination(sessionId, state, reason) {
+		const session = this.sessions.find(sessionId);
+		if (!session || session.status === "terminal" || this.subscribers.get(sessionId) !== state || state.child) return;
+		let paneExists;
+		try {
+			paneExists = await this.paneExists(session.paneId);
+		} catch (error) {
+			const latestState = this.subscribers.get(sessionId);
+			const latestSession = this.sessions.find(sessionId);
+			if (!latestState || latestState !== state || latestState.child || !latestSession || latestSession.status === "terminal") return;
+			this.appendStderr(latestState, `[zellij-pty] ${reason} reconciliation could not verify pane ${latestSession.paneId}: ${errorMessage(error)}`);
+			return;
+		}
+		const latestState = this.subscribers.get(sessionId);
+		const latestSession = this.sessions.find(sessionId);
+		if (!latestState || latestState !== state || latestState.child || !latestSession || latestSession.status === "terminal") return;
+		if (paneExists === false) {
+			this.markSessionTerminal(sessionId, reason);
+			unregisterPaneFromWatchdog(sessionId);
+			return;
+		}
+		if (paneExists === void 0) this.appendStderr(latestState, `[zellij-pty] ${reason} reconciliation could not confirm whether pane ${latestSession.paneId} still exists; leaving session non-terminal.`);
+	}
 	markSessionTerminal(sessionId, reason, input = {}) {
 		const state = this.subscribers.get(sessionId);
 		if (!state) return;
@@ -2226,41 +2255,21 @@ function exitAfterCleanup(signal, code) {
 //#endregion
 //#region src/zellij/tab-title-events.ts
 const execFileAsync = promisify(execFile);
-function isRecord(value) {
+function isRecord$1(value) {
 	return typeof value === "object" && value !== null;
 }
-function stringProperty(object, key) {
+function stringProperty$1(object, key) {
 	const value = object[key];
 	return typeof value === "string" ? value : void 0;
 }
-function nestedStringProperty(object, key, nestedKey) {
+function nestedStringProperty$1(object, key, nestedKey) {
 	const nested = object[key];
-	if (!isRecord(nested)) return void 0;
-	return stringProperty(nested, nestedKey);
+	if (!isRecord$1(nested)) return void 0;
+	return stringProperty$1(nested, nestedKey);
 }
-function sessionStatusProperty(object) {
-	const status = object.status;
-	if (!isRecord(status)) return void 0;
-	if (status.type === "idle" || status.type === "busy") return { type: status.type };
-	if (status.type === "retry") return {
-		type: "retry",
-		attempt: typeof status.attempt === "number" ? status.attempt : 0,
-		message: typeof status.message === "string" ? status.message : "",
-		next: typeof status.next === "number" ? status.next : 0
-	};
-}
-function inputRequestID(object) {
-	return stringProperty(object, "id") ?? stringProperty(object, "requestID") ?? stringProperty(object, "permissionID");
-}
-function inputState(object) {
-	return (stringProperty(object, "status") ?? stringProperty(object, "state") ?? stringProperty(object, "type"))?.toLowerCase();
-}
-function isResolvedInputState(state) {
-	return state === "approved" || state === "denied" || state === "rejected" || state === "resolved" || state === "replied";
-}
-function deletedSessionID(event) {
-	if (!isRecord(event.properties)) return void 0;
-	return nestedStringProperty(event.properties, "info", "id") ?? stringProperty(event.properties, "sessionID");
+function deletedSessionID$1(event) {
+	if (!isRecord$1(event.properties)) return void 0;
+	return nestedStringProperty$1(event.properties, "info", "id") ?? stringProperty$1(event.properties, "sessionID");
 }
 async function readGitBranch(worktree) {
 	return (await execFileAsync("git", [
@@ -2285,70 +2294,6 @@ async function getInitialBranch(worktree, readBranch = readGitBranch) {
 function shouldReadInitialBranch(zellij) {
 	return Boolean(zellij);
 }
-function handleTabTitleEvent(tabTitleManager, event) {
-	if (event.type === "server.instance.disposed" || event.type === "global.disposed") return tabTitleManager.destroy?.();
-	if (!isRecord(event.properties)) return;
-	const properties = event.properties;
-	switch (event.type) {
-		case "session.status": {
-			const sessionID = stringProperty(properties, "sessionID");
-			const status = sessionStatusProperty(properties);
-			if (sessionID && status) if (status.type === "idle") tabTitleManager.markSessionIdle(sessionID);
-			else tabTitleManager.updateSessionStatus(sessionID, status);
-			break;
-		}
-		case "session.idle": {
-			const sessionID = stringProperty(properties, "sessionID");
-			if (sessionID) tabTitleManager.markSessionIdle(sessionID);
-			break;
-		}
-		case "session.error": {
-			const sessionID = stringProperty(properties, "sessionID");
-			if (sessionID) tabTitleManager.markSessionIdle(sessionID);
-			break;
-		}
-		case "vcs.branch.updated":
-			tabTitleManager.setBranch(stringProperty(properties, "branch"));
-			break;
-		case "question.asked":
-		case "permission.asked": {
-			const id = inputRequestID(properties);
-			const sessionID = stringProperty(properties, "sessionID");
-			if (id && sessionID) {
-				tabTitleManager.markNeedsInput(id, sessionID);
-				tabTitleManager.updateSessionStatus(sessionID, { type: "busy" });
-			}
-			break;
-		}
-		case "permission.updated": {
-			const id = inputRequestID(properties);
-			const sessionID = stringProperty(properties, "sessionID");
-			const state = inputState(properties);
-			if (id && isResolvedInputState(state)) {
-				tabTitleManager.clearNeedsInput(id);
-				if (sessionID) tabTitleManager.updateSessionStatus(sessionID, { type: "busy" });
-			} else if (id && sessionID) {
-				tabTitleManager.markNeedsInput(id, sessionID);
-				tabTitleManager.updateSessionStatus(sessionID, { type: "busy" });
-			}
-			break;
-		}
-		case "question.replied":
-		case "question.rejected":
-		case "permission.replied": {
-			const id = inputRequestID(properties);
-			const sessionID = stringProperty(properties, "sessionID");
-			if (id) tabTitleManager.clearNeedsInput(id);
-			if (sessionID) tabTitleManager.updateSessionStatus(sessionID, { type: "busy" });
-			break;
-		}
-		case "session.deleted": {
-			const sessionID = deletedSessionID(event);
-			if (sessionID) tabTitleManager.removeSession(sessionID);
-			break;
-		}
-	}
-}
 //#endregion
 //#region src/zellij/tab-title.ts
 const defaultTabTitleEmojis = {
@@ -2367,12 +2312,240 @@ function sanitizeTitle(title, maxLength = 90) {
 	if (chars.length > maxLength) cleaned = `${chars.slice(0, maxLength - 1).join("")}…`;
 	return cleaned;
 }
-var TabTitleManager = class {
+function isRecord(value) {
+	return typeof value === "object" && value !== null;
+}
+function stringProperty(object, key) {
+	const value = object[key];
+	return typeof value === "string" ? value : void 0;
+}
+function nestedStringProperty(object, key, nestedKey) {
+	const nested = object[key];
+	if (!isRecord(nested)) return void 0;
+	return stringProperty(nested, nestedKey);
+}
+function sessionStatusType(properties) {
+	const status = properties.status;
+	if (!isRecord(status)) return void 0;
+	const type = status.type;
+	if (type === "idle" || type === "busy") return type;
+	if (type === "retry") return "retry";
+}
+function inputRequestID(properties) {
+	return stringProperty(properties, "id") ?? stringProperty(properties, "requestID") ?? stringProperty(properties, "permissionID");
+}
+function inputState(properties) {
+	return (stringProperty(properties, "status") ?? stringProperty(properties, "state") ?? stringProperty(properties, "type"))?.toLowerCase();
+}
+function isResolvedInputState(state) {
+	return state === "approved" || state === "denied" || state === "rejected" || state === "resolved" || state === "replied";
+}
+function deletedSessionID(properties) {
+	return nestedStringProperty(properties, "info", "id") ?? stringProperty(properties, "sessionID");
+}
+var TabTitleIdentityModel = class {
+	ready;
+	projectName;
+	branchName;
+	worktree;
+	readBranch;
+	refreshGeneration = 0;
+	constructor(options) {
+		this.projectName = options.projectName;
+		this.worktree = options.worktree;
+		this.readBranch = options.readBranch;
+		this.ready = this.refreshBranch("initial");
+	}
+	async refreshBranch(_reason) {
+		const generation = ++this.refreshGeneration;
+		try {
+			const result = await this.readBranch(this.worktree);
+			if (generation !== this.refreshGeneration) return;
+			const trimmed = result.trim() || void 0;
+			this.branchName = trimmed;
+		} catch (error) {
+			if (generation !== this.refreshGeneration) return;
+			debug("refreshBranch failed", errorMessage(error));
+		}
+	}
+	handleEvent(event) {
+		if (event.type === "vcs.branch.updated") return this.refreshBranch("vcs.branch.updated");
+	}
+};
+var TabTitleActivityModel = class {
+	status = "idle";
+	worktreeDirectory;
+	sessions = /* @__PURE__ */ new Map();
+	scopedSessions = /* @__PURE__ */ new Set();
 	runningSessions = /* @__PURE__ */ new Set();
 	pendingInputs = /* @__PURE__ */ new Map();
-	branchName;
+	constructor(options) {
+		this.worktreeDirectory = options.worktreeDirectory;
+	}
+	getSession(sessionID) {
+		return this.scopedSessions.has(sessionID) ? this.sessions.get(sessionID) : void 0;
+	}
+	hasPendingInput(sessionID, requestID) {
+		return this.pendingInputs.has(`${sessionID}:${requestID}`);
+	}
+	handleEvent(event) {
+		if (!isRecord(event.properties)) return;
+		const properties = event.properties;
+		switch (event.type) {
+			case "session.created":
+			case "session.updated": {
+				const info = properties.info;
+				if (isRecord(info)) {
+					const id = stringProperty(info, "id");
+					if (id) this.storeSession(id, info);
+				}
+				break;
+			}
+			case "session.status": {
+				const sessionID = stringProperty(properties, "sessionID");
+				const statusType = sessionStatusType(properties);
+				if (sessionID && statusType) {
+					if (statusType === "idle") {
+						if (this.runningSessions.has(sessionID)) {
+							this.runningSessions.delete(sessionID);
+							this.updateStatus();
+						}
+					} else if (statusType === "busy" || statusType === "retry") {
+						if (this.scopedSessions.has(sessionID)) {
+							this.runningSessions.add(sessionID);
+							this.updateStatus();
+						}
+					}
+				}
+				break;
+			}
+			case "session.idle":
+			case "session.error": {
+				const sessionID = stringProperty(properties, "sessionID");
+				if (sessionID && this.runningSessions.has(sessionID)) {
+					this.runningSessions.delete(sessionID);
+					this.updateStatus();
+				}
+				break;
+			}
+			case "question.asked":
+			case "permission.asked": {
+				const id = inputRequestID(properties);
+				const sessionID = stringProperty(properties, "sessionID");
+				if (id && sessionID && this.scopedSessions.has(sessionID)) {
+					this.pendingInputs.set(`${sessionID}:${id}`, sessionID);
+					this.runningSessions.add(sessionID);
+					this.updateStatus();
+				}
+				break;
+			}
+			case "permission.updated": {
+				const id = inputRequestID(properties);
+				const sessionID = stringProperty(properties, "sessionID");
+				const state = inputState(properties);
+				if (id && isResolvedInputState(state)) {
+					this.pendingInputs.delete(`${sessionID}:${id}`);
+					if (sessionID && this.runningSessions.has(sessionID)) this.runningSessions.add(sessionID);
+					this.updateStatus();
+				} else if (id && sessionID && this.scopedSessions.has(sessionID)) {
+					this.pendingInputs.set(`${sessionID}:${id}`, sessionID);
+					this.runningSessions.add(sessionID);
+					this.updateStatus();
+				}
+				break;
+			}
+			case "question.replied":
+			case "question.rejected":
+			case "permission.replied": {
+				const id = inputRequestID(properties);
+				const sessionID = stringProperty(properties, "sessionID");
+				if (id) this.pendingInputs.delete(`${sessionID}:${id}`);
+				if (sessionID && this.runningSessions.has(sessionID)) this.runningSessions.add(sessionID);
+				this.updateStatus();
+				break;
+			}
+			case "session.deleted": {
+				const sessionID = deletedSessionID(properties);
+				if (sessionID) {
+					this.removeSessionAndDescendants(sessionID);
+					this.updateStatus();
+				}
+				break;
+			}
+		}
+	}
+	storeSession(id, info) {
+		const directory = stringProperty(info, "directory");
+		const parentID = stringProperty(info, "parentID");
+		this.sessions.set(id, {
+			directory,
+			parentID
+		});
+		const isDirectlyScoped = directory === this.worktreeDirectory;
+		const isDescendantScoped = parentID ? this.scopedSessions.has(parentID) : false;
+		if (this.scopedSessions.has(id) || isDirectlyScoped || isDescendantScoped) this.scopedSessions.add(id);
+	}
+	removeSessionAndDescendants(rootID) {
+		const toRemove = /* @__PURE__ */ new Set();
+		toRemove.add(rootID);
+		let changed = true;
+		while (changed) {
+			changed = false;
+			for (const [id, session] of this.sessions) if (!toRemove.has(id) && session.parentID && toRemove.has(session.parentID)) {
+				toRemove.add(id);
+				changed = true;
+			}
+		}
+		for (const id of toRemove) {
+			this.sessions.delete(id);
+			this.scopedSessions.delete(id);
+			this.runningSessions.delete(id);
+		}
+		for (const [key, sessionID] of [...this.pendingInputs.entries()]) if (toRemove.has(sessionID)) this.pendingInputs.delete(key);
+	}
+	updateStatus() {
+		if (this.pendingInputs.size > 0) this.status = "needs-input";
+		else if (this.runningSessions.size > 0) this.status = "running";
+		else this.status = "idle";
+	}
+};
+var TabTitleActor = class {
+	ready;
+	identity;
+	activity;
+	emojis;
+	constructor(options) {
+		this.identity = options.identity;
+		this.activity = options.activity;
+		this.emojis = {
+			...defaultTabTitleEmojis,
+			...options.emojis
+		};
+		this.ready = this.identity.ready;
+	}
+	get context() {
+		return {
+			projectName: this.identity.projectName,
+			branchName: this.identity.branchName,
+			status: this.activity.status
+		};
+	}
+	get title() {
+		return formatTabTitle({
+			...this.context,
+			emojis: this.emojis
+		});
+	}
+	async handleEvent(event) {
+		this.activity.handleEvent(event);
+		const identityResult = this.identity.handleEvent(event);
+		if (identityResult instanceof Promise) await identityResult;
+	}
+};
+var TabTitleManager = class {
 	desiredTitle;
 	lastSyncedTitle;
+	syncGeneration = 0;
 	debounceTimer;
 	retryTimer;
 	retryAttempt = 0;
@@ -2381,7 +2554,6 @@ var TabTitleManager = class {
 	debounceMs;
 	retryInitialMs;
 	retryMaxMs;
-	projectName;
 	cli;
 	emojis;
 	enabled;
@@ -2390,9 +2562,8 @@ var TabTitleManager = class {
 	originalTabTitleLoaded = false;
 	originalTabTitlePromise;
 	destroyPromise;
+	actor;
 	constructor(options) {
-		this.projectName = options.projectName;
-		this.branchName = options.branchName?.trim() || void 0;
 		this.cli = options.cli ?? new ZellijCli();
 		this.emojis = {
 			...defaultTabTitleEmojis,
@@ -2401,65 +2572,12 @@ var TabTitleManager = class {
 		this.debounceMs = options.debounceMs ?? 300;
 		this.retryInitialMs = options.retryInitialMs ?? 250;
 		this.retryMaxMs = options.retryMaxMs ?? 5e3;
-		this.enabled = Boolean(process.env.ZELLIJ);
-	}
-	setBranch(branch) {
-		const trimmed = branch?.trim() || void 0;
-		if (this.branchName === trimmed) return;
-		this.branchName = trimmed;
-		this.scheduleUpdate();
-	}
-	updateSessionStatus(sessionID, status) {
-		const isRunning = status.type === "busy" || status.type === "retry";
-		const wasRunning = this.runningSessions.has(sessionID);
-		if (isRunning) {
-			if (!wasRunning) {
-				this.runningSessions.add(sessionID);
-				this.scheduleUpdate();
-			}
-		} else if (wasRunning) {
-			this.runningSessions.delete(sessionID);
-			this.scheduleUpdate();
-		}
-	}
-	markSessionIdle(sessionID) {
-		if (this.runningSessions.delete(sessionID)) this.scheduleUpdate();
-	}
-	removeSession(sessionID) {
-		const hadRunning = this.runningSessions.delete(sessionID);
-		let hadPendingInput = false;
-		for (const [id, pendingSessionID] of this.pendingInputs) if (pendingSessionID === sessionID) {
-			this.pendingInputs.delete(id);
-			hadPendingInput = true;
-		}
-		if (!hadRunning && !hadPendingInput) return;
-		this.scheduleUpdate();
-	}
-	markNeedsInput(id, sessionID) {
-		if (this.pendingInputs.get(id) === sessionID) return;
-		this.pendingInputs.set(id, sessionID);
-		this.scheduleUpdate();
-	}
-	clearNeedsInput(id) {
-		if (!this.pendingInputs.delete(id)) return;
-		this.scheduleUpdate();
-	}
-	get isBusy() {
-		return this.runningSessions.size > 0;
-	}
-	get needsInput() {
-		return this.pendingInputs.size > 0;
-	}
-	get status() {
-		if (this.needsInput) return "needs-input";
-		if (this.isBusy) return "running";
-		return "idle";
+		this.enabled = Boolean(process.env.ZELLIJ || process.env.ZELLIJ_SESSION_NAME);
+		this.actor = options.actor;
 	}
 	buildTitle() {
 		return sanitizeTitle(formatTabTitle({
-			projectName: this.projectName,
-			branchName: this.branchName,
-			status: this.status,
+			...this.actor.context,
 			emojis: this.emojis
 		}));
 	}
@@ -2490,24 +2608,27 @@ var TabTitleManager = class {
 	}
 	async syncDesiredTitle() {
 		if (!this.enabled || this.destroyed) return;
+		const generation = this.syncGeneration;
 		await this.ensureOriginalTabTitle();
-		if (this.destroyed) return;
+		if (this.destroyed || generation !== this.syncGeneration) return;
 		if (this.syncInFlight) return this.syncPromise;
 		this.syncInFlight = true;
-		this.syncPromise = this.runTitleSync();
+		this.syncPromise = this.runTitleSync(generation);
 		return this.syncPromise;
 	}
-	async runTitleSync() {
+	async runTitleSync(generation) {
 		try {
-			while (this.desiredTitle && this.desiredTitle !== this.lastSyncedTitle) {
+			while (generation === this.syncGeneration && this.desiredTitle && this.desiredTitle !== this.lastSyncedTitle) {
 				const title = this.desiredTitle;
 				try {
 					await this.cli.renameTab(title);
+					if (generation !== this.syncGeneration || this.destroyed) return;
 					this.lastSyncedTitle = title;
 					this.retryAttempt = 0;
 					this.clearRetryTimer();
 				} catch (cause) {
 					debug("Failed to rename Zellij tab.", cause);
+					if (generation !== this.syncGeneration || this.destroyed) break;
 					this.scheduleRetry();
 					break;
 				}
@@ -2558,6 +2679,8 @@ var TabTitleManager = class {
 	destroy() {
 		if (this.destroyed) return this.destroyPromise ?? Promise.resolve();
 		this.destroyed = true;
+		this.syncGeneration += 1;
+		this.desiredTitle = void 0;
 		this.clearDebounceTimer();
 		this.clearRetryTimer();
 		if (!this.enabled) return Promise.resolve();
@@ -2635,10 +2758,18 @@ function createZellijPtyPlugin(dependencies = {}) {
 		registerShutdownCleanup();
 		const workspaceRoot = getWorkspaceRoot(input);
 		const projectName = getProjectName(workspaceRoot);
-		const branchName = config.tabTitle.enabled && shouldReadInitialBranch(process.env.ZELLIJ) ? await getInitialBranch(workspaceRoot) : void 0;
-		const tabTitleManager = config.tabTitle.enabled ? new TabTitleManager({
+		const identityModel = config.tabTitle.enabled ? new TabTitleIdentityModel({
 			projectName,
-			branchName,
+			worktree: workspaceRoot,
+			readBranch: async (worktree) => shouldReadInitialBranch(process.env.ZELLIJ || process.env.ZELLIJ_SESSION_NAME) ? await getInitialBranch(worktree) ?? "" : ""
+		}) : void 0;
+		const activityModel = config.tabTitle.enabled ? new TabTitleActivityModel({ worktreeDirectory: workspaceRoot }) : void 0;
+		const actor = identityModel && activityModel ? new TabTitleActor({
+			identity: identityModel,
+			activity: activityModel
+		}) : void 0;
+		const tabTitleManager = config.tabTitle.enabled && actor ? new TabTitleManager({
+			actor,
 			debounceMs: config.tabTitle.debounceMs,
 			emojis: {
 				idle: config.tabTitle.emojiIdle,
@@ -2672,19 +2803,24 @@ function createZellijPtyPlugin(dependencies = {}) {
 			}
 		});
 		subscriberManager.setLifecycleHooks(completionNotifications ? { onSessionTerminal: (event) => void completionNotifications.handleSessionTerminal(event).catch((error) => debug("completion notification lifecycle hook failed", errorMessage(error))) } : void 0);
+		if (actor) await actor.ready;
 		tabTitleManager?.renderImmediate().catch((error) => debug("initial tab title render failed", errorMessage(error)));
 		if (config.autoUpdate) (dependencies.startAutoUpdateCheck ?? startAutoUpdateCheck)(client, dependencies.importMetaUrl ?? import.meta.url);
 		return {
 			async event(input) {
 				const event = input.event;
-				if (tabTitleManager) await handleTabTitleEvent(tabTitleManager, event);
+				if (actor && tabTitleManager) {
+					await actor.handleEvent(event);
+					if (event.type === "server.instance.disposed" || event.type === "global.disposed") await tabTitleManager.destroy();
+					else tabTitleManager.scheduleUpdate();
+				}
 				if (event.type === "server.instance.disposed" || event.type === "global.disposed") {
 					completionNotifications?.clearAll();
 					completionNotifications?.dispose();
 					subscriberManager.setLifecycleHooks(void 0);
 				}
 				if (event.type === "session.deleted") {
-					const sessionID = deletedSessionID(event);
+					const sessionID = deletedSessionID$1(event);
 					if (!sessionID) return;
 					const sessions = sessionManager.listByOpenCodeSession(sessionID);
 					for (const session of sessions) completionNotifications?.clearSession(session.id);