osdy-pi 1.11.10 → 1.11.11

package/README.md

@@ -12,7 +12,7 @@ Osdy Pi gives [Pi](https://github.com/earendil-works/pi) a themed, responsive te
 
 | Area | What ships |
 | --- | --- |
-| Control Center | `/osdyConfig` opens ten categories, including confirmed TODO/Agents provider selection and explicit per-profile Codex quota previews. |
+| Control Center | **Ctrl+Option+O** or `/osdyConfig` opens ten categories, including confirmed TODO/Agents provider selection and explicit per-profile Codex quota previews. |
 | Local analytics (1.10.0) | `/osdy-usage` opens Summary, Profiles, Models, and History pages for recorded tokens and estimated cost—not billing or subscription quota. |
 | Themes introduced in 1.11.0 | Spider-Man Classic, Miles Morales, and Spider-Verse add three distinct dark palettes. |
 | Themes introduced in 1.9.0 | Halloween and Halloween Killer add two dark palettes. |
@@ -20,7 +20,7 @@ Osdy Pi gives [Pi](https://github.com/earendil-works/pi) a themed, responsive te
 | Message cards | Pi-native colored user cards without emojis and plain assistant Markdown preceded by a separate `🦝` transcript row. |
 | Header and mascot | Independent header/mascot choices, an installed-package version label, and mascot-only fallback when full artwork cannot fit. |
 | Accounts | `/osdy-account` switches Codex profiles in place with atomic activation, rollback, bounded auth files, and process-safe locks. |
-| Quota | `/usage` and compact bars emphasize remaining Codex quota at warning (40% or less) and error (15% or less) thresholds. |
+| Quota | **Ctrl+Option+U** or `/usage` opens subscription quota; compact bars emphasize remaining Codex quota at warning (40% or less) and error (15% or less) thresholds. |
 | TODO (starting in 1.5.0, opt-in) | Default-off first-party `todo` snapshots track the Pi session branch; `/todos` reads them without editing. ODD Markdown remains separate. |
 
 ## Prerequisites
@@ -57,11 +57,22 @@ Osdy Pi's own extension and themes are bundled—do not install them separately.
 
 ### Control Center in Pi
 
-Run **`/osdyConfig`** in interactive Pi to open the Osdy Control Center. The ten categories—**Theme, Header, Mascot, Editor, Git, Sounds, Account, Usage, TODO, and Agents**—provide inline controls or data in the same modal. Existing commands remain available.
+Press **Ctrl+Option+O** or run **`/osdyConfig`** in interactive Pi to open the Osdy Control Center. The ten categories—**Theme, Header, Mascot, Editor, Git, Sounds, Account, Usage, TODO, and Agents**—provide inline controls or data in the same modal. Existing commands remain available.
+
+| Shortcut | Panel | Command fallback |
+| --- | --- | --- |
+| **Ctrl+Option+O** | Osdy Control Center | `/osdyConfig` |
+| **Ctrl+Option+U** | Active Codex subscription quota—not local token/cost analytics | `/usage` |
+
+On macOS, **Option = Alt** in Pi's shortcut names: these bindings register as `ctrl+alt+o` and `ctrl+alt+u`. On other platforms, use **Ctrl+Alt+O** and **Ctrl+Alt+U**. Your terminal must send Option as **Alt/Meta** and support **Ctrl+Alt chords**; registration does not guarantee actual hardware delivery. Check **`/hotkeys`** for bindings, and use **`/osdyConfig`** or **`/usage`** if the terminal, OS, or another extension intercepts or cannot deliver the chord.
+
+**Ctrl+Option+O capability limits:** Account **Switch**, **Set default**, and **Clear default** refuse changes while Pi is busy; retry when idle. The same actions through `/osdyConfig` retain idle waiting, as does switching through `/osdy-account`. Read-only account quota previews remain available while busy. Successful TODO/Agents selection from Ctrl+Option+O saves settings, closes/disposes the panel, releases its editor hold, then asks you to run **`/reload` manually** (or restart Pi). From `/osdyConfig`, the same sequence still reloads automatically once; restart Pi if reload fails.
+
+Ctrl+Option+U opens the existing `/usage` dashboard with the same refresh behavior; it does not open `/osdy-usage`.
 
 - Use **↑/↓**, **Home/End**, or **Page Up/Down** to navigate; **Tab** or **←/→** switches between categories and details. **Enter** selects. Single blank lines separate the heading, summary, compact options, selected-item help, status, and action hints—not individual options. Gaps yield on short viewports so the selected option and controls remain reachable. Press **?** to expand/collapse the selected help and view notes; resize if expanded help is clipped. Confirmation effects remain complete, and **?** never toggles help during confirmation, path editing, loading, querying, or saving.
-- TODO shows configured selection, current eligibility, and actually loaded SDK registration separately. Opt-in/out requires an idle session and a Cancel-first inline confirmation naming the target, owned Gentle filter effects, and reload. Successful selection closes/disposes the panel and releases its editor hold before reloading once; restart Pi if reload fails. Rejections stay in the panel. No installs or task-history changes occur; legacy `/osdy-pi todo on|off|status` remains available.
-- Agents shows concise **Joker / Gentle** choices without activating anything. With detail focus, visible lowercase-only **j Joker / g Gentle** letters open the existing confirmation directly; only available, unambiguous rows get shortcuts. **↑/↓ + Enter** remains the fallback. Profile and Agent selections survive category navigation; unavailable choices fall back to the current row. Letters never bypass category focus, confirmation, path input, loading, querying, or saving. Selection is idle-only and Cancel-first confirmed, naming the real target, possible Joker installation, owned agent filters, and preserved unrelated resources. Normal personal Pi only: `pi:dev` and isolated/override sessions are blocked, never redirected to personal settings. Success closes/disposes the panel and releases its editor hold before reloading once; restart Pi if reload fails. Legacy `/osdy-pi agents setup|on|off|status` is unchanged.
+- TODO shows configured selection, current eligibility, and actually loaded SDK registration separately. Opt-in/out requires an idle session and a Cancel-first inline confirmation naming the target, owned Gentle filter effects, and reload. Successful selection closes/disposes the panel and releases its editor hold before automatic command reload or the Ctrl+Option+O manual-reload notice described above; restart Pi if reload fails. Rejections stay in the panel. No installs or task-history changes occur; legacy `/osdy-pi todo on|off|status` remains available.
+- Agents shows concise **Joker / Gentle** choices without activating anything. With detail focus, visible lowercase-only **j Joker / g Gentle** letters open the existing confirmation directly; only available, unambiguous rows get shortcuts. **↑/↓ + Enter** remains the fallback. Profile and Agent selections survive category navigation; unavailable choices fall back to the current row. Letters never bypass category focus, confirmation, path input, loading, querying, or saving. Selection is idle-only and Cancel-first confirmed, naming the real target, possible Joker installation, owned agent filters, and preserved unrelated resources. Normal personal Pi only: `pi:dev` and isolated/override sessions are blocked, never redirected to personal settings. Success closes/disposes the panel and releases its editor hold before automatic command reload or the Ctrl+Option+O manual-reload notice described above; restart Pi if reload fails. Legacy `/osdy-pi agents setup|on|off|status` is unchanged.
 - Theme lists Pi's available themes and marks the current theme. Explicit **Page x/N** pages contain at most **8 themes**, fewer in short viewports or with expanded help. **Page Up/Down** changes pages, **Home/End** reaches the first/last theme, and arrows cross page boundaries. Selection survives category navigation and resizing; resizing adjusts the page around the selected theme. A successful selection applies live and saves globally in the active Pi agent directory; project settings can override it at startup. Failures appear in the modal.
 - Header offers **osdy-theme / neon**; Mascot offers **current / Bts / Osdy-Halloween**; Editor offers **auto / extended / simple**, with the current preference marked. Editor also shows the effective mode: small terminals stay simple/native even with extended selected.
 - Preferences save immediately through the same runtime and global Osdy settings store as `/osdy-pi` commands (`<agent-dir>/extensions/osdy-pi/settings.json`). Header/Mascot apply live without closing the panel. Editor replacement waits until all overlays close; if another overlay remains, the next existing responsive watcher tick applies the latest choice. The effective mode reports the actually mounted editor while queued. Opening a category only reads values; while Osdy is disabled, choices save for later without enabling it.
@@ -69,7 +80,7 @@ Run **`/osdyConfig`** in interactive Pi to open the Osdy Control Center. The ten
 - **Git** shows the current branch (or detached HEAD), changed-entry count/clean status, and the current widget position as a read-only session detail. Working-tree enablement applies and saves through the same owner as `/osdy-pi working-tree`; Git inspection never writes Git. `/osdy-pi diff` and position commands are unchanged.
 - **Sounds** shows each event's saved and effective path/source. Configure opens a single-line path editor **inside this overlay**: enter a readable `.mp3`/`.wav` path, then **Enter** to validate and save immediately, or **Esc** to cancel editing. Relative paths resolve against the project directory and save as absolute paths. Clear removes only that event's saved path from the existing v1 audio store (`<agent-dir>/extensions/osdy-pi/audio-notifications.json`). Notifications read this store afresh; refresh failures are reported separately from save failures.
 - Sounds' master enablement is **unavailable**: the existing schema has paths, not an enable switch or presets. Startup `--osdy-pi-sound-<event>` flags override saved paths, so **clearing a saved path does not disable flag-configured playback**. Only **Test effective** explicitly plays a sound; opening categories and configuring paths never play. Tests report unavailable files/platforms or playback failures; playback remains macOS/Windows only. The legacy `/osdy-pi sound setup` wizard is preserved.
-- **Account** shows one row per validated profile, marked **Active** and **Default** where applicable. Select a profile, then use its visible context bar: **v View usage**, **s Switch** (inactive profiles), **d Set default**, and **c Clear default** (when a default exists). **v** or **Enter** explicitly queries that profile's stored Codex credentials without activating it; no second action list appears. Opening, navigating or highlighting never queries; stored profiles are never polled. A dedicated quota view reuses `/usage` dashboard content: Session/Weekly cards, additional bucket groups, remaining-capacity bars, resets, and the quotas/account summary with plan and credits when available. Identity belongs to the selected stored profile; unknown provider/model metadata is labeled honestly. Checked and updated times use local time; absent data is unknown, not zero. Refresh/Back controls and query feedback stay pinned while long dashboard content scrolls. **r Refresh** repeats the selected profile query; **s Switch**, when available, confirms activation of the currently viewed inactive profile. Cancelling that confirmation preserves the quota view and scroll position. **b Back** or **Esc** returns to the overview with the profile selected, without closing the overlay. In quota details, **↑/↓** selects Refresh/Back and **Enter** activates it; **Page Up/Down** and **Home/End** scroll long quota data. Switch, set default, and clear default require an **in-screen confirmation** with Cancel selected initially; **Esc** cancels confirmation without closing the overlay. Single blank separators group the confirmation title, complete effects, choices, and instructions; gaps yield on short viewports. Resize if the full confirmation cannot fit—acceptance stays hidden and blocked. Switching waits for Pi to become idle, activates through the existing backend, and refreshes subscription usage. Login remains Pi-owned (`/login`); create/rename/remove remain available in `/osdy-account`. Category navigation never changes profiles or credentials.
+- **Account** shows one row per validated profile, marked **Active** and **Default** where applicable. Select a profile, then use its visible context bar: **v View usage**, **s Switch** (inactive profiles), **d Set default**, and **c Clear default** (when a default exists). **v** or **Enter** explicitly queries that profile's stored Codex credentials without activating it; no second action list appears. Opening, navigating or highlighting never queries; stored profiles are never polled. A dedicated quota view reuses `/usage` dashboard content: Session/Weekly cards, additional bucket groups, remaining-capacity bars, resets, and the quotas/account summary with plan and credits when available. Identity belongs to the selected stored profile; unknown provider/model metadata is labeled honestly. Checked and updated times use local time; absent data is unknown, not zero. Refresh/Back controls and query feedback stay pinned while long dashboard content scrolls. **r Refresh** repeats the selected profile query; **s Switch**, when available, confirms activation of the currently viewed inactive profile. Cancelling that confirmation preserves the quota view and scroll position. **b Back** or **Esc** returns to the overview with the profile selected, without closing the overlay. In quota details, **↑/↓** selects Refresh/Back and **Enter** activates it; **Page Up/Down** and **Home/End** scroll long quota data. Switch, set default, and clear default require an **in-screen confirmation** with Cancel selected initially; **Esc** cancels confirmation without closing the overlay. Single blank separators group the confirmation title, complete effects, choices, and instructions; gaps yield on short viewports. Resize if the full confirmation cannot fit—acceptance stays hidden and blocked. Switching through `/osdyConfig` waits for Pi to become idle; Ctrl+Option+O refuses busy account changes. Successful switching activates through the existing backend and refreshes subscription usage. Login remains Pi-owned (`/login`); create/rename/remove remain available in `/osdy-account`. Category navigation never changes profiles or credentials.
 - **Usage** shows the runtime's cached active Codex subscription quota (remaining-capacity bars and percentages, window, reset/fetch times) and the existing local history owner's recorded token/cache totals, cost gaps, and model detail. Select **Range: day/week/month** for the current local calendar period; toggle **Accounts: all/current** for local analytics (unmanaged when no valid current profile exists). Quota always belongs to the active account, not the analytics filter; local token/cost totals never become quota percentages. Select **Refresh quota and local history** explicitly; rendering and filters never fetch. Empty, loading, unavailable, and limited/incomplete coverage are reported honestly. Estimates are not billing or subscription quota. `/usage` and `/osdy-usage` remain unchanged.
 - **Esc** closes without undoing live or saved changes, except when cancelling a confirmation/input or returning from Account quota details. Account read-only queries are cancelled on Back/Esc, category exit or close; late results are ignored even if cancellation is not honored. Other in-flight operations still finish and are not claimed cancelled. Late results cannot replace a closed overlay or another category. On narrow terminals, categories and details share the viewport; use Tab to switch.
 
@@ -402,7 +413,7 @@ The enabled state, editor mode, working-tree visibility preference, header, and
 
 | Group | Command |
 | --- | --- |
-| Control Center | `/osdyConfig` (interactive terminal UI) |
+| Control Center | **Ctrl+Option+O** or `/osdyConfig` (interactive terminal UI) |
 | Main | `/osdy-pi` |
 | Main | `/osdy-pi enable\|disable\|on\|off\|status` |
 | Accounts | `/osdy-account` |
@@ -416,7 +427,7 @@ The enabled state, editor mode, working-tree visibility preference, header, and
 | Audio | `/osdy-pi sound setup` |
 | Diff | `/osdy-pi diff` |
 | Package | `/osdy-pi uninstall` |
-| Codex subscription | `/usage` |
+| Codex subscription | **Ctrl+Option+U** or `/usage` |
 | Local usage analytics (starting in 1.10.0) | `/osdy-usage` |
 
 `/osdy-pi uninstall` finds a unique Osdy Pi package in Pi's configured package list and asks you to confirm its exact source and user/project scope before calling Pi's `remove` command. Run it from a trusted project with interactive UI. Git registrations are checked against Pi's host/path identity; a local registration must point to this running extension's package root and have a matching manifest. Ambiguous or changed registrations, unrecognized sources, and cancelled confirmation remove nothing. It removes only the Pi package registration, not Osdy profiles, accounts, the globally installed CLI, or other packages. Restart Pi afterward to unload the extension. If no unique source is found, inspect `pi list` and use `pi remove <source> [-l]` manually.
@@ -425,13 +436,13 @@ The enabled state, editor mode, working-tree visibility preference, header, and
 
 ### Codex subscription usage
 
-Run `/usage` to open the Codex subscription dashboard for the active managed `openai-codex` profile and model. Press `r` to refresh; `esc` or `q` closes it. The dashboard shows these controls at the bottom.
+Press **Ctrl+Option+U** or run `/usage` to open the same Codex subscription dashboard for the active managed `openai-codex` profile and model. Press `r` to refresh; `esc` or `q` closes it. The dashboard shows these controls at the bottom.
 
 The main windows are labeled **Session** and **Weekly** (the API/domain remains primary/secondary). Their remaining-capacity bars are full at 100% remaining and empty at 0%; labels use the active theme's bold accent, Session uses the accent fill, Weekly uses `mdLink`, and empty segments are muted. The remaining percentage stays muted above 40%, changes to the theme's warning color at 40% or less, and changes to its error color at 15% or less. The same thresholds apply in the `/usage` dashboard and compact footer/editor quota bars. A double themed frame, section dividers, and spacing separate the display. Detail cards show each duration and relative, local, and UTC reset times. Plan, availability, credits/reset count, and additional buckets appear only when the service supplies them; absent optional values are omitted.
 
 At wide widths, the modal pairs the Session and Weekly detail cards. Below 72 content columns, cards and bars stack and account/model data wraps. The native footer and extended editor also show compact Session/Weekly remaining-capacity bars below model and thinking metadata whenever a current Codex snapshot exists. Wide widths combine those bars; narrow widths stack them. Additional buckets appear in `/usage` and the selected-profile Control Center quota view, not compact editor/footer bars.
 
-Active quota loads when an enabled session starts and refreshes when `/usage` opens or `r` is pressed. It also refreshes while idle on a **60-second** schedule, only after settings are loaded, with Osdy enabled, an interactive terminal UI, an `openai-codex` model selected, and no quota request already in flight. Automatic failures double the retry delay up to **10 minutes**; a successful automatic query restores the 60-second interval. This scheduler never polls stored profiles.
+Active quota loads when an enabled session starts and refreshes when **Ctrl+Option+U** or `/usage` opens the dashboard, or `r` is pressed. It also refreshes while idle on a **60-second** schedule, only after settings are loaded, with Osdy enabled, an interactive terminal UI, an `openai-codex` model selected, and no quota request already in flight. Automatic failures double the retry delay up to **10 minutes**; a successful automatic query restores the 60-second interval. This scheduler never polls stored profiles.
 
 Automatic refresh retains the last snapshot during loading and on error, so an older reading can remain visible until a successful query replaces it. Manual refresh clears the previous snapshot before authentication resolves and supersedes any in-flight automatic request. Account switching refreshes active quota through that same clearing path. Session replacement and shutdown stop the timer, cancel pending requests and clear quota state; late results are ignored.
 
@@ -606,13 +617,14 @@ This launches `pi` from `PATH`, loads this checkout with `-e`, and uses `.pi-dev
 The explicit argument bypasses the launcher's default-account activation; Pi's `--no-session` disables session persistence, **not settings writes or provider access**.
 An isolated agent directory does **not** make custom audio paths or real provider accounts harmless. Use intentional disposable test profiles/files for profile writes, switches, default confirmations, and audio tests; do not assume an isolated account store makes real credentials safe.
 
-- Open `/osdyConfig` in regular and fullscreen Pi. Check arrows/Home/End/Page Up/Down, Tab or left/right, Enter, and Esc; shrink and restore the terminal, checking both panes remain reachable.
+- Check `/hotkeys` lists `ctrl+alt+o` and `ctrl+alt+u`. On macOS, configure Option to send Alt/Meta and verify the terminal supports Ctrl+Alt chords; actual Ctrl+Option delivery still needs a hardware check. Open both **Ctrl+Option+O** and `/osdyConfig` in regular and fullscreen Pi (Ctrl+Alt+O on other platforms); use the slash command if the chord is intercepted or unsupported. Check arrows/Home/End/Page Up/Down, Tab or left/right, Enter, and Esc; shrink and restore the terminal, checking both panes remain reachable. With disposable TODO/Agents settings, verify Ctrl+Option+O asks for manual `/reload` only after closing, while `/osdyConfig` reloads automatically.
 - In disposable settings, change a visual preference, wait for **Saved globally**, close and reopen, then reload/restart to check persistence. Esc does not undo changes; distinguish save/application errors from success.
-- Account (manual): with disposable profiles only, check Cancel-first switch/set-default/clear-default confirmations, Esc cancellation, idle switching, and current/default labels. Check one row per profile with **v/s/d/c** context actions and **Enter** usage fallback, without a second action list. From **v** quota details, check eligible **s Switch** opens the same Cancel-first confirmation, with blank separators between the title/effects, choices, and instructions; Cancel/Esc must retain the quota view and scroll position. Check gaps yield on short viewports without hiding safety content or enabling acceptance when the full confirmation cannot fit. Check remaining-capacity bars, **r Refresh**, **b Back/Esc** returning to the selected profile, long-view scrolling, no query on navigation, no stored-profile polling, and cancellation on exit. Create/rename/remove stay in `/osdy-account`, login in `/login`.
+- Account (manual): with disposable profiles only, check Cancel-first switch/set-default/clear-default confirmations, Esc cancellation, idle switching, and current/default labels. Verify Ctrl+Option+O refuses all three changes while busy, succeeds when idle, and `/osdyConfig` still waits for idle. Check one row per profile with **v/s/d/c** context actions and **Enter** usage fallback, without a second action list. From **v** quota details, check eligible **s Switch** opens the same Cancel-first confirmation, with blank separators between the title/effects, choices, and instructions; Cancel/Esc must retain the quota view and scroll position. Check gaps yield on short viewports without hiding safety content or enabling acceptance when the full confirmation cannot fit. Check remaining-capacity bars, **r Refresh**, **b Back/Esc** returning to the selected profile, long-view scrolling, no query on navigation, no stored-profile polling, and cancellation on exit. Create/rename/remove stay in `/osdy-account`, login in `/login`.
+- Subscription quota (manual): compare **Ctrl+Option+U** and `/usage` (Ctrl+Alt+U on other platforms), including **r Refresh** and Esc/q closing. Verify actual terminal chord delivery; use `/usage` if intercepted or unsupported.
 - Usage (manual): check day/week/month and all/current filters, empty/unavailable/limited states, and explicit refresh. Authenticated quota and post-switch account correctness need an intentionally authorized live provider check; local estimates are not billing.
 - Sounds (manual): use disposable readable `.mp3`/`.wav` files to check configure, cancel, clear, and startup-flag precedence. Only choose **Test effective** when playback is intended; actual macOS/Windows playback still needs a live check.
 
-Live TUI appearance, real account switching/authenticated quota, and actual audio playback remain unverified; this checklist is not a recorded pass.
+The user confirmed physical Ctrl+Option+O and Ctrl+Option+U delivery on one Mac terminal; other terminals may intercept or not support these chords. Live TUI appearance, real account switching/authenticated quota, and actual audio playback remain unverified; this checklist is not a recorded full pass.
 
 Install a local checkout into Pi with:
 

package/extensions/osdy-pi/account-profiles.test.ts

@@ -460,12 +460,14 @@ void test("manages profile rename and permanent removal prompts through authorit
 
 void test("switches in place after idle without spawning or shutting down", async () => {
 	const events: string[] = [];
+	let idle = false;
 	await switchAccountInPlace(
 		{
-			isIdle: () => false,
+			isIdle: () => idle,
 			waitForIdle: () =>
 				Promise.resolve().then(() => {
 					events.push("idle");
+					idle = true;
 				}),
 			ui: {
 				notify: (message: string) => events.push(message),
@@ -495,6 +497,46 @@ void test("switches in place after idle without spawning or shutting down", asyn
 	]);
 });
 
+void test("base-context account switches require idle without a command wait hook", async () => {
+	const previous = process.env.OSDY_PI_PROFILE_NAME;
+	try {
+		for (const idle of [false, true]) {
+			process.env.OSDY_PI_PROFILE_NAME = "personal";
+			const events: string[] = [];
+			const notices: string[] = [];
+			const ctx = { isIdle: () => idle, ui: {
+				notify: (message: string) => notices.push(message),
+				select: () => Promise.resolve(undefined), input: () => Promise.resolve(undefined),
+			} };
+			assert.equal("waitForIdle" in ctx, false);
+			const switched = await switchAccountInPlace(ctx, "work",
+				profile => { events.push(`activate:${profile}`); return Promise.resolve(); },
+				() => { events.push("refresh"); return Promise.resolve(); },
+				() => { events.push("render"); });
+			assert.equal(switched, idle);
+			assert.deepEqual(events, idle ? ["activate:work", "render", "refresh"] : []);
+			assert.equal(process.env.OSDY_PI_PROFILE_NAME, idle ? "work" : "personal");
+			assert.match(notices.join(" "), idle ? /Switched to work/ : /require Pi to be idle/);
+		}
+	} finally {
+		if (previous === undefined) delete process.env.OSDY_PI_PROFILE_NAME;
+		else process.env.OSDY_PI_PROFILE_NAME = previous;
+	}
+});
+
+void test("a command wait hook cannot activate an account if Pi remains busy", async () => {
+	const events: string[] = [];
+	const switched = await switchAccountInPlace({ isIdle: () => false,
+		waitForIdle: () => { events.push("wait"); return Promise.resolve(); },
+		ui: { notify: message => events.push(message), select: () => Promise.resolve(undefined), input: () => Promise.resolve(undefined) },
+	}, "work", () => { events.push("activate"); return Promise.resolve(); },
+	() => { events.push("refresh"); return Promise.resolve(); }, () => { events.push("render"); });
+	assert.equal(switched, false);
+	assert.equal(events[0], "wait");
+	assert.match(events[1] ?? "", /require Pi to be idle/);
+	assert.equal(events.length, 2);
+});
+
 void test("keeps the current account when in-place activation fails", async () => {
 	const notices: string[] = [];
 	let renderRequested = false;

package/extensions/osdy-pi/account-profiles.ts

@@ -12,10 +12,9 @@ function sameProfile(left: string | undefined, right: string | undefined): boole
 	return left?.toLowerCase() === right?.toLowerCase();
 }
 
-export type AccountContext = Pick<
-	ExtensionCommandContext,
-	"isIdle" | "waitForIdle"
-> & {
+export type AccountContext = Pick<ExtensionContext, "isIdle"> & {
+	/** Only slash-command contexts can wait; base shortcut contexts must already be idle. */
+	waitForIdle?: ExtensionCommandContext["waitForIdle"];
 	shutdown?: ExtensionCommandContext["shutdown"];
 	sessionManager?: Pick<
 		ExtensionCommandContext["sessionManager"],
@@ -128,7 +127,14 @@ export async function switchAccountInPlace(
 		);
 		return false;
 	}
-	if (!ctx.isIdle()) await ctx.waitForIdle();
+	if (!ctx.isIdle() && ctx.waitForIdle) await ctx.waitForIdle();
+	if (!ctx.isIdle()) {
+		ctx.ui.notify(
+			"Account changes require Pi to be idle. Wait for active work to finish and retry.",
+			"warning",
+		);
+		return false;
+	}
 	try {
 		await activate(profile);
 	} catch {

package/extensions/osdy-pi/constants.ts

@@ -458,11 +458,11 @@ function addRightEdgeGlow(art: MascotArt): MascotArt {
 }
 
 // Transparent overlay at Current's mouth/shoulders (row 17 onward).
-// ▓ = dark cape, ▒ = crimson lining, █/▼ = ivory fangs. Keep the face and tail.
+// ▓ = dark cape, ▒ = crimson lining. Keep the face and tail.
 const VAMPIRE_COSTUME = [
   "        ▓                                     ▓",
-  "         ▓▒▓          █          █         ▓▒▒▓",
-  "          ▓▒▒▒▓       ▼          ▼      ▓▒▒▒▒▓",
+  "         ▓▒▓                               ▓▒▒▓",
+  "          ▓▒▒▒▓                        ▓▒▒▒▒▓",
   "           ▓▒▒▒▒▒▒▓                 ▓▒▒▒▒▒▒▓",
   "            ▓▓▒▒▒▒▒▓▓             ▓▓▒▒▒▒▒▓▓",
   "            ▓▓▓▒▒▒▓▓             ▓▓▒▒▒▓▓▓",

package/extensions/osdy-pi/control-center-account.test.ts

@@ -138,6 +138,87 @@ void test("Bound Account reuses idle switching, quota refresh, and authoritative
 	}
 });
 
+void test("Bound base-context Account mutations refuse busy Pi and work when idle", async () => {
+	const previous = process.env.OSDY_PI_PROFILE_NAME;
+	try {
+		for (const idle of [false, true]) {
+			process.env.OSDY_PI_PROFILE_NAME = "personal";
+			const events: string[] = [];
+			const commands: string[][] = [];
+			const ctx = { isIdle: () => idle, ui: {
+				notify: (text: string) => events.push(text),
+				select: () => Promise.reject(new Error("dialog forbidden")), input: () => Promise.reject(new Error("dialog forbidden")),
+			} };
+			assert.equal("waitForIdle" in ctx, false);
+			const service = bindControlCenterAccount(ctx,
+				() => { events.push("refresh"); return Promise.resolve(); }, () => { events.push("render"); },
+				{ profiles: () => Promise.resolve(["work", "personal"]),
+					activate: name => { events.push(`activate:${name}`); return Promise.resolve(); },
+					run: args => { commands.push(args); return Promise.resolve({ code: 0, stdout: "No default account.", stderr: "" }); } });
+			assert.equal((await service.apply({ kind: "account-switch", profile: "work" })).failed, !idle);
+			assert.equal((await service.apply({ kind: "account-default", profile: "work" })).failed, !idle);
+			assert.equal((await service.apply({ kind: "account-default", profile: undefined })).failed, !idle);
+			assert.deepEqual(commands, idle ? [["account", "default", "work"], ["account", "default", "--clear"]] : []);
+			assert.equal(events.includes("activate:work"), idle);
+			assert.equal(events.includes("render"), idle);
+			assert.equal(events.includes("refresh"), idle);
+			assert.equal(process.env.OSDY_PI_PROFILE_NAME, idle ? "work" : "personal");
+		}
+	} finally {
+		if (previous === undefined) delete process.env.OSDY_PI_PROFILE_NAME;
+		else process.env.OSDY_PI_PROFILE_NAME = previous;
+	}
+});
+
+void test("Bound command Account defaults wait for idle and recheck idle and runtime freshness", async () => {
+	for (const outcome of ["idle", "busy", "stale", "rejected"] as const) {
+		let idle = false;
+		let current = true;
+		const events: string[] = [];
+		const service = bindControlCenterAccount({ isIdle: () => idle,
+			waitForIdle: () => {
+				events.push("wait");
+				idle = outcome !== "busy";
+				current = outcome !== "stale";
+				return outcome === "rejected" ? Promise.reject(new Error("wait failed")) : Promise.resolve();
+			},
+			ui: { notify: () => {}, select: () => Promise.resolve(undefined), input: () => Promise.resolve(undefined) },
+		}, () => { throw new Error("refresh forbidden"); }, () => {},
+		{ profiles: () => Promise.resolve(["work"]), run: args => {
+			events.push(args.join(" ")); return Promise.resolve({ code: 0, stdout: "", stderr: "" });
+		} }, { isCurrent: () => current });
+		assert.equal((await service.apply({ kind: "account-default", profile: "work" })).failed, outcome !== "idle");
+		assert.deepEqual(events, outcome === "idle" ? ["wait", "account default work"] : ["wait"]);
+	}
+});
+
+void test("Bound base-context Account rechecks idle after asynchronous profile validation", async () => {
+	const previous = process.env.OSDY_PI_PROFILE_NAME;
+	process.env.OSDY_PI_PROFILE_NAME = "personal";
+	let idle = true;
+	let finish: (profiles: string[]) => void = () => {};
+	const events: string[] = [];
+	const service = bindControlCenterAccount({ isIdle: () => idle,
+		ui: { notify: () => {}, select: () => Promise.resolve(undefined), input: () => Promise.resolve(undefined) },
+	}, () => { events.push("refresh"); return Promise.resolve(); }, () => { events.push("render"); },
+	{ profiles: () => new Promise(resolve => { finish = resolve; }),
+		activate: () => { events.push("activate"); return Promise.resolve(); },
+		run: () => { events.push("default"); return Promise.resolve({ code: 0, stdout: "", stderr: "" }); } });
+	try {
+		for (const kind of ["account-switch", "account-default"] as const) {
+			idle = true;
+			const applying = service.apply({ kind, profile: "work" });
+			idle = false;
+			finish(["work"]);
+			assert.equal((await applying).failed, true);
+		}
+		assert.deepEqual(events, []);
+	} finally {
+		if (previous === undefined) delete process.env.OSDY_PI_PROFILE_NAME;
+		else process.env.OSDY_PI_PROFILE_NAME = previous;
+	}
+});
+
 void test("Bound Account validates live external active names without rendering unsafe metadata", async () => {
 	const previous = process.env.OSDY_PI_PROFILE_NAME;
 	const service = bindControlCenterAccount({ isIdle: () => true, waitForIdle: () => Promise.resolve(),

package/extensions/osdy-pi/control-center-account.ts

@@ -136,7 +136,7 @@ export function bindControlCenterAccount(ctx: AccountContext, refreshUsage: () =
 			await backend.activate!(name);
 		}, refreshUsage, requestRender) : Promise.resolve(false),
 		setDefault: async profile => {
-			if (!ctx.isIdle()) await ctx.waitForIdle();
+			if (!ctx.isIdle() && ctx.waitForIdle) await ctx.waitForIdle();
 			if (!(options.isCurrent?.() ?? true) || !ctx.isIdle()) return false;
 			return (await backend.run(["account", "default", profile ?? "--clear"])).code === 0;
 		},

package/extensions/osdy-pi/runtime.test.ts

@@ -47,6 +47,8 @@ registerHooks({
 	},
 });
 
+type ShortcutRegistration = Parameters<ExtensionAPI["registerShortcut"]>[1];
+
 const profileLabels = await import("./profile-label.js");
 const { showControlCenter } = await import("./control-center.js");
 
@@ -60,7 +62,7 @@ void test("registered Account factory isolates profile preview from active quota
 	let signal: AbortSignal | undefined; let finish = () => {}; let factoryCalls = 0; let renderCount = 0;
 	let current: (() => boolean) | undefined;
 	const pi = { registerCommand: (name: string, command: { handler(args: string, ctx: ExtensionCommandContext): Promise<void> }) => commands.set(name, command),
-		on: () => {}, registerFlag: () => {}, registerMessageRenderer: () => {}, registerEntryRenderer: () => {}, events: { on: () => () => {} },
+		registerShortcut: () => {}, on: () => {}, registerFlag: () => {}, registerMessageRenderer: () => {}, registerEntryRenderer: () => {}, events: { on: () => () => {} },
 		exec: () => { throw new Error("launcher or provider forbidden"); } } as unknown as ExtensionAPI;
 	const ctx = { cwd: process.cwd(), mode: "tui", hasUI: true, isIdle: () => true, waitForIdle: () => Promise.resolve(), ui: {
 		notify: (text: string) => notices.push(text),
@@ -197,7 +199,7 @@ void test("shared visual actions apply immediately, save the complete settings,
 const { isSmallResponsiveMode } = await import("./utils.js");
 const { createResponsiveCoordinator, reconcileResponsiveUi, disableOsdyPi } = await import("./runtime-helpers.js");
 
-async function focusFixture(options: { boundary?: boolean; throwApply?: boolean; synchronousThrow?: boolean; underlyingOverlay?: boolean; startupFailure?: boolean; registered?: boolean; todoDir?: string; reloadFails?: boolean;
+async function focusFixture(options: { boundary?: boolean; throwApply?: boolean; synchronousThrow?: boolean; underlyingOverlay?: boolean; startupFailure?: boolean; registered?: boolean; shortcut?: boolean; idle?: boolean; todoDir?: string; reloadFails?: boolean;
 	accountFactory?: NonNullable<Parameters<typeof registerOsdyPi>[1]>["accountFactory"] } = {}) {
 	let input: (data: string) => void = () => {};
 	const columns = options.boundary
@@ -237,7 +239,7 @@ async function focusFixture(options: { boundary?: boolean; throwApply?: boolean;
 	let panel: Component & { dispose?(): void };
 	let handle: OverlayHandle;
 	let otherHandle: OverlayHandle | undefined;
-	let complete: () => void = () => {};
+	let complete: (result?: unknown) => void = () => {};
 	let current = true;
 	let headerMounts = 0;
 	const writes: GlobalEditorSettings[] = [];
@@ -246,8 +248,8 @@ async function focusFixture(options: { boundary?: boolean; throwApply?: boolean;
 	const notices: string[] = [];
 	const theme = { name: "dark", appearance: "dark" as const, fg: (_color: string, text: string) => text };
 	const lifecycle: string[] = [];
-	const ctx = { cwd: options.todoDir ?? "/synthetic", isIdle: () => true,
-		reload: () => { lifecycle.push("reload"); return options.reloadFails ? Promise.reject(new Error("reload failed")) : Promise.resolve(); },
+	let idle = options.idle ?? true;
+	const ctx = { cwd: options.todoDir ?? "/synthetic", isIdle: () => idle,
 		hasUI: true, mode: "tui", modelRegistry: { getProviderAuth: () => Promise.resolve(undefined) }, ui: {
 		theme, getAllThemes: () => [{ name: "dark", path: undefined }],
 		setTheme: () => { theme.name = "light"; panel.invalidate(); return { success: true }; },
@@ -275,7 +277,7 @@ async function focusFixture(options: { boundary?: boolean; throwApply?: boolean;
 					lifecycle.push("done"); closes++; tui.hideOverlay(); lifecycle.push("hidden");
 					resolve(result as T); panel.dispose?.(); lifecycle.push("disposed");
 				};
-				complete = () => finish(undefined);
+				complete = result => finish(result);
 				panel = factory(tui, theme as Theme, undefined as never, finish) as typeof panel;
 				const overlayOptions = customOptions?.overlayOptions;
 				handle = tui.showOverlay(panel, typeof overlayOptions === "function" ? overlayOptions() : overlayOptions);
@@ -285,6 +287,12 @@ async function focusFixture(options: { boundary?: boolean; throwApply?: boolean;
 	} };
 	tui.start();
 	const runtimeCtx = ctx as unknown as ExtensionContext;
+	const commandCtx = { ...ctx,
+		waitForIdle: () => { lifecycle.push("idle"); idle = true; return Promise.resolve(); },
+		reload: () => {
+			lifecycle.push("reload"); return options.reloadFails ? Promise.reject(new Error("reload failed")) : Promise.resolve();
+		},
+	} as unknown as ExtensionCommandContext;
 	const coordinator = createResponsiveCoordinator({} as ExtensionAPI, runtimeCtx, state, tree);
 	coordinator.start();
 	const showDirect = () => withEditorMountHold({} as ExtensionAPI, runtimeCtx, state, tree, async () => { await showControlCenter(runtimeCtx, {
@@ -303,8 +311,10 @@ async function focusFixture(options: { boundary?: boolean; throwApply?: boolean;
 	if (options.registered) {
 		coordinator.stop();
 		const commands = new Map<string, { handler(args: string, ctx: ExtensionCommandContext): Promise<void> }>();
+		const shortcuts = new Map<string, ShortcutRegistration>();
 		const handlers = new Map<string, Array<(event: unknown, ctx: ExtensionContext) => Promise<void> | void>>();
 		const pi = { registerCommand: (name: string, command: { handler(args: string, ctx: ExtensionCommandContext): Promise<void> }) => commands.set(name, command),
+			registerShortcut: (key: string, shortcut: ShortcutRegistration) => shortcuts.set(key, shortcut),
 			on: (name: string, handler: (event: unknown, ctx: ExtensionContext) => Promise<void> | void) => {
 				const registered = handlers.get(name) ?? []; registered.push(handler); handlers.set(name, registered);
 			},
@@ -320,12 +330,23 @@ async function focusFixture(options: { boundary?: boolean; throwApply?: boolean;
 		} finally {
 			if (previousDir === undefined) delete process.env.PI_CODING_AGENT_DIR; else process.env.PI_CODING_AGENT_DIR = previousDir;
 		}
+		shutdown = () => { void handlers.get("session_shutdown")?.[1]?.({}, runtimeCtx); };
+		if (options.shortcut) {
+			try {
+				assert.ok(shortcuts.has("ctrl+alt+o"), "Ctrl+Alt+O must open Control Center");
+				assert.equal(shortcuts.has("f1"), false);
+				assert.equal(shortcuts.has("f2"), false);
+				assert.equal("reload" in runtimeCtx, false, "shortcuts receive only the base context");
+				assert.equal("waitForIdle" in runtimeCtx, false, "shortcuts cannot wait through command-only hooks");
+			} catch (error) { shutdown(); tui.stop(); throw error; }
+		}
 		await handlers.get("session_start")?.[1]?.({}, runtimeCtx);
 		replacements = 0;
 		headerMounts = 0;
-		shutdown = () => { void handlers.get("session_shutdown")?.[1]?.({}, runtimeCtx); };
 		transition = async () => { await handlers.get("session_start")?.[1]?.({}, runtimeCtx); };
-		reopen = () => commands.get("osdyConfig")!.handler("", runtimeCtx as ExtensionCommandContext);
+		reopen = options.shortcut
+			? async () => { await shortcuts.get("ctrl+alt+o")!.handler(runtimeCtx); }
+			: () => commands.get("osdyConfig")!.handler("", commandCtx);
 	}
 	if (options.underlyingOverlay) otherHandle = tui.showOverlay({ render: () => ["Other overlay"], invalidate: () => {} });
 	const showing = reopen();
@@ -337,12 +358,13 @@ async function focusFixture(options: { boundary?: boolean; throwApply?: boolean;
 		disable: () => { state.enabled = false; disableOsdyPi(runtimeCtx, state); },
 		reconcile: () => reconcileResponsiveUi({} as ExtensionAPI, runtimeCtx, state, tree), send: (data: string) => input(data), text: () => panel.render(100).join("\n"),
 		focused: () => handle.isFocused(), replacements: () => replacements, closes: () => closes,
-		resolveSave: () => resolveSave(), rejectSave: () => rejectSave(), complete: () => complete(),
+		resolveSave: () => resolveSave(), rejectSave: () => rejectSave(), complete: (result?: unknown) => complete(result),
+		setIdle: (value: boolean) => { idle = value; },
 		editors, mountedEditor: () => editors.find(candidate => editorArea.children.includes(candidate))!,
 		other: () => otherHandle, cleanup: () => { shutdown(); coordinator.stop(); panel?.dispose?.(); handle?.hide(); otherHandle?.hide(); tui.stop(); } };
 }
-for (const closePending of [false, true]) {
-	void test(`registered Account real TUI ${closePending ? "aborts pending preview and ignores late completion" : "renders selected profile quota before Escape restores mounted input"}`, async () => {
+for (const shortcut of [false, true]) for (const closePending of [false, true]) {
+	void test(`registered ${shortcut ? "Ctrl+Alt+O" : "command"} Account real TUI ${closePending ? "aborts pending preview and ignores late completion" : "renders selected profile quota before Escape restores mounted input"}`, async () => {
 		const { bindControlCenterAccount } = await import("./control-center-account.js");
 		const queries: string[] = []; const metadataCalls: string[][] = [];
 		let signal: AbortSignal | undefined;
@@ -354,7 +376,7 @@ for (const closePending of [false, true]) {
 			quotaSnapshot: { fetchedAt: checkedAt, planType: "plus", ordinaryUsageAllowed: true, credits: undefined,
 				buckets: [{ id: "codex", label: "Codex", primary: { usedPercent: 37, windowMinutes: 300, resetsAt }, secondary: undefined }] },
 		};
-		const f = await focusFixture({ registered: true, accountFactory: (context, _refresh, render, _backend, options) => {
+		const f = await focusFixture({ registered: true, shortcut, idle: false, accountFactory: (context, _refresh, render, _backend, options) => {
 			factoryCalls++;
 			return bindControlCenterAccount(context, () => { activeRefreshes++; throw new Error("active quota refresh forbidden"); }, render,
 				{ profiles: () => Promise.resolve(["personal", "work"]),
@@ -425,12 +447,73 @@ for (const closePending of [false, true]) {
 	});
 }
 
-void test("registered TODO reload follows public done, SDK hide/dispose and deferred editor mount release", async () => {
-	for (const reloadFails of [false, true]) {
+for (const shortcut of [false, true]) void test(`registered ${shortcut ? "Ctrl+Alt+O" : "command"} Account confirms mutations and respects its idle capability`, async () => {
+	const { bindControlCenterAccount } = await import("./control-center-account.js");
+	const previous = process.env.OSDY_PI_PROFILE_NAME;
+	try {
+		for (const initialIdle of [false, true]) {
+			process.env.OSDY_PI_PROFILE_NAME = "personal";
+			let defaultProfile: string | undefined = "personal";
+			const mutations: string[] = [];
+			const f = await focusFixture({ registered: true, shortcut, idle: initialIdle,
+				accountFactory: (context, _refresh, render, _backend, options) => {
+					assert.equal(typeof context.waitForIdle, shortcut ? "undefined" : "function");
+					return bindControlCenterAccount(context,
+						() => { mutations.push("refresh"); return Promise.resolve(); }, render,
+						{ profiles: () => Promise.resolve(["work", "personal"]),
+							activate: profile => { mutations.push(`switch:${profile}`); return Promise.resolve(); },
+							run: args => {
+								if (args.length === 3) {
+									mutations.push(`default:${args[2]}`);
+									defaultProfile = args[2] === "--clear" ? undefined : args[2];
+								}
+								return Promise.resolve({ code: 0, stdout: defaultProfile ?? "No default account.", stderr: "" });
+							},
+						}, options);
+				},
+			});
+			try {
+				for (let i = 0; i < 6; i++) f.send("\x1b[B");
+				await flushFocus(); await flushFocus();
+				f.send("\x1b[C"); f.send("\x1b[H");
+				assert.match(f.text(), /> work/);
+				const refused = shortcut && !initialIdle;
+				for (const key of ["s", "d", "c"]) {
+					f.setIdle(initialIdle);
+					const beforeCancel = [...mutations];
+					f.send(key);
+					assert.match(f.text(), /> Cancel/);
+					f.send("\r");
+					assert.deepEqual(mutations, beforeCancel, "Cancel never mutates");
+					f.send(key); f.text(); f.send("\x1b[B"); f.send("\r");
+					await flushFocus(); await flushFocus();
+					assert.match(f.text(), refused ? /Account operation failed; change not confirmed/ : key === "s" ? /Account switched/ : /Default account saved/);
+					assert.equal(f.closes(), 0, "Account changes keep the panel open");
+				}
+				assert.deepEqual(mutations, refused ? [] : ["switch:work", "refresh", "default:work", "default:--clear"]);
+				assert.equal(process.env.OSDY_PI_PROFILE_NAME, refused ? "personal" : "work");
+				assert.equal(defaultProfile, refused ? "personal" : undefined);
+				assert.equal(f.lifecycle.filter(event => event === "idle").length, !shortcut && !initialIdle ? 3 : 0);
+				f.send("\x1b"); await f.showing;
+				assert.equal(f.tui.hasOverlay(), false);
+				assert.ok(!f.lifecycle.includes("reload"));
+				assertEditorContinuity(f);
+			} finally { f.cleanup(); }
+		}
+	} finally {
+		if (previous === undefined) delete process.env.OSDY_PI_PROFILE_NAME;
+		else process.env.OSDY_PI_PROFILE_NAME = previous;
+	}
+});
+
+void test("registered TODO selection reloads from the command but Ctrl+Alt+O requests manual reload after disposal and hold release", async () => {
+	for (const { shortcut, reloadFails } of [
+		{ shortcut: false, reloadFails: false }, { shortcut: false, reloadFails: true }, { shortcut: true, reloadFails: false },
+	]) {
 		const previousDir = process.env.PI_CODING_AGENT_DIR;
 		const agentDir = mkdtempSync(join(tmpdir(), "osdy-cc07-runtime-"));
 		process.env.PI_CODING_AGENT_DIR = agentDir;
-		const f = await focusFixture({ registered: true, todoDir: agentDir, reloadFails });
+		const f = await focusFixture({ registered: true, shortcut, todoDir: agentDir, reloadFails });
 		try {
 			f.lifecycle.length = 0;
 			// Queue simple editor while this real overlay still owns input.
@@ -447,10 +530,13 @@ void test("registered TODO reload follows public done, SDK hide/dispose and defe
 			assert.match(f.text(), /Reload follows/);
 			f.send("\x1b[B"); f.send("\r");
 			await f.showing;
-			assert.deepEqual(f.lifecycle, ["done", "hidden", "disposed", "editor-mount", "reload"]);
+			assert.deepEqual(f.lifecycle, ["done", "hidden", "disposed", "editor-mount", ...(shortcut ? [] : ["reload"])]);
 			assert.equal(f.closes(), 1);
 			assert.equal(f.tui.hasOverlay(), false);
-			assert.deepEqual(f.notices, [], "no stale-context notification even after reload rejection");
+			if (shortcut) {
+				assert.equal(f.notices.length, 1);
+				assert.match(f.notices[0]!, /saved.*run \/reload.*manually/i);
+			} else assert.deepEqual(f.notices, [], "no stale-context notification even after reload rejection");
 			assert.match(readFileSync(join(agentDir, "settings.json"), "utf8"), /"enabled": true/);
 		} finally {
 			f.cleanup();
@@ -459,14 +545,27 @@ void test("registered TODO reload follows public done, SDK hide/dispose and defe
 	}
 });
 
-void test("registered Agents uses synthetic normal Pi and reloads only after SDK disposal and hold release", { timeout: 5000 }, async () => {
+void test("Ctrl+Alt+O ignores a reload result after runtime shutdown", async () => {
+	const f = await focusFixture({ registered: true, shortcut: true });
+	try {
+		f.shutdown();
+		f.lifecycle.length = 0;
+		f.complete({ kind: "reload" });
+		await f.showing;
+		assert.deepEqual(f.lifecycle, ["done", "hidden", "disposed"]);
+		assert.deepEqual(f.notices, []);
+		assert.equal(f.tui.hasOverlay(), false);
+	} finally { f.cleanup(); }
+});
+
+for (const shortcut of [false, true]) void test(`registered ${shortcut ? "Ctrl+Alt+O" : "command"} Agents uses synthetic normal Pi and handles reload only after SDK disposal and hold release`, { timeout: 5000 }, async () => {
 	const previousHome = process.env.HOME; const previousDir = process.env.PI_CODING_AGENT_DIR;
 	const home = mkdtempSync(join(tmpdir(), "osdy-cc08-runtime-"));
 	const agentDir = join(home, ".pi", "agent"); mkdirSync(agentDir, { recursive: true });
 	const path = join(agentDir, "settings.json");
 	writeFileSync(path, JSON.stringify({ packages: ["npm:gentle-pi", "npm:pi-subagents-j0k3r"], unrelated: true }));
 	process.env.HOME = home; delete process.env.PI_CODING_AGENT_DIR;
-	const f = await focusFixture({ registered: true, todoDir: home });
+	const f = await focusFixture({ registered: true, shortcut, todoDir: home });
 	try {
 		f.lifecycle.length = 0;
 		for (let i = 0; i < 3; i++) f.send("\x1b[B");
@@ -481,8 +580,12 @@ void test("registered Agents uses synthetic normal Pi and reloads only after SDK
 		f.send("\r"); assert.equal(f.closes(), 0);
 		f.send("g"); f.text(); f.send("\x1b[B"); f.send("\r");
 		await f.showing;
-		assert.deepEqual(f.lifecycle, ["done", "hidden", "disposed", "editor-mount", "reload"]);
-		assert.equal(f.closes(), 1); assert.equal(f.tui.hasOverlay(), false); assert.deepEqual(f.notices, []);
+		assert.deepEqual(f.lifecycle, ["done", "hidden", "disposed", "editor-mount", ...(shortcut ? [] : ["reload"])]);
+		assert.equal(f.closes(), 1); assert.equal(f.tui.hasOverlay(), false);
+		if (shortcut) {
+			assert.equal(f.notices.length, 1);
+			assert.match(f.notices[0]!, /saved.*run \/reload.*manually/i);
+		} else assert.deepEqual(f.notices, []);
 		assert.match(readFileSync(path, "utf8"), /-\.\/index.ts/);
 		assert.match(readFileSync(path, "utf8"), /"unrelated": true/);
 	} finally {
@@ -819,9 +922,9 @@ void test("registered runtime modal wiring defers editor changes and shutdown ca
 	} finally { f.cleanup(); }
 });
 
-void test("registered runtime session transition ignores the old modal finally and uses the new watcher", async (t) => {
+for (const shortcut of [false, true]) void test(`registered ${shortcut ? "Ctrl+Alt+O" : "command"} session transition ignores the old modal finally and uses the new watcher`, async (t) => {
 	t.mock.timers.enable({ apis: ["setInterval"] });
-	const f = await focusFixture({ registered: true });
+	const f = await focusFixture({ registered: true, shortcut });
 	try {
 		chooseVisual(f, 3);
 		await f.transition();
@@ -845,10 +948,11 @@ void test("registered runtime session transition ignores the old modal finally a
 	} finally { f.cleanup(); }
 });
 
-void test("registered legacy commands and osdyConfig share live values and existing persistence/notifications", async () => {
+void test("registered Ctrl+Alt+O and osdyConfig share the same panel, live values and legacy persistence/notifications", async () => {
 	const previousDir = process.env.PI_CODING_AGENT_DIR;
 	process.env.PI_CODING_AGENT_DIR = fileURLToPath(new URL("./.startup-test-missing", import.meta.url));
 	const commands = new Map<string, { handler(args: string, ctx: ExtensionCommandContext): Promise<void> }>();
+	const shortcuts = new Map<string, ShortcutRegistration>();
 	const writes: GlobalEditorSettings[] = [];
 	const notices: { message: string; level: string | undefined }[] = [];
 	const gitCalls: { command: string; args: string[] }[] = [];
@@ -856,6 +960,7 @@ void test("registered legacy commands and osdyConfig share live values and exist
 	let mounts = 0;
 	let panels = 0;
 	const pi = { registerCommand: (name: string, command: { handler(args: string, ctx: ExtensionCommandContext): Promise<void> }) => commands.set(name, command),
+		registerShortcut: (key: string, shortcut: ShortcutRegistration) => shortcuts.set(key, shortcut),
 		on: () => {}, registerFlag: () => {}, registerMessageRenderer: () => {}, registerEntryRenderer: () => {},
 		exec: (command: string, args: string[]) => {
 			gitCalls.push({ command, args: [...args] });
@@ -922,16 +1027,24 @@ void test("registered legacy commands and osdyConfig share live values and exist
 		assert.deepEqual(notices.at(-1), { message: "osdy-pi mascot: Osdy-Halloween", level: "info" });
 		for (const args of ["working-tree status", "header status", "mascot status", "editor status", "header invalid", "mascot bts extra", "mascot osdy-halloween extra", "mascot invalid", "editor simple extra"]) await legacy.handler(args, ctx);
 		assert.equal(writes.length, before, "status and invalid inputs never save");
-		const beforeModalGitCalls = gitCalls.length;
-		const beforeModalNotices = notices.length;
-		await modal.handler("", ctx);
-		assert.deepEqual(notices.slice(beforeModalNotices).filter((notice) => notice.level === "error"), [],
-			"modal integration assertions must not be swallowed as Control Center error notifications");
-		assert.equal(panels, 1);
-		assert.deepEqual(gitCalls.slice(beforeModalGitCalls, beforeModalGitCalls + 2), [
-			{ command: "git", args: ["--no-optional-locks", "branch", "--show-current"] },
-			{ command: "git", args: ["--no-optional-locks", "status", "--short", "--untracked-files=normal"] },
-		], "modal inspection uses exact read-only Git commands, including the global option");
+		assert.equal(shortcuts.has("f1"), false);
+		assert.equal(shortcuts.has("f2"), false);
+		assert.deepEqual([...shortcuts.keys()].sort(), ["ctrl+alt+o", "ctrl+alt+u"]);
+		assert.equal("reload" in ctx, false);
+		for (const open of [() => modal.handler("", ctx), () => shortcuts.get("ctrl+alt+o")!.handler(ctx)]) {
+			await legacy.handler("header neon", ctx);
+			await legacy.handler("working-tree off", ctx);
+			const beforeModalGitCalls = gitCalls.length;
+			const beforeModalNotices = notices.length;
+			await open();
+			assert.deepEqual(notices.slice(beforeModalNotices).filter((notice) => notice.level === "error"), [],
+				"modal integration assertions must not be swallowed as Control Center error notifications");
+			assert.deepEqual(gitCalls.slice(beforeModalGitCalls, beforeModalGitCalls + 2), [
+				{ command: "git", args: ["--no-optional-locks", "branch", "--show-current"] },
+				{ command: "git", args: ["--no-optional-locks", "status", "--short", "--untracked-files=normal"] },
+			], "both entry points inspect Git through the same read-only owner");
+		}
+		assert.equal(panels, 2);
 		failure = true;
 		await legacy.handler("working-tree off", ctx);
 		assert.match(notices.at(-1)?.message ?? "", /disabled but could not be saved/);
@@ -950,6 +1063,52 @@ void test("registered legacy commands and osdyConfig share live values and exist
 	}
 });
 
+void test("registered shortcuts preserve command no-UI and Control Center mode/error guards", async () => {
+	const previous = process.env.PI_CODING_AGENT_DIR;
+	process.env.PI_CODING_AGENT_DIR = fileURLToPath(new URL("./.startup-test-missing", import.meta.url));
+	const commands = new Map<string, { handler(args: string, ctx: ExtensionCommandContext): Promise<void> }>();
+	const shortcuts = new Map<string, ShortcutRegistration>();
+	const notices: { message: string; level: string | undefined }[] = [];
+	let customCalls = 0;
+	const pi = { registerCommand: (name: string, command: { handler(args: string, ctx: ExtensionCommandContext): Promise<void> }) => commands.set(name, command),
+		registerShortcut: (key: string, shortcut: ShortcutRegistration) => shortcuts.set(key, shortcut),
+		on: () => {}, registerFlag: () => {}, registerMessageRenderer: () => {}, registerEntryRenderer: () => {},
+		events: { on: () => () => {} }, exec: () => { throw new Error("external execution forbidden"); },
+	} as unknown as ExtensionAPI;
+	const ctx = { cwd: "/synthetic", hasUI: false, mode: "tui", ui: {
+		notify: (message: string, level?: string) => notices.push({ message, level }),
+		custom: () => { customCalls++; throw new Error("overlay failed"); },
+		setEditorComponent: () => {}, setHeader: () => {}, setFooter: () => {}, setWidget: () => {}, setWorkingVisible: () => {},
+	} } as unknown as ExtensionContext;
+	const commandCtx = { ...ctx, reload: () => { throw new Error("reload forbidden"); } } as unknown as ExtensionCommandContext;
+	try {
+		await registerOsdyPi(pi);
+		assert.equal(shortcuts.has("f1"), false);
+		assert.equal(shortcuts.has("f2"), false);
+		assert.deepEqual([...shortcuts.keys()].sort(), ["ctrl+alt+o", "ctrl+alt+u"]);
+		for (const [key, command] of [["ctrl+alt+o", "osdyConfig"], ["ctrl+alt+u", "usage"]] as const) {
+			notices.length = 0;
+			await commands.get(command)!.handler("", commandCtx);
+			const commandNotice = notices.at(-1);
+			await shortcuts.get(key)!.handler(ctx);
+			assert.deepEqual(notices.at(-1), commandNotice);
+			assert.equal(commandNotice?.level, "warning");
+			assert.match(commandNotice?.message ?? "", /interactive.*UI/);
+		}
+		assert.equal(customCalls, 0);
+		for (const mode of ["rpc", "json", "print"] as const) {
+			await shortcuts.get("ctrl+alt+o")!.handler({ ...ctx, mode, hasUI: true });
+			assert.match(notices.at(-1)?.message ?? "", /interactive terminal UI/);
+		}
+		assert.equal(customCalls, 0);
+		await shortcuts.get("ctrl+alt+o")!.handler({ ...ctx, hasUI: true });
+		assert.equal(customCalls, 1);
+		assert.deepEqual(notices.at(-1), { message: "Control Center unavailable: overlay failed", level: "error" });
+	} finally {
+		if (previous === undefined) delete process.env.PI_CODING_AGENT_DIR; else process.env.PI_CODING_AGENT_DIR = previous;
+	}
+});
+
 void test("actual factory registers no TODO surfaces by default, and all three only with opt-in", async () => {
  const root = mkdtempSync(join(tmpdir(), "osdy-runtime-todo-"));
  const agentDir = join(root, "agent"); mkdirSync(agentDir);
@@ -986,7 +1145,10 @@ void test("actual factory registers no TODO surfaces by default, and all three o
    assert.ok(commands.includes("osdyConfig"));
    assert.equal(commands.includes("osdy"), false);
    assert.equal(commands.includes("todos"), enabled); assert.equal(tools.includes("todo"), enabled);
-   assert.equal(shortcuts.length > 0, enabled);
+   assert.ok(shortcuts.includes("ctrl+alt+o")); assert.ok(shortcuts.includes("ctrl+alt+u"));
+   assert.equal(shortcuts.includes("f1"), false); assert.equal(shortcuts.includes("f2"), false);
+   assert.equal(shortcuts.includes("ctrl+shift+t"), enabled);
+   assert.equal(shortcuts.length, enabled ? 3 : 2);
    assert.equal(execCalls, probes);
   }
  } finally {
@@ -1020,7 +1182,10 @@ void test("official SDK factory uses SDK cwd, not the safe process cwd, before T
     assert.equal(extension.commands.has("osdy"), false);
     assert.equal(extension.tools.has("todo"), active, cwd);
     assert.equal(extension.commands.has("todos"), active, cwd);
-    assert.equal(extension.shortcuts.size > 0, active, cwd);
+    assert.ok(extension.shortcuts.has("ctrl+alt+o")); assert.ok(extension.shortcuts.has("ctrl+alt+u"));
+    assert.equal(extension.shortcuts.has("f1"), false); assert.equal(extension.shortcuts.has("f2"), false);
+    assert.equal(extension.shortcuts.has("ctrl+shift+t"), active, cwd);
+    assert.equal(extension.shortcuts.size, active ? 3 : 2, cwd);
    } finally { runtime.invalidate(); }
   }
  } finally {
@@ -1048,7 +1213,8 @@ void test("unavailable, failed and invalid SDK cwd probes fail closed", async ()
    } as unknown as ExtensionAPI;
    await registerOsdyPi(pi);
    assert.ok(commands.includes("osdy-pi")); assert.equal(commands.includes("todos"), false);
-   assert.equal(tools.includes("todo"), false); assert.equal(shortcuts.length, 0);
+   assert.equal(tools.includes("todo"), false); assert.deepEqual(shortcuts.sort(), ["ctrl+alt+o", "ctrl+alt+u"]);
+   assert.equal(shortcuts.includes("f1"), false); assert.equal(shortcuts.includes("f2"), false);
   }
  } finally {
   if (previous === undefined) delete process.env.PI_CODING_AGENT_DIR; else process.env.PI_CODING_AGENT_DIR = previous;
@@ -1168,7 +1334,7 @@ void test("real session_start restores labels before editor mounting and rejects
 					registered.push(handler);
 					handlers.set(name, registered);
 				},
-				registerCommand: () => {}, registerFlag: () => {}, registerMessageRenderer: () => {}, registerEntryRenderer: () => {},
+				registerCommand: () => {}, registerShortcut: () => {}, registerFlag: () => {}, registerMessageRenderer: () => {}, registerEntryRenderer: () => {},
 				events: { on: () => () => {} },
 				exec: () => Promise.resolve({ code: 1, stdout: "", stderr: "unavailable" }),
 			} as unknown as ExtensionAPI;
@@ -1507,6 +1673,8 @@ class IdleQuotaClock implements CodexUsageRefreshClock {
 
 async function idleQuotaFixture() {
 	const clock = new IdleQuotaClock();
+	const shortcuts = new Map<string, ShortcutRegistration>();
+	const authSessions: number[] = [];
 	const commands = new Map<string, { handler(args: string, ctx: ExtensionCommandContext): Promise<void> }>();
 	const handlers = new Map<string, Array<(event: unknown, ctx: ExtensionContext) => Promise<void> | void>>();
 	const requests: Array<{ signal: AbortSignal; resolve(snapshot: CodexUsageSnapshot): void; reject(error: Error): void }> = [];
@@ -1515,16 +1683,19 @@ async function idleQuotaFixture() {
 	const snapshot = (fetchedAt: number): CodexUsageSnapshot => ({ fetchedAt, planType: "plus", ordinaryUsageAllowed: true,
 		buckets: [], credits: undefined });
 	const pi = { registerCommand: (name: string, command: { handler(args: string, ctx: ExtensionCommandContext): Promise<void> }) => commands.set(name, command),
+		registerShortcut: (key: string, shortcut: ShortcutRegistration) => shortcuts.set(key, shortcut),
 		on: (name: string, handler: (event: unknown, ctx: ExtensionContext) => Promise<void> | void) => {
 			const list = handlers.get(name) ?? []; list.push(handler); handlers.set(name, list);
 		}, registerFlag: () => {}, registerMessageRenderer: () => {}, registerEntryRenderer: () => {},
 		events: { on: () => () => {} }, exec: () => { throw new Error("external execution forbidden"); },
 	} as unknown as ExtensionAPI;
 	const accessToken = `header.${Buffer.from(JSON.stringify({ "https://api.openai.com/auth": { chatgpt_account_id: "fake-account" } })).toString("base64url")}.signature`;
-	const makeContext = () => ({ cwd: "/synthetic-idle-quota", get hasUI() { return hasUI; }, get mode() { return mode; },
+	const makeContext = () => {
+		const generation = session;
+		return ({ cwd: "/synthetic-idle-quota", get hasUI() { return hasUI; }, get mode() { return mode; },
 		get model() { return { provider, id: "fake-codex", name: `session-${session}` }; }, isIdle: () => idle,
 		getThinkingLevel: () => "off", modelRegistry: { getProviderAuth: () => {
-			authCalls++; return Promise.resolve({ auth: { apiKey: accessToken } });
+			authCalls++; authSessions.push(generation); return Promise.resolve({ auth: { apiKey: accessToken } });
 		} }, ui: { getEditorComponent: () => undefined, setEditorComponent: () => {}, setHeader: () => {}, setFooter: () => {},
 			setWidget: () => {}, setWorkingVisible: () => {}, notify: () => {},
 			custom: (factory: (tui: unknown, theme: unknown, keys: unknown, done: () => void) => Component) => {
@@ -1532,7 +1703,8 @@ async function idleQuotaFixture() {
 				return Promise.resolve();
 			},
 		},
-	}) as unknown as ExtensionContext;
+		}) as unknown as ExtensionContext;
+	};
 	let ctx = makeContext();
 	const previousDir = process.env.PI_CODING_AGENT_DIR;
 	// A nonexistent synthetic directory prevents factory inspection of personal settings.
@@ -1553,10 +1725,17 @@ async function idleQuotaFixture() {
 		assert.ok(handler, `runtime ${name} handler must be registered`);
 		await handler({}, ctx); await clock.advance(0);
 	};
-	return { clock, requests, snapshot, authCalls: () => authCalls,
+	return { clock, requests, snapshot, authSessions, authCalls: () => authCalls, context: () => ctx,
 		start: () => lifecycle("session_start"), stop: () => lifecycle("session_shutdown"), settle: () => lifecycle("agent_settled"),
 		replace: async () => { session++; ctx = makeContext(); await lifecycle("session_start"); },
 		manual: async () => { await commands.get("usage")!.handler("", ctx as ExtensionCommandContext); await clock.advance(0); },
+		shortcut: async (context: ExtensionContext = ctx) => {
+			assert.ok(shortcuts.has("ctrl+alt+u"), "Ctrl+Alt+U must open subscription usage");
+			assert.equal(shortcuts.has("f1"), false);
+			assert.equal(shortcuts.has("f2"), false);
+			assert.equal("reload" in context, false);
+			await shortcuts.get("ctrl+alt+u")!.handler(context); await clock.advance(0);
+		},
 		visual: async (action: "on" | "off") => { await commands.get("osdy-pi")!.handler(action, ctx as ExtensionCommandContext); },
 		panel: () => panel!.render(100).join("\n"),
 		set: (values: { enabled?: boolean; hasUI?: boolean; idle?: boolean; provider?: string; mode?: string }) => {
@@ -1588,6 +1767,29 @@ void test("registered idle quota runtime respects timing, in-flight manual reque
 	} finally { await f.stop(); }
 });
 
+void test("Ctrl+Alt+U opens the usage command panel and refreshes the latest session from a base context", async () => {
+	const f = await idleQuotaFixture();
+	try {
+		await f.start(); await f.complete(0);
+		await f.manual();
+		const commandPanel = f.panel();
+		await f.shortcut();
+		assert.equal(f.panel(), commandPanel, "both entry points render the same loading dashboard and metadata");
+		assert.equal(f.requests.length, 3);
+		assert.equal(f.requests[1]?.signal.aborted, true, "Ctrl+Alt+U supersedes the command refresh");
+		await f.complete(1); await f.complete(2);
+		assert.match(f.panel(), /Codex subscription usage/);
+		const oldContext = f.context();
+		await f.replace(); await f.complete(3);
+		await f.shortcut(oldContext);
+		assert.equal(f.authSessions.at(-1), 1, "even an older shortcut context refreshes current session auth");
+		await f.stop();
+		assert.equal(f.requests[4]?.signal.aborted, true);
+		await f.complete(4);
+		assert.equal(f.clock.jobs.size, 0, "shutdown ignores the late shortcut query result");
+	} finally { await f.stop(); }
+});
+
 void test("registered idle quota runtime skips disabled UI, non-Codex and busy sessions", async () => {
 	const f = await idleQuotaFixture();
 	try {

package/extensions/osdy-pi/runtime.ts

@@ -779,24 +779,29 @@ function registerUsageCommand(
 		getSessionContext,
 		startRefresh,
 	);
+	const openUsagePanel = async (ctx: ExtensionContext): Promise<void> => {
+		if (!ctx.hasUI) {
+			ctx.ui.notify("Codex usage requires the interactive UI", "warning");
+			return;
+		}
+		await showCodexUsagePanel(
+			ctx,
+			() => state.codexUsage,
+			refreshActiveSessionUsage,
+			{
+				profile: resolveActiveProfileLabel(),
+				provider: ctx.model?.provider ?? "unknown",
+				model: modelLabel(ctx),
+			},
+		);
+	};
 	pi.registerCommand("usage", {
 		description: "Show current Codex subscription usage.",
-		handler: async (_args, ctx) => {
-			if (!ctx.hasUI) {
-				ctx.ui.notify("Codex usage requires the interactive UI", "warning");
-				return;
-			}
-			await showCodexUsagePanel(
-				ctx,
-				() => state.codexUsage,
-				refreshActiveSessionUsage,
-				{
-					profile: resolveActiveProfileLabel(),
-					provider: ctx.model?.provider ?? "unknown",
-					model: modelLabel(ctx),
-				},
-			);
-		},
+		handler: async (_args, ctx) => openUsagePanel(ctx),
+	});
+	pi.registerShortcut("ctrl+alt+u", {
+		description: "Show current Codex subscription usage.",
+		handler: openUsagePanel,
 	});
 }
 
@@ -895,43 +900,54 @@ function registerCommand(
 	captureCurrentRuntime: () => () => boolean,
 	accountFactory: typeof bindControlCenterAccount,
 ): void {
+	const openControlCenter = async (
+		ctx: ExtensionContext,
+		onReloadRequired: () => Promise<void> | void,
+	): Promise<void> => {
+		const isCurrent = captureCurrentRuntime();
+		const completion: { result: ControlCenterResult } = { result: { kind: "closed" } };
+		await withEditorMountHold(pi, ctx, state, workingTreeState, async () => {
+			completion.result = await showControlCenter(ctx, {
+				snapshot: () => state,
+				apply: (action) => isCurrent()
+					? applyVisualPreference(action, pi, ctx, state, workingState, workingTreeState, editorSettingsStore)
+					: Promise.resolve(false),
+			}, {
+				git: createControlCenterGit({
+					snapshot: () => ({ enabled: state.workingTreeEnabled, placement: state.workingTreePlacement }),
+					exec: async (args) => {
+						const result = await pi.exec("git", args, { cwd: ctx.cwd, timeout: 5000 });
+						if (result.code !== 0 || result.killed) throw new Error("Git inspection failed");
+						return result.stdout;
+					},
+					applyEnabled: (value) => applyWorkingTreeEnabled(value, pi, ctx, state, workingState, workingTreeState, editorSettingsStore),
+				}),
+				sounds: bindControlCenterSounds(pi, ctx, settingsStore, createAudioPlaybackAdapter()),
+				account: accountFactory(ctx, refreshUsage, () => state.tui?.requestRender(), undefined, { isCurrent }),
+				usage: createControlCenterUsage({ quota: () => state.codexUsage, history: readUsageHistory,
+					refresh: refreshUsage, active: readActiveProfileName }),
+				todo: createControlCenterTodo({ agentDir: todoAgentDir(), cwd: ctx.cwd,
+					loaded: todoActive, isIdle: () => ctx.isIdle(), isCurrent }),
+				agents: createControlCenterAgents({ agentDir: todoAgentDir(), cwd: ctx.cwd,
+					env: { ...process.env }, isIdle: () => ctx.isIdle(), isCurrent }),
+			});
+		}, isCurrent);
+		// Disposal and hold release precede either effect; check freshness without another await.
+		if (completion.result.kind === "reload" && isCurrent()) await onReloadRequired();
+	};
 	pi.registerCommand("osdyConfig", {
 		description: "Open Osdy Control Center (preferences, Git, Sounds, Account, Usage, TODO and Agents).",
-		handler: async (_args, ctx) => {
-			const isCurrent = captureCurrentRuntime();
-			const completion: { result: ControlCenterResult } = { result: { kind: "closed" } };
-			await withEditorMountHold(pi, ctx, state, workingTreeState, async () => {
-				completion.result = await showControlCenter(ctx, {
-					snapshot: () => state,
-					apply: (action) => isCurrent()
-						? applyVisualPreference(action, pi, ctx, state, workingState, workingTreeState, editorSettingsStore)
-						: Promise.resolve(false),
-				}, {
-					git: createControlCenterGit({
-						snapshot: () => ({ enabled: state.workingTreeEnabled, placement: state.workingTreePlacement }),
-						exec: async (args) => {
-							const result = await pi.exec("git", args, { cwd: ctx.cwd, timeout: 5000 });
-							if (result.code !== 0 || result.killed) throw new Error("Git inspection failed");
-							return result.stdout;
-						},
-						applyEnabled: (value) => applyWorkingTreeEnabled(value, pi, ctx, state, workingState, workingTreeState, editorSettingsStore),
-					}),
-					sounds: bindControlCenterSounds(pi, ctx, settingsStore, createAudioPlaybackAdapter()),
-					account: accountFactory(ctx, refreshUsage, () => state.tui?.requestRender(), undefined, { isCurrent }),
-					usage: createControlCenterUsage({ quota: () => state.codexUsage, history: readUsageHistory,
-						refresh: refreshUsage, active: readActiveProfileName }),
-					todo: createControlCenterTodo({ agentDir: todoAgentDir(), cwd: ctx.cwd,
-						loaded: todoActive, isIdle: () => ctx.isIdle(), isCurrent }),
-					agents: createControlCenterAgents({ agentDir: todoAgentDir(), cwd: ctx.cwd,
-						env: { ...process.env }, isIdle: () => ctx.isIdle(), isCurrent }),
-				});
-			}, isCurrent);
-			if (completion.result.kind === "reload" && isCurrent()) {
-				// Disposal and CC06 hold release precede reload; old context is unusable afterward.
-				try { await ctx.reload(); } catch { return; }
-				return;
-			}
-		},
+		handler: async (_args, ctx) => openControlCenter(ctx, async () => {
+			// Keep reload bound to the command context; never use that context afterward.
+			try { await ctx.reload(); } catch { return; }
+		}),
+	});
+	pi.registerShortcut("ctrl+alt+o", {
+		description: "Open Osdy Control Center.",
+		handler: async (ctx) => openControlCenter(ctx, () => {
+			// Shortcuts receive only the base context, without command-only reload.
+			ctx.ui.notify("Settings saved. Run /reload manually to apply the changes.", "info");
+		}),
 	});
 	pi.registerCommand("osdy-pi", {
 		description:

package/extensions/osdy-pi/ui.test.ts

@@ -260,7 +260,7 @@ void test("Current and Bts retain their original glyphs, tone maps, and palettes
 	}
 });
 
-void test("Osdy-Halloween preserves Current's face and tail beneath a bounded vampire costume", () => {
+void test("Osdy-Halloween preserves Current's muzzle and tail beneath a fang-free cape", () => {
 	const { art, tonePalette } = mascotForChoice("osdy-halloween");
 	const current = MASCOTS.current.art;
 	assert.deepEqual(art.mascot.slice(0, 17), current.mascot.slice(0, 17), "same ears, mask, eyes and snout");
@@ -268,13 +268,18 @@ void test("Osdy-Halloween preserves Current's face and tail beneath a bounded va
 		assert.equal(art.mascot[row]?.slice(44), current.mascot[row]?.slice(44), "original striped tail");
 	}
 	assert.notDeepEqual(art.mascot.slice(17), current.mascot.slice(17));
-	const fangs = art.mascot.slice(17, 20).join("\n");
-	assert.match(fangs, /▼[^▼\n]+▼/, "two ivory fang tips separated by the original muzzle");
-	assert.equal([...fangs].filter((glyph) => glyph === "▼").length, 2, "one-column fang tips");
-	assert.equal([...fangs].filter((glyph) => glyph === "█").length, 2, "one-column stems keep fangs two rows tall");
+	assert.doesNotMatch(art.mascot.join("\n"), /▼/, "no fang tips");
+	assert.doesNotMatch(art.mascot.slice(17, 20).join("\n"), /█/, "no fang stems on the muzzle");
+	for (const row of [18, 19]) {
+		for (const column of [22, 33]) {
+			assert.equal(art.mascot[row]?.[column], current.mascot[row]?.[column], "original muzzle at removed fang positions");
+		}
+	}
 	assert.equal(art.mascot.length, current.mascot.length);
 	assert.deepEqual(art.mascot.map((row) => row.length), current.mascot.map((row) => row.length));
+	assert.equal(art.mascot[17]?.[8], "▓", "raised collar stays in place");
 	assert.equal(art.toneMap[17]?.[8], "d", "raised collar has a dark outer edge");
+	assert.equal(art.mascot[20]?.[12], "▒", "collar lining stays in place");
 	assert.equal(art.toneMap[20]?.[12], "b", "collar has crimson lining");
 	assert.equal(tonePalette.b, "#9F2342");
 	assert.equal(tonePalette.d, MASCOTS.current.tonePalette.d);
@@ -282,7 +287,11 @@ void test("Osdy-Halloween preserves Current's face and tail beneath a bounded va
 		const scaled = scaleMascot(art, width, rows);
 		assert.ok(scaled.mascot.length <= rows);
 		assert.equal(scaled.mascot.length, scaled.toneMap.length);
-		if (width >= 32) assert.match(scaled.mascot.join("\n"), /▼+[^▼\n]+▼+/, "both fangs survive responsive sampling");
+		assert.doesNotMatch(scaled.mascot.join("\n"), /▼/, "responsive art has no fang tips");
+		if (width >= 32) {
+			assert.ok(scaled.mascot.some((line, row) => [...line].some((glyph, column) => glyph === "▓" && scaled.toneMap[row]?.[column] === "d")), "dark cape survives responsive sampling");
+			assert.ok(scaled.mascot.some((line, row) => [...line].some((glyph, column) => glyph === "▒" && scaled.toneMap[row]?.[column] === "b")), "crimson lining survives responsive sampling");
+		}
 		for (let row = 0; row < scaled.mascot.length; row++) {
 			const glyphs = Array.from(scaled.mascot[row] ?? "");
 			const tones = Array.from(scaled.toneMap[row] ?? "");
@@ -290,7 +299,7 @@ void test("Osdy-Halloween preserves Current's face and tail beneath a bounded va
 			assert.equal(glyphs.length, tones.length);
 			for (let column = 0; column < glyphs.length; column++) {
 				if (glyphs[column] !== " ") assert.ok(Object.keys(tonePalette).includes(tones[column] ?? ""));
-				if (glyphs[column] === "▼") assert.equal(tones[column], "h", "fangs retain ivory rather than glow/lining tones");
+
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "osdy-pi",
-	"version": "1.11.10",
+	"version": "1.11.11",
 	"description": "Osdy Pi package: themes, header, and custom editor for Pi.",
 	"license": "MIT",
 	"type": "module",
@@ -83,7 +83,7 @@
 		"typescript": "^5.9.3",
 		"typescript-eslint": "^8.46.3"
 	},
-	"releaseSource": "96f670c11788dfb1a336c664a266b8581546ff59",
+	"releaseSource": "108d5648e4958aef1ae9390d14fcb8332867d0b7",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/OsdyOrtiz/Osdy-Pi.git"