mixdog 0.9.147 → 0.9.148

package/src/tui/dist/index.mjs

@@ -4086,8 +4086,6 @@ var CATEGORY_ORDER = [
   "Shell",
   "Agent",
   "Task",
-  "Schedule",
-  "Channel",
   "Setup",
   "Other"
 ];
@@ -4163,8 +4161,6 @@ var CATEGORY_COPY = /* @__PURE__ */ new Map([
   ["Shell", { active: "Running", done: "Ran", noun: "command" }],
   ["Agent", { active: "Calling", done: "Called", noun: "agent" }],
   ["Task", { active: "Checking", done: "Checked", noun: "task" }],
-  ["Schedule", { active: "Running", done: "Ran", noun: "schedule" }],
-  ["Channel", { active: "Sending", done: "Sent", noun: "message" }],
   ["Setup", { active: "Setting up", done: "Set up", noun: "item" }],
   ["Other", { active: "Calling", done: "Called", noun: "tool" }]
 ]);
@@ -4283,8 +4279,11 @@ function toolWorkUnit(name, args = {}, category = "") {
     case "job_wait":
       return unitDescriptor("Shell", { count: queryCount(a, "command", "commands", "cmd") || 1, noun: "command" });
     case "git":
-    case "git_stage":
       return unitDescriptor("Git", { count: queryCount(a, "command", "commands") || 1, noun: "Git command" });
+    // Staging is not "running a Git command": it selects change_ids out of an
+    // existing diff. Its own work unit keeps the two apart on the activity row.
+    case "git_stage":
+      return unitDescriptor("Git", { count: queryCount(a, "change_ids", "change_id") || 1, active: "Staging", done: "Staged", noun: "change" });
     case "agent":
     case "bridge": {
       const type = String(a.type || a.action || "").toLowerCase();
@@ -4303,8 +4302,11 @@ function toolWorkUnit(name, args = {}, category = "") {
     }
     case "task": {
       const action = String(a.action || "").toLowerCase();
-      if (action === "cancel") return unitDescriptor("Task", { count: queryCount(a, "task_id", "task_ids", "id", "ids") || 1, active: "Cancelling", done: "Cancelled", noun: "task" });
-      return unitDescriptor("Task", { count: queryCount(a, "task_id", "task_ids", "id", "ids") || 1, noun: "task" });
+      const taskCount = queryCount(a, "task_id", "task_ids", "id", "ids") || 1;
+      if (action === "cancel") return unitDescriptor("Task", { count: taskCount, active: "Cancelling", done: "Cancelled", noun: "task" });
+      if (action === "wait") return unitDescriptor("Task", { count: taskCount, active: "Waiting for", done: "Waited for", noun: "task" });
+      if (action === "list") return unitDescriptor("Task", { count: taskCount, active: "Listing", done: "Listed", noun: "task" });
+      return unitDescriptor("Task", { count: taskCount, noun: "task" });
     }
     case "skill":
     case "skill_execute":
@@ -4319,7 +4321,9 @@ function toolWorkUnit(name, args = {}, category = "") {
         count: queryCount(a, "symbols", "symbol", "query", "file", "path") || 1,
         active: searching ? "Mapping" : "Reading",
         done: searching ? "Mapped" : "Read",
-        noun: searching ? "symbol" : "file"
+        // "code map", not "file": an overview/imports/impact pass reads
+        // structure, and sharing the plain read unit hid it behind file reads.
+        noun: searching ? "symbol" : "code map"
       });
     }
     case "request_user_input":
@@ -5268,6 +5272,13 @@ init_config();
 // src/runtime/agent/orchestrator/providers/oauth-credential-probes.mjs
 init_plugin_paths();
 import { join as join6 } from "node:path";
+
+// src/runtime/agent/orchestrator/providers/cursor-auth.mjs
+init_plugin_paths();
+init_atomic_file();
+var REFRESH_SKEW_MS = 5 * 6e4;
+
+// src/runtime/agent/orchestrator/providers/oauth-credential-probes.mjs
 var ANTHROPIC_DEFAULT_CREDENTIALS_PATH = join6(resolvePluginData(), "anthropic-oauth-credentials.json");
 
 // src/runtime/agent/orchestrator/config.mjs
@@ -8512,6 +8523,21 @@ function textEntryReservedRows(value, width, maxRows) {
   return Math.min(wrappedTextRows(`${String(value ?? "")} `, w), cap);
 }
 
+// src/tui/app/text-entry-policy.mjs
+var CLEAR_BY_EMPTY_TEXT_ENTRY_KINDS = Object.freeze([
+  "system-shell",
+  "autoclear-provider",
+  "profile-title"
+]);
+var CLEAR_BY_EMPTY_KIND_SET = new Set(CLEAR_BY_EMPTY_TEXT_ENTRY_KINDS);
+function textEntryClearsByEmpty(kind) {
+  return CLEAR_BY_EMPTY_KIND_SET.has(String(kind || ""));
+}
+function canSubmitTextEntry(value, allowEmpty = false) {
+  if (allowEmpty === true) return true;
+  return String(value ?? "").trim().length > 0;
+}
+
 // src/tui/components/TextEntryPanel.jsx
 import { Fragment as Fragment5, jsx as jsx10, jsxs as jsxs8 } from "react/jsx-runtime";
 function insertText2(draft, input) {
@@ -8625,6 +8651,10 @@ function TextEntryPanel({
   hint = "",
   detail = "",
   initialValue = "",
+  // Blank submit = the documented reset/clear action for some prompt kinds
+  // (system shell → auto, provider auto-clear → built-in, profile title →
+  // cleared). Off by default: every other prompt still requires a value.
+  allowEmpty = false,
   mask = false,
   multiline = false,
   maxContentRows = 8,
@@ -8694,7 +8724,7 @@ function TextEntryPanel({
   }, [multiline, draft.value, mask, contentCells, maxContentRows, onContentRowsChange]);
   const submit = () => {
     if (submitGateRef.current) return;
-    if (!String(draftRef.current.value || "").trim()) return;
+    if (!canSubmitTextEntry(draftRef.current.value, allowEmpty)) return;
     submitGateRef.current = true;
     const accepted = onSubmit?.(draftRef.current.value) !== false;
     if (accepted) {
@@ -8710,7 +8740,7 @@ function TextEntryPanel({
     if (submitGateRef.current) return;
     const current = draftRef.current;
     const next = prefix ? insertText2(current, prefix) : current;
-    if (!String(next.value || "").trim()) return;
+    if (!canSubmitTextEntry(next.value, allowEmpty)) return;
     submitGateRef.current = true;
     const accepted = onSubmit?.(next.value) !== false;
     if (accepted) {
@@ -9376,7 +9406,7 @@ function compareSlashCommands(a, b) {
   return String(a?.name || "").localeCompare(String(b?.name || ""), "en", { sensitivity: "base" });
 }
 function overlayBlocksGlobalTranscriptScroll(owner = {}) {
-  return !!(owner.slashPaletteOpen || owner.picker || owner.toolApproval || owner.contextPanel || owner.usagePanel || owner.providerPrompt || owner.channelPrompt || owner.hookPrompt || owner.settingsPrompt);
+  return !!(owner.slashPaletteOpen || owner.picker || owner.toolApproval || owner.contextPanel || owner.usagePanel || owner.providerPrompt || owner.settingsPrompt);
 }
 function normalizeSlashCommandName(cmd) {
   const name = String(cmd || "").toLowerCase();
@@ -9427,31 +9457,6 @@ function isLiveSpinnerMetaVisible({
 }
 
 // src/tui/app/input-parsers.mjs
-function parseHookRuleInput(text) {
-  const parts = String(text || "").split("|").map((part) => part.trim());
-  const [tool, actionRaw, match, reason, patchText] = parts;
-  const action = String(actionRaw || "").toLowerCase();
-  if (!tool || !action) return { error: "usage: tool | allow|deny|modify | match(optional) | reason(optional) | json patch(optional)" };
-  if (!["allow", "deny", "block", "modify", "rewrite"].includes(action)) {
-    return { error: "hook action must be allow, deny, block, modify, or rewrite" };
-  }
-  const rule = { tool, action };
-  if (match) rule.match = match;
-  if (reason) rule.reason = reason;
-  if (patchText) {
-    try {
-      const patch = JSON.parse(patchText);
-      if (!patch || typeof patch !== "object" || Array.isArray(patch)) return { error: "json patch must be an object" };
-      rule.patch = patch;
-    } catch (e) {
-      return { error: `invalid json patch: ${e?.message || e}` };
-    }
-  }
-  if ((action === "modify" || action === "rewrite") && !rule.patch) {
-    return { error: "modify/rewrite needs a json patch object in the last field" };
-  }
-  return { rule };
-}
 function parseMcpServerInput(text) {
   const parts = String(text || "").split("|").map((part) => part.trim());
   const [name, commandOrUrl, argsText = "", cwd = ""] = parts;
@@ -9608,6 +9613,90 @@ function copyToClipboard(text) {
   });
 }
 
+// src/tui/app/panel-epoch.mjs
+var panelEpoch = 0;
+function currentPanelEpoch() {
+  return panelEpoch;
+}
+function supersedePanelEpoch() {
+  panelEpoch += 1;
+  return panelEpoch;
+}
+function isPanelEpochCurrent(token) {
+  return token === panelEpoch;
+}
+function panelIdentity(panel) {
+  if (!panel || typeof panel !== "object") return null;
+  return panel._kind || panel.title || null;
+}
+function shouldSupersedePanelEpoch(previous, next) {
+  if (!previous || typeof previous !== "object") return false;
+  if (!next || typeof next !== "object") return true;
+  if (previous === next) return false;
+  return panelIdentity(previous) !== panelIdentity(next);
+}
+
+// src/tui/app/panel-surface.mjs
+function createPanelSurface({ setPicker, setContextPanel, setUsagePanel } = {}) {
+  let usageGeneration = 0;
+  const claim = () => {
+    let token = currentPanelEpoch();
+    let released = false;
+    const owns = () => !released && isPanelEpochCurrent(token);
+    const write = (sink, value) => {
+      if (!owns()) return false;
+      sink?.(value);
+      token = currentPanelEpoch();
+      return true;
+    };
+    return {
+      owns,
+      paint: (panel) => write(setPicker, panel),
+      // Clearing the context panel hands the surface back exactly as closing a
+      // picker does. setPicker's caller supersedes the epoch on a close (see
+      // shouldSupersedePanelEpoch); this sink has no such step, so a context
+      // open still in flight stayed valid and repainted "Context Usage" after
+      // the user had already pressed Esc. Superseding here is what makes the
+      // dismissal final, and re-reading the token keeps THIS flow (Esc inside a
+      // settings picker, which clears context and carries on) working.
+      context: (panel) => {
+        if (!owns()) return false;
+        setContextPanel?.(panel);
+        if (panel == null) supersedePanelEpoch();
+        token = currentPanelEpoch();
+        return true;
+      },
+      close: () => {
+        if (!owns()) return false;
+        setPicker?.(null);
+        released = true;
+        return true;
+      },
+      defer: (run) => {
+        const deferredToken = token;
+        return (...args) => !released && isPanelEpochCurrent(deferredToken) ? run(...args) : void 0;
+      }
+    };
+  };
+  const claimUsage = () => {
+    const generation = usageGeneration += 1;
+    const owns = () => generation === usageGeneration;
+    return {
+      owns,
+      paint: (dashboard) => {
+        if (!owns()) return false;
+        setUsagePanel?.(dashboard);
+        return true;
+      }
+    };
+  };
+  const closeUsage = () => {
+    usageGeneration += 1;
+    setUsagePanel?.(null);
+  };
+  return { claim, claimUsage, closeUsage };
+}
+
 // src/tui/App.jsx
 import stringWidth11 from "string-width";
 
@@ -11959,7 +12048,7 @@ function normalizeToolTerminalStatus(value) {
   if (/^(running|pending|queued|in_progress|in-progress)$/.test(raw)) return "running";
   if (/^(completed|complete|done|success|succeeded|ok)$/.test(raw)) return "completed";
   if (/^(failed|fail|error|errored|timeout|timed_out|killed)$/.test(raw)) return "failed";
-  if (/^(cancelled|canceled|cancel)$/.test(raw)) return "cancelled";
+  if (/^(cancelled|canceled|cancel|cancel[-_ ]unconfirmed|cancel[-_ ]pending|cancelling|canceling)$/.test(raw)) return "cancelled";
   if (/^(denied|deny|refused|rejected)$/.test(raw)) return "denied";
   return "";
 }
@@ -14844,12 +14933,20 @@ function useWelcomePromptHint({ store, state, toastErrorSignature }) {
           }
         }
       }
-      const activeWorkflow = await activeWorkflowSummaryForStore(store, state.workflow || {});
+      let activeWorkflow = null;
+      try {
+        activeWorkflow = await activeWorkflowSummaryForStore(store, state.workflow || {});
+      } catch {
+      }
       if (!next && String(activeWorkflow?.id || state.workflow?.id || "").toLowerCase() === "solo") {
         next = CONDITIONAL_WELCOME_PROMPT_HINTS.soloWorkflow;
       }
       if (!next) {
-        const webSearchRoute = await store.getWebSearchRoute?.() || null;
+        let webSearchRoute = null;
+        try {
+          webSearchRoute = await store.getWebSearchRoute?.() || null;
+        } catch {
+        }
         const webSearchProvider = String(webSearchRoute?.provider || "").trim();
         const webSearchModel = String(webSearchRoute?.model || "").trim();
         const defaultWebSearchRoute = webSearchProvider.toLowerCase() === "default" && webSearchModel.toLowerCase() === "default";
@@ -14869,7 +14966,8 @@ function useWelcomePromptHint({ store, state, toastErrorSignature }) {
       }
       if (alive) setConditionalWelcomePromptHint((prev) => prev === next ? prev : next);
     };
-    void refreshConditionalWelcomeHint();
+    void refreshConditionalWelcomeHint().catch(() => {
+    });
     return () => {
       alive = false;
     };
@@ -14919,27 +15017,20 @@ function useCopySelection({
 function createUsageContextPanels({
   store,
   state,
-  usageRequestRef,
-  setPicker,
+  surface,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
-  setContextPanel,
-  setUsagePanel,
   closeUsagePanel
 }) {
   const openUsagePanel = (arg = "") => {
     const refresh = /(?:^|\s)(?:refresh|--refresh|-r|true)(?:\s|$)/i.test(String(arg || ""));
-    const requestId = usageRequestRef.current + 1;
-    usageRequestRef.current = requestId;
+    const own = surface.claim();
+    const dashboardOwn = surface.claimUsage();
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setPicker(null);
-    setContextPanel(null);
-    setUsagePanel({
+    own.paint(null);
+    own.context(null);
+    dashboardOwn.paint({
       title: "Provider Quotas",
       subtitle: "Statusline-style provider quota windows.",
       checking: true,
@@ -14948,30 +15039,29 @@ function createUsageContextPanels({
       total: null
     });
     setTimeout(() => {
-      if (usageRequestRef.current !== requestId) return;
+      if (!dashboardOwn.owns()) return;
       void store.getUsageDashboard?.({
         refresh,
         onUpdate: (dashboard) => {
-          if (usageRequestRef.current !== requestId) return;
-          if (!dashboard) return;
-          setUsagePanel(dashboard);
+          if (dashboard) dashboardOwn.paint(dashboard);
         }
       }).then((dashboard) => {
-        if (usageRequestRef.current !== requestId) return;
+        if (!dashboardOwn.owns()) return;
         if (!dashboard) {
           closeUsagePanel();
           store.pushNotice("usage dashboard unavailable", "warn");
           return;
         }
-        setUsagePanel(dashboard);
+        dashboardOwn.paint(dashboard);
       }).catch((e) => {
-        if (usageRequestRef.current !== requestId) return;
+        if (!dashboardOwn.owns()) return;
         closeUsagePanel();
         store.pushNotice(`usage failed: ${e?.message || e}`, "error");
       });
     }, 0);
   };
   const openContextPicker = async () => {
+    const own = surface.claim();
     const [toolsStatus, mcpStatus, skillsStatus, pluginsStatus, contextStatusValue] = await Promise.all([
       Promise.resolve(store.toolsStatus?.()).catch(() => null),
       Promise.resolve(store.mcpStatus?.()).catch(() => null),
@@ -15109,12 +15199,11 @@ function createUsageContextPanels({
         _action: "extensions"
       }
     ];
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setPicker(null);
-    setContextPanel({
+    own.paint(null);
+    own.context({
       kind: "context",
       title: "Context Usage",
       detail: {
@@ -15194,21 +15283,20 @@ function createUsageContextPanels({
 
 // src/tui/app/prompt-submit.mjs
 init_paste_attachments();
+var providerWriteToken = 0;
+var settingsWriteToken = 0;
+var providerWriteInFlight = () => providerWriteToken > 0 && isPanelEpochCurrent(providerWriteToken);
+var settingsWriteInFlight = () => settingsWriteToken > 0 && isPanelEpochCurrent(settingsWriteToken);
 function createPromptSubmit({
   store,
   state,
   providerPrompt,
-  channelPrompt,
-  hookPrompt,
   settingsPrompt,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
   oauthSubmitRef,
   clearModelCaches,
   openProviderSetupPicker,
-  openHooksPicker,
   openSettingsPicker,
   openProjectPicker,
   openAutoClearPicker,
@@ -15232,6 +15320,12 @@ function createPromptSubmit({
     }
     return Promise.resolve(target.apply(store, args));
   };
+  const openPanel = (open, ...args) => {
+    if (typeof open !== "function") return;
+    void Promise.resolve(open(...args)).catch((error) => {
+      store.pushNotice(`panel failed to open: ${error?.message || error}`, "error");
+    });
+  };
   const submitPrompt = (prompt, options) => {
     if (typeof store.submitAsync !== "function") return store.submit(prompt, options);
     void Promise.resolve(store.submitAsync(prompt, options)).then((accepted) => {
@@ -15241,6 +15335,14 @@ function createPromptSubmit({
     });
     return true;
   };
+  const restoreSettingsPrompt = (target, value) => {
+    setSettingsPrompt({
+      ...target,
+      submitting: false,
+      initialValue: value,
+      restoreEpoch: (Number(target.restoreEpoch) || 0) + 1
+    });
+  };
   const onSubmit = (raw) => {
     const text = String(raw ?? "");
     const commandText = text.trim();
@@ -15249,57 +15351,80 @@ function createPromptSubmit({
         store.pushNotice("wait for the current command to finish", "warn");
         return false;
       }
+      const beginProviderSave = (target) => {
+        const token = supersedePanelEpoch();
+        providerWriteToken = token;
+        setProviderPrompt((prompt) => prompt === target ? { ...prompt, submitting: true } : prompt);
+        return token;
+      };
+      const endProviderSave = (token) => {
+        if (providerWriteToken === token) providerWriteToken = 0;
+      };
+      const finishProviderSave = (target, token) => {
+        endProviderSave(token);
+        if (!isPanelEpochCurrent(token)) return;
+        setProviderPrompt(null);
+        if (target.afterSave) target.afterSave();
+        else openPanel(openProviderSetupPicker);
+      };
+      const failProviderSave = (target, value, message, token) => {
+        endProviderSave(token);
+        store.pushNotice(message, "error");
+        if (!isPanelEpochCurrent(token)) return;
+        supersedePanelEpoch();
+        setProviderPrompt({
+          ...target,
+          submitting: false,
+          initialValue: value,
+          restoreEpoch: (Number(target.restoreEpoch) || 0) + 1
+        });
+      };
       if (providerPrompt.kind === "api-key") {
         if (!commandText) {
           store.pushNotice(`API key is required for ${providerPrompt.providerId}`, "warn");
           return false;
         }
-        try {
-          store.saveProviderApiKey(providerPrompt.providerId, commandText);
-          clearModelCaches("all");
-          const afterSave = providerPrompt.afterSave;
-          setProviderPrompt(null);
-          if (afterSave) afterSave();
-          else void openProviderSetupPicker();
-          return true;
-        } catch (e) {
-          store.pushNotice(`api key save failed: ${e?.message || e}`, "error");
+        if (providerWriteInFlight()) {
+          store.pushNotice("API key is already being saved", "warn");
           return false;
         }
+        const target = providerPrompt;
+        const token = beginProviderSave(target);
+        void serviceCall("saveProviderApiKey", target.providerId, commandText).then(() => {
+          clearModelCaches("all");
+          finishProviderSave(target, token);
+        }).catch((error) => failProviderSave(target, commandText, `api key save failed: ${error?.message || error}`, token));
+        return true;
       }
       if (providerPrompt.kind === "openai-usage-session") {
         if (!commandText) {
           store.pushNotice("OpenAI usage session key is required for credit lookup", "warn");
           return false;
         }
-        try {
-          store.saveOpenAIUsageSessionKey(commandText);
-          const afterSave = providerPrompt.afterSave;
-          setProviderPrompt(null);
-          if (afterSave) afterSave();
-          else void openProviderSetupPicker();
-          return true;
-        } catch (e) {
-          store.pushNotice(`OpenAI usage auth save failed: ${e?.message || e}`, "error");
+        if (providerWriteInFlight()) {
+          store.pushNotice("OpenAI usage session key is already being saved", "warn");
           return false;
         }
+        const target = providerPrompt;
+        const token = beginProviderSave(target);
+        void serviceCall("saveOpenAIUsageSessionKey", commandText).then(() => finishProviderSave(target, token)).catch((error) => failProviderSave(target, commandText, `OpenAI usage auth save failed: ${error?.message || error}`, token));
+        return true;
       }
       if (providerPrompt.kind === "local-url") {
-        try {
-          store.setLocalProvider(providerPrompt.providerId, {
-            enabled: true,
-            baseURL: commandText || providerPrompt.defaultURL
-          });
-          clearModelCaches("all");
-          const afterSave = providerPrompt.afterSave;
-          setProviderPrompt(null);
-          if (afterSave) afterSave();
-          else void openProviderSetupPicker();
-          return true;
-        } catch (e) {
-          store.pushNotice(`local provider update failed: ${e?.message || e}`, "error");
+        if (providerWriteInFlight()) {
+          store.pushNotice("local provider update is already running", "warn");
           return false;
         }
+        const target = providerPrompt;
+        const token = beginProviderSave(target);
+        void serviceCall("setLocalProvider", target.providerId, {
+          enabled: true,
+          baseURL: commandText || target.defaultURL
+        }).then(() => {
+          clearModelCaches("all");
+          finishProviderSave(target, token);
+        }).catch((error) => failProviderSave(target, commandText, `local provider update failed: ${error?.message || error}`, token));
+        return true;
       }
       if (providerPrompt.kind === "oauth-code") {
         if (!commandText) {
@@ -15321,7 +15446,7 @@ function createPromptSubmit({
           store.pushNotice(`${providerPrompt.providerName || "OAuth"} login complete`, "info");
           if (successReturn) successReturn();
           else if (afterSave) afterSave();
-          else void openProviderSetupPicker();
+          else openPanel(openProviderSetupPicker);
         }).catch((e) => {
           oauthSubmitRef.current = false;
           store.pushNotice(`oauth code failed: ${e?.message || e}`, "error");
@@ -15331,46 +15456,51 @@ function createPromptSubmit({
         return true;
       }
     }
-    if (hookPrompt) {
+    if (settingsPrompt) {
       if (state.commandBusy) {
         store.pushNotice("wait for the current command to finish", "warn");
         return false;
       }
-      try {
-        if (hookPrompt.kind === "rule-add") {
-          const parsed = parseHookRuleInput(commandText);
-          if (parsed.error) {
-            store.pushNotice(parsed.error, "warn");
-            return false;
-          }
-          store.addHookRule?.(parsed.rule);
-          setHookPrompt(null);
-          void openHooksPicker();
-          return true;
-        }
-      } catch (e) {
-        store.pushNotice(`hook update failed: ${e?.message || e}`, "error");
-        return false;
-      }
-    }
-    if (settingsPrompt) {
-      if (state.commandBusy) {
-        store.pushNotice("wait for the current command to finish", "warn");
+      if (settingsWriteInFlight()) {
+        store.pushNotice("wait for the current settings change to finish", "warn");
         return false;
       }
+      const beginSettingsSave = (target) => {
+        const token = supersedePanelEpoch();
+        settingsWriteToken = token;
+        setSettingsPrompt((prompt) => prompt === target ? { ...prompt, submitting: true } : prompt);
+        return token;
+      };
+      const endSettingsSave = (token) => {
+        if (settingsWriteToken === token) settingsWriteToken = 0;
+      };
+      const finishSettingsSave = (token, after) => {
+        endSettingsSave(token);
+        if (!isPanelEpochCurrent(token)) return;
+        setSettingsPrompt(null);
+        after?.();
+      };
+      const failSettingsSave = (target, value, message, token, tone = "error") => {
+        endSettingsSave(token);
+        store.pushNotice(message, tone);
+        if (!isPanelEpochCurrent(token)) return;
+        supersedePanelEpoch();
+        restoreSettingsPrompt(target, value);
+      };
       try {
         if (settingsPrompt.kind === "cwd") {
           if (!commandText) {
             store.pushNotice("working directory path is required", "warn");
             return false;
           }
+          const target = settingsPrompt;
+          const token = beginSettingsSave(target);
           void serviceCall("setCwd", commandText, {
             message: `Project set: ${projectNameFromPath(commandText)}`
           }).then(() => {
-            setSettingsPrompt(null);
-            void openSettingsPicker();
+            finishSettingsSave(token, () => openPanel(openSettingsPicker));
           }).catch((error) => {
-            store.pushNotice(`project switch failed: ${error?.message || error}`, "error");
+            failSettingsSave(target, commandText, `project switch failed: ${error?.message || error}`, token);
           });
           return true;
         }
@@ -15379,17 +15509,21 @@ function createPromptSubmit({
             store.pushNotice("project path is required", "warn");
             return false;
           }
+          const target = settingsPrompt;
+          const token = beginSettingsSave(target);
           void serviceCall("inspectProjectPath", commandText).then((result) => {
             const path2 = String(result?.path || commandText);
             if (result?.directory === true) {
-              setSettingsPrompt(null);
-              void registerProject(path2);
+              finishSettingsSave(token, () => openPanel(registerProject, path2));
               return;
             }
             if (result?.exists === true) {
-              store.pushNotice(`${path2} is not a directory`, "warn");
+              failSettingsSave(target, commandText, `${path2} is not a directory`, token, "warn");
               return;
             }
+            endSettingsSave(token);
+            if (!isPanelEpochCurrent(token)) return;
+            supersedePanelEpoch();
             setSettingsPrompt({
               kind: "project-create-confirm",
               label: "New project \xB7 Create folder?",
@@ -15397,7 +15531,7 @@ function createPromptSubmit({
               pendingPath: path2
             });
           }).catch((error) => {
-            store.pushNotice(`project path check failed: ${error?.message || error}`, "error");
+            failSettingsSave(target, commandText, `project path check failed: ${error?.message || error}`, token);
           });
           return true;
         }
@@ -15405,12 +15539,14 @@ function createPromptSubmit({
           const pendingPath = String(settingsPrompt.pendingPath || "");
           const answer = String(commandText || "").trim().toLowerCase();
           if (answer === "y" || answer === "yes") {
+            const target = settingsPrompt;
+            const token = beginSettingsSave(target);
             void serviceCall("ensureProjectDirectory", pendingPath).then((created) => {
-              setSettingsPrompt(null);
-              void registerProject(created || pendingPath);
+              finishSettingsSave(token, () => openPanel(registerProject, created || pendingPath));
             }).catch((error) => {
+              endSettingsSave(token);
               store.pushNotice(`could not create folder: ${error?.message || error}`, "error");
-              setSettingsPrompt(null);
+              if (isPanelEpochCurrent(token)) setSettingsPrompt(null);
             });
             return true;
           }
@@ -15420,21 +15556,26 @@ function createPromptSubmit({
         }
         if (settingsPrompt.kind === "project-rename") {
           const targetPath = String(settingsPrompt.projectPath || "");
+          const target = settingsPrompt;
+          const token = beginSettingsSave(target);
           void serviceCall("renameProject", targetPath, commandText).then((updated) => {
             if (updated) {
               store.pushNotice(`project renamed to "${updated.name}"`, "info");
             }
-            setSettingsPrompt(null);
-            void openProjectPicker();
+            finishSettingsSave(token, () => openPanel(openProjectPicker));
           }).catch((error) => {
-            store.pushNotice(`rename failed: ${error?.message || error}`, "error");
+            failSettingsSave(target, commandText, `rename failed: ${error?.message || error}`, token);
           });
           return true;
         }
         if (settingsPrompt.kind === "system-shell") {
-          store.setSystemShell?.(commandText);
-          setSettingsPrompt(null);
-          void openSettingsPicker();
+          const target = settingsPrompt;
+          const token = beginSettingsSave(target);
+          void serviceCall("setSystemShell", commandText).then(() => {
+            finishSettingsSave(token, () => openPanel(openSettingsPicker));
+          }).catch((error) => {
+            failSettingsSave(target, commandText, `system shell update failed: ${error?.message || error}`, token);
+          });
           return true;
         }
         if (settingsPrompt.kind === "autoclear-provider") {
@@ -15443,28 +15584,26 @@ function createPromptSubmit({
             store.pushNotice("auto-clear provider is missing", "warn");
             return false;
           }
-          const text2 = String(commandText || "").trim();
-          try {
-            if (text2) store.setAutoClear?.({ provider, duration: text2 });
-            else store.setAutoClear?.({ provider, resetProvider: true });
-            store.pushNotice(text2 ? `Auto-clear ${provider} default set to ${text2}` : `Auto-clear ${provider} default reset`, "info");
-          } catch (e) {
-            store.pushNotice(`autoclear failed: ${e?.message || e}`, "error");
-            return false;
-          }
-          setSettingsPrompt(null);
-          openAutoClearPicker({ advanced: true, returnTo: settingsPrompt.returnTo });
+          const duration = String(commandText || "").trim();
+          const target = settingsPrompt;
+          const token = beginSettingsSave(target);
+          void serviceCall("setAutoClear", duration ? { provider, duration } : { provider, resetProvider: true }).then(() => {
+            store.pushNotice(duration ? `Auto-clear ${provider} default set to ${duration}` : `Auto-clear ${provider} default reset`, "info");
+            finishSettingsSave(token, () => openPanel(openAutoClearPicker, { advanced: true, returnTo: target.returnTo }));
+          }).catch((error) => {
+            failSettingsSave(target, duration, `autoclear failed: ${error?.message || error}`, token);
+          });
           return true;
         }
         if (settingsPrompt.kind === "profile-title") {
-          try {
-            store.setProfile?.({ title: commandText });
+          const target = settingsPrompt;
+          const token = beginSettingsSave(target);
+          void serviceCall("setProfile", { title: commandText }).then(() => {
             store.pushNotice(commandText ? `Title set to "${commandText.trim()}"` : "Title cleared", "info");
-          } catch (e) {
-            store.pushNotice(`profile update failed: ${e?.message || e}`, "error");
-          }
-          setSettingsPrompt(null);
-          openProfilePicker();
+            finishSettingsSave(token, () => openPanel(openProfilePicker));
+          }).catch((error) => {
+            failSettingsSave(target, commandText, `profile update failed: ${error?.message || error}`, token);
+          });
           return true;
         }
         if (settingsPrompt.kind === "plugin-add") {
@@ -15616,8 +15755,6 @@ function createPromptSubmit({
 // src/tui/app/shell-layout.mjs
 function computeShellLayout({
   providerPrompt,
-  channelPrompt,
-  hookPrompt,
   settingsPrompt,
   panelTransitionEpoch,
   panelInkMaskEpoch,
@@ -15653,7 +15790,7 @@ function computeShellLayout({
   isInstantPanelCloseTransition: isInstantPanelCloseTransition2,
   PANEL_LAYOUT_SIG: PANEL_LAYOUT_SIG2
 }) {
-  const textEntryPrompt = providerPrompt || channelPrompt || hookPrompt || settingsPrompt;
+  const textEntryPrompt = providerPrompt || settingsPrompt;
   const hasTextEntryPrompt = !!textEntryPrompt;
   const hasFloatingPanel = !!(toolApproval || picker || contextPanel || usagePanel || slashPaletteOpen || hasTextEntryPrompt);
   const expandedOptionPanel = !!(toolApproval || picker || contextPanel || usagePanel || hasTextEntryPrompt);
@@ -15909,7 +16046,7 @@ function useGlobalKeyInput({
   picker,
   usagePanel,
   contextPanel,
-  setContextPanel,
+  surface,
   closeUsagePanel,
   isRawModeSupported,
   resizeState,
@@ -15987,7 +16124,7 @@ function useGlobalKeyInput({
       return;
     }
     if (key.escape && contextPanel && !picker) {
-      setContextPanel(null);
+      surface.claim().context(null);
       return;
     }
     if (key.pageUp) {
@@ -16781,7 +16918,7 @@ var Item = React19.memo(function Item2({ item, prevKind, columns, toolOutputExpa
 // src/tui/app/app-view.jsx
 import { Fragment as Fragment6, jsx as jsx20, jsxs as jsxs16 } from "react/jsx-runtime";
 function renderAppView(ctx) {
-  const { PANEL_MAX_VISIBLE, acceptSlashPalette, activeSlashQuery, activeTools, agentRevision, cancelChannelPrompt, cancelHookPrompt, cancelProviderPrompt, cancelSettingsPrompt, cancelSlashPalette, channelPrompt, clearPromptHint, completeSlashPalette, contextPanel, cycleWorkflowFromPrompt, exiting, expandedOptionPanel, floatingPanelRows, frameColumns, gridSelectionActiveRef, guardHintWidth, handlePromptEscape, handlePromptHistoryNavigate, handlePromptInterrupt, handlePromptPaste, hasUserMessages, hookPrompt, initialStatusLine, inputBoxHidden, inputHint, inputHintTone, liveSpinner, onPromptDraftChange, onSubmit, overlayHintAttachItemIndex, overlayHintBandRows, overlayHintFallbackRow, overlayHintOnLastItem, panelCloseMaskRows, panelInkMaskEpoch, panelTransitionClearRows, panelTransitionEpoch, picker, pickerOpenedFromEnterRef, pickerOpenedFromEnterTimerRef, pickerVisibleRows, promptBoxRectRef, promptBoxRows, promptDraft, promptDraftOverride, promptMetaVisible, promptMouseSelectionRef, promptSelectionRef, promptSpinnerColumns, promptValueRef, providerPrompt, queuedCompact, queuedVisible, renderedTranscriptItems, resizeEpoch, resizeState, restoreQueuedToPrompt, setPicker, setSlashIndex, setTextEntryLayoutRows, settingsPrompt, showWelcomeBanner, slashCommands, slashIndex, slashPaletteOpen, state, statuslineStats, store, toolApproval, toolOutputExpanded, transcriptContentHeight, transcriptGuardRows, transcriptMeasureRef, transcriptTailPinned, transcriptWindow, transientStatusWidth, tuiReady, usagePanel, viewportHeight, welcomePromptHintRows, welcomePromptHintText } = ctx;
+  const { PANEL_MAX_VISIBLE, acceptSlashPalette, activeSlashQuery, activeTools, agentRevision, cancelProviderPrompt, cancelSettingsPrompt, cancelSlashPalette, clearPromptHint, completeSlashPalette, contextPanel, cycleWorkflowFromPrompt, exiting, expandedOptionPanel, floatingPanelRows, frameColumns, gridSelectionActiveRef, guardHintWidth, handlePromptEscape, handlePromptHistoryNavigate, handlePromptInterrupt, handlePromptPaste, hasUserMessages, initialStatusLine, inputBoxHidden, inputHint, inputHintTone, liveSpinner, onPromptDraftChange, onSubmit, overlayHintAttachItemIndex, overlayHintBandRows, overlayHintFallbackRow, overlayHintOnLastItem, panelCloseMaskRows, panelInkMaskEpoch, panelTransitionClearRows, panelTransitionEpoch, picker, pickerOpenedFromEnterRef, pickerOpenedFromEnterTimerRef, pickerVisibleRows, promptBoxRectRef, promptBoxRows, promptDraft, promptDraftOverride, promptMetaVisible, promptMouseSelectionRef, promptSelectionRef, promptSpinnerColumns, promptValueRef, providerPrompt, queuedCompact, queuedVisible, renderedTranscriptItems, resizeEpoch, resizeState, restoreQueuedToPrompt, setSlashIndex, setTextEntryLayoutRows, settingsPrompt, showWelcomeBanner, slashCommands, slashIndex, slashPaletteOpen, state, statuslineStats, store, surface, toolApproval, toolOutputExpanded, transcriptContentHeight, transcriptGuardRows, transcriptMeasureRef, transcriptTailPinned, transcriptWindow, transientStatusWidth, tuiReady, usagePanel, viewportHeight, welcomePromptHintRows, welcomePromptHintText } = ctx;
   const promptInputControl = /* @__PURE__ */ jsx20(
     PromptInput,
     {
@@ -16967,7 +17104,7 @@ function renderAppView(ctx) {
             onCancel: () => {
               if (picker.onCancel) picker.onCancel();
               else {
-                setPicker(null);
+                surface.claim().close();
                 clearPromptHint();
               }
             },
@@ -17030,32 +17167,13 @@ function renderAppView(ctx) {
             detail: providerPrompt.detail || "",
             mask: providerPrompt.kind === "api-key" || providerPrompt.kind === "openai-usage-session",
             columns: frameColumns,
+            initialValue: providerPrompt.initialValue || "",
             actionLabel: providerPrompt.kind === "oauth-code" ? "continue" : "save",
             promptLabel: providerPrompt.kind === "api-key" ? "API key > " : providerPrompt.kind === "oauth-code" ? "Paste code here if prompted > " : providerPrompt.kind === "openai-usage-session" ? "Session key > " : "Base URL > ",
             onSubmit,
             onCancel: cancelProviderPrompt
-          }
-        ) : channelPrompt ? /* @__PURE__ */ jsx20(
-          TextEntryPanel,
-          {
-            title: channelPrompt.label,
-            hint: channelPrompt.hint || "Save channel setting.",
-            mask: channelPrompt.kind === "webhook-token",
-            columns: frameColumns,
-            promptLabel: "Value > ",
-            onSubmit,
-            onCancel: cancelChannelPrompt
-          }
-        ) : hookPrompt ? /* @__PURE__ */ jsx20(
-          TextEntryPanel,
-          {
-            title: hookPrompt.label,
-            hint: hookPrompt.hint || "Save hook setting.",
-            columns: frameColumns,
-            promptLabel: "Value > ",
-            onSubmit,
-            onCancel: cancelHookPrompt
-          }
+          },
+          `provider-prompt:${providerPrompt.restoreEpoch || 0}`
         ) : settingsPrompt ? /* @__PURE__ */ jsx20(
           TextEntryPanel,
           {
@@ -17063,6 +17181,7 @@ function renderAppView(ctx) {
             hint: settingsPrompt.hint || "Save setting.",
             columns: frameColumns,
             initialValue: settingsPrompt.initialValue || "",
+            allowEmpty: textEntryClearsByEmpty(settingsPrompt.kind),
             multiline: settingsPrompt.kind === "core-add" || settingsPrompt.kind === "core-edit",
             maxContentRows: PANEL_MAX_VISIBLE,
             onContentRowsChange: setTextEntryLayoutRows,
@@ -17070,7 +17189,8 @@ function renderAppView(ctx) {
             promptLabel: settingsPrompt.kind === "skill-use" ? "Command > " : settingsPrompt.kind === "autoclear-provider" ? "Duration > " : settingsPrompt.kind === "project-new" ? "Path > " : settingsPrompt.kind === "project-create-confirm" ? "Create? (y/n) > " : settingsPrompt.kind === "project-rename" ? "Name > " : settingsPrompt.kind === "core-add" ? "Sentence > " : settingsPrompt.kind === "core-edit" ? "Sentence > " : settingsPrompt.kind === "core-delete-confirm" ? "Delete? (y/n) > " : "Value > ",
             onSubmit,
             onCancel: cancelSettingsPrompt
-          }
+          },
+          `settings-prompt:${settingsPrompt.kind}:${settingsPrompt.restoreEpoch || 0}`
         ) : null }) : null,
         !inputBoxHidden ? /* @__PURE__ */ jsxs16(Fragment6, { children: [
           promptMetaVisible ? /* @__PURE__ */ jsxs16(Fragment6, { children: [
@@ -17172,12 +17292,8 @@ function usePromptDraftFlow({
   slashDismissedFor,
   setSlashDismissedFor,
   providerPrompt,
-  channelPrompt,
-  hookPrompt,
   settingsPrompt,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
   oauthSubmitRef,
   openProjectPicker,
@@ -17216,6 +17332,7 @@ function usePromptDraftFlow({
     }
   }, [clearPromptHint, dismissWelcomePromptHint, resetPromptHistoryNav, showPromptHint, slashDismissedFor, syncPromptLayoutRows]);
   const cancelProviderPrompt = useCallback8(() => {
+    supersedePanelEpoch();
     try {
       providerPrompt?.login?.cancel?.();
     } catch {
@@ -17227,17 +17344,8 @@ function usePromptDraftFlow({
     if (onCancel) onCancel();
     else if (afterSave) afterSave();
   }, [providerPrompt, showPromptHint]);
-  const cancelChannelPrompt = useCallback8(() => {
-    const onCancel = channelPrompt?.onCancel;
-    const afterSave = channelPrompt?.afterSave;
-    setChannelPrompt(null);
-    if (typeof onCancel === "function") onCancel();
-    else if (typeof afterSave === "function") afterSave();
-  }, [channelPrompt, showPromptHint]);
-  const cancelHookPrompt = useCallback8(() => {
-    setHookPrompt(null);
-  }, [showPromptHint]);
   const cancelSettingsPrompt = useCallback8(() => {
+    supersedePanelEpoch();
     const kind = settingsPrompt?.kind;
     setSettingsPrompt(null);
     if (kind === "project-new" || kind === "project-create-confirm" || kind === "project-rename") {
@@ -17277,8 +17385,6 @@ function usePromptDraftFlow({
   return {
     onPromptDraftChange,
     cancelProviderPrompt,
-    cancelChannelPrompt,
-    cancelHookPrompt,
     cancelSettingsPrompt,
     acceptSlashPalette,
     completeSlashPalette,
@@ -17387,18 +17493,16 @@ var themeNotice = (applied) => `Theme set to ${applied?.label || applied?.id ||
 function createThemeEffortPickers({
   state,
   store,
-  setPicker,
+  surface,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
-  setContextPanel,
   closeUsagePanel,
   clean: clean2
 }) {
   const openThemePicker = (options = {}) => {
     const returnTo = typeof options.returnTo === "function" ? options.returnTo : null;
     const onboarding = options.onboarding || null;
+    const own = surface.claim();
     let themes = [];
     try {
       themes = store.listThemes?.() || [];
@@ -17420,10 +17524,8 @@ function createThemeEffortPickers({
       _theme: entry
     }));
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setContextPanel(null);
+    own.context(null);
     closeUsagePanel();
     const applyTheme = (id, { persist = true } = {}) => {
       try {
@@ -17434,13 +17536,13 @@ function createThemeEffortPickers({
       }
     };
     const saveTheme = (id, { advance = false } = {}) => {
-      setPicker(null);
+      own.close();
       const applied = applyTheme(id, { persist: true });
       store.pushNotice(themeNotice(applied || { id }), "info");
       if (advance && onboarding) onboarding.onAdvance?.();
       else if (returnTo) returnTo();
     };
-    setPicker({
+    own.paint({
       title: "Theme",
       description: "Choose the color theme that looks best with your terminal.",
       help: onboarding ? void 0 : returnTo ? "\u2191/\u2193 Preview \xB7 Enter Choose \xB7 Esc Settings" : "\u2191/\u2193 Preview \xB7 Enter Choose \xB7 Esc Back",
@@ -17475,7 +17577,7 @@ function createThemeEffortPickers({
         saveTheme(entry.id, { advance: Boolean(onboarding) });
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
         if (currentId) applyTheme(currentId, { persist: false });
         if (onboarding) onboarding.onCancel?.();
         else if (returnTo) returnTo();
@@ -17483,9 +17585,8 @@ function createThemeEffortPickers({
     });
   };
   const openEffortPicker = () => {
+    const own = surface.claim();
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
     const items = Array.isArray(state.effortOptions) && state.effortOptions.length > 0 ? state.effortOptions : [];
     if (!items.length) {
@@ -17499,17 +17600,17 @@ function createThemeEffortPickers({
       markerColor: theme.success,
       description: clean2(item?.description).toLowerCase() === "current" ? "" : item?.description
     }));
-    setPicker({
+    own.paint({
       title: "Effort",
       description: "Reasoning effort for the current model.",
       items: pickerItems,
       onSelect: (value) => {
-        setPicker(null);
+        own.close();
         const pendingTurn = state.busy ? " (applies from the next turn)" : "";
         void store.setEffort(value).then((result) => store.pushNotice(result ? `Effort set to ${result}${pendingTurn}` : "Effort switch is already running.", result ? "info" : "warn")).catch((e) => store.pushNotice(`Couldn\u2019t switch effort: ${e?.message || e}`, "error"));
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
       }
     });
   };
@@ -17519,11 +17620,12 @@ function createThemeEffortPickers({
 // src/tui/app/resume-picker.mjs
 function createResumePicker({
   store,
-  setPicker,
+  surface,
   formatSessionUpdatedAt: formatSessionUpdatedAt2,
   formatSessionMessageCount: formatSessionMessageCount2
 }) {
   const openResumePicker = async () => {
+    const own = surface.claim();
     let sessions;
     try {
       sessions = await store.listSessions({ refreshFromStorage: true });
@@ -17545,19 +17647,19 @@ function createResumePicker({
         description: title || preview || "(no message)"
       };
     });
-    setPicker({
+    own.paint({
       title: "Resume",
       description: "Restore a saved chat session.",
       items,
       labelWidth: 21,
       onSelect: (value) => {
-        setPicker(null);
+        own.close();
         const selected = sessions.find((session) => session.id === value);
         const resumedName = String(selected?.title || selected?.preview || value).replace(/\s+/g, " ").trim();
         void store.resume(value).then((ok) => store.pushNotice(ok ? `Resumed ${resumedName || value}` : "Couldn\u2019t resume chat.", ok ? "info" : "warn")).catch((e) => store.pushNotice(`Couldn\u2019t resume chat: ${e?.message || e}`, "error"));
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
       }
     });
   };
@@ -17567,20 +17669,22 @@ function createResumePicker({
 // src/tui/app/core-memory-picker.mjs
 function createCoreMemoryPicker({
   store,
-  setPicker,
+  surface,
   setSettingsPrompt,
   parseMemoryCoreRows: parseMemoryCoreRows2
 }) {
   let escReturnTo = null;
   const closeMemoryCorePicker = () => {
     if (escReturnTo) escReturnTo();
-    else setPicker(null);
+    else surface.claim().close();
   };
   const openMemoryCorePicker = (options = {}) => {
     if (options && Object.prototype.hasOwnProperty.call(options, "returnTo")) {
       escReturnTo = typeof options.returnTo === "function" ? options.returnTo : null;
     }
-    setPicker({
+    const own = surface.claim();
+    const paintPanel = (panel) => own.paint(panel);
+    paintPanel({
       title: "Memory",
       // Loading state lives in the header description row, not as a fake
       // selectable menu item.
@@ -17603,7 +17707,7 @@ function createCoreMemoryPicker({
           _rows: coreRows
         }
       ];
-      setPicker({
+      paintPanel({
         title: "Memory",
         description: "User-curated core memories across projects.",
         items: rows.length ? rows : [{ value: "empty", label: "Memory", description: "empty" }],
@@ -17620,13 +17724,15 @@ function createCoreMemoryPicker({
         onCancel: closeMemoryCorePicker
       });
     }).catch((e) => {
-      setPicker(null);
+      own.close();
       store.pushNotice(`core memory failed: ${e?.message || e}`, "error");
     });
   };
   const openCoreMemoryListPicker = (rows = null) => {
+    const own = surface.claim();
+    const paintPanel = (panel) => own.paint(panel);
     const renderList = (coreRows) => {
-      setPicker({
+      paintPanel({
         title: "Memory \xB7 List",
         description: coreRows.length ? "Select a memory to edit or delete." : "No stored memories yet.",
         items: coreRows.length ? coreRows : [{ value: "empty", label: "Memory", description: "empty" }],
@@ -17643,7 +17749,7 @@ function createCoreMemoryPicker({
       renderList(rows);
       return;
     }
-    setPicker({
+    paintPanel({
       title: "Memory \xB7 List",
       description: "Loading memories\u2026",
       items: [],
@@ -17651,13 +17757,16 @@ function createCoreMemoryPicker({
       },
       onCancel: () => openMemoryCorePicker()
     });
-    void store.memoryControl?.({ action: "core", op: "list", project_id: "*" }, { silent: true }).then((result) => renderList(parseMemoryCoreRows2(result))).catch((e) => {
-      setPicker(null);
+    void store.memoryControl?.({ action: "core", op: "list", project_id: "*" }, { silent: true }).then((result) => {
+      renderList(parseMemoryCoreRows2(result));
+    }).catch((e) => {
+      own.close();
       store.pushNotice(`core memory failed: ${e?.message || e}`, "error");
     });
   };
   const openCoreEntryActionsPicker = (entryItem) => {
-    setPicker({
+    const own = surface.claim();
+    own.paint({
       title: `Memory \xB7 #${entryItem._id}`,
       description: entryItem._summary || entryItem._element || "",
       items: [
@@ -17672,7 +17781,7 @@ function createCoreMemoryPicker({
     });
   };
   const beginAddCoreMemory = () => {
-    setPicker(null);
+    surface.claim().close();
     setSettingsPrompt({
       kind: "core-add",
       label: "Add memory",
@@ -17680,7 +17789,7 @@ function createCoreMemoryPicker({
     });
   };
   const beginEditCoreMemory = (entryItem) => {
-    setPicker(null);
+    surface.claim().close();
     setSettingsPrompt({
       kind: "core-edit",
       label: `Memory \xB7 Edit #${entryItem._id}`,
@@ -17695,7 +17804,7 @@ function createCoreMemoryPicker({
     });
   };
   const beginDeleteCoreMemory = (entryItem) => {
-    setPicker(null);
+    surface.claim().close();
     setSettingsPrompt({
       kind: "core-delete-confirm",
       label: `Memory \xB7 Delete #${entryItem._id}?`,
@@ -17719,11 +17828,9 @@ function createExtensionPickers({
   theme: theme2,
   clean: clean2,
   copyToClipboard: copyToClipboard2,
-  setPicker,
+  surface,
   getPicker,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
   getDisabledSkills,
   setDisabledSkills
@@ -17741,6 +17848,7 @@ function createExtensionPickers({
     return { ...status, servers: status.servers || [] };
   };
   const openMcpServersPicker = async (options = {}) => {
+    const own = surface.claim();
     const status = await mcpStatus();
     if (!status) return;
     const servers = status.servers || [];
@@ -17768,9 +17876,8 @@ function createExtensionPickers({
         _enabled: enabled
       });
     }
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
     const toggleServer = (item) => {
       if (item._action !== "server" || !item._server?.name) return;
@@ -17790,7 +17897,7 @@ function createExtensionPickers({
         settle(() => openMcpServersPicker({ highlightValue }));
       });
     };
-    setPicker({
+    own.paint({
       _kind: "mcp-servers",
       title: "MCP servers",
       description: "Enable or disable configured MCP servers.",
@@ -17802,7 +17909,7 @@ function createExtensionPickers({
       onCancel: () => {
         mcpActive = false;
         mcpEpoch++;
-        setPicker(null);
+        own.close();
       }
     });
     mcpActive = true;
@@ -17821,6 +17928,7 @@ function createExtensionPickers({
     return { ...status, skills: status.skills || [] };
   };
   const openProjectSkillsPicker = async () => {
+    const own = surface.claim();
     const status = await skillsStatus();
     if (!status) return;
     const skills = status.skills || [];
@@ -17842,26 +17950,26 @@ function createExtensionPickers({
         _skill: skill
       });
     }
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setPicker({
+    own.paint({
       title: "Project skills",
       description: "Skills bundled with this project.",
       items,
       onSelect: (_value, item) => {
-        setPicker(null);
+        own.close();
         if (item._action !== "view") return;
         openSkillDetailPicker(item._skill);
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
         void openSkillsPicker();
       }
     });
   };
   const openSkillsPicker = async (options = {}) => {
+    const own = surface.claim();
     let skills;
     if (Array.isArray(options.skills)) {
       skills = options.skills;
@@ -17893,9 +18001,8 @@ function createExtensionPickers({
         _enabled: enabled
       });
     }
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
     const toggleSkill = (item) => {
       if (item._action !== "skill" || !item._skill?.name) return;
@@ -17910,7 +18017,7 @@ function createExtensionPickers({
       );
       openSkillsPicker({ highlightValue: name, disabledOverride: next, skills });
     };
-    setPicker({
+    own.paint({
       _kind: "skills",
       title: "Skills",
       description: "Enable or disable project skills.",
@@ -17920,13 +18027,14 @@ function createExtensionPickers({
       onLeft: (item) => toggleSkill(item),
       onRight: (item) => toggleSkill(item),
       onCancel: () => {
-        setPicker(null);
+        own.close();
       }
     });
   };
   const openSkillDetailPicker = (skill) => {
+    const own = surface.claim();
     const disabled = getDisabledSkills().has(skill.name);
-    setPicker({
+    own.paint({
       title: `Skill \xB7 ${skill.name}`,
       description: clean2(skill.description) || "Enable, disable, or run this skill.",
       items: [
@@ -17944,7 +18052,7 @@ function createExtensionPickers({
         }
       ],
       onSelect: (_value, item) => {
-        setPicker(null);
+        own.close();
         if (item._action === "enable") {
           setDisabledSkills((current) => {
             const next = new Set(current);
@@ -17976,7 +18084,7 @@ function createExtensionPickers({
         }
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
         void openSkillsPicker();
       }
     });
@@ -17992,11 +18100,12 @@ function createExtensionPickers({
     return { ...status, plugins: status.plugins || [] };
   };
   const beginAddPlugin = () => {
-    setPicker(null);
+    surface.claim().close();
     setSettingsPrompt({ kind: "plugin-add", label: "Plugin URL", hint: "Git URL, owner/repo, or local path" });
   };
   const openPluginDetailPicker = (p) => {
-    setPicker({
+    const own = surface.claim();
+    own.paint({
       title: p.title || p.name,
       description: clean2(p.description) || "Update, MCP, or uninstall this plugin.",
       items: [
@@ -18038,7 +18147,7 @@ function createExtensionPickers({
         }
       ],
       onSelect: (_detailValue, detail) => {
-        setPicker(null);
+        own.paint(null);
         if (detail._action === "info") {
           store.pushNotice([
             `${p.title || p.name}${p.version ? ` ${p.version}` : ""}`,
@@ -18052,11 +18161,11 @@ ${p.description}` : ""
           return;
         }
         if (detail._action === "update") {
-          void store.updatePlugin?.(p).then(() => openInstalledPluginsPicker()).catch((e) => store.pushNotice(`plugin update failed: ${e?.message || e}`, "error"));
+          void store.updatePlugin?.(p).then(own.defer(() => openInstalledPluginsPicker())).catch((e) => store.pushNotice(`plugin update failed: ${e?.message || e}`, "error"));
           return;
         }
         if (detail._action === "enable-mcp") {
-          void store.enablePluginMcp?.(p).then(() => openMcpPicker()).catch((e) => store.pushNotice(`plugin MCP enable failed: ${e?.message || e}`, "error"));
+          void store.enablePluginMcp?.(p).then(own.defer(() => openMcpPicker())).catch((e) => store.pushNotice(`plugin MCP enable failed: ${e?.message || e}`, "error"));
           return;
         }
         if (detail._action === "copy-root") {
@@ -18068,16 +18177,17 @@ ${p.description}` : ""
           return;
         }
         if (detail._action === "uninstall") {
-          void store.removePlugin?.(p).then(() => openInstalledPluginsPicker()).catch((e) => store.pushNotice(`plugin uninstall failed: ${e?.message || e}`, "error"));
+          void store.removePlugin?.(p).then(own.defer(() => openInstalledPluginsPicker())).catch((e) => store.pushNotice(`plugin uninstall failed: ${e?.message || e}`, "error"));
         }
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
         void openInstalledPluginsPicker();
       }
     });
   };
   const openInstalledPluginsPicker = async () => {
+    const own = surface.claim();
     const status = await pluginStatus();
     if (!status) return;
     const plugins = status.plugins || [];
@@ -18099,33 +18209,32 @@ ${p.description}` : ""
         _plugin: plugin
       });
     }
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setPicker({
+    own.paint({
       title: "Installed plugins",
       description: "Open an installed plugin to manage it.",
       items,
       onSelect: (_value, item) => {
-        setPicker(null);
+        own.close();
         if (item._action !== "plugin") return;
         openPluginDetailPicker(item._plugin);
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
         void openPluginsPicker();
       }
     });
   };
   const openPluginsPicker = async () => {
+    const own = surface.claim();
     const status = await pluginStatus();
     if (!status) return;
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setPicker({
+    own.paint({
       title: "Plugins",
       description: "Add or manage local plugin integrations.",
       items: [
@@ -18143,7 +18252,7 @@ ${p.description}` : ""
         }
       ],
       onSelect: (_value, item) => {
-        setPicker(null);
+        own.close();
         if (item._action === "installed") {
           openInstalledPluginsPicker();
           return;
@@ -18151,11 +18260,12 @@ ${p.description}` : ""
         if (item._action === "add") beginAddPlugin();
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
       }
     });
   };
   const openHooksPicker = async () => {
+    const own = surface.claim();
     let status;
     try {
       status = await store.hooksStatus?.() || { events: [], recent: [] };
@@ -18180,20 +18290,14 @@ ${p.description}` : ""
         _action: "noop"
       }]
     ];
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
     const toggleRule = (item) => {
       if (item._action !== "rule") return;
-      try {
-        store.setHookRuleEnabled?.(item._rule.index, !item._rule.enabled);
-        void openHooksPicker();
-      } catch (e) {
-        store.pushNotice(`hook toggle failed: ${e?.message || e}`, "error");
-      }
+      void Promise.resolve(store.setHookRuleEnabled?.(item._rule.index, !item._rule.enabled)).then(own.defer(() => openHooksPicker())).catch((e) => store.pushNotice(`hook toggle failed: ${e?.message || e}`, "error"));
     };
-    setPicker({
+    own.paint({
       _kind: "hooks",
       title: "Hooks",
       description: "Before-tool hook rules; Enter toggles a rule.",
@@ -18202,7 +18306,7 @@ ${p.description}` : ""
       onLeft: (item) => toggleRule(item),
       onRight: (item) => toggleRule(item),
       onCancel: () => {
-        setPicker(null);
+        own.close();
       }
     });
   };
@@ -18225,16 +18329,20 @@ function createMaintenancePickers({
   store,
   theme: theme2,
   formatDuration: formatDuration2,
-  setPicker,
+  surface,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
-  setContextPanel,
   closeUsagePanel
 }) {
   const openUpdatePicker = (options = {}) => {
     const returnTo = typeof options.returnTo === "function" ? options.returnTo : null;
+    const own = surface.claim();
+    const paintPanel = (panel) => {
+      if (!own.owns()) return false;
+      setProviderPrompt(null);
+      setSettingsPrompt(null);
+      return own.paint(panel);
+    };
     const readSettings = async () => {
       try {
         return await store.getUpdateSettings?.() || {};
@@ -18277,11 +18385,7 @@ function createMaintenancePickers({
           _action: "auto-update"
         }
       ];
-      setProviderPrompt(null);
-      setChannelPrompt(null);
-      setHookPrompt(null);
-      setSettingsPrompt(null);
-      setPicker({
+      return paintPanel({
         title: "Update",
         description: "Check version and update mixdog.",
         help: "\u2191/\u2193 Select \xB7 Enter Open/Toggle \xB7 Esc Close",
@@ -18308,46 +18412,54 @@ function createMaintenancePickers({
           }
         },
         onCancel: () => {
-          setPicker(null);
+          own.close();
           if (returnTo) returnTo();
         }
       });
     };
+    const rerender = (opts = {}) => {
+      void Promise.resolve(render2(opts)).catch((e) => store.pushNotice(`update panel failed: ${e?.message || e}`, "error"));
+    };
+    const deferredRerender = (opts = {}) => own.defer(() => rerender(opts));
     const toggleAutoUpdate = (enabled) => {
-      try {
-        void Promise.resolve(store.setAutoUpdate?.(enabled)).finally(() => render2());
-        store.pushNotice(`Auto-update ${enabled ? "on" : "off"}`, "info");
-      } catch (e) {
-        store.pushNotice(`auto-update failed: ${e?.message || e}`, "error");
-      }
-      render2();
+      void Promise.resolve(store.setAutoUpdate?.(enabled)).then(() => store.pushNotice(`Auto-update ${enabled ? "on" : "off"}`, "info")).catch((e) => store.pushNotice(`auto-update failed: ${e?.message || e}`, "error")).finally(deferredRerender());
     };
     const recheck = () => {
-      render2({ checking: true });
-      void Promise.resolve(store.checkForUpdate?.({ force: true })).then(() => render2()).catch((e) => {
+      rerender({ checking: true });
+      const settled = deferredRerender();
+      void Promise.resolve(store.checkForUpdate?.({ force: true })).then(() => settled()).catch((e) => {
         store.pushNotice(`update check failed: ${e?.message || e}`, "error");
-        render2();
+        settled();
       });
     };
     const runUpdate = () => {
       store.pushNotice("Updating\u2026", "info");
+      const settled = deferredRerender();
       void Promise.resolve(store.runUpdateNow?.()).then((result) => {
         if (result?.ok) {
           store.pushNotice(`v${result.version} installed \u2014 restart to apply`, "warn");
         } else {
           store.pushNotice(`Update failed: ${result?.error || "unknown error"}`, "error");
         }
-        render2();
+        settled();
       }).catch((e) => {
         store.pushNotice(`Update failed: ${e?.message || e}`, "error");
-        render2();
+        settled();
       });
     };
-    render2({ checking: true });
-    void Promise.resolve(store.checkForUpdate?.({})).then(() => render2()).catch(() => render2());
+    void Promise.resolve(render2({ checking: true })).catch((e) => {
+      store.pushNotice(`update panel failed: ${e?.message || e}`, "error");
+      return false;
+    }).then((painted) => {
+      if (!painted) return;
+      const initialChecked = deferredRerender();
+      void Promise.resolve(store.checkForUpdate?.({})).then(() => initialChecked()).catch(() => initialChecked());
+    });
   };
   const openAutoClearPicker = (options = {}) => {
     const returnTo = typeof options.returnTo === "function" ? options.returnTo : null;
+    const own = surface.claim();
+    const paintPanel = (panel) => own.paint(panel);
     const HOUR_MS = 60 * 60 * 1e3;
     const formatDurationInput = (ms) => {
       const value = Math.max(0, Math.round(Number(ms) || 0));
@@ -18364,19 +18476,20 @@ function createMaintenancePickers({
       }
     };
     const applyAutoClear = (patch = {}) => {
+      const settled = own.defer(() => {
+        void Promise.resolve(render2()).catch((e) => store.pushNotice(`auto-clear panel failed: ${e?.message || e}`, "error"));
+      });
       void Promise.resolve(store.setAutoClear?.(patch)).then((next) => {
         if (!next) {
           store.pushNotice("autoclear unavailable", "warn");
           return;
         }
         store.pushNotice(next.enabled ? `autoclear on \xB7 idle ${formatDuration2(next.idleMs)}` : "autoclear off", "info");
-      }).catch((e) => store.pushNotice(`autoclear failed: ${e?.message || e}`, "error")).finally(() => {
-        void render2();
-      });
+      }).catch((e) => store.pushNotice(`autoclear failed: ${e?.message || e}`, "error")).finally(settled);
     };
     const openProviderDurationEditor = (entry) => {
       if (!entry?.provider) return;
-      setPicker(null);
+      own.close();
       setSettingsPrompt({
         kind: "autoclear-provider",
         label: `Auto-clear \xB7 ${entry.provider}`,
@@ -18401,7 +18514,7 @@ function createMaintenancePickers({
         _action: "provider-default",
         _entry: entry
       }));
-      setPicker({
+      paintPanel({
         title: "Auto-clear \xB7 Advanced",
         description: "Provider default idle windows. Enter edits the duration text.",
         help: "\u2191/\u2193 Select \xB7 Enter Edit \xB7 Esc Back",
@@ -18437,7 +18550,7 @@ function createMaintenancePickers({
           _action: "advanced"
         }
       ];
-      setPicker({
+      paintPanel({
         title: "Auto-clear",
         description: `Clear idle context after ${enabled ? formatDuration2(idleMs) : "never"} \xB7 lead cache TTL ${cacheTtlLabel}.`,
         help: "\u2191/\u2193 Select \xB7 \u2190/\u2192 Toggle On/Off \xB7 Enter Open/Toggle \xB7 Esc Close",
@@ -18458,22 +18571,21 @@ function createMaintenancePickers({
           }
         },
         onCancel: () => {
-          setPicker(null);
+          own.close();
           if (returnTo) returnTo();
         }
       });
     };
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setContextPanel(null);
+    own.context(null);
     closeUsagePanel();
     if (options.advanced === true) renderAdvanced();
     else render2();
   };
   const openProfilePicker = async (options = {}) => {
     const returnTo = typeof options.returnTo === "function" ? options.returnTo : null;
+    const own = surface.claim();
     let profile = null;
     try {
       profile = await store.getProfile?.() || null;
@@ -18492,36 +18604,26 @@ function createMaintenancePickers({
     const currentExperienceLevelId = profile?.experienceLevel || "";
     const currentExperienceLevel = experienceLevels.find((level) => level.id === currentExperienceLevelId) || null;
     const titleValue = String(profile?.title || "").trim();
+    const reopenProfile = () => own.defer(() => {
+      void Promise.resolve(openProfilePicker({ returnTo })).catch((e) => store.pushNotice(`profile panel failed: ${e?.message || e}`, "error"));
+    });
     const cycleLanguage = (direction = 1) => {
       const idx = Math.max(0, languages.findIndex((lang) => lang.id === currentLangId));
       const next = languages[(idx + direction + languages.length) % languages.length];
-      try {
-        store.setProfile?.({ language: next.id });
-        store.pushNotice(`Language set to ${next.label}`, "info");
-      } catch (e) {
-        store.pushNotice(`profile update failed: ${e?.message || e}`, "error");
-      }
-      openProfilePicker({ returnTo });
+      void Promise.resolve(store.setProfile?.({ language: next.id })).then(() => store.pushNotice(`Language set to ${next.label}`, "info")).catch((e) => store.pushNotice(`profile update failed: ${e?.message || e}`, "error")).finally(reopenProfile());
     };
     const cycleExperienceLevel = (direction = 1) => {
       const idx = experienceLevels.findIndex((level) => level.id === currentExperienceLevelId);
       const nextIdx = idx < 0 ? direction < 0 ? experienceLevels.length - 1 : 0 : (idx + direction + experienceLevels.length) % experienceLevels.length;
       const next = experienceLevels[nextIdx];
-      try {
-        store.setProfile?.({ experienceLevel: next.id });
-        store.pushNotice(`Experience level set to ${next.label}`, "info");
-      } catch (e) {
-        store.pushNotice(`profile update failed: ${e?.message || e}`, "error");
-      }
-      openProfilePicker({ returnTo });
+      void Promise.resolve(store.setProfile?.({ experienceLevel: next.id })).then(() => store.pushNotice(`Experience level set to ${next.label}`, "info")).catch((e) => store.pushNotice(`profile update failed: ${e?.message || e}`, "error")).finally(reopenProfile());
     };
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setContextPanel(null);
+    own.context(null);
     closeUsagePanel();
-    setPicker({
+    own.paint({
       title: "Profile",
       description: "How the assistant addresses you, adapts terminology, and chooses its response language.",
       help: "\u2191/\u2193 Select \xB7 \u2190/\u2192 Change \xB7 Enter Edit \xB7 Esc Close",
@@ -18561,7 +18663,7 @@ function createMaintenancePickers({
       },
       onSelect: (_value, item) => {
         if (item?._action === "title") {
-          setPicker(null);
+          own.close();
           setSettingsPrompt({
             kind: "profile-title",
             label: "Profile \xB7 Title",
@@ -18574,7 +18676,7 @@ function createMaintenancePickers({
         }
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
         if (returnTo) returnTo();
       }
     });
@@ -18857,10 +18959,8 @@ var routeFromModel = (model, effort = null) => ({
 // src/tui/app/onboarding-steps.mjs
 function createOnboardingSteps({
   store,
-  setPicker,
+  surface,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
   setOnboardingActive,
   onboardingRef,
@@ -18899,11 +18999,13 @@ function createOnboardingSteps({
   };
   const openOnboardingAuthStep = async () => {
     prefetchOnboardingStep2();
+    const own = surface.claim();
     let preloadedSetup = null;
     try {
       preloadedSetup = await store.getProviderSetup?.();
     } catch {
     }
+    if (!own.owns()) return;
     void openProviderSetupPicker({
       title: "First Run \xB7 Step 1/4 \xB7 Provider Auth",
       returnTo: () => openOnboardingAuthStep(),
@@ -18943,7 +19045,7 @@ function createOnboardingSteps({
     const webSearchRoute = onboardingRef.current.webSearchRoute || null;
     const overrides = onboardingRef.current.agentRoutes || {};
     const hasOverrides = Object.keys(overrides).length > 0;
-    setPicker(null);
+    surface.claim().close();
     setOnboardingActive(false);
     const done = () => store.pushNotice("First-run setup complete.", "info");
     const failed = (e) => store.pushNotice(`Couldn\u2019t save setup: ${e?.message || e}`, "error");
@@ -18965,6 +19067,7 @@ function createOnboardingSteps({
     void Promise.resolve().then(() => store.skipOnboarding?.()).then(done, failed);
   };
   const openOnboardingRoleModelPicker = async (target) => {
+    const own = surface.claim();
     const isLead = target === "lead";
     const isWebSearch = target === "webSearch";
     let models;
@@ -18978,14 +19081,14 @@ function createOnboardingSteps({
       models = normalizeModelOptions(webSearchModels || []);
       if (models.length === 0) {
         store.pushNotice("no native web-search models available; connect OpenAI, Grok, Gemini, or Anthropic", "warn");
-        void openOnboardingWorkflowStep();
+        if (own.owns()) void openOnboardingWorkflowStep();
         return;
       }
     } else {
       models = normalizeModelOptions(onboardingRef.current.providerModels || []);
       if (models.length === 0) {
         store.pushNotice("no provider models available; open /providers to sign in", "warn");
-        openOnboardingAuthStep();
+        if (own.owns()) openOnboardingAuthStep();
         return;
       }
     }
@@ -19016,7 +19119,8 @@ function createOnboardingSteps({
     const matchIdx = models.findIndex((m) => routeMatchesModel(currentRoute, m));
     const initialIndex = isLead ? Math.max(0, matchIdx) : isUnset || matchIdx < 0 ? 0 : matchIdx + 1;
     const label = isLead ? "Main" : isWebSearch ? "Web Search" : (onboardingRef.current.agents || []).find((a) => a.id === target)?.label || target;
-    setPicker({
+    if (!own.owns()) return;
+    own.paint({
       title: `First Run \xB7 ${label}`,
       description: isLead ? "Pick the main model. Agents inherit this unless individually changed." : isWebSearch ? "Pick the native web-search model, or Default to follow the Main Model." : `Pick the model for ${label}, or Default to follow the Main Model.`,
       initialIndex,
@@ -19057,6 +19161,7 @@ function createOnboardingSteps({
     });
   };
   const openOnboardingWorkflowStep = async () => {
+    const own = surface.claim();
     if (!Array.isArray(onboardingRef.current.providerModels) || onboardingRef.current.providerModels.length === 0) {
       try {
         onboardingRef.current.providerModels = await store.listProviderModels();
@@ -19071,7 +19176,7 @@ function createOnboardingSteps({
       onboardingRef.current.defaultRoute = null;
       onboardingRef.current.agentRoutes = {};
       store.pushNotice("no provider models available; open /providers to sign in", "warn");
-      openOnboardingAuthStep();
+      if (own.owns()) openOnboardingAuthStep();
       return;
     }
     if (!Array.isArray(onboardingRef.current.agents) || onboardingRef.current.agents.length === 0) {
@@ -19086,11 +19191,10 @@ function createOnboardingSteps({
     const webSearchRoute = onboardingRef.current.webSearchRoute || null;
     const overrides = onboardingRef.current.agentRoutes || {};
     const agents = onboardingRef.current.agents || [];
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setPicker({
+    own.paint({
       title: "First Run \xB7 Step 2/4 \xB7 Models",
       description: "Set the Main Model; each agent inherits it unless changed.",
       indexMode: "always",
@@ -19139,7 +19243,7 @@ function createOnboardingSteps({
         }
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
         onboardingWarnReopen();
       }
     });
@@ -19159,12 +19263,9 @@ function createOnboardingSteps({
 // src/tui/app/provider-setup-picker.mjs
 function createProviderSetupPicker({
   store,
-  setPicker,
+  surface,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
-  setContextPanel,
   closeUsagePanel,
   oauthSubmitRef,
   clearModelCaches
@@ -19173,16 +19274,18 @@ function createProviderSetupPicker({
     const returnTo = typeof options.returnTo === "function" ? options.returnTo : null;
     const onContinue = typeof options.onContinue === "function" ? options.onContinue : returnTo;
     const onCancel = typeof options.onCancel === "function" ? options.onCancel : null;
+    const own = surface.claim();
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setContextPanel(null);
+    own.context(null);
     closeUsagePanel();
+    const ownsSurface = () => own.owns();
+    const paintProviders = (panel) => own.paint(panel);
+    const releaseSurface = () => own.paint(null);
     let setup = options.preloadedSetup && typeof options.preloadedSetup === "object" ? options.preloadedSetup : null;
     options.preloadedSetup = null;
     if (!setup) {
-      setPicker({
+      paintProviders({
         title: options.title || "Providers",
         description: options.description || "Choose a provider to configure.",
         labelWidth: 18,
@@ -19199,7 +19302,7 @@ function createProviderSetupPicker({
         onSelect: () => {
         },
         onCancel: () => {
-          setPicker(null);
+          own.close();
           if (onCancel) onCancel();
         }
       });
@@ -19292,7 +19395,8 @@ function createProviderSetupPicker({
       return idx >= 0 ? idx : 0;
     };
     const reopenProviders = () => {
-      void openProviderSetupPicker(options);
+      if (!ownsSurface()) return;
+      void Promise.resolve(openProviderSetupPicker(options)).catch((e) => store.pushNotice(`providers failed: ${e?.message || e}`, "error"));
     };
     const providerActionFooter = (provider) => provider ? [{
       glyph: providerIsActive(provider) ? "\u25CF" : "\u25CB",
@@ -19300,6 +19404,7 @@ function createProviderSetupPicker({
       text: [providerKindLabel(provider), providerStatusLabel(provider), providerDetailText(provider)].filter(Boolean).join(" \xB7 ")
     }] : "";
     const setApiKeyPrompt = (providerItem) => {
+      if (!ownsSurface()) return;
       setProviderPrompt({
         kind: "api-key",
         providerId: providerItem._providerId,
@@ -19311,6 +19416,7 @@ function createProviderSetupPicker({
       });
     };
     const openApiProviderActions = (providerItem) => {
+      if (!ownsSurface()) return;
       rememberProviderSelection(providerItem);
       const provider = providerItem._provider || {};
       const hasAuth = providerItem._authenticated || provider.authenticated;
@@ -19338,7 +19444,7 @@ function createProviderSetupPicker({
           _action: "usage-login-browser"
         });
       }
-      setPicker({
+      paintProviders({
         title: `Provider \xB7 ${providerItem._providerName}`,
         description: "Choose an API-key action.",
         footer: () => providerActionFooter(provider),
@@ -19349,19 +19455,19 @@ function createProviderSetupPicker({
         initialIndex: 0,
         items: apiActions,
         onSelect: (_detailValue, detail) => {
-          setPicker(null);
+          releaseSurface();
           if (detail._action === "set-key") {
             setApiKeyPrompt(providerItem);
             return;
           }
           if (detail._action === "forget-key") {
-            try {
-              store.forgetProviderAuth(providerItem._providerId);
+            void Promise.resolve(store.forgetProviderAuth?.(providerItem._providerId)).then(() => {
               clearModelCaches("all");
               reopenProviders();
-            } catch (e) {
+            }).catch((e) => {
               store.pushNotice(`auth-forget failed: ${e?.message || e}`, "error");
-            }
+              openApiProviderActions(providerItem);
+            });
           }
           if (detail._action === "usage-login-browser") {
             let backedOut = false;
@@ -19381,7 +19487,7 @@ function createProviderSetupPicker({
                 _action: "back"
               }
             ];
-            setPicker({
+            paintProviders({
               title: `Provider \xB7 ${providerItem._providerName}`,
               description: "Opening browser. Sign in at opencode.ai/auth; the auth cookie is captured automatically.",
               footer: () => providerActionFooter(provider),
@@ -19436,7 +19542,7 @@ function createProviderSetupPicker({
             _action: "back"
           }
         ];
-        setPicker({
+        paintProviders({
           title: `Provider \xB7 ${providerItem._providerName}`,
           description: message,
           footer: () => providerActionFooter(provider),
@@ -19455,7 +19561,7 @@ function createProviderSetupPicker({
       };
       const showOAuthResult = (ok, message = "") => {
         setProviderPrompt(null);
-        setPicker({
+        paintProviders({
           title: `Provider \xB7 ${providerItem._providerName}`,
           description: message || (ok ? "Login complete." : "Login did not complete."),
           footer: () => providerActionFooter(provider),
@@ -19504,7 +19610,8 @@ function createProviderSetupPicker({
         };
         void store.beginOAuthProviderLogin(providerItem._providerId).then((login) => {
           if (typeof login?.completeCode === "function") {
-            setPicker(null);
+            if (!ownsSurface()) return;
+            releaseSurface();
             const manualUrl = login?.manualUrl || "";
             setProviderPrompt({
               kind: "oauth-code",
@@ -19556,6 +19663,7 @@ function createProviderSetupPicker({
       });
     };
     const openOAuthProviderActions = (providerItem) => {
+      if (!ownsSurface()) return;
       rememberProviderSelection(providerItem);
       const provider = providerItem._provider || {};
       const hasAuth = providerItem._authenticated || provider.authenticated || provider.reauthRequired === true;
@@ -19574,7 +19682,7 @@ function createProviderSetupPicker({
           _action: "forget-oauth"
         });
       }
-      setPicker({
+      paintProviders({
         title: `Provider \xB7 ${providerItem._providerName}`,
         description: "Choose an OAuth login action.",
         footer: () => providerActionFooter(provider),
@@ -19590,19 +19698,20 @@ function createProviderSetupPicker({
             return;
           }
           if (detail._action === "forget-oauth") {
-            try {
-              store.forgetProviderAuth(providerItem._providerId);
+            void Promise.resolve(store.forgetProviderAuth?.(providerItem._providerId)).then(() => {
               clearModelCaches("all");
               reopenProviders();
-            } catch (e) {
+            }).catch((e) => {
               store.pushNotice(`auth-forget failed: ${e?.message || e}`, "error");
-            }
+              openOAuthProviderActions(providerItem);
+            });
           }
         },
         onCancel: reopenProviders
       });
     };
     const openLocalProviderActions = (providerItem) => {
+      if (!ownsSurface()) return;
       rememberProviderSelection(providerItem);
       const provider = providerItem._provider || {};
       const localActions = [
@@ -19621,7 +19730,7 @@ function createProviderSetupPicker({
           _action: "disable-local"
         });
       }
-      setPicker({
+      paintProviders({
         title: `Provider \xB7 ${providerItem._providerName}`,
         description: "Choose a local endpoint action.",
         footer: () => providerActionFooter(provider),
@@ -19632,7 +19741,7 @@ function createProviderSetupPicker({
         initialIndex: 0,
         items: localActions,
         onSelect: (_detailValue, detail) => {
-          setPicker(null);
+          releaseSurface();
           if (detail._action === "set-local-url") {
             setProviderPrompt({
               kind: "local-url",
@@ -19644,19 +19753,19 @@ function createProviderSetupPicker({
             return;
           }
           if (detail._action === "disable-local") {
-            try {
-              store.setLocalProvider(providerItem._providerId, { enabled: false, baseURL: providerItem._baseURL });
+            void Promise.resolve(store.setLocalProvider?.(providerItem._providerId, { enabled: false, baseURL: providerItem._baseURL })).then(() => {
               clearModelCaches("all");
               reopenProviders();
-            } catch (e) {
+            }).catch((e) => {
               store.pushNotice(`local provider update failed: ${e?.message || e}`, "error");
-            }
+              openLocalProviderActions(providerItem);
+            });
           }
         },
         onCancel: reopenProviders
       });
     };
-    setPicker({
+    paintProviders({
       title: options.title || "Providers",
       description: options.description || "Choose a provider. Enter opens provider actions.",
       footer: providerFooter,
@@ -19673,7 +19782,7 @@ function createProviderSetupPicker({
         if (item?._providerId) rememberProviderSelection(item);
       },
       onSelect: (_value, item) => {
-        setPicker(null);
+        releaseSurface();
         if (item._type === "continue") {
           onContinue?.();
           return;
@@ -19691,7 +19800,7 @@ function createProviderSetupPicker({
         }
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
         if (onCancel) onCancel();
         else if (returnTo) returnTo();
       }
@@ -19705,10 +19814,8 @@ var MODEL_CACHE_TTL_MS = 5 * 60 * 1e3;
 function createModelPicker({
   store,
   getState,
-  setPicker,
+  surface,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
   providerModelsCacheRef,
   webSearchModelsCacheRef,
@@ -19720,9 +19827,8 @@ function createModelPicker({
   let providerModelsTtlRefreshPromise = null;
   const openModelPicker = async (options = {}) => {
     const state = getState();
+    const own = surface.claim();
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
     modelPickerRequestRef.current += 1;
     let modelPickerClosed = false;
@@ -19733,15 +19839,16 @@ function createModelPicker({
     const cancelModelPicker = () => {
       modelPickerClosed = true;
       if (returnTo) returnTo();
-      else setPicker(null);
+      else own.close();
     };
+    const paintModelPicker = (panel) => own.paint(panel);
     const cacheRef = options.cacheRef === "webSearch" ? webSearchModelsCacheRef : providerModelsCacheRef;
     const loadModels = typeof options.loadModels === "function" ? options.loadModels : store.listProviderModels;
     let providerModels = Array.isArray(cacheRef.current.models) ? cacheRef.current.models : [];
     let refreshModelsPromise = null;
     let renderedQuickModels = false;
     if (!providerModels.length || options.refreshModels === true) {
-      setPicker({
+      paintModelPicker({
         title: options.title || "Model",
         description: options.loadingDescription || "Loading models...",
         help: returnTo ? `\u2191/\u2193 Select \xB7 Enter Open \xB7 Esc ${returnLabel}` : "\u2191/\u2193 Select \xB7 Enter Open \xB7 Esc Back",
@@ -19770,6 +19877,7 @@ function createModelPicker({
     const cacheIsStale = providerModels.length > 0 && options.refreshModels !== true && options.cacheRef !== "webSearch" && !refreshModelsPromise && Date.now() - cacheAt > MODEL_CACHE_TTL_MS;
     if (!providerModels || providerModels.length === 0) {
       store.pushNotice(options.emptyNotice || "no provider models available; open /providers to sign in", "warn");
+      if (!own.owns()) return;
       void openProviderSetupPicker({
         title: "Providers",
         continueLabel: "Back to model setup",
@@ -20013,23 +20121,29 @@ ${model?.id || ""}`;
             if (typeof options.onImmediateSelect === "function") {
               options.onImmediateSelect(routeInput, selected, effort);
             } else {
-              setPicker(null);
+              own.paint(null);
             }
+            const afterSelect2 = own.defer(() => {
+              if (typeof options.onAfterSelect === "function") options.onAfterSelect();
+            });
             void savePromise.then((result) => {
               if (result) clearModelCaches("all");
-              if (typeof options.onAfterSelect === "function") options.onAfterSelect();
+              afterSelect2();
               return result;
             }).catch((e) => store.pushNotice(`Couldn\u2019t save model: ${e?.message || e}`, "error"));
             return;
           }
-          setPicker(null);
+          own.paint(null);
+          const afterSelect = own.defer(() => {
+            if (typeof options.onAfterSelect === "function") options.onAfterSelect();
+          });
           void store.setRoute(routeInput).then((ok) => {
             if (ok) clearModelCaches("provider");
             store.pushNotice(
               ok ? modelSwitchNotice2() : "Model switch is already running",
               ok ? "info" : "warn"
             );
-            if (ok && typeof options.onAfterSelect === "function") options.onAfterSelect();
+            if (ok) afterSelect();
           }).catch((e) => store.pushNotice(`Couldn\u2019t switch model: ${e?.message || e}`, "error"));
         };
         const renderProviderModels = () => {
@@ -20040,7 +20154,7 @@ ${model?.id || ""}`;
               (item) => item._provider === activeRoute?.provider && item._modelId === activeRoute?.model
             )
           );
-          setPicker({
+          paintModelPicker({
             title: providerDisplayName(provider),
             description: options.modelDescription || "Select a model. Adjust Effort with \u2190/\u2192.",
             footer: (item) => modelFooter(item?._model),
@@ -20090,7 +20204,7 @@ ${model?.id || ""}`;
         0,
         providerItems.findIndex((item) => item._provider === providerHighlight)
       );
-      setPicker({
+      paintModelPicker({
         title: options.title || "Model",
         description: options.providerDescription || "Choose a provider.",
         help: returnTo ? `\u2191/\u2193 Select \xB7 Enter Open \xB7 Esc ${returnLabel}` : "\u2191/\u2193 Select \xB7 Enter Open \xB7 Esc Back",
@@ -20141,12 +20255,9 @@ var outputStyleNotice = (result) => {
 function createRoutePickers({
   store,
   state,
-  setPicker,
+  surface,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
-  setContextPanel,
   closeUsagePanel,
   clean: clean2,
   routeLabel: routeLabel2,
@@ -20158,7 +20269,9 @@ function createRoutePickers({
   const openWebSearchPicker = async (options = {}) => {
     const routeOverride = options.routeOverride || null;
     const returnTo = typeof options.returnTo === "function" ? options.returnTo : null;
+    const own = surface.claim();
     const currentWebSearchRoute = routeOverride || await store.getWebSearchRoute?.() || null;
+    if (!own.owns()) return;
     void openModelPicker({
       title: "Web Search Model",
       loadingDescription: "Loading web-search-capable models...",
@@ -20173,7 +20286,7 @@ function createRoutePickers({
       returnOnNestedCancel: options.returnOnNestedCancel === true,
       onImmediateSelect: () => {
         if (returnTo) returnTo();
-        else setPicker(null);
+        else surface.claim().close();
       },
       onSelectRoute: async (routeInput) => {
         const result = await store.setWebSearchRoute?.(routeInput);
@@ -20188,6 +20301,7 @@ function createRoutePickers({
     });
   };
   const openAgentsPicker = async (options = {}) => {
+    const own = surface.claim();
     let agents = [];
     try {
       agents = await store.listAgents?.() || [];
@@ -20205,13 +20319,12 @@ function createRoutePickers({
       description: agent.description || agent.definition?.description || "",
       _agent: agent
     }));
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setContextPanel(null);
+    own.context(null);
     closeUsagePanel();
-    setPicker({
+    own.paint({
       title: "Agents",
       description: "Workflow agents available for agent tasks.",
       help: "\u2191/\u2193 Select \xB7 Enter Set Model \xB7 Esc Back",
@@ -20241,7 +20354,7 @@ function createRoutePickers({
             store.pushNotice(`${agent.label} model set to ${agentModelProfile2(result)}`, "info");
           }
         });
-        setPicker({
+        own.paint({
           title: agent.label,
           description: "Pick a model for this agent, or turn it off.",
           help: "\u2191/\u2193 Select \xB7 Enter Choose \xB7 Esc Back",
@@ -20267,6 +20380,9 @@ function createRoutePickers({
               openAgentModelPicker();
               return;
             }
+            const reopenAgents = own.defer(() => {
+              void openAgentsPicker();
+            });
             try {
               const result = await store.setAgentRoute?.(agent.id, { disabled: true });
               if (!result) {
@@ -20277,7 +20393,7 @@ function createRoutePickers({
             } catch (e) {
               store.pushNotice(`could not turn off ${agent.label}: ${e?.message || e}`, "error");
             }
-            void openAgentsPicker();
+            reopenAgents();
           },
           onCancel: () => {
             void openAgentsPicker();
@@ -20285,12 +20401,13 @@ function createRoutePickers({
         });
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
       }
     });
   };
   const openWorkflowPicker = async (options = {}) => {
     const returnTo = typeof options.returnTo === "function" ? options.returnTo : null;
+    const own = surface.claim();
     let workflows = [];
     try {
       workflows = await store.listWorkflows?.() || [];
@@ -20310,13 +20427,12 @@ function createRoutePickers({
       description: workflow.description || `${workflow.source || "workflow"} workflow`,
       _workflow: workflow
     }));
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setContextPanel(null);
+    own.context(null);
     closeUsagePanel();
-    setPicker({
+    own.paint({
       title: "Workflow",
       description: "Select active workflow.",
       help: returnTo ? "\u2191/\u2193 Select \xB7 Enter Choose \xB7 Esc Settings" : "\u2191/\u2193 Select \xB7 Enter Choose \xB7 Esc Back",
@@ -20325,18 +20441,21 @@ function createRoutePickers({
       onSelect: (_value, item) => {
         const workflow = item?._workflow;
         if (!workflow) return;
-        setPicker(null);
+        own.paint(null);
+        const returnAfterSwitch = own.defer(() => {
+          if (returnTo) returnTo();
+        });
         void store.setWorkflow?.(workflow.id).then((result) => {
           if (!result) {
             store.pushNotice("Workflow switch is already running.", "warn");
             return;
           }
           store.pushNotice(workflowSwitchNotice2(result), "info");
-          if (returnTo) returnTo();
+          returnAfterSwitch();
         }).catch((e) => store.pushNotice(`Couldn\u2019t switch workflow: ${e?.message || e}`, "error"));
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
         if (returnTo) returnTo();
       }
     });
@@ -20344,6 +20463,7 @@ function createRoutePickers({
   const openOutputStylePicker = async (options = {}) => {
     const returnTo = typeof options.returnTo === "function" ? options.returnTo : null;
     const onboarding = options.onboarding || null;
+    const own = surface.claim();
     let status = null;
     try {
       status = await store.listOutputStyles?.() || null;
@@ -20366,26 +20486,28 @@ function createRoutePickers({
       description: style.description || style.source || "output style",
       _style: style
     }));
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setContextPanel(null);
+    own.context(null);
     closeUsagePanel();
     const saveStyle = (styleId, { advance = false } = {}) => {
       if (!styleId) return;
-      if (!(advance && onboarding)) setPicker(null);
+      if (!(advance && onboarding)) own.paint(null);
+      const advanceAfterSave = own.defer(() => {
+        if (advance && onboarding) onboarding.onAdvance?.();
+        else if (returnTo) returnTo();
+      });
       void store.setOutputStyle?.(styleId).then((result) => {
         if (!result) {
           store.pushNotice("Output style switch is already running.", "warn");
         } else {
           store.pushNotice(outputStyleNotice(result), "info");
         }
-        if (advance && onboarding) onboarding.onAdvance?.();
-        else if (returnTo) returnTo();
+        advanceAfterSave();
       }).catch((e) => store.pushNotice(`Couldn\u2019t switch output style: ${e?.message || e}`, "error"));
     };
-    setPicker({
+    own.paint({
       title: "Output Style",
       description: "Select response style.",
       // Onboarding uses a ConfirmBar (←/→ = Back/Next); let the Picker supply
@@ -20400,7 +20522,7 @@ function createRoutePickers({
         ],
         onConfirm: (button) => {
           if (button.value === "back") {
-            setPicker(null);
+            own.close();
             onboarding.onBack?.();
             return;
           }
@@ -20416,7 +20538,7 @@ function createRoutePickers({
         saveStyle(style.id, { advance: Boolean(onboarding) });
       },
       onCancel: () => {
-        setPicker(null);
+        own.close();
         if (onboarding) onboarding.onCancel?.();
         else if (returnTo) returnTo();
       }
@@ -20541,12 +20663,11 @@ async function toggleVoice({ pushNotice, setProgressHint } = {}) {
 function createSettingsPicker({
   store,
   state,
-  setPicker,
+  surface,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
   settingsHeavyCacheRef,
+  settingsRequestRef,
   formatDuration: formatDuration2,
   displayModelName: displayModelName3,
   routeModelLabel: routeModelLabel2,
@@ -20569,7 +20690,14 @@ function createSettingsPicker({
   openMemoryCorePicker,
   openUpdatePicker
 }) {
-  const openSettingsPicker = async (opts = {}) => {
+  const nextSettingsRequest = () => {
+    if (!settingsRequestRef) return 0;
+    settingsRequestRef.current = (Number(settingsRequestRef.current) || 0) + 1;
+    return settingsRequestRef.current;
+  };
+  const isCurrentSettingsRequest = (requestId) => !settingsRequestRef || settingsRequestRef.current === requestId;
+  const buildSettingsPicker = async (opts = {}, requestId = 0) => {
+    const own = surface.claim();
     const light = opts.light === true;
     const overrides = opts.overrides || null;
     const heavyCache = light ? settingsHeavyCacheRef.current : null;
@@ -20593,13 +20721,12 @@ function createSettingsPicker({
     const workflowLabel = workflowDisplayName2(workflow);
     const boolLabel = (enabled) => enabled ? "On" : "Off";
     const compactTypeDescription = "Uses Memory recall to rebuild context faster on large histories.";
+    const deferredSettingsRefresh = () => own.defer(() => refreshSettings());
     const applyAutoClear = (patch = {}) => {
       void Promise.resolve(store.setAutoClear?.(patch)).then((next) => {
         if (!next) store.pushNotice("autoclear unavailable", "warn");
         else store.pushNotice(next.enabled ? `Auto-clear on \xB7 idle ${formatDuration2(next.idleMs)}` : "Auto-clear off", "info");
-      }).catch((e) => store.pushNotice(`autoclear failed: ${e?.message || e}`, "error")).finally(() => {
-        void openSettingsPicker({ light: true });
-      });
+      }).catch((e) => store.pushNotice(`autoclear failed: ${e?.message || e}`, "error")).finally(deferredSettingsRefresh());
     };
     const autoClearEnabled = autoClear.enabled !== false;
     const toggleAutoClear = () => applyAutoClear({ enabled: !autoClearEnabled });
@@ -20610,22 +20737,20 @@ function createSettingsPicker({
           return;
         }
         store.pushNotice(`Compaction ${next.auto !== false ? "auto on" : "auto off"} \xB7 ${next.compactType === "recall-fasttrack" ? "Fast-track" : "Default"}`, "info");
-      }).catch((e) => store.pushNotice(`compaction failed: ${e?.message || e}`, "error")).finally(() => openSettingsPicker({ light: true }));
+      }).catch((e) => store.pushNotice(`compaction failed: ${e?.message || e}`, "error")).finally(deferredSettingsRefresh());
     };
     const applyVoice = () => {
       if (isVoiceInstallBusy()) {
         store.pushNotice("Voice install is already running", "warn");
         return;
       }
-      void Promise.resolve(toggleVoice({ pushNotice: store.pushNotice, setProgressHint: store.setProgressHint })).finally(() => {
-        void openSettingsPicker({ light: true });
-      });
+      void Promise.resolve(toggleVoice({ pushNotice: store.pushNotice, setProgressHint: store.setProgressHint })).catch((e) => store.pushNotice(`voice setup failed: ${e?.message || e}`, "error")).finally(deferredSettingsRefresh());
     };
     const applyToolModule = (label, setter, enabled) => {
       void Promise.resolve(setter?.(enabled)).then((next) => {
         if (!next) store.pushNotice(`${label} setting is busy`, "warn");
         else store.pushNotice(`${label} ${enabled ? "on" : "off"} \xB7 new sessions`, "info");
-      }).catch((e) => store.pushNotice(`${label} setting failed: ${e?.message || e}`, "error")).finally(() => openSettingsPicker({ light: true }));
+      }).catch((e) => store.pushNotice(`${label} setting failed: ${e?.message || e}`, "error")).finally(deferredSettingsRefresh());
     };
     const toggleWebSearch = () => applyToolModule("Web search", store.setWebSearchEnabled, !webSearchOn);
     const toggleMemory = () => applyToolModule("Memory", store.setMemoryToolsEnabled, !memoryToolsOn);
@@ -20634,9 +20759,10 @@ function createSettingsPicker({
       void Promise.resolve(store.setRecapEnabled?.(enabled)).then((next) => {
         if (!next) store.pushNotice("Memory cycles setting is busy", "warn");
         else store.pushNotice(`Memory cycles ${enabled ? "on" : "off"}`, "info");
-      }).catch((e) => store.pushNotice(`Memory cycles setting failed: ${e?.message || e}`, "error")).finally(() => openSettingsPicker({ light: true }));
+      }).catch((e) => store.pushNotice(`Memory cycles setting failed: ${e?.message || e}`, "error")).finally(deferredSettingsRefresh());
     };
     const cycleOutputStyle = async (direction = 1) => {
+      const settled = deferredSettingsRefresh();
       let status = null;
       try {
         status = await store.listOutputStyles?.() || null;
@@ -20658,9 +20784,10 @@ function createSettingsPicker({
           return;
         }
         store.pushNotice(outputStyleNotice(result), "info");
-      }).catch((e) => store.pushNotice(`Couldn\u2019t switch output style: ${e?.message || e}`, "error")).finally(() => openSettingsPicker({ light: true }));
+      }).catch((e) => store.pushNotice(`Couldn\u2019t switch output style: ${e?.message || e}`, "error")).finally(settled);
     };
     const cycleWorkflow = async (direction = 1) => {
+      const settled = deferredSettingsRefresh();
       let workflows = [];
       try {
         workflows = await store.listWorkflows?.() || [];
@@ -20681,7 +20808,7 @@ function createSettingsPicker({
           return;
         }
         store.pushNotice(workflowSwitchNotice2(result), "info");
-      }).catch((e) => store.pushNotice(`Couldn\u2019t switch workflow: ${e?.message || e}`, "error")).finally(() => openSettingsPicker({ light: true }));
+      }).catch((e) => store.pushNotice(`Couldn\u2019t switch workflow: ${e?.message || e}`, "error")).finally(settled);
     };
     const cycleTheme = (direction = 1) => {
       let themes = [];
@@ -20704,7 +20831,7 @@ function createSettingsPicker({
       } catch (e) {
         store.pushNotice(`Couldn\u2019t set theme: ${e?.message || e}`, "error");
       }
-      openSettingsPicker({ light: true });
+      refreshSettings();
     };
     const items = [
       {
@@ -20717,7 +20844,10 @@ function createSettingsPicker({
       {
         value: "websearch",
         label: "Web search model",
-        meta: routeModelLabel2(store.getWebSearchRoute?.()),
+        // From the one-shot snapshot: a direct getWebSearchRoute() here is an
+        // unresolved promise on a daemon-backed store, so the row rendered
+        // its "(unset)" default for every configured route.
+        meta: routeModelLabel2(snapshot.webSearchRoute || null),
         description: "Native web-search model.",
         _action: "websearch"
       },
@@ -20868,11 +20998,11 @@ function createSettingsPicker({
         _action: "update"
       }
     ];
+    if (!isCurrentSettingsRequest(requestId)) return;
+    if (!own.owns()) return;
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setPicker({
+    own.paint({
       title: "Settings",
       description: "Runtime, model, tools, and integrations.",
       help: "\u2191/\u2193 Select \xB7 \u2190/\u2192 Change \xB7 Enter Open/Toggle \xB7 Esc Close",
@@ -20937,7 +21067,7 @@ function createSettingsPicker({
         else if (item._action === "skills") openSkillsPicker();
         else if (item._action === "memory") openMemoryCorePicker({ returnTo: openSettingsPicker });
         else if (item._action === "system-shell") {
-          setPicker(null);
+          own.close();
           setSettingsPrompt({
             kind: "system-shell",
             label: "System shell",
@@ -20947,10 +21077,22 @@ function createSettingsPicker({
         } else if (item._action === "update") openUpdatePicker({ returnTo: openSettingsPicker });
       },
       onCancel: () => {
-        setPicker(null);
+        nextSettingsRequest();
+        own.close();
       }
     });
   };
+  const openSettingsPicker = async (opts = {}) => {
+    const requestId = nextSettingsRequest();
+    try {
+      await buildSettingsPicker(opts, requestId);
+    } catch (error) {
+      store.pushNotice(`settings unavailable: ${error?.message || error}`, "error");
+    }
+  };
+  const refreshSettings = () => {
+    void openSettingsPicker({ light: true });
+  };
   return { openSettingsPicker };
 }
 
@@ -20965,7 +21107,7 @@ function createSlashDispatch({
   state,
   store,
   normalizeSlashCommandName: normalizeSlashCommandName2,
-  setContextPanel,
+  surface,
   closeUsagePanel,
   openModelPicker,
   modelSwitchNotice: modelSwitchNotice2,
@@ -21001,7 +21143,7 @@ function createSlashDispatch({
   const runSlashCommand = (cmd, arg = "") => {
     const rawName = String(cmd || "").toLowerCase();
     cmd = normalizeSlashCommandName2(cmd);
-    if (cmd !== "context") setContextPanel(null);
+    if (cmd !== "context") surface.claim().context(null);
     if (cmd !== "usage") closeUsagePanel();
     switch (cmd) {
       case "clear":
@@ -21286,12 +21428,9 @@ function createSlashDispatch({
 function createAppPickers({
   state,
   store,
-  setPicker,
+  surface,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
-  setContextPanel,
   setOnboardingActive,
   closeUsagePanel,
   oauthSubmitRef,
@@ -21302,6 +21441,7 @@ function createAppPickers({
   modelPickerRequestRef,
   onboardingPrefetchSeqRef,
   settingsHeavyCacheRef,
+  settingsRequestRef,
   livePickerRef,
   disabledSkills,
   setDisabledSkills,
@@ -21314,24 +21454,21 @@ function createAppPickers({
   const { openThemePicker, openEffortPicker } = createThemeEffortPickers({
     state,
     store,
-    setPicker,
+    surface,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
-    setContextPanel,
     closeUsagePanel,
     clean
   });
   const { openResumePicker } = createResumePicker({
     store,
-    setPicker,
+    surface,
     formatSessionUpdatedAt,
     formatSessionMessageCount
   });
   const { openMemoryCorePicker } = createCoreMemoryPicker({
     store,
-    setPicker,
+    surface,
     setSettingsPrompt,
     parseMemoryCoreRows
   });
@@ -21351,11 +21488,9 @@ function createAppPickers({
     theme,
     clean,
     copyToClipboard,
-    setPicker,
+    surface,
     getPicker: () => livePickerRef.current,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
     getDisabledSkills: () => disabledSkills,
     setDisabledSkills
@@ -21368,20 +21503,15 @@ function createAppPickers({
     store,
     theme,
     formatDuration,
-    setPicker,
+    surface,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
-    setContextPanel,
     closeUsagePanel
   });
   const { onboardingWarnReopen, openOnboardingAuthStep } = createOnboardingSteps({
     store,
-    setPicker,
+    surface,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
     setOnboardingActive,
     onboardingRef,
@@ -21393,12 +21523,9 @@ function createAppPickers({
   });
   const { openProviderSetupPicker } = createProviderSetupPicker({
     store,
-    setPicker,
+    surface,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
-    setContextPanel,
     closeUsagePanel,
     oauthSubmitRef,
     clearModelCaches
@@ -21406,10 +21533,8 @@ function createAppPickers({
   const { openModelPicker } = createModelPicker({
     store,
     getState: () => state,
-    setPicker,
+    surface,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
     providerModelsCacheRef,
     webSearchModelsCacheRef,
@@ -21426,12 +21551,9 @@ function createAppPickers({
   } = createRoutePickers({
     store,
     state,
-    setPicker,
+    surface,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
-    setContextPanel,
     closeUsagePanel,
     clean,
     routeLabel,
@@ -21443,12 +21565,11 @@ function createAppPickers({
   const { openSettingsPicker } = createSettingsPicker({
     store,
     state,
-    setPicker,
+    surface,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
     settingsHeavyCacheRef,
+    settingsRequestRef,
     formatDuration,
     displayModelName,
     routeModelLabel,
@@ -21475,7 +21596,7 @@ function createAppPickers({
     state,
     store,
     normalizeSlashCommandName,
-    setContextPanel,
+    surface,
     closeUsagePanel,
     openModelPicker: (...a) => openModelPicker(...a),
     modelSwitchNotice,
@@ -21712,7 +21833,7 @@ function messageSelectorLabel(text, width = 56) {
 function useMessageSelector({
   store,
   state,
-  setPicker,
+  surface,
   setPromptDraftOverride,
   syncPromptLayoutRows,
   showPromptHint,
@@ -21742,14 +21863,15 @@ function useMessageSelector({
       showPromptHint("No message to jump back to.", "info");
       return false;
     }
-    setPicker({
+    const own = surface.claim();
+    own.paint({
       _kind: "message-selector",
       title: "Jump back to a message",
       description: "Rewind the conversation to a previous prompt and edit it.",
       initialIndex: rows.length - 1,
       items: rows.map((row) => ({ value: row.id, label: messageSelectorLabel(row.text) })),
       onSelect: (value) => {
-        setPicker(null);
+        own.close();
         let restored;
         try {
           restored = store.rewindToItem?.(value);
@@ -21763,10 +21885,10 @@ function useMessageSelector({
         }
         applyRewind(restored);
       },
-      onCancel: () => setPicker(null)
+      onCancel: () => own.close()
     });
     return true;
-  }, [store, state.items, setPicker, applyRewind, showPromptHint]);
+  }, [store, state.items, surface, applyRewind, showPromptHint]);
   return { hasUserMessages, openMessageSelector };
 }
 
@@ -22367,12 +22489,9 @@ function useTranscriptWindow({
 function createProjectPicker({
   state,
   store,
-  setPicker,
+  surface,
   setProviderPrompt,
-  setChannelPrompt,
-  setHookPrompt,
   setSettingsPrompt,
-  setContextPanel,
   closeUsagePanel,
   projectNameFromPath: projectNameFromPath3,
   pickFolder: pickFolder2
@@ -22443,16 +22562,15 @@ function createProjectPicker({
         }
       },
       onCancel: () => {
-        setPicker(null);
+        surface.claim().close();
       }
     };
   };
   const beginNewProjectManual = () => {
-    setPicker(null);
+    const own = surface.claim();
+    own.context(null);
+    own.close();
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
-    setContextPanel(null);
     closeUsagePanel();
     setSettingsPrompt({
       kind: "project-new",
@@ -22461,12 +22579,11 @@ function createProjectPicker({
     });
   };
   const beginNewProject = () => {
+    const own = surface.claim();
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
-    setContextPanel(null);
+    own.context(null);
     closeUsagePanel();
-    setPicker({
+    own.paint({
       kind: "project",
       title: "Project",
       description: "Opening folder picker\u2026 choose a folder in the dialog window.",
@@ -22482,6 +22599,7 @@ function createProjectPicker({
       title: "Select a project folder",
       initialPath: String(state.cwd || process.cwd() || "")
     }).then((result) => {
+      if (!own.owns()) return;
       if (!result || result.available === false) {
         beginNewProjectManual();
         return;
@@ -22492,7 +22610,7 @@ function createProjectPicker({
       }
       void registerProject(result.path);
     }).catch(() => {
-      beginNewProjectManual();
+      if (own.owns()) beginNewProjectManual();
     });
   };
   const registerProject = async (rawPath) => {
@@ -22501,9 +22619,11 @@ function createProjectPicker({
       store.pushNotice("project path is required", "warn");
       return false;
     }
+    const own = surface.claim();
     try {
       const project = await serviceCall("addProject", path2);
       if (project?.name) store.pushNotice(`project added: ${project.name}`, "info");
+      if (!own.owns()) return true;
       await openProjectPicker();
       return true;
     } catch (e) {
@@ -22517,7 +22637,7 @@ function createProjectPicker({
       store.pushNotice("project path is required", "warn");
       return false;
     }
-    setPicker(null);
+    surface.claim().close();
     try {
       const resolved = await serviceCall("setCwd", path2, {
         notice: options?.notice !== false,
@@ -22532,11 +22652,10 @@ function createProjectPicker({
   };
   const beginRenameProject = (project) => {
     if (!project?.path) return;
-    setPicker(null);
+    const own = surface.claim();
+    own.context(null);
+    own.close();
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
-    setContextPanel(null);
     closeUsagePanel();
     setSettingsPrompt({
       kind: "project-rename",
@@ -22547,28 +22666,27 @@ function createProjectPicker({
     });
   };
   const openProjectPicker = async ({ initialEntry = false } = {}) => {
+    const own = surface.claim();
     setProviderPrompt(null);
-    setChannelPrompt(null);
-    setHookPrompt(null);
     setSettingsPrompt(null);
-    setContextPanel(null);
+    own.context(null);
     closeUsagePanel();
     const requestId = /* @__PURE__ */ Symbol("project-picker-request");
-    setPicker(buildProjectPickerState({
+    own.paint(buildProjectPickerState({
       initialEntry,
       loading: true,
       requestId
     }));
     try {
       const projects = await serviceCall("listProjects");
-      setPicker((current) => current?._projectRequestId === requestId ? buildProjectPickerState({
+      own.paint((current) => current?._projectRequestId === requestId ? buildProjectPickerState({
         initialEntry,
         projects: Array.isArray(projects) ? projects : [],
         requestId
       }) : current);
       return projects;
     } catch (error) {
-      setPicker((current) => current?._projectRequestId === requestId ? buildProjectPickerState({ initialEntry, projects: [], requestId }) : current);
+      own.paint((current) => current?._projectRequestId === requestId ? buildProjectPickerState({ initialEntry, projects: [], requestId }) : current);
       store.pushNotice(`project list failed: ${error?.message || error}`, "error");
       return [];
     }
@@ -22681,7 +22799,7 @@ function usePromptHandlers({
   setPastedImages,
   setPastedTexts,
   setPromptDraftOverride,
-  setContextPanel,
+  surface,
   // derived / helper values + callbacks
   syncPromptLayoutRows,
   showPromptHint,
@@ -22822,7 +22940,7 @@ function usePromptHandlers({
       return true;
     }
     if (contextPanel) {
-      setContextPanel(null);
+      surface.claim().context(null);
       return true;
     }
     if (meta.phase === "clear-arm") {
@@ -22996,7 +23114,9 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
   const [picker, setPickerState] = useState11(null);
   const livePickerRef = useRef15(null);
   const setPicker = useCallback13((next) => {
-    livePickerRef.current = typeof next === "function" ? next(livePickerRef.current) : next;
+    const previousPicker = livePickerRef.current;
+    livePickerRef.current = typeof next === "function" ? next(previousPicker) : next;
+    if (shouldSupersedePanelEpoch(previousPicker, livePickerRef.current)) supersedePanelEpoch();
     setPickerState((prev) => {
       const resolved = typeof next === "function" ? next(prev) : next;
       if (resolved && typeof resolved === "object" && pickerOpenedFromEnterRef.current) {
@@ -23016,26 +23136,23 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
   livePickerRef.current = picker;
   const [contextPanel, setContextPanel] = useState11(null);
   const [usagePanel, setUsagePanel] = useState11(null);
-  const usageRequestRef = useRef15(0);
+  const surfaceRef = useRef15(null);
+  if (!surfaceRef.current) {
+    surfaceRef.current = createPanelSurface({ setPicker, setContextPanel, setUsagePanel });
+  }
+  const surface = surfaceRef.current;
   const settingsHeavyCacheRef = useRef15(null);
-  const closeUsagePanel = useCallback13(() => {
-    usageRequestRef.current += 1;
-    setUsagePanel(null);
-  }, []);
+  const settingsRequestRef = useRef15(0);
+  const closeUsagePanel = useCallback13(() => surface.closeUsage(), [surface]);
   const [providerPrompt, setProviderPrompt] = useState11(null);
   const oauthSubmitRef = useRef15(false);
-  const [channelPrompt, setChannelPrompt] = useState11(null);
-  const [hookPrompt, setHookPrompt] = useState11(null);
   const [settingsPrompt, setSettingsPrompt] = useState11(null);
   const projectPicker = createProjectPicker({
     state,
     store,
-    setPicker,
+    surface,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
-    setContextPanel,
     closeUsagePanel,
     projectNameFromPath,
     pickFolder
@@ -23206,12 +23323,9 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
   } = createAppPickers({
     state,
     store,
-    setPicker,
+    surface,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
-    setContextPanel,
     setOnboardingActive,
     closeUsagePanel,
     oauthSubmitRef,
@@ -23222,6 +23336,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
     modelPickerRequestRef,
     onboardingPrefetchSeqRef,
     settingsHeavyCacheRef,
+    settingsRequestRef,
     livePickerRef,
     disabledSkills,
     setDisabledSkills,
@@ -23373,7 +23488,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
   const { hasUserMessages, openMessageSelector } = useMessageSelector({
     store,
     state,
-    setPicker,
+    surface,
     setPromptDraftOverride,
     syncPromptLayoutRows,
     showPromptHint,
@@ -23397,7 +23512,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
     setPastedImages,
     setPastedTexts,
     setPromptDraftOverride,
-    setContextPanel,
+    surface,
     syncPromptLayoutRows,
     showPromptHint,
     clearPromptHint,
@@ -23425,7 +23540,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
     picker,
     usagePanel,
     contextPanel,
-    setContextPanel,
+    surface,
     closeUsagePanel,
     isRawModeSupported,
     resizeState,
@@ -23445,14 +23560,9 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
   const { openUsagePanel, openContextPicker } = createUsageContextPanels({
     store,
     state,
-    usageRequestRef,
-    setPicker,
+    surface,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
-    setContextPanel,
-    setUsagePanel,
     closeUsagePanel
   });
   useEffect14(() => {
@@ -23493,17 +23603,12 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
     store,
     state,
     providerPrompt,
-    channelPrompt,
-    hookPrompt,
     settingsPrompt,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
     oauthSubmitRef,
     clearModelCaches,
     openProviderSetupPicker,
-    openHooksPicker,
     openSettingsPicker,
     openProjectPicker,
     openAutoClearPicker,
@@ -23520,7 +23625,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
     pastedImagesRef,
     pastedTextsRef
   });
-  const activeSlashQuery = providerPrompt || channelPrompt || hookPrompt || settingsPrompt || toolApproval || contextPanel || usagePanel ? null : slashQuery(promptDraft);
+  const activeSlashQuery = providerPrompt || settingsPrompt || toolApproval || contextPanel || usagePanel ? null : slashQuery(promptDraft);
   const slashModeLive = activeSlashQuery !== null && !picker && !toolApproval && !contextPanel && !usagePanel && !exiting && !state.commandBusy;
   const slashCommands = !slashModeLive ? [] : SLASH_COMMANDS.filter((command) => slashCommandMatches(command, activeSlashQuery)).sort(compareSlashCommands);
   const slashPaletteOpen = slashModeLive && slashDismissedFor !== promptDraft;
@@ -23532,8 +23637,6 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
     contextPanel: !!contextPanel,
     usagePanel: !!usagePanel,
     providerPrompt: !!providerPrompt,
-    channelPrompt: !!channelPrompt,
-    hookPrompt: !!hookPrompt,
     settingsPrompt: !!settingsPrompt
   };
   useEffect14(() => {
@@ -23542,8 +23645,6 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
   const {
     onPromptDraftChange,
     cancelProviderPrompt,
-    cancelChannelPrompt,
-    cancelHookPrompt,
     cancelSettingsPrompt,
     acceptSlashPalette,
     completeSlashPalette,
@@ -23563,12 +23664,8 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
     slashDismissedFor,
     setSlashDismissedFor,
     providerPrompt,
-    channelPrompt,
-    hookPrompt,
     settingsPrompt,
     setProviderPrompt,
-    setChannelPrompt,
-    setHookPrompt,
     setSettingsPrompt,
     oauthSubmitRef,
     openProjectPicker,
@@ -23584,8 +23681,6 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
   const { agentRevision, activeToolsSignature, activeTools, statuslineStats } = useTranscriptActivity({ state });
   const layout = computeShellLayout({
     providerPrompt,
-    channelPrompt,
-    hookPrompt,
     settingsPrompt,
     panelTransitionEpoch,
     panelInkMaskEpoch,
@@ -23701,7 +23796,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
     setMeasuredRowsVersion
   });
   const cycleWorkflowFromPrompt = useCallback13(() => {
-    if (slashPaletteOpen || toolApproval || picker || settingsPrompt || providerPrompt || channelPrompt || hookPrompt || contextPanel || usagePanel) return true;
+    if (slashPaletteOpen || toolApproval || picker || settingsPrompt || providerPrompt || contextPanel || usagePanel) return true;
     const repeatGuardMs = 300;
     const cycleGuard = workflowTabCycleRef.current;
     const now = Date.now();
@@ -23736,19 +23831,16 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
       cycleGuard.lastAt = Date.now();
     });
     return true;
-  }, [slashPaletteOpen, toolApproval, picker, settingsPrompt, providerPrompt, channelPrompt, hookPrompt, contextPanel, usagePanel, state.commandBusy, state.workflow, store]);
+  }, [slashPaletteOpen, toolApproval, picker, settingsPrompt, providerPrompt, contextPanel, usagePanel, state.commandBusy, state.workflow, store]);
   return renderAppView({
     ...layout,
     acceptSlashPalette,
     activeSlashQuery,
     activeTools,
     agentRevision,
-    cancelChannelPrompt,
-    cancelHookPrompt,
     cancelProviderPrompt,
     cancelSettingsPrompt,
     cancelSlashPalette,
-    channelPrompt,
     clearPromptHint,
     completeSlashPalette,
     contextPanel,
@@ -23761,7 +23853,6 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
     handlePromptInterrupt,
     handlePromptPaste,
     hasUserMessages,
-    hookPrompt,
     initialStatusLine,
     onPromptDraftChange,
     onSubmit,
@@ -23784,7 +23875,6 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
     resizeEpoch,
     resizeState,
     restoreQueuedToPrompt,
-    setPicker,
     setSlashIndex,
     setTextEntryLayoutRows,
     settingsPrompt,
@@ -23794,6 +23884,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false, onboardin
     state,
     statuslineStats,
     store,
+    surface,
     toolApproval,
     toolOutputExpanded,
     transcriptMeasureRef,