@sortedyuan/maybecode 0.3.2 → 0.5.0

package/dist/cli/{retained-tui-VJ3VX4R3.js → retained-tui-QF5VMYLC.js}

@@ -1,14 +1,25 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
+import {
+  createMaybeCodeSlashCommandSuggester,
+  createMaybeCodeWebHost,
+  delegationOrder,
+  executeMaybeCodeSlashCommand,
+  formatDelegationTree,
+  formatGoal,
+  formatMaybeCodeMcpStatus,
+  parseMaybeCodeSlashCommand,
+  renderDelegationTask,
+  startMaybeCodeWebServer
+} from "./chunk-WMSG5ZTR.js";
 import {
   Column,
   DEFAULT_DARK_THEME,
+  DEFAULT_EDITOR_KEYBINDINGS,
   Dialog,
   Editor,
   EditorHistory,
   FocusManager,
   FullscreenRenderer,
-  MAYBECODE_EDITOR_KEYBINDINGS,
-  MaybeCodeTerminalWeb,
   NodeTerminalDriver,
   Panel,
   ScrollView,
@@ -20,36 +31,140 @@ import {
   TranscriptView,
   TuiRuntime,
   WorkspaceDiffViewer,
-  createMaybeCodeKeymap,
   createTerminalClipboard,
-  presentMcpInteraction,
   sanitizeTerminalText,
   styleText,
   workspaceGitLabel
-} from "./chunk-LVTRXPDS.js";
+} from "./chunk-4B2Z6KW7.js";
+import "./chunk-Z3BOPBVU.js";
+import "./chunk-XTEMRAQW.js";
 import {
-  createMaybeCodeSlashCommandSuggester,
-  delegationOrder,
-  executeMaybeCodeSlashCommand,
-  formatDelegationTree,
-  formatGoal,
-  formatMaybeCodeMcpStatus,
-  parseMaybeCodeSlashCommand,
-  renderDelegationTask
-} from "./chunk-7ISOHFS7.js";
-import "./chunk-HOU5ITUK.js";
-import "./chunk-JT6VBKOM.js";
-import "./chunk-H7SNBFO4.js";
-import "./chunk-VAZMCNBB.js";
-import "./chunk-K5JWPNSY.js";
+  Keymap,
+  formatKeySequence,
+  mergeKeyBindings,
+  parseKeySequence
+} from "./chunk-4WG6JIJJ.js";
+import "./chunk-MNBYXL5Y.js";
+import "./chunk-5SLWALZK.js";
+import "./chunk-UQDZ55LQ.js";
 import "./chunk-BSBNNF34.js";
 import {
   __name
 } from "./chunk-E732GDOI.js";
 
 // apps/maybecode/src/ui/retained-tui.ts
+import { omitUndefined as omitUndefined2 } from "@sortedyuan/may/core";
 import { userInfo } from "node:os";
 
+// apps/maybecode/src/ui/terminal-view.ts
+import { omitUndefined } from "@sortedyuan/may/core";
+
+// apps/maybecode/src/keymap.ts
+var MAYBECODE_KEY_ACTIONS = [
+  "app.interrupt",
+  "app.tools.toggle",
+  "app.thinking.toggle",
+  "app.reply.start",
+  "app.focus.next",
+  "app.focus.previous",
+  "app.selection.copy",
+  "list.up",
+  "list.down",
+  "list.pageUp",
+  "list.pageDown",
+  "list.home",
+  "list.end",
+  "list.accept",
+  "list.cancel",
+  "preview.toggle",
+  "search.start",
+  "search.finish",
+  "text.backspace",
+  "text.clear",
+  "session.rename.start",
+  "session.rename.accept",
+  "session.delete.request",
+  "session.delete.accept",
+  "session.delete.cancel",
+  "model.default.set",
+  "approval.allow",
+  "approval.allowSession",
+  "approval.deny",
+  "request.cancel",
+  "request.pageUp",
+  "request.pageDown",
+  "request.scrollUp",
+  "request.scrollDown"
+];
+var MAYBECODE_EDITOR_KEYBINDINGS = [
+  { context: "editor", keys: "ctrl+j", action: "editor.newline" }
+];
+var MAYBECODE_DEFAULT_KEYBINDINGS = [
+  { context: "global", keys: "ctrl+c", action: "app.interrupt" },
+  { context: "dialog", keys: "ctrl+c", action: "app.interrupt" },
+  { context: "global", keys: "<leader> d", action: "app.tools.toggle" },
+  { context: "global", keys: "<leader> t", action: "app.thinking.toggle" },
+  { context: "global", keys: "<leader> r", action: "app.reply.start" },
+  { context: "global", keys: "tab", action: "app.focus.next" },
+  { context: "global", keys: "shift+tab", action: "app.focus.previous" },
+  { context: "transcript.selection", keys: "ctrl+c", action: "app.selection.copy" },
+  { context: "select", keys: "up", action: "list.up" },
+  { context: "select", keys: "down", action: "list.down" },
+  { context: "select", keys: "pageup", action: "list.pageUp" },
+  { context: "select", keys: "pagedown", action: "list.pageDown" },
+  { context: "select", keys: "home", action: "list.home" },
+  { context: "select", keys: "end", action: "list.end" },
+  { context: "select", keys: "enter", action: "list.accept" },
+  { context: "select", keys: "escape", action: "list.cancel" },
+  { context: "sessionPicker", keys: "space", action: "preview.toggle" },
+  { context: "sessionPicker", keys: "/", action: "search.start" },
+  { context: "sessionPicker", keys: "d", action: "session.delete.request" },
+  { context: "sessionPicker", keys: "r", action: "session.rename.start" },
+  { context: "modelPicker", keys: "d", action: "model.default.set" },
+  { context: "approval", keys: "a", action: "approval.allow" },
+  { context: "approval", keys: "s", action: "approval.allowSession" },
+  { context: "approval", keys: "d", action: "approval.deny" },
+  { context: "mcpInput", keys: "escape", action: "request.cancel" },
+  { context: "mcpInput", keys: "pageup", action: "request.pageUp" },
+  { context: "mcpInput", keys: "pagedown", action: "request.pageDown" },
+  { context: "mcpInput", keys: "wheelup", action: "request.scrollUp" },
+  { context: "mcpInput", keys: "wheeldown", action: "request.scrollDown" },
+  { context: "sessionSearch", keys: "escape", action: "list.cancel" },
+  { context: "sessionSearch", keys: "enter", action: "search.finish" },
+  { context: "sessionSearch", keys: "backspace", action: "text.backspace" },
+  { context: "sessionSearch", keys: "ctrl+u", action: "text.clear" },
+  { context: "sessionSearch", keys: "up", action: "list.up" },
+  { context: "sessionSearch", keys: "down", action: "list.down" },
+  { context: "sessionSearch", keys: "pageup", action: "list.pageUp" },
+  { context: "sessionSearch", keys: "pagedown", action: "list.pageDown" },
+  { context: "sessionRename", keys: "escape", action: "list.cancel" },
+  { context: "sessionRename", keys: "enter", action: "session.rename.accept" },
+  { context: "sessionRename", keys: "backspace", action: "text.backspace" },
+  { context: "sessionRename", keys: "ctrl+u", action: "text.clear" },
+  { context: "sessionDelete", keys: "y", action: "session.delete.accept" },
+  { context: "sessionDelete", keys: "n", action: "session.delete.cancel" },
+  { context: "sessionDelete", keys: "escape", action: "session.delete.cancel" }
+];
+function createMaybeCodeKeymap(options = {}) {
+  const leader = options.leader ?? "ctrl+g";
+  const sequence = parseKeySequence(leader);
+  if (sequence.length !== 1 || !sequence[0].ctrl && !sequence[0].alt && !sequence[0].meta) {
+    throw new Error("MaybeCode leader must be one modified key, for example ctrl+g");
+  }
+  const leaderKey = formatKeySequence(sequence);
+  if (mergeKeyBindings(DEFAULT_EDITOR_KEYBINDINGS, MAYBECODE_EDITOR_KEYBINDINGS).some(
+    (binding) => formatKeySequence(parseKeySequence(binding.keys)) === leaderKey
+  )) {
+    throw new Error("MaybeCode leader conflicts with a text editing shortcut");
+  }
+  return new Keymap(mergeKeyBindings(MAYBECODE_DEFAULT_KEYBINDINGS, options.bindings, { leader }), {
+    actions: MAYBECODE_KEY_ACTIONS,
+    leader,
+    chordTimeoutMs: null
+  });
+}
+__name(createMaybeCodeKeymap, "createMaybeCodeKeymap");
+
 // apps/maybecode/src/ui/theme.ts
 var MAYBECODE_DARK_THEME = {
   ...DEFAULT_DARK_THEME,
@@ -134,8 +249,8 @@ var MaybeCodeUiActionRegistry = class {
   }
 };
 
-// apps/maybecode/src/ui/prototype-view.ts
-var MaybeCodePrototypeView = class {
+// apps/maybecode/src/ui/terminal-view.ts
+var MaybeCodeTerminalView = class {
   constructor(options) {
     this.options = options;
     this.keymap = createMaybeCodeKeymap(options.keymap);
@@ -148,7 +263,7 @@ var MaybeCodePrototypeView = class {
       assistantLabel: "MaybeCode",
       selectedToolDetailsHint: "Enter details",
       toolDetailsHint: `${this.shortcutHint("app.tools.toggle")} all`,
-      ...options.toolRenderers === void 0 ? {} : { toolRenderers: options.toolRenderers }
+      ...omitUndefined({ toolRenderers: options.toolRenderers })
     });
     this.transcript = new ScrollView(this.transcriptView, {
       followEnd: true,
@@ -197,7 +312,7 @@ var MaybeCodePrototypeView = class {
   }
   options;
   static {
-    __name(this, "MaybeCodePrototypeView");
+    __name(this, "MaybeCodeTerminalView");
   }
   focus = new FocusManager();
   keymap;
@@ -236,7 +351,8 @@ var MaybeCodePrototypeView = class {
     handlePointer: /* @__PURE__ */ __name((event) => {
       if (event.type === "down") {
         if (event.button !== 0) return false;
-        if (event.x < 1 || event.x >= this.editorSize.width - 1 || event.y < 1 || event.y >= this.editorSize.height - 1) return false;
+        if (event.x < 1 || event.x >= this.editorSize.width - 1 || event.y < 1 || event.y >= this.editorSize.height - 1)
+          return false;
         this.resetInputContext();
         this.focus.focus("editor");
         this.transcriptView.clearSelection();
@@ -296,7 +412,7 @@ var MaybeCodePrototypeView = class {
   editorOptions() {
     return {
       keybindings: MAYBECODE_EDITOR_KEYBINDINGS,
-      ...this.options.clipboard === void 0 ? {} : { clipboard: this.options.clipboard },
+      ...omitUndefined({ clipboard: this.options.clipboard }),
       onInvalidate: /* @__PURE__ */ __name(() => this.options.onInvalidate?.(), "onInvalidate"),
       onError: /* @__PURE__ */ __name((error) => this.setStatus(`Error: ${error instanceof Error ? error.message : String(error)}`), "onError")
     };
@@ -337,29 +453,30 @@ var MaybeCodePrototypeView = class {
     return new Promise((resolve) => {
       let settled = false;
       const abort = /* @__PURE__ */ __name(() => pending.finish(), "abort");
-      const pending = { prompt, finish: /* @__PURE__ */ __name((value) => {
-        if (settled) return;
-        settled = true;
-        signal.removeEventListener("abort", abort);
-        const index = this.mcpQuestions.indexOf(pending);
-        if (index >= 0) this.mcpQuestions.splice(index, 1);
-        if (index === 0 && this.dialogKind === "mcp") {
-          this.dialog = void 0;
-          this.dialogKind = void 0;
-          this.openCurrentApproval();
-        }
-        resolve(value);
-        this.options.onInvalidate?.();
-      }, "finish") };
+      const pending = {
+        prompt,
+        finish: /* @__PURE__ */ __name((value) => {
+          if (settled) return;
+          settled = true;
+          signal.removeEventListener("abort", abort);
+          const index = this.mcpQuestions.indexOf(pending);
+          if (index >= 0) this.mcpQuestions.splice(index, 1);
+          if (index === 0 && this.dialogKind === "mcp") {
+            this.dialog = void 0;
+            this.dialogKind = void 0;
+            this.openCurrentApproval();
+          }
+          resolve(value);
+          this.options.onInvalidate?.();
+        }, "finish")
+      };
       this.mcpQuestions.push(pending);
       signal.addEventListener("abort", abort, { once: true });
       this.openCurrentApproval();
     });
   }
   dismissApproval(requestId) {
-    const index = this.approvalQueue.findIndex(
-      (item) => item.request.id === requestId
-    );
+    const index = this.approvalQueue.findIndex((item) => item.request.id === requestId);
     if (index < 0) return false;
     const [approval] = this.approvalQueue.splice(index, 1);
     approval?.resolve(void 0);
@@ -377,15 +494,22 @@ var MaybeCodePrototypeView = class {
     }
     return new Promise((resolve) => {
       this.resolveSessionDialog = resolve;
-      const prompt = new SessionPrompt(sessions, currentSessionId, this.theme, (action) => {
-        this.dialog = void 0;
-        this.dialogKind = void 0;
-        const complete = this.resolveSessionDialog;
-        this.resolveSessionDialog = void 0;
-        complete?.(action);
-        this.openCurrentApproval();
-        this.options.onInvalidate?.();
-      }, this.editorOptions(), this.options.keymap);
+      const prompt = new SessionPrompt(
+        sessions,
+        currentSessionId,
+        this.theme,
+        (action) => {
+          this.dialog = void 0;
+          this.dialogKind = void 0;
+          const complete = this.resolveSessionDialog;
+          this.resolveSessionDialog = void 0;
+          complete?.(action);
+          this.openCurrentApproval();
+          this.options.onInvalidate?.();
+        },
+        this.editorOptions(),
+        this.options.keymap
+      );
       this.dialog = new Dialog(this.baseView, prompt, {
         open: true,
         title: "Sessions",
@@ -441,15 +565,20 @@ var MaybeCodePrototypeView = class {
     }
     return new Promise((resolve) => {
       this.resolveEffortDialog = resolve;
-      const prompt = new EffortPrompt(state, this.theme, (effort) => {
-        this.dialog = void 0;
-        this.dialogKind = void 0;
-        const complete = this.resolveEffortDialog;
-        this.resolveEffortDialog = void 0;
-        complete?.(effort);
-        this.openCurrentApproval();
-        this.options.onInvalidate?.();
-      }, this.options.keymap);
+      const prompt = new EffortPrompt(
+        state,
+        this.theme,
+        (effort) => {
+          this.dialog = void 0;
+          this.dialogKind = void 0;
+          const complete = this.resolveEffortDialog;
+          this.resolveEffortDialog = void 0;
+          complete?.(effort);
+          this.openCurrentApproval();
+          this.options.onInvalidate?.();
+        },
+        this.options.keymap
+      );
       this.dialog = new Dialog(this.baseView, prompt, {
         open: true,
         title: "Reasoning effort",
@@ -479,8 +608,20 @@ var MaybeCodePrototypeView = class {
     if (this.dialog) return Promise.reject(new Error("Another dialog is already open"));
     return new Promise((resolve) => {
       this.resolveVersionDialog = resolve;
-      const picker = new SessionForkPicker(points, { currentSessionId, theme: this.theme, onComplete: /* @__PURE__ */ __name((selection) => this.completeVersionDialog(selection), "onComplete") });
-      this.dialog = new Dialog(this.baseView, picker, { open: true, title: "Session \u5206\u652F", width: 100, height: 25, dismissOnEscape: false, borderStyle: this.theme.borderAccent, titleStyle: this.theme.accent });
+      const picker = new SessionForkPicker(points, {
+        currentSessionId,
+        theme: this.theme,
+        onComplete: /* @__PURE__ */ __name((selection) => this.completeVersionDialog(selection), "onComplete")
+      });
+      this.dialog = new Dialog(this.baseView, picker, {
+        open: true,
+        title: "Session \u5206\u652F",
+        width: 100,
+        height: 25,
+        dismissOnEscape: false,
+        borderStyle: this.theme.borderAccent,
+        titleStyle: this.theme.accent
+      });
       this.dialogKind = "fork";
       this.synchronizeDialog();
       this.options.onInvalidate?.();
@@ -490,8 +631,21 @@ var MaybeCodePrototypeView = class {
     if (this.dialog) return Promise.reject(new Error("Another dialog is already open"));
     return new Promise((resolve) => {
       this.resolveVersionDialog = () => resolve();
-      const viewer = new WorkspaceDiffViewer(diff, { theme: this.theme, onClose: /* @__PURE__ */ __name(() => this.completeVersionDialog(), "onClose"), ...operations, onInvalidate: /* @__PURE__ */ __name(() => this.options.onInvalidate?.(), "onInvalidate") });
-      this.dialog = new Dialog(this.baseView, viewer, { open: true, title: "\u6587\u4EF6\u53D8\u5316", width: 110, height: 30, dismissOnEscape: false, borderStyle: this.theme.borderAccent, titleStyle: this.theme.accent });
+      const viewer = new WorkspaceDiffViewer(diff, {
+        theme: this.theme,
+        onClose: /* @__PURE__ */ __name(() => this.completeVersionDialog(), "onClose"),
+        ...operations,
+        onInvalidate: /* @__PURE__ */ __name(() => this.options.onInvalidate?.(), "onInvalidate")
+      });
+      this.dialog = new Dialog(this.baseView, viewer, {
+        open: true,
+        title: "\u6587\u4EF6\u53D8\u5316",
+        width: 110,
+        height: 30,
+        dismissOnEscape: false,
+        borderStyle: this.theme.borderAccent,
+        titleStyle: this.theme.accent
+      });
       this.dialogKind = "changes";
       this.synchronizeDialog();
       this.options.onInvalidate?.();
@@ -543,21 +697,19 @@ var MaybeCodePrototypeView = class {
     this.layout.setItems([
       {
         height: 3,
-        component: new HeaderView(
-          this.workspace,
-          this.model,
-          this.theme
-        )
+        component: new HeaderView(this.workspace, this.model, this.theme)
       },
       { flex: 1, minHeight: 1, component: this.transcriptRegion },
-      ...suggestionHeight === 0 ? [] : [{
-        height: suggestionHeight,
-        component: new Panel(this.suggestionList, {
-          title: " Commands ",
-          borderStyle: this.theme.border,
-          titleStyle: this.theme.accent
-        })
-      }],
+      ...suggestionHeight === 0 ? [] : [
+        {
+          height: suggestionHeight,
+          component: new Panel(this.suggestionList, {
+            title: " Commands ",
+            borderStyle: this.theme.border,
+            titleStyle: this.theme.accent
+          })
+        }
+      ],
       {
         height: 4,
         component: this.editorRegion
@@ -591,7 +743,10 @@ var MaybeCodePrototypeView = class {
       this.clearShortcutHint();
       return true;
     }
-    const shortcut = this.keymap.resolve(stroke, this.transcriptView.hasSelection ? ["global", "transcript.selection"] : ["global"]);
+    const shortcut = this.keymap.resolve(
+      stroke,
+      this.transcriptView.hasSelection ? ["global", "transcript.selection"] : ["global"]
+    );
     if (shortcut.type === "pending") {
       this.statusBeforeShortcut ??= this.status;
       this.status = `Shortcut: ${shortcut.completions.join(" / ")}`;
@@ -686,7 +841,8 @@ var MaybeCodePrototypeView = class {
     const previous = this.submissionTail;
     const pending = (previous ? previous.then(submit) : Promise.resolve(submit())).then(
       (status) => {
-        if (epoch === this.submissionEpoch) this.setStatus(status ?? (this.options.isRunning?.() ? "Running" : "Ready"));
+        if (epoch === this.submissionEpoch)
+          this.setStatus(status ?? (this.options.isRunning?.() ? "Running" : "Ready"));
       },
       (error) => {
         if (this.disposed || epoch !== this.submissionEpoch) return;
@@ -730,11 +886,13 @@ var MaybeCodePrototypeView = class {
       (suggestions) => {
         if (version !== this.suggestionVersion || value !== this.editor.value) return;
         this.suggestions = suggestions;
-        this.suggestionList.setItems(suggestions.map((suggestion) => ({
-          value: suggestion,
-          label: suggestion.label,
-          ...suggestion.description === void 0 ? {} : { description: suggestion.description }
-        })));
+        this.suggestionList.setItems(
+          suggestions.map((suggestion) => ({
+            value: suggestion,
+            label: suggestion.label,
+            ...suggestion.description === void 0 ? {} : { description: suggestion.description }
+          }))
+        );
         this.suggestionsVisible = suggestions.length > 0;
         this.options.onInvalidate?.();
       },
@@ -772,29 +930,38 @@ var MaybeCodePrototypeView = class {
       this.dialog = void 0;
       const question = this.mcpQuestions[0];
       if (question !== void 0) {
-        this.dialog = new Dialog(this.baseView, new McpInputPrompt(question.prompt, question.finish, this.editorOptions(), this.options.keymap), {
-          open: true,
-          title: "MCP user interaction \u2014 untrusted server",
-          width: 92,
-          height: 24,
-          dismissOnEscape: false,
-          borderStyle: this.theme.warning,
-          titleStyle: this.theme.warning
-        });
+        this.dialog = new Dialog(
+          this.baseView,
+          new McpInputPrompt(question.prompt, question.finish, this.editorOptions(), this.options.keymap),
+          {
+            open: true,
+            title: "MCP user interaction \u2014 untrusted server",
+            width: 92,
+            height: 24,
+            dismissOnEscape: false,
+            borderStyle: this.theme.warning,
+            titleStyle: this.theme.warning
+          }
+        );
         this.dialogKind = "mcp";
         this.synchronizeDialog();
         this.options.onInvalidate?.();
       }
       return;
     }
-    const prompt = new ApprovalPrompt(pending.request, this.theme, (decision) => {
-      const current = this.approvalQueue.shift();
-      this.dialog = void 0;
-      this.dialogKind = void 0;
-      current?.resolve(decision);
-      this.openCurrentApproval();
-      this.options.onInvalidate?.();
-    }, this.options.keymap);
+    const prompt = new ApprovalPrompt(
+      pending.request,
+      this.theme,
+      (decision) => {
+        const current = this.approvalQueue.shift();
+        this.dialog = void 0;
+        this.dialogKind = void 0;
+        current?.resolve(decision);
+        this.openCurrentApproval();
+        this.options.onInvalidate?.();
+      },
+      this.options.keymap
+    );
     this.dialog = new Dialog(this.baseView, prompt, {
       open: true,
       title: `Approval: ${sanitizeTerminalText(pending.request.tool.name)}`,
@@ -818,10 +985,7 @@ var MaybeCodePrototypeView = class {
       this.transcript.detachFromEnd();
       return;
     }
-    this.transcript.preserveAnchor(
-      anchor,
-      () => this.transcriptView.selectedToolAnchor
-    );
+    this.transcript.preserveAnchor(anchor, () => this.transcriptView.selectedToolAnchor);
   }
   executeUiAction(id) {
     const status = this.uiActions.execute(id);
@@ -842,22 +1006,23 @@ var ModelPrompt = class {
   constructor(models, currentProfile, theme, complete, keymapOptions = {}) {
     this.complete = complete;
     this.keymap = createMaybeCodeKeymap(keymapOptions);
-    const currentIndex = models.findIndex(
-      (model) => model.name === currentProfile
+    const currentIndex = models.findIndex((model) => model.name === currentProfile);
+    this.list = new SelectList(
+      models.map((model) => ({
+        value: model,
+        label: `${model.name === currentProfile ? "* " : ""}${model.name}${model.isDefault ? " [default]" : ""}`,
+        description: `${model.provider}/${model.model} \xB7 ${model.adapter}`
+      })),
+      {
+        onSelect: /* @__PURE__ */ __name((item) => this.complete({ type: "switch", profile: item.value.name }), "onSelect"),
+        onCancel: /* @__PURE__ */ __name(() => this.complete(void 0), "onCancel"),
+        selectedIndex: Math.max(0, currentIndex),
+        selectedStyle: theme.selected,
+        descriptionStyle: theme.muted,
+        markerStyle: theme.accent,
+        emptyLabel: "No model profiles configured"
+      }
     );
-    this.list = new SelectList(models.map((model) => ({
-      value: model,
-      label: `${model.name === currentProfile ? "* " : ""}${model.name}${model.isDefault ? " [default]" : ""}`,
-      description: `${model.provider}/${model.model} \xB7 ${model.adapter}`
-    })), {
-      onSelect: /* @__PURE__ */ __name((item) => this.complete({ type: "switch", profile: item.value.name }), "onSelect"),
-      onCancel: /* @__PURE__ */ __name(() => this.complete(void 0), "onCancel"),
-      selectedIndex: Math.max(0, currentIndex),
-      selectedStyle: theme.selected,
-      descriptionStyle: theme.muted,
-      markerStyle: theme.accent,
-      emptyLabel: "No model profiles configured"
-    });
     this.list.setFocused(true);
   }
   complete;
@@ -872,7 +1037,9 @@ var ModelPrompt = class {
       { flex: 1, minHeight: 1, component: this.list },
       {
         height: 1,
-        component: new Text(`${promptShortcut(this.keymap, "list.accept", "select")} select \xB7 ${promptShortcut(this.keymap, "model.default.set", "modelPicker")} set default \xB7 ${promptShortcut(this.keymap, "list.cancel", "select")} close`)
+        component: new Text(
+          `${promptShortcut(this.keymap, "list.accept", "select")} select \xB7 ${promptShortcut(this.keymap, "model.default.set", "modelPicker")} set default \xB7 ${promptShortcut(this.keymap, "list.cancel", "select")} close`
+        )
       }
     ]);
     return this.layout.render(size);
@@ -898,18 +1065,21 @@ var EffortPrompt = class {
     this.keymap = createMaybeCodeKeymap(keymapOptions);
     const efforts = ["default", ...state.efforts];
     const currentIndex = state.overridden ? efforts.indexOf(state.effectiveEffort ?? "") : 0;
-    this.list = new SelectList(efforts.map((effort) => ({
-      value: effort,
-      label: `${effort === efforts[currentIndex] ? "* " : ""}${effort}`,
-      description: effort === "default" ? `Clear override \xB7 default ${state.defaultEffort ?? "is provider-defined"}` : `Capability source: ${state.source}`
-    })), {
-      onSelect: /* @__PURE__ */ __name((item) => this.complete(item.value), "onSelect"),
-      onCancel: /* @__PURE__ */ __name(() => this.complete(void 0), "onCancel"),
-      selectedIndex: Math.max(0, currentIndex),
-      selectedStyle: theme.selected,
-      descriptionStyle: theme.muted,
-      markerStyle: theme.accent
-    });
+    this.list = new SelectList(
+      efforts.map((effort) => ({
+        value: effort,
+        label: `${effort === efforts[currentIndex] ? "* " : ""}${effort}`,
+        description: effort === "default" ? `Clear override \xB7 default ${state.defaultEffort ?? "is provider-defined"}` : `Capability source: ${state.source}`
+      })),
+      {
+        onSelect: /* @__PURE__ */ __name((item) => this.complete(item.value), "onSelect"),
+        onCancel: /* @__PURE__ */ __name(() => this.complete(void 0), "onCancel"),
+        selectedIndex: Math.max(0, currentIndex),
+        selectedStyle: theme.selected,
+        descriptionStyle: theme.muted,
+        markerStyle: theme.accent
+      }
+    );
     this.list.setFocused(true);
   }
   complete;
@@ -922,7 +1092,12 @@ var EffortPrompt = class {
   render(size) {
     this.layout.setItems([
       { flex: 1, minHeight: 1, component: this.list },
-      { height: 1, component: new Text(`${promptShortcut(this.keymap, "list.accept", "select")} select \xB7 ${promptShortcut(this.keymap, "list.cancel", "select")} close`) }
+      {
+        height: 1,
+        component: new Text(
+          `${promptShortcut(this.keymap, "list.accept", "select")} select \xB7 ${promptShortcut(this.keymap, "list.cancel", "select")} close`
+        )
+      }
     ]);
     return this.layout.render(size);
   }
@@ -940,22 +1115,31 @@ var ApprovalPrompt = class {
     this.theme = theme;
     this.decide = decide;
     this.keymap = createMaybeCodeKeymap(keymapOptions);
-    this.choices = new SelectList([
-      { value: "allow", label: "Allow once", description: promptShortcut(this.keymap, "approval.allow", "approval") },
-      ...request.grantKey === void 0 ? [] : [{
-        value: "allow-session",
-        label: "Allow matching calls for this session",
-        description: promptShortcut(this.keymap, "approval.allowSession", "approval")
-      }],
-      { value: "deny", label: "Deny", description: `${promptShortcut(this.keymap, "approval.deny", "approval")} / ${promptShortcut(this.keymap, "list.cancel", "select")}` },
-      ...request.persistent ? [{ value: "allow-persistent", label: "\u4FDD\u5B58\u5141\u8BB8\u89C4\u5219", description: request.persistent.description }] : []
-    ], {
-      onSelect: /* @__PURE__ */ __name((item) => this.decide(item.value), "onSelect"),
-      onCancel: /* @__PURE__ */ __name(() => this.decide("deny"), "onCancel"),
-      selectedStyle: this.theme.selected,
-      descriptionStyle: this.theme.muted,
-      markerStyle: this.theme.accent
-    });
+    this.choices = new SelectList(
+      [
+        { value: "allow", label: "Allow once", description: promptShortcut(this.keymap, "approval.allow", "approval") },
+        ...request.grantKey === void 0 ? [] : [
+          {
+            value: "allow-session",
+            label: "Allow matching calls for this session",
+            description: promptShortcut(this.keymap, "approval.allowSession", "approval")
+          }
+        ],
+        {
+          value: "deny",
+          label: "Deny",
+          description: `${promptShortcut(this.keymap, "approval.deny", "approval")} / ${promptShortcut(this.keymap, "list.cancel", "select")}`
+        },
+        ...request.persistent ? [{ value: "allow-persistent", label: "\u4FDD\u5B58\u5141\u8BB8\u89C4\u5219", description: request.persistent.description }] : []
+      ],
+      {
+        onSelect: /* @__PURE__ */ __name((item) => this.decide(item.value), "onSelect"),
+        onCancel: /* @__PURE__ */ __name(() => this.decide("deny"), "onCancel"),
+        selectedStyle: this.theme.selected,
+        descriptionStyle: this.theme.muted,
+        markerStyle: this.theme.accent
+      }
+    );
     this.choices.setFocused(true);
   }
   request;
@@ -972,9 +1156,7 @@ var ApprovalPrompt = class {
     this.layout.setItems([
       {
         height: 1,
-        component: new Text(
-          `Tool: ${sanitizeTerminalText(this.request.tool.name)}`
-        )
+        component: new Text(`Tool: ${sanitizeTerminalText(this.request.tool.name)}`)
       },
       { flex: 1, minHeight: 1, component: new Text(input) },
       {
@@ -1142,11 +1324,13 @@ ${promptShortcut(this.keymap, "list.accept", "select")} resume \xB7 ${promptShor
     const filtered = query === "" ? this.sessions : this.sessions.filter(
       (session) => [session.id, session.title, session.preview].filter((value) => value !== void 0).some((value) => value.toLowerCase().includes(query))
     );
-    this.list.setItems(filtered.map((session) => ({
-      value: session,
-      label: `${session.id === this.currentSessionId ? "* " : ""}${session.title ?? session.id}`,
-      description: session.preview ?? (session.turnCount === void 0 ? "No recorded turns" : `${session.turnCount} turns`)
-    })));
+    this.list.setItems(
+      filtered.map((session) => ({
+        value: session,
+        label: `${session.id === this.currentSessionId ? "* " : ""}${session.title ?? session.id}`,
+        description: session.preview ?? (session.turnCount === void 0 ? "No recorded turns" : `${session.turnCount} turns`)
+      }))
+    );
     this.status = filtered.length === 0 ? "No matching sessions" : this.status;
   }
   resumeSelected() {
@@ -1305,7 +1489,12 @@ var McpInputPrompt = class {
     this.layout.setItems([
       { flex: 1, minHeight: 1, component: this.body },
       { height: 4, component: this.editor },
-      { height: 1, component: new Text(`${promptShortcut(this.keymap, "request.pageUp", "mcpInput")}/${promptShortcut(this.keymap, "request.pageDown", "mcpInput")} review request | Enter continue | ${promptShortcut(this.keymap, "request.cancel", "mcpInput")} cancel`) }
+      {
+        height: 1,
+        component: new Text(
+          `${promptShortcut(this.keymap, "request.pageUp", "mcpInput")}/${promptShortcut(this.keymap, "request.pageDown", "mcpInput")} review request | Enter continue | ${promptShortcut(this.keymap, "request.cancel", "mcpInput")} cancel`
+        )
+      }
     ]);
     return this.layout.render(size);
   }
@@ -1346,21 +1535,256 @@ function promptShortcut(keymap, action, context) {
 }
 __name(promptShortcut, "promptShortcut");
 
+// apps/maybecode/src/mcp-interaction-ui.ts
+async function presentMcpInteraction(request, app, ask, signal) {
+  if (app.respondMcpInteraction === void 0) return;
+  const header = sanitizeTerminalText(
+    `MCP server: ${request.serverId}
+Session: ${request.owner.sessionId}
+Request: ${request.requestId}
+${request.params.message}
+`
+  );
+  const question = /* @__PURE__ */ __name(async (prompt) => {
+    signal.throwIfAborted();
+    const answer = await ask(sanitizeTerminalText(prompt), signal);
+    signal.throwIfAborted();
+    return answer;
+  }, "question");
+  let error = "";
+  while (!signal.aborted) {
+    if (request.params.mode === "review") {
+      let data = request.params.data;
+      let edited = false;
+      for (; ; ) {
+        const choice = (await question(
+          `${header}
+Host review: ${request.params.kind}
+${JSON.stringify(data, null, 2)}
+${error}Type allow to approve${request.params.editable ? ", edit to change the JSON" : ""}, decline, or cancel: `
+        ))?.trim().toLowerCase();
+        if (choice === "edit" && request.params.editable) {
+          try {
+            const input = await question(
+              `${header}
+Enter the replacement JSON document (reviewed again before sending), or cancel: `
+            );
+            if (input === void 0 || input.trim() === "cancel") {
+              app.respondMcpInteraction(request.id, { action: "cancel" });
+              return;
+            }
+            if (Buffer.byteLength(input) > 48 * 1024) throw new Error();
+            data = JSON.parse(input);
+            edited = true;
+            error = "";
+          } catch {
+            error = "Invalid JSON or document too large.\n";
+          }
+          continue;
+        }
+        app.respondMcpInteraction(request.id, {
+          action: choice === "allow" ? "accept" : choice === "decline" ? "decline" : "cancel",
+          ...choice !== "allow" || !edited ? {} : { content: { json: JSON.stringify(data) } }
+        });
+        return;
+      }
+    }
+    if (request.params.mode === "url") {
+      let url;
+      try {
+        url = new URL(request.params.url);
+        if (!["https:", "http:"].includes(url.protocol) || url.username || url.password) throw new Error("Unsafe URL");
+      } catch {
+        app.respondMcpInteraction(request.id, { action: "decline" });
+        return;
+      }
+      const consent = await question(
+        `${header}
+External host: ${url.host}
+URL: ${request.params.url}
+This is an untrusted external website, not MCP client login. Nothing opens automatically.
+Type accept to consent, decline to refuse, or cancel to dismiss: `
+      );
+      if (consent?.trim().toLowerCase() !== "accept") {
+        app.respondMcpInteraction(request.id, {
+          action: consent?.trim().toLowerCase() === "decline" ? "decline" : "cancel"
+        });
+        return;
+      }
+      const resume = await question(
+        `${header}
+Open the displayed URL yourself if you wish.
+After interacting with the website, type retry to resume the original request, or cancel: `
+      );
+      app.respondMcpInteraction(request.id, { action: resume?.trim().toLowerCase() === "retry" ? "accept" : "cancel" });
+      return;
+    }
+    const answer = await question(
+      `${header}
+Never enter passwords, API keys, tokens or payment credentials.
+Requested form (untrusted):
+${JSON.stringify(request.params.requestedSchema, null, 2)}
+${error}Enter a JSON object, decline, or cancel: `
+    );
+    if (answer === void 0 || ["decline", "cancel"].includes(answer.trim().toLowerCase())) {
+      app.respondMcpInteraction(request.id, {
+        action: answer?.trim().toLowerCase() === "decline" ? "decline" : "cancel"
+      });
+      return;
+    }
+    let content;
+    try {
+      if (Buffer.byteLength(answer) > 64 * 1024) throw new Error();
+      const parsed = JSON.parse(answer);
+      if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error();
+      content = parsed;
+    } catch {
+      error = "Invalid JSON object or response too large.\n";
+      continue;
+    }
+    const review = await question(
+      `${header}
+Review what will be sent ONLY to this server:
+${JSON.stringify(content, null, 2)}
+Type send to submit, edit to replace, decline, or cancel: `
+    );
+    const action = review?.trim().toLowerCase();
+    if (action === "edit") continue;
+    if (action !== "send") {
+      app.respondMcpInteraction(request.id, { action: action === "decline" ? "decline" : "cancel" });
+      return;
+    }
+    try {
+      app.respondMcpInteraction(request.id, { action: "accept", content });
+      return;
+    } catch {
+      error = "The response does not satisfy the form; please correct it.\n";
+    }
+  }
+}
+__name(presentMcpInteraction, "presentMcpInteraction");
+
+// apps/maybecode/src/terminal-web.ts
+import { randomBytes } from "node:crypto";
+import open from "open";
+import { AsyncEventQueue, isStreamingMayEvent } from "@sortedyuan/may/core";
+function eventQueue() {
+  return new AsyncEventQueue({
+    maxBufferedValues: 1024,
+    isDroppable: /* @__PURE__ */ __name((event) => event.type === "mcp.resource.updated" || event.type === "run.event" && isStreamingMayEvent(event.event), "isDroppable")
+  });
+}
+__name(eventQueue, "eventQueue");
+var MaybeCodeTerminalWeb = class {
+  constructor(app, exit) {
+    this.app = app;
+    this.exit = exit;
+    this.host = createMaybeCodeWebHost(app, { events: this.webEvents, closeApplication: false, terminal: true });
+    this.events = this.readTerminalEvents();
+    this.relay = this.forwardEvents().catch((error) => {
+      this.failure = error;
+    });
+  }
+  app;
+  exit;
+  static {
+    __name(this, "MaybeCodeTerminalWeb");
+  }
+  terminalEvents = eventQueue();
+  webEvents = eventQueue();
+  host;
+  relay;
+  failure;
+  starting;
+  closing;
+  events;
+  async forwardEvents() {
+    try {
+      for await (const event of this.app.events) {
+        this.terminalEvents.push(event);
+        this.webEvents.push(event);
+      }
+    } catch (error) {
+      this.failure = error;
+      throw error;
+    } finally {
+      this.terminalEvents.close();
+      this.webEvents.close();
+    }
+  }
+  async *readTerminalEvents() {
+    for await (const event of this.terminalEvents) yield event;
+    if (this.failure !== void 0) throw this.failure;
+  }
+  async open() {
+    const server = await this.startServer();
+    const url = server.createLoginUrl();
+    try {
+      await open(url);
+    } catch {
+      throw new Error("\u65E0\u6CD5\u6253\u5F00\u9ED8\u8BA4\u6D4F\u89C8\u5668\uFF0C\u8BF7\u68C0\u67E5\u7CFB\u7EDF\u6D4F\u89C8\u5668\u8BBE\u7F6E\u540E\u91CD\u65B0\u6267\u884C /web\u3002");
+    }
+    return server.url;
+  }
+  async startServer() {
+    if (this.closing) throw new Error("MaybeCode \u6B63\u5728\u5173\u95ED\u3002");
+    this.starting ??= startMaybeCodeWebServer(this.host, {
+      token: randomBytes(32).toString("base64url"),
+      port: 0,
+      browserLogin: true,
+      exit: /* @__PURE__ */ __name(() => {
+        if (this.exit) this.exit();
+        else this.beginClose();
+      }, "exit")
+    });
+    const server = await this.starting;
+    if (this.closing) throw new Error("MaybeCode \u6B63\u5728\u5173\u95ED\u3002");
+    return server;
+  }
+  close() {
+    this.beginClose();
+    return this.closing.then(() => {
+      if (this.failure !== void 0) throw this.failure;
+    });
+  }
+  beginClose() {
+    this.closing ??= this.closeOwnedResources().catch((error) => {
+      this.failure = error;
+    });
+  }
+  async closeOwnedResources() {
+    const results = await Promise.allSettled([
+      this.app.close(),
+      this.starting ? this.starting.then((server) => server.close()) : this.host.close()
+    ]);
+    await this.relay;
+    const failures = results.flatMap((result) => result.status === "rejected" ? [result.reason] : []);
+    if (this.failure !== void 0) failures.push(this.failure);
+    if (failures.length) throw new AggregateError(failures, "\u5173\u95ED MaybeCode \u65F6\u53D1\u751F\u9519\u8BEF\u3002");
+  }
+};
+
 // apps/maybecode/src/ui/retained-tui.ts
 async function runRetainedTerminalUI(app, options = {}) {
   const terminal = options.terminal ?? new NodeTerminalDriver();
   const renderer = options.renderer ?? new FullscreenRenderer(terminal);
   const store = new TranscriptStore();
   const displayedSteering = /* @__PURE__ */ new Set();
-  const images = new TerminalImages(void 0, terminal.imageSupport?.protocol, { cellSize: /* @__PURE__ */ __name(() => terminal.imageSupport?.cellSize, "cellSize") });
+  const images = new TerminalImages(void 0, terminal.imageSupport?.protocol, {
+    cellSize: /* @__PURE__ */ __name(() => terminal.imageSupport?.cellSize, "cellSize")
+  });
   try {
     const history = await app.history();
-    for (const event of history) if (event.type === "assistant.completed" || event.type === "input.submitted") await images.prepare(event.message.content);
-    for (const event of history) if (event.type === "tool.completed" && event.content) await images.prepare(event.content);
+    for (const event of history)
+      if (event.type === "assistant.completed" || event.type === "input.submitted")
+        await images.prepare(event.message.content);
+    for (const event of history)
+      if (event.type === "tool.completed" && event.content) await images.prepare(event.content);
     store.loadHistory(history);
     for (const event of history) {
       if (event.type === "input.submitted" && event.inputId) displayedSteering.add(event.inputId);
-      if (event.type === "input.steering.delivered") for (const inputId of event.inputIds) displayedSteering.add(inputId);
+      if (event.type === "input.steering.delivered")
+        for (const inputId of event.inputIds) displayedSteering.add(inputId);
     }
   } catch (error) {
     await app.close();
@@ -1371,9 +1795,12 @@ async function runRetainedTerminalUI(app, options = {}) {
   let eventFailure;
   const pendingRuns = /* @__PURE__ */ new Set();
   const observeRun = /* @__PURE__ */ __name((result) => {
-    const pending = result.then(() => void 0, (error) => {
-      if (!closing && !isCancellation(error)) store.appendNotice("error", errorMessage(error));
-    }).finally(() => {
+    const pending = result.then(
+      () => void 0,
+      (error) => {
+        if (!closing && !isCancellation(error)) store.appendNotice("error", errorMessage(error));
+      }
+    ).finally(() => {
       pendingRuns.delete(pending);
       if (!closing) view.setStatus(app.isRunning ? "Running" : "Ready");
     });
@@ -1392,13 +1819,11 @@ async function runRetainedTerminalUI(app, options = {}) {
     if (app.isRunning) app.cancel("Interrupted by process signal");
     finish();
   }, "handleProcessSignal");
-  const view = new MaybeCodePrototypeView({
+  const view = new MaybeCodeTerminalView({
     isRunning: /* @__PURE__ */ __name(() => app.isRunning, "isRunning"),
     permissionMode: /* @__PURE__ */ __name(() => app.permissionMode, "permissionMode"),
     clipboard: options.clipboard ?? createTerminalClipboard({ output: terminal }),
-    keymap: options.keymap ?? {
-      ...process.env.MAY_TUI_LEADER === void 0 ? {} : { leader: process.env.MAY_TUI_LEADER }
-    },
+    keymap: options.keymap ?? omitUndefined2({ leader: process.env.MAY_TUI_LEADER }),
     images,
     store,
     workspace: app.workspace,
@@ -1430,7 +1855,7 @@ async function runRetainedTerminalUI(app, options = {}) {
   });
   process.on("SIGINT", handleProcessSignal);
   process.on("SIGTERM", handleProcessSignal);
-  void refreshModelLabel(view, app);
+  await refreshModelLabel(view, app);
   const refreshWorkspace = /* @__PURE__ */ __name(async () => {
     if (!app.getWorkspaceGit || closing) return;
     try {
@@ -1441,10 +1866,14 @@ async function runRetainedTerminalUI(app, options = {}) {
   }, "refreshWorkspace");
   await refreshWorkspace();
   let refreshingWorkspace = false;
+  let workspaceTask;
   const workspaceTimer = app.getWorkspaceGit ? setInterval(() => {
     if (refreshingWorkspace || closing) return;
     refreshingWorkspace = true;
-    void refreshWorkspace().finally(() => {
+    workspaceTask = refreshWorkspace().catch((error) => {
+      eventFailure = error;
+      finish();
+    }).finally(() => {
       refreshingWorkspace = false;
     });
   }, 2e3) : void 0;
@@ -1452,11 +1881,13 @@ async function runRetainedTerminalUI(app, options = {}) {
   let eventTask;
   try {
     runtime.start();
-    eventTask = consumeEvents(app, store, view, () => closing, web.events, images, displayedSteering).catch((error) => {
-      eventFailure = error;
-      store.appendNotice("error", `Event stream failed: ${errorMessage(error)}`);
-      finish();
-    });
+    eventTask = consumeEvents(app, store, view, () => closing, web.events, images, displayedSteering, finish).catch(
+      (error) => {
+        eventFailure = error;
+        store.appendNotice("error", `Event stream failed: ${errorMessage(error)}`);
+        finish();
+      }
+    );
     await exited;
   } finally {
     closing = true;
@@ -1465,138 +1896,197 @@ async function runRetainedTerminalUI(app, options = {}) {
     process.removeListener("SIGTERM", handleProcessSignal);
     runtime.stop();
     view.dispose();
-    await web.close();
-    await Promise.all(pendingRuns);
-    await eventTask;
+    const results = await Promise.allSettled([
+      web.close(),
+      ...pendingRuns,
+      ...workspaceTask ? [workspaceTask] : [],
+      ...eventTask ? [eventTask] : []
+    ]);
+    const failures = results.flatMap((result) => result.status === "rejected" ? [result.reason] : []);
+    if (failures.length) {
+      if (eventFailure !== void 0) failures.push(eventFailure);
+      throw new AggregateError(failures, "MaybeCode terminal failed to close");
+    }
   }
   if (eventFailure !== void 0) throw eventFailure;
 }
 __name(runRetainedTerminalUI, "runRetainedTerminalUI");
-async function consumeEvents(app, store, view, isClosing, events, images, displayedSteering) {
+async function consumeEvents(app, store, view, isClosing, events, images, displayedSteering, onStopped) {
   const approvals = /* @__PURE__ */ new Set();
+  const approvalErrors = [];
+  const trackApproval = /* @__PURE__ */ __name((operation, finish) => {
+    const task = operation.catch((error) => {
+      approvalErrors.push(error);
+      onStopped();
+    }).finally(() => {
+      finish?.();
+      approvals.delete(task);
+    });
+    approvals.add(task);
+  }, "trackApproval");
   const interactions = /* @__PURE__ */ new Map();
   const delegationStatus = /* @__PURE__ */ new Map();
   let lastGoalDisplay = "";
-  for await (const event of events) {
-    if (event.type === "run.event") {
-      if (event.event.type === "run.started") {
-        view.setStatus("Running");
-        const unread = app.listSteeringInputs?.().filter((input) => input.status === "delivered" && !displayedSteering.has(input.inputId)) ?? [];
-        if (unread.length > 0) {
-          const history = await app.history();
-          const runId = event.event.runId;
-          const runIndex = history.findIndex((item) => item.type === "run.started" && item.runId === runId);
-          const submitted = runIndex < 0 ? void 0 : history.slice(0, runIndex).reverse().find((item) => item.type === "input.submitted");
-          if (submitted?.type === "input.submitted" && submitted.inputId && unread.some((input) => input.inputId === submitted.inputId)) {
-            store.appendUser(submitted.message.content.filter((part) => part.type === "text").map((part) => part.text).join(""));
-            displayedSteering.add(submitted.inputId);
+  try {
+    for await (const event of events) {
+      if (event.type === "run.event") {
+        if (event.event.type === "run.started") {
+          view.setStatus("Running");
+          const unread = app.application.agent.listSteeringInputs().filter((input) => input.status === "delivered" && !displayedSteering.has(input.inputId));
+          if (unread.length > 0) {
+            const history = await app.history();
+            const runId = event.event.runId;
+            const runIndex = history.findIndex((item) => item.type === "run.started" && item.runId === runId);
+            const submitted = runIndex < 0 ? void 0 : history.slice(0, runIndex).reverse().find((item) => item.type === "input.submitted");
+            if (submitted?.type === "input.submitted" && submitted.inputId && unread.some((input) => input.inputId === submitted.inputId)) {
+              store.appendUser(
+                submitted.message.content.filter((part) => part.type === "text").map((part) => part.text).join("")
+              );
+              displayedSteering.add(submitted.inputId);
+            }
           }
         }
-      }
-      if (event.event.type === "input.received") {
-        for (const input of app.listSteeringInputs?.() ?? []) {
-          if (input.status === "delivered" && input.runId === event.event.runId) displayedSteering.add(input.inputId);
+        if (event.event.type === "input.received") {
+          for (const input of app.application.agent.listSteeringInputs()) {
+            if (input.status === "delivered" && input.runId === event.event.runId) displayedSteering.add(input.inputId);
+          }
+        }
+        if (event.event.type === "run.completed" || event.event.type === "run.yielded" || event.event.type === "run.cancelled") {
+          view.setStatus(app.isRunning ? "Delegating" : "Ready");
         }
+        if (event.event.type === "run.failed") view.setStatus(`Error: ${event.event.error.message}`);
       }
-      if (event.event.type === "run.completed" || event.event.type === "run.yielded" || event.event.type === "run.cancelled") {
-        view.setStatus(app.isRunning ? "Delegating" : "Ready");
+      if (event.type === "permission-mode.changed") {
+        view.setStatus(event.mode === "yolo" ? "YOLO enabled" : "YOLO disabled");
       }
-      if (event.event.type === "run.failed") view.setStatus(`Error: ${event.event.error.message}`);
-    }
-    if (event.type === "permission-mode.changed") {
-      view.setStatus(event.mode === "yolo" ? "YOLO enabled" : "YOLO disabled");
-    }
-    if (event.type === "run.event" && event.event.type === "model.completed") await images.prepare(event.event.message.content);
-    if (event.type === "run.event" && event.event.type === "tool.completed") await images.prepare(event.event.content);
-    if (event.type === "goal.changed") {
-      view.setStatus(`Goal ${event.goal.status}`);
-      const display = `${event.goal.id}:${event.goal.status}:${event.goal.progress}`;
-      if (display !== lastGoalDisplay) {
-        lastGoalDisplay = display;
-        store.appendNotice("info", formatGoal(event.goal));
+      if (event.type === "run.event" && event.event.type === "model.completed")
+        await images.prepare(event.event.message.content);
+      if (event.type === "run.event" && event.event.type === "tool.completed")
+        await images.prepare(event.event.content);
+      if (event.type === "goal.changed") {
+        view.setStatus(`Goal ${event.goal.status}`);
+        const display = `${event.goal.id}:${event.goal.status}:${event.goal.progress}`;
+        if (display !== lastGoalDisplay) {
+          lastGoalDisplay = display;
+          store.appendNotice("info", formatGoal(event.goal));
+        }
       }
-    }
-    if (event.type === "delegation.started" || event.type === "delegation.finished") {
-      if (event.type === "delegation.started") delegationStatus.clear();
-      const label = event.type === "delegation.started" ? "Sub-agent request" : "Sub-agent request finished";
-      if (app.delegationNotifications === true) store.appendNotice("info", `${label}
+      if (event.type === "delegation.started" || event.type === "delegation.finished") {
+        if (event.type === "delegation.started") delegationStatus.clear();
+        const label = event.type === "delegation.started" ? "Sub-agent request" : "Sub-agent request finished";
+        if (app.delegationNotifications === true)
+          store.appendNotice("info", `${label}
 ${formatDelegationTree(event.state)}`);
-      view.setStatus(event.type === "delegation.started" ? "Delegating" : "Ready");
-    } else if (event.type === "delegation.updated") {
-      for (const task of delegationOrder(event.state.tasks)) {
-        const previous = delegationStatus.get(task.id);
-        delegationStatus.set(task.id, task.status);
-        if (app.delegationNotifications !== true || previous === task.status) continue;
-        store.appendNotice(["failed", "cancelled", "recovery-required"].includes(task.status) ? "warning" : "info", renderDelegationTask(task));
+        view.setStatus(event.type === "delegation.started" ? "Delegating" : "Ready");
+      } else if (event.type === "delegation.updated") {
+        for (const task of delegationOrder(event.state.tasks)) {
+          const previous = delegationStatus.get(task.id);
+          delegationStatus.set(task.id, task.status);
+          if (app.delegationNotifications !== true || previous === task.status) continue;
+          store.appendNotice(
+            ["failed", "cancelled", "recovery-required"].includes(task.status) ? "warning" : "info",
+            renderDelegationTask(task)
+          );
+        }
       }
-    }
-    applyMaybeCodeEvent(store, event);
-    if (event.type === "mcp.interaction.requested") {
-      const controller = new AbortController();
-      interactions.set(event.request.id, controller);
-      const signal = AbortSignal.any([controller.signal, AbortSignal.timeout(Math.max(0, Math.ceil(event.request.expiresAt - Date.now())))]);
-      const task = presentMcpInteraction(event.request, app, (prompt, signal2) => view.requestMcpInput(prompt, signal2), signal).catch(() => {
-        if (!isClosing() && !signal.aborted) {
-          store.appendNotice("warning", "MCP interaction could not be completed");
-          app.cancel("User interaction is unavailable");
+      applyMaybeCodeEvent(store, event);
+      if (event.type === "mcp.interaction.requested") {
+        const controller = new AbortController();
+        interactions.set(event.request.id, controller);
+        const signal = AbortSignal.any([
+          controller.signal,
+          AbortSignal.timeout(Math.max(0, Math.ceil(event.request.expiresAt - Date.now())))
+        ]);
+        trackApproval(
+          presentMcpInteraction(
+            event.request,
+            app,
+            (prompt, signal2) => view.requestMcpInput(prompt, signal2),
+            signal
+          ).catch(() => {
+            if (!isClosing() && !signal.aborted) {
+              store.appendNotice("warning", "MCP interaction could not be completed");
+              app.cancel("User interaction is unavailable");
+            }
+          }),
+          () => {
+            interactions.delete(event.request.id);
+          }
+        );
+      } else if (event.type === "mcp.interaction.settled") interactions.get(event.requestId)?.abort();
+      if (event.type === "model.changed") {
+        await refreshModelLabel(view, app);
+      }
+      if (event.type === "session.changed" && event.resumed) {
+        const history = await app.history();
+        for (const event2 of history)
+          if (event2.type === "assistant.completed" || event2.type === "input.submitted")
+            await images.prepare(event2.message.content);
+        for (const event2 of history)
+          if (event2.type === "tool.completed" && event2.content) await images.prepare(event2.content);
+        store.loadHistory(history);
+        displayedSteering.clear();
+        for (const event2 of history) {
+          if (event2.type === "input.submitted" && event2.inputId) displayedSteering.add(event2.inputId);
+          if (event2.type === "input.steering.delivered")
+            for (const inputId of event2.inputIds) displayedSteering.add(inputId);
         }
-      }).finally(() => interactions.delete(event.request.id));
-      approvals.add(task);
-      void task.finally(() => approvals.delete(task));
-    } else if (event.type === "mcp.interaction.settled") interactions.get(event.requestId)?.abort();
-    if (event.type === "model.changed") {
-      void refreshModelLabel(view, app);
-    }
-    if (event.type === "session.changed" && event.resumed) {
-      const history = await app.history();
-      for (const event2 of history) if (event2.type === "assistant.completed" || event2.type === "input.submitted") await images.prepare(event2.message.content);
-      for (const event2 of history) if (event2.type === "tool.completed" && event2.content) await images.prepare(event2.content);
-      store.loadHistory(history);
-      displayedSteering.clear();
-      for (const event2 of history) {
-        if (event2.type === "input.submitted" && event2.inputId) displayedSteering.add(event2.inputId);
-        if (event2.type === "input.steering.delivered") for (const inputId of event2.inputIds) displayedSteering.add(inputId);
+        store.appendNotice("info", "Session resumed");
+        continue;
       }
-      store.appendNotice("info", "Session resumed");
-      continue;
-    }
-    if (event.type === "permission.event" && event.event.type === "approval.requested") {
-      const task = presentApproval(app, view, store, event.event.request, isClosing, approvals);
-      approvals.add(task);
-      void task.finally(() => approvals.delete(task));
-    } else if (event.type === "permission.event" && (event.event.type === "approval.resolved" || event.event.type === "approval.cancelled")) {
-      view.dismissApproval(event.event.requestId);
-    }
-    if (event.type === "delegation.event" && event.event.type === "permission.event") {
-      const inner = event.event.event;
-      if (inner.type === "approval.requested") {
-        store.appendNotice("info", `\u5B50\u4EFB\u52A1 ${event.taskId} \u8BF7\u6C42\u6279\u51C6 ${inner.request.tool.name}`);
-        const task = presentApproval(app, view, store, inner.request, isClosing, approvals);
-        approvals.add(task);
-        void task.finally(() => approvals.delete(task));
-      } else if (inner.type === "approval.resolved" || inner.type === "approval.cancelled") {
-        view.dismissApproval(inner.requestId);
+      if (event.type === "permission.event" && event.event.type === "approval.requested") {
+        trackApproval(presentApproval(app, view, store, event.event.request, isClosing));
+      } else if (event.type === "permission.event" && (event.event.type === "approval.resolved" || event.event.type === "approval.cancelled")) {
+        view.dismissApproval(event.event.requestId);
+      }
+      if (event.type === "delegation.event" && event.event.type === "permission.event") {
+        const inner = event.event.event;
+        if (inner.type === "approval.requested") {
+          store.appendNotice("info", `\u5B50\u4EFB\u52A1 ${event.taskId} \u8BF7\u6C42\u6279\u51C6 ${inner.request.tool.name}`);
+          trackApproval(presentApproval(app, view, store, inner.request, isClosing));
+        } else if (inner.type === "approval.resolved" || inner.type === "approval.cancelled") {
+          view.dismissApproval(inner.requestId);
+        }
       }
     }
+  } finally {
+    onStopped();
+    for (const controller of interactions.values()) controller.abort();
+    await Promise.all(approvals);
+    if (approvalErrors.length) throw new AggregateError(approvalErrors, "MaybeCode approval operations failed");
   }
-  for (const controller of interactions.values()) controller.abort();
-  await Promise.all(approvals);
 }
 __name(consumeEvents, "consumeEvents");
-function presentApproval(app, view, store, request, isClosing, approvals) {
+function presentApproval(app, view, store, request, isClosing) {
   return view.requestApproval(request).then(async (decision) => {
     if (decision !== void 0 && !isClosing()) {
-      await app.resolveApproval(request.id, decision, decision === "allow-persistent" ? { createdBy: `local:${userInfo().username}` } : void 0);
+      await app.resolveApproval(
+        request.id,
+        decision,
+        decision === "allow-persistent" ? { createdBy: `local:${userInfo().username}` } : void 0
+      );
     }
   }).catch((error) => {
     if (!isClosing()) {
       store.appendNotice("error", `Approval failed: ${errorMessage(error)}`);
+    } else if (!isCancellation(error)) {
+      throw error;
     }
   });
 }
 __name(presentApproval, "presentApproval");
 function applyMaybeCodeEvent(store, event) {
   switch (event.type) {
+    case "delegation.finished":
+    case "delegation.started":
+    case "delegation.updated":
+    case "goal.changed":
+    case "mcp.interaction.requested":
+    case "mcp.interaction.settled":
+    case "permission-mode.changed":
+    case "session.forked":
+    case "workspace.git.changed":
+      break;
     case "run.event":
       store.applyMayEvent(event.event);
       break;
@@ -1608,26 +2098,15 @@ function applyMaybeCodeEvent(store, event) {
       store.applyPermissionEvent(event.event);
       break;
     case "change.preview":
-      store.appendChangePreview(
-        event.runId,
-        event.step,
-        event.toolCallId,
-        event.preview
-      );
+      store.appendChangePreview(event.runId, event.step, event.toolCallId, event.preview);
       break;
     case "session.changed":
       store.reset(event.sessionId);
-      store.appendNotice(
-        "info",
-        `Session ${event.resumed ? "resumed" : "started"}: ${event.sessionId}`
-      );
+      store.appendNotice("info", `Session ${event.resumed ? "resumed" : "started"}: ${event.sessionId}`);
       break;
     case "model.changed": {
       const profile = event.model.profile === void 0 ? "" : ` profile ${event.model.profile}`;
-      store.appendNotice(
-        "info",
-        `Model switched to${profile}: ${event.model.provider}/${event.model.model}`
-      );
+      store.appendNotice("info", `Model switched to${profile}: ${event.model.provider}/${event.model.model}`);
       break;
     }
     case "model.default.changed":
@@ -1640,19 +2119,13 @@ function applyMaybeCodeEvent(store, event) {
       store.appendNotice("info", `MCP resource watch closed: ${event.serverId} ${event.uri} (${event.reason})`);
       break;
     case "mcp.server.connected":
-      store.appendNotice(
-        "info",
-        `MCP server connected: ${event.serverId} (${event.toolNames.length} tools)`
-      );
+      store.appendNotice("info", `MCP server connected: ${event.serverId} (${event.toolNames.length} tools)`);
       break;
     case "mcp.server.catalog-updated":
       store.appendNotice("info", `MCP catalog updated: ${event.serverId} (revision ${event.revision})`);
       break;
     case "mcp.server.failed":
-      store.appendNotice(
-        "warning",
-        `MCP server failed: ${event.serverId}: ${event.diagnostic.message}`
-      );
+      store.appendNotice("warning", `MCP server failed: ${event.serverId}: ${event.diagnostic.message}`);
       break;
     case "mcp.server.disconnected":
       store.appendNotice("info", `MCP server disconnected: ${event.serverId}`);
@@ -1664,10 +2137,7 @@ function applyMaybeCodeEvent(store, event) {
       );
       break;
     case "context.compaction.failed":
-      store.appendNotice(
-        "warning",
-        `Context compaction failed with ${event.strategy}: ${event.error.message}`
-      );
+      store.appendNotice("warning", `Context compaction failed with ${event.strategy}: ${event.error.message}`);
       break;
   }
 }
@@ -1675,10 +2145,7 @@ __name(applyMaybeCodeEvent, "applyMaybeCodeEvent");
 async function handleCommand(input, app, store, view, finish, web, observeRun) {
   const parsed = parseMaybeCodeSlashCommand(input);
   if (parsed.type === "command" && parsed.definition.name === "/compact" && parsed.arguments.length === 0) {
-    store.appendNotice(
-      "info",
-      "Pruning old tool results and summarizing context"
-    );
+    store.appendNotice("info", "Pruning old tool results and summarizing context");
   }
   const result = await executeMaybeCodeSlashCommand(input, app);
   if (result.type === "web.requested") {
@@ -1697,12 +2164,8 @@ async function presentCommandResult(result, app, store, view, finish, observeRun
       store.appendNotice(
         "info",
         [
-          ...result.commands.map(
-            (command) => `${command.usage} \u2014 ${command.description}`
-          ),
-          ...view.displayCommands.map(
-            (command) => `${command.command} \u2014 ${command.description} (display only)`
-          )
+          ...result.commands.map((command) => `${command.usage} \u2014 ${command.description}`),
+          ...view.displayCommands.map((command) => `${command.command} \u2014 ${command.description} (display only)`)
         ].join("\n")
       );
       break;
@@ -1765,9 +2228,12 @@ Model: ${await resolvedModelLabel(app)}${inspectionText(result.inspection)}`
       });
       break;
     case "worktrees.display":
-      store.appendNotice("info", result.worktrees.length ? result.worktrees.map((item) => `${item.id}
+      store.appendNotice(
+        "info",
+        result.worktrees.length ? result.worktrees.map((item) => `${item.id}
 ${item.path}
-${item.branch} \xB7 ${item.status} \xB7 ${item.commit.slice(0, 12)}`).join("\n\n") : "\u6CA1\u6709\u5DF2\u767B\u8BB0\u7684 worktree\u3002");
+${item.branch} \xB7 ${item.status} \xB7 ${item.commit.slice(0, 12)}`).join("\n\n") : "\u6CA1\u6709\u5DF2\u767B\u8BB0\u7684 worktree\u3002"
+      );
       break;
     case "session.resumed":
       store.appendNotice("info", `Resumed session ${result.sessionId}`);
@@ -1779,10 +2245,7 @@ ${item.branch} \xB7 ${item.status} \xB7 ${item.commit.slice(0, 12)}`).join("\n\n
       await refreshModelLabel(view, app);
       break;
     case "model.not-found":
-      store.appendNotice(
-        "warning",
-        `No model profile starts with: ${result.query}`
-      );
+      store.appendNotice("warning", `No model profile starts with: ${result.query}`);
       break;
     case "effort.selection.requested":
       if (result.state.status !== "known") {
@@ -1796,10 +2259,7 @@ ${item.branch} \xB7 ${item.status} \xB7 ${item.commit.slice(0, 12)}`).join("\n\n
       store.appendNotice("info", reasoningEffortChanged(result.state));
       break;
     case "effort.not-found":
-      store.appendNotice(
-        "warning",
-        `No reasoning effort starts with: ${result.query}`
-      );
+      store.appendNotice("warning", `No reasoning effort starts with: ${result.query}`);
       break;
     case "usage":
       store.appendNotice("warning", `Usage: ${result.usage}`);
@@ -1814,9 +2274,7 @@ async function runEffortDialog(view, app, store, state) {
   const effort = await view.requestReasoningEffortSelection(state);
   if (effort === void 0) return;
   try {
-    const changed = await app.setReasoningEffort(
-      effort === "default" ? void 0 : effort
-    );
+    const changed = await app.setReasoningEffort(effort === "default" ? void 0 : effort);
     view.setModel(modelLabel(app, changed));
     store.appendNotice("info", reasoningEffortChanged(changed));
   } catch (error) {
@@ -1827,10 +2285,7 @@ __name(runEffortDialog, "runEffortDialog");
 async function runModelDialog(view, app, store, initialModels) {
   let models = initialModels;
   while (true) {
-    const action = await view.requestModelAction(
-      models,
-      app.modelInfo?.profile
-    );
+    const action = await view.requestModelAction(models, app.application.modelInfo?.profile);
     if (action === void 0) return;
     try {
       if (action.type === "switch") {
@@ -1884,9 +2339,10 @@ Context: ~${inspection.effectiveTokens}${window} tokens, ${inspection.messageCou
 }
 __name(inspectionText, "inspectionText");
 function modelLabel(app, effort = "loading") {
-  if (app.modelInfo === void 0) return "unknown \xB7 effort: unknown";
-  const endpoint = `${app.modelInfo.provider}/${app.modelInfo.model}`;
-  const model = app.modelInfo.profile === void 0 ? endpoint : `${app.modelInfo.profile} (${endpoint})`;
+  const info = app.application.modelInfo;
+  if (info === void 0) return "unknown \xB7 effort: unknown";
+  const endpoint = `${info.provider}/${info.model}`;
+  const model = info.profile === void 0 ? endpoint : `${info.profile} (${endpoint})`;
   return `${model} \xB7 effort: ${reasoningEffortLabel(effort)}`;
 }
 __name(modelLabel, "modelLabel");
@@ -1912,7 +2368,7 @@ async function refreshModelLabel(view, app) {
 }
 __name(refreshModelLabel, "refreshModelLabel");
 function modelIdentity(app) {
-  const model = app.modelInfo;
+  const model = app.application.modelInfo;
   return model === void 0 ? "" : `${model.profile ?? ""}\0${model.provider}\0${model.model}`;
 }
 __name(modelIdentity, "modelIdentity");
@@ -1945,4 +2401,4 @@ __name(errorMessage, "errorMessage");
 export {
   runRetainedTerminalUI
 };
-//# sourceMappingURL=retained-tui-VJ3VX4R3.js.map
+//# sourceMappingURL=retained-tui-QF5VMYLC.js.map