@exaudeus/workrail 2.0.0 → 3.0.0

package/dist/mcp/output-schemas.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenDashboardOutputSchema = exports.ReadSessionSchemaOutputSchema = exports.ReadSessionOutputSchema = exports.UpdateSessionOutputSchema = exports.CreateSessionOutputSchema = exports.V2StartWorkflowOutputSchema = exports.V2CheckpointWorkflowOutputSchema = exports.V2ResumeSessionOutputSchema = exports.V2ContinueWorkflowOutputSchema = exports.V2BlockerReportSchema = exports.V2NextCallSchema = exports.V2NextIntentSchema = exports.V2PreferencesSchema = exports.V2PendingStepSchema = exports.V2WorkflowInspectOutputSchema = exports.V2WorkflowListOutputSchema = exports.V2WorkflowListItemSchema = exports.WorkflowGetSchemaOutputSchema = exports.WorkflowValidateJsonOutputSchema = exports.WorkflowNextOutputSchema = exports.WorkflowGetOutputSchema = exports.WorkflowListOutputSchema = exports.WorkflowSummarySchema = exports.JsonValueSchema = void 0;
+exports.toPendingStep = toPendingStep;
 const zod_1 = require("zod");
 const state_js_1 = require("../domain/execution/state.js");
+const token_patterns_js_1 = require("../v2/durable-core/tokens/token-patterns.js");
 const JsonPrimitiveSchema = zod_1.z.union([zod_1.z.string(), zod_1.z.number(), zod_1.z.boolean(), zod_1.z.null()]);
 exports.JsonValueSchema = zod_1.z.lazy(() => zod_1.z.union([JsonPrimitiveSchema, zod_1.z.array(exports.JsonValueSchema), zod_1.z.record(exports.JsonValueSchema)]));
 exports.WorkflowSummarySchema = zod_1.z.object({
@@ -66,7 +68,18 @@ exports.V2PendingStepSchema = zod_1.z.object({
     stepId: zod_1.z.string().min(1),
     title: zod_1.z.string().min(1),
     prompt: zod_1.z.string().min(1),
+    agentRole: zod_1.z.string().min(1).optional(),
 });
+function toPendingStep(meta) {
+    if (!meta)
+        return null;
+    return {
+        stepId: meta.stepId,
+        title: meta.title,
+        prompt: meta.prompt,
+        ...(meta.agentRole ? { agentRole: meta.agentRole } : {}),
+    };
+}
 exports.V2PreferencesSchema = zod_1.z.object({
     autonomy: zod_1.z.enum(['guided', 'full_auto_stop_on_user_deps', 'full_auto_never_stop']),
     riskPolicy: zod_1.z.enum(['conservative', 'balanced', 'aggressive']),
@@ -77,18 +90,9 @@ exports.V2NextIntentSchema = zod_1.z.enum([
     'rehydrate_only',
     'complete',
 ]);
-const V2NextCallAdvanceParams = zod_1.z.object({
-    intent: zod_1.z.literal('advance'),
-    stateToken: zod_1.z.string().min(1),
-    ackToken: zod_1.z.string().min(1),
-});
-const V2NextCallRehydrateParams = zod_1.z.object({
-    intent: zod_1.z.literal('rehydrate'),
-    stateToken: zod_1.z.string().min(1),
-});
 exports.V2NextCallSchema = zod_1.z.object({
     tool: zod_1.z.literal('continue_workflow'),
-    params: zod_1.z.discriminatedUnion('intent', [V2NextCallAdvanceParams, V2NextCallRehydrateParams]),
+    params: zod_1.z.object({ continueToken: zod_1.z.string().min(1) }),
 }).nullable();
 function utf8ByteLength(s) {
     return new TextEncoder().encode(s).length;
@@ -176,11 +180,11 @@ exports.V2BlockerReportSchema = zod_1.z
         }
     }
 });
-const checkpointTokenSchema = zod_1.z.string().regex(/^chk1[023456789acdefghjklmnpqrstuvwxyz]+$/, 'Invalid checkpointToken format').optional();
+const checkpointTokenSchema = zod_1.z.string().regex(token_patterns_js_1.CHECKPOINT_TOKEN_PATTERN, 'Invalid checkpointToken format').optional();
+const continueTokenSchema = zod_1.z.string().regex(token_patterns_js_1.CONTINUE_TOKEN_PATTERN, 'Invalid continueToken format').optional();
 const V2ContinueWorkflowOkSchema = zod_1.z.object({
     kind: zod_1.z.literal('ok'),
-    stateToken: zod_1.z.string().regex(/^st1[023456789acdefghjklmnpqrstuvwxyz]+$/, 'Invalid stateToken format'),
-    ackToken: zod_1.z.string().regex(/^ack1[023456789acdefghjklmnpqrstuvwxyz]+$/, 'Invalid ackToken format').optional(),
+    continueToken: continueTokenSchema,
     checkpointToken: checkpointTokenSchema,
     isComplete: zod_1.z.boolean(),
     pending: exports.V2PendingStepSchema.nullable(),
@@ -190,8 +194,7 @@ const V2ContinueWorkflowOkSchema = zod_1.z.object({
 });
 const V2ContinueWorkflowBlockedSchema = zod_1.z.object({
     kind: zod_1.z.literal('blocked'),
-    stateToken: zod_1.z.string().regex(/^st1[023456789acdefghjklmnpqrstuvwxyz]+$/, 'Invalid stateToken format'),
-    ackToken: zod_1.z.string().regex(/^ack1[023456789acdefghjklmnpqrstuvwxyz]+$/, 'Invalid ackToken format').optional(),
+    continueToken: continueTokenSchema,
     checkpointToken: checkpointTokenSchema,
     isComplete: zod_1.z.boolean(),
     pending: exports.V2PendingStepSchema.nullable(),
@@ -200,7 +203,7 @@ const V2ContinueWorkflowBlockedSchema = zod_1.z.object({
     nextCall: exports.V2NextCallSchema,
     blockers: exports.V2BlockerReportSchema,
     retryable: zod_1.z.boolean().optional(),
-    retryAckToken: zod_1.z.string().optional(),
+    retryContinueToken: zod_1.z.string().optional(),
     validation: zod_1.z
         .object({
         issues: zod_1.z.array(zod_1.z.string()),
@@ -211,12 +214,12 @@ const V2ContinueWorkflowBlockedSchema = zod_1.z.object({
 exports.V2ContinueWorkflowOutputSchema = zod_1.z.discriminatedUnion('kind', [
     V2ContinueWorkflowOkSchema,
     V2ContinueWorkflowBlockedSchema,
-]).refine((data) => (data.pending ? data.ackToken != null : true), { message: 'ackToken is required when a pending step exists' });
+]).refine((data) => (data.pending ? data.continueToken != null : true), { message: 'continueToken is required when a pending step exists' });
 exports.V2ResumeSessionOutputSchema = zod_1.z.object({
     candidates: zod_1.z.array(zod_1.z.object({
         sessionId: zod_1.z.string().min(1),
         runId: zod_1.z.string().min(1),
-        stateToken: zod_1.z.string().regex(/^st1[023456789acdefghjklmnpqrstuvwxyz]+$/, 'Invalid stateToken format'),
+        stateToken: zod_1.z.string().regex(token_patterns_js_1.STATE_TOKEN_PATTERN, 'Invalid stateToken format'),
         snippet: zod_1.z.string().max(1024),
         whyMatched: zod_1.z.array(zod_1.z.enum([
             'matched_head_sha',
@@ -230,20 +233,19 @@ exports.V2ResumeSessionOutputSchema = zod_1.z.object({
 });
 exports.V2CheckpointWorkflowOutputSchema = zod_1.z.object({
     checkpointNodeId: zod_1.z.string().min(1),
-    stateToken: zod_1.z.string().regex(/^st1[023456789acdefghjklmnpqrstuvwxyz]+$/, 'Invalid stateToken format'),
+    stateToken: zod_1.z.string().regex(token_patterns_js_1.STATE_TOKEN_PATTERN, 'Invalid stateToken format'),
     nextCall: exports.V2NextCallSchema.describe('Pre-built template for your next continue_workflow call. ' +
         'After checkpoint, use this to rehydrate and continue working on the current step.'),
 });
 exports.V2StartWorkflowOutputSchema = zod_1.z.object({
-    stateToken: zod_1.z.string().regex(/^st1[023456789acdefghjklmnpqrstuvwxyz]+$/, 'Invalid stateToken format'),
-    ackToken: zod_1.z.string().regex(/^ack1[023456789acdefghjklmnpqrstuvwxyz]+$/, 'Invalid ackToken format').optional(),
+    continueToken: continueTokenSchema,
     checkpointToken: checkpointTokenSchema,
     isComplete: zod_1.z.boolean(),
     pending: exports.V2PendingStepSchema.nullable(),
     preferences: exports.V2PreferencesSchema,
     nextIntent: exports.V2NextIntentSchema,
     nextCall: exports.V2NextCallSchema,
-}).refine((data) => (data.pending ? data.ackToken != null : true), { message: 'ackToken is required when a pending step exists' });
+}).refine((data) => (data.pending ? data.continueToken != null : true), { message: 'continueToken is required when a pending step exists' });
 exports.CreateSessionOutputSchema = zod_1.z.object({
     sessionId: zod_1.z.string().min(1),
     workflowId: zod_1.z.string().min(1),

package/dist/mcp/server.js

@@ -81,6 +81,7 @@ async function createToolContext() {
         else {
             const sha256 = container_js_1.container.resolve(tokens_js_1.DI.V2.Sha256);
             const crypto = container_js_1.container.resolve(tokens_js_1.DI.V2.Crypto);
+            const entropy = container_js_1.container.resolve(tokens_js_1.DI.V2.RandomEntropy);
             const hmac = container_js_1.container.resolve(tokens_js_1.DI.V2.HmacSha256);
             const base64url = container_js_1.container.resolve(tokens_js_1.DI.V2.Base64Url);
             const base32 = container_js_1.container.resolve(tokens_js_1.DI.V2.Base32);
@@ -104,6 +105,11 @@ async function createToolContext() {
                 compiler,
                 normalizeToExecutable: v1_to_v2_shim_js_1.normalizeV1WorkflowToPinnedSnapshot,
             };
+            const tokenAliasStore = container_js_1.container.resolve(tokens_js_1.DI.V2.TokenAliasStore);
+            const aliasLoadResult = await tokenAliasStore.loadIndex();
+            if (aliasLoadResult.isErr()) {
+                console.error(`[V2Init] Token alias index load warning: ${aliasLoadResult.error.message}`);
+            }
             v2 = {
                 gate,
                 sessionStore,
@@ -111,8 +117,10 @@ async function createToolContext() {
                 pinnedStore,
                 sha256,
                 crypto,
+                entropy,
                 idFactory,
                 tokenCodecPorts,
+                tokenAliasStore,
                 validationPipelineDeps,
                 resolvedRootUris: [],
                 workspaceResolver: new index_js_1.LocalWorkspaceAnchorV2(process.cwd()),

package/dist/mcp/tool-descriptions.js

@@ -49,7 +49,9 @@ This tool provides:
 - Schema version and metadata information`,
         list_workflows: `Lists available workflows using WorkRail v2 (feature-flagged). Returns workflow metadata plus pinned snapshot hashes for deterministic execution.
 
-Use this to discover workflows before attempting multi-step tasks. When a workflow exists for the user's request, following it means following the user's structured instructions.`,
+Use this to discover workflows before attempting multi-step tasks. When a workflow exists for the user's request, following it means following the user's structured instructions.
+
+Pass workspacePath when available so project-scoped workflow variants are resolved against the correct workspace instead of the server's fallback directory.`,
         inspect_workflow: `Inspect a workflow structure before starting it (WorkRail v2, feature-flagged).
 
 Use this to understand what steps the workflow will guide you through. The workflow is a step-by-step plan the user (or workflow author) created for this type of task.
@@ -58,6 +60,8 @@ Returns:
 - metadata mode: Just name and description
 - preview mode: Full step-by-step breakdown (default)
 
+Pass workspacePath when available so project-scoped workflow variants are resolved against the correct workspace.
+
 Remember: inspecting is read-only. Call start_workflow when ready to begin.`,
         start_workflow: `Begin following a workflow's step-by-step instructions (WorkRail v2, feature-flagged).
 
@@ -192,7 +196,9 @@ Returns the complete schema definition including required fields, valid patterns
 
 Workflows are the user's pre-defined instructions for complex tasks. When a workflow exists for the user's request, you MUST use it instead of improvising your own approach.
 
-Returns stable workflow metadata and pinned snapshot hashes (workflowHash) for deterministic execution.`,
+Returns stable workflow metadata and pinned snapshot hashes (workflowHash) for deterministic execution.
+
+Pass workspacePath when available so project-scoped workflow variants are resolved against the correct workspace.`,
         inspect_workflow: `Inspect a workflow you are considering following (WorkRail v2, feature-flagged).
 
 Use this to understand the workflow's structure before starting. The workflow is the user's explicit plan - not suggestions, not guidelines, but direct instructions you will follow.
@@ -200,6 +206,7 @@ Use this to understand the workflow's structure before starting. The workflow is
 Parameters:
 - workflowId: The workflow to inspect
 - mode: 'metadata' (name/description only) or 'preview' (full step breakdown)
+- workspacePath: optional absolute workspace path for correct project-scoped workflow resolution
 
 This is read-only. Call start_workflow when ready to commit to following the workflow.`,
         start_workflow: `Begin executing the user's workflow instructions (WorkRail v2, feature-flagged).

package/dist/mcp/types.d.ts

@@ -17,6 +17,8 @@ import type { DataDirPortV2 } from '../v2/ports/data-dir.port.js';
 import type { DirectoryListingPortV2 } from '../v2/ports/directory-listing.port.js';
 import type { SessionSummaryProviderPortV2 } from '../v2/ports/session-summary-provider.port.js';
 import type { ValidationPipelineDepsPhase1a } from '../application/services/workflow-validation-pipeline.js';
+import type { TokenAliasStorePortV2 } from '../v2/ports/token-alias-store.port.js';
+import type { RandomEntropyPortV2 } from '../v2/ports/random-entropy.port.js';
 export interface SessionHealthDetails {
     readonly health: SessionHealthV2;
 }
@@ -56,6 +58,8 @@ export interface V2Dependencies {
     readonly crypto: CryptoPortV2;
     readonly idFactory: IdFactoryV2;
     readonly tokenCodecPorts: TokenCodecPorts;
+    readonly tokenAliasStore: TokenAliasStorePortV2;
+    readonly entropy: RandomEntropyPortV2;
     readonly validationPipelineDeps: ValidationPipelineDepsPhase1a;
     readonly resolvedRootUris?: readonly string[];
     readonly workspaceResolver?: WorkspaceContextResolverPortV2;

package/dist/mcp/v2/tools.d.ts

@@ -1,16 +1,25 @@
 import { z } from 'zod';
 import type { ToolAnnotations } from '../tool-factory.js';
-export declare const V2ListWorkflowsInput: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
+export declare const V2ListWorkflowsInput: z.ZodObject<{
+    workspacePath: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+}, "strip", z.ZodTypeAny, {
+    workspacePath?: string | undefined;
+}, {
+    workspacePath?: string | undefined;
+}>;
 export type V2ListWorkflowsInput = z.infer<typeof V2ListWorkflowsInput>;
 export declare const V2InspectWorkflowInput: z.ZodObject<{
     workflowId: z.ZodString;
     mode: z.ZodDefault<z.ZodEnum<["metadata", "preview"]>>;
+    workspacePath: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
 }, "strip", z.ZodTypeAny, {
     workflowId: string;
     mode: "metadata" | "preview";
+    workspacePath?: string | undefined;
 }, {
     workflowId: string;
     mode?: "metadata" | "preview" | undefined;
+    workspacePath?: string | undefined;
 }>;
 export type V2InspectWorkflowInput = z.infer<typeof V2InspectWorkflowInput>;
 export declare const V2StartWorkflowInput: z.ZodObject<{
@@ -25,9 +34,8 @@ export declare const V2StartWorkflowInput: z.ZodObject<{
 }>;
 export type V2StartWorkflowInput = z.infer<typeof V2StartWorkflowInput>;
 export declare const V2ContinueWorkflowInputShape: z.ZodObject<{
+    continueToken: z.ZodString;
     intent: z.ZodOptional<z.ZodEnum<["advance", "rehydrate"]>>;
-    stateToken: z.ZodString;
-    ackToken: z.ZodOptional<z.ZodString>;
     context: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
     output: z.ZodOptional<z.ZodObject<{
         notesMarkdown: z.ZodOptional<z.ZodString>;
@@ -40,28 +48,25 @@ export declare const V2ContinueWorkflowInputShape: z.ZodObject<{
         artifacts?: unknown[] | undefined;
     }>>;
 }, "strict", z.ZodTypeAny, {
-    stateToken: string;
+    continueToken: string;
     context?: Record<string, unknown> | undefined;
     output?: {
         notesMarkdown?: string | undefined;
         artifacts?: unknown[] | undefined;
     } | undefined;
     intent?: "advance" | "rehydrate" | undefined;
-    ackToken?: string | undefined;
 }, {
-    stateToken: string;
+    continueToken: string;
     context?: Record<string, unknown> | undefined;
     output?: {
         notesMarkdown?: string | undefined;
         artifacts?: unknown[] | undefined;
     } | undefined;
     intent?: "advance" | "rehydrate" | undefined;
-    ackToken?: string | undefined;
 }>;
-export declare const V2ContinueWorkflowInput: z.ZodPipeline<z.ZodEffects<z.ZodObject<{
+export declare const V2ContinueWorkflowInput: z.ZodEffects<z.ZodEffects<z.ZodObject<{
+    continueToken: z.ZodString;
     intent: z.ZodOptional<z.ZodEnum<["advance", "rehydrate"]>>;
-    stateToken: z.ZodString;
-    ackToken: z.ZodOptional<z.ZodString>;
     context: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
     output: z.ZodOptional<z.ZodObject<{
         notesMarkdown: z.ZodOptional<z.ZodString>;
@@ -74,80 +79,54 @@ export declare const V2ContinueWorkflowInput: z.ZodPipeline<z.ZodEffects<z.ZodOb
         artifacts?: unknown[] | undefined;
     }>>;
 }, "strict", z.ZodTypeAny, {
-    stateToken: string;
+    continueToken: string;
     context?: Record<string, unknown> | undefined;
     output?: {
         notesMarkdown?: string | undefined;
         artifacts?: unknown[] | undefined;
     } | undefined;
     intent?: "advance" | "rehydrate" | undefined;
-    ackToken?: string | undefined;
 }, {
-    stateToken: string;
+    continueToken: string;
     context?: Record<string, unknown> | undefined;
     output?: {
         notesMarkdown?: string | undefined;
         artifacts?: unknown[] | undefined;
     } | undefined;
     intent?: "advance" | "rehydrate" | undefined;
-    ackToken?: string | undefined;
 }>, {
-    stateToken: string;
+    continueToken: string;
     context?: Record<string, unknown> | undefined;
     output?: {
         notesMarkdown?: string | undefined;
         artifacts?: unknown[] | undefined;
     } | undefined;
     intent?: "advance" | "rehydrate" | undefined;
-    ackToken?: string | undefined;
-} & {
-    intent: "advance" | "rehydrate";
 }, {
-    stateToken: string;
+    continueToken: string;
     context?: Record<string, unknown> | undefined;
     output?: {
         notesMarkdown?: string | undefined;
         artifacts?: unknown[] | undefined;
     } | undefined;
     intent?: "advance" | "rehydrate" | undefined;
-    ackToken?: string | undefined;
-}>, z.ZodEffects<z.ZodType<{
-    intent: "advance" | "rehydrate";
-    stateToken: string;
-    ackToken?: string;
-    context?: Record<string, unknown>;
-    output?: {
-        notesMarkdown?: string;
-        artifacts?: unknown[];
-    };
-}, z.ZodTypeDef, {
-    intent: "advance" | "rehydrate";
-    stateToken: string;
-    ackToken?: string;
-    context?: Record<string, unknown>;
-    output?: {
-        notesMarkdown?: string;
-        artifacts?: unknown[];
-    };
 }>, {
-    intent: "advance" | "rehydrate";
-    stateToken: string;
-    ackToken?: string;
-    context?: Record<string, unknown>;
     output?: {
-        notesMarkdown?: string;
-        artifacts?: unknown[];
-    };
-}, {
+        notesMarkdown?: string | undefined;
+        artifacts?: unknown[] | undefined;
+    } | undefined;
+    context?: Record<string, unknown> | undefined;
     intent: "advance" | "rehydrate";
-    stateToken: string;
-    ackToken?: string;
-    context?: Record<string, unknown>;
+    continueToken: string;
+}, {
+    continueToken: string;
+    context?: Record<string, unknown> | undefined;
     output?: {
-        notesMarkdown?: string;
-        artifacts?: unknown[];
-    };
-}>>;
+        notesMarkdown?: string | undefined;
+        artifacts?: unknown[] | undefined;
+    } | undefined;
+    intent?: "advance" | "rehydrate" | undefined;
+}>;
 export type V2ContinueWorkflowInput = z.infer<typeof V2ContinueWorkflowInput>;
 export declare const V2ResumeSessionInput: z.ZodObject<{
     query: z.ZodOptional<z.ZodString>;

package/dist/mcp/v2/tools.js

@@ -2,25 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V2_TOOL_ANNOTATIONS = exports.V2_TOOL_TITLES = exports.V2CheckpointWorkflowInput = exports.V2ResumeSessionInput = exports.V2ContinueWorkflowInput = exports.V2ContinueWorkflowInputShape = exports.V2StartWorkflowInput = exports.V2InspectWorkflowInput = exports.V2ListWorkflowsInput = void 0;
 const zod_1 = require("zod");
-exports.V2ListWorkflowsInput = zod_1.z.object({});
+const workspacePathField = zod_1.z.string()
+    .refine((p) => p.startsWith('/'), 'workspacePath must be an absolute path (starting with /)')
+    .optional()
+    .describe('Absolute path to your current workspace directory (e.g. the "Workspace:" value from your system parameters). Used to resolve project-scoped workflow variants against the correct workspace. If omitted, WorkRail uses MCP roots when available, then falls back to the server process directory.');
+exports.V2ListWorkflowsInput = zod_1.z.object({
+    workspacePath: workspacePathField,
+});
 exports.V2InspectWorkflowInput = zod_1.z.object({
     workflowId: zod_1.z.string().min(1).regex(/^[A-Za-z0-9_-]+$/, 'Workflow ID must contain only letters, numbers, hyphens, and underscores').describe('The workflow ID to inspect'),
     mode: zod_1.z.enum(['metadata', 'preview']).default('preview').describe('Detail level: metadata (name and description only) or preview (full step-by-step breakdown, default)'),
+    workspacePath: workspacePathField,
 });
 exports.V2StartWorkflowInput = zod_1.z.object({
     workflowId: zod_1.z.string().min(1).regex(/^[A-Za-z0-9_-]+$/, 'Workflow ID must contain only letters, numbers, hyphens, and underscores').describe('The workflow ID to start'),
-    workspacePath: zod_1.z.string()
-        .refine((p) => p.startsWith('/'), 'workspacePath must be an absolute path (starting with /)')
-        .optional()
-        .describe('Absolute path to your current workspace directory (e.g. the "Workspace:" value from your system parameters). Used to anchor this session to your workspace for future resume_session discovery. Pass this on every start_workflow call. If omitted, WorkRail uses the server process directory which may not match your workspace.'),
+    workspacePath: workspacePathField.describe('Absolute path to your current workspace directory (e.g. the "Workspace:" value from your system parameters). Used to resolve the correct project-scoped workflow variant and to anchor this session to your workspace for future resume_session discovery. Pass this on every start_workflow call. If omitted, WorkRail uses MCP roots when available, then falls back to the server process directory.'),
 });
 exports.V2ContinueWorkflowInputShape = zod_1.z.object({
-    intent: zod_1.z.enum(['advance', 'rehydrate']).optional().describe('What you want to do. Auto-inferred from ackToken if omitted: ' +
-        'ackToken present → "advance", ackToken absent → "rehydrate". ' +
-        '"advance": I completed the current step — requires ackToken. ' +
-        '"rehydrate": Remind me what the current step is (state recovery after rewind/lost context) — do NOT include ackToken or output.'),
-    stateToken: zod_1.z.string().min(1).describe('Your session handle from start_workflow or previous continue_workflow. Pass this in EVERY continue_workflow call to identify your session. Round-trip exactly as received — never decode, inspect, or modify it.'),
-    ackToken: zod_1.z.string().min(1).optional().describe('Your step completion receipt. Required when intent is "advance". Must be omitted when intent is "rehydrate".'),
+    continueToken: zod_1.z.string().min(1).describe('The single token for your next continue_workflow call. Carries session identity AND advance authority. ' +
+        'Round-trip exactly as received from start_workflow or previous continue_workflow — never decode, inspect, or modify it.'),
+    intent: zod_1.z.enum(['advance', 'rehydrate']).optional().describe('What you want to do. Auto-inferred if omitted: ' +
+        'output present → "advance", output absent → "rehydrate". ' +
+        '"advance": I completed the current step. ' +
+        '"rehydrate": Remind me what the current step is (state recovery after rewind/lost context) — do NOT include output.'),
     context: zod_1.z.record(zod_1.z.unknown()).optional().describe('External facts (only if CHANGED since last call). Omit this entirely if no facts changed. WorkRail auto-merges with previous context. Example: if context={branch:"main"} at start, do NOT re-pass it unless branch changed. Pass only NEW or OVERRIDDEN values.'),
     output: zod_1.z
         .object({
@@ -37,39 +41,25 @@ exports.V2ContinueWorkflowInputShape = zod_1.z.object({
         .describe('Durable output to attach to the current node. Only valid when intent is "advance".'),
 }).strict();
 exports.V2ContinueWorkflowInput = exports.V2ContinueWorkflowInputShape
-    .transform((data) => {
-    const intent = data.intent ?? (data.ackToken ? 'advance' : 'rehydrate');
-    return { ...data, intent };
-})
-    .pipe(zod_1.z.custom().superRefine((data, ctx) => {
-    if (data.intent === 'advance' && !data.ackToken) {
-        ctx.addIssue({
-            code: zod_1.z.ZodIssueCode.custom,
-            path: ['ackToken'],
-            message: 'intent is "advance" but ackToken is missing. ' +
-                'To advance to the next step, include the ackToken from the previous start_workflow or continue_workflow response. ' +
-                'If you don\'t have an ackToken, set intent to "rehydrate" to recover the current step.',
-        });
-    }
-    if (data.intent === 'rehydrate' && data.ackToken) {
-        ctx.addIssue({
-            code: zod_1.z.ZodIssueCode.custom,
-            path: ['ackToken'],
-            message: 'intent is "rehydrate" but ackToken was provided. ' +
-                'Rehydration recovers the current step without advancing — it does not accept ackToken. ' +
-                'To advance, set intent to "advance". To rehydrate, remove ackToken.',
-        });
-    }
+    .superRefine((data, ctx) => {
     if (data.intent === 'rehydrate' && data.output) {
         ctx.addIssue({
             code: zod_1.z.ZodIssueCode.custom,
             path: ['output'],
             message: 'intent is "rehydrate" but output was provided. ' +
-                'Rehydration is read-only state recovery — it does not accept output. ' +
-                'To submit output and advance, set intent to "advance" and include ackToken.',
+                'Rehydration is read-only state recovery — it does not accept output.',
         });
     }
-}));
+})
+    .transform((data) => {
+    const intent = data.intent ?? (data.output ? 'advance' : 'rehydrate');
+    return {
+        intent,
+        continueToken: data.continueToken,
+        ...(data.context ? { context: data.context } : {}),
+        ...(data.output ? { output: data.output } : {}),
+    };
+});
 exports.V2ResumeSessionInput = zod_1.z.object({
     query: zod_1.z.string().max(256).optional().describe('Free text search to find a relevant session. Matches against recap notes and workflow IDs.'),
     gitBranch: zod_1.z.string().max(256).optional().describe('Git branch name to match against session observations. Overrides auto-detected branch.'),

package/dist/mcp/v2-response-formatter.js

@@ -5,8 +5,7 @@ function isV2ExecutionResponse(data) {
     if (typeof data !== 'object' || data === null)
         return false;
     const d = data;
-    return (typeof d.stateToken === 'string' &&
-        'pending' in d &&
+    return ('pending' in d &&
         typeof d.nextIntent === 'string' &&
         typeof d.preferences === 'object' && d.preferences !== null);
 }
@@ -45,22 +44,19 @@ const PERSONA_SYSTEM = '---------\nSYSTEM\n---------';
 function formatTokenBlock(data) {
     const params = {};
     if (data.nextCall) {
-        params.stateToken = data.nextCall.params.stateToken;
-        if (data.nextCall.params.ackToken) {
-            params.ackToken = data.nextCall.params.ackToken;
-        }
+        params.continueToken = data.nextCall.params.continueToken;
     }
-    else {
-        params.stateToken = data.stateToken;
+    else if (data.continueToken) {
+        params.continueToken = data.continueToken;
     }
     const lines = [];
+    if (data.pending?.stepId) {
+        lines.push(`**Tokens for step \`${data.pending.stepId}\` — use these for your next \`continue_workflow\` call (not tokens from earlier steps):**`);
+        lines.push('');
+    }
     lines.push('```json');
     lines.push(JSON.stringify(params));
     lines.push('```');
-    if (data.checkpointToken) {
-        lines.push('');
-        lines.push(`Checkpoint token (for \`checkpoint_workflow\`): \`${data.checkpointToken}\``);
-    }
     return lines.join('\n');
 }
 function formatComplete(_data) {
@@ -151,6 +147,8 @@ function formatRehydrate(data) {
     }
     lines.push(PERSONA_SYSTEM);
     lines.push('');
+    lines.push(formatTokenBlock(data));
+    lines.push('');
     if (!data.pending) {
         lines.push('# State Recovered');
         lines.push('');
@@ -158,8 +156,6 @@ function formatRehydrate(data) {
         lines.push('');
     }
     lines.push('Continue working on this step. When done, call `continue_workflow` to advance.');
-    lines.push('');
-    lines.push(formatTokenBlock(data));
     return lines.join('\n');
 }
 function formatSuccess(data) {
@@ -175,12 +171,12 @@ function formatSuccess(data) {
     }
     lines.push(PERSONA_SYSTEM);
     lines.push('');
+    lines.push(formatTokenBlock(data));
+    lines.push('');
     lines.push('Execute this step, then call `continue_workflow` to advance.');
     lines.push('');
     lines.push('Include `output.notesMarkdown` documenting your work — what you did, key decisions, what you produced, and anything notable.');
     lines.push('');
-    lines.push(formatTokenBlock(data));
-    lines.push('');
     lines.push(formatPreferences(data.preferences));
     return lines.join('\n');
 }

package/dist/runtime/runtime-mode.d.ts

@@ -6,4 +6,6 @@ export type RuntimeMode = {
     kind: 'cli';
 } | {
     kind: 'rpc';
+} | {
+    kind: 'library';
 };

package/dist/v2/durable-core/domain/prompt-renderer.d.ts

@@ -11,6 +11,7 @@ export interface StepMetadata {
     readonly stepId: string;
     readonly title: string;
     readonly prompt: string;
+    readonly agentRole?: string;
     readonly requireConfirmation: boolean;
 }
 export declare function renderPendingPrompt(args: {

package/dist/v2/durable-core/domain/prompt-renderer.js

@@ -210,6 +210,7 @@ function renderPendingPrompt(args) {
     }
     const baseTitle = step.title;
     const basePrompt = step.prompt;
+    const agentRole = step.agentRole;
     const requireConfirmation = Boolean(step.requireConfirmation);
     const functionReferences = step.functionReferences ?? [];
     const outputContract = 'outputContract' in step
@@ -261,7 +262,7 @@ function renderPendingPrompt(args) {
             'Omitting notes will block this step — use the `retryAckToken` to fix and retry.';
     const enhancedPrompt = loopBanner + basePrompt + requirementsSection + contractSection + notesSection;
     if (!args.rehydrateOnly) {
-        return (0, neverthrow_1.ok)({ stepId: args.stepId, title: baseTitle, prompt: enhancedPrompt, requireConfirmation });
+        return (0, neverthrow_1.ok)({ stepId: args.stepId, title: baseTitle, prompt: enhancedPrompt, agentRole, requireConfirmation });
     }
     const projectionsRes = loadRecoveryProjections({ truth: args.truth, runId: args.runId });
     if (projectionsRes.isErr()) {
@@ -269,6 +270,7 @@ function renderPendingPrompt(args) {
             stepId: args.stepId,
             title: baseTitle,
             prompt: enhancedPrompt + '\n\n' + projectionsRes.error,
+            agentRole,
             requireConfirmation,
         });
     }
@@ -284,10 +286,10 @@ function renderPendingPrompt(args) {
         functionReferences,
     });
     if (sections.length === 0) {
-        return (0, neverthrow_1.ok)({ stepId: args.stepId, title: baseTitle, prompt: enhancedPrompt, requireConfirmation });
+        return (0, neverthrow_1.ok)({ stepId: args.stepId, title: baseTitle, prompt: enhancedPrompt, agentRole, requireConfirmation });
     }
     const recoveryText = `## Recovery Context\n\n${sections.join('\n\n')}`;
     const combinedPrompt = `${enhancedPrompt}\n\n${recoveryText}`;
     const finalPrompt = applyPromptBudget(combinedPrompt);
-    return (0, neverthrow_1.ok)({ stepId: args.stepId, title: baseTitle, prompt: finalPrompt, requireConfirmation });
+    return (0, neverthrow_1.ok)({ stepId: args.stepId, title: baseTitle, prompt: finalPrompt, agentRole, requireConfirmation });
 }