jeopi-cli 16.6.9 → 16.6.11

package/src/messenger/live-session.ts

@@ -0,0 +1,321 @@
+import type { AssistantMessage, UserMessage } from "jeopi-ai";
+import type { InteractiveModeContext } from "../modes/types";
+import { loadMessengerConfig, validateMessengerEnvironment } from "./config";
+import { createDiscordAdapter, type DiscordTransportDeps } from "./discord";
+import { createMessengerGateway, isMessengerMessageAllowed, type MessengerGateway } from "./gateway";
+import type { MessengerAdapter, MessengerConfig, MessengerReply } from "./types";
+
+const DEFAULT_POLL_INTERVAL_MS = 250;
+const LIVE_HOST_ABORT_TIMEOUT_MS = 1000;
+const LIVE_BUSY_MESSAGE = "The live session is busy. Please try again when it is idle.";
+const LIVE_UNAVAILABLE_MESSAGE = "The live Discord bridge is no longer attached to this session.";
+
+export interface LiveDiscordBridgeDependencies {
+	createAdapter?: typeof createDiscordAdapter;
+	createGateway?: typeof createMessengerGateway;
+	env?: Record<string, string | undefined>;
+	transport?: DiscordTransportDeps;
+	pollIntervalMs?: number;
+}
+
+export interface LiveDiscordBridge {
+	readonly gateway: MessengerGateway;
+	readonly active: boolean;
+	run(signal?: AbortSignal): Promise<void>;
+	close(): Promise<void>;
+}
+
+interface TurnCapture {
+	readonly promptText: string;
+	promptSeen: boolean;
+	dispatched: boolean;
+	hostSettled: boolean;
+	conflicted: boolean;
+}
+
+export interface LiveDiscordBridgeOptions {
+	/** Explicit acknowledgement that Discord requests may use this host session's tools. */
+	acknowledgeFullControl?: boolean;
+}
+
+function userMessageText(message: UserMessage): string {
+	if (typeof message.content === "string") return message.content;
+	return message.content
+		.filter(block => block.type === "text")
+		.map(block => block.text)
+		.join("");
+}
+function assistantMessageText(message: AssistantMessage): string {
+	return message.content
+		.filter(block => block.type === "text")
+		.map(block => block.text)
+		.join("\n");
+}
+
+function sameSession(
+	ctx: InteractiveModeContext,
+	attachedSession: InteractiveModeContext["session"],
+	sessionId: string,
+	sessionFile: string | undefined,
+): boolean {
+	return (
+		ctx.session === attachedSession &&
+		!attachedSession.isDisposed &&
+		ctx.sessionManager.getSessionId() === sessionId &&
+		ctx.sessionManager.getSessionFile() === sessionFile &&
+		!ctx.shutdownRequested &&
+		!ctx.isShuttingDown
+	);
+}
+
+function isCompetingMessage(message: { role: string; attribution?: string }): boolean {
+	if (message.role === "user") return true;
+	const attribution = message.attribution ?? "agent";
+	return (
+		(message.role === "custom" || message.role === "developer" || message.role === "hookMessage") &&
+		attribution !== "agent"
+	);
+}
+
+async function awaitWithAbort<T>(operation: Promise<T>, signal: AbortSignal | undefined): Promise<T> {
+	if (!signal) return operation;
+	if (signal.aborted) throw new Error(LIVE_UNAVAILABLE_MESSAGE);
+	const cancellation = Promise.withResolvers<never>();
+	const onAbort = () => cancellation.reject(new Error(LIVE_UNAVAILABLE_MESSAGE));
+	signal.addEventListener("abort", onAbort, { once: true });
+	if (signal.aborted) onAbort();
+	try {
+		return await Promise.race([operation, cancellation.promise]);
+	} finally {
+		signal.removeEventListener("abort", onAbort);
+	}
+}
+
+async function awaitHostAbort(operation: Promise<void>): Promise<void> {
+	const timeout = Promise.withResolvers<never>();
+	const timer = setTimeout(
+		() => timeout.reject(new Error("Live Discord host abort timed out")),
+		LIVE_HOST_ABORT_TIMEOUT_MS,
+	);
+	try {
+		await Promise.race([operation, timeout.promise]);
+	} finally {
+		clearTimeout(timer);
+	}
+}
+
+function liveConfig(config: MessengerConfig): MessengerConfig {
+	const discord = config.platforms.discord;
+	if (!discord) throw new Error("Live Discord requires a discord platform configuration");
+	if (discord.allowedChannelIds === undefined || discord.allowedChannelIds.length === 0) {
+		throw new Error("Live Discord requires an explicit nonempty allowedChannelIds list");
+	}
+	return { ...config, platforms: { discord } };
+}
+
+/**
+ * Attach an authorized Discord transport to the already-running interactive session.
+ * This never creates, switches, or disposes an AgentSession. The caller owns activation
+ * and must retain the returned bridge to close it when the TUI shuts down.
+ */
+export function createLiveDiscordBridge(
+	ctx: InteractiveModeContext,
+	config: MessengerConfig,
+	dependencies: LiveDiscordBridgeDependencies = {},
+	options: LiveDiscordBridgeOptions = {},
+): LiveDiscordBridge {
+	if (!options.acknowledgeFullControl) {
+		throw new Error(
+			"Live Discord requires explicit full-control acknowledgement (--allow-full-control); " +
+				"Discord requests run in the active session with its tools and approval policy",
+		);
+	}
+	const scopedConfig = liveConfig(config);
+	validateMessengerEnvironment(scopedConfig, dependencies.env);
+	const attachedSession = ctx.session;
+	const sessionId = ctx.sessionManager.getSessionId();
+	const sessionFile = ctx.sessionManager.getSessionFile();
+	if (!sessionId) throw new Error("Live Discord requires a persisted session identity");
+
+	const lifetime = new AbortController();
+	let closed = false;
+	let runPromise: Promise<void> | undefined;
+	let currentTurn: TurnCapture | undefined;
+	let pollTimer: NodeJS.Timeout;
+	let bridgeRef: LiveDiscordBridge | undefined;
+	let close: () => Promise<void>;
+	const reply: MessengerReply = async (message, signal) => {
+		if (closed || signal?.aborted) throw new Error(LIVE_UNAVAILABLE_MESSAGE);
+		if (!sameSession(ctx, attachedSession, sessionId, sessionFile)) throw new Error(LIVE_UNAVAILABLE_MESSAGE);
+		if (!isMessengerMessageAllowed(message, scopedConfig)) throw new Error(LIVE_UNAVAILABLE_MESSAGE);
+		if (
+			attachedSession.isStreaming ||
+			attachedSession.isCompacting ||
+			attachedSession.isGeneratingHandoff ||
+			attachedSession.isRetrying ||
+			attachedSession.isBashRunning ||
+			attachedSession.isEvalRunning ||
+			attachedSession.hasPostPromptWork ||
+			currentTurn
+		)
+			return LIVE_BUSY_MESSAGE;
+		const promptText = `[Discord:${message.messageId} sender:${message.senderId} channel:${message.channelId}] ${message.text}`;
+		const capture: TurnCapture = {
+			promptText,
+			promptSeen: false,
+			dispatched: false,
+			hostSettled: false,
+			conflicted: false,
+		};
+		currentTurn = capture;
+
+		try {
+			ctx.showStatus(`Discord request from ${message.senderId}`);
+		} catch {}
+		const operationSignal = signal ? AbortSignal.any([lifetime.signal, signal]) : lifetime.signal;
+		const unsubscribe = attachedSession.subscribe(event => {
+			if (event.type !== "message_end") return;
+			if (event.message.role === "user") {
+				const text = userMessageText(event.message);
+				if (!capture.promptSeen && text === capture.promptText) {
+					capture.promptSeen = true;
+				} else if (capture.promptSeen) {
+					capture.conflicted = true;
+				}
+				return;
+			}
+			if (capture.promptSeen && isCompetingMessage(event.message)) capture.conflicted = true;
+		});
+		try {
+			if (closed || operationSignal.aborted || !sameSession(ctx, attachedSession, sessionId, sessionFile))
+				throw new Error(LIVE_UNAVAILABLE_MESSAGE);
+			const promptPromise = attachedSession.prompt(promptText, {
+				expandPromptTemplates: false,
+				attribution: "user",
+			});
+			capture.dispatched = true;
+			const dispatched = await awaitWithAbort(promptPromise, operationSignal);
+			capture.dispatched = dispatched;
+			await awaitWithAbort(attachedSession.waitForIdle(), operationSignal);
+			capture.hostSettled = true;
+			const turnMessages = attachedSession.messages;
+			const promptIndices = turnMessages.flatMap((turnMessage, index) =>
+				turnMessage.role === "user" && userMessageText(turnMessage) === promptText ? [index] : [],
+			);
+			capture.promptSeen = capture.promptSeen || promptIndices.length === 1;
+			if (
+				closed ||
+				!dispatched ||
+				!sameSession(ctx, attachedSession, sessionId, sessionFile) ||
+				capture.conflicted ||
+				promptIndices.length !== 1
+			)
+				throw new Error(LIVE_UNAVAILABLE_MESSAGE);
+			const promptIndex = promptIndices[0]!;
+			const messagesAfterPrompt = turnMessages.slice(promptIndex + 1);
+			if (messagesAfterPrompt.some(isCompetingMessage)) throw new Error(LIVE_UNAVAILABLE_MESSAGE);
+			const finalAssistant = messagesAfterPrompt.findLast(
+				(turnMessage): turnMessage is AssistantMessage => turnMessage.role === "assistant",
+			);
+			if (finalAssistant?.stopReason !== "stop") throw new Error("Live Discord response unavailable");
+			const response = assistantMessageText(finalAssistant);
+			if (!response.trim()) throw new Error("Live Discord response unavailable");
+			return response;
+		} finally {
+			unsubscribe();
+			if (currentTurn === capture) currentTurn = undefined;
+		}
+	};
+
+	const discordConfig = scopedConfig.platforms.discord;
+	if (!discordConfig) throw new Error("Live Discord configuration unavailable");
+	const adapterFactory = dependencies.createAdapter ?? createDiscordAdapter;
+	const gatewayFactory = dependencies.createGateway ?? createMessengerGateway;
+	const adapter = adapterFactory(discordConfig, dependencies.env, dependencies.transport);
+	const guardedAdapter: MessengerAdapter = {
+		...adapter,
+		send: async (message, text, signal) => {
+			if (closed || !sameSession(ctx, attachedSession, sessionId, sessionFile)) {
+				throw new Error(LIVE_UNAVAILABLE_MESSAGE);
+			}
+			const sendSignal = signal ? AbortSignal.any([lifetime.signal, signal]) : lifetime.signal;
+			if (sendSignal.aborted || !sameSession(ctx, attachedSession, sessionId, sessionFile)) {
+				throw new Error(LIVE_UNAVAILABLE_MESSAGE);
+			}
+			await adapter.send(message, text, sendSignal);
+		},
+	};
+	const gateway = gatewayFactory(scopedConfig, [guardedAdapter], reply);
+	close = async (): Promise<void> => {
+		if (closed) {
+			await runPromise?.catch(() => {});
+			return;
+		}
+		closed = true;
+		clearInterval(pollTimer);
+		lifetime.abort();
+		const turn = currentTurn;
+		if (turn && sameSession(ctx, attachedSession, sessionId, sessionFile)) {
+			if (turn.dispatched && !turn.hostSettled && !turn.conflicted) {
+				try {
+					await awaitHostAbort(attachedSession.abort({ reason: "Discord live bridge revoked" }));
+				} catch {
+					try {
+						ctx.showWarning("Discord live turn could not be interrupted; press Esc to interrupt it.");
+					} catch {}
+				}
+			} else if (!turn.hostSettled) {
+				try {
+					ctx.showWarning("A Discord-initiated turn is still running; press Esc to interrupt.");
+				} catch {}
+			}
+		}
+		await runPromise?.catch(() => {});
+	};
+
+	const run = (signal?: AbortSignal): Promise<void> => {
+		if (runPromise) return runPromise;
+		const effectiveSignal = signal ? AbortSignal.any([lifetime.signal, signal]) : lifetime.signal;
+		runPromise = gateway
+			.run(effectiveSignal)
+			.then(() => {
+				if (ctx.liveDiscordBridge !== bridgeRef) return;
+				ctx.liveDiscordBridge = undefined;
+				if (!sameSession(ctx, attachedSession, sessionId, sessionFile)) {
+					ctx.showStatus("Discord live bridge detached: session changed");
+				}
+			})
+			.finally(() => {
+				closed = true;
+				clearInterval(pollTimer);
+			});
+		return runPromise;
+	};
+
+	const pollInterval = Math.max(50, Math.trunc(dependencies.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS));
+	pollTimer = setInterval(() => {
+		if (!closed && !sameSession(ctx, attachedSession, sessionId, sessionFile)) void close().catch(() => {});
+	}, pollInterval);
+	pollTimer.unref?.();
+
+	const bridge: LiveDiscordBridge = {
+		gateway,
+		get active() {
+			return !closed;
+		},
+		run,
+		close,
+	};
+	bridgeRef = bridge;
+	return bridge;
+}
+
+export async function loadAndCreateLiveDiscordBridge(
+	ctx: InteractiveModeContext,
+	configPath: string,
+	dependencies: LiveDiscordBridgeDependencies = {},
+	options: LiveDiscordBridgeOptions = {},
+): Promise<LiveDiscordBridge> {
+	const config = await loadMessengerConfig(configPath);
+	return createLiveDiscordBridge(ctx, config, dependencies, options);
+}

package/src/modes/interactive-mode.ts

@@ -80,6 +80,7 @@ import {
 	MCP_CONNECTION_STATUS_EVENT_CHANNEL,
 	type McpConnectionStatusEvent,
 } from "../mcp/startup-events";
+import type { LiveDiscordBridge } from "../messenger/live-session";
 import {
 	humanizePlanTitle,
 	type PlanApprovalDetails,
@@ -491,6 +492,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	oauthManualInput: OAuthManualInputManager = new OAuthManualInputManager();
 	collabHost?: CollabHost;
 	collabGuest?: CollabGuestLink;
+	liveDiscordBridge?: LiveDiscordBridge;
 
 	#pendingSlashCommands: SlashCommand[] = [];
 	#cleanupUnsubscribe?: () => void;
@@ -796,10 +798,27 @@ export class InteractiveMode implements InteractiveModeContext {
 		// signal arriving mid-Ctrl+C no-ops instead of racing a second dispose.
 		this.#signalTeardown = createSessionTeardown({
 			getDraftText: () => this.editor.getText(),
+			beforeDispose: async () => {
+				const liveDiscordBridge = this.liveDiscordBridge;
+				this.liveDiscordBridge = undefined;
+				try {
+					await liveDiscordBridge?.close();
+				} catch (error) {
+					logger.warn("Failed to close live Discord bridge before teardown", { error: String(error) });
+				}
+			},
 			beginDispose: () => this.session.beginDispose(),
 			saveDraft: text => this.sessionManager.saveDraft(text),
-			disposeSession: reason =>
-				this.session.dispose({ mnemopiConsolidateTimeoutMs: SHUTDOWN_CONSOLIDATE_BUDGET_MS, reason }),
+			disposeSession: async reason => {
+				const liveDiscordBridge = this.liveDiscordBridge;
+				this.liveDiscordBridge = undefined;
+				try {
+					await liveDiscordBridge?.close();
+				} catch (error) {
+					logger.warn("Failed to close live Discord bridge during teardown", { error: String(error) });
+				}
+				await this.session.dispose({ mnemopiConsolidateTimeoutMs: SHUTDOWN_CONSOLIDATE_BUDGET_MS, reason });
+			},
 		});
 		// Forward the postmortem reason (SIGTERM/SIGHUP/uncaughtException/…) so the
 		// persisted `session_exit` diagnostic carries the real trigger. Postmortem
@@ -3349,14 +3368,19 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#isShuttingDown = true;
 
 		this.#btwController.dispose();
-		this.#omfgController.dispose();
 		this.#focusController.dispose();
-
+		this.#omfgController.dispose();
 		// Surface an explicit "Closing session…" line so the user sees a reason
 		// for the pause while `session.dispose()` flushes memory consolidate and
-		// other cleanups (issue #3641). The await on the next line yields the
-		// event loop, giving requestRender() a tick to paint the status before
-		// dispose blocks.
+		// other cleanups (issue #3641). The bridge is closed before disposal so
+		// revoked Discord work cannot race session teardown.
+		const liveDiscordBridge = this.liveDiscordBridge;
+		this.liveDiscordBridge = undefined;
+		try {
+			await liveDiscordBridge?.close();
+		} catch (error) {
+			logger.warn("Failed to close live Discord bridge during shutdown", { error: String(error) });
+		}
 		this.showStatus("Closing session…");
 
 		// Persist the draft and dispose the session through the shared teardown

package/src/modes/session-teardown.test.ts

@@ -66,6 +66,67 @@ describe("createSessionTeardown", () => {
 		expect(order).toEqual(["snapshot", "beginDispose", "saveDraft:start", "saveDraft:done", "disposeSession"]);
 	});
 
+	it("awaits beforeDispose before marking the session disposing", async () => {
+		const order: string[] = [];
+		const release = Promise.withResolvers<void>();
+
+		const teardown = createSessionTeardown({
+			getDraftText: () => "draft",
+			beforeDispose: async () => {
+				order.push("beforeDispose:start");
+				await release.promise;
+				order.push("beforeDispose:done");
+			},
+			beginDispose: () => {
+				order.push("beginDispose");
+			},
+			saveDraft: async () => {
+				order.push("saveDraft");
+			},
+			disposeSession: async () => {
+				order.push("disposeSession");
+			},
+		});
+
+		const running = teardown();
+		expect(order).toEqual(["beforeDispose:start"]);
+		release.resolve();
+		await running;
+
+		expect(order).toEqual([
+			"beforeDispose:start",
+			"beforeDispose:done",
+			"beginDispose",
+			"saveDraft",
+			"disposeSession",
+		]);
+	});
+
+	it("continues teardown when beforeDispose rejects", async () => {
+		const order: string[] = [];
+
+		const teardown = createSessionTeardown({
+			getDraftText: () => "draft",
+			beforeDispose: async () => {
+				order.push("beforeDispose");
+				throw new Error("revocation failed");
+			},
+			beginDispose: () => {
+				order.push("beginDispose");
+			},
+			saveDraft: async () => {
+				order.push("saveDraft");
+			},
+			disposeSession: async () => {
+				order.push("disposeSession");
+			},
+		});
+
+		await teardown();
+
+		expect(order).toEqual(["beforeDispose", "beginDispose", "saveDraft", "disposeSession"]);
+	});
+
 	it("still disposes when saveDraft rejects — never leaves session_shutdown unemitted", async () => {
 		let disposed = false;
 

package/src/modes/session-teardown.ts

@@ -16,11 +16,16 @@ export interface SessionTeardownDeps {
 	/** Snapshot the current editor text; called once, before disposal touches session state. */
 	getDraftText: () => string;
 	/**
-	 * Synchronously mark the session as disposing before any awaited teardown
-	 * work. This closes the async gap where deferred jobs could otherwise start
-	 * after a signal requested shutdown but before `disposeSession()` begins.
+	 * Synchronously mark the session as disposing after asynchronous revocation
+	 * completes and before any further awaited teardown work. This closes the async
+	 * gap where deferred jobs could otherwise start after a signal requested shutdown.
 	 */
 	beginDispose: () => void;
+	/**
+	 * Complete asynchronous revocation before the session is marked disposed.
+	 * Failures are logged and never skip the disposal chain.
+	 */
+	beforeDispose?: () => Promise<void>;
 	/**
 	 * Persist the snapshotted draft. Called even for an empty string so a
 	 * previously-persisted draft sidecar is cleared on a clean exit.
@@ -44,11 +49,11 @@ export interface SessionTeardownDeps {
 export type SessionTeardown = (reason?: postmortem.Reason) => Promise<void>;
 
 /**
- * Build a promise-memoized teardown function. The first call snapshots the
- * draft text, marks the session disposing synchronously, runs `saveDraft`
- * (draft-loss protection for `--resume`), then `disposeSession`; subsequent
- * calls await the same settled promise, so the keypress
- * `InteractiveMode.shutdown()` path and the postmortem signal callback cannot
+ * Build a promise-memoized teardown: snapshot the draft, complete asynchronous
+ * revocation, mark the session disposing synchronously, run `saveDraft` (draft-loss
+ * protection for `--resume`), then `disposeSession`; subsequent calls await the same
+ * settled promise so the keypress `InteractiveMode.shutdown()` path and the postmortem
+ * signal callback cannot
  * double-emit `session_shutdown`, double-dispose the session's async-job
  * manager, or race each other.
  *
@@ -67,6 +72,13 @@ export function createSessionTeardown(deps: SessionTeardownDeps): SessionTeardow
 	let pending: Promise<void> | undefined;
 	const run = async (reason?: postmortem.Reason): Promise<void> => {
 		const draftText = deps.getDraftText();
+		if (deps.beforeDispose) {
+			try {
+				await deps.beforeDispose();
+			} catch (err) {
+				logger.warn("Failed pre-dispose cleanup during teardown", { error: String(err) });
+			}
+		}
 		deps.beginDispose();
 		try {
 			await deps.saveDraft(draftText);

package/src/modes/types.ts

@@ -16,6 +16,7 @@ import type {
 import type { CompactOptions } from "../extensibility/extensions/types";
 import type { Skill } from "../extensibility/skills";
 import type { MCPManager } from "../mcp";
+import type { LiveDiscordBridge } from "../messenger/live-session";
 import type { PlanApprovalDetails } from "../plan-mode/approved-plan";
 import type { AgentSession } from "../session/agent-session";
 import type { CompactMode } from "../session/compact-modes";
@@ -134,6 +135,7 @@ export interface InteractiveModeContext {
 	collabGuest?: CollabGuestLink;
 	eventController: EventController;
 	eventBus?: EventBus;
+	liveDiscordBridge?: LiveDiscordBridge;
 
 	// State
 	isInitialized: boolean;

package/src/sdk.ts

@@ -1921,11 +1921,18 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		const refreshedProviders = new Set<string>();
 		for (const selector of discoverySelectors) {
 			if (!selector) continue;
-			const parsed = parseModelString(selector, {
-				allowMaxAlias: true,
-				allowAutoAlias: true,
-				isLiteralModelId: (provider, id) => modelRegistry.find(provider, id) !== undefined,
-			});
+			const parsed =
+				parseModelString(selector, {
+					allowMaxAlias: true,
+					allowAutoAlias: true,
+					isLiteralModelId: (provider, id) => modelRegistry.find(provider, id) !== undefined,
+				}) ??
+				(!selector.includes("/") &&
+				!/[?*[\]]/.test(selector) &&
+				/argon|gemini-(?:3\.8|4)/i.test(selector) &&
+				!parseModelPattern(selector, modelRegistry.getAll(), modelMatchPreferences).model
+					? { provider: "google-antigravity", id: selector.split(":")[0] }
+					: undefined);
 			if (!parsed || /[?*[\]]/.test(parsed.id)) continue;
 			const existing = modelRegistry.find(parsed.provider, parsed.id);
 			if (existing && hasModelAuth(existing)) break;

package/src/slash-commands/builtin-registry.ts

@@ -24,6 +24,7 @@ import {
 	MarketplaceManager,
 } from "../extensibility/plugins/marketplace";
 import { resolveMemoryBackend } from "../memory-backend";
+import { loadAndCreateLiveDiscordBridge } from "../messenger/live-session";
 import { describeLoopLimitRuntime } from "../modes/loop-limit";
 import { theme } from "../modes/theme/theme";
 import type { InteractiveModeContext } from "../modes/types";
@@ -66,6 +67,13 @@ import type {
 
 export type { BuiltinSlashCommand, SubcommandDef } from "./types";
 
+interface LiveDiscordStart {
+	cancelled: boolean;
+	promise: Promise<void>;
+}
+
+const liveDiscordStarts = new WeakMap<InteractiveModeContext, LiveDiscordStart>();
+
 /** TUI-specific runtime accepted by `executeBuiltinSlashCommand`. */
 export type BuiltinSlashCommandRuntime = TuiSlashCommandRuntime;
 
@@ -650,6 +658,102 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<SlashCommandSpec> = [
 			runtime.ctx.editor.setText("");
 		},
 	},
+	{
+		name: "discord",
+		description: "Opt in to this session from an authorized Discord channel",
+		inlineHint: "[live|stop|status] [configPath] [--allow-full-control]",
+		subcommands: [
+			{ name: "live", description: "Start the live Discord bridge with a private config file" },
+			{ name: "status", description: "Show live Discord bridge status" },
+			{ name: "stop", description: "Stop the live Discord bridge" },
+		],
+		allowArgs: true,
+		getTuiAutocompleteDescription: runtime =>
+			runtime.ctx.liveDiscordBridge?.active ? "Discord live bridge: active" : "Discord live bridge: off",
+		handleTui: async (command, runtime) => {
+			const ctx = runtime.ctx;
+			ctx.editor.setText("");
+			const { verb, rest } = parseSubcommand(command.args.trim());
+			if (verb === "status") {
+				if (!ctx.liveDiscordBridge?.active) {
+					ctx.showStatus("Discord live bridge is off");
+					return;
+				}
+				const approvalMode = String(ctx.session.settings.get("tools.approvalMode"));
+				const activeTools = ctx.session.getActiveToolNames();
+				ctx.showStatus(
+					`Discord live bridge is active with full host control acknowledged. Approval mode: ${approvalMode}; active tools: ${activeTools.length > 0 ? activeTools.join(", ") : "none"}.`,
+				);
+				return;
+			}
+			if (verb === "stop") {
+				const bridge = ctx.liveDiscordBridge;
+				const start = liveDiscordStarts.get(ctx);
+				if (!bridge && start) {
+					start.cancelled = true;
+					ctx.showStatus("Discord live bridge startup cancellation requested");
+					return;
+				}
+				if (!bridge) {
+					ctx.showStatus("Discord live bridge is not active");
+					return;
+				}
+				ctx.liveDiscordBridge = undefined;
+				try {
+					await bridge.close();
+					ctx.showStatus("Discord live bridge stopped; access revoked");
+				} catch (error) {
+					ctx.showError(`Failed to stop Discord live bridge: ${errorMessage(error)}`);
+				}
+				return;
+			}
+			const acknowledgment = /^(.+?)\s+--allow-full-control$/.exec(rest);
+			if (verb !== "live" || !acknowledgment) {
+				ctx.showError("Usage: /discord live <private messenger.json> --allow-full-control");
+				return;
+			}
+			if (ctx.liveDiscordBridge?.active || liveDiscordStarts.has(ctx)) {
+				ctx.showError("Discord live bridge is already active or starting (/discord stop first)");
+				return;
+			}
+			let resolveStart!: () => void;
+			const startPromise = new Promise<void>(resolve => {
+				resolveStart = resolve;
+			});
+			const startState: LiveDiscordStart = { cancelled: false, promise: startPromise };
+			liveDiscordStarts.set(ctx, startState);
+			try {
+				const configPath = resolveToCwd(acknowledgment[1]!, ctx.sessionManager.getCwd());
+				const bridge = await loadAndCreateLiveDiscordBridge(ctx, configPath, {}, { acknowledgeFullControl: true });
+				if (startState.cancelled || ctx.shutdownRequested || ctx.isShuttingDown) {
+					await bridge.close().catch(() => {});
+					return;
+				}
+				if (ctx.liveDiscordBridge?.active) {
+					await bridge.close().catch(() => {});
+					ctx.showError("Discord live bridge is already active (/discord stop first)");
+					return;
+				}
+				ctx.liveDiscordBridge = bridge;
+				void bridge.run().catch(error => {
+					if (ctx.liveDiscordBridge !== bridge || ctx.isShuttingDown) return;
+					ctx.liveDiscordBridge = undefined;
+					ctx.showError(`Discord live bridge stopped: ${errorMessage(error)}`);
+				});
+				const approvalMode = String(ctx.session.settings.get("tools.approvalMode"));
+				const activeTools = ctx.session.getActiveToolNames();
+				ctx.showStatus(
+					`Discord live bridge active with full host control acknowledged. Approval mode: ${approvalMode}; active tools: ${activeTools.length > 0 ? activeTools.join(", ") : "none"}. /discord stop revokes access.`,
+				);
+			} catch (error) {
+				ctx.showError(`Failed to start Discord live bridge: ${errorMessage(error)}`);
+			} finally {
+				resolveStart();
+				if (liveDiscordStarts.get(ctx)?.promise === startPromise) liveDiscordStarts.delete(ctx);
+			}
+		},
+	},
+
 	{
 		name: "collab",
 		description: "Share this session live via a relay",