fix: inspector

Author: jog1t

examples/chat-room/package.json

@@ -4,22 +4,22 @@
   "private": true,
   "type": "module",
   "scripts": {
+    "dev": "npx @actor-core/cli@latest dev",
     "check-types": "tsc --noEmit",
     "test": "vitest run"
   },
   "devDependencies": {
     "@types/node": "^22.13.9",
     "@types/prompts": "^2",
     "actor-core": "workspace:*",
+    "@actor-core/cli": "workspace:*",
     "prompts": "^2.4.2",
     "tsx": "^3.12.7",
     "typescript": "^5.5.2",
     "vitest": "^3.0.9"
   },
   "example": {
-    "platforms": [
-      "*"
-    ],
+    "platforms": ["*"],
     "actors": {
       "chat-room": "src/chat-room.ts"
     }

examples/counter/package.json

@@ -4,19 +4,19 @@
   "private": true,
   "type": "module",
   "scripts": {
+    "dev": "npx @actor-core/cli@latest dev",
     "check-types": "tsc --noEmit",
     "test": "vitest run"
   },
   "devDependencies": {
     "@types/node": "^22.13.9",
     "actor-core": "workspace:*",
+    "@actor-core/cli": "workspace:*",
     "tsx": "^3.12.7",
     "typescript": "^5.7.3",
     "vitest": "^3.0.9"
   },
   "example": {
-    "platforms": [
-      "*"
-    ]
+    "platforms": ["*"]
   }
 }

packages/actor-core-cli/src/commands/dev.tsx

@@ -3,11 +3,11 @@ import { Argument, Command, Option } from "commander";
 import { workflow } from "../workflow";
 
 import { validateConfigTask } from "../workflows/validate-config";
-import { serve } from "@actor-core/nodejs";
 import chokidar from "chokidar";
 import { Text } from "ink";
 import open from "open";
 import { withResolvers } from "../utils/mod";
+import { spawn } from "node:child_process";
 
 export const dev = new Command()
 	.name("dev")
@@ -35,8 +35,6 @@ export async function action(
 ) {
 	const cwd = path.join(process.cwd(), cmdPath);
 	await workflow("Run locally your ActorCore project", async function* (ctx) {
-		let server: ReturnType<typeof serve>;
-
 		if (opts.open) {
 			open(
 				process.env._ACTOR_CORE_CLI_DEV
@@ -51,26 +49,48 @@ export async function action(
 			ignored: (path) => path.includes("node_modules"),
 		});
 
-		let lock: ReturnType<typeof withResolvers> = withResolvers();
+		function createServer() {
+			return spawn(
+				process.execPath,
+				[
+					path.join(
+						path.dirname(require.resolve("@actor-core/cli")),
+						"server-entry.js",
+					),
+				],
+				{ env: { ...process.env, PORT: opts.port }, cwd },
+			);
+		}
 
-		watcher.on("all", async (event, path) => {
-			if (path.includes("node_modules") || path.includes("/.")) return;
+		let server: ReturnType<typeof spawn> | undefined = undefined;
+		let lock: ReturnType<typeof withResolvers> = withResolvers();
 
-			server?.close();
+		function createLock() {
 			if (lock) {
 				lock.resolve(undefined);
-				lock = withResolvers();
 			}
+			lock = withResolvers();
+		}
+
+		watcher.on("all", async (_, path) => {
+			if (path.includes("node_modules") || path.includes("/.")) return;
+
+			server?.kill();
 		});
 
 		while (true) {
-			const config = yield* validateConfigTask(ctx, cwd);
-			config.app.config.inspector = {
-				enabled: true,
-			};
-			server = serve(config.app, {
-				port: Number.parseInt(opts.port || "6420", 10) || 6420,
+			yield* validateConfigTask(ctx, cwd);
+			server = createServer();
+			createLock();
+
+			server?.addListener("exit", () => {
+				lock.resolve(undefined);
 			});
+
+			server?.addListener("close", () => {
+				lock.resolve(undefined);
+			});
+
 			yield* ctx.task(
 				"Watching for changes...",
 				async () => {

packages/actor-core-cli/src/server-entry.ts

@@ -0,0 +1,17 @@
+import { validateConfig } from "./utils/config";
+import { serve } from "@actor-core/nodejs";
+
+async function run() {
+	const config = await validateConfig(process.cwd());
+	config.app.config.inspector = {
+		enabled: true,
+	};
+	serve(config.app, {
+		port: Number.parseInt(process.env.PORT || "6420", 10) || 6420,
+	});
+}
+
+run().catch((err) => {
+	console.error(err);
+	process.exit(1);
+});

packages/actor-core-cli/src/workflow.tsx

@@ -257,8 +257,7 @@ export function workflow(
 				new Promise<undefined>((resolve) => setTimeout(resolve, ms)),
 			task: runner.bind(null, {
 				...meta,
-				parent: meta.id,
-				id: "",
+				parent: meta.parent,
 				name: "",
 			}) as Context["task"],
 			render(children: React.ReactNode) {
@@ -292,11 +291,12 @@ export function workflow(
 				WorkflowAction.Prompt.One<T>,
 				WorkflowAction.Prompt.Answer<T>
 			> {
+				const id = getTaskId();
 				const { promise, resolve, reject } =
 					withResolvers<WorkflowAction.Prompt.Answer<T>>();
 
 				yield WorkflowAction.prompt<T>(
-					{ ...meta, id: meta.id, name: question },
+					{ ...meta, id, name: question },
 					question,
 					{
 						answer: null,
@@ -308,7 +308,7 @@ export function workflow(
 				const result = await promise;
 
 				yield WorkflowAction.prompt<T>(
-					{ ...meta, id: meta.id, name: question },
+					{ ...meta, id, name: question },
 					question,
 					{
 						answer: result,
@@ -353,11 +353,15 @@ export function workflow(
 					parentMap.set(task.meta.id, parent);
 					// Propagate errors up the tree
 					if (task.status === "error") {
-						let parentTask = parentMap.get(id);
+						let parentTask = parentMap.get(task.meta.id);
 						while (parentTask) {
 							const grandParent = parentMap.get(parentTask);
 							yield WorkflowAction.progress(
-								{ id, name: parentTask, parent: grandParent || null },
+								{
+									id: parentTask,
+									name: parentTask,
+									parent: grandParent || null,
+								},
 								"error",
 							);
 							parentTask = grandParent;

packages/actor-core-cli/tsup.config.ts

@@ -11,7 +11,7 @@ const __dirname = topLevelFileURLToPath(new topLevelURL(".", import.meta.url));
 `;
 
 export default defineConfig({
-	entry: ["src/mod.ts", "src/cli.ts"],
+	entry: ["src/mod.ts", "src/cli.ts", "src/server-entry.ts"],
 	platform: "node",
 	bundle: true,
 	format: "esm",

packages/platforms/nodejs/src/mod.ts

@@ -4,7 +4,6 @@ import { assertUnreachable } from "actor-core/utils";
 import { CoordinateTopology } from "actor-core/topologies/coordinate";
 import { logger } from "./log";
 import type { Hono } from "hono";
-import { getRouterName, showRoutes } from "hono/dev";
 import { StandaloneTopology, type ActorCoreApp } from "actor-core";
 import {
 	MemoryGlobalState,