@arcote.tech/arc-cli 0.7.6 → 0.7.8

package/src/platform/server.ts

@@ -600,7 +600,25 @@ export async function startPlatformServer(
   // Context available — use createArcServer with platform handlers on top.
   // `resolveDbAdapterFactory` picks SQLite or Postgres based on DATABASE_URL.
   const dbPath = opts.dbPath || join(ws.arcDir, "data", "arc.db");
-  const dbAdapterFactory = await resolveDbAdapterFactory(dbPath);
+  const baseDbFactory = await resolveDbAdapterFactory(dbPath);
+
+  // Wrap the DB adapter for per-transaction spans when telemetry is on.
+  // Done here (not in arc-host) so arc-host stays free of arc-otel runtime
+  // imports — duplicate @opentelemetry/api copies silently drop spans.
+  let dbAdapterFactory = baseDbFactory;
+  if (telemetry) {
+    // Pull wrapDbAdapter from `/server` (not the root export) so Bun
+    // doesn't double-bundle arc-otel for the CLI bundle. Both /server
+    // and / share telemetry.ts but split bundling otherwise.
+    const { wrapDbAdapter } = await import("@arcote.tech/arc-otel/server");
+    const dbSystem: "postgresql" | "sqlite" = process.env.DATABASE_URL
+      ? "postgresql"
+      : "sqlite";
+    dbAdapterFactory = async (ctx: any) => {
+      const a = await baseDbFactory(ctx);
+      return wrapDbAdapter(a, telemetry, dbSystem);
+    };
+  }
 
   const arcServer = await createArcServer({
     context,

package/src/platform/startup.ts

@@ -74,17 +74,39 @@ export async function startPlatform(
 
   // 3. Start the platform server. Cache headers + SSE behaviour are
   // controlled inside the server by `devMode`; we just pass the flag.
-  const platform = await startPlatformServer({
-    ws,
-    port,
-    manifest,
-    context,
-    moduleAccess,
-    dbPath,
-    devMode,
-  });
+  // In dev mode, if the port is busy, try incrementing up to 20 times.
+  const MAX_PORT_ATTEMPTS = devMode ? 20 : 1;
+  let platform: PlatformServer | null = null;
+  let actualPort = port;
+  for (let i = 0; i < MAX_PORT_ATTEMPTS; i++) {
+    try {
+      platform = await startPlatformServer({
+        ws,
+        port: actualPort,
+        manifest,
+        context,
+        moduleAccess,
+        dbPath,
+        devMode,
+      });
+      break;
+    } catch (e) {
+      const msg = (e as Error).message || "";
+      const inUse =
+        msg.includes("EADDRINUSE") ||
+        msg.includes("address already in use") ||
+        msg.includes("in use");
+      if (!inUse || i === MAX_PORT_ATTEMPTS - 1) throw e;
+      log(`Port ${actualPort} in use, trying ${actualPort + 1}...`);
+      actualPort++;
+    }
+  }
+  if (!platform) {
+    err(`Failed to bind a free port starting from ${port}`);
+    process.exit(1);
+  }
 
-  ok(`Server on http://localhost:${port}`);
+  ok(`Server on http://localhost:${actualPort}`);
   if (platform.contextHandler) {
     ok("Commands, queries, WebSocket — all on same port");
   }