npm - @marina-cloud/cli - Versions diffs - 0.0.1 → 0.0.3 - Mend

@marina-cloud/cli 0.0.1 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/README.md CHANGED Viewed

@@ -2,6 +2,9 @@
 Deploy small internal apps to Marina Cloud.
+Source code and Marina's deployment skill live in the
+[marina-hq/marina](https://github.com/marina-hq/marina) repository.
 ```sh
 npm install -g @marina-cloud/cli
 marina setup
@@ -16,8 +19,7 @@ The saved credential lives in `~/.marina/profile` with user-only permissions.
 Use `marina profile` to inspect the active profile and `marina logout` to remove
 its credential.
-Setup automatically installs Marina's deployment skill when Codex or Claude is
-detected. Install or refresh it explicitly with:
+Install Marina deployment skills with:
 ```sh
 marina skills install

package/dist/marina.mjs CHANGED Viewed

@@ -75,6 +75,7 @@ function writeLink(dir, link) {
 }
 // src/api.ts
+var LOGIN_EXCHANGE_TIMEOUT_MS = 15e3;
 var ApiError = class extends Error {
   code;
   status;
@@ -102,11 +103,24 @@ async function request(path, init) {
   return body;
 }
 async function exchangeCliLogin(code, codeVerifier) {
-  const res = await fetch(`${apiUrl()}/cli/auth/exchange`, {
-    method: "POST",
-    headers: { "content-type": "application/json" },
-    body: JSON.stringify({ code, code_verifier: codeVerifier })
-  });
+  let res;
+  try {
+    res = await fetch(`${apiUrl()}/cli/auth/exchange`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ code, code_verifier: codeVerifier }),
+      signal: AbortSignal.timeout(LOGIN_EXCHANGE_TIMEOUT_MS)
+    });
+  } catch (error) {
+    if (error.name === "TimeoutError") {
+      throw new ApiError(
+        "login_timeout",
+        "the login confirmation request timed out after 15 seconds \u2014 run `marina setup` to try again",
+        408
+      );
+    }
+    throw error;
+  }
   const body = await res.json().catch(() => ({}));
   if (!res.ok || !body.token) {
     throw new ApiError(
@@ -133,9 +147,10 @@ async function startDeploy(zip, name, app) {
   });
   return res.deploy;
 }
-async function pollDeploy(id) {
+async function pollDeploy(id, onProgress = () => void 0) {
   for (; ; ) {
     const { deploy: deploy2 } = await request(`/v1/deploys/${id}`);
+    onProgress(deploy2);
     if (deploy2.status !== "queued" && deploy2.status !== "building") return deploy2;
     await new Promise((resolve2) => setTimeout(resolve2, 500));
   }
@@ -1414,22 +1429,53 @@ import { spawn } from "node:child_process";
 import { createServer } from "node:http";
 import { hostname } from "node:os";
 var LOGIN_TIMEOUT_MS = 5 * 6e4;
+var PROGRESS_INTERVAL_MS = 1e3;
 var page = (title, message) => `<!doctype html>
 <html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width">
 <title>${title}</title><style>
 body{margin:0;display:grid;place-items:center;min-height:100vh;font:15px/1.5 system-ui,sans-serif;color:#142238;background:#faf9f7}
 main{text-align:center;padding:32px}h1{font-size:22px;margin:0 0 6px}p{margin:0;color:#667085}
 </style></head><body><main><h1>${title}</h1><p>${message}</p></main></body></html>`;
-var closeServer = (server) => new Promise((resolve2) => server.close(() => resolve2()));
+var closeLoginServer = (server) => new Promise((resolve2) => {
+  server.close(() => resolve2());
+  server.closeAllConnections();
+});
 function openBrowser(url) {
   const command = process.platform === "darwin" ? "open" : process.platform === "win32" ? "explorer.exe" : "xdg-open";
   const child = spawn(command, [url], { detached: true, stdio: "ignore" });
   child.on("error", () => void 0);
   child.unref();
 }
-function callbackCode(server, expectedState) {
+function timeoutLabel(timeoutMs) {
+  if (timeoutMs % 6e4 === 0) {
+    const minutes = timeoutMs / 6e4;
+    return `${String(minutes)} minute${minutes === 1 ? "" : "s"}`;
+  }
+  const seconds = Math.ceil(timeoutMs / 1e3);
+  return `${String(seconds)} second${seconds === 1 ? "" : "s"}`;
+}
+function waitForLoginCallback(server, expectedState, onProgress, timeoutMs = LOGIN_TIMEOUT_MS) {
   return new Promise((resolve2, reject) => {
-    const timer = setTimeout(() => reject(new Error("browser login timed out")), LOGIN_TIMEOUT_MS);
+    const startedAt = Date.now();
+    const waiting = () => {
+      const elapsedMs = Date.now() - startedAt;
+      onProgress({
+        phase: "waiting",
+        elapsedMs,
+        remainingMs: Math.max(0, timeoutMs - elapsedMs)
+      });
+    };
+    waiting();
+    const progress = setInterval(waiting, PROGRESS_INTERVAL_MS);
+    progress.unref();
+    const timer = setTimeout(() => {
+      clearInterval(progress);
+      reject(
+        new Error(
+          `browser login timed out after ${timeoutLabel(timeoutMs)} \u2014 run \`marina setup\` to try again`
+        )
+      );
+    }, timeoutMs);
     timer.unref();
     server.on("request", (request2, response) => {
       const url = new URL(request2.url ?? "/", "http://127.0.0.1");
@@ -1439,6 +1485,7 @@ function callbackCode(server, expectedState) {
       }
       response.setHeader("cache-control", "no-store");
       response.setHeader("content-type", "text/html; charset=utf-8");
+      response.setHeader("connection", "close");
       const state = url.searchParams.get("state");
       const code = url.searchParams.get("code");
       const error = url.searchParams.get("error");
@@ -1448,6 +1495,7 @@ function callbackCode(server, expectedState) {
         return;
       }
       clearTimeout(timer);
+      clearInterval(progress);
       if (error || !code) {
         response.writeHead(400);
         response.end(
@@ -1460,6 +1508,7 @@ function callbackCode(server, expectedState) {
         );
         return;
       }
+      onProgress({ phase: "received" });
       response.writeHead(200);
       response.end(
         page("Marina CLI is signed in", "You can close this window and return to the terminal."),
@@ -1468,7 +1517,7 @@ function callbackCode(server, expectedState) {
     });
   });
 }
-async function loginWithBrowser(onOpen) {
+async function loginWithBrowser(onOpen, onProgress = () => void 0) {
   const verifier = randomBytes(32).toString("base64url");
   const challenge = createHash("sha256").update(verifier).digest("base64url");
   const state = randomBytes(32).toString("base64url");
@@ -1489,13 +1538,13 @@ async function loginWithBrowser(onOpen) {
       "device_name",
       `Marina CLI on ${hostname().split(".")[0]}`.slice(0, 80)
     );
-    const codePromise = callbackCode(server, state);
+    const codePromise = waitForLoginCallback(server, state, onProgress);
     onOpen(authorize.toString());
     openBrowser(authorize.toString());
     const code = await codePromise;
     return await exchangeCliLogin(code, verifier);
   } finally {
-    await closeServer(server);
+    await closeLoginServer(server);
   }
 }
@@ -1516,6 +1565,28 @@ function say(line = "") {
 function note(line) {
   console.error(line);
 }
+function createProgress() {
+  let active = false;
+  let lastPhase = null;
+  let frame = 0;
+  const frames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+  const interactive = process.stderr.isTTY === true && !json;
+  return {
+    update(phase, line) {
+      if (interactive) {
+        process.stderr.write(`\r\x1B[2K${frames[frame++ % frames.length]} ${line}`);
+        active = true;
+      } else if (phase !== lastPhase) {
+        console.error(json ? JSON.stringify({ type: "progress", phase, message: line }) : line);
+      }
+      lastPhase = phase;
+    },
+    clear() {
+      if (active) process.stderr.write("\r\x1B[2K");
+      active = false;
+    }
+  };
+}
 function result(payload) {
   if (json) console.log(JSON.stringify({ schema_version: 1, ok: true, ...payload }, null, 2));
 }
@@ -1690,21 +1761,6 @@ function install(target, update) {
     status: existing === null ? "installed" : "updated"
   };
 }
-function autoInstallSkills() {
-  const detectedTargets = targets();
-  const installed = [];
-  const updatesAvailable = [];
-  for (const target of detectedTargets) {
-    const result2 = install(target, false);
-    if (result2) installed.push(result2);
-    else updatesAvailable.push(target.agent);
-  }
-  return {
-    detected: detectedTargets.map((target) => target.agent),
-    installed,
-    updatesAvailable
-  };
-}
 function installSkills(agent) {
   const selected = targets(agent);
   if (selected.length === 0) {
@@ -1716,7 +1772,7 @@ function installSkills(agent) {
 // package.json
 var package_default = {
   name: "@marina-cloud/cli",
-  version: "0.0.1",
+  version: "0.0.3",
   description: "Command-line client for Marina Cloud",
   homepage: "https://github.com/marina-hq/marina#readme",
   bugs: {
@@ -1861,13 +1917,14 @@ async function deploy(dirArg, flags) {
     packed = pack(dir);
   }
   for (const secret of packed.skippedSecrets) say(dim(`skipped ${secret} \u2014 secrets stay local`));
-  say(
-    `uploading ${bold(name)} ${dim(`(${String(packed.fileCount)} files, ${String(Math.round(packed.totalBytes / 1024))} KB)`)}`
-  );
+  const progress = createProgress();
+  const size = `${String(packed.fileCount)} files, ${String(Math.round(packed.totalBytes / 1024))} KB`;
+  progress.update("uploading", `Uploading ${name} (${size})`);
   let started;
   try {
     started = await startDeploy(packed.zip, name, target);
   } catch (error) {
+    progress.clear();
     if (error instanceof ApiError && error.code === "not_found" && link) {
       failure(
         "link_stale",
@@ -1877,7 +1934,18 @@ async function deploy(dirArg, flags) {
     }
     throw error;
   }
-  const deployed = await pollDeploy(started.id);
+  const deployedAt = Date.now();
+  let deployed;
+  try {
+    deployed = await pollDeploy(started.id, (current) => {
+      if (current.status !== "queued" && current.status !== "building") return;
+      const elapsed = Math.max(1, Math.round((Date.now() - deployedAt) / 1e3));
+      const message = current.status === "queued" ? `Waiting for a deploy worker (${String(elapsed)}s)` : `Building and verifying (${String(elapsed)}s)`;
+      progress.update(current.status, message);
+    });
+  } finally {
+    progress.clear();
+  }
   if (deployed.status === "refused" && deployed.refusal) {
     say(`${red("refused")} ${deployed.refusal.message}`);
     if (deployed.refusal.action) say(`        ${deployed.refusal.action}`);
@@ -2061,27 +2129,6 @@ async function main() {
     return;
   }
   shouldCheckForUpdates = true;
-  let skillBootstrap = null;
-  if (command !== "skills") {
-    try {
-      skillBootstrap = autoInstallSkills();
-      for (const installed of skillBootstrap.installed) {
-        if (installed.status === "installed") {
-          say(dim(`installed Marina skill for ${installed.agent}`));
-        }
-      }
-      if (skillBootstrap.updatesAvailable.length > 0) {
-        const agent = skillBootstrap.updatesAvailable.length > 1 ? "all" : skillBootstrap.updatesAvailable[0];
-        say(
-          dim(
-            `Marina skill update available \u2014 run marina skills install --agent ${agent ?? "all"}`
-          )
-        );
-      }
-    } catch {
-      say(dim("could not install the Marina agent skill; run marina skills install later"));
-    }
-  }
   switch (command) {
     case "setup":
     case "login": {
@@ -2089,24 +2136,41 @@ async function main() {
       if (token) {
         saveToken(token);
       } else {
-        const signedIn = await loginWithBrowser((url) => {
-          say("Opening your browser to sign in\u2026");
-          say(dim(url));
-        });
+        let lastReportedRemaining = -1;
+        const signedIn = await loginWithBrowser(
+          (url) => {
+            say("Opening your browser to sign in\u2026");
+            say(dim(url));
+          },
+          (progress) => {
+            if (progress.phase === "waiting") {
+              const remainingSeconds = Math.ceil(progress.remainingMs / 1e3);
+              if (lastReportedRemaining < 0) {
+                say(
+                  dim(
+                    `Waiting for browser authorization (${String(Math.ceil(remainingSeconds / 60))} minute timeout)\u2026`
+                  )
+                );
+                lastReportedRemaining = remainingSeconds;
+              } else if (remainingSeconds <= lastReportedRemaining - 15) {
+                const minutes = Math.floor(remainingSeconds / 60);
+                const seconds = String(remainingSeconds % 60).padStart(2, "0");
+                say(dim(`Still waiting\u2026 ${String(minutes)}:${seconds} remaining`));
+                lastReportedRemaining = remainingSeconds;
+              }
+            } else if (progress.phase === "received") {
+              say(dim("Authorization received. Completing sign-in\u2026"));
+            }
+          }
+        );
         saveToken(signedIn.token);
       }
       say(`${green("ok")} signed in ${dim(`(${apiUrl()})`)}`);
-      if (skillBootstrap?.detected.length === 0) {
-        say(
-          dim("no Codex or Claude installation detected \u2014 use marina skills install --agent later")
-        );
-      }
       result({
         command: "setup",
         signed_in: true,
         api: apiUrl(),
-        profile: profilePath(),
-        skills: skillBootstrap?.installed ?? []
+        profile: profilePath()
       });
       return;
     }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@marina-cloud/cli",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Command-line client for Marina Cloud",
   "homepage": "https://github.com/marina-hq/marina#readme",
   "bugs": {