@marina-cloud/cli 0.0.2 → 0.0.4

package/README.md

@@ -2,30 +2,39 @@
 
 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
 marina deploy
 ```
 
+For a complete first run, including the deployment skill and demo app:
+
+```sh
+npm install -g @marina-cloud/cli && marina setup --skills --deploy-demo --json
+```
+
 `marina setup` opens Clerk in the browser and delivers the resulting API key
-directly back to the CLI. For unattended environments, `MARINA_TOKEN` or
-`marina setup --token mar_…` is the explicit fallback.
+directly back to the CLI. For unattended environments, `MARINA_TOKEN` is the
+process-only credential override.
 
 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
 marina skills install --agent codex
 ```
 
-The CLI checks npm at most once per day and prints an advisory update command
-when a newer release is available. It never updates itself.
+The CLI reads release metadata from Marina's control plane and prints an
+advisory update command at most once per day when a newer release is available.
+It never updates itself.
 
 ## Agent-friendly output
 

package/dist/marina.mjs

@@ -16,14 +16,151 @@ import {
 } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
+
+// package.json
+var package_default = {
+  name: "@marina-cloud/cli",
+  version: "0.0.4",
+  description: "Command-line client for Marina Cloud",
+  homepage: "https://github.com/marina-hq/marina#readme",
+  bugs: {
+    url: "https://github.com/marina-hq/marina/issues"
+  },
+  license: "Apache-2.0",
+  repository: {
+    type: "git",
+    url: "git+https://github.com/marina-hq/marina.git",
+    directory: "packages/cli"
+  },
+  bin: {
+    marina: "dist/marina.mjs"
+  },
+  files: [
+    "dist"
+  ],
+  type: "module",
+  publishConfig: {
+    access: "public",
+    provenance: true
+  },
+  scripts: {
+    build: 'esbuild src/index.ts --bundle --platform=node --target=node22 --format=esm --loader:.md=text --loader:.yaml=text --loader:.html=text --loader:.css=text --loader:.txt=text --outfile=dist/marina.mjs --banner:js="#!/usr/bin/env node" && chmod +x dist/marina.mjs',
+    typecheck: "tsc --noEmit",
+    test: "pnpm build && node --experimental-strip-types --test src/*.test.ts",
+    prepack: "pnpm build"
+  },
+  devDependencies: {
+    "@types/node": "^26.2.0",
+    esbuild: "^0.25.0",
+    fflate: "^0.8.2",
+    typescript: "^5.9.0"
+  },
+  engines: {
+    node: ">=22"
+  }
+};
+
+// src/identity.ts
+var CLI_VERSION = package_default.version;
+var cliRequestHeaders = () => ({
+  "user-agent": `marina-cli/${CLI_VERSION}`,
+  "x-marina-client": "cli",
+  "x-marina-client-version": CLI_VERSION
+});
+
+// src/config.ts
 var MARINA_HOME = process.env.MARINA_HOME ?? join(homedir(), ".marina");
 var PROFILE = join(MARINA_HOME, "profile");
-var apiUrl = () => (process.env.MARINA_API ?? "https://v1.marina.cloud").replace(/\/$/, "");
+var PRODUCTION_CONTROL_PLANE = "https://marina.cloud";
+var CONTROL_PLANE_CACHE_MS = 60 * 60 * 1e3;
+var resolvedControlPlane = null;
+function normalizeApiUrl(value) {
+  const url = new URL(value);
+  if (url.protocol !== "https:" && url.protocol !== "http:") {
+    throw new Error("the Marina control plane must use http or https");
+  }
+  if (url.username || url.password || url.search || url.hash || url.pathname !== "/") {
+    throw new Error("the Marina control plane must be an origin without a path");
+  }
+  if (url.protocol === "http:" && url.hostname !== "localhost" && url.hostname !== "127.0.0.1" && url.hostname !== "[::1]") {
+    throw new Error("the Marina control plane must use https unless it is local");
+  }
+  return url.origin;
+}
+var controlPlaneHost = () => normalizeApiUrl(
+  process.env.MARINA_CONTROL_PLANE ?? readProfile().control_plane_host ?? PRODUCTION_CONTROL_PLANE
+);
+function cachedControlPlane(host = controlPlaneHost()) {
+  const cached = readProfile().control_plane;
+  if (!cached || cached.host !== host) return null;
+  try {
+    normalizeApiUrl(cached.api_url);
+    normalizeApiUrl(cached.dashboard_url);
+    return cached;
+  } catch {
+    return null;
+  }
+}
+var apiUrl = () => normalizeApiUrl(
+  process.env.MARINA_API ?? resolvedControlPlane?.api_url ?? cachedControlPlane()?.api_url ?? controlPlaneHost()
+);
 var dashboardUrl = () => {
-  if (process.env.MARINA_DASHBOARD) return process.env.MARINA_DASHBOARD.replace(/\/$/, "");
-  const api = new URL(apiUrl());
-  return api.hostname === "localhost" || api.hostname === "127.0.0.1" ? "http://localhost:5173" : api.origin;
+  if (process.env.MARINA_DASHBOARD) return normalizeApiUrl(process.env.MARINA_DASHBOARD);
+  return normalizeApiUrl(
+    resolvedControlPlane?.dashboard_url ?? cachedControlPlane()?.dashboard_url ?? controlPlaneHost()
+  );
 };
+async function resolveControlPlane() {
+  const host = controlPlaneHost();
+  const cached = cachedControlPlane(host);
+  const checkedAt = cached ? Date.parse(cached.checked_at) : Number.NaN;
+  if (cached && Number.isFinite(checkedAt) && Date.now() - checkedAt < CONTROL_PLANE_CACHE_MS) {
+    resolvedControlPlane = {
+      api_url: cached.api_url,
+      dashboard_url: cached.dashboard_url,
+      latest_cli_version: cached.latest_cli_version
+    };
+    return;
+  }
+  if (process.env.MARINA_DISABLE_CONTROL_PLANE_DISCOVERY === "1") return;
+  try {
+    const response = await fetch(`${host}/.well-known/marina`, {
+      headers: { ...cliRequestHeaders(), accept: "application/json" },
+      signal: AbortSignal.timeout(3e3)
+    });
+    if (!response.ok)
+      throw new Error(`control-plane discovery failed (${String(response.status)})`);
+    const body = await response.json();
+    if (body.schema_version !== 1 || typeof body.api_url !== "string" || typeof body.dashboard_url !== "string") {
+      throw new Error("control-plane discovery returned an invalid response");
+    }
+    const discovered = {
+      api_url: normalizeApiUrl(body.api_url),
+      dashboard_url: normalizeApiUrl(body.dashboard_url),
+      latest_cli_version: typeof body.clients?.cli?.latest_version === "string" ? body.clients.cli.latest_version : null
+    };
+    resolvedControlPlane = discovered;
+    writeProfile({
+      ...readProfile(),
+      control_plane: {
+        host,
+        checked_at: (/* @__PURE__ */ new Date()).toISOString(),
+        ...discovered
+      }
+    });
+  } catch {
+    if (cached) {
+      resolvedControlPlane = {
+        api_url: cached.api_url,
+        dashboard_url: cached.dashboard_url,
+        latest_cli_version: cached.latest_cli_version
+      };
+    }
+  }
+}
+function latestCliVersion() {
+  return resolvedControlPlane?.latest_cli_version ?? cachedControlPlane()?.latest_cli_version ?? null;
+}
 var profilePath = () => PROFILE;
 function readProfile() {
   try {
@@ -90,7 +227,7 @@ async function request(path, init) {
   if (!token) throw new ApiError("unauthenticated", "not signed in \u2014 run `marina setup`", 401);
   const res = await fetch(`${apiUrl()}${path}`, {
     ...init,
-    headers: { authorization: `Bearer ${token}`, ...init?.headers }
+    headers: { ...cliRequestHeaders(), authorization: `Bearer ${token}`, ...init?.headers }
   });
   const body = await res.json().catch(() => ({}));
   if (!res.ok) {
@@ -107,7 +244,7 @@ async function exchangeCliLogin(code, codeVerifier) {
   try {
     res = await fetch(`${apiUrl()}/cli/auth/exchange`, {
       method: "POST",
-      headers: { "content-type": "application/json" },
+      headers: { ...cliRequestHeaders(), "content-type": "application/json" },
       body: JSON.stringify({ code, code_verifier: codeVerifier }),
       signal: AbortSignal.timeout(LOGIN_EXCHANGE_TIMEOUT_MS)
     });
@@ -147,9 +284,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));
   }
@@ -1564,6 +1702,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));
 }
@@ -1746,52 +1906,8 @@ function installSkills(agent) {
   return selected.map((target) => install(target, true));
 }
 
-// package.json
-var package_default = {
-  name: "@marina-cloud/cli",
-  version: "0.0.2",
-  description: "Command-line client for Marina Cloud",
-  homepage: "https://github.com/marina-hq/marina#readme",
-  bugs: {
-    url: "https://github.com/marina-hq/marina/issues"
-  },
-  license: "Apache-2.0",
-  repository: {
-    type: "git",
-    url: "git+https://github.com/marina-hq/marina.git",
-    directory: "packages/cli"
-  },
-  bin: {
-    marina: "dist/marina.mjs"
-  },
-  files: [
-    "dist"
-  ],
-  type: "module",
-  publishConfig: {
-    access: "public",
-    provenance: true
-  },
-  scripts: {
-    build: 'esbuild src/index.ts --bundle --platform=node --target=node22 --format=esm --loader:.md=text --loader:.yaml=text --loader:.html=text --loader:.css=text --loader:.txt=text --outfile=dist/marina.mjs --banner:js="#!/usr/bin/env node" && chmod +x dist/marina.mjs',
-    typecheck: "tsc --noEmit",
-    test: "pnpm build && node --experimental-strip-types --test src/*.test.ts",
-    prepack: "pnpm build"
-  },
-  devDependencies: {
-    "@types/node": "^26.2.0",
-    esbuild: "^0.25.0",
-    fflate: "^0.8.2",
-    typescript: "^5.9.0"
-  },
-  engines: {
-    node: ">=22"
-  }
-};
-
 // src/update.ts
-var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
-var LATEST_URL = "https://registry.npmjs.org/@marina-cloud%2Fcli/latest";
+var NAG_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 function isNewerVersion(candidate, current) {
   const parse = (version) => version.replace(/^v/, "").split("-", 1)[0].split(".").map((part) => Number.parseInt(part, 10));
   const left = parse(candidate);
@@ -1806,40 +1922,28 @@ function isNewerVersion(candidate, current) {
 async function availableUpdate() {
   if (process.env.MARINA_DISABLE_UPDATE_CHECK) return null;
   const current = package_default.version;
+  const latest = latestCliVersion();
+  if (!latest || !isNewerVersion(latest, current)) return null;
   const profile = readProfile();
-  const checkedAt = profile.update ? Date.parse(profile.update.checked_at) : Number.NaN;
-  let latest = profile.update?.latest;
-  if (!latest || !Number.isFinite(checkedAt) || Date.now() - checkedAt >= CHECK_INTERVAL_MS) {
-    try {
-      const response = await fetch(LATEST_URL, {
-        headers: { accept: "application/json" },
-        signal: AbortSignal.timeout(1500)
-      });
-      if (response.ok) {
-        const body = await response.json();
-        if (body.version) {
-          latest = body.version;
-          writeProfile({
-            ...readProfile(),
-            update: { checked_at: (/* @__PURE__ */ new Date()).toISOString(), latest }
-          });
-        }
-      }
-    } catch {
-    }
-  }
-  return latest && isNewerVersion(latest, current) ? {
+  const notifiedAt = profile.update?.notified_at ? Date.parse(profile.update.notified_at) : Number.NaN;
+  if (Number.isFinite(notifiedAt) && Date.now() - notifiedAt < NAG_INTERVAL_MS) return null;
+  writeProfile({
+    ...profile,
+    update: { latest, notified_at: (/* @__PURE__ */ new Date()).toISOString() }
+  });
+  return {
     current,
     latest,
     command: "npm install -g @marina-cloud/cli@latest"
-  } : null;
+  };
 }
 
 // src/index.ts
 var HELP = `${bold("marina")} \u2014 deploy internal apps
 
   marina setup                   sign in with Clerk in your browser
-      --token mar_\u2026              save an existing API key (headless fallback)
+      --skills                   install the Marina deployment skill
+      --deploy-demo              deploy Hello Marina after signing in
   marina logout                  remove the saved credential
   marina profile                 show where this CLI is signed in
   marina skills install          install or update the Marina deployment skill
@@ -1858,8 +1962,7 @@ var HELP = `${bold("marina")} \u2014 deploy internal apps
   marina list                    apps in your workspace
   marina open                    open this project's app
 
-  ${dim("--json  machine-readable result on stdout, progress on stderr")}
-  ${dim(`API: ${apiUrl()} (override with MARINA_API)`)}`;
+  ${dim("--json  machine-readable result on stdout, progress on stderr")}`;
 var ANSI_ESCAPE = new RegExp(`${String.fromCodePoint(27)}\\[[0-9;]*m`, "g");
 var shouldCheckForUpdates = false;
 function targetApp(flag) {
@@ -1872,7 +1975,7 @@ function targetApp(flag) {
   return app;
 }
 var shortDigest = (digest) => digest?.slice(7, 14) ?? "\u2014";
-async function deploy(dirArg, flags) {
+async function deploy(dirArg, flags, emitResult = true) {
   let dir = null;
   let link = null;
   let target;
@@ -1894,13 +1997,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",
@@ -1910,7 +2014,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}`);
@@ -1949,7 +2064,7 @@ async function deploy(dirArg, flags) {
     if (deployed.version_url) say(`   try this version: ${deployed.version_url}`);
     say(dim("   a publisher can approve it from the Marina inbox"));
   }
-  result({
+  const payload = {
     command: "deploy",
     status: "succeeded",
     app: slug,
@@ -1960,7 +2075,9 @@ async function deploy(dirArg, flags) {
     preparation: deployed.preparation,
     live: published,
     demo: dirArg === "demo"
-  });
+  };
+  if (emitResult) result(payload);
+  return payload;
 }
 async function status(appFlag) {
   const app = targetApp(appFlag);
@@ -2076,12 +2193,13 @@ async function main() {
   const { positionals, values } = parseArgs({
     allowPositionals: true,
     options: {
-      token: { type: "string" },
       name: { type: "string" },
       app: { type: "string" },
       to: { type: "string" },
       plain: { type: "boolean" },
       agent: { type: "string" },
+      skills: { type: "boolean" },
+      "deploy-demo": { type: "boolean" },
       json: { type: "boolean" },
       help: { type: "boolean", short: "h" }
     }
@@ -2093,14 +2211,12 @@ async function main() {
     result({ command: "help", usage: HELP.replaceAll(ANSI_ESCAPE, "") });
     return;
   }
+  await resolveControlPlane();
   shouldCheckForUpdates = true;
   switch (command) {
     case "setup":
     case "login": {
-      const token = values.token ?? process.env.MARINA_TOKEN;
-      if (token) {
-        saveToken(token);
-      } else {
+      if (!process.env.MARINA_TOKEN) {
         let lastReportedRemaining = -1;
         const signedIn = await loginWithBrowser(
           (url) => {
@@ -2131,11 +2247,18 @@ async function main() {
         saveToken(signedIn.token);
       }
       say(`${green("ok")} signed in ${dim(`(${apiUrl()})`)}`);
+      const installed = values.skills ? installSkills(values.agent) : void 0;
+      for (const skill of installed ?? []) {
+        say(`${green("ok")} ${skill.status} Marina skill for ${skill.agent} ${dim(skill.path)}`);
+      }
+      const demo = values["deploy-demo"] ? await deploy("demo", { name: values.name }, false) : void 0;
       result({
         command: "setup",
         signed_in: true,
         api: apiUrl(),
-        profile: profilePath()
+        profile: profilePath(),
+        ...installed ? { skills: installed } : {},
+        ...demo ? { deploy: demo } : {}
       });
       return;
     }
@@ -2231,8 +2354,8 @@ async function run() {
   if (!shouldCheckForUpdates) return;
   const update = await availableUpdate();
   if (update) {
-    const message = `Marina CLI ${update.latest} is available (current ${update.current}) \u2014 ${update.command}`;
-    note(isJsonMode() ? message : dim(message));
+    const detail = `Marina CLI ${update.latest} is available (current ${update.current}) \u2014 ${update.command}`;
+    note(isJsonMode() ? detail : `${bold("Update available:")} ${detail}`);
   }
 }
 run().catch((error) => {

package/package.json

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