maka-agent 0.2.0-dev.24.20260907 → 0.2.0-dev.26.20260909

package/README.md

@@ -24,7 +24,8 @@
 [简体中文](https://github.com/apache/maka/blob/main/packages/cli/README.zh-CN.md)
 
 Maka is a local-first agent workspace. The `maka-agent` npm package installs the interactive
-terminal UI, the non-interactive CLI, Runtime Host tooling, and the Eval command.
+terminal UI, the non-interactive CLI, Runtime Host tooling, and the Eval command. That package is
+published under the `nightly` dist-tag; `latest` holds an early alpha stub (see [Install](#install)).
 
 ## Apache Incubation Disclaimer
 
@@ -79,16 +80,24 @@ release gate. Real Eval executor validation currently runs on Linux x64 with Nod
 
 ## Install
 
-Install the current beta explicitly from the `next` dist-tag:
+Two dist-tags are live on npm, and they are not interchangeable:
 
-```sh
-npm install --global maka-agent@next
-maka --version
-maka --help
-```
+- `nightly` carries the complete CLI. The line moves daily — resolve the tag (or query its
+  current version) instead of copying a version number from any document:
+
+  ```sh
+  npm install --global maka-agent@nightly
+  maka --version
+  maka --help
+  ```
+
+- `latest` points at an early alpha (`0.0.0-alpha.0`) whose command surface is limited to
+  `doctor`, help, and version. Because of that split, do not use a bare
+  `npm update --global maka-agent`: it follows `latest` and may switch the installation to the
+  other release line.
 
 The public command is `maka`. For a one-off invocation, use
-`npx --yes --package maka-agent@next maka`; the unrelated `maka` package on npm is not this project.
+`npx --yes --package maka-agent@nightly maka`; the unrelated `maka` package on npm is not this project.
 `runtime-host service install` uses the persistent global installation above; `runtime-host setup`
 creates its own managed copy from the exact package invoked by `npx`.
 
@@ -124,26 +133,31 @@ modify.
 
 ## Upgrade
 
-While using prereleases, keep the `next` tag explicit:
+Update within the nightly line by pinning the exact release (`--target` accepts `latest`,
+`next`, or an exact Maka version — there is no `nightly` channel name). Resolve the current
+nightly version first and pass that exact value: the updater refuses downgrades, so a copied
+version number goes stale as soon as the nightly line moves on.
 
 ```sh
-maka update --target next
+version="$(npm view maka-agent@nightly version --registry=https://registry.npmjs.org)"
+maka update --target "$version"
 maka --version
 ```
 
+Do not use a bare `npm update --global maka-agent` to upgrade: it follows `latest`, which holds
+the early alpha stub, and may switch the installation to the other release line.
+
 The update stages and verifies the exact release before replacing the local Runtime Host or the
 npm-global package. It refuses to interrupt active or durable work by default. Use
 `--allow-interrupt-active-tasks` only after deciding that interruption is safe. A direct
-`npm install --global maka-agent@next` remains available for installation repair; do not use a bare
-`npm update --global maka-agent`, because it follows `latest` and may select a different release
-line. After a stable release is available, select it with `maka update --target latest`.
+`npm install --global maka-agent@nightly` remains available for installation repair.
 
 ## Remote Runtime Host setup
 
 To set up a persistent remote Runtime Host from an exact released package on Linux or macOS:
 
 ```sh
-npx --yes --package maka-agent@next maka runtime-host setup \
+npx --yes --package maka-agent@nightly maka runtime-host setup \
   --principal my-client \
   --preset terminal-client
 ```
@@ -151,10 +165,12 @@ npx --yes --package maka-agent@next maka runtime-host setup \
 Rerunning setup replaces that Client credential. The service no longer depends on the temporary
 `npx` cache after setup succeeds.
 
-Check a managed service against a release channel without changing the running Host:
+Check a managed service against the nightly release it should track, without changing the
+running Host — pass the exact version resolved above rather than `latest`, which holds the
+early alpha:
 
 ```sh
-maka runtime-host service check-update --target next --json
+maka runtime-host service check-update --target "$version" --json
 ```
 
 The result pins the selected channel to an exact version and package integrity. It also reports
@@ -165,10 +181,13 @@ to the existing exact-package update transaction, and does not mutate a candidat
 manual review.
 
 The installation owner can persist one update target and reconcile it with the same verified
-transaction:
+transaction. Pin the exact nightly version resolved above: there is no `nightly` target name,
+and `latest` holds the early alpha, which the reconciliation assesses as a downgrade for a
+nightly installation. Following successive nightlies therefore means resolving the current
+version again and re-running `update-policy` with the fresh value:
 
 ```sh
-maka runtime-host service update-policy --target latest \
+maka runtime-host service update-policy --target "$version" \
   --expected-service-id <service-id> \
   --expected-root-path <state-root> \
   --expected-root-id <root-id>
@@ -182,7 +201,7 @@ bounded one-shot command: it never interrupts active work and does not install a
 
 ```sh
 # When a managed Runtime Host service was installed on Linux or macOS
-npx --yes --package maka-agent@next maka runtime-host service uninstall
+npx --yes --package maka-agent@nightly maka runtime-host service uninstall
 
 # If Maka was installed globally
 npm uninstall --global maka-agent

package/README.zh-CN.md

@@ -24,7 +24,8 @@
 [English](./README.md)
 
 Maka 是一个本地优先的 Agent 工作空间。`maka-agent` npm 包包含交互式终端界面、非交互
-CLI、Runtime Host 工具和 Eval 命令。
+CLI、Runtime Host 工具和 Eval 命令。该包发布在 `nightly` dist-tag 上；`latest` 指向一个
+早期 alpha stub（见[安装](#安装)）。
 
 ## Apache 孵化免责声明
 
@@ -57,15 +58,21 @@ release commit 中的 [DISCLAIMER-WIP](https://github.com/apache/maka/blob/main/
 
 ## 安装
 
-Beta 阶段请明确从 `next` dist-tag 安装：
+npm 上有两条 dist-tag，且二者不可互换：
 
-```sh
-npm install --global maka-agent@next
-maka --version
-maka --help
-```
+- `nightly` 承载完整的 CLI。该发布线每日推进——请解析 tag 本身（或查询其当前版本），不要誊写任何文档里的版本号：
 
-公开命令只有 `maka`。一次性运行请使用 `npx --yes --package maka-agent@next maka`；npm 上与本项目
+  ```sh
+  npm install --global maka-agent@nightly
+  maka --version
+  maka --help
+  ```
+
+- `latest` 指向一个早期 alpha（`0.0.0-alpha.0`），命令面只有 `doctor`、帮助与版本命令。
+  因此不要使用裸的 `npm update --global maka-agent`：它跟随 `latest`，可能把安装切换到
+  另一条发布线。
+
+公开命令只有 `maka`。一次性运行请使用 `npx --yes --package maka-agent@nightly maka`；npm 上与本项目
 无关的 `maka` 包不是本项目。`runtime-host service install` 使用上面的持久全局安装；
 `runtime-host setup` 会从 `npx` 调用的精确 package 创建自己的托管副本。
 
@@ -98,35 +105,40 @@ Maka 默认会在执行高权限工具操作前询问。`maka run --yolo` 会授
 
 ## 升级
 
-使用预发布版本时，请继续明确指定 `next`：
+在 nightly 线内更新时固定精确版本（`--target` 只接受 `latest`、`next` 或精确的 Maka
+版本号——不存在 `nightly` 这个 channel 名）。先解析当前 nightly 版本再传入精确值：
+updater 拒绝降级，nightly 前进之后誊写的旧版本号会被直接拒绝。
 
 ```sh
-maka update --target next
+version="$(npm view maka-agent@nightly version --registry=https://registry.npmjs.org)"
+maka update --target "$version"
 maka --version
 ```
 
+不要使用裸的 `npm update --global maka-agent` 来升级：它跟随 `latest`（早期 alpha stub），
+可能把安装切换到另一条发布线。
+
 更新流程会先 stage 并验证精确 release，再替换本地 Runtime Host 与 npm-global package；
 默认不会中断 active 或 durable work。只有在你确认可以安全中断后，才使用
-`--allow-interrupt-active-tasks`。`npm install --global maka-agent@next` 仍可用于修复安装；
-不要使用不带 tag 的 `npm update --global maka-agent`，因为它会跟随 `latest`，可能选中
-不同的发布线。稳定版发布后，使用 `maka update --target latest`。
+`--allow-interrupt-active-tasks`。`npm install --global maka-agent@nightly` 仍可用于修复安装。
 
 ## 设置远程 Runtime Host
 
 在 Linux 或 macOS 上从精确的发布 package 设置持久 remote Runtime Host：
 
 ```sh
-npx --yes --package maka-agent@next maka runtime-host setup \
+npx --yes --package maka-agent@nightly maka runtime-host setup \
   --principal my-client \
   --preset terminal-client
 ```
 
 重复设置会替换该 Client credential。设置成功后，service 不再依赖临时 `npx` cache。
 
-可以在不改变当前 Host 的情况下检查 managed service 对应的发布频道：
+检查 managed service 应跟随的 nightly 发布，且不改变当前运行中的 Host——传入上面解析出的
+精确版本，而不是指向早期 alpha 的 `latest`：
 
 ```sh
-maka runtime-host service check-update --target next --json
+maka runtime-host service check-update --target "$version" --json
 ```
 
 结果会把频道固定为精确版本和 package integrity，并说明 package 是否提供足够的兼容性证据，
@@ -134,10 +146,13 @@ maka runtime-host service check-update --target next --json
 selector 传给 `service update --target`。该路径会先校验 archive 与解包后的 manifest，再委托给
 现有的精确 package 更新事务；需要人工审查的候选不会改变当前 Host。
 
-Installation owner 可以持久化一个更新目标，并通过同一套已验证事务执行 reconciliation：
+Installation owner 可以持久化一个更新目标，并通过同一套已验证事务执行 reconciliation。持久化
+上面解析出的精确 nightly 版本：不存在 `nightly` 这个 target 名，而 `latest` 指向早期 alpha，
+reconciliation 会把对一个 nightly 安装而言更旧的候选判为降级。因此要跟随每日推进的 nightly，
+就需要重新解析当前版本，并用新值再次运行 `update-policy`：
 
 ```sh
-maka runtime-host service update-policy --target latest \
+maka runtime-host service update-policy --target "$version" \
   --expected-service-id <service-id> \
   --expected-root-path <state-root> \
   --expected-root-id <root-id>
@@ -151,7 +166,7 @@ maka runtime-host service reconcile-update --json
 
 ```sh
 # 仅限安装过 managed Runtime Host service 的 Linux 或 macOS
-npx --yes --package maka-agent@next maka runtime-host service uninstall
+npx --yes --package maka-agent@nightly maka runtime-host service uninstall
 
 # 如果曾全局安装 Maka
 npm uninstall --global maka-agent

package/dist/mcp-capability-provider.js

@@ -73,7 +73,10 @@ export function createMcpCapabilityProvider(manager) {
             if (!binding)
                 throw new Error('MCP capability is not part of the published snapshot');
             await options.accept({ kind: 'none' });
-            return projectMcpResult(await manager.callTool(binding, frame.arguments, { signal: options.signal }));
+            return projectMcpResult(await manager.callTool(binding, frame.arguments, {
+                signal: options.signal,
+                requestInteraction: options.requestInteraction,
+            }));
         },
     };
 }

package/dist/pi-transcript-tools.js

@@ -267,6 +267,12 @@ function compactToolSummary(entry) {
         isReadBodyResult(result)) {
         return { text: linesText(readBodyLineCount(text)), protect: true };
     }
+    const status = makaPiToolPresentationStatus(entry);
+    // Error-text size is not a successful read's size. Show only the outcome,
+    // including under NO_COLOR; the full reason remains in expanded details.
+    if (status === 'error' || status === 'failed' || status === 'aborted') {
+        return { text: status === 'error' ? 'failed' : status, protect: true };
+    }
     return textResultSummary(text);
 }
 function compactTerminalSummary(content) {

package/dist/pi-tui-layout.js

@@ -48,8 +48,8 @@ export class MakaTranscriptComponent {
      * by the live terminal-scrollback reconciliation path.
      */
     createDocumentRenderer() {
-        // The detached keys and their rendered-line cache live only as long as one
-        // viewer overlay. Closing it releases the complete duplicate projection.
+        // The detached keys and their rendered-line cache belong to one Session's
+        // reader. Reopening keeps its position; switching Sessions releases it.
         const entryClones = new WeakMap();
         const documentEntry = (entry) => {
             const cached = entryClones.get(entry);
@@ -61,11 +61,35 @@ export class MakaTranscriptComponent {
             entryClones.set(entry, clone);
             return clone;
         };
-        return (width) => renderMakaPiTranscript({
-            ...this.state,
-            entries: this.state.entries.map(documentEntry),
-            renderGeometry: { entryFirstLine: undefined, viewportTop: 0 },
-        }, this.metadata(), width);
+        return (width, expanded) => {
+            const entries = this.state.entries.map(documentEntry);
+            if (expanded !== undefined) {
+                for (const entry of entries) {
+                    if (entry.kind === 'tool' || entry.kind === 'thinking')
+                        entry.expanded = expanded;
+                }
+            }
+            const detachedState = {
+                ...this.state,
+                entries,
+                renderGeometry: { entryFirstLine: undefined, viewportTop: 0 },
+            };
+            const lines = renderMakaPiTranscript(detachedState, this.metadata(), width);
+            const anchors = entries.flatMap((entry, index) => {
+                if (entry.kind === 'tool' && entry.suppressed)
+                    return [];
+                const line = detachedState.renderGeometry.entryFirstLine?.get(entry);
+                if (line === undefined)
+                    return [];
+                const id = entry.kind === 'tool'
+                    ? `tool:${entry.turnId ?? ''}:${entry.toolUseId}`
+                    : 'messageId' in entry
+                        ? `${entry.kind}:${entry.messageId}`
+                        : `${entry.kind}:${index}`;
+                return [{ id, line }];
+            });
+            return { lines, anchors };
+        };
     }
 }
 export class MakaStatusLineComponent {
@@ -121,11 +145,12 @@ export class MakaPiLayoutComponent extends Container {
     editor;
     statusLine;
     terminal;
+    todoIndicator;
     /** Composed lines of the previous render, for the viewport-top shadow diff. */
     previousLines;
     previousRows;
     previousWidth;
-    constructor(state, transcript, activityStrip, pendingQueue, editor, statusLine, terminal) {
+    constructor(state, transcript, activityStrip, pendingQueue, editor, statusLine, terminal, todoIndicator) {
         super();
         this.state = state;
         this.transcript = transcript;
@@ -134,9 +159,12 @@ export class MakaPiLayoutComponent extends Container {
         this.editor = editor;
         this.statusLine = statusLine;
         this.terminal = terminal;
+        this.todoIndicator = todoIndicator;
         this.addChild(transcript);
         this.addChild(activityStrip);
         this.addChild(pendingQueue);
+        if (todoIndicator)
+            this.addChild(todoIndicator);
         this.addChild(editor);
         this.addChild(statusLine);
     }
@@ -145,14 +173,27 @@ export class MakaPiLayoutComponent extends Container {
         const activityLines = this.activityStrip.render(width);
         const allPendingLines = this.pendingQueue.render(width);
         const statusLines = this.statusLine.render(width);
+        // Supplementary information must not steal the composer's minimum space.
+        const todoLines = this.terminal.rows >
+            activityLines.length +
+                allPendingLines.length +
+                statusLines.length +
+                this.editor.minimumViewportRows()
+            ? (this.todoIndicator?.render(width) ?? []).slice(0, 1)
+            : [];
         const pendingRowsAvailable = this.editor.isShowingAutocomplete()
             ? Math.max(0, this.terminal.rows -
                 activityLines.length -
                 statusLines.length -
+                todoLines.length -
                 this.editor.minimumViewportRows())
             : allPendingLines.length;
         const pendingLines = fitPendingQueueLines(allPendingLines, pendingRowsAvailable);
-        this.editor.setViewportRows(this.terminal.rows - activityLines.length - pendingLines.length - statusLines.length);
+        this.editor.setViewportRows(this.terminal.rows -
+            activityLines.length -
+            pendingLines.length -
+            statusLines.length -
+            todoLines.length);
         const editorLines = this.editor.render(width);
         // #1064: when the activity strip is showing (a turn is running), separate
         // it from the last transcript line with a blank row. Without this, a
@@ -162,7 +203,11 @@ export class MakaPiLayoutComponent extends Container {
         const lastTranscriptLine = transcriptLines[transcriptLines.length - 1];
         const needGap = activityActive && lastTranscriptLine !== undefined && lastTranscriptLine.length > 0;
         const paddedTranscript = needGap ? [...transcriptLines, ''] : transcriptLines;
-        const chromeRows = activityLines.length + pendingLines.length + editorLines.length + statusLines.length;
+        const chromeRows = activityLines.length +
+            pendingLines.length +
+            todoLines.length +
+            editorLines.length +
+            statusLines.length;
         const viewportRows = Math.max(0, this.terminal.rows - chromeRows);
         const paddingRows = Math.max(0, viewportRows - paddedTranscript.length);
         const lines = [
@@ -170,6 +215,7 @@ export class MakaPiLayoutComponent extends Container {
             ...Array.from({ length: paddingRows }, () => ''),
             ...activityLines,
             ...pendingLines,
+            ...todoLines,
             ...editorLines,
             ...statusLines,
         ];

package/dist/pi-tui-mcp-status.js

@@ -210,7 +210,7 @@ export class McpManagementOverlay {
             return;
         const protocol = matchesKey(data, '1')
             ? 'legacy'
-            : matchesKey(data, '2')
+            : matchesKey(data, '2') || matchesKey(data, 'enter')
                 ? 'auto'
                 : matchesKey(data, '3')
                     ? '2026-07-28'
@@ -371,7 +371,7 @@ export class McpManagementOverlay {
             return [ansi.bold(editor.transportTitle), '', '1  stdio', '2  Streamable HTTP'];
         }
         if (this.phase.kind === 'protocol') {
-            return [ansi.bold(editor.protocolTitle), '', '1  legacy', '2  auto', '3  2026-07-28'];
+            return [ansi.bold(editor.protocolTitle), '', '1  legacy', '2  auto (Enter)', '3  2026-07-28'];
         }
         if (this.phase.kind === 'confirm_add') {
             return confirmAddDocument(this.phase.draft, this.input.locale);

package/dist/pi-tui-pickers.js

@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { CombinedAutocompleteProvider, Editor, Key, SelectList, decodeKittyPrintable, isKeyRepeat, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi, } from '@earendil-works/pi-tui';
+import { CombinedAutocompleteProvider, Editor, Key, SelectList, decodeKittyPrintable, isKeyRelease, isKeyRepeat, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi, } from '@earendil-works/pi-tui';
 import { defineUiMessageCatalog, formatUiMessage, resolveUiMessageCatalog, } from '@maka/core/ui-locale';
 import { providerDefaultsOf, validateSlug, } from '@maka/core/llm-connections';
 import { CONNECTION_NAME_MAX_LENGTH } from '@maka/core/runtime-policy';
 import { ansi, editorTheme, selectListTheme, stripAnsi } from './tui-ansi.js';
+import { stripUnfocusedCursorStyle } from './tui-editor-render.js';
 import { TUI_COPY_RESOURCES } from './tui-copy-catalog.js';
 const TUI_PICKER_COPY = resolveUiMessageCatalog(defineUiMessageCatalog()(TUI_COPY_RESOURCES.pickers));
 export function onboardingFailureMessage(failure, locale) {
@@ -433,22 +434,13 @@ export class UserQuestionOverlay {
         return assemble(cappedTitle, optionRows.map((rows) => clampRowsWithEllipsis(rows, perOption, safeWidth)));
     }
     renderInputRow(width) {
-        const prefix = this.onInputRow ? '→ ' : '  ';
-        const contentWidth = Math.max(1, width - USER_QUESTION_ROW_PREFIX_WIDTH);
-        // Focused only while the input row is highlighted: that both shows the block
-        // cursor and emits the hardware-cursor marker (#1064) so IME candidate windows
-        // anchor to the edited text instead of the terminal bottom.
+        const marker = this.onInputRow ? '→' : ' ';
+        // Focus controls the IME marker and our cursor-visibility adapter (#1064).
         this.editor.focused = this.onInputRow;
         if (!this.onInputRow && this.editor.getText().length === 0) {
-            return [padLine(`${prefix}${ansi.dim(this.input.placeholder)}`, width)];
+            return [padLine(`${marker} ${ansi.dim(this.input.placeholder)}`, width)];
         }
-        // Drop the editor's own top/bottom border rows; keep just its content lines
-        // so the answer reads as one row of the list.
-        const editorLines = this.editor.render(contentWidth).slice(1, -1);
-        if (editorLines.length === 0) {
-            return [padLine(`${prefix}${ansi.dim(this.input.placeholder)}`, width)];
-        }
-        return editorLines.map((line, index) => padLine(`${index === 0 ? prefix : '  '}${line}`, width));
+        return renderFieldRow(this.editor, marker, width);
     }
 }
 export function modelPickerItems(currentModel, models, locale) {
@@ -552,6 +544,107 @@ function matchesModelChoice(choice, query) {
         return true;
     return false;
 }
+export class SessionSearchOverlay {
+    tui;
+    input;
+    renderWidth = 0;
+    searchEditor;
+    copy;
+    choices;
+    filtered;
+    list;
+    selectedValue;
+    scopeLabel;
+    constructor(tui, input) {
+        this.tui = tui;
+        this.input = input;
+        this.copy = getTuiPickerCopy(input.locale);
+        this.choices = input.choices;
+        this.filtered = input.choices;
+        this.scopeLabel = input.scopeLabel;
+        this.list = this.buildList();
+        this.searchEditor = new Editor(tui, editorTheme(), { paddingX: 0 });
+        this.searchEditor.onChange = (text) => this.applyQuery(text);
+    }
+    updateChoices(choices, scopeLabel) {
+        this.choices = choices;
+        this.scopeLabel = scopeLabel;
+        this.applyQuery(this.searchEditor.getText());
+    }
+    buildList() {
+        const list = new SelectList(this.filtered.map(({ item }) => item), 10, selectListTheme(), {
+            minPrimaryColumnWidth: 20,
+            maxPrimaryColumnWidth: Math.max(20, this.renderWidth - 30),
+        });
+        const selectedIndex = this.filtered.findIndex(({ item }) => item.value === this.selectedValue);
+        if (selectedIndex >= 0)
+            list.setSelectedIndex(selectedIndex);
+        list.onSelectionChange = (item) => {
+            this.selectedValue = item.value;
+        };
+        list.onSelect = (item) => {
+            this.selectedValue = item.value;
+            this.input.onSelect(item);
+        };
+        list.onCancel = () => this.input.onCancel();
+        return list;
+    }
+    applyQuery(text) {
+        const query = text.trim().toLocaleLowerCase();
+        this.filtered = query
+            ? this.choices.filter((choice) => choice.searchText.includes(query))
+            : this.choices;
+        this.list = this.buildList();
+    }
+    invalidate() {
+        this.searchEditor.invalidate();
+        this.list.invalidate();
+    }
+    handleInput(data) {
+        if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl('c'))) {
+            this.input.onCancel();
+            return;
+        }
+        if (matchesKey(data, Key.tab) && !isKeyRelease(data) && !isKeyRepeat(data)) {
+            this.input.onToggleScope();
+            return;
+        }
+        if (matchesKey(data, Key.up) || matchesKey(data, Key.down) || matchesKey(data, Key.enter)) {
+            if (matchesKey(data, Key.enter) && isKeyRepeat(data))
+                return;
+            this.list.handleInput(data);
+            return;
+        }
+        this.searchEditor.handleInput(data);
+    }
+    render(width) {
+        const safeWidth = Math.max(1, width);
+        if (safeWidth !== this.renderWidth) {
+            this.renderWidth = safeWidth;
+            this.list = this.buildList();
+        }
+        this.searchEditor.focused = true;
+        return [
+            padLine(`${this.copy.resumeSessionTitle} ${ansi.accent(this.scopeLabel)}`, safeWidth),
+            padLine(ansi.dim(this.copy.sessionSearchHint), safeWidth),
+            padLine('', safeWidth),
+            ...this.renderFieldRow(safeWidth),
+            padLine('', safeWidth),
+            ...(this.filtered.length === 0
+                ? [padLine(ansi.dim(this.copy.noMatchingSessions), safeWidth)]
+                : this.list.render(safeWidth).map((line) => formatPickerItemLine(line, safeWidth))),
+            padLine(ansi.accent('-'.repeat(safeWidth)), safeWidth),
+        ];
+    }
+    renderFieldRow(width) {
+        const prefix = `${this.copy.searchLabel} `;
+        const contentWidth = Math.max(1, width - visibleWidth(prefix));
+        const editorLines = this.searchEditor.render(contentWidth).slice(1, -1);
+        return editorLines.length > 0
+            ? editorLines.map((line, index) => padLine(`${index === 0 ? prefix : ' '.repeat(prefix.length)}${line}`, width))
+            : [padLine(prefix, width)];
+    }
+}
 export function getTuiPickerCopy(locale) {
     return TUI_PICKER_COPY[locale];
 }
@@ -649,14 +742,7 @@ export class ModelSearchOverlay {
         ];
     }
     renderFieldRow(editor, label, width) {
-        const prefix = `${label} `;
-        const prefixWidth = visibleWidth(prefix);
-        const contentWidth = Math.max(1, width - prefixWidth);
-        const editorLines = editor.render(contentWidth).slice(1, -1);
-        if (editorLines.length === 0) {
-            return [padLine(prefix, width)];
-        }
-        return editorLines.map((line, index) => padLine(`${index === 0 ? prefix : ' '.repeat(prefixWidth)}${line}`, width));
+        return renderFieldRow(editor, label, width);
     }
 }
 /**
@@ -772,6 +858,18 @@ function padLine(text, width) {
     const trimmed = visibleWidth(text) > safeWidth ? truncateToWidth(text, safeWidth, '') : text;
     return `${trimmed}${' '.repeat(Math.max(0, safeWidth - visibleWidth(trimmed)))}`;
 }
+function renderFieldRow(editor, label, width) {
+    const prefix = `${label} `;
+    const prefixWidth = visibleWidth(prefix);
+    const contentWidth = Math.max(1, width - prefixWidth);
+    // These field editors have no autocomplete rows. Keep Editor's wrapping and
+    // scrolling, but omit its top/bottom borders.
+    const lines = editor.render(contentWidth).slice(1, -1);
+    const editorLines = stripUnfocusedCursorStyle(lines, editor.focused);
+    if (editorLines.length === 0)
+        return [padLine(prefix, width)];
+    return editorLines.map((line, index) => padLine(`${index === 0 ? prefix : ' '.repeat(prefixWidth)}${line}`, width));
+}
 function keyEntryHint(copy, hasConnection, returnsTo) {
     const action = hasConnection ? 'reuse' : 'enter';
     return copy.keyHints[action][returnsTo];
@@ -1445,13 +1543,6 @@ export class OnboardingWizard {
         ];
     }
     renderFieldRow(editor, label, width) {
-        const prefix = `${label} `;
-        const prefixWidth = visibleWidth(prefix);
-        const contentWidth = Math.max(1, width - prefixWidth);
-        const editorLines = editor.render(contentWidth).slice(1, -1);
-        if (editorLines.length === 0) {
-            return [padLine(prefix, width)];
-        }
-        return editorLines.map((line, index) => padLine(`${index === 0 ? prefix : ' '.repeat(prefixWidth)}${line}`, width));
+        return renderFieldRow(editor, label, width);
     }
 }