maka-agent 0.2.0-dev.46.20260922 → 0.2.0-dev.48.20260923

package/dist/pi-tui-layout.js

@@ -150,6 +150,13 @@ export class MakaPiLayoutComponent extends Container {
     previousLines;
     previousRows;
     previousWidth;
+    /**
+     * An in-turn question is live chrome, not a modal picker: reserving its rows
+     * keeps the transcript tail above it instead of compositing the prompt over
+     * model output. The runner owns the interaction lifecycle; this component
+     * owns the resulting terminal geometry.
+     */
+    blockingInteraction;
     constructor(state, transcript, activityStrip, pendingQueue, editor, statusLine, terminal, todoIndicator) {
         super();
         this.state = state;
@@ -168,45 +175,66 @@ export class MakaPiLayoutComponent extends Container {
         this.addChild(editor);
         this.addChild(statusLine);
     }
+    setBlockingInteraction(interaction) {
+        if (this.blockingInteraction === interaction)
+            return;
+        if (this.blockingInteraction)
+            this.removeChild(this.blockingInteraction);
+        this.blockingInteraction = interaction;
+        if (interaction)
+            this.addChild(interaction);
+    }
     render(width) {
         const transcriptLines = this.transcript.render(width);
         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 blockingInteraction = this.blockingInteraction;
+        // #1064: separate an active strip from the last transcript line. Reserve
+        // both that gap and a content row before budgeting a blocking question.
+        const activityActive = activityLines.length > 0 && activityLines.some((line) => line.length > 0);
+        const lastTranscriptLine = transcriptLines[transcriptLines.length - 1];
+        const needGap = activityActive && lastTranscriptLine !== undefined && lastTranscriptLine.length > 0;
+        const paddedTranscript = needGap ? [...transcriptLines, ''] : transcriptLines;
+        const transcriptRows = blockingInteraction
+            ? Math.min(paddedTranscript.length, needGap ? 2 : 1)
+            : 0;
+        const interactionMargin = blockingInteraction ? 1 : 0;
+        const input = blockingInteraction ?? this.editor;
+        const minimumInputRows = input.minimumViewportRows();
+        // Supplementary information yields to the active input and transcript.
         const todoLines = this.terminal.rows >
             activityLines.length +
                 allPendingLines.length +
                 statusLines.length +
-                this.editor.minimumViewportRows()
+                transcriptRows +
+                interactionMargin +
+                minimumInputRows
             ? (this.todoIndicator?.render(width) ?? []).slice(0, 1)
             : [];
-        const pendingRowsAvailable = this.editor.isShowingAutocomplete()
+        const pendingRowsAvailable = blockingInteraction || this.editor.isShowingAutocomplete()
             ? Math.max(0, this.terminal.rows -
                 activityLines.length -
                 statusLines.length -
                 todoLines.length -
-                this.editor.minimumViewportRows())
+                transcriptRows -
+                interactionMargin -
+                minimumInputRows)
             : allPendingLines.length;
         const pendingLines = fitPendingQueueLines(allPendingLines, pendingRowsAvailable);
-        this.editor.setViewportRows(this.terminal.rows -
+        input.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
-        // thinking or tool row (the agent-work stack, which has no internal blank
-        // gaps) sits directly against `Working… 12s`.
-        const activityActive = activityLines.length > 0 && activityLines.some((line) => line.length > 0);
-        const lastTranscriptLine = transcriptLines[transcriptLines.length - 1];
-        const needGap = activityActive && lastTranscriptLine !== undefined && lastTranscriptLine.length > 0;
-        const paddedTranscript = needGap ? [...transcriptLines, ''] : transcriptLines;
+            todoLines.length -
+            transcriptRows -
+            interactionMargin);
+        const inputLines = input.render(width);
         const chromeRows = activityLines.length +
             pendingLines.length +
             todoLines.length +
-            editorLines.length +
+            inputLines.length +
+            interactionMargin +
             statusLines.length;
         const viewportRows = Math.max(0, this.terminal.rows - chromeRows);
         const paddingRows = Math.max(0, viewportRows - paddedTranscript.length);
@@ -216,7 +244,8 @@ export class MakaPiLayoutComponent extends Container {
             ...activityLines,
             ...pendingLines,
             ...todoLines,
-            ...editorLines,
+            ...inputLines,
+            ...(blockingInteraction ? [''] : []),
             ...statusLines,
         ];
         // #1097: record where pi-tui's live viewport starts for this render, in

package/dist/pi-tui-pickers.js

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { CombinedAutocompleteProvider, Editor, Key, SelectList, decodeKittyPrintable, isKeyRelease, isKeyRepeat, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi, } from '@earendil-works/pi-tui';
+import { CombinedAutocompleteProvider, CURSOR_MARKER, 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';
@@ -333,6 +333,7 @@ const USER_QUESTION_ROW_PREFIX_WIDTH = 2;
 export class UserQuestionOverlay {
     input;
     editor;
+    viewportRows = Number.POSITIVE_INFINITY;
     // Highlight index over [0, options.length]. `options.length` is the input row.
     activeIndex = 0;
     constructor(tui, input) {
@@ -352,6 +353,13 @@ export class UserQuestionOverlay {
     get inputRowIndex() {
         return this.input.options.length;
     }
+    minimumViewportRows() {
+        // One title, every option, the answer field, and the closing divider.
+        return this.input.options.length + 3;
+    }
+    setViewportRows(rows) {
+        this.viewportRows = Math.max(this.minimumViewportRows(), Math.floor(rows));
+    }
     get onInputRow() {
         return this.activeIndex === this.inputRowIndex;
     }
@@ -411,30 +419,33 @@ export class UserQuestionOverlay {
         const hint = padLine(ansi.dim(this.input.hint), safeWidth);
         const blank = padLine('', safeWidth);
         const divider = padLine(ansi.accent('-'.repeat(safeWidth)), safeWidth);
-        const inputRows = this.renderInputRow(safeWidth);
+        const allInputRows = this.renderInputRow(safeWidth);
+        const inputBudget = Math.max(1, this.viewportRows - this.input.options.length - 2);
+        const cursorRow = Math.max(0, allInputRows.findIndex((line) => line.includes(CURSOR_MARKER)));
+        const inputStart = Math.max(0, Math.min(cursorRow, allInputRows.length - inputBudget));
+        const inputRows = allInputRows.slice(inputStart, inputStart + inputBudget);
         const optionRows = this.input.options.map((option, index) => formatUserQuestionOptionRow(option, index === this.activeIndex, safeWidth));
-        const assemble = (title, options) => [
+        const assemble = (title, options, help = [hint, blank]) => [
             ...title,
-            hint,
-            blank,
+            ...help,
             ...options.flat(),
             ...inputRows,
             divider,
         ];
         const full = assemble(titleLines, optionRows);
-        const budget = this.input.maxRows?.() ?? Number.POSITIVE_INFINITY;
+        const budget = this.viewportRows;
         if (full.length <= budget)
             return full;
-        // Over budget pi-tui would slice(0, maxHeight) — silently dropping the
-        // input row and divider. Degrade instead: cap the title at two lines and
-        // give every option an equal share of the remaining rows, each ending in
-        // a visible ellipsis when clamped. Only a terminal too short for one row
-        // per option still overflows, falling back to the pre-existing clip.
-        const cappedTitle = clampRowsWithEllipsis(titleLines, 2, safeWidth);
-        const fixedRows = cappedTitle.length + 2 + inputRows.length + 1;
+        // The layout owns the available height. Short screens first lose spacing
+        // and the hint, retaining the question, every choice, and the answer field.
+        const titleBudget = Math.min(2, Math.max(1, budget - this.input.options.length - inputRows.length - 3));
+        const cappedTitle = clampRowsWithEllipsis(titleLines, titleBudget, safeWidth);
+        const helpBudget = Math.max(0, budget - cappedTitle.length - this.input.options.length - inputRows.length - 1);
+        const help = [hint, blank].slice(0, helpBudget);
+        const fixedRows = cappedTitle.length + help.length + inputRows.length + 1;
         const optionBudget = Math.max(this.input.options.length, budget - fixedRows);
         const perOption = Math.max(1, Math.floor(optionBudget / Math.max(1, this.input.options.length)));
-        return assemble(cappedTitle, optionRows.map((rows) => clampRowsWithEllipsis(rows, perOption, safeWidth)));
+        return assemble(cappedTitle, optionRows.map((rows) => clampRowsWithEllipsis(rows, perOption, safeWidth)), help);
     }
     renderInputRow(width) {
         const marker = this.onInputRow ? '→' : ' ';

package/dist/pi-tui-runner.js

@@ -240,7 +240,7 @@ export async function runMakaPiTui(input) {
         };
     };
     let userQuestionInFlight = false;
-    let userQuestionOverlay;
+    let userQuestionPrompt;
     let userQuestionProgress;
     let formResponseInFlightRequestId;
     let formOverlay;
@@ -1783,9 +1783,14 @@ export async function runMakaPiTui(input) {
         maxHeight: '100%',
         margin: { bottom: BOTTOM_PICKER_MARGIN_ROWS },
     });
-    const closeUserQuestionOverlay = () => {
-        userQuestionOverlay?.hide();
-        userQuestionOverlay = undefined;
+    const closeUserQuestionPrompt = () => {
+        const prompt = userQuestionPrompt;
+        if (!prompt)
+            return;
+        layout.setBlockingInteraction(undefined);
+        userQuestionPrompt = undefined;
+        if (tui.getFocusedComponent() === prompt)
+            tui.setFocus(editorSurface);
     };
     const finishUserQuestion = (requestId, answers) => {
         if (userQuestionInFlight)
@@ -1796,7 +1801,7 @@ export async function runMakaPiTui(input) {
             return;
         }
         userQuestionInFlight = true;
-        closeUserQuestionOverlay();
+        closeUserQuestionPrompt();
         void respond
             .call(input.driver, { requestId, answers })
             .then(() => {
@@ -1824,36 +1829,35 @@ export async function runMakaPiTui(input) {
             finishUserQuestion(request.requestId, progress.answers);
             return;
         }
-        closeUserQuestionOverlay();
+        closeUserQuestionPrompt();
         const advance = (answer) => {
             progress.answers[progress.index] = answer;
             progress.index += 1;
             showUserQuestion();
         };
-        userQuestionOverlay = showBottomPicker(new UserQuestionOverlay(tui, {
+        userQuestionPrompt = new UserQuestionOverlay(tui, {
             title: question.question,
             rightLabel: `${progress.index + 1} / ${request.questions.length}`,
             hint: '↑↓ move · type to answer · Enter select · Esc unanswered · Ctrl+C stop',
             placeholder: 'Other: type your answer…',
             options: question.options,
-            // Live budget: terminal.rows changes on resize, so read it per render
-            // rather than at overlay construction.
-            maxRows: () => Math.max(1, terminal.rows - BOTTOM_PICKER_MARGIN_ROWS),
             onSelectOption: (index) => advance(question.options[index]?.label ?? null),
             onSubmitText: (value) => advance(value),
             onSkip: () => advance(null),
-        }));
+        });
+        layout.setBlockingInteraction(userQuestionPrompt);
+        tui.setFocus(userQuestionPrompt);
     };
-    const syncUserQuestionOverlay = () => {
+    const syncUserQuestionPrompt = () => {
         const request = activeUserQuestionRequest(state);
         if (!request) {
-            closeUserQuestionOverlay();
+            closeUserQuestionPrompt();
             userQuestionProgress = undefined;
             return;
         }
         if (userQuestionInFlight)
             return;
-        if (userQuestionProgress?.requestId !== request.requestId) {
+        if (userQuestionProgress?.requestId !== request.requestId || !userQuestionPrompt) {
             userQuestionProgress = {
                 requestId: request.requestId,
                 index: 0,
@@ -1978,7 +1982,7 @@ export async function runMakaPiTui(input) {
             transcriptOverlay?.hide();
             transcriptOverlay = undefined;
         }
-        syncUserQuestionOverlay();
+        syncUserQuestionPrompt();
         syncFormOverlay();
     };
     const showSelectPicker = (title, rightLabel, items, onSelect, options) => {
@@ -4090,6 +4094,11 @@ export async function runMakaPiTui(input) {
                 requestTurnInterrupt();
             return { consume: true };
         }
+        // AskUserQuestion is rendered inside the live layout so the transcript is
+        // not covered by a modal overlay. Keep the same input-capture boundary as
+        // the old overlay while the prompt owns focus.
+        if (userQuestionPrompt)
+            return undefined;
         if (tui.hasOverlay())
             return undefined;
         if (sideConversation && matchesSideConversationToggle(data)) {

package/dist/runtime-host-capability-provider-command.js

@@ -22,7 +22,7 @@ import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { createCredentialMcpOAuthStorage, formatMcpDiagnosticText, McpClientManager, } from '@maka/mcp';
 import { createFileCredentialStore } from '@maka/storage/credential-store';
-import { normalizeMcpConfig } from '@maka/storage/mcp-config-store';
+import { normalizeMcpConfig, subscribeMcpConfigFileChanges } from '@maka/storage/mcp-config-store';
 import { connectRemoteRuntimeHost, loadOrCreateRuntimeHostClientInstanceId, remoteRuntimeHostUnavailableError, RuntimeHostPermanentReconnectError, startRuntimeHostCapabilityProviderService, } from '@maka/runtime-host/client';
 import { INTERACTIVE_RUNTIME_HOST_COMPOSITION_ID, RUNTIME_HOST_COMPATIBILITY_EPOCH, RUNTIME_HOST_PROTOCOL_VERSION, } from '@maka/runtime-host/protocol';
 import { runRuntimeHostProcessLifecycle } from '@maka/runtime-host/server';
@@ -39,11 +39,14 @@ export async function runRuntimeHostCapabilityProviderCli(options) {
     const credential = process.env[credentialEnv];
     if (!credential)
         throw new Error(`Runtime Host access credential is missing from ${credentialEnv}`);
-    const configText = await readFile(configPath, 'utf8');
-    if (Buffer.byteLength(configText, 'utf8') > MAX_MCP_CONFIG_BYTES) {
-        throw new Error('MCP config exceeds 1 MiB');
-    }
-    const config = normalizeMcpConfig(JSON.parse(configText));
+    const readConfig = async () => {
+        const configText = await readFile(configPath, 'utf8');
+        if (Buffer.byteLength(configText, 'utf8') > MAX_MCP_CONFIG_BYTES) {
+            throw new Error('MCP config exceeds 1 MiB');
+        }
+        return normalizeMcpConfig(JSON.parse(configText));
+    };
+    const config = await readConfig();
     const clientInstanceId = await loadOrCreateRuntimeHostClientInstanceId(identityPath);
     const manager = new McpClientManager({
         clientName: 'maka-capability-provider',
@@ -55,6 +58,21 @@ export async function runRuntimeHostCapabilityProviderCli(options) {
         oauthStorage: createCredentialMcpOAuthStorage(createFileCredentialStore(dirname(configPath))),
     });
     await manager.sync(config);
+    // Desktop and the TUI edit this file while the provider runs. One change is
+    // read and applied at a time, so an older read never lands last.
+    let following = Promise.resolve();
+    const stopFollowing = subscribeMcpConfigFileChanges(configPath, (error) => {
+        if (error) {
+            process.stderr.write(`MCP config is no longer followed: ${error.message}\n`);
+            return;
+        }
+        following = following
+            .then(async () => manager.sync(await readConfig()))
+            .catch((failure) => {
+            const message = failure instanceof Error ? failure.message : String(failure);
+            process.stderr.write(`MCP config change was not applied: ${message}\n`);
+        });
+    });
     let service;
     let publishedRevision = manager.toolSnapshot().revision;
     const disposeChanges = manager.onChange(() => {
@@ -100,6 +118,7 @@ export async function runRuntimeHostCapabilityProviderCli(options) {
     }
     finally {
         clearInterval(reconnectTimer);
+        stopFollowing();
         disposeChanges();
         await service?.close().catch(() => undefined);
         await manager.close();

package/dist/runtime-host-service-manager.js

@@ -24,9 +24,10 @@ import { mkdir, open, readFile, realpath, rename, rm, stat, unlink, } from 'node
 import { homedir } from 'node:os';
 import { dirname, isAbsolute, join, resolve } from 'node:path';
 import { truncateUtf8 } from '@maka/core/diagnostic-log';
+import { redactSecrets } from '@maka/core/redaction';
 import { canonicalProjectDirectoryRootSpec, isCanonicalRuntimeHostWebSocketPath, PROJECT_DIRECTORY_MAX_ROOTS, projectDirectoryRootSpecValid, RUNTIME_HOST_PROTOCOL_VERSION, } from '@maka/runtime-host/protocol';
 import { connectExistingRuntimeHost, prepareConnectedRuntimeHostRetirement, } from '@maka/runtime-host/client';
-import { resolveRuntimeHostManagedServiceId, RUNTIME_HOST_SERVICE_LOG_MAX_BYTES, } from '@maka/runtime-host/operator';
+import { resolveRuntimeHostManagedServiceId, RUNTIME_HOST_SERVICE_LOG_MAX_BYTES, RUNTIME_HOST_SERVICE_ERROR_MESSAGE_MAX_BYTES, } from '@maka/runtime-host/operator';
 import { withProcessLifetimeFileUpdateLock } from '@maka/storage/process-lifetime-file-update-lock';
 import { discoverMarkedStorageRoot, resolveExistingStorageRoot, tryAcquireInteractiveRootOwner, } from '@maka/storage/root-authority';
 import { isRuntimeHostManagedDeploymentCli, removeRuntimeHostManagedDeployment, resolveExistingRuntimeHostManagedDeploymentRoot, resolveRuntimeHostManagedDeploymentForCli, resolveRuntimeHostManagedDeploymentRoot, } from './runtime-host-managed-deployment.js';
@@ -39,6 +40,7 @@ const DEFAULT_WEBSOCKET_PATH = '/runtime-host';
 const SERVICE_OPERATION_LOCK_TIMEOUT_MS = 60_000;
 const SERVICE_READY_TIMEOUT_MS = 45_000;
 const SERVICE_READY_POLL_MS = 50;
+const SERVICE_READINESS_LOG_MAX_BYTES = 1_024;
 export class RuntimeHostServiceManagerError extends Error {
     code;
     constructor(code, message, options) {
@@ -451,6 +453,17 @@ export function formatRuntimeHostServiceLogs(sources) {
     })
         .join('\n');
 }
+export function formatRuntimeHostServiceReadinessDiagnostic(input) {
+    const lines = [`Runtime Host service did not become ready: ${redactSecrets(input.lastFailure)}`];
+    if (input.status) {
+        lines.push(`service state: ${input.status.state}; active: ${String(input.status.active)}; pid: ${input.status.pid ?? 'none'}; last exit code: ${input.status.lastExitCode ?? 'unknown'}`);
+    }
+    if (input.logs?.trim()) {
+        const safeLogs = takeUtf8Tail(redactSecrets(input.logs.trim()), SERVICE_READINESS_LOG_MAX_BYTES);
+        lines.push(`service logs (tail):\n${safeLogs}`);
+    }
+    return truncateUtf8(lines.join('\n'), RUNTIME_HOST_SERVICE_ERROR_MESSAGE_MAX_BYTES, '\n<diagnostic truncated>');
+}
 function takeUtf8Tail(value, maximumBytes) {
     const encoded = Buffer.from(value);
     if (encoded.byteLength <= maximumBytes)
@@ -738,7 +751,18 @@ export async function verifyRuntimeHostManagedServiceReady(config, backend) {
         }
         await new Promise((resolveWait) => setTimeout(resolveWait, SERVICE_READY_POLL_MS));
     }
-    throw new RuntimeHostServiceManagerError('service_manager_operation_failed', `Runtime Host service did not become ready: ${lastFailure}`);
+    throw new RuntimeHostServiceManagerError('service_manager_operation_failed', await formatRuntimeHostServiceReadinessFailure(lastFailure, backend));
+}
+async function formatRuntimeHostServiceReadinessFailure(lastFailure, backend) {
+    const [status, logs] = await Promise.all([
+        backend.status().catch(() => undefined),
+        backend.logs().catch(() => undefined),
+    ]);
+    return formatRuntimeHostServiceReadinessDiagnostic({
+        lastFailure,
+        status,
+        logs,
+    });
 }
 async function prepareRuntimeHostRetirement(config, expectedPid, allowInterruptActiveTasks) {
     const connected = await connectExistingRuntimeHost({

package/dist/tui-context-refresh.js

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { createRefreshReadCoordinator } from '@maka/core/refresh-read-coordinator';
 /**
  * How full the context is right now, re-asked mid-turn (#4545).
  *
@@ -55,44 +56,32 @@ export function isCtxRefreshRelevantEvent(event) {
 export const CTX_REFRESH_DEBOUNCE_MS = 400;
 /**
  * Coalesces a burst of refresh-worthy events into one query, and lets only
- * the latest issued query apply. A query that resolves after a newer one was
- * issued — or after `cancel` retired it — is dropped: the answer a slow read
- * brings back describes an older snapshot than the one already shown, and a
- * torn-down session is not owed an update at all. A failed query leaves the
- * last value standing: it is still the newest answer anyone has.
+ * the latest valid query apply. A query that resolves after a newer one was
+ * issued, after a relevant event invalidated it, or after `cancel` retired it
+ * is dropped: the answer a slow read brings back describes an older snapshot
+ * than the one already shown, and a torn-down session is not owed an update
+ * at all. A failed query leaves the last value standing: it is still the
+ * newest answer anyone has.
  *
  * The scheduler is injected so the policy is testable without a wall clock,
  * and follows the CLI's ticker convention: schedule returns the cancel.
  */
 export function createCtxRefresher(input) {
-    let cancelScheduled;
-    let revision = 0;
-    const dropScheduled = () => {
-        cancelScheduled?.();
-        cancelScheduled = undefined;
-    };
-    const run = () => {
-        cancelScheduled = undefined;
-        const requestRevision = ++revision;
-        void input.query().then((result) => {
-            if (requestRevision !== revision)
-                return;
-            input.apply(result);
-        }, () => { });
-    };
+    const coordinator = createRefreshReadCoordinator({
+        read: input.query,
+        apply: input.apply,
+        delayMs: input.delayMs,
+        schedule: input.schedule,
+    });
     return {
         observe(event) {
             if (!isCtxRefreshRelevantEvent(event))
                 return;
             // Restart rather than stack: the last event of a burst is the one whose
             // snapshot the reader wants, and an earlier timer would read before it.
-            dropScheduled();
-            cancelScheduled = input.schedule(run, input.delayMs);
-        },
-        cancel() {
-            dropScheduled();
-            revision += 1;
+            coordinator.observe();
         },
+        cancel: coordinator.cancel,
     };
 }
 /** Default one-shot timer; unref'd so a pending refresh never holds the CLI open. */