@docyrus/docyrus 0.0.57 → 0.0.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docyrus/docyrus",
-  "version": "0.0.57",
+  "version": "0.0.59",
   "private": false,
   "description": "Docyrus API CLI",
   "main": "./main.js",

package/server-loader.js

@@ -43378,23 +43378,39 @@ function attachPtyBridge(server, authToken) {
         return;
       }
     }
+    const origin = request.headers.origin ?? "unknown";
+    const remoteAddr = request.socket?.remoteAddress ?? "unknown";
+    process.stderr.write(`  PTY WebSocket upgrade from ${remoteAddr} (origin: ${origin})
+`);
     wss.handleUpgrade(request, socket, head, (ws) => {
       wss.emit("connection", ws, request);
     });
   });
   wss.on("connection", (ws) => {
     const shell = getDefaultShell();
-    const ptyProcess = pty.spawn(shell, [], {
-      name: "xterm-256color",
-      cols: DEFAULT_COLS,
-      rows: DEFAULT_ROWS,
-      cwd: process.cwd(),
-      env: {
-        ...process.env,
-        TERM: "xterm-256color",
-        COLORTERM: "truecolor"
+    let ptyProcess;
+    try {
+      ptyProcess = pty.spawn(shell, [], {
+        name: "xterm-256color",
+        cols: DEFAULT_COLS,
+        rows: DEFAULT_ROWS,
+        cwd: process.cwd(),
+        env: {
+          ...process.env,
+          TERM: "xterm-256color",
+          COLORTERM: "truecolor"
+        }
+      });
+    } catch (err2) {
+      const message = err2 instanceof Error ? err2.message : String(err2);
+      process.stderr.write(`  PTY spawn failed (${shell}): ${message}
+`);
+      if (ws.readyState === import_websocket.default.OPEN) {
+        ws.send(JSON.stringify({ type: "error", message: `Failed to spawn shell: ${message}` }));
+        ws.close();
       }
-    });
+      return;
+    }
     const onData = ptyProcess.onData((data) => {
       if (ws.readyState === import_websocket.default.OPEN) {
         ws.send(data);
@@ -45657,14 +45673,11 @@ async function createAgentServer(params) {
       return c.json({ error: message }, status);
     }
   });
-  const CLI_EXEC = process.env.DOCYRUS_CLI_EXECUTABLE || process.execPath;
-  const CLI_ENTRY = process.env.DOCYRUS_CLI_ENTRY || (0, import_node_path22.resolve)(process.argv[1] ? (0, import_node_path22.join)(process.argv[1], "..") : __dirname, "main.js");
-  const CLI_SCOPE = process.env.DOCYRUS_CLI_SCOPE;
+  const CLI_GLOBAL = process.env.DOCYRUS_CLI_SCOPE === "global";
   const CLI_TIMEOUT_MS = 3e4;
   function runCliCommand(args2) {
     return new Promise((resolveResult) => {
-      const scopeArgs = CLI_SCOPE ? ["--scope", CLI_SCOPE] : [];
-      const proc = (0, import_node_child_process3.spawn)(CLI_EXEC, [CLI_ENTRY, ...scopeArgs, ...args2, "--json"], {
+      const proc = (0, import_node_child_process3.spawn)("docyrus", [...CLI_GLOBAL ? ["-g"] : [], ...args2, "--json"], {
         cwd: context.cwd,
         stdio: ["ignore", "pipe", "pipe"],
         timeout: CLI_TIMEOUT_MS
@@ -45696,6 +45709,7 @@ async function createAgentServer(params) {
   let devProcess = null;
   let devUrl = null;
   const DEV_URL_PATTERN = /https?:\/\/(?:localhost|127\.0\.0\.1):\d+/;
+  const ANSI_ESCAPE_PATTERN = /\x1b\[[0-9;]*[a-zA-Z]/g;
   const DEV_STARTUP_TIMEOUT_MS = 3e4;
   const DEV_PROBE_TIMEOUT_MS = 3e3;
   async function probeUrl(url2) {
@@ -45858,9 +45872,19 @@ async function createAgentServer(params) {
     }
     return c.json({ status: "stopped", url: null, managed: false, project, env, docyrusCliVersion });
   });
-  app.post("/api/env/serve", (c) => {
+  app.post("/api/env/serve", async (c) => {
     if (devProcess && devProcess.exitCode === null) {
-      return c.json({ status: "running", url: devUrl });
+      if (!devUrl) {
+        const detected = await detectDevPort(context.cwd);
+        if (detected) {
+          const probeTarget = `http://localhost:${detected}`;
+          const httpStatus = await probeUrl(probeTarget);
+          if (httpStatus !== null) {
+            devUrl = probeTarget;
+          }
+        }
+      }
+      return c.json({ status: devUrl ? "running" : "starting", url: devUrl });
     }
     devUrl = null;
     const proc = (0, import_node_child_process3.spawn)("pnpm", ["dev"], {
@@ -45880,7 +45904,8 @@ async function createAgentServer(params) {
         resolveResponse(response);
       }
       function checkOutput(text3) {
-        const match2 = text3.match(DEV_URL_PATTERN);
+        const clean = text3.replace(ANSI_ESCAPE_PATTERN, "");
+        const match2 = clean.match(DEV_URL_PATTERN);
         if (match2) {
           devUrl = match2[0];
           settle(c.json({ status: "running", url: devUrl }));
@@ -45898,7 +45923,20 @@ async function createAgentServer(params) {
       proc.on("error", (err2) => {
         settle(c.json({ status: "error", error: err2.message }, 500));
       });
-      setTimeout(() => {
+      setTimeout(async () => {
+        if (resolved) {
+          return;
+        }
+        const detected = await detectDevPort(context.cwd);
+        if (detected) {
+          const probeTarget = `http://localhost:${detected}`;
+          const httpStatus = await probeUrl(probeTarget);
+          if (httpStatus !== null) {
+            devUrl = probeTarget;
+            settle(c.json({ status: "running", url: devUrl }));
+            return;
+          }
+        }
         settle(c.json({ status: "error", error: stderr || "Timed out waiting for dev server URL" }, 500));
       }, DEV_STARTUP_TIMEOUT_MS);
     });
@@ -46313,8 +46351,7 @@ async function createAgentServer(params) {
     }
     const cliArgs = buildCliArgs(pathSegments, query, body2);
     return new Promise((resolveResponse) => {
-      const scopeArgs = CLI_SCOPE ? ["--scope", CLI_SCOPE] : [];
-      const proc = (0, import_node_child_process3.spawn)(CLI_EXEC, [CLI_ENTRY, ...scopeArgs, ...cliArgs], {
+      const proc = (0, import_node_child_process3.spawn)("docyrus", [...CLI_GLOBAL ? ["-g"] : [], ...cliArgs], {
         cwd: context.cwd,
         stdio: ["ignore", "pipe", "pipe"],
         timeout: CLI_TIMEOUT_MS
@@ -46329,10 +46366,16 @@ async function createAgentServer(params) {
       });
       proc.on("close", (code) => {
         if (code !== 0) {
+          let parsedStdout;
+          try {
+            parsedStdout = JSON.parse(stdout);
+          } catch {
+          }
           resolveResponse(c.json({
             error: stderr.trim() || `Command exited with code ${code}`,
             command: `docyrus ${cliArgs.join(" ")}`,
-            exitCode: code
+            exitCode: code,
+            ...parsedStdout !== void 0 ? { detail: parsedStdout } : stdout.trim() ? { output: stdout.trim() } : {}
           }, 500));
           return;
         }