omnius 1.0.884 → 1.0.887

package/dist/tui/native/worker.js

@@ -2,7 +2,7 @@
 import { createWriteStream } from "node:fs";
 import { createInterface } from "node:readline";
 import { PassThrough } from "node:stream";
-import { CliRenderEvents as CliRenderEvents10, NativeSession, RGBA as RGBA4, createCliRenderer } from "@opentui/core";
+import { CliRenderEvents as CliRenderEvents11, NativeSession, RGBA as RGBA4, createCliRenderer } from "@opentui/core";
 
 // packages/cli/src/tui/native/components/frontend.ts
 import {
@@ -179,6 +179,27 @@ function nativeTextFromAnsi(value) {
 }
 
 // packages/cli/src/tui/native/components/text.ts
+var colorCache = /* @__PURE__ */ new Map();
+function nativeColor(value, background2 = false) {
+  if (value === void 0 || value === -1 || value === "default")
+    return background2 ? RGBA.defaultBackground() : RGBA.defaultForeground();
+  const key = String(value);
+  if (key === "index:-1") return background2 ? RGBA.defaultBackground() : RGBA.defaultForeground();
+  let color = colorCache.get(key);
+  if (!color) {
+    const index = typeof value === "number" || /^\d+$/.test(key) ? Number(value) : key.startsWith("index:") ? Number(key.slice(6)) : void 0;
+    if (index !== void 0 ? !Number.isInteger(index) || index < 0 || index > 255 : !/^#?(?:[\da-f]{3}|[\da-f]{4}|[\da-f]{6}|[\da-f]{8})$/i.test(key))
+      return background2 ? RGBA.defaultBackground() : RGBA.defaultForeground();
+    try {
+      color = index === void 0 ? RGBA.fromHex(key) : RGBA.fromIndex(index);
+    } catch {
+      return background2 ? RGBA.defaultBackground() : RGBA.defaultForeground();
+    }
+    if (colorCache.size >= 1024) colorCache.delete(colorCache.keys().next().value);
+    colorCache.set(key, color);
+  }
+  return color;
+}
 function plainText(value) {
   return typeof value === "string" ? stripTextControls(value) : (value ?? []).map((span) => stripTextControls(span.text)).join("");
 }
@@ -189,6 +210,7 @@ function styledText(value) {
   return new StyledText(textSpans(value).map((span) => ({
     __isChunk: true,
     text: span.text,
+    ...span.fg === void 0 ? {} : { fg: nativeColor(span.fg) },
     ...span.attributes === void 0 ? {} : { attributes: span.attributes },
     ...span.link ? { link: { url: span.link } } : {}
   })));
@@ -1653,6 +1675,16 @@ var NativeBlockView = class {
   get block() {
     return this.spec;
   }
+  get trailingSpace() {
+    return this.spec.kind === "markdown" && this.spec.presentation === "final-answer" ? 1 : 0;
+  }
+  get hasVisibleContent() {
+    return this.spec.kind !== "column" && this.spec.kind !== "row" || Boolean(this.spec.title || this.spec.text !== void 0 || this.spec.actions?.length || [...this.children?.views.values() ?? []].some((view) => view.hasVisibleContent));
+  }
+  setTurnSeparation(separate, previousBottom = 0) {
+    const answer = this.spec.kind === "markdown" && this.spec.presentation === "final-answer";
+    this.root.marginTop = separate ? Math.max(0, 1 - previousBottom) : answer ? 1 : 0;
+  }
   build() {
     const { renderer: renderer2, colors, syntax } = this.context;
     const spec = this.spec;
@@ -1951,12 +1983,13 @@ var NativeBlockView = class {
   }
   applyTheme() {
     const colors = this.context.colors;
+    const heading = this.spec.color === void 0 ? colors.foreground : nativeColor(this.spec.color);
     this.root.backgroundColor = colors.background;
     this.root.shouldFill = this.spec.kind !== "model3d";
-    if (this.spec.kind === "card") this.root.borderColor = colors.border;
+    if (this.spec.kind === "card") this.root.borderColor = this.spec.color === void 0 ? colors.border : heading;
     else this.root.border = false;
     if (this.title) {
-      this.title.fg = colors.foreground;
+      this.title.fg = heading;
       this.title.bg = colors.background;
     }
     if (this.body) {
@@ -1964,11 +1997,11 @@ var NativeBlockView = class {
       this.body.shouldFill = this.spec.kind !== "model3d";
     }
     if (this.text) {
-      this.text.fg = colors.foreground;
+      this.text.fg = this.spec.kind === "text" || this.spec.kind === "progress" ? heading : colors.foreground;
       this.text.bg = colors.background;
     }
     if (this.progress) {
-      this.progress.fg = colors.foreground;
+      this.progress.fg = this.spec.color === void 0 ? colors.accent : heading;
       this.progress.bg = colors.background;
     }
     for (const action of this.actions?.getChildren() ?? []) if (action instanceof TextRenderable3) {
@@ -1998,12 +2031,14 @@ var NativeBlockView = class {
   }
 };
 var NativeBlockList = class {
-  constructor(context, parent) {
+  constructor(context, parent, separateTurns = false) {
     this.context = context;
     this.parent = parent;
+    this.separateTurns = separateTurns;
   }
   context;
   parent;
+  separateTurns;
   views = /* @__PURE__ */ new Map();
   order = [];
   patch(patch) {
@@ -2021,6 +2056,20 @@ var NativeBlockList = class {
       }
     }
     if (patch.order) this.reorder(patch.order);
+    if (this.separateTurns) {
+      let turnId, previousBottom = 0;
+      for (const id of this.order) {
+        const view = this.views.get(id);
+        if (!view.hasVisibleContent) {
+          view.setTurnSeparation(false);
+          continue;
+        }
+        const nextTurn = view.block.turnId;
+        view.setTurnSeparation(Boolean(turnId && nextTurn && turnId !== nextTurn), previousBottom);
+        if (nextTurn) turnId = nextTurn;
+        previousBottom = view.trailingSpace;
+      }
+    }
   }
   replace(blocks) {
     const keep = new Set(blocks.map((block) => block.id));
@@ -7671,7 +7720,7 @@ var NativeTabStrip = class extends BoxRenderable11 {
           },
           onKeyDown: (key) => this.handleKey(entry, key)
         });
-        entry = { action, active: false, blocked: false, button };
+        entry = { action, active: false, blocked: false, closeBlocked: false, button };
         this.buttons.set(action.id, entry);
         button.on("focused", () => {
           this.style(entry);
@@ -7691,7 +7740,7 @@ var NativeTabStrip = class extends BoxRenderable11 {
             fg: this.colors.foreground,
             bg: this.colors.background,
             onMouseDown: (event) => {
-              if (event.button === 0 && !entry.blocked) {
+              if (event.button === 0 && !entry.closeBlocked) {
                 close2.focus();
                 this.options.close(entry.action.id);
               }
@@ -7712,8 +7761,9 @@ var NativeTabStrip = class extends BoxRenderable11 {
       entry.action = action;
       entry.active = action.id === activeId;
       entry.blocked = busy || Boolean(action.disabled);
+      entry.closeBlocked = entry.blocked || Boolean(action.closeDisabled);
       entry.button.focusable = entry.active || !entry.blocked;
-      if (entry.close) entry.close.focusable = !entry.blocked;
+      if (entry.close) entry.close.focusable = !entry.closeBlocked;
       const label3 = plainText(action.label);
       const content = ` ${label3} `;
       if (entry.button.plainText !== content) entry.button.content = content;
@@ -7731,17 +7781,17 @@ var NativeTabStrip = class extends BoxRenderable11 {
   }
   style(entry) {
     entry.button.attributes = (entry.active ? TextAttributes10.BOLD | TextAttributes10.UNDERLINE : entry.blocked ? TextAttributes10.DIM : 0) | (entry.button.focused ? TextAttributes10.INVERSE : 0);
-    if (entry.close) entry.close.attributes = (entry.blocked || !entry.close.focused ? TextAttributes10.DIM : 0) | (entry.close.focused ? TextAttributes10.INVERSE : 0);
+    if (entry.close) entry.close.attributes = (entry.closeBlocked || !entry.close.focused ? TextAttributes10.DIM : 0) | (entry.close.focused ? TextAttributes10.INVERSE : 0);
   }
   handleKey(entry, key, close2 = false) {
     if (key.eventType === "release") return;
     if (key.name === "return" || key.sequence === " ") {
-      if (!entry.blocked) {
+      if (close2 ? !entry.closeBlocked : !entry.blocked) {
         if (close2) this.options.close?.(entry.action.id);
         else this.options.activate(entry.action.id);
       }
     } else if (this.options.close && (key.name === "delete" || key.ctrl && key.name.toLowerCase() === "w")) {
-      if (!entry.blocked) this.options.close(entry.action.id);
+      if (!entry.closeBlocked) this.options.close(entry.action.id);
     } else if (["left", "right", "home", "end"].includes(key.name)) {
       const targets = this.scroll.getChildren().filter((button) => button.focusable && button.id.startsWith(`${this.options.prefix}:`));
       const index = targets.indexOf(entry.button);
@@ -7975,13 +8025,13 @@ var NativeFrontend = class {
       fg: colors.foreground,
       bg: colors.background,
       onMouseDown: (event) => {
-        if (event.button === 0 && !this.state?.sessions?.busy) this.emitAction("session-new");
+        if (event.button === 0) this.emitAction("session-new");
         event.preventDefault();
         event.stopPropagation();
       },
       onKeyDown: (key) => {
         if (key.eventType !== "release" && (key.name === "return" || key.sequence === " ")) {
-          if (!this.state?.sessions?.busy) this.emitAction("session-new");
+          this.emitAction("session-new");
           key.preventDefault();
           key.stopPropagation();
         }
@@ -7989,7 +8039,7 @@ var NativeFrontend = class {
     });
     this.newSession.focusable = true;
     const styleNew = () => {
-      this.newSession.attributes = (this.state?.sessions?.busy ? TextAttributes11.DIM : 0) | (this.newSession.focused ? TextAttributes11.INVERSE : 0);
+      this.newSession.attributes = this.newSession.focused ? TextAttributes11.INVERSE : 0;
     };
     this.newSession.on("focused", styleNew);
     this.newSession.on("blurred", styleNew);
@@ -8004,13 +8054,13 @@ var NativeFrontend = class {
       fg: colors.foreground,
       bg: colors.background,
       onMouseDown: (event) => {
-        if (event.button === 0 && !this.state?.sessions?.busy) this.emitAction("session-picker");
+        if (event.button === 0) this.emitAction("session-picker");
         event.preventDefault();
         event.stopPropagation();
       },
       onKeyDown: (key) => {
         if (key.eventType !== "release" && (key.name === "return" || key.sequence === " ")) {
-          if (!this.state?.sessions?.busy) this.emitAction("session-picker");
+          this.emitAction("session-picker");
           key.preventDefault();
           key.stopPropagation();
         }
@@ -8018,7 +8068,7 @@ var NativeFrontend = class {
     });
     this.sessionPicker.focusable = true;
     const stylePicker = () => {
-      this.sessionPicker.attributes = (this.state?.sessions?.busy ? TextAttributes11.DIM : 0) | (this.sessionPicker.focused ? TextAttributes11.INVERSE : 0);
+      this.sessionPicker.attributes = this.sessionPicker.focused ? TextAttributes11.INVERSE : 0;
     };
     this.sessionPicker.on("focused", stylePicker);
     this.sessionPicker.on("blurred", stylePicker);
@@ -8096,7 +8146,7 @@ var NativeFrontend = class {
       } }
     });
     this.transcriptPane.add(this.scroll);
-    this.content = new NativeBlockList(this.context, this.scroll);
+    this.content = new NativeBlockList(this.context, this.scroll, true);
     this.instrumentDivider = new InstrumentDivider(renderer2, {
       resize: (column3) => this.resizeInstruments(column3),
       toggle: () => this.toggleDetails(),
@@ -8392,6 +8442,7 @@ var NativeFrontend = class {
   history = [];
   historyIndex = -1;
   savedInput = "";
+  savedInputCursor = 0;
   disposeSelectionContrast;
   actionSignatures = /* @__PURE__ */ new WeakMap();
   detailsOpen;
@@ -8416,6 +8467,7 @@ var NativeFrontend = class {
     const previousView = this.state ? `${this.state.sessions?.activeId ?? ""}:${this.state.activeViewId}:${this.state.presentation ?? "stack"}` : void 0;
     const currentView = `${state.sessions?.activeId ?? ""}:${state.activeViewId}:${state.presentation ?? "stack"}`;
     const viewChanged = previousView !== void 0 && previousView !== currentView;
+    if (this.state?.sessions?.activeId !== state.sessions?.activeId) this.resetHistoryNavigation();
     if (viewChanged) {
       this.viewScroll.set(previousView, { top: this.scroll.scrollTop, live: this.offset === 0 });
       this.viewDisclosures.set(previousView, this.content.captureDisclosures(this.tasks.captureDisclosures()));
@@ -8446,12 +8498,14 @@ var NativeFrontend = class {
       this.tabs.visible = state.tabs.some((tab) => tab.id !== "main");
       this.viewTabsRow.visible = this.tabs.visible;
       this.sessionRow.visible = Boolean(state.sessions);
-      this.sessions.update(state.sessions?.items ?? [], state.sessions?.activeId ?? "", state.sessions?.busy);
-      this.newSession.focusable = !state.sessions?.busy;
-      this.sessionPicker.focusable = !state.sessions?.busy;
-      if (state.sessions?.busy && (this.newSession.focused || this.sessionPicker.focused)) this.getRenderable(`session:${state.sessions.activeId}`)?.focus();
-      this.newSession.attributes = state.sessions?.busy ? TextAttributes11.DIM : this.newSession.focused ? TextAttributes11.INVERSE : 0;
-      this.sessionPicker.attributes = state.sessions?.busy ? TextAttributes11.DIM : this.sessionPicker.focused ? TextAttributes11.INVERSE : 0;
+      this.sessions.update((state.sessions?.items ?? []).map((item) => ({
+        ...item,
+        disabled: item.disabled ?? false,
+        closeDisabled: item.closeDisabled ?? Boolean(state.sessions?.busy)
+      })), state.sessions?.activeId ?? "");
+      this.newSession.focusable = this.sessionPicker.focusable = true;
+      this.newSession.attributes = this.newSession.focused ? TextAttributes11.INVERSE : 0;
+      this.sessionPicker.attributes = this.sessionPicker.focused ? TextAttributes11.INVERSE : 0;
       this.tasks.replace(state.taskNotes ? [] : state.tasks);
       this.taskPane.visible = !state.taskNotes && state.tasks.length > 0;
       this.taskStrip.update(state.taskNotes);
@@ -8474,7 +8528,7 @@ var NativeFrontend = class {
         const index = state.suggestions.findIndex((item) => item.value === selected);
         if (index >= 0) this.suggestions.setSelectedIndex(index);
       }
-      this.suggestions.visible = state.suggestions.length > 0;
+      this.suggestions.visible = this.historyIndex < 0 && state.suggestions.length > 0;
       this.suggestions.height = Math.min(4, state.suggestions.length || 1);
       this.prompt.content = styledText(state.prompt.trimEnd() || "❯");
       if (!this.editorInitialized) {
@@ -8724,6 +8778,28 @@ var NativeFrontend = class {
     return visit(this.renderer.root);
   }
   onFrame = () => {
+    if (this.destroyed) return;
+    this.flushPendingInterfaceLayout();
+    const height = Math.max(1, Math.min(8, this.editor.editorView.getTotalVirtualLineCount(), this.renderer.terminalHeight - 8));
+    if (height !== this.editor.height) this.editor.height = height;
+    this.layoutTabStrips();
+    for (const media of this.context.mediaViews ?? []) media.reconcile({ x: this.scroll.viewport.x, y: this.scroll.viewport.y, width: this.scroll.viewport.width, height: this.scroll.viewport.height }, !this.paused && !this.modals.active);
+    for (const model of this.context.modelViews ?? []) model.reconcile(this.scroll.viewport, !this.paused && !this.modals.active);
+    this.modals.reconcileMedia();
+    const offset2 = this.offset;
+    if (offset2 === 0) this.newEntries = 0;
+    this.liveButton.visible = offset2 > 0;
+    const liveLabel = offset2 > 0 ? `↓ Live${this.newEntries ? ` · ${this.newEntries} new` : ""}` : "↓ Live";
+    if (this.liveButton.plainText !== liveLabel) this.liveButton.content = liveLabel;
+    const event = { type: "viewport", offset: this.scroll.scrollTop, height: this.scroll.viewport.height, width: this.scroll.viewport.width, total: this.scroll.scrollHeight };
+    const signature = JSON.stringify(event);
+    if (signature !== this.viewportSignature) {
+      this.viewportSignature = signature;
+      this.emit(event);
+    }
+  };
+  /** Restore presentation after native layout, without requiring terminal drain. */
+  flushPendingInterfaceLayout() {
     if (this.destroyed) return;
     if (this.pendingInterface) {
       const state = this.pendingInterface;
@@ -8747,24 +8823,7 @@ var NativeFrontend = class {
       this.scroll.scrollTo(restore.live ? this.scroll.scrollHeight : restore.top);
       this.renderer.requestRender();
     }
-    const height = Math.max(1, Math.min(8, this.editor.editorView.getTotalVirtualLineCount(), this.renderer.terminalHeight - 8));
-    if (height !== this.editor.height) this.editor.height = height;
-    this.layoutTabStrips();
-    for (const media of this.context.mediaViews ?? []) media.reconcile({ x: this.scroll.viewport.x, y: this.scroll.viewport.y, width: this.scroll.viewport.width, height: this.scroll.viewport.height }, !this.paused && !this.modals.active);
-    for (const model of this.context.modelViews ?? []) model.reconcile(this.scroll.viewport, !this.paused && !this.modals.active);
-    this.modals.reconcileMedia();
-    const offset2 = this.offset;
-    if (offset2 === 0) this.newEntries = 0;
-    this.liveButton.visible = offset2 > 0;
-    const liveLabel = offset2 > 0 ? `↓ Live${this.newEntries ? ` · ${this.newEntries} new` : ""}` : "↓ Live";
-    if (this.liveButton.plainText !== liveLabel) this.liveButton.content = liveLabel;
-    const event = { type: "viewport", offset: this.scroll.scrollTop, height: this.scroll.viewport.height, width: this.scroll.viewport.width, total: this.scroll.scrollHeight };
-    const signature = JSON.stringify(event);
-    if (signature !== this.viewportSignature) {
-      this.viewportSignature = signature;
-      this.emit(event);
-    }
-  };
+  }
   onResize = () => {
     this.layoutInstruments();
     this.layoutTabStrips();
@@ -8792,6 +8851,7 @@ var NativeFrontend = class {
     const text = this.editor.plainText;
     const cursor = this.inputCursor();
     if (text === this.lastInput && cursor === this.lastCursor) return;
+    if (this.historyIndex >= 0 && text !== this.history[this.historyIndex]) this.resetHistoryNavigation();
     this.lastInput = text;
     this.lastCursor = cursor;
     this.renderEnhance();
@@ -8808,19 +8868,31 @@ var NativeFrontend = class {
       this.history.unshift(text);
       this.history.length = Math.min(this.history.length, 1e3);
     }
-    this.historyIndex = -1;
-    this.savedInput = "";
+    this.resetHistoryNavigation();
     this.editor.clear();
     this.emit({ type: "submit", text });
     this.editorChanged();
   }
+  resetHistoryNavigation() {
+    this.historyIndex = -1;
+    this.savedInput = "";
+    this.savedInputCursor = 0;
+  }
   navigateHistory(direction) {
     if (this.history.length === 0) return;
     if (direction < 0) {
-      if (this.historyIndex < 0) this.savedInput = this.editor.plainText;
+      if (this.historyIndex < 0) {
+        this.savedInput = this.editor.plainText;
+        this.savedInputCursor = this.inputCursor();
+      }
       this.historyIndex = Math.min(this.history.length - 1, this.historyIndex + 1);
-    } else this.historyIndex = Math.max(-1, this.historyIndex - 1);
-    this.setInput(this.historyIndex < 0 ? this.savedInput : this.history[this.historyIndex]);
+    } else {
+      if (this.historyIndex < 0) return;
+      this.historyIndex--;
+    }
+    this.suggestions.visible = false;
+    if (this.historyIndex < 0) this.setInput(this.savedInput, this.savedInputCursor, true);
+    else this.setInput(this.history[this.historyIndex], void 0, true);
   }
   acceptSuggestion() {
     const selected = this.suggestions.getSelectedOption();
@@ -8831,7 +8903,8 @@ var NativeFrontend = class {
     this.emitAction("completion", text);
     return true;
   }
-  setInput(text, cursor = text.length) {
+  setInput(text, cursor = text.length, fromHistory = false) {
+    if (!fromHistory) this.resetHistoryNavigation();
     this.editor.replaceText(text);
     this.placeInputCursor(text, cursor);
     this.editorInitialized = true;
@@ -8983,14 +9056,26 @@ var NativeFrontend = class {
       return;
     }
     if (key.name === "up" || key.name === "down") {
-      if (this.suggestions.visible) {
-        if (key.name === "up") this.suggestions.moveUp();
-        else this.suggestions.moveDown();
+      if (this.renderer.currentFocusedRenderable === this.scroll) {
+        this.scroll.scrollBy(key.name === "up" ? -1 : 1, "absolute");
         key.preventDefault();
         return;
       }
-      if (this.renderer.currentFocusedRenderable === this.scroll || this.offset > 0 || this.state?.activity?.processing && !this.editor.plainText) {
-        this.scroll.scrollBy(key.name === "up" ? -1 : 1, "absolute");
+      if (this.paused || this.state?.input.enabled === false) {
+        key.preventDefault();
+        return;
+      }
+      if (this.suggestions.visible) {
+        const index = this.suggestions.getSelectedIndex();
+        const edge = key.name === "up" ? index <= 0 : index >= this.suggestions.options.length - 1;
+        if (edge) {
+          this.suggestions.visible = false;
+          this.navigateHistory(key.name === "up" ? -1 : 1);
+          key.preventDefault();
+          return;
+        }
+        if (key.name === "up") this.suggestions.moveUp();
+        else this.suggestions.moveDown();
         key.preventDefault();
         return;
       }
@@ -9001,6 +9086,7 @@ var NativeFrontend = class {
         key.preventDefault();
         return;
       }
+      this.editorChanged();
     }
     if (this.paused || this.state?.input.enabled === false) {
       if (this.renderer.currentFocusedRenderable === this.editor) key.preventDefault();
@@ -9244,6 +9330,11 @@ var NativeFrontend = class {
     if (this.state) this.update(this.state);
     this.layoutInstruments();
     this.renderer.requestRender();
+    const pendingScroll = this.pendingScrollRestore;
+    return () => {
+      if (this.pendingInterface === state) this.pendingInterface = void 0;
+      if (this.pendingScrollRestore === pendingScroll) this.pendingScrollRestore = void 0;
+    };
   }
   async dispose() {
     if (this.destroyed) return;
@@ -9338,6 +9429,70 @@ function installTerminalCursorDefaults(renderer2, session) {
   return { restore, dispose };
 }
 
+// packages/cli/src/tui/native/layout-barrier.ts
+import { CliRenderEvents as CliRenderEvents10 } from "@opentui/core";
+var NATIVE_INTERFACE_LAYOUT_TIMEOUT_MS = 1e3;
+function waitForNativeLayout(renderer2, applyPendingLayout, options = {}) {
+  const deadline = options.deadline ?? performance.now() + (options.timeoutMs ?? NATIVE_INTERFACE_LAYOUT_TIMEOUT_MS);
+  return new Promise((resolve2, reject) => {
+    let settled = false;
+    let queued = false;
+    let timer;
+    const finish = (error) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      renderer2.removePostProcessFn(afterLayout);
+      renderer2.off(CliRenderEvents10.DESTROY, destroyed);
+      options.signal?.removeEventListener("abort", aborted);
+      if (error) reject(error);
+      else resolve2();
+    };
+    const destroyed = () => finish(new Error("OpenTUI closed before interface layout completed"));
+    const aborted = () => finish(new Error("OpenTUI interface layout was cancelled"));
+    const afterLayout = (_buffer) => {
+      if (queued || settled) return;
+      queued = true;
+      queueMicrotask(() => {
+        if (settled) return;
+        if (performance.now() >= deadline) {
+          timedOut();
+          return;
+        }
+        try {
+          applyPendingLayout();
+          finish();
+        } catch (error) {
+          finish(error instanceof Error ? error : new Error("OpenTUI interface layout failed"));
+        }
+      });
+    };
+    renderer2.addPostProcessFn(afterLayout);
+    renderer2.once(CliRenderEvents10.DESTROY, destroyed);
+    options.signal?.addEventListener("abort", aborted, { once: true });
+    if (options.signal?.aborted) {
+      aborted();
+      return;
+    }
+    if (renderer2.isDestroyed) {
+      destroyed();
+      return;
+    }
+    const timeoutMs = deadline - performance.now();
+    const timedOut = () => finish(new Error("OpenTUI interface layout did not complete; terminal output may be paused"));
+    if (timeoutMs <= 0) {
+      timedOut();
+      return;
+    }
+    timer = setTimeout(timedOut, timeoutMs);
+    try {
+      renderer2.requestRender();
+    } catch (error) {
+      finish(error instanceof Error ? error : new Error("OpenTUI interface layout failed"));
+    }
+  });
+}
+
 // packages/cli/src/tui/native/worker.ts
 var replies = createWriteStream("", { fd: 3, autoClose: false });
 var reply = (message) => replies.write(JSON.stringify(message) + "\n");
@@ -9347,9 +9502,11 @@ var frontend;
 var cursorDefaults;
 var stopping = false;
 var failed = false;
+var layoutController = new AbortController();
 async function close() {
   if (stopping) return;
   stopping = true;
+  layoutController.abort();
   try {
     await frontend?.dispose();
     await cursorDefaults?.restore();
@@ -9369,27 +9526,35 @@ async function fail(error) {
   });
   replies.end(() => process.exit(1));
 }
-async function command(message) {
+async function command(message, layoutDeadline) {
   if (message.type === "command") {
     frontend.command(message.command);
     return;
   }
-  if (message.type === "interface-capture") {
-    await renderer.idle();
-    reply({ type: "interface-state", id: message.id, state: frontend.captureInterfaceState() });
-    return;
-  }
-  if (message.type === "interface-restore") {
-    frontend.restoreInterfaceState(message.state);
-    renderer.requestRender();
-    await renderer.idle();
-    reply({ type: "ack", id: message.id });
+  if (message.type === "interface-capture" || message.type === "interface-restore") {
+    if (performance.now() >= layoutDeadline) {
+      reply({ type: "request-error", id: message.id, message: "OpenTUI interface request expired before layout could begin" });
+      return;
+    }
+    let cancelRestore;
+    try {
+      await waitForNativeLayout(renderer, () => {
+        if (message.type === "interface-restore") cancelRestore = frontend.restoreInterfaceState(message.state);
+        frontend.flushPendingInterfaceLayout();
+      }, { signal: layoutController.signal, deadline: layoutDeadline });
+    } catch (error) {
+      cancelRestore?.();
+      if (!stopping) reply({ type: "request-error", id: message.id, message: error instanceof Error ? error.message : "OpenTUI interface layout failed" });
+      return;
+    }
+    if (stopping) return;
+    if (message.type === "interface-capture") reply({ type: "interface-state", id: message.id, state: frontend.captureInterfaceState() });
+    else reply({ type: "ack", id: message.id });
     return;
   }
   if (message.type === "state") {
     frontend.update(message.snapshot, message.content);
     renderer.requestRender();
-    await renderer.idle();
   } else if (message.type === "suspend") {
     frontend.pauseMedia();
     await cursorDefaults.restore();
@@ -9397,7 +9562,6 @@ async function command(message) {
   } else if (message.type === "resume") {
     await renderer.resume();
     renderer.requestRender();
-    await renderer.idle();
     await cursorDefaults.restore();
   } else if (message.type === "stop") await close();
   reply({ type: "ack", id: message.id });
@@ -9423,10 +9587,10 @@ try {
     maxFps: 60,
     clearOnShutdown: false
   });
-  renderer.on(CliRenderEvents10.RENDER_ERROR, (event) => {
+  renderer.on(CliRenderEvents11.RENDER_ERROR, (event) => {
     void fail(event.error);
   });
-  renderer.on(CliRenderEvents10.HANDLER_ERROR, (event) => {
+  renderer.on(CliRenderEvents11.HANDLER_ERROR, (event) => {
     void fail(event.error);
   });
   renderer.on("error", (event) => {
@@ -9437,6 +9601,7 @@ try {
   const controls = createInterface({ input: process.stdin, crlfDelay: Infinity });
   let pending = Promise.resolve();
   controls.on("line", (line) => {
+    const layoutDeadline = performance.now() + NATIVE_INTERFACE_LAYOUT_TIMEOUT_MS;
     let message;
     try {
       message = JSON.parse(line);
@@ -9452,7 +9617,7 @@ try {
       } catch (error) {
         void fail(error);
       }
-    } else pending = pending.then(() => command(message)).catch(fail);
+    } else pending = pending.then(() => command(message, layoutDeadline)).catch(fail);
   });
   controls.on("close", () => {
     void pending.then(close).finally(() => process.exit(0));