feat: add Ctrl+O activity panel toggle, fix terminal 997;1n garbage on exit
Wire up the activity_toggle keybind (Ctrl+O) to show/hide the activity panel via new activityVisible store state. Fix terminal garbage text on exit by draining stdin after renderer teardown to consume pending DECRQM mode 997 responses before they echo in the shell.
This commit is contained in:
@@ -20,6 +20,7 @@ import {
|
||||
registerExitHandlers,
|
||||
exitFullscreen,
|
||||
clearScreen,
|
||||
drainStdin,
|
||||
} from "@utils/core/terminal";
|
||||
import { createCallbacks } from "@commands/chat-tui";
|
||||
import { agentLoader } from "@services/agent-loader";
|
||||
@@ -35,7 +36,9 @@ const createHandleExit = (): (() => void) => (): void => {
|
||||
exitFullscreen();
|
||||
clearScreen();
|
||||
console.log("Goodbye!");
|
||||
process.exit(0);
|
||||
// Drain stdin to consume pending terminal responses (e.g. DECRQM 997;1n)
|
||||
// before exiting, so they don't echo as garbage text in the shell
|
||||
drainStdin().then(() => process.exit(0));
|
||||
};
|
||||
|
||||
const createHandleModelSelect =
|
||||
|
||||
@@ -113,7 +113,7 @@ export const DEFAULT_KEYBINDS: Readonly<Record<KeybindAction, string>> = {
|
||||
|
||||
// Sidebar / panels
|
||||
sidebar_toggle: "<leader>b",
|
||||
activity_toggle: "<leader>s",
|
||||
activity_toggle: "ctrl+o",
|
||||
} as const;
|
||||
|
||||
/**
|
||||
|
||||
@@ -286,8 +286,19 @@ function AppContent(props: AppProps) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Toggle activity panel
|
||||
if (matchesAction(evt, "activity_toggle")) {
|
||||
app.toggleActivity();
|
||||
evt.preventDefault();
|
||||
return;
|
||||
}
|
||||
|
||||
// Command menu trigger from "/" when input is empty
|
||||
if (matchesAction(evt, "command_menu") && app.mode() === "idle" && !app.inputBuffer()) {
|
||||
if (
|
||||
matchesAction(evt, "command_menu") &&
|
||||
app.mode() === "idle" &&
|
||||
!app.inputBuffer()
|
||||
) {
|
||||
app.openCommandMenu();
|
||||
evt.preventDefault();
|
||||
return;
|
||||
|
||||
@@ -44,6 +44,7 @@ interface AppStore {
|
||||
availableModels: ProviderModel[];
|
||||
sessionStats: SessionStats;
|
||||
todosVisible: boolean;
|
||||
activityVisible: boolean;
|
||||
debugLogVisible: boolean;
|
||||
interruptPending: boolean;
|
||||
exitPending: boolean;
|
||||
@@ -89,6 +90,7 @@ interface AppContextValue {
|
||||
availableModels: Accessor<ProviderModel[]>;
|
||||
sessionStats: Accessor<SessionStats>;
|
||||
todosVisible: Accessor<boolean>;
|
||||
activityVisible: Accessor<boolean>;
|
||||
debugLogVisible: Accessor<boolean>;
|
||||
interruptPending: Accessor<boolean>;
|
||||
exitPending: Accessor<boolean>;
|
||||
@@ -172,6 +174,7 @@ interface AppContextValue {
|
||||
|
||||
// UI state actions
|
||||
toggleTodos: () => void;
|
||||
toggleActivity: () => void;
|
||||
toggleDebugLog: () => void;
|
||||
setInterruptPending: (pending: boolean) => void;
|
||||
setExitPending: (pending: boolean) => void;
|
||||
@@ -276,6 +279,7 @@ export const { provider: AppStoreProvider, use: useAppStore } =
|
||||
availableModels: [],
|
||||
sessionStats: createInitialSessionStats(),
|
||||
todosVisible: true,
|
||||
activityVisible: true,
|
||||
debugLogVisible: false,
|
||||
interruptPending: false,
|
||||
exitPending: false,
|
||||
@@ -331,6 +335,7 @@ export const { provider: AppStoreProvider, use: useAppStore } =
|
||||
const availableModels = (): ProviderModel[] => store.availableModels;
|
||||
const sessionStats = (): SessionStats => store.sessionStats;
|
||||
const todosVisible = (): boolean => store.todosVisible;
|
||||
const activityVisible = (): boolean => store.activityVisible;
|
||||
const debugLogVisible = (): boolean => store.debugLogVisible;
|
||||
const interruptPending = (): boolean => store.interruptPending;
|
||||
const exitPending = (): boolean => store.exitPending;
|
||||
@@ -700,6 +705,10 @@ export const { provider: AppStoreProvider, use: useAppStore } =
|
||||
setStore("todosVisible", !store.todosVisible);
|
||||
};
|
||||
|
||||
const toggleActivity = (): void => {
|
||||
setStore("activityVisible", !store.activityVisible);
|
||||
};
|
||||
|
||||
const toggleDebugLog = (): void => {
|
||||
setStore("debugLogVisible", !store.debugLogVisible);
|
||||
};
|
||||
@@ -889,6 +898,7 @@ export const { provider: AppStoreProvider, use: useAppStore } =
|
||||
availableModels,
|
||||
sessionStats,
|
||||
todosVisible,
|
||||
activityVisible,
|
||||
debugLogVisible,
|
||||
interruptPending,
|
||||
exitPending,
|
||||
@@ -990,6 +1000,7 @@ export const { provider: AppStoreProvider, use: useAppStore } =
|
||||
|
||||
// UI state actions
|
||||
toggleTodos,
|
||||
toggleActivity,
|
||||
toggleDebugLog,
|
||||
setInterruptPending,
|
||||
setExitPending,
|
||||
@@ -1085,6 +1096,7 @@ export const appStore = {
|
||||
sessionStats: storeRef.sessionStats(),
|
||||
cascadeEnabled: storeRef.cascadeEnabled(),
|
||||
todosVisible: storeRef.todosVisible(),
|
||||
activityVisible: storeRef.activityVisible(),
|
||||
debugLogVisible: storeRef.debugLogVisible(),
|
||||
interruptPending: storeRef.interruptPending(),
|
||||
exitPending: storeRef.exitPending(),
|
||||
@@ -1217,6 +1229,11 @@ export const appStore = {
|
||||
storeRef.toggleTodos();
|
||||
},
|
||||
|
||||
toggleActivity: (): void => {
|
||||
if (!storeRef) return;
|
||||
storeRef.toggleActivity();
|
||||
},
|
||||
|
||||
toggleDebugLog: (): void => {
|
||||
if (!storeRef) return;
|
||||
storeRef.toggleDebugLog();
|
||||
|
||||
@@ -282,7 +282,9 @@ export function Session(props: SessionProps) {
|
||||
<LogPanel />
|
||||
</box>
|
||||
|
||||
<ActivityPanel />
|
||||
<Show when={app.activityVisible()}>
|
||||
<ActivityPanel />
|
||||
</Show>
|
||||
|
||||
<Show when={app.todosVisible() && props.plan}>
|
||||
<TodoPanel plan={props.plan ?? null} visible={app.todosVisible()} />
|
||||
@@ -303,9 +305,7 @@ export function Session(props: SessionProps) {
|
||||
/>
|
||||
</Show>
|
||||
|
||||
<Show
|
||||
when={app.mode() === "plan_approval" && app.planApprovalPrompt()}
|
||||
>
|
||||
<Show when={app.mode() === "plan_approval" && app.planApprovalPrompt()}>
|
||||
<PlanApprovalModal
|
||||
prompt={app.planApprovalPrompt()!}
|
||||
onRespond={props.onPlanApprovalResponse}
|
||||
@@ -314,7 +314,11 @@ export function Session(props: SessionProps) {
|
||||
</Show>
|
||||
|
||||
<StatusBar />
|
||||
<Show when={app.mode() !== "permission_prompt" && app.mode() !== "plan_approval"}>
|
||||
<Show
|
||||
when={
|
||||
app.mode() !== "permission_prompt" && app.mode() !== "plan_approval"
|
||||
}
|
||||
>
|
||||
<InputArea onSubmit={props.onSubmit} />
|
||||
</Show>
|
||||
|
||||
|
||||
@@ -19,6 +19,56 @@ let spinner: Ora | null = null;
|
||||
*/
|
||||
let exitHandlersRegistered = false;
|
||||
|
||||
/**
|
||||
* Drain any pending stdin data (e.g. DECRQM responses from @opentui/core's
|
||||
* theme-mode detection that queries mode 997). The terminal responds with
|
||||
* `\x1b[?997;1n` or `\x1b[?997;2n`, but if the TUI renderer has already
|
||||
* torn down its stdin listener and disabled raw mode, those bytes echo as
|
||||
* visible garbage ("997;1n") in the shell.
|
||||
*
|
||||
* Strategy: re-enable raw mode so the response doesn't echo, attach a
|
||||
* temporary listener to swallow any bytes that arrive, wait long enough
|
||||
* for the terminal to respond, then clean up.
|
||||
*/
|
||||
export const drainStdin = (): Promise<void> =>
|
||||
new Promise((resolve) => {
|
||||
try {
|
||||
if (!process.stdin.isTTY) {
|
||||
resolve();
|
||||
return;
|
||||
}
|
||||
|
||||
// Re-enable raw mode so pending responses don't echo
|
||||
process.stdin.setRawMode(true);
|
||||
process.stdin.resume();
|
||||
process.stdin.setEncoding("utf8");
|
||||
|
||||
// Swallow any bytes that arrive
|
||||
const sink = (): void => {};
|
||||
process.stdin.on("data", sink);
|
||||
|
||||
// Wait for in-flight terminal responses then clean up
|
||||
setTimeout(() => {
|
||||
try {
|
||||
process.stdin.removeListener("data", sink);
|
||||
// Read and discard any remaining buffered data
|
||||
while (process.stdin.read() !== null) {
|
||||
// drain
|
||||
}
|
||||
process.stdin.setRawMode(false);
|
||||
process.stdin.pause();
|
||||
// Unref so this doesn't keep the process alive
|
||||
process.stdin.unref();
|
||||
} catch {
|
||||
// Ignore — stdin may already be destroyed
|
||||
}
|
||||
resolve();
|
||||
}, 100);
|
||||
} catch {
|
||||
resolve();
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* Emergency cleanup for terminal state on process exit
|
||||
* Uses writeSync to fd 1 (stdout) to guarantee bytes are flushed
|
||||
|
||||
Reference in New Issue
Block a user