feat(runtime): switch agent scripts to local launchers

Run agent and session commands through project-local spawndock scripts and drop the CLI dev dependency to keep runtime bootstrap self-contained.

Made-with: Cursor

Author: ilyar

README.md

@@ -24,7 +24,7 @@ npx -y @spawn-dock/create@beta --token <pairing-token> [project-dir]
 - `pnpm run dev` starts Next.js and the SpawnDock tunnel together (no AI agent).
   The tunnel startup logs also print the Telegram Mini App deep link when the
   bootstrapped `spawndock.config.json` includes it.
-- `pnpm run agent` starts Next.js, the tunnel, then the SpawnDock agent launcher (`@spawn-dock/cli`).
+- `pnpm run agent` starts Next.js, the tunnel, then the local SpawnDock runtime launcher (`spawndock/agent.mjs`).
 - `pnpm run dev:next` starts only the local Next.js server.
 - `pnpm run dev:tunnel` starts only the SpawnDock tunnel client.
 - `pnpm run agent:session` starts only the SpawnDock AI runtime launcher (`spawn-dock session`, no dev server).

package.json

@@ -4,8 +4,8 @@
   "private": true,
   "scripts": {
     "dev": "node ./spawndock/dev.mjs",
-    "agent": "spawn-dock agent",
-    "agent:session": "spawn-dock session",
+    "agent": "node ./spawndock/agent.mjs",
+    "agent:session": "node ./spawndock/session.mjs",
     "dev:next": "node ./spawndock/next.mjs",
     "dev:tunnel": "node ./spawndock/tunnel.mjs",
     "dev:https": "next dev --experimental-https",
@@ -28,7 +28,6 @@
     "ws": "^8.19.0"
   },
   "devDependencies": {
-    "@spawn-dock/cli": "0.2.0",
     "@spawn-dock/dev-tunnel": "1.0.9",
     "@spawn-dock/mcp": "1.0.5",
     "@tailwindcss/postcss": "^4.1.17",

pnpm-lock.yaml

@@ -0,0 +1,87 @@
+import { spawn } from "node:child_process"
+
+import { readSpawndockConfig, resolveConfiguredLocalPort } from "./config.mjs"
+import { findAvailablePort, waitForPort } from "./port.mjs"
+
+const config = readSpawndockConfig()
+const requestedLocalPort = resolveConfiguredLocalPort(config)
+const localPort = await findAvailablePort(requestedLocalPort)
+
+if (localPort !== requestedLocalPort) {
+  console.warn(
+    `SpawnDock local port ${requestedLocalPort} is busy, using ${localPort} instead.`
+  )
+}
+
+const sharedEnv = {
+  ...process.env,
+  SPAWNDOCK_PORT: String(localPort),
+}
+
+const children = []
+let shuttingDown = false
+
+const stopChildren = (signal = "SIGTERM") => {
+  shuttingDown = true
+  for (const child of [...children].reverse()) {
+    if (!child.killed) {
+      child.kill(signal)
+    }
+  }
+}
+
+const onSignal = (signal) => {
+  stopChildren(signal)
+  process.exit(signal === "SIGINT" ? 130 : 143)
+}
+
+process.once("SIGINT", () => onSignal("SIGINT"))
+process.once("SIGTERM", () => onSignal("SIGTERM"))
+
+const spawnChild = (command, args, env = sharedEnv) => {
+  const child = spawn(command, args, {
+    cwd: process.cwd(),
+    env,
+    stdio: "inherit",
+  })
+
+  children.push(child)
+
+  child.on("exit", (code) => {
+    if (shuttingDown) {
+      return
+    }
+    if (typeof code === "number" && code !== 0) {
+      stopChildren()
+      process.exit(code)
+    }
+  })
+
+  return child
+}
+
+const nextChild = spawnChild("node", ["spawndock/next.mjs"])
+
+try {
+  await waitForPort(localPort, {
+    isCancelled: () => shuttingDown || nextChild.exitCode !== null,
+  })
+} catch (error) {
+  stopChildren()
+  throw error
+}
+
+spawnChild("node", ["spawndock/tunnel.mjs"])
+
+const agentChild = spawnChild("node", ["spawndock/session.mjs"], {
+  ...process.env,
+  SPAWNDOCK_PORT: String(localPort),
+})
+
+const exitCode = await new Promise((resolve, reject) => {
+  agentChild.once("error", reject)
+  agentChild.once("exit", (code) => resolve(typeof code === "number" ? code : 1))
+})
+
+stopChildren()
+process.exit(exitCode)

spawndock/agent.mjs

@@ -47,3 +47,12 @@ export const resolveMcpApiKey = (config) => {
 
   throw new Error("Missing mcpApiKey in spawndock.config.json")
 }
+
+
+const resolveRuntimeFromValue = (value) =>
+  value === "opencode" || value === "codex" || value === "claude" ? value : undefined
+
+export const resolveAgentRuntime = (config, env = process.env) =>
+  resolveRuntimeFromValue(env.SPAWNDOCK_AGENT_RUNTIME) ??
+  resolveRuntimeFromValue(config.agentRuntime) ??
+  "opencode"

spawndock/config.mjs

@@ -0,0 +1,47 @@
+import { spawn } from "node:child_process"
+
+import { readSpawndockConfig, resolveAgentRuntime } from "./config.mjs"
+
+const config = readSpawndockConfig()
+const runtime = resolveAgentRuntime(config)
+const projectDir = process.cwd()
+
+const buildRuntimeCommand = (selectedRuntime, cwd) => {
+  if (selectedRuntime === "codex") {
+    return {
+      command: "codex",
+      args: ["-C", cwd, "-s", "workspace-write", "-a", "on-request"],
+    }
+  }
+
+  if (selectedRuntime === "claude") {
+    return {
+      command: "codex",
+      args: ["sandbox", "linux", "claude"],
+    }
+  }
+
+  return {
+    command: "codex",
+    args: ["sandbox", "linux", "opencode", cwd],
+  }
+}
+
+const spec = buildRuntimeCommand(runtime, projectDir)
+console.log(`Launching ${runtime} in ${projectDir}`)
+console.log("Filesystem access is constrained to the project working directory on a best-effort basis.")
+
+const child = spawn(spec.command, spec.args, {
+  cwd: projectDir,
+  env: process.env,
+  stdio: "inherit",
+})
+
+child.on("exit", (code) => {
+  process.exit(typeof code === "number" ? code : 1)
+})
+
+child.on("error", (error) => {
+  console.error(error)
+  process.exit(1)
+})