botapp-cli 0.2.7 → 0.2.9

package/dist/index.js

@@ -1363,7 +1363,7 @@ async function runShellAgent(job) {
   child.stderr.on("data", (chunk) => {
     stderr += chunk.toString();
   });
-  const code = await new Promise((resolve11) => child.on("close", resolve11));
+  const code = await awaitChildClose(child, job.agent.command);
   if (code !== 0) {
     throw new Error(stderr.trim() || `Agent exited with code ${code}`);
   }
@@ -1451,7 +1451,7 @@ async function runCodexAgent(job, update) {
   }
   const rl = createInterface2({ input: child.stdout });
   rl.on("line", processLine);
-  const code = await new Promise((resolve11) => child.on("close", resolve11));
+  const code = await awaitChildClose(child, job.agent.command);
   if (code !== 0) {
     throw new Error(errors.at(-1) ?? (stderr.trim() || `Codex exited with code ${code}`));
   }
@@ -1586,7 +1586,7 @@ async function runClaudeCodeAgent(job, update) {
   }
   const rl = createInterface2({ input: child.stdout });
   rl.on("line", processLine);
-  const code = await new Promise((resolve11) => child.on("close", resolve11));
+  const code = await awaitChildClose(child, job.agent.command);
   if (code !== 0) {
     const parts = [];
     if (stderr.trim()) parts.push(stderr.trim());
@@ -1723,7 +1723,7 @@ ${job.query}`;
   }
   const rl = createInterface2({ input: child.stdout });
   rl.on("line", processLine);
-  const code = await new Promise((resolve11) => child.on("close", resolve11));
+  const code = await awaitChildClose(child, job.agent.command);
   const resumeMatch = stderr.match(/To resume this session:\s*kimi\s+-r\s+([A-Za-z0-9_-]+)/);
   if (resumeMatch) result.sessionId = resumeMatch[1];
   if (code !== 0) {
@@ -2387,7 +2387,7 @@ Invalid ACP stdout: ${line}`;
       clientInfo: {
         name: "botapp-daemon",
         title: "botapp daemon",
-        version: "0.2.7"
+        version: "0.2.9"
       }
     });
     const session = await request2("session/new", {
@@ -2514,6 +2514,20 @@ function parseMaybeJson(value) {
 function sleep(ms) {
   return new Promise((resolveSleep) => setTimeout(resolveSleep, ms));
 }
+function awaitChildClose(child, commandLabel) {
+  return new Promise((resolveClose, reject) => {
+    child.once("error", (err) => {
+      if (err.code === "ENOENT") {
+        reject(new Error(
+          `Agent CLI "${commandLabel}" not found on PATH for the daemon process. Install it, or re-register the agent with an absolute path (\`bot daemon agent remove ${commandLabel}\` then \`bot daemon config\`).`
+        ));
+      } else {
+        reject(err);
+      }
+    });
+    child.once("close", resolveClose);
+  });
+}
 async function waitForChild(child, timeoutMs, label) {
   return new Promise((resolveWait, reject) => {
     const timeout = setTimeout(() => {
@@ -4494,7 +4508,7 @@ function packageJson(ctx, headless) {
     typecheck: "tsc --noEmit"
   };
   const deps = {
-    "botapp-sdk": "^0.1.0",
+    "botapp-sdk": "^0.1.1",
     ws: "^8.18.0"
   };
   const devDeps = {
@@ -4656,7 +4670,7 @@ function apiEntryTs(ctx, headless) {
 
     ctx.serveStatic('./dist/public')
 `;
-  return `import { BotApp } from 'botapp-sdk'
+  return `import { BotApp, runHosted } from 'botapp-sdk'
 
 const app = new BotApp({
   name: '${ctx.name}',
@@ -4678,7 +4692,16 @@ const app = new BotApp({
 ${widget}  },
 })
 
-await app.start()
+export default app
+
+// Hosted-tier bridge: only connects when launched with BOTAPP_SERVER +
+// BOTAPP_APP_TOKEN (set by \`bot simulate\` and the platform-spawned runner).
+// In every other context (tests, in-process discovery) the bridge stays
+// dormant. Use globalThis.process so this typechecks without @types/node.
+const env = (globalThis as { process?: { env?: Record<string, string | undefined> } }).process?.env ?? {}
+if (env.BOTAPP_SERVER && env.BOTAPP_APP_TOKEN) {
+  await runHosted(app)
+}
 `;
 }
 function srcMainTsx(_ctx) {
@@ -4719,32 +4742,53 @@ export function App() {
 }
 function srcApiTs() {
   return `// Tiny client for calling app routes/commands from the browser.
-// Routes resolve as /apps/<name>/* on the platform; the platform forwards
-// each request to your app's WebSocket session.
+// Two ways an app frontend reaches its backend on a botapp server:
+//
+//   1. Path-prefixed:   /apps/<name>/api/commands/<cmd>  (on bare apex)
+//   2. Subdomain:       /api/apps/<name>/commands/<cmd>  (on app subdomain)
+//
+// The subdomain dispatcher in the server leaves /api/* unrewritten on
+// subdomain hosts, so the frontend has to construct the absolute
+// /api/apps/<name>/... URL itself. We resolve <name> three ways and
+// take the first that works:
+//   \u2022 from a /apps/<name>/ path prefix (host is the apex)
+//   \u2022 from the first DNS label (host is <name>.<domain>)
+//   \u2022 fallback: skip the /api/apps/<name> prefix (single-app local dev)
 
-const APP_BASE = ((): string => {
-  const m = location.pathname.match(/^\\/apps\\/[^/]+\\//)
-  return m ? m[0] : '/'
-})()
+function resolveAppName(): string | null {
+  const m = location.pathname.match(/^\\/apps\\/([^/]+)\\//)
+  if (m) return m[1]
+  const host = location.hostname
+  const first = host.split('.')[0]
+  if (first && first !== 'www' && host.split('.').length >= 2) return first
+  return null
+}
 
-export async function callCommand(name: string, params: Record<string, unknown> = {}) {
-  const r = await fetch(\`\${APP_BASE}api/commands/\${encodeURIComponent(name)}\`, {
+const APP_NAME = resolveAppName()
+const API_BASE = APP_NAME ? \`/api/apps/\${APP_NAME}\` : '/api'
+
+async function call(kind: 'commands' | 'actions', name: string, params: Record<string, unknown>): Promise<unknown> {
+  const r = await fetch(\`\${API_BASE}/\${kind}/\${encodeURIComponent(name)}\`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(params),
   })
   if (!r.ok) throw new Error(await r.text())
-  return r.json()
+  // The /api/apps/<name>/... handler wraps responses as
+  // \`{ status: 'success', result }\` or \`{ status: 'error', error }\`.
+  // Unwrap so callers see the bare result; throw on error.
+  const json = (await r.json()) as { status?: string; result?: unknown; error?: string }
+  if (json.status === 'error') throw new Error(json.error ?? 'unknown error')
+  if (json.status === 'success') return json.result
+  return json
+}
+
+export async function callCommand(name: string, params: Record<string, unknown> = {}) {
+  return call('commands', name, params)
 }
 
 export async function callAction(name: string, params: Record<string, unknown> = {}) {
-  const r = await fetch(\`\${APP_BASE}api/actions/\${encodeURIComponent(name)}\`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(params),
-  })
-  if (!r.ok) throw new Error(await r.text())
-  return r.json()
+  return call('actions', name, params)
 }
 `;
 }
@@ -5011,7 +5055,7 @@ function die(msg) {
 }
 
 // src/index.ts
-var version = "0.2.7";
+var version = "0.2.9";
 var program = new Command25().name("bot").description("botapp CLI \u2014 operate apps from the command line").version(version).enablePositionalOptions(true).option("--json", "Output as JSON").option("-s, --server <url>", "Server URL override").option("-t, --token <token>", "Auth token override").option("-v, --verbose", "Verbose output");
 program.addCommand(launchCommand);
 program.addCommand(runCommand);