maka-agent 0.2.0-dev.14.20260902 → 0.2.0-dev.16.20260903

package/dist/pi-tui-runner.js

@@ -20,6 +20,7 @@ import { randomUUID } from 'node:crypto';
 import { basename } from 'node:path';
 import { Key, ProcessTerminal, SelectList, TuiMainScreen, isKeyRelease, isKeyRepeat, matchesKey, } from '@earendil-works/pi-tui';
 import { isThinkingLevel } from '@maka/core/model-thinking';
+import { deriveConnectionSlug, } from '@maka/core/llm-connections';
 import { projectRevisionLinkedSessionTree } from '@maka/core/session-revisions';
 import { slashCommandsForSurface, } from '@maka/core/slash-command-catalog';
 import { latestAssistantModelId, } from '@maka/core/session';
@@ -32,7 +33,8 @@ import { parseGraphCommand } from '@maka/core/graph-command';
 import { parseSwarmCommand } from '@maka/core/swarm-command';
 import { inspectSessionResumeAvailability, } from './session-driver.js';
 import { SafeBoundaryResumeParkedError } from './runtime-host-session-driver.js';
-import { appendExpansionCollapseConfirmation, appendTurnFailureToTranscript, appendUserCommandToTranscript, appendUserPrompt, applyMakaSessionEventToTranscript, applyShellRunUpdateToTranscript, createMakaPiTranscriptState, hasRunningUserCommand, activeSandboxBoundaryRequest, activeUserQuestionRequest, applyExpansionDefaultToAll, completePendingInteraction, applyShellRunViewUpdateToTranscript, EXPANSION_COLLAPSE_CONFIRM_WINDOW_MS, hasExpandedEntriesAboveViewport, permissionModeLabel, retireCancelledTransientMessages, replaceTranscriptWithStoredMessages, hydrateToolsWithStoredMessages, submitCompactToTranscript, toggleAllThinkingExpansion, toggleAllToolExpansion, } from './pi-transcript.js';
+import { appendExpansionCollapseConfirmation, appendTurnFailureToTranscript, appendUserCommandToTranscript, appendUserPrompt, applyMakaSessionEventToTranscript, applyShellRunUpdateToTranscript, createMakaPiTranscriptState, hasRunningUserCommand, activeSandboxBoundaryRequest, activeFormRequest, activeUserQuestionRequest, applyExpansionDefaultToAll, completePendingInteraction, applyShellRunViewUpdateToTranscript, EXPANSION_COLLAPSE_CONFIRM_WINDOW_MS, hasExpandedEntriesAboveViewport, permissionModeLabel, retireCancelledTransientMessages, replaceTranscriptWithStoredMessages, hydrateToolsWithStoredMessages, submitCompactToTranscript, toggleAllThinkingExpansion, toggleAllToolExpansion, } from './pi-transcript.js';
+import { FormInteractionOverlay } from './pi-tui-form-interaction.js';
 import { runMakaPiTuiTurn } from './pi-tui-turn.js';
 import { editorTheme, selectListTheme } from './tui-ansi.js';
 import { MakaAutocompleteAboveEditorComponent } from './tui-autocomplete-layout.js';
@@ -42,6 +44,7 @@ import { getTuiCopyCopy, lastAssistantText, serializeTranscriptText } from './tu
 import { McpManagementOverlay } from './pi-tui-mcp-status.js';
 import { createShellRunElapsedTicker } from './shell-run-elapsed-ticker.js';
 import { createShellRunHydrationController } from './shell-run-hydration.js';
+import { CTX_REFRESH_DEBOUNCE_MS, createCtxRefresher, scheduleCtxRefreshTimeout, } from './tui-context-refresh.js';
 import { sessionStatusBadge } from './tui-session-status.js';
 import { AttentionController, DISABLE_FOCUS_REPORTING, ENABLE_FOCUS_REPORTING, FOCUS_IN_SEQUENCE, FOCUS_OUT_SEQUENCE, } from './tui-attention.js';
 import { MakaActivityStripComponent, MakaPendingQueueComponent, MakaPiLayoutComponent, MakaStatusLineComponent, MakaTranscriptComponent, } from './pi-tui-layout.js';
@@ -184,6 +187,13 @@ export async function runMakaPiTui(input) {
     let userQuestionInFlight = false;
     let userQuestionOverlay;
     let userQuestionProgress;
+    let formResponseInFlightRequestId;
+    let formOverlay;
+    let formOverlayComponent;
+    let formOverlayRequestId;
+    let formOverlaySessionId;
+    let formOverlaySchema;
+    let retainedFormDraft;
     let turnRunning = false;
     // Monotonic generation for visible agent turns. A mid-turn `/session`
     // switch-away (#3380) bumps it to orphan the in-flight drain: every callback
@@ -369,7 +379,7 @@ export async function runMakaPiTui(input) {
             return;
         }
         permissionResponseInFlightRequestId = null;
-        syncUserQuestionOverlay();
+        syncInteractionOverlays();
         requestRender();
     }) ?? (() => { });
     const unsubscribeTranscriptReplacements = input.driver.subscribeTranscriptReplacements?.((sessionId, turnId, messages, reason) => {
@@ -377,6 +387,7 @@ export async function runMakaPiTui(input) {
             return;
         if (reason === 'reconnect') {
             replaceTranscript(messages, { preserveClientLocalEntries: true });
+            syncInteractionOverlays();
             shellRunElapsedTicker.sync();
             requestRender();
             const messageIds = state.entries.flatMap((entry) => entry.kind === 'user' && entry.transient === true ? [entry.messageId] : []);
@@ -405,6 +416,40 @@ export async function runMakaPiTui(input) {
         now: input.shellRunTicker?.now,
         schedule: input.shellRunTicker?.schedule,
     });
+    // Live ctx refresh (#4545): the end-of-turn token_usage event moves the
+    // statusline once per turn, but the Host's latest-context snapshot moves at
+    // every settled provider request. Pull it on the desktop inspector's signal
+    // (tui-context-refresh.ts) so a long turn shows the context filling as it
+    // fills. The query is a plain read on the driver — deliberately not routed
+    // through runControl, whose serial lock exists for mutations.
+    const getContextDiagnostics = input.driver.getContextDiagnostics?.bind(input.driver);
+    const ctxRefresher = getContextDiagnostics
+        ? createCtxRefresher({
+            query: async () => {
+                const sessionId = input.driver.getSessionId();
+                const diagnostics = await getContextDiagnostics();
+                return { sessionId, diagnostics };
+            },
+            apply: ({ sessionId, diagnostics }) => {
+                // The session moved under the query (switch, /new): its usage was
+                // rebuilt from stored messages, and a pre-switch snapshot must not
+                // overwrite it.
+                if (closed || input.driver.getSessionId() !== sessionId)
+                    return;
+                if (diagnostics.status !== 'available')
+                    return;
+                const { inputTokens, contextWindow } = diagnostics;
+                if (inputTokens === undefined || contextWindow === undefined || contextWindow <= 0)
+                    return;
+                // Same formula the token_usage path uses (#1067), from the same
+                // settled request — the two cannot disagree.
+                state.usage.contextRemaining = Math.max(0, contextWindow - inputTokens);
+                requestRender();
+            },
+            delayMs: input.ctxRefreshTicker?.delayMs ?? CTX_REFRESH_DEBOUNCE_MS,
+            schedule: input.ctxRefreshTicker?.schedule ?? scheduleCtxRefreshTimeout,
+        })
+        : undefined;
     // ── Explicit skill invocation (#1148) ────────────────────────────────────
     // One cached list feeds autocomplete, the `/skill` picker, and the editor's
     // sync highlight validator. The cache is keyed by cwd (project-level skill
@@ -568,6 +613,7 @@ export async function runMakaPiTui(input) {
         unsubscribeTranscriptReplacements();
         shellRunHydration.dispose();
         shellRunElapsedTicker.dispose();
+        ctxRefresher?.cancel();
         stopTurnElapsedTicker();
         setTaskbarProgress(false);
         // Drop the busy / attention title marker so the tab is not handed back to
@@ -859,6 +905,10 @@ export async function runMakaPiTui(input) {
     // The existing connection the picked provider resolved to, so saving edits
     // it in place (a Desktop-created relay may live under a custom slug).
     let wizardTarget;
+    // The identity step's answer for a create target. Null halves keep the wire
+    // target bare so any Host vintage accepts it; an edited slug/name rides on
+    // the target and gets `slug_taken` back when it loses.
+    let wizardIdentity = { slug: null, name: null };
     let wizardModels = [];
     // Authoritative ready model choices for `/model`. A startup snapshot refreshed
     // in place after `/setup` saves so newly configured models are immediately
@@ -1043,6 +1093,7 @@ export async function runMakaPiTui(input) {
                     replaceTranscript(authoritativeAttachedTurn.messages, {
                         preserveClientLocalEntries: true,
                     });
+                    syncInteractionOverlays();
                     shellRunHydration.reset();
                     if (input.listShellRunUpdates) {
                         await shellRunHydration.hydrate(authoritativeAttachedTurn.sessionId);
@@ -1067,11 +1118,14 @@ export async function runMakaPiTui(input) {
                 // not reach the adopted Session's transcript or overlays.
                 if (superseded())
                     return;
-                if ((event.type === 'sandbox_boundary_request' || event.type === 'user_question_request') &&
+                if ((event.type === 'sandbox_boundary_request' ||
+                    event.type === 'user_question_request' ||
+                    event.type === 'form_request') &&
                     resolvedInteractionIds.delete(event.requestId)) {
                     return;
                 }
                 applyMakaSessionEventToTranscript(state, event);
+                ctxRefresher?.observe(event);
                 if (event.type === 'error')
                     attention.attentionNeeded();
                 if (permissionResponseInFlightRequestId !== null &&
@@ -1091,7 +1145,7 @@ export async function runMakaPiTui(input) {
                     permissionAlerted = false;
                 }
                 shellRunElapsedTicker.sync();
-                syncUserQuestionOverlay();
+                syncInteractionOverlays();
                 requestRender();
             },
             // A turn failing is worth pulling the user back, regardless of how long it
@@ -1106,7 +1160,7 @@ export async function runMakaPiTui(input) {
                 appendTurnFailureToTranscript(state, error);
                 attention.attentionNeeded();
                 shellRunElapsedTicker.sync();
-                syncUserQuestionOverlay();
+                syncInteractionOverlays();
                 requestRender();
             },
         }).then(async (outcome) => {
@@ -1246,6 +1300,7 @@ export async function runMakaPiTui(input) {
     const applySwitchResult = async ({ summary, messages, activeTurn, }) => {
         adoptSessionMetadata(summary, false);
         replaceTranscript(messages);
+        syncInteractionOverlays();
         if (connectionIdentityNotice) {
             state.entries.push({ kind: 'notice', level: 'error', text: connectionIdentityNotice });
         }
@@ -1606,7 +1661,10 @@ export async function runMakaPiTui(input) {
     const showBottomPicker = (picker) => tui.showOverlay(picker, {
         anchor: 'bottom-left',
         width: '100%',
-        maxHeight: Math.max(1, terminal.rows - BOTTOM_PICKER_MARGIN_ROWS),
+        // A numeric cap would freeze today's rows into the option; '100%' is
+        // re-resolved against the live terminal height on every composite, so
+        // after a resize the cap still lands at rows - margin (#4610 review).
+        maxHeight: '100%',
         margin: { bottom: BOTTOM_PICKER_MARGIN_ROWS },
     });
     const closeUserQuestionOverlay = () => {
@@ -1631,13 +1689,13 @@ export async function runMakaPiTui(input) {
                 completePendingInteraction(state, requestId);
             }
             userQuestionProgress = undefined;
-            syncUserQuestionOverlay();
+            syncInteractionOverlays();
             requestRender();
         })
             .catch((error) => {
             userQuestionInFlight = false;
             reportError(error);
-            syncUserQuestionOverlay();
+            syncInteractionOverlays();
         });
     };
     const showUserQuestion = () => {
@@ -1662,6 +1720,9 @@ export async function runMakaPiTui(input) {
             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),
@@ -1685,6 +1746,120 @@ export async function runMakaPiTui(input) {
             showUserQuestion();
         }
     };
+    const closeFormOverlay = (retainDraft = true) => {
+        if (retainDraft &&
+            formOverlayComponent &&
+            formOverlaySessionId &&
+            formOverlayRequestId &&
+            formOverlaySchema) {
+            retainedFormDraft = {
+                sessionId: formOverlaySessionId,
+                requestId: formOverlayRequestId,
+                schema: formOverlaySchema,
+                drafts: formOverlayComponent.snapshotDrafts(),
+            };
+        }
+        formOverlay?.hide();
+        formOverlay = undefined;
+        formOverlayComponent = undefined;
+        formOverlayRequestId = undefined;
+        formOverlaySessionId = undefined;
+        formOverlaySchema = undefined;
+    };
+    const finishUserForm = (response) => {
+        if (formResponseInFlightRequestId)
+            return;
+        const respond = input.driver.respondToUserForm;
+        if (!respond) {
+            formOverlayComponent?.setSubmissionFailed();
+            reportError(new Error('User forms are unavailable on this driver.'));
+            return;
+        }
+        const responseSessionId = formOverlaySessionId ?? input.driver.getSessionId();
+        formResponseInFlightRequestId = response.requestId;
+        void respond
+            .call(input.driver, response)
+            .then(() => {
+            if (formResponseInFlightRequestId === response.requestId) {
+                formResponseInFlightRequestId = undefined;
+            }
+            if (input.driver.getSessionId() === responseSessionId &&
+                activeFormRequest(state)?.requestId === response.requestId) {
+                completePendingInteraction(state, response.requestId);
+            }
+            if (retainedFormDraft?.sessionId === responseSessionId &&
+                retainedFormDraft.requestId === response.requestId) {
+                retainedFormDraft = undefined;
+            }
+            if (formOverlaySessionId === responseSessionId &&
+                formOverlayRequestId === response.requestId) {
+                closeFormOverlay(false);
+            }
+            syncInteractionOverlays();
+            requestRender();
+        })
+            .catch((error) => {
+            if (formResponseInFlightRequestId === response.requestId) {
+                formResponseInFlightRequestId = undefined;
+            }
+            if (activeFormRequest(state)?.requestId === response.requestId &&
+                formOverlaySessionId === responseSessionId &&
+                formOverlayRequestId === response.requestId) {
+                formOverlayComponent?.setSubmissionFailed();
+            }
+            else {
+                closeFormOverlay();
+                syncInteractionOverlays();
+            }
+            reportError(error);
+            requestRender();
+        });
+    };
+    const syncFormOverlay = () => {
+        const request = activeFormRequest(state);
+        if (!request) {
+            closeFormOverlay();
+            return;
+        }
+        const sessionId = input.driver.getSessionId();
+        if (!sessionId) {
+            closeFormOverlay();
+            return;
+        }
+        if (retainedFormDraft?.sessionId === sessionId &&
+            retainedFormDraft.requestId !== request.requestId) {
+            retainedFormDraft = undefined;
+        }
+        if (formOverlaySessionId !== sessionId || formOverlayRequestId !== request.requestId)
+            closeFormOverlay();
+        if (formResponseInFlightRequestId || formOverlayComponent)
+            return;
+        const schema = JSON.stringify(request.fields);
+        const restoredDrafts = retainedFormDraft?.sessionId === sessionId &&
+            retainedFormDraft.requestId === request.requestId &&
+            retainedFormDraft.schema === schema
+            ? retainedFormDraft.drafts
+            : undefined;
+        if (retainedFormDraft?.sessionId === sessionId &&
+            retainedFormDraft.requestId === request.requestId &&
+            retainedFormDraft.schema !== schema) {
+            retainedFormDraft = undefined;
+        }
+        formOverlayComponent = new FormInteractionOverlay(tui, {
+            locale,
+            request,
+            initialDrafts: restoredDrafts,
+            onRespond: finishUserForm,
+        });
+        formOverlaySessionId = sessionId;
+        formOverlaySchema = schema;
+        formOverlayRequestId = request.requestId;
+        formOverlay = showBottomPicker(formOverlayComponent);
+    };
+    const syncInteractionOverlays = () => {
+        syncUserQuestionOverlay();
+        syncFormOverlay();
+    };
     const showSelectPicker = (title, rightLabel, items, onSelect, options) => {
         const list = new SelectList(items, 10, selectListTheme(), {
             minPrimaryColumnWidth: options.minPrimaryColumnWidth,
@@ -1717,6 +1892,7 @@ export async function runMakaPiTui(input) {
         wizardApiKey = '';
         wizardBaseUrl = '';
         wizardTarget = undefined;
+        wizardIdentity = { slug: null, name: null };
         wizardModels = [];
     };
     // Key submit from the wizard. Slash commands route as commands (so /exit
@@ -1745,7 +1921,13 @@ export async function runMakaPiTui(input) {
             if (closed || wizard !== targetWizard || attempt !== wizardAttempt)
                 return;
             if (result.kind !== 'ok') {
-                wizard.setKeyError(onboardingFailureMessage(result, locale));
+                // A rejected slug is the identity step's to fix, not the key's.
+                if (result.kind === 'rejected' && result.reason === 'slug_taken') {
+                    wizard.setIdentityError(onboardingFailureMessage(result, locale));
+                }
+                else {
+                    wizard.setKeyError(onboardingFailureMessage(result, locale));
+                }
                 requestRender();
                 return;
             }
@@ -1787,7 +1969,12 @@ export async function runMakaPiTui(input) {
             if (result.kind !== 'ok') {
                 if (closed || wizard !== targetWizard || attempt !== wizardAttempt)
                     return;
-                wizard.setModelError(onboardingFailureMessage(result, locale));
+                if (result.kind === 'rejected' && result.reason === 'slug_taken') {
+                    wizard.setIdentityError(onboardingFailureMessage(result, locale));
+                }
+                else {
+                    wizard.setModelError(onboardingFailureMessage(result, locale));
+                }
                 requestRender();
                 return;
             }
@@ -1845,6 +2032,7 @@ export async function runMakaPiTui(input) {
                 ...provider,
                 target: { kind: 'create', providerType: provider.providerType },
                 label: provider.label,
+                suggestedSlug: deriveConnectionSlug(provider.providerType),
                 enabledModelIds: [],
             }));
         }
@@ -1866,12 +2054,25 @@ export async function runMakaPiTui(input) {
                 // reselects the same catalog row. A late save may converge only the
                 // exact target object captured by its own submit.
                 wizardTarget = { ...provider.target };
+                wizardIdentity = { slug: null, name: null };
                 wizardApiKey = '';
                 wizardBaseUrl = '';
                 wizardModels = [];
                 wizardAttempt += 1; // a new pick supersedes any in-flight attempt
                 requestRender();
             },
+            onSubmitIdentity: (identity) => {
+                wizardIdentity = identity;
+                if (wizardTarget?.kind === 'create') {
+                    wizardTarget = {
+                        kind: 'create',
+                        providerType: wizardTarget.providerType,
+                        ...(identity.slug === null ? {} : { slug: identity.slug }),
+                        ...(identity.name === null ? {} : { name: identity.name }),
+                    };
+                }
+                requestRender();
+            },
             onSubmitBaseUrl: (baseUrl) => {
                 wizardBaseUrl = baseUrl;
                 requestRender();
@@ -2038,8 +2239,9 @@ export async function runMakaPiTui(input) {
         try {
             for await (const event of input.driver.resumeLatest()) {
                 applyMakaSessionEventToTranscript(state, event);
+                ctxRefresher?.observe(event);
                 shellRunElapsedTicker.sync();
-                syncUserQuestionOverlay();
+                syncInteractionOverlays();
                 requestRender();
             }
         }
@@ -2240,6 +2442,7 @@ export async function runMakaPiTui(input) {
         // session, send a prompt to begin" cue. A notice here would make entries
         // non-empty and suppress it.
         replaceTranscript([]);
+        syncInteractionOverlays();
         shellRunElapsedTicker.sync();
         await discardCurrentSidePair();
         requestRender();
@@ -3277,7 +3480,7 @@ export async function runMakaPiTui(input) {
                 void runControl(closeSideConversation);
             return { consume: true };
         }
-        if (activeUserQuestionRequest(state) &&
+        if ((activeUserQuestionRequest(state) || activeFormRequest(state)) &&
             turnRunning &&
             matchesKey(data, Key.ctrl('c')) &&
             !isKeyRepeat(data)) {

package/dist/runtime-host-cli.js

@@ -1347,11 +1347,8 @@ function parseProfileCommand(argv) {
     let sshRemotePort;
     let sshWebSocketPath = '/runtime-host';
     let sshWebSocketPathConfigured = false;
-    let peerId;
     let wslDistribution;
     let operatorPath;
-    const peerRouteHints = [];
-    const peerCoordinationRelays = [];
     let expectedRootId;
     let credentialEnv;
     for (let index = 1; index < argv.length; index += 1) {
@@ -1364,9 +1361,6 @@ function parseProfileCommand(argv) {
             argument !== '--ssh-port' &&
             argument !== '--ssh-remote-port' &&
             argument !== '--ssh-websocket-path' &&
-            argument !== '--peer-id' &&
-            argument !== '--peer-route' &&
-            argument !== '--peer-coordination-relay' &&
             argument !== '--wsl-distribution' &&
             argument !== '--operator-path' &&
             argument !== '--expected-root' &&
@@ -1399,12 +1393,6 @@ function parseProfileCommand(argv) {
             sshWebSocketPath = parsed;
             sshWebSocketPathConfigured = true;
         }
-        if (argument === '--peer-id')
-            peerId = parsed;
-        if (argument === '--peer-route')
-            peerRouteHints.push(parsed);
-        if (argument === '--peer-coordination-relay')
-            peerCoordinationRelays.push(parsed);
         if (argument === '--wsl-distribution')
             wslDistribution = parsed;
         if (argument === '--operator-path')
@@ -1422,10 +1410,9 @@ function parseProfileCommand(argv) {
     if ((tlsUrl ? 1 : 0) +
         (plaintextUrl ? 1 : 0) +
         (sshDestination ? 1 : 0) +
-        (peerId ? 1 : 0) +
         (wslDistribution ? 1 : 0) !==
         1) {
-        return error('exactly one of --tls-url, --plaintext-url, --ssh-destination, --peer-id, or --wsl-distribution is required');
+        return error('exactly one of --tls-url, --plaintext-url, --ssh-destination, or --wsl-distribution is required');
     }
     if (wslDistribution && !operatorPath) {
         return error('--wsl-distribution requires --operator-path');
@@ -1449,12 +1436,6 @@ function parseProfileCommand(argv) {
     if (sshDestination && !sshRemotePort) {
         return error('--ssh-destination requires --ssh-remote-port');
     }
-    if (!peerId && (peerRouteHints.length > 0 || peerCoordinationRelays.length > 0)) {
-        return error('peer route options require --peer-id');
-    }
-    if (peerId && peerRouteHints.length === 0 && peerCoordinationRelays.length === 0) {
-        return error('--peer-id requires at least one --peer-route or --peer-coordination-relay');
-    }
     if (sshPort !== undefined && (!Number.isInteger(sshPort) || sshPort < 1 || sshPort > 65_535)) {
         return error('--ssh-port must be an integer between 1 and 65535');
     }
@@ -1474,32 +1455,26 @@ function parseProfileCommand(argv) {
             expectedRootId,
         };
     }
+    const transport = tlsUrl
+        ? { kind: 'tls', url: tlsUrl }
+        : plaintextUrl
+            ? {
+                kind: 'plaintext',
+                url: plaintextUrl,
+                acknowledgement: 'plaintext-bearer-v1',
+            }
+            : {
+                kind: 'ssh',
+                destination: sshDestination,
+                ...(sshPort === undefined ? {} : { sshPort }),
+                remotePort: sshRemotePort,
+                websocketPath: sshWebSocketPath,
+            };
     return {
         kind: 'runtime-host-profile-set',
         id,
         name,
-        transport: tlsUrl
-            ? { kind: 'tls', url: tlsUrl }
-            : plaintextUrl
-                ? {
-                    kind: 'plaintext',
-                    url: plaintextUrl,
-                    acknowledgement: 'plaintext-bearer-v1',
-                }
-                : sshDestination
-                    ? {
-                        kind: 'ssh',
-                        destination: sshDestination,
-                        ...(sshPort === undefined ? {} : { sshPort }),
-                        remotePort: sshRemotePort,
-                        websocketPath: sshWebSocketPath,
-                    }
-                    : {
-                        kind: 'libp2p-direct',
-                        peerId: peerId,
-                        routeHints: peerRouteHints,
-                        coordinationRelays: peerCoordinationRelays,
-                    },
+        transport,
         expectedRootId,
         ...(credentialEnv ? { credentialEnv } : {}),
     };

package/dist/runtime-host-lifecycle-transaction.js

@@ -20,7 +20,7 @@ import { randomUUID } from 'node:crypto';
 import { join } from 'node:path';
 import { isDeepStrictEqual } from 'node:util';
 import { resolveExistingStorageRoot, tryAcquireStateRootOwner, } from '@maka/storage/root-authority';
-import { connectExistingRuntimeHost, prepareConnectedRuntimeHostRetirement, waitForRuntimeHostReady, } from '@maka/runtime-host/client';
+import { connectExistingRuntimeHost, prepareConnectedRuntimeHostRetirement, RuntimeHostOperationError, RuntimeHostRequestInterruptedError, waitForRuntimeHostReady, } from '@maka/runtime-host/client';
 import { RUNTIME_HOST_PROTOCOL_VERSION } from '@maka/runtime-host/protocol';
 import { beginRuntimeHostManagedDeploymentTransition, blockRuntimeHostManagedDeploymentTransition, commitRuntimeHostManagedDeploymentTransition, decodeRuntimeHostManagedDeploymentConfig, readRuntimeHostManagedDeploymentAuthorityRecord, resolveRuntimeHostManagedDeploymentAuthority, resolveRuntimeHostNpmDeploymentLayout, rollbackRuntimeHostManagedDeploymentTransition, RuntimeHostManagedDeploymentError, } from '@maka/runtime-host/operator';
 /** The budget a managed Runtime Host has to become reachable after its lifecycle is activated. */
@@ -198,7 +198,7 @@ export async function retireRuntimeHostLifecycleOwner(input) {
             throw error;
         }
     }
-    const connected = await connectExistingRuntimeHost({
+    const connected = await (input.connectExisting ?? connectExistingRuntimeHost)({
         rootPath: capability.canonicalPath,
         protocol: {
             min: RUNTIME_HOST_PROTOCOL_VERSION,
@@ -220,22 +220,35 @@ export async function retireRuntimeHostLifecycleOwner(input) {
         throw new RuntimeHostLifecycleTransactionError('transition_failed', `Runtime Host cannot prepare for retirement: ${connected.kind}`);
     }
     try {
-        const diagnostics = await connected.connection.request('host.diagnostics.query', {});
         const supervisorStatus = await input.supervisor?.status();
         if (supervisorStatus)
             assertExpectedSupervisorOwner(input.expectedOwner, supervisorStatus);
         if (supervisorStatus &&
-            (!supervisorStatus.active || supervisorStatus.pid !== diagnostics.pid)) {
-            throw new RuntimeHostLifecycleTransactionError('transition_failed', 'The supervisor and State Root report different Runtime Host processes');
+            (!supervisorStatus.active || supervisorStatus.pid !== connected.registration.pid)) {
+            throw new RuntimeHostLifecycleTransactionError('transition_failed', 'The supervisor and Runtime Host registration report different processes');
         }
-        // The exact Root owner and canonical supervisor now agree while the deployment lock is held.
-        // This admits retirement of that deployment; a later same-deployment restart is not a new
-        // authority, but it must not acquire the Root before the supervisor is retired.
-        const prepared = await prepareConnectedRuntimeHostRetirement(connected.connection, input.allowInterruptActiveTasks ? 'interrupt_active_work' : 'refuse_active_work');
-        if (prepared.kind === 'active_tasks')
-            return prepared;
-        if (prepared.pid !== diagnostics.pid) {
-            throw new RuntimeHostLifecycleTransactionError('transition_failed', 'The Runtime Host process changed while retirement was prepared');
+        try {
+            const diagnostics = await connected.connection.request('host.diagnostics.query', {});
+            if (diagnostics.pid !== connected.registration.pid) {
+                throw new RuntimeHostLifecycleTransactionError('transition_failed', 'The Runtime Host registration and diagnostics report different processes');
+            }
+            // The exact Root owner and canonical supervisor now agree while the deployment lock is held.
+            // This admits retirement of that deployment; a later same-deployment restart is not a new
+            // authority, but it must not acquire the Root before the supervisor is retired.
+            const prepared = await prepareConnectedRuntimeHostRetirement(connected.connection, input.allowInterruptActiveTasks ? 'interrupt_active_work' : 'refuse_active_work');
+            if (prepared.kind === 'active_tasks')
+                return prepared;
+            if (prepared.pid !== diagnostics.pid) {
+                throw new RuntimeHostLifecycleTransactionError('transition_failed', 'The Runtime Host process changed while retirement was prepared');
+            }
+        }
+        catch (error) {
+            if (!isRuntimeHostRetirementUnavailable(error) || !input.supervisor)
+                throw error;
+            if (!input.allowInterruptActiveTasks)
+                return { kind: 'active_tasks' };
+            await input.supervisor.retire();
+            return waitForRuntimeHostLifecycleOwner(capability, input.timeoutMs ?? 45_000);
         }
         const retirement = await waitForRuntimeHostLifecycleOwner(capability, input.timeoutMs ?? 45_000);
         try {
@@ -251,6 +264,11 @@ export async function retireRuntimeHostLifecycleOwner(input) {
         await connected.connection.close().catch(() => undefined);
     }
 }
+function isRuntimeHostRetirementUnavailable(error) {
+    return (error instanceof RuntimeHostRequestInterruptedError ||
+        (error instanceof RuntimeHostOperationError &&
+            (error.code === 'host_not_ready' || error.code === 'host_draining')));
+}
 function assertExpectedRuntimeHostOwner(expected, observed) {
     if (!expected)
         return;

package/dist/runtime-host-managed-lifecycle-manager.js

@@ -276,7 +276,7 @@ function absentStatus(config) {
 function presentationManager(config) {
     if (config.lifecycle.mode === 'on_demand')
         return 'on_demand';
-    return config.lifecycle.provider === 'systemd_user' ? 'systemd_user' : 'launch_agent';
+    return config.lifecycle.provider;
 }
 function projectLegacyConfig(config) {
     const layout = resolveRuntimeHostNpmDeploymentLayout(config.deploymentRoot, config.launch.package.integrity);

package/dist/runtime-host-onboarding.js

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { offerableCatalogEntries } from '@maka/core/llm-connections';
+import { deriveConnectionSlug, offerableCatalogEntries } from '@maka/core/llm-connections';
 import { readRuntimeHostConnectionCatalog, } from '@maka/runtime-host/client';
 import { listApiKeyOnboardableProviders } from './onboarding-catalog.js';
 /** Adapt the TUI onboarding workflow to Host-owned verification and persistence. */
@@ -115,6 +115,7 @@ export function projectRuntimeHostConnectionIdentities(catalog) {
 }
 export function projectProviders(catalog) {
     const entries = [];
+    const existingSlugs = catalog.connections.map((connection) => connection.slug);
     for (const provider of listApiKeyOnboardableProviders()) {
         for (const connection of catalog.connections) {
             if (connection.providerType !== provider.providerType)
@@ -131,6 +132,7 @@ export function projectProviders(catalog) {
             ...provider,
             target: { kind: 'create', providerType: provider.providerType },
             label: provider.label,
+            suggestedSlug: deriveConnectionSlug(provider.providerType, existingSlugs),
             enabledModelIds: [],
         });
     }