@exaudeus/workrail 3.3.0 → 3.5.0

package/dist/mcp/handlers/v2-execution/continue-rehydrate.d.ts

@@ -21,4 +21,5 @@ export declare function handleRehydrateIntent(args: {
     };
     readonly aliasStore: import('../../../v2/ports/token-alias-store.port.js').TokenAliasStorePortV2;
     readonly entropy: import('../../../v2/ports/random-entropy.port.js').RandomEntropyPortV2;
+    readonly resolvedRootUris?: readonly string[];
 }): RA<z.infer<typeof V2ContinueWorkflowOutputSchema>, ContinueWorkflowError>;

package/dist/mcp/handlers/v2-execution/continue-rehydrate.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleRehydrateIntent = handleRehydrateIntent;
 const output_schemas_js_1 = require("../../output-schemas.js");
+const binding_drift_js_1 = require("../../../v2/durable-core/domain/binding-drift.js");
+const binding_registry_js_1 = require("../../../application/services/compiler/binding-registry.js");
+const v2_workspace_resolution_js_1 = require("../v2-workspace-resolution.js");
 const snapshot_state_js_1 = require("../../../v2/durable-core/projections/snapshot-state.js");
 const workflow_js_1 = require("../../../types/workflow.js");
 const index_js_1 = require("../../../v2/durable-core/ids/index.js");
@@ -16,14 +19,14 @@ const v2_state_conversion_js_1 = require("../v2-state-conversion.js");
 const constants_js_1 = require("../../../v2/durable-core/constants.js");
 const index_js_2 = require("./index.js");
 function handleRehydrateIntent(args) {
-    const { input, sessionId, runId, nodeId, workflowHashRef, truth, tokenCodecPorts, pinnedStore, snapshotStore, idFactory, aliasStore, entropy } = args;
+    const { input, sessionId, runId, nodeId, workflowHashRef, truth, tokenCodecPorts, pinnedStore, snapshotStore, idFactory, aliasStore, entropy, resolvedRootUris } = args;
     const runStarted = truth.events.find((e) => e.kind === constants_js_1.EVENT_KIND.RUN_STARTED && e.scope.runId === String(runId));
     const workflowId = runStarted?.data.workflowId;
     if (!runStarted || typeof workflowId !== 'string' || workflowId.trim() === '') {
         return (0, neverthrow_1.errAsync)({
             kind: 'token_unknown_node',
-            message: 'No durable run state was found for this stateToken (missing run_started).',
-            suggestion: 'Use start_workflow to mint a new run, or use a stateToken returned by WorkRail for an existing run.',
+            message: 'No durable run state was found for this continueToken (missing run_started).',
+            suggestion: 'Use start_workflow to mint a new run, or use a continueToken returned by WorkRail for an existing run.',
         });
     }
     const workflowHash = runStarted.data.workflowHash;
@@ -36,14 +39,14 @@ function handleRehydrateIntent(args) {
         });
     }
     if (String(expectedRefRes.value) !== String(workflowHashRef)) {
-        return (0, neverthrow_1.errAsync)({ kind: 'precondition_failed', message: 'workflowHash mismatch for this run.', suggestion: 'Use the stateToken returned by WorkRail for this run.' });
+        return (0, neverthrow_1.errAsync)({ kind: 'precondition_failed', message: 'workflowHash mismatch for this run.', suggestion: 'Use the continueToken returned by WorkRail for this run.' });
     }
     const nodeCreated = truth.events.find((e) => e.kind === constants_js_1.EVENT_KIND.NODE_CREATED && e.scope.nodeId === String(nodeId) && e.scope.runId === String(runId));
     if (!nodeCreated) {
         return (0, neverthrow_1.errAsync)({
             kind: 'token_unknown_node',
-            message: 'No durable node state was found for this stateToken (missing node_created).',
-            suggestion: 'Use a stateToken returned by WorkRail for an existing node.',
+            message: 'No durable node state was found for this continueToken (missing node_created).',
+            suggestion: 'Use a continueToken returned by WorkRail for an existing node.',
         });
     }
     const expectedNodeRefRes = (0, workflow_hash_ref_js_1.deriveWorkflowHashRef)(nodeCreated.data.workflowHash);
@@ -55,7 +58,7 @@ function handleRehydrateIntent(args) {
         });
     }
     if (String(expectedNodeRefRes.value) !== String(workflowHashRef)) {
-        return (0, neverthrow_1.errAsync)({ kind: 'precondition_failed', message: 'workflowHash mismatch for this node.', suggestion: 'Use the stateToken returned by WorkRail for this node.' });
+        return (0, neverthrow_1.errAsync)({ kind: 'precondition_failed', message: 'workflowHash mismatch for this node.', suggestion: 'Use the continueToken returned by WorkRail for this node.' });
     }
     return snapshotStore.getExecutionSnapshotV1(nodeCreated.data.snapshotRef)
         .mapErr((cause) => ({ kind: 'snapshot_load_failed', cause }))
@@ -64,35 +67,13 @@ function handleRehydrateIntent(args) {
             return (0, neverthrow_1.errAsync)({
                 kind: 'token_unknown_node',
                 message: 'No execution snapshot was found for this node.',
-                suggestion: 'Use a stateToken returned by WorkRail for an existing node.',
+                suggestion: 'Use a continueToken returned by WorkRail for an existing node.',
             });
         }
         const engineState = snapshot.enginePayload.engineState;
         const pending = (0, snapshot_state_js_1.derivePendingStep)(engineState);
         const isComplete = (0, snapshot_state_js_1.deriveIsComplete)(engineState);
-        if (!pending) {
-            const preferences = (0, v2_execution_helpers_js_1.derivePreferencesOrDefault)({ truth, runId, nodeId });
-            const nextIntent = (0, v2_state_conversion_js_1.deriveNextIntent)({ rehydrateOnly: true, isComplete, pending: null });
-            return (0, neverthrow_1.okAsync)(output_schemas_js_1.V2ContinueWorkflowOutputSchema.parse({
-                kind: 'ok',
-                isComplete,
-                pending: null,
-                preferences,
-                nextIntent,
-                nextCall: null,
-            }));
-        }
-        const attemptId = (0, v2_token_ops_js_1.newAttemptId)(idFactory);
-        const entryBase = {
-            sessionId: String(sessionId),
-            runId: String(runId),
-            nodeId: String(nodeId),
-            attemptId: String(attemptId),
-            workflowHashRef: String(workflowHashRef),
-        };
-        return (0, v2_token_ops_js_1.mintContinueAndCheckpointTokens)({ entry: entryBase, ports: tokenCodecPorts, aliasStore, entropy })
-            .mapErr((failure) => ({ kind: 'token_signing_failed', cause: failure }))
-            .andThen(({ continueToken: continueTokenValue, checkpointToken: checkpointTokenValue }) => pinnedStore.get(workflowHash)
+        return pinnedStore.get(workflowHash)
             .mapErr((cause) => ({ kind: 'pinned_workflow_store_failed', cause }))
             .andThen((pinned) => {
             if (!pinned)
@@ -106,35 +87,70 @@ function handleRehydrateIntent(args) {
                     suggestion: 'Re-pin the workflow via start_workflow.',
                 });
             }
-            const wf = (0, workflow_js_1.createWorkflow)(pinned.definition, (0, workflow_source_js_1.createBundledSource)());
-            const metaRes = (0, prompt_renderer_js_1.renderPendingPrompt)({
-                workflow: wf,
-                stepId: String(pending.stepId),
-                loopPath: pending.loopPath,
-                truth,
-                runId: (0, index_js_1.asRunId)(String(runId)),
-                nodeId: (0, index_js_1.asNodeId)(String(nodeId)),
-                rehydrateOnly: true,
-            });
-            if (metaRes.isErr()) {
-                return (0, neverthrow_1.errAsync)({
-                    kind: 'invariant_violation',
-                    message: `Prompt rendering failed: ${metaRes.error.message}`,
-                });
+            const bindingBaseDir = (0, v2_workspace_resolution_js_1.resolveBindingBaseDir)(input.workspacePath, resolvedRootUris ?? []);
+            const driftWarnings = detectBindingDriftForSnapshot(pinned, workflowId, bindingBaseDir);
+            if (!pending) {
+                const preferences = (0, v2_execution_helpers_js_1.derivePreferencesOrDefault)({ truth, runId, nodeId });
+                const nextIntent = (0, v2_state_conversion_js_1.deriveNextIntent)({ rehydrateOnly: true, isComplete, pending: null });
+                return (0, neverthrow_1.okAsync)(output_schemas_js_1.V2ContinueWorkflowOutputSchema.parse({
+                    kind: 'ok',
+                    isComplete,
+                    pending: null,
+                    preferences,
+                    nextIntent,
+                    nextCall: null,
+                    ...(driftWarnings.length > 0 ? { warnings: driftWarnings } : {}),
+                }));
             }
-            const meta = metaRes.value;
-            const preferences = (0, v2_execution_helpers_js_1.derivePreferencesOrDefault)({ truth, runId, nodeId });
-            const nextIntent = (0, v2_state_conversion_js_1.deriveNextIntent)({ rehydrateOnly: true, isComplete, pending: meta });
-            return (0, neverthrow_1.okAsync)(output_schemas_js_1.V2ContinueWorkflowOutputSchema.parse({
-                kind: 'ok',
-                continueToken: continueTokenValue,
-                checkpointToken: checkpointTokenValue,
-                isComplete,
-                pending: (0, output_schemas_js_1.toPendingStep)(meta),
-                preferences,
-                nextIntent,
-                nextCall: (0, index_js_2.buildNextCall)({ continueToken: continueTokenValue, isComplete, pending: meta }),
-            }));
-        }));
+            const attemptId = (0, v2_token_ops_js_1.newAttemptId)(idFactory);
+            const entryBase = {
+                sessionId: String(sessionId),
+                runId: String(runId),
+                nodeId: String(nodeId),
+                attemptId: String(attemptId),
+                workflowHashRef: String(workflowHashRef),
+            };
+            return (0, v2_token_ops_js_1.mintContinueAndCheckpointTokens)({ entry: entryBase, ports: tokenCodecPorts, aliasStore, entropy })
+                .mapErr((failure) => ({ kind: 'token_signing_failed', cause: failure }))
+                .andThen(({ continueToken: continueTokenValue, checkpointToken: checkpointTokenValue }) => {
+                const wf = (0, workflow_js_1.createWorkflow)(pinned.definition, (0, workflow_source_js_1.createBundledSource)());
+                const metaRes = (0, prompt_renderer_js_1.renderPendingPrompt)({
+                    workflow: wf,
+                    stepId: String(pending.stepId),
+                    loopPath: pending.loopPath,
+                    truth,
+                    runId: (0, index_js_1.asRunId)(String(runId)),
+                    nodeId: (0, index_js_1.asNodeId)(String(nodeId)),
+                    rehydrateOnly: true,
+                });
+                if (metaRes.isErr()) {
+                    return (0, neverthrow_1.errAsync)({
+                        kind: 'invariant_violation',
+                        message: `Prompt rendering failed: ${metaRes.error.message}`,
+                    });
+                }
+                const meta = metaRes.value;
+                const preferences = (0, v2_execution_helpers_js_1.derivePreferencesOrDefault)({ truth, runId, nodeId });
+                const nextIntent = (0, v2_state_conversion_js_1.deriveNextIntent)({ rehydrateOnly: true, isComplete, pending: meta });
+                return (0, neverthrow_1.okAsync)(output_schemas_js_1.V2ContinueWorkflowOutputSchema.parse({
+                    kind: 'ok',
+                    continueToken: continueTokenValue,
+                    checkpointToken: checkpointTokenValue,
+                    isComplete,
+                    pending: (0, output_schemas_js_1.toPendingStep)(meta),
+                    preferences,
+                    nextIntent,
+                    nextCall: (0, index_js_2.buildNextCall)({ continueToken: continueTokenValue, isComplete, pending: meta }),
+                    ...(driftWarnings.length > 0 ? { warnings: driftWarnings } : {}),
+                }));
+            });
+        });
     });
 }
+function detectBindingDriftForSnapshot(pinned, workflowId, baseDir) {
+    const pinnedOverrides = pinned.pinnedOverrides ?? pinned.resolvedBindings;
+    if (!pinnedOverrides || Object.keys(pinnedOverrides).length === 0)
+        return [];
+    const currentBindings = (0, binding_registry_js_1.loadProjectBindings)(workflowId, baseDir);
+    return (0, binding_drift_js_1.detectBindingDrift)(pinnedOverrides, currentBindings);
+}

package/dist/mcp/handlers/v2-execution/index.js

@@ -10,6 +10,7 @@ const index_js_2 = require("../../../v2/durable-core/ids/index.js");
 const neverthrow_1 = require("neverthrow");
 const v2_execution_helpers_js_1 = require("../v2-execution-helpers.js");
 const v2_token_ops_js_1 = require("../v2-token-ops.js");
+const types_js_2 = require("../../types.js");
 const v2_context_budget_js_1 = require("../v2-context-budget.js");
 const start_js_1 = require("./start.js");
 const continue_rehydrate_js_1 = require("./continue-rehydrate.js");
@@ -37,56 +38,97 @@ async function handleV2ContinueWorkflow(input, ctx) {
         return guard.error;
     return executeContinueWorkflow(input, guard.ctx).match((payload) => (0, types_js_1.success)(payload), (e) => (0, v2_execution_helpers_js_1.mapContinueWorkflowErrorToToolError)(e));
 }
+function classifyToken(raw) {
+    if (raw.startsWith('st_') || raw.startsWith('st1'))
+        return { kind: 'state', raw };
+    return { kind: 'continue', raw };
+}
+function loadAndRehydrate(args) {
+    const { sessionId, runId, nodeId, workflowHashRef, input } = args;
+    const { sessionStore, tokenCodecPorts, pinnedStore, snapshotStore, idFactory, tokenAliasStore, entropy } = args.ctx.v2;
+    return sessionStore.load(sessionId)
+        .mapErr((cause) => ({ kind: 'session_load_failed', cause }))
+        .andThen((truth) => (0, continue_rehydrate_js_1.handleRehydrateIntent)({
+        input,
+        sessionId,
+        runId,
+        nodeId,
+        workflowHashRef,
+        truth,
+        tokenCodecPorts,
+        pinnedStore,
+        snapshotStore,
+        idFactory,
+        aliasStore: tokenAliasStore,
+        entropy,
+        resolvedRootUris: args.ctx.v2.resolvedRootUris,
+    }));
+}
 function executeContinueWorkflow(input, ctx) {
     const { gate, sessionStore, snapshotStore, pinnedStore, sha256, tokenCodecPorts, idFactory, tokenAliasStore, entropy } = ctx.v2;
     const ctxCheck = (0, v2_context_budget_js_1.checkContextBudget)({ tool: 'continue_workflow', context: input.context });
     if (!ctxCheck.ok)
         return (0, neverthrow_1.errAsync)({ kind: 'validation_failed', failure: ctxCheck.error });
-    return (0, v2_token_ops_js_1.parseContinueTokenOrFail)(input.continueToken, tokenCodecPorts, tokenAliasStore)
-        .mapErr((failure) => ({ kind: 'validation_failed', failure }))
-        .andThen((resolved) => {
-        const sessionId = (0, index_js_2.asSessionId)(resolved.sessionId);
-        const runId = (0, index_js_2.asRunId)(resolved.runId);
-        const nodeId = (0, index_js_2.asNodeId)(resolved.nodeId);
-        const workflowHashRef = resolved.workflowHashRef;
-        if (input.intent === 'rehydrate') {
-            return sessionStore.load(sessionId)
-                .mapErr((cause) => ({ kind: 'session_load_failed', cause }))
-                .andThen((truth) => (0, continue_rehydrate_js_1.handleRehydrateIntent)({
+    const routing = classifyToken(input.continueToken);
+    switch (routing.kind) {
+        case 'state': {
+            if (input.intent === 'advance') {
+                const hasOutput = input.output != null;
+                const message = hasOutput
+                    ? 'A resumeToken cannot carry output — resumeTokens are read-only. Remove the output field and call continue_workflow with just the resumeToken to rehydrate session context.'
+                    : 'A resumeToken (st_... / st1...) carries no advance authority. Use intent: "rehydrate" to restore session context.';
+                const suggestion = hasOutput
+                    ? 'Remove the output field. Pass just { continueToken: "<resumeToken>", intent: "rehydrate" } to rehydrate, then use the returned continueToken to advance.'
+                    : 'Pass intent: "rehydrate" when using the resumeToken from resume_session or checkpoint_workflow.';
+                return (0, neverthrow_1.errAsync)({
+                    kind: 'validation_failed',
+                    failure: (0, types_js_2.errNotRetryable)('TOKEN_SCOPE_MISMATCH', message, { suggestion }),
+                });
+            }
+            return (0, v2_token_ops_js_1.parseStateTokenOrFail)(routing.raw, tokenCodecPorts, tokenAliasStore)
+                .mapErr((failure) => ({ kind: 'validation_failed', failure }))
+                .andThen((resolved) => loadAndRehydrate({
+                sessionId: (0, index_js_2.asSessionId)(resolved.payload.sessionId),
+                runId: (0, index_js_2.asRunId)(resolved.payload.runId),
+                nodeId: (0, index_js_2.asNodeId)(resolved.payload.nodeId),
+                workflowHashRef: resolved.payload.workflowHashRef,
                 input,
-                sessionId,
-                runId,
-                nodeId,
-                workflowHashRef,
-                truth,
-                tokenCodecPorts,
-                pinnedStore,
-                snapshotStore,
-                idFactory,
-                aliasStore: tokenAliasStore,
-                entropy,
+                ctx,
             }));
         }
-        const attemptId = (0, index_js_1.asAttemptId)(resolved.attemptId);
-        return sessionStore.load(sessionId)
-            .mapErr((cause) => ({ kind: 'session_load_failed', cause }))
-            .andThen((truth) => (0, continue_advance_js_1.handleAdvanceIntent)({
-            input,
-            sessionId,
-            runId,
-            nodeId,
-            attemptId,
-            workflowHashRef,
-            truth,
-            gate,
-            sessionStore,
-            snapshotStore,
-            pinnedStore,
-            tokenCodecPorts,
-            idFactory,
-            sha256,
-            aliasStore: tokenAliasStore,
-            entropy,
-        }));
-    });
+        case 'continue': {
+            return (0, v2_token_ops_js_1.parseContinueTokenOrFail)(routing.raw, tokenCodecPorts, tokenAliasStore)
+                .mapErr((failure) => ({ kind: 'validation_failed', failure }))
+                .andThen((resolved) => {
+                const sessionId = (0, index_js_2.asSessionId)(resolved.sessionId);
+                const runId = (0, index_js_2.asRunId)(resolved.runId);
+                const nodeId = (0, index_js_2.asNodeId)(resolved.nodeId);
+                const workflowHashRef = resolved.workflowHashRef;
+                if (input.intent === 'rehydrate') {
+                    return loadAndRehydrate({ sessionId, runId, nodeId, workflowHashRef, input, ctx });
+                }
+                const attemptId = (0, index_js_1.asAttemptId)(resolved.attemptId);
+                return sessionStore.load(sessionId)
+                    .mapErr((cause) => ({ kind: 'session_load_failed', cause }))
+                    .andThen((truth) => (0, continue_advance_js_1.handleAdvanceIntent)({
+                    input,
+                    sessionId,
+                    runId,
+                    nodeId,
+                    attemptId,
+                    workflowHashRef,
+                    truth,
+                    gate,
+                    sessionStore,
+                    snapshotStore,
+                    pinnedStore,
+                    tokenCodecPorts,
+                    idFactory,
+                    sha256,
+                    aliasStore: tokenAliasStore,
+                    entropy,
+                }));
+            });
+        }
+    }
 }

package/dist/mcp/handlers/v2-execution-helpers.js

@@ -107,7 +107,7 @@ function mapTokenDecodeErrorToToolError(e) {
         }
         if (bech32mErr.code === 'BECH32M_HRP_MISMATCH') {
             return (0, types_js_1.errNotRetryable)('TOKEN_INVALID_FORMAT', `Wrong token type. ${e.message}`, {
-                suggestion: 'Ensure you are using the correct token (stateToken vs ackToken) for this operation.',
+                suggestion: 'Ensure you are using the correct token type for this operation (continueToken, checkpointToken, or resumeToken).',
                 details: {
                     errorType: 'hrp_mismatch',
                 },

package/dist/mcp/handlers/v2-resume.js

@@ -30,14 +30,14 @@ async function handleV2ResumeSession(input, ctx) {
     if (resumeResult.isErr()) {
         return (0, types_js_1.errNotRetryable)('INTERNAL_ERROR', `Resume failed: ${resumeResult.error.message}`);
     }
-    const candidates = resumeResult.value;
+    const { candidates, totalFound } = resumeResult.value;
     const { outputCandidates, skipped } = mintCandidateTokens(candidates, v2.tokenCodecPorts);
     if (skipped > 0) {
         console.error(`[workrail:resume] ${skipped}/${candidates.length} candidate(s) skipped: token minting failed (workflowHashRef derivation or signing error)`);
     }
     const output = output_schemas_js_1.V2ResumeSessionOutputSchema.parse({
         candidates: outputCandidates,
-        totalEligible: candidates.length,
+        totalEligible: totalFound,
     });
     return {
         type: 'success',
@@ -53,7 +53,7 @@ function mintCandidateTokens(candidates, ports) {
             skipped++;
             continue;
         }
-        const stateTokenRes = (0, v2_token_ops_js_1.signTokenOrErr)({
+        const resumeTokenRes = (0, v2_token_ops_js_1.signTokenOrErr)({
             payload: {
                 tokenVersion: 1,
                 tokenKind: 'state',
@@ -64,16 +64,21 @@ function mintCandidateTokens(candidates, ports) {
             },
             ports,
         });
-        if (stateTokenRes.isErr()) {
+        if (resumeTokenRes.isErr()) {
             skipped++;
             continue;
         }
         outputCandidates.push({
             sessionId: candidate.sessionId,
             runId: candidate.runId,
-            stateToken: stateTokenRes.value,
+            workflowId: candidate.workflowId,
+            resumeToken: resumeTokenRes.value,
             snippet: candidate.snippet,
             whyMatched: [...candidate.whyMatched],
+            nextCall: {
+                tool: 'continue_workflow',
+                params: { continueToken: resumeTokenRes.value, intent: 'rehydrate' },
+            },
         });
     }
     return { outputCandidates, skipped };

package/dist/mcp/handlers/v2-token-ops.d.ts

@@ -35,7 +35,7 @@ export declare function mintContinueAndCheckpointTokens(args: Omit<MintShortToke
     readonly entry: Omit<TokenAliasEntryV2, 'nonceHex' | 'tokenKind'>;
 }): ResultAsync<ContinueAndCheckpointTokens, ToolFailure>;
 export interface ShortTokenTriple {
-    readonly stateToken: string;
+    readonly resumeToken: string;
     readonly ackToken: string;
     readonly checkpointToken: string;
 }

package/dist/mcp/handlers/v2-token-ops.js

@@ -94,7 +94,7 @@ function parseStateTokenOrFail(raw, ports, aliasStore) {
         return resolveShortToken(raw, ports, aliasStore).andThen((resolved) => {
             if (resolved.payload.tokenKind !== 'state') {
                 return (0, neverthrow_1.errAsync)((0, types_js_1.errNotRetryable)('TOKEN_INVALID_FORMAT', 'Expected a state token (st_... or st1...).', {
-                    suggestion: 'Use the stateToken returned by WorkRail.',
+                    suggestion: 'Use the resumeToken returned by WorkRail.',
                 }));
             }
             return (0, neverthrow_1.okAsync)(resolved);
@@ -110,7 +110,7 @@ function parseStateTokenOrFail(raw, ports, aliasStore) {
     }
     if (parsedRes.value.payload.tokenKind !== 'state') {
         return (0, neverthrow_1.errAsync)((0, types_js_1.errNotRetryable)('TOKEN_INVALID_FORMAT', 'Expected a state token (st1...).', {
-            suggestion: 'Use the stateToken returned by WorkRail.',
+            suggestion: 'Use the resumeToken returned by WorkRail.',
         }));
     }
     return (0, neverthrow_1.okAsync)(parsedRes.value);
@@ -288,7 +288,7 @@ function mintShortTokenTriple(args) {
         const replayCk = reTokenFromNonceHex('checkpoint', existingCk.nonceHex, ports);
         if (replayState.isOk() && replayAck.isOk() && replayCk.isOk()) {
             return (0, neverthrow_1.okAsync)({
-                stateToken: replayState.value,
+                resumeToken: replayState.value,
                 ackToken: replayAck.value,
                 checkpointToken: replayCk.value,
             });
@@ -310,7 +310,7 @@ function mintShortTokenTriple(args) {
                     : 'UNKNOWN';
         return (0, neverthrow_1.errAsync)((0, types_js_1.errNotRetryable)('INTERNAL_ERROR', `Short token minting failed: ${msg}`));
     }
-    const stateTokenStr = stateMinted.value;
+    const resumeTokenStr = stateMinted.value;
     const ackTokenStr = ackMinted.value;
     const ckTokenStr = ckMinted.value;
     const stateNonceHex = bufToHex(stateNonce);
@@ -347,7 +347,7 @@ function mintShortTokenTriple(args) {
         .andThen(() => aliasStore.register(ackEntry))
         .andThen(() => aliasStore.register(ckEntry))
         .map(() => ({
-        stateToken: stateTokenStr,
+        resumeToken: resumeTokenStr,
         ackToken: ackTokenStr,
         checkpointToken: ckTokenStr,
     }))

package/dist/mcp/handlers/v2-workspace-resolution.d.ts

@@ -1,5 +1,6 @@
 import type { ResultAsync } from 'neverthrow';
 import type { WorkspaceAnchor, WorkspaceSource } from '../../v2/ports/workspace-anchor.port.js';
 import type { V2Dependencies } from '../types.js';
+export declare function resolveBindingBaseDir(workspacePath: string | undefined, resolvedRootUris: readonly string[]): string;
 export declare function selectWorkspaceSource(workspacePath: string | undefined, resolvedRootUris: readonly string[]): WorkspaceSource;
 export declare function resolveWorkspaceAnchors(v2: V2Dependencies, workspacePath: string | undefined): ResultAsync<readonly WorkspaceAnchor[], never>;

package/dist/mcp/handlers/v2-workspace-resolution.js

@@ -1,8 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveBindingBaseDir = resolveBindingBaseDir;
 exports.selectWorkspaceSource = selectWorkspaceSource;
 exports.resolveWorkspaceAnchors = resolveWorkspaceAnchors;
 const neverthrow_1 = require("neverthrow");
+function resolveBindingBaseDir(workspacePath, resolvedRootUris) {
+    if (workspacePath !== undefined)
+        return workspacePath;
+    const primaryUri = resolvedRootUris[0];
+    if (primaryUri !== undefined) {
+        if (primaryUri.startsWith('file://')) {
+            return decodeURIComponent(primaryUri.replace(/^file:\/\//, ''));
+        }
+    }
+    return process.cwd();
+}
 function selectWorkspaceSource(workspacePath, resolvedRootUris) {
     if (workspacePath !== undefined) {
         return { kind: 'explicit_path', path: workspacePath };

package/dist/mcp/index.d.ts

@@ -12,5 +12,8 @@ export { handleWorkflowList, handleWorkflowGet, handleWorkflowNext, handleWorkfl
 export type { WorkflowSummary, WorkflowListOutput, WorkflowGetOutput, WorkflowNextOutput, WorkflowValidateJsonOutput, WorkflowGetSchemaOutput, } from './handlers/workflow.js';
 export { handleCreateSession, handleUpdateSession, handleReadSession, handleOpenDashboard, } from './handlers/session.js';
 export type { CreateSessionOutput, UpdateSessionOutput, ReadSessionOutput, ReadSessionSchemaOutput, SchemaOverview, OpenDashboardOutput, } from './handlers/session.js';
-export { createToolContext, startServer, } from './server.js';
+export { createToolContext, composeServer, } from './server.js';
+export type { ComposedServer } from './server.js';
+export { startStdioServer } from './transports/stdio-entry.js';
+export { startHttpServer } from './transports/http-entry.js';
 export { zodToJsonSchema } from './zod-to-json-schema.js';

package/dist/mcp/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zodToJsonSchema = exports.startServer = exports.createToolContext = exports.handleOpenDashboard = exports.handleReadSession = exports.handleUpdateSession = exports.handleCreateSession = exports.handleWorkflowGetSchema = exports.handleWorkflowValidateJson = exports.handleWorkflowNext = exports.handleWorkflowGet = exports.handleWorkflowList = exports.sessionTools = exports.openDashboardTool = exports.readSessionTool = exports.updateSessionTool = exports.createSessionTool = exports.OpenDashboardInput = exports.ReadSessionInput = exports.UpdateSessionInput = exports.CreateSessionInput = exports.WORKFLOW_TOOL_TITLES = exports.WORKFLOW_TOOL_ANNOTATIONS = exports.WorkflowGetSchemaInput = exports.WorkflowValidateJsonInput = exports.WorkflowNextInput = exports.WorkflowGetInput = exports.WorkflowListInput = exports.DESCRIPTIONS = exports.StaticToolDescriptionProvider = exports.ToolDescriptionProvider = exports.isWorkflowToolName = exports.isDescriptionMode = exports.WORKFLOW_TOOL_NAMES = exports.DESCRIPTION_MODES = exports.createToolFactory = exports.errRetryImmediate = exports.errRetryAfterMs = exports.errNotRetryable = exports.error = exports.success = void 0;
+exports.zodToJsonSchema = exports.startHttpServer = exports.startStdioServer = exports.composeServer = exports.createToolContext = exports.handleOpenDashboard = exports.handleReadSession = exports.handleUpdateSession = exports.handleCreateSession = exports.handleWorkflowGetSchema = exports.handleWorkflowValidateJson = exports.handleWorkflowNext = exports.handleWorkflowGet = exports.handleWorkflowList = exports.sessionTools = exports.openDashboardTool = exports.readSessionTool = exports.updateSessionTool = exports.createSessionTool = exports.OpenDashboardInput = exports.ReadSessionInput = exports.UpdateSessionInput = exports.CreateSessionInput = exports.WORKFLOW_TOOL_TITLES = exports.WORKFLOW_TOOL_ANNOTATIONS = exports.WorkflowGetSchemaInput = exports.WorkflowValidateJsonInput = exports.WorkflowNextInput = exports.WorkflowGetInput = exports.WorkflowListInput = exports.DESCRIPTIONS = exports.StaticToolDescriptionProvider = exports.ToolDescriptionProvider = exports.isWorkflowToolName = exports.isDescriptionMode = exports.WORKFLOW_TOOL_NAMES = exports.DESCRIPTION_MODES = exports.createToolFactory = exports.errRetryImmediate = exports.errRetryAfterMs = exports.errNotRetryable = exports.error = exports.success = void 0;
 var types_js_1 = require("./types.js");
 Object.defineProperty(exports, "success", { enumerable: true, get: function () { return types_js_1.success; } });
 Object.defineProperty(exports, "error", { enumerable: true, get: function () { return types_js_1.error; } });
@@ -49,6 +49,10 @@ Object.defineProperty(exports, "handleReadSession", { enumerable: true, get: fun
 Object.defineProperty(exports, "handleOpenDashboard", { enumerable: true, get: function () { return session_js_1.handleOpenDashboard; } });
 var server_js_1 = require("./server.js");
 Object.defineProperty(exports, "createToolContext", { enumerable: true, get: function () { return server_js_1.createToolContext; } });
-Object.defineProperty(exports, "startServer", { enumerable: true, get: function () { return server_js_1.startServer; } });
+Object.defineProperty(exports, "composeServer", { enumerable: true, get: function () { return server_js_1.composeServer; } });
+var stdio_entry_js_1 = require("./transports/stdio-entry.js");
+Object.defineProperty(exports, "startStdioServer", { enumerable: true, get: function () { return stdio_entry_js_1.startStdioServer; } });
+var http_entry_js_1 = require("./transports/http-entry.js");
+Object.defineProperty(exports, "startHttpServer", { enumerable: true, get: function () { return http_entry_js_1.startHttpServer; } });
 var zod_to_json_schema_js_1 = require("./zod-to-json-schema.js");
 Object.defineProperty(exports, "zodToJsonSchema", { enumerable: true, get: function () { return zod_to_json_schema_js_1.zodToJsonSchema; } });