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

package/node_modules/@maka/runtime-host/dist/protocol/workhub-coordination.js

@@ -16,14 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { isWorkHubActionResult } from '@maka/core/workhub-action-result';
 import { decodeMessageContent } from './turn.js';
-import { isWorkHubCreateDefaults } from '@maka/core/session';
+import { WORKHUB_COORDINATION_SESSION_ID, isWorkHubCreateDefaults, } from '@maka/core/session';
 import { requireCount, requireEntityId, requireExactRecord, requireRecord, requireShapedRecord, requireUtf8String, } from './codec.js';
 import { invalidProtocolFrame } from './errors.js';
 import { defineOperation } from './operation-spec.js';
 import { decodeWorkspaceProjection, decodeWorkspaceTarget, } from './workspace.js';
+import { decodeSessionConfigurationUpdateInput, decodeSessionUpdateResult, decodeSessionCatalogItem, SESSION_CATALOG_OPERATION_SPECS, } from './session-catalog.js';
+export function decodeWorkHubCoordinationConfigureModelInput(value) {
+    const input = requireExactRecord(value, 'WorkHub model configuration', [
+        'expectedRevision',
+        'modelTarget',
+    ]);
+    const decoded = decodeSessionConfigurationUpdateInput({
+        sessionId: WORKHUB_COORDINATION_SESSION_ID,
+        expectedRevision: input.expectedRevision,
+        patch: { modelTarget: input.modelTarget },
+    });
+    return {
+        expectedRevision: decoded.expectedRevision,
+        modelTarget: decoded.patch.modelTarget,
+    };
+}
 export const WORKHUB_COORDINATION_TEXT_MAX_BYTES = 48 * 1024;
-export const WORKHUB_COORDINATION_SUMMARY_MAX_BYTES = 8 * 1024;
 const COORDINATION_TITLE_MAX_BYTES = 512;
 const CANDIDATE_SET_ID_MAX_BYTES = 96;
 export const WORKHUB_COORDINATION_CANDIDATE_MAX_ITEMS = 32;
@@ -56,6 +72,25 @@ const CANDIDATE_ERRORS = [
     'internal_failure',
 ];
 export const WORKHUB_COORDINATION_OPERATION_SPECS = {
+    'workhub.coordination.configureModel': defineOperation({
+        mode: 'command',
+        availability: 'ready',
+        errors: SESSION_CATALOG_OPERATION_SPECS['session.configuration.update'].errors,
+        decodeInput: decodeWorkHubCoordinationConfigureModelInput,
+        decodeOutput: decodeSessionUpdateResult,
+        assertOutputForInput: (input, output) => SESSION_CATALOG_OPERATION_SPECS['session.configuration.update'].assertOutputForInput?.({
+            sessionId: WORKHUB_COORDINATION_SESSION_ID,
+            expectedRevision: input.expectedRevision,
+            patch: { modelTarget: input.modelTarget },
+        }, output),
+    }),
+    'workhub.coordination.query': defineOperation({
+        mode: 'query',
+        availability: 'ready',
+        errors: RESOLVE_ERRORS,
+        decodeInput: decodeWorkHubCoordinationResolveInput,
+        decodeOutput: decodeSessionCatalogItem,
+    }),
     'workhub.coordination.resolve': defineOperation({
         mode: 'command',
         availability: 'ready',
@@ -70,13 +105,6 @@ export const WORKHUB_COORDINATION_OPERATION_SPECS = {
         decodeInput: decodeWorkHubCoordinationAnswerInput,
         decodeOutput: decodeWorkHubCoordinationTurnResult,
     }),
-    'workhub.coordination.record': defineOperation({
-        mode: 'command',
-        availability: 'ready',
-        errors: TURN_ERRORS,
-        decodeInput: decodeWorkHubCoordinationRecordInput,
-        decodeOutput: decodeWorkHubCoordinationTurnResult,
-    }),
     'workhub.coordination.candidates': defineOperation({
         mode: 'query',
         availability: 'ready',
@@ -84,11 +112,11 @@ export const WORKHUB_COORDINATION_OPERATION_SPECS = {
         decodeInput: decodeWorkHubCoordinationCandidatesInput,
         decodeOutput: decodeWorkHubCoordinationCandidatesResult,
     }),
-    'workhub.coordination.act': defineOperation({
+    'workhub.coordination.actFromTurn': defineOperation({
         mode: 'command',
         availability: 'ready',
-        errors: TURN_ERRORS,
-        decodeInput: decodeWorkHubCoordinationActInput,
+        errors: [...TURN_ERRORS, 'candidate_set_stale'],
+        decodeInput: decodeWorkHubCoordinationActFromTurnInput,
         decodeOutput: decodeWorkHubCoordinationActResult,
     }),
 };
@@ -115,18 +143,6 @@ export function decodeWorkHubCoordinationAnswerInput(value) {
         text: requireUtf8String(input.text, 'WorkHub Coordination answer text', WORKHUB_COORDINATION_TEXT_MAX_BYTES),
     };
 }
-export function decodeWorkHubCoordinationRecordInput(value) {
-    const input = requireExactRecord(value, 'WorkHub Coordination record input', [
-        'turnId',
-        'userText',
-        'assistantText',
-    ]);
-    return {
-        turnId: requireEntityId(input.turnId, 'WorkHub Coordination Turn id'),
-        userText: requireUtf8String(input.userText, 'WorkHub Coordination user text', WORKHUB_COORDINATION_TEXT_MAX_BYTES),
-        assistantText: requireUtf8String(input.assistantText, 'WorkHub Coordination assistant text', WORKHUB_COORDINATION_SUMMARY_MAX_BYTES),
-    };
-}
 export function decodeWorkHubCoordinationTurnResult(value) {
     const result = requireExactRecord(value, 'WorkHub Coordination Turn result', ['turnId']);
     return {
@@ -153,8 +169,16 @@ export function decodeWorkHubCoordinationCandidatesResult(value) {
         candidates: result.candidates.map(decodeWorkHubCoordinationCandidate),
     };
 }
-export function decodeWorkHubCoordinationActInput(value) {
-    const input = requireShapedRecord(value, 'WorkHub Coordination action input', ['actionId', 'userText', 'proposal'], ['candidateSetId', 'create', 'confirmation', 'newWorkDefaults', 'attachments']);
+export function decodeWorkHubCoordinationActFromTurnInput(value) {
+    const input = requireShapedRecord(value, 'WorkHub active Turn action input', ['turnId', 'actionId', 'proposal'], ['candidateSetId', 'create', 'newWorkDefaults', 'delegationText']);
+    const fields = decodeWorkHubCoordinationActionFields(input);
+    return {
+        ...fields,
+        proposal: fields.proposal,
+        turnId: requireEntityId(input.turnId, 'WorkHub Coordination Turn id'),
+    };
+}
+function decodeWorkHubCoordinationActionFields(input) {
     const proposal = decodeWorkHubCoordinationProposal(input.proposal);
     if (input.newWorkDefaults !== undefined &&
         (!isWorkHubCreateDefaults(input.newWorkDefaults) ||
@@ -162,47 +186,37 @@ export function decodeWorkHubCoordinationActInput(value) {
                 (proposal.disposition === 'replace' && proposal.target.disposition === 'create_new')))) {
         throw invalidProtocolFrame('Invalid WorkHub creation defaults');
     }
-    if (input.attachments !== undefined &&
-        !['answer_here', 'delegate_existing', 'create_new', 'replace'].includes(proposal.disposition)) {
-        throw invalidProtocolFrame('This WorkHub action does not accept attachments');
+    const delegationText = input.delegationText === undefined
+        ? undefined
+        : requireUtf8String(input.delegationText, 'WorkHub delegation text', WORKHUB_COORDINATION_TEXT_MAX_BYTES);
+    if (delegationText !== undefined &&
+        (!delegationText.trim() ||
+            (proposal.disposition !== 'delegate_existing' &&
+                proposal.disposition !== 'create_new' &&
+                proposal.disposition !== 'replace'))) {
+        throw invalidProtocolFrame('Invalid WorkHub delegation text');
     }
     const base = {
         actionId: requireEntityId(input.actionId, 'WorkHub Coordination action id'),
-        userText: requireUtf8String(input.userText, 'WorkHub Coordination action text', WORKHUB_COORDINATION_TEXT_MAX_BYTES),
         proposal,
-        ...(input.attachments !== undefined
-            ? {
-                attachments: decodeMessageContent({
-                    text: input.userText,
-                    attachments: input.attachments,
-                }).attachments,
-            }
-            : {}),
         ...(input.newWorkDefaults !== undefined
             ? { newWorkDefaults: input.newWorkDefaults }
             : {}),
+        ...(delegationText === undefined ? {} : { delegationText }),
     };
     if (proposal.disposition === 'delegate_existing') {
-        if (input.create !== undefined ||
-            input.candidateSetId === undefined ||
-            input.confirmation !== undefined) {
+        if (input.create !== undefined || input.candidateSetId === undefined) {
             throw invalidProtocolFrame('Invalid WorkHub delegation context');
         }
         return { ...base, candidateSetId: candidateSetId(input.candidateSetId) };
     }
     if (proposal.disposition === 'create_new') {
-        if (input.candidateSetId !== undefined ||
-            input.create === undefined ||
-            input.confirmation !== undefined) {
+        if (input.candidateSetId !== undefined || input.create === undefined) {
             throw invalidProtocolFrame('Invalid WorkHub creation context');
         }
         return { ...base, create: decodeWorkHubCoordinationCreateContext(input.create) };
     }
     if (proposal.disposition === 'replace') {
-        const confirmation = decodeWorkHubCoordinationDestructiveConfirmation(input.confirmation);
-        if (confirmation.kind !== 'user_correction') {
-            throw invalidProtocolFrame('Invalid WorkHub replacement confirmation');
-        }
         if (proposal.target.disposition === 'delegate_existing') {
             if (input.candidateSetId === undefined || input.create !== undefined) {
                 throw invalidProtocolFrame('Invalid WorkHub replacement context');
@@ -210,7 +224,6 @@ export function decodeWorkHubCoordinationActInput(value) {
             return {
                 ...base,
                 candidateSetId: candidateSetId(input.candidateSetId),
-                confirmation,
             };
         }
         if (input.candidateSetId !== undefined || input.create === undefined) {
@@ -219,112 +232,20 @@ export function decodeWorkHubCoordinationActInput(value) {
         return {
             ...base,
             create: decodeWorkHubCoordinationCreateContext(input.create),
-            confirmation,
         };
     }
-    if (proposal.disposition === 'stop_work') {
-        const confirmation = decodeWorkHubCoordinationDestructiveConfirmation(input.confirmation);
-        if (confirmation.kind !== 'user_stop' ||
-            input.candidateSetId !== undefined ||
-            input.create !== undefined) {
-            throw invalidProtocolFrame('Invalid WorkHub stop context');
-        }
-        return { ...base, confirmation };
-    }
-    if (input.candidateSetId !== undefined ||
-        input.create !== undefined ||
-        input.confirmation !== undefined) {
+    if (input.candidateSetId !== undefined || input.create !== undefined) {
         throw invalidProtocolFrame('Unexpected WorkHub action context');
     }
     return base;
 }
 export function decodeWorkHubCoordinationActResult(value) {
-    const result = requireRecord(value, 'WorkHub Coordination action result');
-    if (result.disposition === 'answer_here' || result.disposition === 'clarify') {
-        const exact = requireExactRecord(result, 'WorkHub Coordination local action result', [
-            'disposition',
-            'coordinationTurnId',
-        ]);
-        return {
-            disposition: result.disposition,
-            coordinationTurnId: requireEntityId(exact.coordinationTurnId, 'WorkHub Coordination Turn id'),
-        };
-    }
-    if (result.disposition === 'delegate_existing' || result.disposition === 'create_new') {
-        const exact = requireShapedRecord(result, 'WorkHub Coordination execution action result', ['disposition', 'targetSessionId', 'targetTurnId'], ['steered']);
-        if (exact.steered !== undefined && exact.steered !== true) {
-            throw invalidProtocolFrame('Invalid WorkHub Coordination steering result');
-        }
-        return {
-            disposition: result.disposition,
-            targetSessionId: requireEntityId(exact.targetSessionId, 'WorkHub target Session id'),
-            targetTurnId: requireEntityId(exact.targetTurnId, 'WorkHub target Turn id'),
-            ...(exact.steered === true ? { steered: true } : {}),
-        };
-    }
-    if (result.disposition === 'replace') {
-        const exact = requireShapedRecord(result, 'WorkHub Coordination replacement result', ['disposition', 'replacementDisposition', 'targetSessionId', 'targetTurnId'], ['steered']);
-        if (exact.replacementDisposition !== 'delegate_existing' &&
-            exact.replacementDisposition !== 'create_new') {
-            throw invalidProtocolFrame('Invalid WorkHub replacement disposition');
-        }
-        if (exact.steered !== undefined && exact.steered !== true) {
-            throw invalidProtocolFrame('Invalid WorkHub Coordination steering result');
-        }
-        return {
-            disposition: 'replace',
-            replacementDisposition: exact.replacementDisposition,
-            targetSessionId: requireEntityId(exact.targetSessionId, 'WorkHub target Session id'),
-            targetTurnId: requireEntityId(exact.targetTurnId, 'WorkHub target Turn id'),
-            ...(exact.steered === true ? { steered: true } : {}),
-        };
-    }
-    if (result.disposition === 'stop_work') {
-        const exact = requireShapedRecord(result, 'WorkHub Coordination stop result', ['disposition', 'outcome', 'targetSessionId'], ['targetTurnId']);
-        if (exact.outcome !== 'cancelled_pending' &&
-            exact.outcome !== 'stop_delivered' &&
-            exact.outcome !== 'already_terminal' &&
-            exact.outcome !== 'not_owned') {
-            throw invalidProtocolFrame('Invalid WorkHub stop outcome');
-        }
-        if (((exact.outcome === 'stop_delivered' || exact.outcome === 'not_owned') &&
-            exact.targetTurnId === undefined) ||
-            (exact.outcome === 'cancelled_pending' && exact.targetTurnId !== undefined)) {
-            throw invalidProtocolFrame('Invalid WorkHub stop target Turn');
-        }
-        return {
-            disposition: 'stop_work',
-            outcome: exact.outcome,
-            targetSessionId: requireEntityId(exact.targetSessionId, 'WorkHub target Session id'),
-            ...(exact.targetTurnId === undefined
-                ? {}
-                : {
-                    targetTurnId: requireEntityId(exact.targetTurnId, 'WorkHub target Turn id'),
-                }),
-        };
-    }
-    if (result.disposition === 'resume_work') {
-        const exact = requireShapedRecord(result, 'WorkHub Coordination resume result', ['disposition', 'outcome', 'targetSessionId'], ['targetTurnId']);
-        if (exact.outcome !== 'resume_started' && exact.outcome !== 'already_running') {
-            throw invalidProtocolFrame('Invalid WorkHub resume outcome');
-        }
-        // Only a started continuation names a Turn: the Host has one to name, and
-        // the other two outcomes changed nothing that could carry an identity.
-        if ((exact.outcome === 'resume_started') !== (exact.targetTurnId !== undefined)) {
-            throw invalidProtocolFrame('Invalid WorkHub resume target Turn');
-        }
-        return {
-            disposition: 'resume_work',
-            outcome: exact.outcome,
-            targetSessionId: requireEntityId(exact.targetSessionId, 'WorkHub target Session id'),
-            ...(exact.targetTurnId === undefined
-                ? {}
-                : {
-                    targetTurnId: requireEntityId(exact.targetTurnId, 'WorkHub target Turn id'),
-                }),
-        };
+    if (!isWorkHubActionResult(value) ||
+        value.disposition === 'answer_here' ||
+        value.disposition === 'clarify') {
+        throw invalidProtocolFrame('Invalid WorkHub Coordination action result');
     }
-    throw invalidProtocolFrame('Invalid WorkHub Coordination action disposition');
+    return Object.fromEntries(Object.entries(value).filter(([, field]) => field !== undefined));
 }
 function decodeWorkHubCoordinationCandidate(value) {
     const candidate = requireShapedRecord(value, 'WorkHub Coordination candidate', ['candidateRef', 'sessionId', 'sessionName', 'workspace', 'state', 'updatedAt'], ['latestDelegationActionId']);
@@ -344,20 +265,6 @@ function decodeWorkHubCoordinationCandidate(value) {
 }
 function decodeWorkHubCoordinationProposal(value) {
     const proposal = requireRecord(value, 'WorkHub Coordination proposal');
-    if (proposal.disposition === 'answer_here') {
-        requireExactRecord(proposal, 'WorkHub answer proposal', ['disposition']);
-        return { disposition: 'answer_here' };
-    }
-    if (proposal.disposition === 'clarify') {
-        const exact = requireExactRecord(proposal, 'WorkHub clarification proposal', [
-            'disposition',
-            'assistantText',
-        ]);
-        return {
-            disposition: 'clarify',
-            assistantText: requireUtf8String(exact.assistantText, 'WorkHub clarification text', WORKHUB_COORDINATION_SUMMARY_MAX_BYTES),
-        };
-    }
     if (proposal.disposition === 'delegate_existing') {
         const exact = requireExactRecord(proposal, 'WorkHub delegation proposal', [
             'disposition',
@@ -448,13 +355,6 @@ function decodeWorkHubCoordinationCreateContext(value) {
         workspace: decodeWorkspaceTarget(context.workspace),
     };
 }
-function decodeWorkHubCoordinationDestructiveConfirmation(value) {
-    const confirmation = requireExactRecord(value, 'WorkHub destructive confirmation', ['kind']);
-    if (confirmation.kind !== 'user_correction' && confirmation.kind !== 'user_stop') {
-        throw invalidProtocolFrame('Invalid WorkHub destructive confirmation');
-    }
-    return { kind: confirmation.kind };
-}
 function candidateSetId(value) {
     const id = requireUtf8String(value, 'WorkHub candidate set id', CANDIDATE_SET_ID_MAX_BYTES);
     if (!/^sha256:[a-f0-9]{64}$/u.test(id)) {

package/node_modules/@maka/runtime-host/dist/server/access-credential-store.js

@@ -53,6 +53,10 @@ const PERSISTED_GRANT_MIGRATIONS = new Map([
     // Retired with the second execution-inspection contract; no shipped surface
     // called execution.inspect.resolve.
     ['execution.inspect.resolve', { kind: 'release' }],
+    // Direct WorkHub actions and record writes were retired. Their grants do not
+    // authorize actFromTurn, which requires the active coordination Turn.
+    ['workhub.coordination.act', { kind: 'release' }],
+    ['workhub.coordination.record', { kind: 'release' }],
 ]);
 export const ACCESS_FILE_NAME = 'runtime-host-access.json';
 export const SESSION_GUEST_OPERATION_GRANTS = Object.freeze([

package/node_modules/@maka/runtime-host/dist/server/canonical-session-projection.js

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { isSessionNotFoundError } from '@maka/storage/execution-stores';
 import { decodeSessionContinuitySnapshot, SESSION_CONTINUITY_SCHEMA_VERSION, SESSION_CONTINUITY_SNAPSHOT_MAX_BYTES, } from '../protocol/index.js';
 import { isMissingFile, readCanonicalTurnSnapshot, worstCaseFailedTurnSnapshot, } from './canonical-turn-snapshot.js';
 import { worstCaseMessageQueueProjection } from './message-queue-capacity.js';
@@ -42,7 +43,7 @@ export class CanonicalSessionProjectionReader {
             metadataRevision = record.revision;
         }
         catch (error) {
-            if (isMissingFile(error))
+            if (isMissingFile(error) || isSessionNotFoundError(error))
                 return null;
             throw error;
         }

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

@@ -17,13 +17,16 @@
  * under the License.
  */
 import { decodeClientFrame, isClientCapabilityClientFrameKind, RUNTIME_HOST_MAX_IN_FLIGHT_DOMAIN_REQUESTS, } from '../protocol/index.js';
+import { runtimeHostLogBuffer } from '../process-diagnostics.js';
 import { dispatchOperation, operationFailureResponse, } from './operation-dispatcher.js';
 import { BoundedSerialOutboundWriter } from './serial-outbound-writer.js';
 import { RuntimeHostTransportError } from '../transport/framed-transport.js';
 import { authorizeClientCapabilityFrame, authorizeRuntimeHostOperation, hasRuntimeHostOperationGrant, } from './connection-authority.js';
+import { boundedFailureDiagnostic } from './failure-diagnostic.js';
 export class RuntimeHostConnectionSession {
     #options;
     #writer;
+    #onDiagnostic;
     #requests = new Map();
     #transcriptPageTail = Promise.resolve();
     #inFlightStatusRequests = 0;
@@ -37,7 +40,9 @@ export class RuntimeHostConnectionSession {
     #closed = false;
     constructor(options) {
         this.#options = options;
-        this.#writer = new BoundedSerialOutboundWriter(options.transport, () => this.#teardown());
+        this.#onDiagnostic =
+            options.onDiagnostic ?? ((diagnostic) => runtimeHostLogBuffer.append('error', diagnostic));
+        this.#writer = new BoundedSerialOutboundWriter(options.transport, (error) => this.#fail(error));
     }
     async run() {
         this.attachGlobalChanges();
@@ -51,8 +56,8 @@ export class RuntimeHostConnectionSession {
                 await this.#closeAfterDispatchedReplies();
             }
         }
-        catch {
-            this.#teardown();
+        catch (error) {
+            this.#fail(error);
         }
         finally {
             this.#teardown();
@@ -94,7 +99,7 @@ export class RuntimeHostConnectionSession {
                 if (isClientCapabilityClientFrameKind(frame.kind)) {
                     const capabilityFrame = frame;
                     if (!authorizeClientCapabilityFrame(this.#options.connection.authority, capabilityFrame)) {
-                        this.#teardown();
+                        this.#fail(new Error('Runtime Host Client Capability frame is not authorized'));
                         return;
                     }
                     this.#ensureClientCapabilities()?.accept(capabilityFrame);
@@ -104,9 +109,13 @@ export class RuntimeHostConnectionSession {
             }
             const usesLivenessReserve = this.#requests.size === RUNTIME_HOST_MAX_IN_FLIGHT_DOMAIN_REQUESTS &&
                 (frame.operation === 'host.status' || this.#inFlightStatusRequests > 0);
-            if (this.#requests.has(frame.requestId) ||
-                (this.#requests.size >= RUNTIME_HOST_MAX_IN_FLIGHT_DOMAIN_REQUESTS && !usesLivenessReserve)) {
-                this.#teardown();
+            if (this.#requests.has(frame.requestId)) {
+                this.#fail(new Error('Runtime Host Client reused an active request id'));
+                return;
+            }
+            if (this.#requests.size >= RUNTIME_HOST_MAX_IN_FLIGHT_DOMAIN_REQUESTS &&
+                !usesLivenessReserve) {
+                this.#fail(new Error('Runtime Host Client exceeded the in-flight request limit'));
                 return;
             }
             this.#dispatch(frame);
@@ -119,7 +128,7 @@ export class RuntimeHostConnectionSession {
             ? this.#transcriptPageTail.then(() => this.#handleRequest(frame))
             : this.#handleRequest(frame);
         const task = handling
-            .catch(() => this.#teardown())
+            .catch((error) => this.#fail(error))
             .finally(() => {
             if (this.#requests.get(frame.requestId) === task) {
                 this.#requests.delete(frame.requestId);
@@ -313,6 +322,17 @@ export class RuntimeHostConnectionSession {
         this.#hostChanges?.close();
         this.#hostChanges = undefined;
     }
+    #fail(error) {
+        if (this.#closed)
+            return;
+        try {
+            this.#onDiagnostic(`[runtime-host] connection session failed: ${boundedFailureDiagnostic(error)}`);
+        }
+        catch {
+            // Diagnostics cannot keep an invalid connection alive.
+        }
+        this.#teardown();
+    }
     #teardown() {
         if (this.#closed)
             return;