skybridge 0.0.0-dev.fe06299 → 0.0.0-dev.fe35f75

package/dist/cli/use-tunnel.js

@@ -1,30 +1,16 @@
-import { spawn } from "node:child_process";
-import { randomUUID } from "node:crypto";
 import { useEffect, useState } from "react";
-export function useTunnel(port) {
-    const [label, setLabel] = useState({
-        text: "Starting...",
-        color: "yellow",
-    });
-    const [logs, setLogs] = useState([]);
+const POST_RETRY_DELAY_MS = 250;
+export function useTunnel(port, pushMessage, verbose, autoStart) {
+    const [state, setState] = useState(port !== null && autoStart
+        ? { status: "starting", message: "Starting tunnel…" }
+        : { status: "idle" });
     useEffect(() => {
         if (port === null) {
             return;
         }
-        const tunnelProcess = spawn("npx", ["--yes", "alpic", "tunnel", "--port", String(port), "--plain"], {
-            stdio: ["ignore", "pipe", "pipe"],
-        });
-        let stderrBuffer = "";
-        let connected = false;
-        const timeout = setTimeout(() => {
-            if (!connected) {
-                setLabel({
-                    text: "Tunnel connection timed out after one minute",
-                    color: "red",
-                });
-                tunnelProcess.kill();
-            }
-        }, 60_000);
+        const baseUrl = `http://localhost:${port}`;
+        const controller = new AbortController();
+        let cancelled = false;
         const pushLog = (text, type) => {
             const time = new Date().toLocaleTimeString("en-US", {
                 hour: "numeric",
@@ -32,70 +18,114 @@ export function useTunnel(port) {
                 second: "2-digit",
                 hour12: true,
             });
-            setLogs((prev) => [
-                ...prev,
-                {
-                    id: randomUUID(),
-                    text: `${time} [tunnel] ${text}`,
-                    type,
-                },
-            ].slice(-10));
+            pushMessage(`${time} [tunnel] ${text}`, type);
+        };
+        const handleEvent = (event, data) => {
+            if (event === "state") {
+                const next = JSON.parse(data);
+                setState(next);
+                return;
+            }
+            if (event === "activity") {
+                if (!verbose) {
+                    return;
+                }
+                const activity = JSON.parse(data);
+                pushLog(activity.text, activity.level);
+            }
         };
-        const handleStdout = (data) => {
-            const lines = data.toString().trim().split("\n").filter(Boolean);
-            for (const line of lines) {
-                if (connected) {
-                    pushLog(line, "log");
+        const consumeSse = async () => {
+            const res = await fetch(`${baseUrl}/__skybridge/tunnel/events`, {
+                signal: controller.signal,
+                headers: { Accept: "text/event-stream" },
+            });
+            if (!res.ok || !res.body) {
+                throw new Error(`SSE connection failed (${res.status})`);
+            }
+            const reader = res.body.getReader();
+            const decoder = new TextDecoder();
+            let buffer = "";
+            while (!cancelled) {
+                const { value, done } = await reader.read();
+                if (done) {
+                    return;
                 }
-                else {
-                    const match = line.match(/Forwarding:\s+(https:\/\/\S+)\s*->\s*(\S+)/);
-                    if (match?.[1]) {
-                        connected = true;
-                        clearTimeout(timeout);
-                        setLabel({ text: line, color: "white" });
+                buffer += decoder.decode(value, { stream: true });
+                // SSE frames are separated by a blank line ("\n\n").
+                let sep = buffer.indexOf("\n\n");
+                while (sep !== -1) {
+                    const frame = buffer.slice(0, sep);
+                    buffer = buffer.slice(sep + 2);
+                    let eventName = "message";
+                    const dataLines = [];
+                    for (const rawLine of frame.split("\n")) {
+                        const line = rawLine.replace(/\r$/, "");
+                        if (line.startsWith("event:")) {
+                            eventName = line.slice(6).trim();
+                        }
+                        else if (line.startsWith("data:")) {
+                            dataLines.push(line.slice(5).trimStart());
+                        }
                     }
-                    else {
-                        setLabel({ text: line, color: "yellow" });
+                    if (dataLines.length > 0) {
+                        handleEvent(eventName, dataLines.join("\n"));
                     }
+                    sep = buffer.indexOf("\n\n");
                 }
             }
         };
-        const handleStderr = (data) => {
-            const text = data.toString().trim();
-            if (text) {
-                stderrBuffer = (stderrBuffer + text).slice(-1024);
-                for (const line of text.split("\n").filter(Boolean)) {
-                    if (connected) {
-                        pushLog(line, "error");
+        const postUntilStarted = async () => {
+            // Retry indefinitely until POST lands once. Bounded by the effect
+            // lifetime via controller.abort() on unmount. Once the manager has
+            // been started, this returns and never POSTs again — a user-driven
+            // DELETE /tunnel won't be auto-undone.
+            while (!cancelled) {
+                try {
+                    const res = await fetch(`${baseUrl}/__skybridge/tunnel`, {
+                        method: "POST",
+                        signal: controller.signal,
+                    });
+                    if (res.ok) {
+                        return;
                     }
                 }
+                catch {
+                    // dev server not up yet (or restarting under nodemon) — wait, retry
+                }
+                await new Promise((r) => setTimeout(r, POST_RETRY_DELAY_MS));
             }
         };
-        if (tunnelProcess.stdout) {
-            tunnelProcess.stdout.on("data", handleStdout);
-        }
-        if (tunnelProcess.stderr) {
-            tunnelProcess.stderr.on("data", handleStderr);
-        }
-        tunnelProcess.on("error", (err) => {
-            clearTimeout(timeout);
-            setLabel({ text: err.message, color: "red" });
-        });
-        tunnelProcess.on("close", (code) => {
-            clearTimeout(timeout);
-            if (code !== 0 && code !== null) {
-                const detail = stderrBuffer.trim() || `exited with code ${code}`;
-                setLabel({
-                    text: `${detail}. Try manually: npx alpic tunnel --port ${port}`,
-                    color: "red",
-                });
+        // Always observe the tunnel state so external triggers (curl, future
+        // devtools UI) update the cli UI. `autoStart` only decides whether we
+        // also POST /tunnel on mount. Reconnects indefinitely so we survive
+        // dev-server boot delay and nodemon restarts; the cli owns the actual
+        // subprocess so a temporarily-unreachable dev server is fine.
+        const observe = async () => {
+            while (!cancelled) {
+                try {
+                    await consumeSse();
+                }
+                catch {
+                    // network error or stream ended abnormally — fall through to retry
+                }
+                if (cancelled) {
+                    return;
+                }
+                await new Promise((r) => setTimeout(r, POST_RETRY_DELAY_MS));
             }
-        });
+        };
+        // observe() always runs — it owns the cli's view of tunnel state. POST is
+        // a fire-and-forget side-effect that nudges the manager into starting and
+        // retries until it lands at least once.
+        if (autoStart) {
+            void postUntilStarted();
+        }
+        void observe();
         return () => {
-            clearTimeout(timeout);
-            tunnelProcess.kill();
+            cancelled = true;
+            controller.abort();
         };
-    }, [port]);
-    return { label: label.text, labelColor: label.color, logs };
+    }, [port, pushMessage, verbose, autoStart]);
+    return state;
 }
 //# sourceMappingURL=use-tunnel.js.map

package/dist/cli/use-tunnel.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-tunnel.js","sourceRoot":"","sources":["../../src/cli/use-tunnel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-tunnel.js","sourceRoot":"","sources":["../../src/cli/use-tunnel.ts"],"names":[],"mappings":"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","sourcesContent":["import { useEffect, useState } from \"react\";\nimport type { PushMessage } from \"./use-messages.js\";\n\nexport type TunnelState =\n  | { status: \"idle\" }\n  | { status: \"starting\"; message: string }\n  | { status: \"connected\"; url: string }\n  | { status: \"error\"; message: string };\n\ntype TunnelActivity = {\n  time: string;\n  text: string;\n  level: \"log\" | \"error\";\n};\n\nconst POST_RETRY_DELAY_MS = 250;\n\nexport function useTunnel(\n  port: number | null,\n  pushMessage: PushMessage,\n  verbose: boolean,\n  autoStart: boolean,\n): TunnelState {\n  const [state, setState] = useState<TunnelState>(\n    port !== null && autoStart\n      ? { status: \"starting\", message: \"Starting tunnel…\" }\n      : { status: \"idle\" },\n  );\n\n  useEffect(() => {\n    if (port === null) {\n      return;\n    }\n\n    const baseUrl = `http://localhost:${port}`;\n    const controller = new AbortController();\n    let cancelled = false;\n\n    const pushLog = (text: string, type: \"log\" | \"error\") => {\n      const time = new Date().toLocaleTimeString(\"en-US\", {\n        hour: \"numeric\",\n        minute: \"2-digit\",\n        second: \"2-digit\",\n        hour12: true,\n      });\n      pushMessage(`${time} [tunnel] ${text}`, type);\n    };\n\n    const handleEvent = (event: string, data: string) => {\n      if (event === \"state\") {\n        const next = JSON.parse(data) as TunnelState;\n        setState(next);\n        return;\n      }\n      if (event === \"activity\") {\n        if (!verbose) {\n          return;\n        }\n        const activity = JSON.parse(data) as TunnelActivity;\n        pushLog(activity.text, activity.level);\n      }\n    };\n\n    const consumeSse = async () => {\n      const res = await fetch(`${baseUrl}/__skybridge/tunnel/events`, {\n        signal: controller.signal,\n        headers: { Accept: \"text/event-stream\" },\n      });\n      if (!res.ok || !res.body) {\n        throw new Error(`SSE connection failed (${res.status})`);\n      }\n\n      const reader = res.body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = \"\";\n\n      while (!cancelled) {\n        const { value, done } = await reader.read();\n        if (done) {\n          return;\n        }\n        buffer += decoder.decode(value, { stream: true });\n\n        // SSE frames are separated by a blank line (\"\\n\\n\").\n        let sep = buffer.indexOf(\"\\n\\n\");\n        while (sep !== -1) {\n          const frame = buffer.slice(0, sep);\n          buffer = buffer.slice(sep + 2);\n          let eventName = \"message\";\n          const dataLines: string[] = [];\n          for (const rawLine of frame.split(\"\\n\")) {\n            const line = rawLine.replace(/\\r$/, \"\");\n            if (line.startsWith(\"event:\")) {\n              eventName = line.slice(6).trim();\n            } else if (line.startsWith(\"data:\")) {\n              dataLines.push(line.slice(5).trimStart());\n            }\n          }\n          if (dataLines.length > 0) {\n            handleEvent(eventName, dataLines.join(\"\\n\"));\n          }\n          sep = buffer.indexOf(\"\\n\\n\");\n        }\n      }\n    };\n\n    const postUntilStarted = async () => {\n      // Retry indefinitely until POST lands once. Bounded by the effect\n      // lifetime via controller.abort() on unmount. Once the manager has\n      // been started, this returns and never POSTs again — a user-driven\n      // DELETE /tunnel won't be auto-undone.\n      while (!cancelled) {\n        try {\n          const res = await fetch(`${baseUrl}/__skybridge/tunnel`, {\n            method: \"POST\",\n            signal: controller.signal,\n          });\n          if (res.ok) {\n            return;\n          }\n        } catch {\n          // dev server not up yet (or restarting under nodemon) — wait, retry\n        }\n        await new Promise((r) => setTimeout(r, POST_RETRY_DELAY_MS));\n      }\n    };\n\n    // Always observe the tunnel state so external triggers (curl, future\n    // devtools UI) update the cli UI. `autoStart` only decides whether we\n    // also POST /tunnel on mount. Reconnects indefinitely so we survive\n    // dev-server boot delay and nodemon restarts; the cli owns the actual\n    // subprocess so a temporarily-unreachable dev server is fine.\n    const observe = async () => {\n      while (!cancelled) {\n        try {\n          await consumeSse();\n        } catch {\n          // network error or stream ended abnormally — fall through to retry\n        }\n        if (cancelled) {\n          return;\n        }\n        await new Promise((r) => setTimeout(r, POST_RETRY_DELAY_MS));\n      }\n    };\n\n    // observe() always runs — it owns the cli's view of tunnel state. POST is\n    // a fire-and-forget side-effect that nudges the manager into starting and\n    // retries until it lands at least once.\n    if (autoStart) {\n      void postUntilStarted();\n    }\n    void observe();\n\n    return () => {\n      cancelled = true;\n      controller.abort();\n    };\n  }, [port, pushMessage, verbose, autoStart]);\n\n  return state;\n}\n"]}

package/dist/cli/use-typescript-check.d.ts

@@ -2,6 +2,7 @@ type TsError = {
     file: string;
     line: number;
     col: number;
+    code: string;
     message: string;
 };
 export declare function useTypeScriptCheck(): Array<TsError>;

package/dist/cli/use-typescript-check.js

@@ -1,6 +1,24 @@
 import { spawn } from "node:child_process";
 import { isAbsolute, relative } from "node:path";
 import { useEffect, useRef, useState } from "react";
+// TypeScript nests from general to specific — the deepest line is the root cause.
+function extractBestMessage(message, continuationLines) {
+    if (!continuationLines.length) {
+        return message;
+    }
+    let maxIndent = 0;
+    for (const line of continuationLines) {
+        const indent = line.length - line.trimStart().length;
+        if (indent > maxIndent) {
+            maxIndent = indent;
+        }
+    }
+    const deepest = continuationLines
+        .filter((l) => l.length - l.trimStart().length === maxIndent)
+        .map((l) => l.trim())
+        .filter(Boolean)[0];
+    return deepest ?? message;
+}
 export function useTypeScriptCheck() {
     const tsProcessRef = useRef(null);
     const [tsErrors, setTsErrors] = useState([]);
@@ -12,31 +30,48 @@ export function useTypeScriptCheck() {
         tsProcessRef.current = tsProcess;
         let outputBuffer = "";
         let currentErrors = [];
+        let pendingError = null;
+        let continuationLines = [];
+        const flushPending = () => {
+            if (!pendingError) {
+                return;
+            }
+            pendingError.message = extractBestMessage(pendingError.message, continuationLines);
+            currentErrors.push(pendingError);
+            pendingError = null;
+            continuationLines = [];
+        };
         const processOutput = (data) => {
             outputBuffer += data.toString();
             const lines = outputBuffer.split("\n");
-            outputBuffer = lines.pop() || ""; // Keep incomplete line in buffer
+            outputBuffer = lines.pop() || "";
             for (const line of lines) {
                 const trimmed = line.trim();
-                // Parse TypeScript error format: file.ts(10,5): error TS2322: message
-                // Match pattern: filename(line,col): error code: message
                 const errorMatch = trimmed.match(/^(.+?)\((\d+),(\d+)\):\s+error\s+(TS\d+)?\s*:?\s*(.+)$/);
                 if (errorMatch) {
-                    const [, file, lineStr, colStr, , message] = errorMatch;
+                    flushPending();
+                    const [, file, lineStr, colStr, code, message] = errorMatch;
                     if (file && lineStr && colStr && message) {
                         let cleanFile = file.trim();
                         if (isAbsolute(cleanFile)) {
                             cleanFile = relative(process.cwd(), cleanFile);
                         }
-                        currentErrors.push({
+                        pendingError = {
                             file: cleanFile,
                             line: Number.parseInt(lineStr, 10),
                             col: Number.parseInt(colStr, 10),
+                            code: code ?? "",
                             message: message.trim(),
-                        });
+                        };
                     }
+                    continue;
+                }
+                if (pendingError && line.startsWith(" ")) {
+                    continuationLines.push(line);
+                    continue;
                 }
                 if (trimmed.includes("Found") && trimmed.includes("error")) {
+                    flushPending();
                     setTsErrors(trimmed.match(/Found 0 error/) ? [] : [...currentErrors]);
                     currentErrors = [];
                 }

package/dist/cli/use-typescript-check.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-typescript-check.js","sourceRoot":"","sources":["../../src/cli/use-typescript-check.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-typescript-check.js","sourceRoot":"","sources":["../../src/cli/use-typescript-check.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn } from \"node:child_process\";\nimport { isAbsolute, relative } from \"node:path\";\nimport { useEffect, useRef, useState } from \"react\";\n\ntype TsError = {\n  file: string;\n  line: number;\n  col: number;\n  code: string;\n  message: string;\n};\n\n// TypeScript nests from general to specific — the deepest line is the root cause.\nfunction extractBestMessage(\n  message: string,\n  continuationLines: Array<string>,\n): string {\n  if (!continuationLines.length) {\n    return message;\n  }\n  let maxIndent = 0;\n  for (const line of continuationLines) {\n    const indent = line.length - line.trimStart().length;\n    if (indent > maxIndent) {\n      maxIndent = indent;\n    }\n  }\n  const deepest = continuationLines\n    .filter((l) => l.length - l.trimStart().length === maxIndent)\n    .map((l) => l.trim())\n    .filter(Boolean)[0];\n  return deepest ?? message;\n}\n\nexport function useTypeScriptCheck(): Array<TsError> {\n  const tsProcessRef = useRef<ReturnType<typeof spawn> | null>(null);\n  const [tsErrors, setTsErrors] = useState<Array<TsError>>([]);\n\n  useEffect(() => {\n    const tsProcess = spawn(\n      \"npx\",\n      [\"tsc\", \"--noEmit\", \"--watch\", \"--pretty\", \"false\"],\n      {\n        stdio: [\"ignore\", \"pipe\", \"pipe\"],\n        shell: true,\n      },\n    );\n\n    tsProcessRef.current = tsProcess;\n\n    let outputBuffer = \"\";\n    let currentErrors: Array<TsError> = [];\n    let pendingError: TsError | null = null;\n    let continuationLines: Array<string> = [];\n\n    const flushPending = () => {\n      if (!pendingError) {\n        return;\n      }\n      pendingError.message = extractBestMessage(\n        pendingError.message,\n        continuationLines,\n      );\n      currentErrors.push(pendingError);\n      pendingError = null;\n      continuationLines = [];\n    };\n\n    const processOutput = (data: Buffer) => {\n      outputBuffer += data.toString();\n      const lines = outputBuffer.split(\"\\n\");\n      outputBuffer = lines.pop() || \"\";\n\n      for (const line of lines) {\n        const trimmed = line.trim();\n\n        const errorMatch = trimmed.match(\n          /^(.+?)\\((\\d+),(\\d+)\\):\\s+error\\s+(TS\\d+)?\\s*:?\\s*(.+)$/,\n        );\n        if (errorMatch) {\n          flushPending();\n          const [, file, lineStr, colStr, code, message] = errorMatch;\n          if (file && lineStr && colStr && message) {\n            let cleanFile = file.trim();\n            if (isAbsolute(cleanFile)) {\n              cleanFile = relative(process.cwd(), cleanFile);\n            }\n            pendingError = {\n              file: cleanFile,\n              line: Number.parseInt(lineStr, 10),\n              col: Number.parseInt(colStr, 10),\n              code: code ?? \"\",\n              message: message.trim(),\n            };\n          }\n          continue;\n        }\n\n        if (pendingError && line.startsWith(\" \")) {\n          continuationLines.push(line);\n          continue;\n        }\n\n        if (trimmed.includes(\"Found\") && trimmed.includes(\"error\")) {\n          flushPending();\n          setTsErrors(trimmed.match(/Found 0 error/) ? [] : [...currentErrors]);\n          currentErrors = [];\n        }\n      }\n    };\n\n    if (tsProcess.stdout) {\n      tsProcess.stdout.on(\"data\", processOutput);\n    }\n    if (tsProcess.stderr) {\n      tsProcess.stderr.on(\"data\", processOutput);\n    }\n\n    return () => {\n      if (tsProcessRef.current) {\n        tsProcessRef.current.kill();\n      }\n    };\n  }, []);\n\n  return tsErrors;\n}\n"]}

package/dist/commands/build.js

@@ -1,27 +1,83 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { cpSync, rmSync } from "node:fs";
+import { readFileSync, rmSync, writeFileSync } from "node:fs";
+import path from "node:path";
 import { Command } from "@oclif/core";
 import { Box, render, Text } from "ink";
 import { useEffect } from "react";
 import { Header } from "../cli/header.js";
 import { useExecuteSteps } from "../cli/use-execute-steps.js";
+import { scanAndWriteViewsDts } from "../web/plugin/scan-views.js";
+async function resolveViewsDir(root) {
+    const { loadConfigFromFile } = await import("vite");
+    const loaded = await loadConfigFromFile({ command: "build", mode: "production" }, undefined, root);
+    const isPluginCandidate = (value) => typeof value === "object" && value !== null;
+    const plugins = [];
+    const walk = (value) => {
+        if (Array.isArray(value)) {
+            value.forEach(walk);
+        }
+        else if (isPluginCandidate(value)) {
+            plugins.push(value);
+        }
+    };
+    walk(loaded?.config.plugins ?? []);
+    return plugins.find((p) => p.name === "skybridge")?.api?.viewsDir;
+}
 export const commandSteps = [
     {
-        label: "Building widgets",
-        command: "vite build -c web/vite.config.ts",
+        label: "Scanning views",
+        run: async () => {
+            const root = process.cwd();
+            const viewsDir = await resolveViewsDir(root);
+            scanAndWriteViewsDts(root, viewsDir);
+        },
     },
     {
         label: "Compiling server",
         run: () => rmSync("dist", { recursive: true, force: true }),
-        command: "tsc -b",
+        command: "tsc -b --force",
+    },
+    {
+        label: "Building views",
+        command: "vite build",
+    },
+    {
+        label: "Emitting manifest module",
+        // Inline the Vite manifest as a JS module so the server can `import` it
+        // instead of `readFileSync(process.cwd() + ...)` at runtime — required for
+        // workerd, where neither cwd nor the assets directory is readable.
+        // The path mirrors `skybridge start`'s entry convention (dist/server.js)
+        // so the import in the user's entry resolves to a sibling file.
+        run: () => {
+            const root = process.cwd();
+            const manifest = readFileSync(path.join(root, "dist", "assets", ".vite", "manifest.json"), "utf-8");
+            writeFileSync(path.join(root, "dist", "vite-manifest.js"), `export default ${manifest};\n`);
+        },
+    },
+    {
+        label: "Emitting Cloudflare redirects",
+        // Cloudflare's `assets.directory` maps URL → file literally — no
+        // mount-strip like `app.use("/assets", express.static(...))`. Rewrite
+        // `/assets/assets/*` to `/assets/*` before lookup; status 200 =
+        // server-side rewrite, not HTTP redirect.
+        run: () => {
+            const root = process.cwd();
+            writeFileSync(path.join(root, "dist", "assets", "_redirects"), "/assets/assets/* /assets/:splat 200\n");
+        },
     },
     {
-        label: "Copying static assets",
-        run: () => cpSync("web/dist", "dist/assets", { recursive: true }),
+        label: "Emitting Cloudflare headers",
+        // Cloudflare's static asset handler bypasses the worker entirely, so
+        // `app.use("/assets", cors())` never fires for asset requests. Attach
+        // CORS at the edge so cross-origin view iframes can load JS/CSS.
+        run: () => {
+            const root = process.cwd();
+            writeFileSync(path.join(root, "dist", "assets", "_headers"), "/assets/*\n  Access-Control-Allow-Origin: *\n");
+        },
     },
 ];
 export default class Build extends Command {
-    static description = "Build the widgets and MCP server";
+    static description = "Build the views and MCP server";
     static examples = ["skybridge build"];
     static flags = {};
     async run() {

package/dist/commands/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.tsx"],"names":[],"mappings":"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","sourcesContent":["import { readFileSync, rmSync, writeFileSync } from \"node:fs\";\nimport path from \"node:path\";\nimport { Command } from \"@oclif/core\";\nimport { Box, render, Text } from \"ink\";\nimport { useEffect } from \"react\";\nimport { Header } from \"../cli/header.js\";\nimport { type CommandStep, useExecuteSteps } from \"../cli/use-execute-steps.js\";\nimport { scanAndWriteViewsDts } from \"../web/plugin/scan-views.js\";\n\nasync function resolveViewsDir(root: string): Promise<string | undefined> {\n  const { loadConfigFromFile } = await import(\"vite\");\n  const loaded = await loadConfigFromFile(\n    { command: \"build\", mode: \"production\" },\n    undefined,\n    root,\n  );\n\n  const isPluginCandidate = (\n    value: unknown,\n  ): value is { name?: string; api?: { viewsDir?: string } } =>\n    typeof value === \"object\" && value !== null;\n\n  const plugins: Array<{ name?: string; api?: { viewsDir?: string } }> = [];\n  const walk = (value: unknown) => {\n    if (Array.isArray(value)) {\n      value.forEach(walk);\n    } else if (isPluginCandidate(value)) {\n      plugins.push(value);\n    }\n  };\n  walk(loaded?.config.plugins ?? []);\n  return plugins.find((p) => p.name === \"skybridge\")?.api?.viewsDir;\n}\n\nexport const commandSteps: CommandStep[] = [\n  {\n    label: \"Scanning views\",\n    run: async () => {\n      const root = process.cwd();\n      const viewsDir = await resolveViewsDir(root);\n      scanAndWriteViewsDts(root, viewsDir);\n    },\n  },\n  {\n    label: \"Compiling server\",\n    run: () => rmSync(\"dist\", { recursive: true, force: true }),\n    command: \"tsc -b --force\",\n  },\n  {\n    label: \"Building views\",\n    command: \"vite build\",\n  },\n  {\n    label: \"Emitting manifest module\",\n    // Inline the Vite manifest as a JS module so the server can `import` it\n    // instead of `readFileSync(process.cwd() + ...)` at runtime — required for\n    // workerd, where neither cwd nor the assets directory is readable.\n    // The path mirrors `skybridge start`'s entry convention (dist/server.js)\n    // so the import in the user's entry resolves to a sibling file.\n    run: () => {\n      const root = process.cwd();\n      const manifest = readFileSync(\n        path.join(root, \"dist\", \"assets\", \".vite\", \"manifest.json\"),\n        \"utf-8\",\n      );\n      writeFileSync(\n        path.join(root, \"dist\", \"vite-manifest.js\"),\n        `export default ${manifest};\\n`,\n      );\n    },\n  },\n\n  {\n    label: \"Emitting Cloudflare redirects\",\n    // Cloudflare's `assets.directory` maps URL → file literally — no\n    // mount-strip like `app.use(\"/assets\", express.static(...))`. Rewrite\n    // `/assets/assets/*` to `/assets/*` before lookup; status 200 =\n    // server-side rewrite, not HTTP redirect.\n    run: () => {\n      const root = process.cwd();\n      writeFileSync(\n        path.join(root, \"dist\", \"assets\", \"_redirects\"),\n        \"/assets/assets/* /assets/:splat 200\\n\",\n      );\n    },\n  },\n  {\n    label: \"Emitting Cloudflare headers\",\n    // Cloudflare's static asset handler bypasses the worker entirely, so\n    // `app.use(\"/assets\", cors())` never fires for asset requests. Attach\n    // CORS at the edge so cross-origin view iframes can load JS/CSS.\n    run: () => {\n      const root = process.cwd();\n      writeFileSync(\n        path.join(root, \"dist\", \"assets\", \"_headers\"),\n        \"/assets/*\\n  Access-Control-Allow-Origin: *\\n\",\n      );\n    },\n  },\n];\n\nexport default class Build extends Command {\n  static override description = \"Build the views and MCP server\";\n  static override examples = [\"skybridge build\"];\n  static override flags = {};\n\n  public async run(): Promise<void> {\n    const App = () => {\n      const { currentStep, status, error, execute } =\n        useExecuteSteps(commandSteps);\n\n      useEffect(() => {\n        execute();\n      }, [execute]);\n\n      return (\n        <Box flexDirection=\"column\" padding={1}>\n          <Header version={this.config.version}>\n            <Text color=\"green\"> → building for production…</Text>\n          </Header>\n\n          {commandSteps.map((step, index) => {\n            const isCurrent = index === currentStep && status === \"running\";\n            const isCompleted = index < currentStep || status === \"success\";\n            const isError = status === \"error\" && index === currentStep;\n\n            return (\n              <Box key={step.label} marginBottom={0}>\n                <Text color={isError ? \"red\" : isCompleted ? \"green\" : \"grey\"}>\n                  {isError ? \"✗\" : isCompleted ? \"✓\" : isCurrent ? \"⟳\" : \"○\"}{\" \"}\n                  {step.label}\n                </Text>\n              </Box>\n            );\n          })}\n\n          {status === \"success\" && (\n            <Box marginTop={1}>\n              <Text color=\"green\" bold>\n                ✓ Build completed successfully!\n              </Text>\n            </Box>\n          )}\n\n          {status === \"error\" && error && (\n            <Box marginTop={1} flexDirection=\"column\">\n              <Text color=\"red\" bold>\n                ✗ Build failed\n              </Text>\n              <Box marginTop={1} flexDirection=\"column\">\n                {error.split(\"\\n\").map((line) => (\n                  <Text key={line} color=\"red\">\n                    {line}\n                  </Text>\n                ))}\n              </Box>\n            </Box>\n          )}\n        </Box>\n      );\n    };\n\n    render(<App />, {\n      exitOnCtrlC: true,\n      patchConsole: false,\n    });\n  }\n}\n"]}

package/dist/commands/dev.d.ts

@@ -5,6 +5,8 @@ export default class Dev extends Command {
     static flags: {
         port: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
         tunnel: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        open: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/dev.js

@@ -1,10 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Command, Flags } from "@oclif/core";
 import { Box, render, Text } from "ink";
-import { useMemo } from "react";
 import { resolvePort } from "../cli/detect-port.js";
 import { Header } from "../cli/header.js";
+import { startTunnelControlServer } from "../cli/tunnel-control-server.js";
+import { useMessages } from "../cli/use-messages.js";
 import { useNodemon } from "../cli/use-nodemon.js";
+import { useOpenBrowser } from "../cli/use-open-browser.js";
 import { useTunnel } from "../cli/use-tunnel.js";
 import { useTypeScriptCheck } from "../cli/use-typescript-check.js";
 export default class Dev extends Command {
@@ -20,6 +22,16 @@ export default class Dev extends Command {
             description: "Open an Alpic tunnel for remote testing",
             default: false,
         }),
+        open: Flags.boolean({
+            description: "Open DevTools in the browser when the server is ready",
+            default: process.env.SKYBRIDGE_OPEN !== "false",
+            allowNo: true,
+        }),
+        verbose: Flags.boolean({
+            char: "v",
+            description: "Show tunnel logs",
+            default: false,
+        }),
     };
     async run() {
         const { flags } = await this.parse(Dev);
@@ -27,18 +39,42 @@ export default class Dev extends Command {
         if (envWarning) {
             this.warn(envWarning);
         }
+        const { port: controlPort, manager: tunnelManager, close: closeTunnelControl, } = await startTunnelControlServer(() => port);
         const env = {
             ...process.env,
             __PORT: String(port),
+            __TUNNEL_CONTROL_PORT: String(controlPort),
         };
         const App = () => {
             const tsErrors = useTypeScriptCheck();
-            const nodemonMessages = useNodemon(env);
-            const tunnelState = useTunnel(flags.tunnel ? port : null);
-            const messages = useMemo(() => [...nodemonMessages, ...tunnelState.logs].slice(-10), [nodemonMessages, tunnelState.logs]);
-            return (_jsxs(Box, { flexDirection: "column", padding: 1, marginLeft: 1, children: [_jsx(Header, { version: this.config.version }), fallback && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: "yellow", children: ["Port 3000 is in use, falling back to port ", port] }) })), _jsxs(Box, { marginBottom: 1, children: [_jsxs(Text, { color: "green", children: ["\u2192", "  "] }), _jsxs(Text, { color: "white", bold: true, children: ["Open DevTools to test your app locally:", " "] }), _jsx(Text, { color: "green", children: `http://localhost:${port}/` })] }), _jsxs(Box, { marginBottom: 1, children: [_jsxs(Text, { color: "#20a832", children: ["\u2192", "  "] }), _jsxs(Text, { children: ["MCP server running at:", "  "] }), _jsx(Text, { color: "white", bold: true, children: `http://localhost:${port}/mcp` })] }), _jsx(Box, { marginBottom: 1, children: _jsxs(Text, { children: [_jsxs(Text, { color: "#20a832", children: ["\u2192", "  "] }), _jsx(Text, { children: "If you like Skybridge, please " }), _jsxs(Text, { color: "white", bold: true, children: ["give it a star", " "] }), _jsx(Text, { children: "on GitHub: " }), _jsx(Text, { color: "white", underline: true, children: "https://github.com/alpic-ai/skybridge" }), _jsx(Text, { color: "grey", children: " \uD83D\uDE4F" })] }) }), flags.tunnel ? (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: "#20a832", children: "→  " }), _jsxs(Text, { color: tunnelState.labelColor, children: ["Tunnel: ", tunnelState.label] })] })) : (_jsxs(_Fragment, { children: [_jsx(Box, { children: _jsxs(Text, { children: [_jsx(Text, { color: "#20a832", children: "→  " }), _jsxs(Text, { children: ["Get a public URL to test on ChatGPT or Claude with the", " "] }), _jsx(Text, { color: "cyan", bold: true, children: "--tunnel" }), _jsx(Text, { children: " flag." })] }) }), _jsx(Box, { children: _jsxs(Text, { color: "grey", children: ["   ", "More info: https://docs.skybridge.tech/quickstart/test-your-app"] }) })] })), tsErrors.length > 0 && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: "red", bold: true, children: "\u26A0\uFE0F TypeScript errors found:" }), tsErrors.map((error) => (_jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: "white", children: error.file }), _jsxs(Text, { color: "grey", children: ["(", error.line, ",", error.col, "):", " "] })] }), _jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: "red", children: error.message }) })] }, `${error.file}:${error.line}:${error.col}`)))] })), messages.length > 0 && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: "white", bold: true, children: "Logs:" }), messages.map((message) => (_jsx(Box, { marginLeft: 2, children: message.type === "restart" ? (_jsxs(_Fragment, { children: [_jsxs(Text, { color: "green", children: ["\u2713", "  "] }), _jsx(Text, { color: "white", children: message.text })] })) : message.type === "error" ? (_jsx(Text, { color: "red", children: message.text })) : (_jsx(Text, { children: message.text })) }, message.id)))] }))] }));
+            const [messages, pushMessage] = useMessages();
+            useNodemon(env, pushMessage);
+            useOpenBrowser(port, flags.open);
+            const tunnelState = useTunnel(port, pushMessage, flags.verbose, flags.tunnel);
+            return (_jsxs(Box, { flexDirection: "column", padding: 1, marginLeft: 1, children: [_jsx(Header, { version: this.config.version }), _jsxs(Box, { children: [_jsxs(Text, { children: ["\uD83C\uDFE0", "  "] }), fallback ? (_jsx(Text, { color: "yellow", children: "3000 in use, running on " })) : (_jsx(Text, { children: "Running on " })), _jsx(Text, { color: "green", children: `http://localhost:${port}/mcp` })] }), _jsxs(Box, { marginBottom: 1, children: [_jsxs(Text, { color: "#20a832", children: ["\u2192", "  "] }), _jsxs(Text, { color: "white", bold: true, children: ["Test locally with DevTools:", " "] }), _jsx(Text, { color: "green", children: `http://localhost:${port}/` })] }), tunnelState.status === "idle" && (_jsxs(Box, { children: [_jsxs(Text, { children: ["\uD83C\uDF0D", "  "] }), _jsx(Text, { children: "Get a public URL and LLM Playground access with " }), _jsx(Text, { color: "cyan", bold: true, children: "--tunnel" }), _jsx(Text, { children: "." })] })), tunnelState.status === "starting" && (_jsxs(Box, { children: [_jsxs(Text, { children: ["\uD83C\uDF0D", "  "] }), _jsx(Text, { color: "yellow", children: tunnelState.message })] })), tunnelState.status === "connected" && (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsxs(Text, { children: ["\uD83C\uDF0D", "  "] }), _jsx(Text, { children: "Exposed on " }), _jsx(Text, { color: "green", children: `${tunnelState.url}/mcp` })] }), _jsxs(Box, { children: [_jsxs(Text, { color: "#20a832", children: ["\u2192", "  "] }), _jsxs(Text, { color: "white", bold: true, children: ["Test with an LLM on Playground:", " "] }), _jsx(Text, { color: "green", children: `${tunnelState.url}/try` })] })] })), tunnelState.status === "error" && (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsxs(Text, { children: ["\uD83C\uDF0D", "  "] }), _jsxs(Text, { color: "red", children: ["Cannot open tunnel: ", tunnelState.message] })] }), _jsxs(Box, { children: [_jsxs(Text, { color: "#20a832", children: ["\u2192", "  "] }), _jsx(Text, { color: "red", children: `Try manually: npx alpic tunnel --port ${port}` })] })] })), _jsxs(Box, { children: [_jsxs(Text, { children: ["\uD83D\uDEDF", "  "] }), _jsx(Text, { children: "Need help? Reach us on " }), _jsx(Text, { color: "white", underline: true, children: "https://discord.alpic.ai" })] }), tsErrors.length > 0 && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: "red", bold: true, children: "\u26A0\uFE0F TypeScript errors found:" }), tsErrors.map((error) => (_jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: "white", children: error.file }), _jsxs(Text, { color: "grey", children: ["(", error.line, ",", error.col, "):", " "] })] }), _jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: "red", children: error.message }) })] }, `${error.file}:${error.line}:${error.col}`)))] })), messages.length > 0 && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: "white", bold: true, children: "Logs:" }), messages.map((message) => (_jsx(Box, { marginLeft: 2, children: message.type === "restart" ? (_jsxs(_Fragment, { children: [_jsxs(Text, { color: "green", children: ["\u2713", "  "] }), _jsx(Text, { color: "white", children: message.text })] })) : message.type === "error" ? (_jsx(Text, { color: "red", children: message.text })) : (_jsx(Text, { children: message.text })) }, message.id)))] }))] }));
+        };
+        // Note: `exitOnCtrlC: false` because we own SIGINT below to guarantee
+        // alpic gets killed before we exit. If anything ever calls `useInput` or
+        // puts stdin into raw mode, also wire an explicit `\x03` keypress to the
+        // shutdown function — Ink will otherwise swallow Ctrl-C without ever
+        // delivering SIGINT.
+        const ink = render(_jsx(App, {}), { exitOnCtrlC: false, patchConsole: true });
+        // Synchronous-first shutdown: kill the alpic subprocess up front so we
+        // can't leave it orphaned even if another SIGINT listener (e.g. nodemon's)
+        // exits the process before our async cleanup completes.
+        const shutdown = (code) => () => {
+            tunnelManager.stop();
+            void closeTunnelControl()
+                .catch((err) => {
+                console.error("Failed to close tunnel control server", err);
+            })
+                .finally(() => {
+                ink.unmount();
+                process.exit(code);
+            });
         };
-        render(_jsx(App, {}), { exitOnCtrlC: true, patchConsole: true });
+        process.once("SIGINT", shutdown(130));
+        process.once("SIGTERM", shutdown(143));
     }
 }
 //# sourceMappingURL=dev.js.map