maka-agent 0.2.0-dev.52.20260926 → 0.2.0-dev.53.20260927

package/dist/activation-command.js

@@ -321,7 +321,11 @@ export async function runMakaActivationCli(argv, overrides = {}) {
             }, options.timeoutMs);
         try {
             const text = activationStimulusText(request.stimulus);
-            const stream = await activationStream(context.runtime, session.id, { turnId: deps.newId(), text }, existing !== undefined);
+            const stream = await activationStream(context.runtime, session.id, {
+                turnId: deps.newId(),
+                text,
+                origin: { kind: 'cloud_activation', activationId: request.activationId },
+            }, existing !== undefined && deps.automatedResumeEnabled());
             const drain = (async () => {
                 for await (const event of stream) {
                     if (sessionEventSandboxBoundaryFailureReason(event))
@@ -504,8 +508,8 @@ function activationStimulusText(stimulus) {
     }
     return JSON.stringify({ type: stimulus.type, payload });
 }
-async function activationStream(runtime, sessionId, input, allowSafeBoundaryResume) {
-    if (allowSafeBoundaryResume && runtime.resumeLatest) {
+async function activationStream(runtime, sessionId, input, allowAutomatedResume) {
+    if (allowAutomatedResume && runtime.resumeLatest) {
         const resumed = await runtime.resumeLatest(sessionId);
         if (resumed)
             return resumed;
@@ -562,6 +566,10 @@ function makaActivateHelpText() {
 }
 function defaultMakaActivationDeps() {
     return {
+        automatedResumeEnabled: () => {
+            const value = process.env.MAKA_RUNTIME_SAFE_BOUNDARY_RESUME;
+            return value === '1' || value === 'true';
+        },
         createContext: createRuntimeHostActivationContext,
         listSessions: listRuntimeHostActivationSessions,
         workspaceRoot: () => resolve(process.cwd()),

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

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Editor, Input, Key, matchesKey, truncateToWidth, visibleWidth, } from '@earendil-works/pi-tui';
+import { Editor, Input, Key, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi, } from '@earendil-works/pi-tui';
 import { generalizedErrorMessageForLocale } from '@maka/core/redaction';
 import { defineUiMessageCatalog, formatUiMessage, resolveUiMessageCatalog, } from '@maka/core/ui-locale';
 import { normalizeMcpConfig } from '@maka/storage/mcp-config-store';
@@ -40,6 +40,7 @@ export class McpManagementOverlay {
     editor;
     closed = false;
     actionAttempt = 0;
+    pendingConfigErrorPath;
     constructor(input) {
         this.input = input;
         this.dispose = input.surface?.subscribe(input.onChange) ?? (() => undefined);
@@ -59,11 +60,9 @@ export class McpManagementOverlay {
         }
         if (this.phase.kind === 'busy') {
             if (matchesKey(data, Key.escape)) {
-                this.actionAttempt += 1;
                 this.backToList();
             }
             else if (matchesKey(data, 'q')) {
-                this.actionAttempt += 1;
                 this.close();
             }
             return;
@@ -75,7 +74,9 @@ export class McpManagementOverlay {
                 this.backToList();
             return;
         }
-        if (this.phase.kind === 'list')
+        if (this.phase.kind === 'config_error')
+            this.handleTextScroll(data);
+        else if (this.phase.kind === 'list')
             this.handleListInput(data);
         else if (this.phase.kind === 'add_choice')
             this.handleAddChoice(data);
@@ -134,6 +135,14 @@ export class McpManagementOverlay {
     handleListInput(data) {
         const snapshot = this.input.surface?.snapshot();
         const servers = snapshot?.servers ?? [];
+        if (snapshot?.initialization === 'error') {
+            this.handleTextScroll(data);
+            return;
+        }
+        // A ready empty list still has explanatory text below the publication
+        // status, which must remain reachable in a short terminal.
+        if (servers.length === 0 && this.handleTextScroll(data))
+            return;
         if (matchesKey(data, Key.up)) {
             this.selected = clamp(this.selected - 1, 0, servers.length - 1);
         }
@@ -187,6 +196,25 @@ export class McpManagementOverlay {
         }
         this.input.onChange();
     }
+    handleTextScroll(data) {
+        if (matchesKey(data, Key.up))
+            this.top -= 1;
+        else if (matchesKey(data, Key.down))
+            this.top += 1;
+        else if (matchesKey(data, Key.pageUp))
+            this.top -= Math.max(1, this.bodyRows);
+        else if (matchesKey(data, Key.pageDown))
+            this.top += Math.max(1, this.bodyRows);
+        else if (matchesKey(data, Key.home))
+            this.top = 0;
+        else if (matchesKey(data, Key.end))
+            this.top = this.maxTop();
+        else
+            return false;
+        this.top = clamp(this.top, 0, this.maxTop());
+        this.input.onChange();
+        return true;
+    }
     handleAddChoice(data) {
         if (matchesKey(data, 'g'))
             this.startInput('server_id', { serverId: '' });
@@ -352,8 +380,24 @@ export class McpManagementOverlay {
         }
         if (this.closed || attempt !== this.actionAttempt)
             return;
+        if (result.status === 'failed' && result.reason === 'invalid-config-file') {
+            // Esc dismisses the busy view, not the operation or its file diagnostic.
+            // Defer presentation while the user is editing another form.
+            this.pendingConfigErrorPath = result.path;
+            this.showPendingConfigError();
+            this.input.onChange();
+            return;
+        }
+        if (result.status === 'applied' &&
+            ['add', 'edit', 'commit_import', 'set_enabled', 'remove'].includes(action.kind)) {
+            this.pendingConfigErrorPath = undefined;
+        }
+        // Do not restore a dismissed busy view for ordinary completion results.
+        if (this.phase.kind !== 'busy')
+            return;
         this.phase = { kind: 'list' };
         this.notice = actionNotice(result, this.input.locale);
+        this.showPendingConfigError();
         this.input.onChange();
     }
     document(width) {
@@ -361,6 +405,9 @@ export class McpManagementOverlay {
         const snapshot = this.input.surface?.snapshot();
         if (!snapshot)
             return unavailableDocument(this.input.locale);
+        if (this.phase.kind === 'config_error') {
+            return wrapTextWithAnsi(invalidConfigFileCopy(this.input.locale, this.phase.path), width);
+        }
         if (this.phase.kind === 'input')
             return this.inputDocument(width);
         const editor = MCP_STATUS_COPY[this.input.locale].editor;
@@ -407,7 +454,11 @@ export class McpManagementOverlay {
         if (snapshot.initialization === 'loading')
             return [...lines, loadingCopy(this.input.locale)];
         if (snapshot.initialization === 'error') {
-            return [...lines, ansi.red(loadErrorCopy(this.input.locale))];
+            lines.push(ansi.red(loadErrorCopy(this.input.locale)));
+            if (snapshot.invalidConfigPath) {
+                lines.push(...wrapTextWithAnsi(invalidConfigFileCopy(this.input.locale, snapshot.invalidConfigPath), width));
+            }
+            return lines;
         }
         if (snapshot.servers.length === 0)
             return [...lines, '', emptyCopy(this.input.locale)];
@@ -436,8 +487,12 @@ export class McpManagementOverlay {
     }
     footer() {
         const copy = MCP_STATUS_COPY[this.input.locale].footer;
+        if (this.phase.kind === 'config_error')
+            return copy.diagnostic;
         if (this.phase.kind !== 'list')
             return copy.back;
+        if (this.input.surface?.snapshot().initialization === 'error')
+            return copy.readOnly;
         if (!this.management())
             return copy.readOnly;
         return this.input.surface?.snapshot().canManagePublicationCredential
@@ -452,8 +507,18 @@ export class McpManagementOverlay {
         this.phase = { kind: 'list' };
         if (clearNotice)
             this.notice = undefined;
+        this.showPendingConfigError();
         this.input.onChange();
     }
+    showPendingConfigError() {
+        if (this.pendingConfigErrorPath === undefined ||
+            (this.phase.kind !== 'list' && this.phase.kind !== 'busy'))
+            return;
+        this.phase = { kind: 'config_error', path: this.pendingConfigErrorPath };
+        this.pendingConfigErrorPath = undefined;
+        this.notice = undefined;
+        this.top = 0;
+    }
     clearEditor() {
         if (!this.editor)
             return;
@@ -624,6 +689,9 @@ function actionNotice(result, locale) {
 function resultCopy(locale, code) {
     return MCP_STATUS_COPY[locale].editor.results[code] ?? code;
 }
+function invalidConfigFileCopy(locale, path) {
+    return formatUiMessage(MCP_STATUS_COPY[locale].invalidConfigFile, { path: path.replace(/[\u0000-\u001f\u007f-\u009f]/gu, '') }, locale);
+}
 function confirmAddDocument(draft, locale) {
     const editor = MCP_STATUS_COPY[locale].editor;
     return [

package/dist/pi-tui-runner.js

@@ -111,7 +111,7 @@ export function safeBoundaryResumeParkedCopy(reason) {
         case 'resume_feature_disabled':
             return {
                 level: 'info',
-                text: 'Safe-boundary resume is not enabled on this runtime (set MAKA_RUNTIME_SAFE_BOUNDARY_RESUME=1 to enable).',
+                text: 'Safe-boundary resume is disabled by this runtime policy.',
             };
         case 'resume_candidate_missing':
             return {

package/dist/runtime-host-run-command.js

@@ -18,11 +18,12 @@
  */
 import { failureClassFromCompleteStopReason } from '@maka/core/events';
 import { findProjectByIdentity } from '@maka/core/project';
-import { projectSessionCatalogSummary, readRuntimeHostSessions, readRuntimeHostProjects, RuntimeHostOperationError, } from '@maka/runtime-host/client';
+import { projectSessionCatalogSummary, readRuntimeHostSessions, readRuntimeHostProjects, RuntimeHostOperationError, isRuntimeHostReconnectingConnection, } from '@maka/runtime-host/client';
 import { runtimeHostProfileUsesHostWorkspace } from '@maka/runtime-host/profile-kind';
 import { runMakaTextCliCore, } from './run-command-core.js';
 import { connectRuntimeHostCli, resolveRuntimeHostCliTarget, } from './runtime-host-cli-context.js';
 import { createRuntimeHostMakaSessionDriver, } from './runtime-host-session-driver.js';
+import { RuntimeHostRunMcp } from './runtime-host-run-mcp.js';
 import { formatRuntimeHostCliTaskBlockers, isRuntimeHostCliTaskBlocked, readRuntimeHostCliTaskReadiness, } from './runtime-host-task-readiness.js';
 import { resolveMakaClientDataRoot } from './workspace-root.js';
 const GRAPH_POLL_INTERVAL_MS = 25;
@@ -70,6 +71,10 @@ export function createRuntimeHostRunContext(connection, catalog, input, override
         createDriver: createRuntimeHostMakaSessionDriver,
         ...overrides,
     };
+    const mcp = (!input.hostProfileId || input.hostProfileId === 'local') &&
+        isRuntimeHostReconnectingConnection(connection)
+        ? new RuntimeHostRunMcp(input.workspaceRoot, connection)
+        : undefined;
     const driver = contextDeps.createDriver({
         connection,
         cwd: input.cwd,
@@ -80,8 +85,9 @@ export function createRuntimeHostRunContext(connection, catalog, input, override
             ? { kind: 'client_path' }
             : { kind: 'host' },
         ...(input.projectId ? { workspace: { kind: 'project', projectId: input.projectId } } : {}),
+        ...(mcp ? { prepareSession: (sessionId) => mcp.prepare(sessionId) } : {}),
     });
-    const runtime = new RuntimeHostRunRuntime(connection, driver, input.runOutcomeObserver, input.enableAgentGraph === true, input.sessionCwdOverride, input.maxSteps);
+    const runtime = new RuntimeHostRunRuntime(connection, driver, mcp, input.runOutcomeObserver, input.enableAgentGraph === true, input.sessionCwdOverride, input.maxSteps);
     return {
         runtime,
         target: { connection: { slug: target.connection.slug }, model: target.model },
@@ -129,6 +135,7 @@ async function prepareRuntimeHostRunInput(connection, catalog, profile, input, c
 class RuntimeHostRunRuntime {
     #connection;
     #driver;
+    #mcp;
     #observer;
     #graphEnabled;
     #sessionCwdOverride;
@@ -142,9 +149,10 @@ class RuntimeHostRunRuntime {
     #graphAdmissionTurnIds = new Set();
     #latestTranscriptReplacement;
     #graphTerminalWaiters = new Map();
-    constructor(connection, driver, observer, graphEnabled, sessionCwdOverride, maxSteps) {
+    constructor(connection, driver, mcp, observer, graphEnabled, sessionCwdOverride, maxSteps) {
         this.#connection = connection;
         this.#driver = driver;
+        this.#mcp = mcp;
         this.#observer = observer;
         this.#graphEnabled = graphEnabled;
         this.#sessionCwdOverride = sessionCwdOverride;
@@ -166,6 +174,7 @@ class RuntimeHostRunRuntime {
     }
     async *sendMessage(sessionId, input) {
         await this.#attach(sessionId);
+        await this.#mcp?.ready();
         if (this.#stopRequested)
             throw new Error('Turn was cancelled before start');
         if (input.turnOrchestration?.mode === 'graph') {
@@ -176,6 +185,7 @@ class RuntimeHostRunRuntime {
             turnId: input.turnId,
             ...(input.turnOrchestration ? { turnOrchestration: input.turnOrchestration } : {}),
             ...(maxSteps !== undefined ? { maxSteps } : {}),
+            ...(input.origin !== undefined ? { origin: input.origin } : {}),
         });
         if (!turn.runId)
             throw new Error('Runtime Host did not return a Run identity');
@@ -205,8 +215,30 @@ class RuntimeHostRunRuntime {
     }
     async resumeLatest(sessionId) {
         await this.#attach(sessionId);
+        await this.#mcp?.ready();
         const plan = await this.#connection.request('turn.resume.query', { sessionId });
-        return plan.disposition === 'ready' ? this.#driver.resumeLatest() : null;
+        return plan.disposition === 'ready' ? this.#resumeAndObserve(plan) : null;
+    }
+    async *#resumeAndObserve(plan) {
+        const turn = await this.#driver.resumeLatestTurn(plan);
+        if (!turn.runId)
+            throw new Error('Runtime Host did not return a Run identity');
+        const activeTurn = {
+            sessionId: turn.sessionId,
+            turnId: turn.turnId,
+            runId: turn.runId,
+            outcome: new TurnOutcomeClassifier(turn.runId),
+        };
+        this.#activeTurn = activeTurn;
+        try {
+            if (this.#stopRequested)
+                await this.#stopTurn(activeTurn);
+            yield* this.#observeTurn(turn, activeTurn);
+        }
+        finally {
+            if (this.#activeTurn === activeTurn)
+                this.#activeTurn = undefined;
+        }
     }
     async stopSession(sessionId) {
         this.#stopRequested = true;
@@ -273,16 +305,17 @@ class RuntimeHostRunRuntime {
         if (outcome)
             await this.#observer?.(outcome);
     }
-    close() {
+    async close() {
         this.#closed = true;
         this.#interactions.close();
         this.#unsubscribeTranscriptReplacements();
         this.#cancelGraphTerminalWaiters(new Error('Runtime Host run context closed'));
-        return Promise.resolve();
+        await this.#mcp?.close();
     }
     async #attach(sessionId) {
         if (this.#sessionId === sessionId)
             return;
+        await this.#mcp?.prepare(sessionId);
         const switched = await this.#driver.switchSession(sessionId);
         if (this.#sessionCwdOverride?.sessionId === sessionId &&
             switched.summary.cwd !== this.#sessionCwdOverride.cwd) {

package/dist/runtime-host-run-mcp.js

@@ -0,0 +1,161 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { createHash } from 'node:crypto';
+import { stableJsonStringify } from '@maka/core/canonical-json';
+import { createCredentialMcpOAuthStorage, McpClientManager } from '@maka/mcp';
+import { createFileCredentialStore } from '@maka/storage/credential-store';
+import { createMcpConfigStore } from '@maka/storage/mcp-config-store';
+import { RuntimeHostOperationError, } from '@maka/runtime-host/client';
+import { createMcpCapabilityProvider } from './mcp-capability-provider.js';
+import { McpCapabilityPublication } from './mcp-capability-publication.js';
+/** One headless invocation owns one Session's MCP processes and publication. */
+export class RuntimeHostRunMcp {
+    #connection;
+    #workspaceRoot;
+    #manager;
+    #publication;
+    #unsubscribeManager;
+    #unsubscribeConnection;
+    #availability;
+    #sessionId;
+    #sessionConfigurationId;
+    #enabledServerIds = [];
+    #prepareTask;
+    #closed = false;
+    #closeTask;
+    constructor(workspaceRoot, connection) {
+        this.#workspaceRoot = workspaceRoot;
+        this.#connection = connection;
+        this.#manager = new McpClientManager({
+            clientName: 'maka-run',
+            excludedStdioEnvironmentKeys: ['MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL'],
+            oauthStorage: createCredentialMcpOAuthStorage(createFileCredentialStore(workspaceRoot)),
+        });
+        this.#publication = new McpCapabilityPublication({
+            connectionIdentity: () => this.#availability?.kind === 'connected'
+                ? `${this.#availability.hostEpoch}\0${this.#availability.connectionId}`
+                : undefined,
+            revision: () => this.#manager.toolSnapshot().revision,
+            createProvider: () => createMcpCapabilityProvider(this.#manager, {
+                admission: 'mcp',
+                onCurrentRegistrationRetired: () => this.#retire(),
+            }) ?? {
+                // Even an empty snapshot must replace a lost Session publication.
+                offers: () => [],
+                currentRegistrationRetired: () => this.#retire(),
+            },
+            replace: (provider) => this.#connection.replaceClientCapabilities(provider, {
+                sessionId: this.#sessionId,
+                sessionConfigurationId: this.#sessionConfigurationId,
+            }),
+            unregister: () => this.#connection.unregisterClientCapabilities({ sessionId: this.#sessionId }),
+            onState: () => undefined,
+        });
+        this.#unsubscribeManager = this.#manager.onChange(() => {
+            if (this.#sessionId && !this.#closed)
+                this.#publication.request();
+        });
+        this.#unsubscribeConnection = connection.subscribeConnectionAvailability((availability) => {
+            this.#availability = availability;
+            if (availability.kind !== 'connected')
+                this.#publication.invalidate();
+            if (this.#sessionId && !this.#closed)
+                this.#publication.request();
+        });
+    }
+    prepare(sessionId) {
+        if (this.#sessionId && this.#sessionId !== sessionId) {
+            return Promise.reject(new Error('MCP is already bound to another Session'));
+        }
+        this.#prepareTask ??= this.#prepare(sessionId);
+        return this.#prepareTask;
+    }
+    async #prepare(sessionId) {
+        if (this.#closed)
+            throw new Error('MCP publication is closed');
+        try {
+            const config = await createMcpConfigStore(this.#workspaceRoot).get();
+            this.#enabledServerIds = Object.entries(config.mcpServers)
+                .filter(([, server]) => server.enabled !== false)
+                .map(([serverId]) => serverId);
+            try {
+                await this.#manager.sync(config);
+            }
+            catch (error) {
+                throw new Error('Session MCP preparation failed; check the workspace MCP configuration', {
+                    cause: error,
+                });
+            }
+            this.#assertServersConnected();
+            if (this.#closed)
+                throw new Error('MCP publication is closed');
+            this.#sessionConfigurationId = `sha256:${createHash('sha256').update(stableJsonStringify(config)).digest('hex')}`;
+            this.#sessionId = sessionId;
+            await this.ready();
+        }
+        catch (error) {
+            await this.close().catch(() => undefined);
+            throw error;
+        }
+    }
+    async ready() {
+        if (this.#closed || !this.#sessionId)
+            throw new Error('MCP publication is not prepared');
+        this.#assertServersConnected();
+        const state = await this.#publication.settle();
+        if (state !== 'published') {
+            if (this.#publication.lastError instanceof RuntimeHostOperationError &&
+                this.#publication.lastError.code === 'session_binding_conflict') {
+                throw new Error('Session MCP configuration conflicts with its frozen tools; restore the same configuration before resuming', { cause: this.#publication.lastError });
+            }
+            throw new Error('Session MCP capability publication is unavailable', {
+                cause: this.#publication.lastError,
+            });
+        }
+        this.#assertServersConnected();
+    }
+    #assertServersConnected() {
+        const unavailable = this.#enabledServerIds.flatMap((serverId) => {
+            const state = this.#manager.status(serverId)?.state ?? 'missing';
+            return state === 'connected' ? [] : [`${serverId} (${state})`];
+        });
+        if (unavailable.length > 0) {
+            throw new Error(`Session MCP server(s) unavailable: ${unavailable.join(', ')}`);
+        }
+    }
+    close() {
+        this.#closeTask ??= this.#close(true);
+        return this.#closeTask;
+    }
+    #retire() {
+        this.#closeTask ??= this.#close(false);
+        return this.#closeTask;
+    }
+    async #close(unregister) {
+        this.#closed = true;
+        this.#unsubscribeManager();
+        this.#unsubscribeConnection();
+        try {
+            await (unregister ? this.#publication.close() : this.#publication.retire());
+        }
+        finally {
+            await this.#manager.close();
+        }
+    }
+}

package/dist/runtime-host-session-driver.js

@@ -57,6 +57,7 @@ export function createRuntimeHostMakaSessionDriver(input) {
 class RuntimeHostMakaSessionDriverImpl {
     #connection;
     #newId;
+    #prepareSession;
     #now;
     #inspectCwdChanges;
     #executionLocation;
@@ -103,6 +104,7 @@ class RuntimeHostMakaSessionDriverImpl {
     constructor(input) {
         this.#connection = input.connection;
         this.#newId = input.newId ?? randomUUID;
+        this.#prepareSession = input.prepareSession;
         this.#now = input.now ?? Date.now;
         this.#inspectCwdChanges = input.inspectCwdChanges ?? inspectGitCwdChanges;
         this.#executionLocation = input.executionLocation ?? { kind: 'client_path' };
@@ -192,6 +194,9 @@ class RuntimeHostMakaSessionDriverImpl {
         const events = channel.eventsForTurn(turnId);
         const modelText = options.modelText ?? prompt;
         try {
+            if (options.origin !== undefined && options.origin.kind !== 'cloud_activation') {
+                throw new Error('Runtime Host turn.start only supports cloud activation origins');
+            }
             const startInput = {
                 sessionId,
                 turnId,
@@ -201,6 +206,7 @@ class RuntimeHostMakaSessionDriverImpl {
                 },
                 ...(options.turnOrchestration ? { turnOrchestration: options.turnOrchestration } : {}),
                 ...(options.maxSteps !== undefined ? { maxSteps: options.maxSteps } : {}),
+                ...(options.origin !== undefined ? { origin: options.origin } : {}),
             };
             const result = await this.#connection.request('turn.start', startInput);
             if (result.kind === 'blocked') {
@@ -325,6 +331,14 @@ class RuntimeHostMakaSessionDriverImpl {
         if (plan.disposition !== 'ready') {
             throw new SafeBoundaryResumeParkedError(plan.reason);
         }
+        const turn = await this.resumeLatestTurn(plan);
+        yield* turn.events;
+    }
+    async resumeLatestTurn(plan) {
+        const sessionId = this.#requireSession('resume');
+        if (plan.sessionId !== sessionId) {
+            throw new Error('Runtime Host resume plan changed Session identity');
+        }
         const channel = await this.#ensureChannel(sessionId);
         const turnId = this.#newId();
         this.#claimedTurnIds.add(turnId);
@@ -337,14 +351,19 @@ class RuntimeHostMakaSessionDriverImpl {
                 sourceRuntimeEventHighWater: plan.sourceRuntimeEventHighWater,
             });
             if (result.kind !== 'started') {
-                channel.failTurn(turnId, new SafeBoundaryResumeParkedError(result.plan.reason));
+                throw new SafeBoundaryResumeParkedError(result.plan.reason);
             }
+            return {
+                sessionId: result.turn.sessionId,
+                turnId: result.turn.turnId,
+                runId: result.turn.runId,
+                events,
+            };
         }
         catch (error) {
             channel.failTurn(turnId, error);
             throw error;
         }
-        yield* events;
     }
     submitMessage(text, options) {
         return this.#admit(() => this.#submitMessage(text, options));
@@ -1051,6 +1070,7 @@ class RuntimeHostMakaSessionDriverImpl {
         if (!this.#llmConnectionId) {
             throw new Error('Runtime Host Session creation requires an exact Connection identity');
         }
+        await this.#prepareSession?.(sessionId);
         const session = requireSession(await this.#request('session.create', {
             sessionId,
             workspace,

package/dist/tui-copy-catalog.js

@@ -246,6 +246,7 @@ export const TUI_COPY_RESOURCES = {
             title: 'MCP SERVERS',
             footer: {
                 back: 'Esc back',
+                diagnostic: '↑/↓ scroll · Esc back',
                 readOnly: '↑/↓ scroll · q/Esc close',
                 manage: 'a Add · Enter Edit · Space Enable/disable · t Test · r Reconnect · d Remove · Esc Close',
                 managePublication: 'a Add · Enter Edit · Space Enable/disable · t Test · r Reconnect · d Remove · p Set provider credential · x Remove credential · Esc Close',
@@ -254,6 +255,7 @@ export const TUI_COPY_RESOURCES = {
             unavailableDetail: 'Client MCP tool association for remote Runtime Hosts is planned for a later release.',
             loading: 'Loading mcp.json and discovering tools…',
             loadError: 'MCP configuration could not be loaded; no tools were published to the Runtime Host.',
+            invalidConfigFile: 'Invalid JSON in {path}. The file is unchanged. Quit maka, back up and repair this file before retrying.',
             noServers: 'No MCP servers are configured. Press a to add one.',
             publication: {
                 waiting: 'waiting to publish',
@@ -345,6 +347,7 @@ export const TUI_COPY_RESOURCES = {
             title: 'MCP 服务器',
             footer: {
                 back: 'Esc 返回',
+                diagnostic: '↑/↓ 滚动 · Esc 返回',
                 readOnly: '↑/↓ 滚动 · q/Esc 关闭',
                 manage: 'a 添加 · Enter 编辑 · Space 启用/停用 · t 测试 · r 重连 · d 删除 · Esc 关闭',
                 managePublication: 'a 添加 · Enter 编辑 · Space 启用/停用 · t 测试 · r 重连 · d 删除 · p 设置 Provider 凭据 · x 删除凭据 · Esc 关闭',
@@ -353,6 +356,7 @@ export const TUI_COPY_RESOURCES = {
             unavailableDetail: '远程 Runtime Host 的客户端 MCP 工具关联将在后续版本提供。',
             loading: '正在读取 mcp.json 并发现工具…',
             loadError: '无法读取或应用 MCP 配置；没有向 Runtime Host 发布工具。',
+            invalidConfigFile: '{path} 中的 JSON 无效，文件未被修改。请退出 maka，备份并修复此文件后重试。',
             noServers: '尚未配置 MCP 服务器。按 a 添加。',
             publication: {
                 waiting: '等待发布',
@@ -444,6 +448,7 @@ export const TUI_COPY_RESOURCES = {
             title: 'MCP 伺服器',
             footer: {
                 back: 'Esc 返回',
+                diagnostic: '↑/↓ 捲動 · Esc 返回',
                 readOnly: '↑/↓ 捲動 · q/Esc 關閉',
                 manage: 'a 新增 · Enter 編輯 · Space 啟用/停用 · t 測試 · r 重新連線 · d 刪除 · Esc 關閉',
                 managePublication: 'a 新增 · Enter 編輯 · Space 啟用/停用 · t 測試 · r 重新連線 · d 刪除 · p 設定 Provider 認證資料 · x 刪除認證資料 · Esc 關閉',
@@ -452,6 +457,7 @@ export const TUI_COPY_RESOURCES = {
             unavailableDetail: '遠端 Runtime Host 的用戶端 MCP 工具關聯將於後續版本提供。',
             loading: '正在讀取 mcp.json 並探索工具…',
             loadError: '無法讀取或套用 MCP 設定；未向 Runtime Host 發佈任何工具。',
+            invalidConfigFile: '{path} 中的 JSON 無效，檔案未被修改。請退出 maka，備份並修復此檔案後重試。',
             noServers: '尚未設定 MCP 伺服器。按 a 新增。',
             publication: {
                 waiting: '等待發佈',

package/dist/tui-mcp-control.js

@@ -212,10 +212,16 @@ class TuiMcpControllerImpl {
             this.#refreshManagerSnapshot('ready', 'ready');
             this.#requestPublication();
         }
-        catch {
+        catch (error) {
             if (this.#closed)
                 return;
-            this.#updateSnapshot({ initialization: 'error', publication: 'not_published' });
+            this.#updateSnapshot({
+                initialization: 'error',
+                publication: 'not_published',
+                ...(error instanceof McpConfigSourceError && error.reason === 'invalid-json' && error.path
+                    ? { invalidConfigPath: error.path }
+                    : {}),
+            });
         }
     }
     #serializeAction(work) {
@@ -303,6 +309,9 @@ class TuiMcpControllerImpl {
                 return error.result;
             if (error instanceof McpConfigurationValidationError)
                 return { status: 'failed', reason: 'invalid-config' };
+            if (error instanceof McpConfigSourceError && error.reason === 'invalid-json' && error.path) {
+                return { status: 'failed', reason: 'invalid-config-file', path: error.path };
+            }
             if (error instanceof AtomicFileWriteCommitUnknownError) {
                 // The transform has already published, including any credential
                 // retirement. Reload its authority; never replay those effects.

package/node_modules/@maka/core/dist/attachments.js

@@ -55,6 +55,13 @@ export function parseAttachmentResourceRef(value) {
 }
 /** Per-send cap on attachment count, shared by renderer preflight and main resolve. */
 export const MAX_ATTACHMENT_COUNT = 8;
+/**
+ * Per-drop cap on files a composer checks for folders before staging them
+ * (#5279). A larger drop or paste is refused whole instead of staging files
+ * nobody checked; it is far past MAX_ATTACHMENT_COUNT, so it could never be
+ * sent. Preload and main refuse a longer check request outright.
+ */
+export const MAX_ATTACHMENT_DROP_COUNT = 1024;
 /** Per-file byte cap, shared by renderer preflight, preload encode, and main resolve. */
 export const MAX_ATTACHMENT_BYTES = 50 * 1024 * 1024;
 /** Raw-byte cap for workspace images returned by Read, leaving room for Base64 transport overhead. */