@gobing-ai/ts-dual-workflow-engine 0.3.18 → 0.3.20

package/dist/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAIjD,OAAO,KAAK,EACR,uBAAuB,EAEvB,uBAAuB,EACvB,WAAW,EACX,0BAA0B,EAC1B,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,SAAS,CAAC;AAEjB,6FAA6F;AAC7F,qBAAa,eAAe;IAKpB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,WAAW;IALhC,mFAAmF;IACnF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;gBAGxC,IAAI,EAAE,kBAAkB,EACxB,WAAW,EAAE,0BAA0B;IAG5D,4CAA4C;IACtC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAI9C,iDAAiD;IAC3C,GAAG,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAU9F,oCAAoC;IAC9B,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIzF,oCAAoC;IAC9B,QAAQ;IAId,mEAAmE;IAC7D,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAIrG,gFAAgF;IAC1E,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAI9E,qFAAqF;IAC/E,SAAS,CACX,QAAQ,EAAE,WAAW,EACrB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,kBAAkB,GAC7B,OAAO,CAAC,IAAI,CAAC;IACV,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B7F,iGAAiG;IACjG,OAAO,CAAC,0BAA0B;IASlC,oFAAoF;YACtE,YAAY;IAY1B,uEAAuE;IACjE,SAAS,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAgC/G,iEAAiE;IAC3D,cAAc,CAAC,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,SAAS,iBAAiB,EAAE,CAAC;IAIhH;;;;;OAKG;IACG,iBAAiB,CACnB,QAAQ,EAAE,uBAAuB,EACjC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,kBAAkB,GAC7B,OAAO,CAAC,uBAAuB,CAAC;YAsBrB,iBAAiB;IA4E/B;;;;OAIG;IACH,OAAO,CAAC,cAAc;CAiBzB"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAIjD,OAAO,KAAK,EACR,uBAAuB,EAEvB,uBAAuB,EACvB,WAAW,EACX,0BAA0B,EAC1B,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,SAAS,CAAC;AAGjB,6FAA6F;AAC7F,qBAAa,eAAe;IAKpB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,WAAW;IALhC,mFAAmF;IACnF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;gBAGxC,IAAI,EAAE,kBAAkB,EACxB,WAAW,EAAE,0BAA0B;IAG5D,4CAA4C;IACtC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAI9C,iDAAiD;IAC3C,GAAG,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAU9F,oCAAoC;IAC9B,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIzF,oCAAoC;IAC9B,QAAQ;IAId,mEAAmE;IAC7D,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAIrG,gFAAgF;IAC1E,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAI9E,qFAAqF;IAC/E,SAAS,CACX,QAAQ,EAAE,WAAW,EACrB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,kBAAkB,GAC7B,OAAO,CAAC,IAAI,CAAC;IACV,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B7F,iGAAiG;IACjG,OAAO,CAAC,0BAA0B;IASlC,oFAAoF;YACtE,YAAY;IAY1B,uEAAuE;IACjE,SAAS,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAgC/G,iEAAiE;IAC3D,cAAc,CAAC,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,SAAS,iBAAiB,EAAE,CAAC;IAIhH;;;;;OAKG;IACG,iBAAiB,CACnB,QAAQ,EAAE,uBAAuB,EACjC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,kBAAkB,GAC7B,OAAO,CAAC,uBAAuB,CAAC;YAsBrB,iBAAiB;IA+E/B;;;;OAIG;IACH,OAAO,CAAC,cAAc;CAiBzB"}

package/dist/service.js

@@ -3,6 +3,7 @@ import { FSMError, WorkflowResumeError } from './errors.js';
 import { RunLifecycle } from './run-lifecycle.js';
 import { StateMachineDriver } from './state-machine.js';
 import { TransitionFlowDriver } from './transition-flow.js';
+import { resolveTemplates } from './variables.js';
 /** High-level workflow service for loading, running, and listing persisted workflow runs. */
 export class WorkflowService {
     host;
@@ -167,10 +168,17 @@ export class WorkflowService {
         }
         // Evaluate guard if present.
         if (transition.guard !== undefined) {
-            const guardResult = await this.host.evaluateGuardResult(transition.guard.kind, transition.guard.options ?? {}, {
+            // Resolve ${vars.*} templates in guard options against the workflow's vars —
+            // external transitions (requestTransition) must interpolate the same way the
+            // driver's firstPassingTransition does (e.g. `spur task check ${vars.wbs}`).
+            const resolvedGuardOptions = resolveTemplates(transition.guard.options ?? {}, {
+                vars: workflow.vars ?? {},
+                env: {},
+            });
+            const guardResult = await this.host.evaluateGuardResult(transition.guard.kind, resolvedGuardOptions, {
                 runId,
                 current: currentState,
-                vars: {},
+                vars: workflow.vars ?? {},
                 workdir: options?.workdir,
             });
             lifecycle.guardEvaluated(currentState, toState, transition.guard.kind, guardResult.passed);

package/dist/state-machine.js

@@ -1,7 +1,7 @@
 import { runActionSequence } from './action-step.js';
 import { FSMError } from './errors.js';
 import { allowedEnv, RunLifecycle } from './run-lifecycle.js';
-import { mergeSetVars, mergeVars } from './variables.js';
+import { mergeSetVars, mergeVars, resolveTemplates } from './variables.js';
 /** State-machine workflow driver with an R7 single control function. */
 export class StateMachineDriver {
     options;
@@ -131,7 +131,13 @@ async function firstPassingTransition(transitions, host, context, lifecycle) {
     for (const transition of transitions) {
         if (transition.guard === undefined)
             return transition;
-        const passed = await host.evaluateGuard(transition.guard.kind, transition.guard.options ?? {}, context);
+        // Resolve ${vars.*} templates in guard options before evaluation — guards use the
+        // same var interpolation as actions (e.g. `spur task check ${vars.wbs}`).
+        const resolvedOptions = resolveTemplates(transition.guard.options ?? {}, {
+            vars: context.vars,
+            env: {},
+        });
+        const passed = await host.evaluateGuard(transition.guard.kind, resolvedOptions, context);
         lifecycle.guardEvaluated(context.current, transition.to, transition.guard.kind, passed);
         if (passed)
             return transition;

package/dist/transition-flow.js

@@ -1,7 +1,7 @@
 import { runActionStep } from './action-step.js';
 import { FSMError } from './errors.js';
 import { allowedEnv, RunLifecycle } from './run-lifecycle.js';
-import { mergeSetVars, mergeVars } from './variables.js';
+import { mergeSetVars, mergeVars, resolveTemplates } from './variables.js';
 /** Transition-flow workflow driver with an R7 single control function. */
 export class TransitionFlowDriver {
     options;
@@ -109,7 +109,13 @@ async function firstPassingEdge(edges, host, context, lifecycle) {
     for (const edge of edges) {
         if (edge.condition === undefined)
             return edge;
-        const passed = await host.evaluateGuard(edge.condition.kind, edge.condition.options ?? {}, context);
+        // Resolve ${vars.*} templates in condition options before evaluation — conditions use
+        // the same var interpolation as actions (symmetry with state-machine guard resolution).
+        const resolvedOptions = resolveTemplates(edge.condition.options ?? {}, {
+            vars: context.vars,
+            env: {},
+        });
+        const passed = await host.evaluateGuard(edge.condition.kind, resolvedOptions, context);
         lifecycle.guardEvaluated(context.current, edge.to, edge.condition.kind, passed);
         if (passed)
             return edge;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gobing-ai/ts-dual-workflow-engine",
-    "version": "0.3.18",
+    "version": "0.3.20",
     "description": "@gobing-ai/ts-dual-workflow-engine — State-machine and transition-flow workflow runtime.",
     "keywords": [
         "typescript",
@@ -48,9 +48,9 @@
         "release": "echo 'Manual publish is disabled. Releases go through GitHub Actions via Trusted Publishing — push a tag: git tag @gobing-ai/ts-dual-workflow-engine-v<version> && git push --tags' && exit 1"
     },
     "dependencies": {
-        "@gobing-ai/ts-db": "^0.3.18",
-        "@gobing-ai/ts-infra": "^0.3.18",
-        "@gobing-ai/ts-runtime": "^0.3.18",
+        "@gobing-ai/ts-db": "^0.3.20",
+        "@gobing-ai/ts-infra": "^0.3.20",
+        "@gobing-ai/ts-runtime": "^0.3.20",
         "zod": "^4.1.0"
     },
     "devDependencies": {

package/src/service.ts

@@ -14,6 +14,7 @@ import type {
     WorkflowRunRecord,
     WorkflowRunResult,
 } from './types';
+import { resolveTemplates } from './variables';
 
 /** High-level workflow service for loading, running, and listing persisted workflow runs. */
 export class WorkflowService {
@@ -232,16 +233,19 @@ export class WorkflowService {
 
         // Evaluate guard if present.
         if (transition.guard !== undefined) {
-            const guardResult = await this.host.evaluateGuardResult(
-                transition.guard.kind,
-                transition.guard.options ?? {},
-                {
-                    runId,
-                    current: currentState,
-                    vars: {},
-                    workdir: options?.workdir,
-                },
-            );
+            // Resolve ${vars.*} templates in guard options against the workflow's vars —
+            // external transitions (requestTransition) must interpolate the same way the
+            // driver's firstPassingTransition does (e.g. `spur task check ${vars.wbs}`).
+            const resolvedGuardOptions = resolveTemplates(transition.guard.options ?? {}, {
+                vars: workflow.vars ?? {},
+                env: {},
+            });
+            const guardResult = await this.host.evaluateGuardResult(transition.guard.kind, resolvedGuardOptions, {
+                runId,
+                current: currentState,
+                vars: workflow.vars ?? {},
+                workdir: options?.workdir,
+            });
             lifecycle.guardEvaluated(currentState, toState, transition.guard.kind, guardResult.passed);
             if (!guardResult.passed) {
                 return this.denyTransition(options, runId, currentState, toState, extKey, {

package/src/state-machine.ts

@@ -9,7 +9,7 @@ import type {
     WorkflowRunOptions,
     WorkflowRunResult,
 } from './types';
-import { mergeSetVars, mergeVars } from './variables';
+import { mergeSetVars, mergeVars, resolveTemplates } from './variables';
 
 /** Dependencies required by the state-machine driver. */
 export interface StateMachineDriverOptions {
@@ -183,7 +183,13 @@ async function firstPassingTransition(
 ): Promise<StateMachineWorkflowDef['transitions'][number] | undefined> {
     for (const transition of transitions) {
         if (transition.guard === undefined) return transition;
-        const passed = await host.evaluateGuard(transition.guard.kind, transition.guard.options ?? {}, context);
+        // Resolve ${vars.*} templates in guard options before evaluation — guards use the
+        // same var interpolation as actions (e.g. `spur task check ${vars.wbs}`).
+        const resolvedOptions = resolveTemplates(transition.guard.options ?? {}, {
+            vars: context.vars,
+            env: {},
+        });
+        const passed = await host.evaluateGuard(transition.guard.kind, resolvedOptions, context);
         lifecycle.guardEvaluated(context.current, transition.to, transition.guard.kind, passed);
         if (passed) return transition;
     }

package/src/transition-flow.ts

@@ -9,7 +9,7 @@ import type {
     WorkflowRunOptions,
     WorkflowRunResult,
 } from './types';
-import { mergeSetVars, mergeVars } from './variables';
+import { mergeSetVars, mergeVars, resolveTemplates } from './variables';
 
 /** Dependencies required by the transition-flow driver. */
 export interface TransitionFlowDriverOptions {
@@ -163,7 +163,13 @@ async function firstPassingEdge(
 ): Promise<TransitionFlowWorkflowDef['edges'][number] | undefined> {
     for (const edge of edges) {
         if (edge.condition === undefined) return edge;
-        const passed = await host.evaluateGuard(edge.condition.kind, edge.condition.options ?? {}, context);
+        // Resolve ${vars.*} templates in condition options before evaluation — conditions use
+        // the same var interpolation as actions (symmetry with state-machine guard resolution).
+        const resolvedOptions = resolveTemplates(edge.condition.options ?? {}, {
+            vars: context.vars,
+            env: {},
+        });
+        const passed = await host.evaluateGuard(edge.condition.kind, resolvedOptions, context);
         lifecycle.guardEvaluated(context.current, edge.to, edge.condition.kind, passed);
         if (passed) return edge;
     }