opencode-zellij 0.0.14 → 0.0.16

package/dist/index.mjs

@@ -663,6 +663,28 @@ function findTabName(value, tabId) {
 		if (found !== void 0) return found;
 	}
 }
+function activeTabNameProperty(object) {
+	if (object.active !== true || object.is_plugin === true) return void 0;
+	const name = stringProperty$2(object, ["name", "title"]);
+	return typeof name === "string" ? name : void 0;
+}
+function findActiveTabName(value) {
+	if (Array.isArray(value)) {
+		for (const item of value) {
+			const found = findActiveTabName(item);
+			if (found !== void 0) return found;
+		}
+		return;
+	}
+	if (typeof value !== "object" || value === null) return void 0;
+	const object = value;
+	const name = activeTabNameProperty(object);
+	if (name !== void 0) return name;
+	for (const nested of Object.values(object)) {
+		const found = findActiveTabName(nested);
+		if (found !== void 0) return found;
+	}
+}
 function parseTabName(listTabsJson, tabId) {
 	try {
 		return findTabName(JSON.parse(listTabsJson), tabId);
@@ -671,6 +693,14 @@ function parseTabName(listTabsJson, tabId) {
 		return;
 	}
 }
+function parseActiveTabName(listTabsJson) {
+	try {
+		return findActiveTabName(JSON.parse(listTabsJson));
+	} catch (error) {
+		debug("parseActiveTabName failed", errorMessage(error));
+		return;
+	}
+}
 //#endregion
 //#region src/zellij/cli.ts
 const execFileAsync$1 = promisify(execFile);
@@ -738,25 +768,28 @@ async function runZellij(actionArgs, options = {}) {
 	}
 }
 var ZellijCli = class {
+	constructor(run = runZellij) {
+		this.run = run;
+	}
 	async newPane(options) {
-		return parsePaneId((await runZellij(buildNewPaneActionArgs(options))).stdout);
+		return parsePaneId((await this.run(buildNewPaneActionArgs(options))).stdout);
 	}
 	async writeChars(paneId, data) {
-		await runZellij(zellijActionArgs("write-chars", [
+		await this.run(zellijActionArgs("write-chars", [
 			"--pane-id",
 			paneId,
 			data
 		]));
 	}
 	async sendCtrlC(paneId) {
-		await runZellij(zellijActionArgs("send-keys", [
+		await this.run(zellijActionArgs("send-keys", [
 			"--pane-id",
 			paneId,
 			"Ctrl c"
 		]));
 	}
 	async closePane(paneId) {
-		await runZellij(zellijActionArgs("close-pane", ["--pane-id", paneId]));
+		await this.run(zellijActionArgs("close-pane", ["--pane-id", paneId]));
 	}
 	closePaneSync(paneId) {
 		ensureZellijTarget();
@@ -767,10 +800,10 @@ var ZellijCli = class {
 		});
 	}
 	async focusPane(paneId) {
-		await runZellij(zellijActionArgs("focus-pane-id", [paneId]));
+		await this.run(zellijActionArgs("focus-pane-id", [paneId]));
 	}
 	async dumpScreen(paneId) {
-		return (await runZellij(zellijActionArgs("dump-screen", [
+		return (await this.run(zellijActionArgs("dump-screen", [
 			"--pane-id",
 			paneId,
 			"--full"
@@ -779,21 +812,24 @@ var ZellijCli = class {
 	async currentPaneTabId() {
 		const paneId = process.env.ZELLIJ_PANE_ID;
 		if (!paneId) return void 0;
-		return parseCurrentPaneTabId((await runZellij(zellijActionArgs("list-panes", ["--json"]), { timeoutMs: 5e3 })).stdout, paneId);
+		return parseCurrentPaneTabId((await this.run(zellijActionArgs("list-panes", ["--json"]), { timeoutMs: 5e3 })).stdout, paneId);
 	}
 	async paneExists(paneId) {
-		return parsePaneExists((await runZellij(zellijActionArgs("list-panes", ["--json"]), { timeoutMs: 5e3 })).stdout, paneId);
+		return parsePaneExists((await this.run(zellijActionArgs("list-panes", ["--json"]), { timeoutMs: 5e3 })).stdout, paneId);
 	}
 	async renameTab(title) {
 		const tabId = await this.currentPaneTabId();
 		if (tabId === void 0 && process.env.ZELLIJ) throw new Error(`Could not resolve Zellij tab id for pane ${process.env.ZELLIJ_PANE_ID ?? "<missing>"}`);
-		await runZellij(tabId === void 0 ? buildRenameTabActionArgs(title) : buildRenameTabActionArgs(title, { tabId }));
+		await this.run(tabId === void 0 ? buildRenameTabActionArgs(title) : buildRenameTabActionArgs(title, { tabId }));
 	}
 	async currentTabTitle() {
-		if (!process.env.ZELLIJ_PANE_ID) return void 0;
+		if (!process.env.ZELLIJ_PANE_ID) {
+			if (!process.env.ZELLIJ_SESSION_NAME?.trim()) return void 0;
+			return parseActiveTabName((await this.run(zellijActionArgs("list-tabs", ["--json"]), { timeoutMs: 5e3 })).stdout);
+		}
 		const tabId = await this.currentPaneTabId();
 		if (tabId === void 0) return void 0;
-		return parseTabName((await runZellij(zellijActionArgs("list-tabs", ["--json"]), { timeoutMs: 5e3 })).stdout, tabId);
+		return parseTabName((await this.run(zellijActionArgs("list-tabs", ["--json"]), { timeoutMs: 5e3 })).stdout, tabId);
 	}
 };
 const zellijCli = new ZellijCli();
@@ -1038,13 +1074,20 @@ function createExitCodeToken() {
 	return randomUUID().replaceAll("-", "");
 }
 function parseExitCodeMarker(line) {
-	const match = line.replace(ansiPattern, "").trim().match(markerPattern);
+	const match = line.replace(ansiPattern, "").replace(/\r?\n/g, "").trim().match(markerPattern);
 	if (!match?.[1] || !match[2]) return null;
 	return {
 		token: match[1],
 		exitCode: Number(match[2])
 	};
 }
+function parseExitCodeMarkerLines(lines, maxWindowLines = 8) {
+	for (let start = 0; start < lines.length; start += 1) for (let size = 1; size <= maxWindowLines && start + size <= lines.length; size += 1) {
+		const marker = parseExitCodeMarker(lines.slice(start, start + size).join("\n"));
+		if (marker) return marker;
+	}
+	return null;
+}
 //#endregion
 //#region src/zellij/subscribe.ts
 const maxStderrLines = 200;
@@ -1099,6 +1142,7 @@ var SubscriberManager = class {
 	startingSessions = /* @__PURE__ */ new Map();
 	spawnProcess;
 	dumpScreen;
+	paneExists;
 	closePane;
 	lifecycleHooks;
 	terminalTailLines;
@@ -1106,8 +1150,9 @@ var SubscriberManager = class {
 		this.sessions = sessions;
 		this.maxBufferLines = maxBufferLines;
 		this.spawnProcess = dependencies.spawn ?? spawn;
-		this.dumpScreen = dependencies.dumpScreen ?? zellijCli.dumpScreen;
-		this.closePane = dependencies.closePane ?? zellijCli.closePane;
+		this.dumpScreen = dependencies.dumpScreen ?? ((paneId) => zellijCli.dumpScreen(paneId));
+		this.paneExists = dependencies.paneExists ?? ((paneId) => zellijCli.paneExists(paneId));
+		this.closePane = dependencies.closePane ?? ((paneId) => zellijCli.closePane(paneId));
 		this.lifecycleHooks = dependencies.lifecycleHooks;
 		this.terminalTailLines = dependencies.terminalTailLines ?? 200;
 	}
@@ -1266,18 +1311,14 @@ var SubscriberManager = class {
 	captureExitCode(sessionId, lines) {
 		const session = this.sessions.get(sessionId);
 		if (!session.exitCodeToken) return;
-		for (const line of lines) {
-			const marker = parseExitCodeMarker(line);
-			if (!marker || marker.token !== session.exitCodeToken) continue;
-			this.markSessionTerminal(sessionId, "exit_marker", { exitCode: marker.exitCode });
-			return;
-		}
+		const marker = parseExitCodeMarkerLines(lines);
+		if (!marker || marker.token !== session.exitCodeToken) return;
+		this.markSessionTerminal(sessionId, "exit_marker", { exitCode: marker.exitCode });
 	}
 	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,17 +1326,45 @@ 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);
@@ -1509,7 +1578,7 @@ async function executeZellijPtyRead(args, dependencies = {}) {
 	const nextAdviceApi = dependencies.nextAdvice ?? nextAdvice;
 	const readOutputSnapshotApi = dependencies.readOutputSnapshot ?? readOutputSnapshot;
 	const validateGrepApi = dependencies.validateGrep ?? validateGrep;
-	const paneExistsApi = dependencies.paneExists ?? zellijCli.paneExists;
+	const paneExistsApi = dependencies.paneExists ?? ((paneId) => zellijCli.paneExists(paneId));
 	const session = sessionManagerApi.get(args.id);
 	const grepError = validateGrepApi(args.grep);
 	if (grepError) return {
@@ -1685,13 +1754,6 @@ const requestSudoTool = tool({
 			floating: true,
 			exitCodeToken
 		});
-		const warnings = [];
-		try {
-			await zellijCli.focusPane(paneId);
-		} catch (error) {
-			if (!(error instanceof Error ? error.message : String(error)).includes("already focused")) throw error;
-			warnings.push("Pane was already focused after creation.");
-		}
 		const session = sessionManager.create({
 			openCodeSessionId: context.sessionID,
 			paneId,
@@ -1709,7 +1771,7 @@ const requestSudoTool = tool({
 			session: publicSession(session),
 			output: readOutputSnapshot(session.id),
 			next: nextAdvice(false, "The user must review the summary and commands in Zellij, then type YES and any required credentials directly in the pane."),
-			warnings
+			warnings: []
 		});
 	}
 });
@@ -1958,6 +2020,9 @@ function parseSessionStatus(value) {
 const completionTitle = "Zellij PTY session completed";
 const completionMessage = "A Zellij PTY session completed. Review the finished pane if needed.";
 const queuedNoticeHeader = "[OpenCode] Zellij PTY completion notice";
+function supportsActivePrompt(mode) {
+	return mode === "prompt" || mode === "queue+toast";
+}
 function buildQueuedCompletionNotice(events) {
 	return [queuedNoticeHeader, ...events.map((event) => `- ${event.session.id} (${event.session.paneId}) 已完成，請使用 zellij_pty_read 讀取最終輸出並清理 pane。`)].join("\n");
 }
@@ -1999,7 +2064,7 @@ function injectQueuedCompletionNotice(input, notice) {
 	};
 }
 function evaluateCompletionPromptDecision(input) {
-	if (input.config.mode !== "prompt") return {
+	if (!supportsActivePrompt(input.config.mode)) return {
 		shouldPrompt: false,
 		shouldQueue: false,
 		reason: "prompt mode disabled"
@@ -2084,6 +2149,7 @@ var SessionCompletionNotificationQueue = class {
 		const state = {
 			event,
 			queued: false,
+			sent: false,
 			toastSent: false,
 			promptAttempts: 0,
 			promptAttemptedAt: null
@@ -2098,7 +2164,7 @@ var SessionCompletionNotificationQueue = class {
 				this.finalize(state);
 				return;
 			case "queue+toast":
-				state.queued = true;
+				await this.tryPromptOrQueue(state);
 				await this.sendToast(state);
 				return;
 			case "prompt":
@@ -2112,7 +2178,7 @@ var SessionCompletionNotificationQueue = class {
 		if (pending.length === 0) return input;
 		const notice = buildQueuedCompletionNotice(pending.map((state) => state.event));
 		for (const state of pending) {
-			if (!state.toastSent) this.context.markSent(state.event.sessionId);
+			this.markStateSent(state);
 			this.finalize(state);
 		}
 		return injectQueuedCompletionNotice(input, notice);
@@ -2158,7 +2224,7 @@ var SessionCompletionNotificationQueue = class {
 				state.queued = true;
 				return;
 			}
-			this.context.markSent(state.event.sessionId);
+			this.markStateSent(state);
 			this.finalize(state);
 		} catch (error) {
 			debug("completion notification prompt failed", errorMessage(error));
@@ -2179,12 +2245,17 @@ var SessionCompletionNotificationQueue = class {
 				duration: 1e4
 			} });
 			state.toastSent = true;
-			this.context.markSent(state.event.sessionId);
+			this.markStateSent(state);
 			if (!state.queued) this.finalize(state);
 		} catch (error) {
 			debug("completion notification toast failed", errorMessage(error));
 		}
 	}
+	markStateSent(state) {
+		if (state.sent) return;
+		this.context.markSent(state.event.sessionId);
+		state.sent = true;
+	}
 	finalize(state) {
 		this.states.delete(state.event.sessionId);
 	}
@@ -2516,6 +2587,7 @@ var TabTitleActor = class {
 var TabTitleManager = class {
 	desiredTitle;
 	lastSyncedTitle;
+	syncGeneration = 0;
 	debounceTimer;
 	retryTimer;
 	retryAttempt = 0;
@@ -2578,24 +2650,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;
 				}
@@ -2646,6 +2721,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();