Update workbench tests to build and run outside of monorepo

.changeset/thick-beers-share.md

@@ -0,0 +1,8 @@
+---
+"@workflow/builders": patch
+"@workflow/core": patch
+"@workflow/next": patch
+"@workflow/cli": patch
+---
+
+Fix deferred build mode for Next.js

.github/actions/prepare-workbench-path/action.yml

@@ -0,0 +1,33 @@
+name: 'Prepare Workbench Path'
+description: 'Resolve a workbench path, staging tarball-based Next.js workbenches when needed.'
+
+inputs:
+  app-name:
+    description: 'Workbench app name from test matrix'
+    required: true
+
+outputs:
+  workbench_app_path:
+    description: 'Resolved absolute path to the workbench used by tests'
+    value: ${{ steps.prepare.outputs.workbench_app_path }}
+
+runs:
+  using: 'composite'
+  steps:
+    - id: prepare
+      shell: bash
+      run: |
+        if [[ "${{ inputs.app-name }}" == "nextjs-turbopack" || "${{ inputs.app-name }}" == "nextjs-webpack" ]]; then
+          STAGE_LOG="$(mktemp)"
+          node scripts/stage-workbench-with-tarballs.mjs "workbench/${{ inputs.app-name }}" | tee "$STAGE_LOG"
+          WORKBENCH_APP_PATH="$(sed -n 's/^Staged workbench: //p' "$STAGE_LOG" | tail -n 1)"
+          if [ -z "$WORKBENCH_APP_PATH" ]; then
+            echo "Failed to parse staged workbench path from stage-workbench-with-tarballs output"
+            exit 1
+          fi
+        else
+          ./scripts/resolve-symlinks.sh "workbench/${{ inputs.app-name }}"
+          WORKBENCH_APP_PATH="$GITHUB_WORKSPACE/workbench/${{ inputs.app-name }}"
+        fi
+
+        echo "workbench_app_path=$WORKBENCH_APP_PATH" >> "$GITHUB_OUTPUT"

.github/workflows/tests.yml

@@ -345,18 +345,22 @@ jobs:
       - name: Run Initial Build
         run: pnpm turbo run build --filter='!./workbench/*'
 
-      - name: Resolve symlinks
-        run: ./scripts/resolve-symlinks.sh workbench/${{ matrix.app.name }}
+      - name: Prepare workbench path
+        id: prepare-workbench
+        uses: ./.github/actions/prepare-workbench-path
+        with:
+          app-name: ${{ matrix.app.name }}
 
       - name: Run E2E Tests
         run: |
-          cd workbench/${{ matrix.app.name }} && pnpm dev &
+          cd "${{ steps.prepare-workbench.outputs.workbench_app_path }}" && pnpm dev &
           echo "starting tests in 10 seconds" && sleep 10
           pnpm vitest run packages/core/e2e/dev.test.ts; sleep 10
           pnpm run test:e2e --reporter=default --reporter=json --outputFile=e2e-local-dev-${{ matrix.app.name }}-${{ matrix.app.canary && 'canary' || 'stable' }}.json
         env:
           NODE_OPTIONS: "--enable-source-maps"
           APP_NAME: ${{ matrix.app.name }}
+          WORKBENCH_APP_PATH: ${{ steps.prepare-workbench.outputs.workbench_app_path }}
           DEPLOYMENT_URL: "http://localhost:${{ matrix.app.name == 'sveltekit' && '5173' || (matrix.app.name == 'astro' && '4321' || '3000') }}"
           DEV_TEST_CONFIG: ${{ toJSON(matrix.app) }}
 
@@ -413,22 +417,27 @@ jobs:
       - name: Run Initial Build
         run: pnpm turbo run build --filter='!./workbench/*'
 
-      - name: Resolve symlinks
-        run: ./scripts/resolve-symlinks.sh workbench/${{ matrix.app.name }}
+      - name: Prepare workbench path
+        id: prepare-workbench
+        uses: ./.github/actions/prepare-workbench-path
+        with:
+          app-name: ${{ matrix.app.name }}
 
       - name: Run Build Tests
         run: pnpm vitest run packages/core/e2e/local-build.test.ts
         env:
           APP_NAME: ${{ matrix.app.name }}
+          WORKBENCH_APP_PATH: ${{ steps.prepare-workbench.outputs.workbench_app_path }}
 
       - name: Run E2E Tests
         run: |
-          cd workbench/${{ matrix.app.name }} && pnpm start &
+          cd "${{ steps.prepare-workbench.outputs.workbench_app_path }}" && pnpm start &
           echo "starting tests in 10 seconds" && sleep 10
           pnpm run test:e2e --reporter=default --reporter=json --outputFile=e2e-local-prod-${{ matrix.app.name }}-${{ matrix.app.canary && 'canary' || 'stable' }}.json
         env:
           NODE_OPTIONS: "--enable-source-maps"
           APP_NAME: ${{ matrix.app.name }}
+          WORKBENCH_APP_PATH: ${{ steps.prepare-workbench.outputs.workbench_app_path }}
           DEPLOYMENT_URL: "http://localhost:${{ matrix.app.name == 'sveltekit' && '4173' || (matrix.app.name == 'astro' && '4321' || '3000') }}"
 
       - name: Generate E2E summary
@@ -504,22 +513,27 @@ jobs:
       - name: Setup PostgreSQL Database
         run: ./packages/world-postgres/bin/setup.js
 
-      - name: Resolve symlinks
-        run: ./scripts/resolve-symlinks.sh workbench/${{ matrix.app.name }}
+      - name: Prepare workbench path
+        id: prepare-workbench
+        uses: ./.github/actions/prepare-workbench-path
+        with:
+          app-name: ${{ matrix.app.name }}
 
       - name: Run Build Tests
         run: pnpm vitest run packages/core/e2e/local-build.test.ts
         env:
           APP_NAME: ${{ matrix.app.name }}
+          WORKBENCH_APP_PATH: ${{ steps.prepare-workbench.outputs.workbench_app_path }}
 
       - name: Run E2E Tests
         run: |
-          cd workbench/${{ matrix.app.name }} && pnpm start &
+          cd "${{ steps.prepare-workbench.outputs.workbench_app_path }}" && pnpm start &
           echo "starting tests in 10 seconds" && sleep 10
           pnpm run test:e2e --reporter=default --reporter=json --outputFile=e2e-local-postgres-${{ matrix.app.name }}-${{ matrix.app.canary && 'canary' || 'stable' }}.json
         env:
           NODE_OPTIONS: "--enable-source-maps"
           APP_NAME: ${{ matrix.app.name }}
+          WORKBENCH_APP_PATH: ${{ steps.prepare-workbench.outputs.workbench_app_path }}
           DEPLOYMENT_URL: "http://localhost:${{ matrix.app.name == 'sveltekit' && '4173' || (matrix.app.name == 'astro' && '4321' || '3000') }}"
 
       - name: Generate E2E summary

package.json

@@ -34,6 +34,7 @@
     "clean": "turbo clean",
     "typecheck": "turbo typecheck",
     "test:e2e": "vitest run packages/core/e2e/e2e.test.ts",
+    "test:e2e:nextjs-webpack:staged": "node scripts/test-staged-nextjs-webpack.mjs",
     "test:docs": "pnpm --filter @workflow/docs-typecheck test:docs",
     "bench": "vitest bench packages/core/e2e/bench.bench.ts",
     "bench:local": "DEPLOYMENT_URL=http://localhost:3000 APP_NAME=nextjs-turbopack vitest bench packages/core/e2e/bench.bench.ts",
@@ -42,7 +43,8 @@
     "changeset": "changeset",
     "ci:version": "changeset version",
     "ci:publish": "pnpm build && changeset publish",
-    "release:notes": "node scripts/generate-release-notes.mjs"
+    "release:notes": "node scripts/generate-release-notes.mjs",
+    "workbench:stage": "node scripts/stage-workbench-with-tarballs.mjs"
   },
   "lint-staged": {
     "**/*": "biome format --write --no-errors-on-unmatched"

packages/builders/src/module-specifier.test.ts

@@ -208,4 +208,56 @@ describe('getImportPath', () => {
       isPackage: true,
     });
   });
+
+  it('uses package subpath import for direct node_modules dependencies', () => {
+    const projectRoot = join(testRoot, 'apps/chat');
+    const packageDir = join(testRoot, 'apps/chat/node_modules/@workflow/core');
+    const filePath = join(packageDir, 'dist/serialization.js');
+
+    writeJson(join(projectRoot, 'package.json'), {
+      name: 'chat',
+      dependencies: { '@workflow/core': '1.0.0' },
+    });
+
+    writeJson(join(packageDir, 'package.json'), {
+      name: '@workflow/core',
+      version: '1.0.0',
+      exports: {
+        './serialization': './dist/serialization.js',
+      },
+    });
+
+    writeFile(filePath, `'use workflow';\n`);
+
+    expect(getImportPath(filePath, projectRoot)).toEqual({
+      importPath: '@workflow/core/serialization',
+      isPackage: true,
+    });
+  });
+
+  it('falls back to relative import for transitive node_modules dependencies', () => {
+    const projectRoot = join(testRoot, 'apps/chat');
+    const packageDir = join(testRoot, 'apps/chat/node_modules/@workflow/core');
+    const filePath = join(packageDir, 'dist/serialization.js');
+
+    writeJson(join(projectRoot, 'package.json'), {
+      name: 'chat',
+      dependencies: { workflow: '1.0.0' },
+    });
+
+    writeJson(join(packageDir, 'package.json'), {
+      name: '@workflow/core',
+      version: '1.0.0',
+      exports: {
+        './serialization': './dist/serialization.js',
+      },
+    });
+
+    writeFile(filePath, `'use workflow';\n`);
+
+    expect(getImportPath(filePath, projectRoot)).toEqual({
+      importPath: './node_modules/@workflow/core/dist/serialization.js',
+      isPackage: false,
+    });
+  });
 });

packages/builders/src/module-specifier.ts

@@ -511,6 +511,21 @@ export function getImportPath(
     // Find the package.json for this file
     const pkg = findPackageJson(filePath);
     if (pkg) {
+      const isDirectProjectDependency = getProjectDependencies(projectRoot).has(
+        pkg.name
+      );
+      const canUsePackageSpecifier = inWorkspace || isDirectProjectDependency;
+
+      // For transitive node_modules dependencies under strict package managers
+      // (for example, pnpm), importing by package name can fail. Use a direct
+      // file path import in those cases.
+      if (!canUsePackageSpecifier) {
+        return {
+          importPath: toRelativeImportPath(filePath, projectRoot),
+          isPackage: false,
+        };
+      }
+
       // Prefer a package subpath import when this file maps to an export.
       // This preserves the exact module being bundled while still respecting
       // package export conditions.

packages/builders/src/transform-utils.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest';
 import {
   detectWorkflowPatterns,
+  isWorkflowSdkFile,
   useStepPattern,
   useWorkflowPattern,
   workflowSerdeComputedPropertyPattern,
@@ -332,4 +333,44 @@ describe('transform-utils patterns', () => {
       expect(result.hasSerde).toBe(true);
     });
   });
+
+  describe('isWorkflowSdkFile', () => {
+    it('matches direct @workflow package path in node_modules', () => {
+      expect(
+        isWorkflowSdkFile(
+          '/tmp/app/node_modules/@workflow/core/dist/serialization.js'
+        )
+      ).toBe(true);
+    });
+
+    it('matches direct workflow package path in node_modules', () => {
+      expect(
+        isWorkflowSdkFile('/tmp/app/node_modules/workflow/dist/runtime.js')
+      ).toBe(true);
+    });
+
+    it('matches pnpm virtual store @workflow package path', () => {
+      expect(
+        isWorkflowSdkFile(
+          '/tmp/app/node_modules/.pnpm/@workflow+core@4.1.0/node_modules/@workflow/core/dist/serialization.js'
+        )
+      ).toBe(true);
+    });
+
+    it('matches pnpm virtual store workflow package path', () => {
+      expect(
+        isWorkflowSdkFile(
+          '/tmp/app/node_modules/.pnpm/workflow@4.1.0/node_modules/workflow/dist/runtime.js'
+        )
+      ).toBe(true);
+    });
+
+    it('does not match non-workflow package in pnpm store', () => {
+      expect(
+        isWorkflowSdkFile(
+          '/tmp/app/node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/lodash.js'
+        )
+      ).toBe(false);
+    });
+  });
 });

packages/builders/src/transform-utils.ts

@@ -29,10 +29,15 @@ export const generatedWorkflowPathPattern =
 
 // Pattern to detect @workflow SDK packages that should be excluded from transformation
 // These are internal SDK packages that should not be treated as user entry points.
-// Matches both: node_modules/@workflow/* and monorepo packages/*/dist paths
+// Matches:
+// - node_modules/@workflow/*
+// - node_modules/workflow/*
+// - node_modules/.pnpm/.../node_modules/@workflow/* (pnpm virtual store)
+// - node_modules/.pnpm/.../node_modules/workflow/* (pnpm virtual store)
+// - monorepo packages/*/dist paths
 // User npm packages with workflows/steps/serde SHOULD still be discovered.
 export const workflowSdkPathPattern =
-  /[/\\](?:node_modules[/\\]@workflow[/\\]|packages[/\\](?:builders|core|rollup|vite|next|nitro|serde|workflow|swc-plugin-workflow)[/\\])/;
+  /[/\\](?:node_modules[/\\](?:@workflow[/\\]|workflow[/\\]|\.pnpm[/\\][^/\\]+[/\\]node_modules[/\\](?:@workflow[/\\]|workflow[/\\]))|packages[/\\](?:builders|core|rollup|vite|next|nitro|serde|workflow|swc-plugin-workflow)[/\\])/;
 
 /**
  * Detects workflow-related patterns in source code.

packages/cli/src/base.ts

@@ -1,6 +1,32 @@
 import { Command } from '@oclif/core';
 import { getWorld } from '@workflow/core/runtime';
 
+async function flushStream(stream: NodeJS.WriteStream): Promise<void> {
+  if (
+    !stream.writable ||
+    stream.destroyed ||
+    stream.closed ||
+    stream.writableEnded ||
+    stream.writableFinished
+  ) {
+    return;
+  }
+
+  await new Promise<void>((resolve) => {
+    const onError = () => resolve();
+    stream.once('error', onError);
+    try {
+      stream.write('', () => {
+        stream.off('error', onError);
+        resolve();
+      });
+    } catch {
+      stream.off('error', onError);
+      resolve();
+    }
+  });
+}
+
 export abstract class BaseCommand extends Command {
   static enableJsonFlag = true;
 
@@ -23,6 +49,10 @@ export abstract class BaseCommand extends Command {
     // agents, but third-party libraries (oclif update checker, postgres.js)
     // may leave timers or sockets that prevent the event loop from draining.
     // This is safe because all business logic and cleanup has completed.
+    await Promise.all([
+      flushStream(process.stdout),
+      flushStream(process.stderr),
+    ]);
     process.exit(err ? 1 : 0);
   }