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

package/node_modules/@maka/runtime-host/dist/server/client-capability-invocation-broker.js

@@ -82,7 +82,7 @@ export class ClientCapabilityInvocationBroker {
         }));
     }
     #prepare(registration, signal, timeoutMs, onProgress, requestInteraction, frameFor) {
-        const sender = this.#senderFor(registration.connectionId);
+        const sender = this.#senderFor(registration);
         if (!sender) {
             throw new ClientCapabilityInvocationError('capability_lost', 'Client Capability provider is unavailable');
         }
@@ -162,7 +162,7 @@ export class ClientCapabilityInvocationBroker {
                     invocation.requestInteraction = requestInteraction ?? invocation.requestInteraction;
                     invocation.phase = 'admitted';
                     this.#armTimer(invocation);
-                    const currentSender = this.#senderFor(invocation.registration.connectionId);
+                    const currentSender = this.#senderFor(invocation.registration);
                     if (!currentSender) {
                         this.#settle(invocation, undefined, new ClientCapabilityInvocationError('capability_lost', 'Client Capability provider disappeared before admission'), false);
                     }
@@ -183,7 +183,7 @@ export class ClientCapabilityInvocationBroker {
                 const invocation = this.#invocations.get(invocationId);
                 if (!invocation)
                     return;
-                const currentSender = this.#senderFor(invocation.registration.connectionId);
+                const currentSender = this.#senderFor(invocation.registration);
                 void currentSender
                     ?.send({ kind: 'client.capability.cancel', invocationId })
                     .catch(() => { });
@@ -279,10 +279,16 @@ export class ClientCapabilityInvocationBroker {
                 this.#acceptChunk(invocation, frame.index, frame.data);
         }
     }
-    async releaseConnection(connectionId) {
+    releaseConnection(connectionId) {
+        return this.#releaseWhere((registration) => registration.connectionId === connectionId);
+    }
+    releaseRegistration(registration) {
+        return this.#releaseWhere((candidate) => candidate === registration);
+    }
+    async #releaseWhere(matches) {
         const interactions = [];
         for (const invocation of [...this.#invocations.values()]) {
-            if (invocation.registration.connectionId !== connectionId)
+            if (!matches(invocation.registration))
                 continue;
             if (invocation.phase === 'dispatched' || invocation.phase === 'accepted') {
                 invocation.providerAvailability.abort(new ClientCapabilityInvocationError('capability_lost', 'Client Capability provider disconnected before admission'));
@@ -379,7 +385,7 @@ export class ClientCapabilityInvocationBroker {
                 this.#settle(invocation, undefined, terminalBeforeSend.error, terminalBeforeSend.releaseRemote);
                 return;
             }
-            const sender = this.#senderFor(invocation.registration.connectionId);
+            const sender = this.#senderFor(invocation.registration);
             if (!sender) {
                 this.#settle(invocation, undefined, new ToolOutcomeUnknownError('Client Capability provider disappeared before receiving an interaction result'), false);
                 return;
@@ -433,7 +439,7 @@ export class ClientCapabilityInvocationBroker {
             const current = this.#invocations.get(invocation.invocationId);
             if (current !== invocation)
                 return;
-            const sender = this.#senderFor(current.registration.connectionId);
+            const sender = this.#senderFor(current.registration);
             void sender
                 ?.send({ kind: 'client.capability.cancel', invocationId: current.invocationId })
                 .catch(() => { });
@@ -456,7 +462,7 @@ export class ClientCapabilityInvocationBroker {
         }
         this.#rememberRetired(invocation.invocationId);
         if (releaseRemote) {
-            const sender = this.#senderFor(invocation.registration.connectionId);
+            const sender = this.#senderFor(invocation.registration);
             void sender
                 ?.send({
                 kind: 'client.capability.release',

package/node_modules/@maka/runtime-host/dist/server/execution-composition.js

@@ -102,6 +102,7 @@ import { createInteractiveRunComposer, createInteractiveRunComposerFactory, rout
 import { createHostGoalEvaluator, createHostDailyReviewModel, createHostMemoryExtractionModel, createHostPluginModel, createHostSessionEffectModel, } from './execution-model-authority.js';
 import { HostExecutionInspectCoordinator } from './execution-inspect-coordinator.js';
 import { HostExternalSessionCoordinator } from './external-session-coordinator.js';
+import { boundedFailureDiagnostic } from './failure-diagnostic.js';
 import { HostSessionBundleCoordinator } from './session-bundle-coordinator.js';
 import { HostGoalCoordinator } from './goal-coordinator.js';
 import { HostGoalExecutionCoordinator } from './goal-execution-coordinator.js';
@@ -835,6 +836,12 @@ export async function createExecutionRuntimeHostComposition(context, options = {
                     build: (factoryContext) => new PluginExecutorBackend({
                         sessionId: factoryContext.sessionId,
                         cwd: factoryContext.header.cwd,
+                        ...(factoryContext.header.model === executorId
+                            ? {}
+                            : { model: factoryContext.header.model }),
+                        ...(factoryContext.header.thinkingLevel
+                            ? { thinkingLevel: factoryContext.header.thinkingLevel }
+                            : {}),
                         ...(factoryContext.systemPrompt ? { instructions: factoryContext.systemPrompt } : {}),
                         binding,
                     }),
@@ -1160,6 +1167,10 @@ export async function createExecutionRuntimeHostComposition(context, options = {
         };
         clientCapabilities = new HostClientCapabilityCoordinator({
             activation: runtimePolicyActivation,
+            isSessionRetired: async (sessionId) => {
+                const state = await stores.sessionStore.probeSessionRemoval(sessionId);
+                return (state.kind === 'removed' || (state.kind === 'present' && state.record.header.isArchived));
+            },
             onModelToolsChanged: registerBackendInvalidation,
             interactions,
             grants: stores.interactionStore,
@@ -1789,7 +1800,12 @@ export async function createExecutionRuntimeHostComposition(context, options = {
                             workspace: input.create.workspace,
                             name: input.create.title,
                             ...(input.create.defaults?.executorId
-                                ? { executorId: input.create.defaults.executorId }
+                                ? {
+                                    executorId: input.create.defaults.executorId,
+                                    ...(input.create.defaults.executorModel
+                                        ? { executorModel: input.create.defaults.executorModel }
+                                        : {}),
+                                }
                                 : {
                                     modelTarget: input.create.defaults?.model
                                         ? {
@@ -1803,6 +1819,9 @@ export async function createExecutionRuntimeHostComposition(context, options = {
                             ...(input.create.defaults?.permissionMode
                                 ? { permissionMode: input.create.defaults.permissionMode }
                                 : {}),
+                            ...(input.create.defaults?.thinkingLevel
+                                ? { thinkingLevel: input.create.defaults.thinkingLevel }
+                                : {}),
                             collaborationMode: 'agent',
                             orchestrationMode: 'default',
                         })
@@ -1950,6 +1969,9 @@ export async function createExecutionRuntimeHostComposition(context, options = {
         const sessionBundles = new HostSessionBundleCoordinator({
             lease: context.owner.lease,
             fenceSubtree: (sessionId, operation) => requireSessionManager(manager).runSessionSubtreeQuiescentMutation(sessionId, operation),
+            recoverInterruptedSessions: (sessionIds) => requireSessionManager(manager)
+                .recoverInterruptedSessionsForSessions(sessionIds)
+                .then(() => undefined),
             onImported: (sessionId) => hostChanges.publishSessionCatalog(sessionId),
         });
         const externalSessions = new HostExternalSessionCoordinator({
@@ -2194,8 +2216,13 @@ export async function createExecutionRuntimeHostComposition(context, options = {
                                     await clientBoundRecovery;
                                 }
                                 catch (error) {
+                                    // The registration mutation has already committed. Returning a
+                                    // failure now would make the Client discard its new registration
+                                    // identity and mistake the old registration's release for
+                                    // authoritative Session retirement. Drain the unhealthy Host, but
+                                    // acknowledge the committed mutation so reconnect can republish it.
+                                    console.error(`[runtime-host] post-commit Client Capability recovery failed: ${boundedFailureDiagnostic(error)}`);
                                     context.requestDrain();
-                                    throw error;
                                 }
                             }
                             return outcome;

package/node_modules/@maka/runtime-host/dist/server/execution-model-authority.js

@@ -589,6 +589,9 @@ function parseDailyReviewModelKey(modelKey) {
     return connectionSlug && modelId ? { connectionSlug, modelId } : undefined;
 }
 export async function resolveExecutionTarget(header, runtimePolicy, oauthCredentials, createFetchTransport) {
+    if (header.backend === 'plugin-executor') {
+        throw new AuxiliaryModelCallConfigurationError('Plugin Executor Sessions do not expose the native auxiliary model authority');
+    }
     const resolved = await runtimePolicy.operations.resolveExecutionConnection(executionConnectionRef(header));
     if (resolved.kind !== 'ready') {
         throw new AuxiliaryModelCallConfigurationError(`Runtime Host model connection is not ready: ${resolved.kind}`);

package/node_modules/@maka/runtime-host/dist/server/external-session-coordinator.js

@@ -19,7 +19,7 @@
 import { JsonArrayPageBudget } from './json-array-page-budget.js';
 import { ExternalSessionCatalogCursorError, ExternalSessionLimitError, ExternalSessionNotFoundError, } from '@maka/core/external-session';
 import { redactSecrets } from '@maka/core/redaction';
-import { ExternalSessionImporter } from '@maka/storage/external-sessions';
+import { ExternalSessionImporter, } from '@maka/storage/external-sessions';
 import { EXTERNAL_SESSION_CWD_MAX_BYTES, EXTERNAL_SESSION_IMPORTED_SESSION_IDS_MAX_ITEMS, EXTERNAL_SESSION_NAME_MAX_BYTES, EXTERNAL_SESSION_PAGE_MAX_ITEMS, EXTERNAL_SESSION_RESULT_MAX_BYTES, EXTERNAL_SESSION_SOURCE_MAX_ITEMS, EXTERNAL_SESSION_SOURCE_SESSION_ID_MAX_BYTES, } from '../protocol/index.js';
 import { projectSessionCatalogRecord, SessionOperationFailure, NoUsableImportModelError, } from './session-catalog-coordinator.js';
 import { WorkspaceResolutionError } from './workspace-resolver.js';
@@ -52,9 +52,10 @@ export class HostExternalSessionCoordinator {
      * be unmounted mid-import by design, and its in-flight state goes with it —
      * as would a second window's, or the CLI's.
      *
-     * Coalesced, not rejected: the second caller gets the first one's outcome,
-     * success or failure, because it is the same operation. Entries are keyed on
-     * a JSON pair so no separator can be forged out of the ids themselves.
+     * Requests for the same destination share the first outcome. A different
+     * destination is a conflicting intent: it must not receive a successful
+     * Session in a workspace it did not request. The source key also owns the
+     * catalog's isImporting projection, regardless of the chosen destination.
      */
     #importsInFlight = new Map();
     constructor(options) {
@@ -180,10 +181,13 @@ export class HostExternalSessionCoordinator {
     async importSession(input) {
         const key = importKey(input.adapterId, input.sourceSessionId);
         const running = this.#importsInFlight.get(key);
-        if (running)
-            return running;
+        if (running) {
+            return sameImportWorkspace(running.workspace, input.workspace)
+                ? running.outcome
+                : importFailure('operation_conflict', 'This source is already being imported into a different workspace');
+        }
         const attempt = this.#importSession(input);
-        this.#importsInFlight.set(key, attempt);
+        this.#importsInFlight.set(key, { workspace: input.workspace, outcome: attempt });
         try {
             return await attempt;
         }
@@ -201,6 +205,14 @@ export class HostExternalSessionCoordinator {
         let target;
         try {
             target = await this.#resolveTarget();
+            if (input.workspace !== undefined) {
+                const workspace = await this.#workspaceResolver.resolve(input.workspace);
+                target = {
+                    ...target,
+                    cwd: workspace.cwd,
+                    projectId: workspace.projectId,
+                };
+            }
         }
         catch (error) {
             if (error instanceof NoUsableImportModelError) {
@@ -209,6 +221,9 @@ export class HostExternalSessionCoordinator {
             if (error instanceof SessionOperationFailure) {
                 return importFailure(error.code, error.message);
             }
+            if (error instanceof WorkspaceResolutionError) {
+                return importFailure(error.code, error.message);
+            }
             return importFailure('persistence_failed', 'Session defaults are unavailable');
         }
         let commitAttempted = false;
@@ -369,6 +384,13 @@ function safeTimestamp(value) {
 function importKey(adapterId, sourceSessionId) {
     return JSON.stringify([adapterId, sourceSessionId]);
 }
+function sameImportWorkspace(left, right) {
+    if (left === undefined || right === undefined)
+        return left === right;
+    return left.kind === 'project'
+        ? right.kind === 'project' && left.projectId === right.projectId
+        : right.kind === 'host_path' && left.path === right.path;
+}
 function queryFailure(code, message) {
     return { ok: false, error: { code, message } };
 }

package/node_modules/@maka/runtime-host/dist/server/hosted-execution-tool-profile.js

@@ -31,7 +31,7 @@ const HEADLESS_CODING_V1_TOOL_NAMES = [
 ];
 const HEADLESS_CODING_V1_SYSTEM_PROMPT = [
     'Complete the task by acting with the available tools, not by narrating.',
-    'Prefer Read, Glob, and Grep for inspection, Edit and Write for file changes, and Bash for shell commands and tests.',
+    'Prefer Read, Glob, and Grep for inspection, the available file-editing tool for file changes, and Bash for shell commands and tests.',
     'Verify the result when practical.',
     'Stop when the task is complete.',
 ].join('\n');

package/node_modules/@maka/runtime-host/dist/server/session-bundle-coordinator.js

@@ -71,7 +71,10 @@ export class HostSessionBundleCoordinator {
     }
     async #fenced(sessionId, operation) {
         try {
-            return await this.#options.fenceSubtree(sessionId, operation);
+            return await this.#options.fenceSubtree(sessionId, async (fencedSessionIds) => {
+                await this.#options.recoverInterruptedSessions(fencedSessionIds);
+                return operation(fencedSessionIds);
+            });
         }
         catch (error) {
             // Two types, because the Session manager translates on the way out: the

package/node_modules/@maka/runtime-host/dist/server/session-catalog-coordinator.js

@@ -839,17 +839,40 @@ export class HostSessionCatalogCoordinator {
         };
     }
     async #mergeConfigurationPatch(current, patch) {
-        if (current.backend === 'fake' && patch.modelTarget === undefined) {
+        if (current.backend === 'fake' &&
+            patch.modelTarget === undefined &&
+            patch.executorTarget === undefined) {
             throw new SessionOperationFailure('operation_conflict', 'Legacy test backend configuration requires an explicit account selection');
         }
         if (current.backend !== 'plugin-executor' &&
             current.llmConnectionId === undefined &&
-            patch.modelTarget === undefined) {
+            patch.modelTarget === undefined &&
+            patch.executorTarget === undefined) {
             throw new SessionOperationFailure('operation_conflict', 'Legacy Session configuration requires an explicit account selection');
         }
         const thinkingLevel = patch.thinkingLevel === undefined
             ? current.thinkingLevel
             : (patch.thinkingLevel ?? undefined);
+        if (patch.executorTarget !== undefined) {
+            try {
+                this.#assertExecutorAvailable?.(current.id, patch.executorTarget.executorId);
+            }
+            catch {
+                throw new SessionOperationFailure('operation_unavailable', `Plugin executor is unavailable: ${patch.executorTarget.executorId}`);
+            }
+            return {
+                backend: 'plugin-executor',
+                executorId: patch.executorTarget.executorId,
+                llmConnectionId: undefined,
+                llmConnectionSlug: `executor:${patch.executorTarget.executorId}`,
+                model: patch.executorTarget.model ?? patch.executorTarget.executorId,
+                thinkingLevel,
+                connectionLocked: current.connectionLocked,
+                permissionMode: patch.permissionMode ?? current.permissionMode,
+                collaborationMode: patch.collaborationMode ?? current.collaborationMode ?? 'agent',
+                orchestrationMode: patch.orchestrationMode ?? current.orchestrationMode ?? 'default',
+            };
+        }
         let model = {
             ...(current.llmConnectionId === undefined ? {} : { connectionId: current.llmConnectionId }),
             connectionSlug: current.llmConnectionSlug,
@@ -891,7 +914,8 @@ export class HostSessionCatalogCoordinator {
             return {
                 executorId: input.executorId,
                 connectionSlug: `executor:${input.executorId}`,
-                model: input.executorId,
+                model: input.executorModel ?? input.executorId,
+                thinkingLevel: input.thinkingLevel ?? undefined,
             };
         }
         if (!input.modelTarget) {
@@ -923,6 +947,7 @@ function sessionConfigurationMatches(header, configuration) {
 function isPermissionModeOnlyPatch(patch) {
     return (patch.permissionMode !== undefined &&
         patch.modelTarget === undefined &&
+        patch.executorTarget === undefined &&
         patch.thinkingLevel === undefined &&
         patch.collaborationMode === undefined &&
         patch.orchestrationMode === undefined);
@@ -934,6 +959,9 @@ async function prepareCreate(input) {
     if (input.executorId !== undefined && !isExecutorId(input.executorId)) {
         throw new SessionOperationFailure('invalid_request', 'Session executor id is invalid');
     }
+    if (input.executorModel !== undefined && input.executorId === undefined) {
+        throw new SessionOperationFailure('invalid_request', 'Executor model requires an executor id');
+    }
     if (input.labels?.some(isExecutionSemanticLabel)) {
         throw new SessionOperationFailure('invalid_request', 'Session creation cannot set reserved execution labels');
     }
@@ -960,7 +988,7 @@ function createRequestFingerprint(input, prepared) {
         prepared.name,
         prepared.labels,
         input.executorId
-            ? ['executor', input.executorId]
+            ? ['executor', input.executorId, input.executorModel ?? null]
             : input.modelTarget?.kind === 'default'
                 ? ['default']
                 : [

package/node_modules/@maka/runtime-host/dist/server/session-retirement-coordinator.js

@@ -146,7 +146,7 @@ export class HostSessionRetirementCoordinator {
                     handles.goal.commit();
                     handles.scheduledTasks.commit();
                     await this.#graphWake.retireSessions(family.sessionIds);
-                    this.#capabilities.retireSessions(family.sessionIds);
+                    await this.#capabilities.retireSessions(family.sessionIds);
                     this.#messages.retireSessions(family.sessionIds);
                     await this.#refreshFamily(family);
                     return lifecycleSuccess(projectSessionCatalogRecord(await this.#stores.readCatalogRecord(target.header.id)));
@@ -215,7 +215,7 @@ export class HostSessionRetirementCoordinator {
                     await this.#graphWake.retireSessions(allSessionIds);
                     this.#rememberRetiredWorktrees(committableRemove, removedSessionIds);
                     this.#scheduleCleanup(removedSessionIds);
-                    this.#capabilities.retireSessions(allSessionIds);
+                    await this.#capabilities.retireSessions(allSessionIds);
                     this.#messages.retireSessions(allSessionIds);
                     await this.#continuity.retireSessions(plan.remove.sessionIds, plan.remove.admission);
                     await this.#refreshFamily(plan.archive);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maka-agent",
-  "version": "0.2.0-dev.46.20260922",
+  "version": "0.2.0-dev.47.20260922",
   "description": "Apache Maka (Incubating) developer snapshot; not an Apache release.",
   "license": "Apache-2.0",
   "type": "module",