Skip to content

AI Agents & MCPs & AI Workflow Automation • (~400 MCP servers for AI agents) • AI Automation / AI Agent with MCPs • AI Workflows & AI Agents • MCPs for AI Agents

fix(dev-pieces): piece edits take effect on the next test step without restarting the dev server (#16043)

Kishan Parmar8656fb852710
diff --git a/packages/server/api/src/app/pieces/dev-piece-watcher.ts b/packages/server/api/src/app/pieces/dev-piece-watcher.ts
index a8e9103e375..2b5d93b9529 100644
--- a/packages/server/api/src/app/pieces/dev-piece-watcher.ts
+++ b/packages/server/api/src/app/pieces/dev-piece-watcher.ts
@@ -91,20 +91,25 @@ export async function startDevPieceWatcher(app: FastifyInstance): Promise<void>
join(p.pieceDirectory, 'package.json'),
])
- const triggerBuild = async (pieceInfo: PieceInfo) => {
- rebuilding.add(pieceInfo.pieceName)
+ const triggerBuild = async (piecesToBuild: PieceInfo[]): Promise<void> => {
+ piecesToBuild.forEach(p => rebuilding.add(p.pieceName))
try {
- await buildPieces(app, [pieceInfo])
+ await buildPieces(app, piecesToBuild)
}
finally {
- rebuilding.delete(pieceInfo.pieceName)
+ piecesToBuild.forEach(p => rebuilding.delete(p.pieceName))
}
- if (pendingRebuild.has(pieceInfo.pieceName)) {
- pendingRebuild.delete(pieceInfo.pieceName)
- void triggerBuild(pieceInfo)
+ const pending = piecesToBuild.filter(p => pendingRebuild.has(p.pieceName))
+ pending.forEach(p => pendingRebuild.delete(p.pieceName))
+ if (pending.length > 0) {
+ startBuild(pending)
}
}
+ const startBuild = (piecesToBuild: PieceInfo[]): void => {
+ triggerBuild(piecesToBuild).catch((error) => app.log.error({ error }, 'Failed to build dev pieces'))
+ }
+
const watcher = chokidar.watch(watchPaths, { ignoreInitial: true })
watcher.on('all', (_event, filePath) => {
@@ -118,7 +123,7 @@ export async function startDevPieceWatcher(app: FastifyInstance): Promise<void>
pendingRebuild.add(pieceInfo.pieceName)
return
}
- void triggerBuild(pieceInfo)
+ startBuild([pieceInfo])
}, 300))
})
diff --git a/packages/server/sandbox/src/index.ts b/packages/server/sandbox/src/index.ts
index 8f48acbc316..8a0326b4662 100644
--- a/packages/server/sandbox/src/index.ts
+++ b/packages/server/sandbox/src/index.ts
@@ -1,4 +1,5 @@
export { createSandboxRuntime } from './lib/sandbox'
+export { markDevPiecesRebuilt } from './lib/sandbox-manager'
export { createResolver } from './lib/resolver'
export { actionRunCache, ACTION_RUN_CACHE_ACTIVE_WINDOW_MS, ACTION_RUN_CACHE_FIRST_SWEEP_DELAY_MS, ACTION_RUN_CACHE_SWEEP_INTERVAL_MS } from './lib/cache/action-run-cache'
export { cacheUtils } from './lib/cache/cache-paths'
diff --git a/packages/server/sandbox/src/lib/sandbox-manager.ts b/packages/server/sandbox/src/lib/sandbox-manager.ts
index fcaa1fa299b..24b8ef840c6 100644
--- a/packages/server/sandbox/src/lib/sandbox-manager.ts
+++ b/packages/server/sandbox/src/lib/sandbox-manager.ts
@@ -5,21 +5,30 @@ import { createSandboxForJob } from './create-sandbox-for-job'
import { Sandbox } from './sandbox/types'
import { SandboxSettings } from './types'
+let devPiecesGeneration = 0
+
+export function markDevPiecesRebuilt(): void {
+ devPiecesGeneration++
+}
+
export function createSandboxManager({ boxId, basePath, getSettings }: { boxId: number, basePath: string, getSettings: () => SandboxSettings }): SandboxManager {
let currentSandbox: Sandbox | null = null
+ let currentSandboxDevPiecesGeneration = devPiecesGeneration
return {
acquire(params: { log: ApLogger }): Sandbox {
- if (canReuseSandbox(getSettings) && currentSandbox && currentSandbox.isReady()) {
+ const builtBeforeDevPiecesRebuild = currentSandboxDevPiecesGeneration < devPiecesGeneration
+ if (canReuseSandbox(getSettings) && currentSandbox && currentSandbox.isReady() && !builtBeforeDevPiecesRebuild) {
return currentSandbox
}
if (currentSandbox) {
- params.log.info('Sandbox not ready or not reusable, creating fresh one')
+ params.log.info(builtBeforeDevPiecesRebuild ? 'Dev pieces were rebuilt, replacing stale sandbox' : 'Sandbox not ready or not reusable, creating fresh one')
currentSandbox.shutdown().catch((err) =>
params.log.error({ error: err }, 'Error shutting down previous sandbox'),
)
}
currentSandbox = createSandboxForJob({ ...params, boxId, reusable: canReuseSandbox(getSettings), basePath, getSettings })
+ currentSandboxDevPiecesGeneration = devPiecesGeneration
return currentSandbox
},
async invalidate(log: ApLogger): Promise<void> {
diff --git a/packages/server/sandbox/test/lib/sandbox-manager.test.ts b/packages/server/sandbox/test/lib/sandbox-manager.test.ts
index 4ae8e8c7864..6c13881019c 100644
--- a/packages/server/sandbox/test/lib/sandbox-manager.test.ts
+++ b/packages/server/sandbox/test/lib/sandbox-manager.test.ts
@@ -8,7 +8,7 @@ vi.mock('../../src/lib/create-sandbox-for-job', () => ({
}),
}))
-import { createSandboxManager } from '../../src/lib/sandbox-manager'
+import { createSandboxManager, markDevPiecesRebuilt } from '../../src/lib/sandbox-manager'
const log = {
info: vi.fn(),
@@ -133,3 +133,30 @@ describe('sandbox-manager canReuseSandbox', () => {
expect(createSandboxForJob).toHaveBeenCalledTimes(1)
})
})
+
+describe('sandbox-manager dev pieces rebuild', () => {
+ beforeEach(() => {
+ vi.clearAllMocks()
+ })
+
+ it('replaces a sandbox created before the latest dev pieces rebuild even when REUSE_SANDBOX is true, then reuses the new one', async () => {
+ const settings = {
+ ...buildSettings({ executionMode: ExecutionMode.SANDBOX_PROCESS, environment: ApEnvironment.DEVELOPMENT }),
+ REUSE_SANDBOX: 'true',
+ }
+ const manager = createSandboxManager({ boxId: 1, basePath: '/tmp', getSettings: () => settings })
+ const { createSandboxForJob } = await import('../../src/lib/create-sandbox-for-job')
+
+ const staleSandbox = manager.acquire({ log })
+ await manager.release(log)
+ markDevPiecesRebuilt()
+
+ manager.acquire({ log })
+ expect(createSandboxForJob).toHaveBeenCalledTimes(2)
+ expect(staleSandbox.shutdown).toHaveBeenCalled()
+
+ await manager.release(log)
+ manager.acquire({ log })
+ expect(createSandboxForJob).toHaveBeenCalledTimes(2)
+ })
+})
diff --git a/packages/server/worker/src/lib/worker.ts b/packages/server/worker/src/lib/worker.ts
index 417d88ec008..590cb089528 100644
--- a/packages/server/worker/src/lib/worker.ts
+++ b/packages/server/worker/src/lib/worker.ts
@@ -1,9 +1,9 @@
import { createServer } from 'http'
import os from 'os'
import { ActivepiecesError, isNil, spreadIfDefined, tryCatch, tryCatchSync } from '@activepieces/core-utils'
-import { ACTION_RUN_CACHE_ACTIVE_WINDOW_MS, ACTION_RUN_CACHE_FIRST_SWEEP_DELAY_MS, ACTION_RUN_CACHE_SWEEP_INTERVAL_MS, actionRunCache, cacheUtils, createResolver, createSandboxRuntime, Runtime } from '@activepieces/sandbox'
+import { ACTION_RUN_CACHE_ACTIVE_WINDOW_MS, ACTION_RUN_CACHE_FIRST_SWEEP_DELAY_MS, ACTION_RUN_CACHE_SWEEP_INTERVAL_MS, actionRunCache, cacheUtils, createResolver, createSandboxRuntime, markDevPiecesRebuilt, Runtime } from '@activepieces/sandbox'
import { aiCostReporter, createLogger, modelCatalog, modelTierCatalog, systemUsage, wideEvent } from '@activepieces/server-utils'
-import { ApEdition, ApiToWorkerContract, ConsumeJobRequest, createNotifyServer, createRpcClient, EngineResponseStatus, ExecutionMode, JobData, LONG_RUNNING_RPC_METHODS, SandboxInformation, WebsocketServerEvent, WorkerJobType, WorkerMachineHealthcheckRequest, WorkerProps, WorkerSettingsResponse, WorkerToApiContract } from '@activepieces/shared'
+import { ApEdition, ApiToWorkerContract, ConsumeJobRequest, createNotifyServer, createRpcClient, EngineResponseStatus, ExecutionMode, JobData, LONG_RUNNING_RPC_METHODS, SandboxInformation, WebsocketClientEvent, WebsocketServerEvent, WorkerJobType, WorkerMachineHealthcheckRequest, WorkerProps, WorkerSettingsResponse, WorkerToApiContract } from '@activepieces/shared'
import { nanoid } from 'nanoid'
import { io, Socket } from 'socket.io-client'
import { createApiToWorkerHandlers } from './api-notify-service'
@@ -115,6 +115,11 @@ export const worker = {
logger.error({ error: error.message }, 'Socket.IO connection error')
})
+ socket.on(WebsocketClientEvent.REFRESH_PIECE, () => {
+ logger.info('Dev pieces rebuilt, sandboxes will be replaced before their next job')
+ markDevPiecesRebuilt()
+ })
+
createNotifyServer<ApiToWorkerContract>(socket, createApiToWorkerHandlers({
getRuntime: () => runtime,
apiClient,
diff --git a/tools/setup-dev.js b/tools/setup-dev.js
index 8b0e02868c1..8a6dfc0cfca 100644
--- a/tools/setup-dev.js
+++ b/tools/setup-dev.js
@@ -149,5 +149,5 @@ if (devPieces) {
}).join(' ');
console.log(`Building dev pieces: ${devPieces}`);
- execSync(`npx turbo run build ${pieceFilters}`, { stdio: 'inherit' });
+ execSync(`npx turbo run build ${pieceFilters} --force`, { stdio: 'inherit' });
}