uplink-cli 0.1.39 → 0.2.0

package/cli/src/subcommands/menu/requests.ts

@@ -1,12 +1,19 @@
 import fetch from "node-fetch";
-import { getResolvedApiBase } from "../../utils/api-base";
+import { getResolvedApiBase, getResolvedApiToken } from "../../utils/api-base";
 
-export async function unauthenticatedRequest(method: string, path: string, body?: unknown): Promise<any> {
+export async function unauthenticatedRequest(
+  method: string,
+  path: string,
+  body?: unknown,
+  options: { includeCurrentToken?: boolean } = {}
+): Promise<any> {
   const apiBase = getResolvedApiBase();
+  const token = options.includeCurrentToken ? getResolvedApiToken(apiBase) : undefined;
   const response = await fetch(`${apiBase}${path}`, {
     method,
     headers: {
       "Content-Type": "application/json",
+      ...(token ? { Authorization: `Bearer ${token}` } : {}),
     },
     body: body ? JSON.stringify(body) : undefined,
   });

package/cli/src/subcommands/signup.ts

@@ -39,7 +39,7 @@ async function signupRequest(body: Record<string, unknown>): Promise<SignupRespo
 }
 
 export const signupCommand = new Command("signup")
-  .description("Create a new user account and token (no auth required)")
+  .description("Create an explicit guest token (tunnel create does this automatically)")
   .option("--label <label>", "Optional label for the token")
   .option("--expires-days <days>", "Token expiration in days (optional)")
   .option("--json", "Output JSON", false)
@@ -63,7 +63,7 @@ export const signupCommand = new Command("signup")
       } else {
         const apiBase = getResolvedApiBase();
         const tokenExport = formatTokenForEnv(result.token, apiBase);
-        console.log("Account created successfully!");
+        console.log("Guest access created successfully!");
         console.log("");
         console.log(`  Token:    ${result.token}`);
         console.log(`  User ID:  ${result.userId}`);

package/cli/src/subcommands/tunnel.ts

@@ -6,6 +6,7 @@ import {
   killTunnelClient,
   startTunnelClient,
 } from "./menu/effects/tunnel-clients";
+import { ensureGuestAccess } from "../utils/guest-access";
 
 type TunnelResponse = {
   id: string;
@@ -51,6 +52,7 @@ tunnelCommand
     }
 
     try {
+      await ensureGuestAccess();
       const existing = findTunnelClients().filter((c) => c.port === port);
       if (existing.length > 0 && !opts.apiOnly) {
         const err = `Tunnel client already running on port ${port} (pid ${existing[0].pid})`;

package/cli/src/tui/App.tsx

@@ -13,6 +13,11 @@ export type MenuStatus = {
   tunnels: TunnelLine[];
   apps: { name: string; id: string; url?: string; createdAt?: string }[];
   providers: string[];
+  storageUsedBytes: number;
+  storageLimitBytes: number;
+  appLimit: number;
+  alwaysOn: boolean;
+  idleMinutes: number | null;
 };
 
 export type MenuOutcome =

package/cli/src/tui/HomeStatus.tsx

@@ -1,45 +1,73 @@
 import { Box, Text } from "ink";
 import type { MenuStatus } from "./App";
 import { Wordmark } from "./brand";
+import { formatBytes } from "./format";
 
 const LABEL_WIDTH = 12;
-const BAR_CAP = 24;
+const SPACE_GAUGE = 16;
 
-function CountBar({ count }: { count: number }) {
-  if (count <= 0) return null;
-  const filled = Math.min(count, BAR_CAP);
-  return (
-    <Text>
-      <Text color="green">{"█".repeat(filled)}</Text>
-      {count > BAR_CAP ? <Text dimColor> +{count - BAR_CAP}</Text> : null}
-    </Text>
-  );
+function formatLimit(n: number): string {
+  return n < 0 ? "∞" : String(n);
 }
 
-function Metric({ label, count }: { label: string; count: number }) {
+function Metric({ label, value }: { label: string; value: string }) {
   return (
     <Box>
       <Box width={LABEL_WIDTH}>
         <Text dimColor>{label}</Text>
       </Box>
-      <Box width={4}>
-        {count > 0 ? <Text>{count}</Text> : <Text dimColor>—</Text>}
+      <Text>{value}</Text>
+    </Box>
+  );
+}
+
+function SpaceMetric({ usedBytes, limitBytes }: { usedBytes: number; limitBytes: number }) {
+  const used = Math.max(0, usedBytes);
+  const unlimited = limitBytes < 0;
+  const cap = unlimited ? Math.max(used, 1) : Math.max(limitBytes, 1);
+  const left = unlimited ? used : Math.max(0, limitBytes - used);
+  const ratio = unlimited ? 0 : Math.min(1, used / cap);
+  const filled = Math.round(ratio * SPACE_GAUGE);
+  const nearlyFull = !unlimited && ratio >= 0.85;
+
+  return (
+    <Box flexDirection="column">
+      <Box>
+        <Box width={LABEL_WIDTH}>
+          <Text dimColor>space</Text>
+        </Box>
+        <Text>
+          <Text color={nearlyFull ? "red" : "green"}>{"█".repeat(filled)}</Text>
+          <Text dimColor>{"░".repeat(SPACE_GAUGE - filled)}</Text>
+          <Text dimColor>
+            {"  "}
+            {unlimited ? `${formatBytes(used)} used` : `${formatBytes(left)} left`}
+          </Text>
+        </Text>
+      </Box>
+      <Box>
+        <Box width={LABEL_WIDTH}>
+          <Text> </Text>
+        </Box>
+        <Text dimColor>
+          {unlimited ? "unlimited" : `of ${formatBytes(limitBytes)} hosting budget`}
+        </Text>
       </Box>
-      <CountBar count={count} />
     </Box>
   );
 }
 
 export function HomeStatus({ status }: { status: MenuStatus }) {
   const latency =
-    status.connected && status.latencyMs != null ? `${status.latencyMs}ms` : "—";
+    status.connected && status.latencyMs != null ? `${status.latencyMs}ms` : "0ms";
+  const plan = status.alwaysOn ? "always-on" : `sleep after ${status.idleMinutes ?? 30}m idle`;
 
   return (
     <Box flexDirection="column">
       <Wordmark />
       <Box marginTop={1}>
-        <Text color={status.connected ? "green" : "red"}>
-          {status.connected ? "connected" : "offline"}
+        <Text color={status.connected ? "green" : "yellow"}>
+          ● {status.connected ? "connected" : "offline"}
         </Text>
         <Text dimColor> · {latency}</Text>
       </Box>
@@ -47,9 +75,14 @@ export function HomeStatus({ status }: { status: MenuStatus }) {
         <Text dimColor>{"─".repeat(36)}</Text>
       </Box>
       <Box flexDirection="column">
-        <Metric label="apps" count={status.apps.length} />
-        <Metric label="tunnels" count={status.tunnels.length} />
-        <Metric label="registrars" count={status.providers.length} />
+        <Metric
+          label="apps"
+          value={`${status.apps.length} / ${formatLimit(status.appLimit)}`}
+        />
+        <Metric label="tunnels" value={String(status.tunnels.length)} />
+        <Metric label="registrars" value={String(status.providers.length)} />
+        <SpaceMetric usedBytes={status.storageUsedBytes} limitBytes={status.storageLimitBytes} />
+        <Metric label="plan" value={plan} />
       </Box>
       <Box marginTop={1}>
         <Text dimColor>{"─".repeat(36)}</Text>

package/cli/src/tui/session.mts

@@ -1,7 +1,6 @@
 import fetch from "node-fetch";
 import { apiRequest } from "../http";
 import { clearScreen, promptLine, restoreRawMode, truncate } from "../subcommands/menu/io";
-import { unauthenticatedRequest } from "../subcommands/menu/requests";
 import { inlineSelect } from "../subcommands/menu/inline-tree-select";
 import {
   colorDim,
@@ -19,10 +18,12 @@ import {
   buildSystemStatusMenu,
   buildUsageMenu,
 } from "../subcommands/menu/menus";
-import { ports, smoke, tokenConfig, tunnelClients } from "../subcommands/menu/effects";
+import { buildFindDomainAction } from "../subcommands/menu/menus/domain-check";
+import { ports, smoke, tunnelClients } from "../subcommands/menu/effects";
 import { runInkMenu } from "./runMenu";
-import { launchDomainking } from "../utils/launchDomainking";
 import { fetchMenuSnapshot } from "./snapshot";
+import { isEmail, normalizeEmail, persistLogin, requestLoginCode, verifyLoginCode } from "../utils/login-flow";
+import { ensureGuestAccess } from "../utils/guest-access";
 
 function formatBytes(bytes: number): string {
   if (bytes === 0) return "0 B";
@@ -32,221 +33,116 @@ function formatBytes(bytes: number): string {
   return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + " " + sizes[i];
 }
 
+async function continueWithEmail(): Promise<string | undefined> {
+  restoreRawMode();
+  clearScreen();
+  try {
+    process.stdout.write("\n");
+    process.stdout.write(colorWhite("UPLINK") + colorDim("  Continue with email\n\n"));
+    const email = normalizeEmail(await promptLine("Email: "));
+    if (!isEmail(email)) return "Invalid email.";
+
+    await requestLoginCode(email);
+    process.stdout.write(`\nCode sent to ${email}.\n`);
+    const code = (await promptLine("Code: ")).trim();
+    if (!/^\d{6}$/.test(code)) return "Code must be 6 digits.";
+
+    const result = await verifyLoginCode(email, code);
+    if (!result?.token) return "Invalid response from server. Token not received.";
+    const savedTo = persistLogin(result, email);
+    process.stdout.write(`\n${colorGreen("✓")} Account verified\n`);
+    process.stdout.write(colorDim(`  ${savedTo}\n\n`));
+    return "Email verified. Run uplink again to see Hosting and Domains.";
+  } catch (err: any) {
+    const errorMsg = err?.message || String(err);
+    if (errorMsg.includes("429") || errorMsg.includes("RATE_LIMIT")) {
+      return "Too many attempts. Please try again later.";
+    }
+    return `Email verification failed: ${errorMsg}`;
+  } finally {
+    restoreRawMode();
+  }
+}
+
+const aboutItem: MenuChoice = {
+  label: "About",
+  action: async () => {
+    return [
+      "Uplink CLI",
+      "Open source CLI for sharing localhost and hosting apps.",
+      "Interactive menu + agent-friendly commands for automation.",
+      "",
+      "Website: https://uplink.spot",
+      "GitHub: https://github.com/firstprinciplecode/uplink",
+      "Issues: https://github.com/firstprinciplecode/uplink/issues",
+    ].join("\n");
+  },
+};
+
+const exitItem: MenuChoice = {
+  label: "Exit",
+  action: async () => "Goodbye!",
+};
+
 export async function startMenuSession(): Promise<void> {
+    if (!process.stdin.isTTY || !process.stdout.isTTY) {
+      console.error("Uplink menu needs an interactive terminal. Use `uplink --help` for commands.");
+      process.exit(1);
+    }
+
     const apiBase = process.env.AGENTCLOUD_API_BASE || "https://api.uplink.spot";
-    
-    // Determine role (admin or user) via /v1/me; check if auth failed
+
     let isAdmin = false;
-    let authFailed = false;
-    const meStart = Date.now();
-    try {
+    let accountType: "guest" | "verified" | "admin" | null = null;
+    let connectionError: string | null = null;
+
+    const resolveAccount = async (): Promise<void> => {
       const me = await apiRequest("GET", "/v1/me");
       isAdmin = me?.role === "admin";
+      accountType = isAdmin ? "admin" : me?.accountType === "verified" ? "verified" : "guest";
+    };
+
+    try {
+      await resolveAccount();
     } catch (err: any) {
-      // Check if it's an authentication error
       const errorMsg = err?.message || String(err);
-      authFailed =
+      const authFailed =
         errorMsg.includes("UNAUTHORIZED") ||
         errorMsg.includes("401") ||
         errorMsg.includes("Missing or invalid token") ||
         errorMsg.includes("Missing AGENTCLOUD_TOKEN");
-      isAdmin = false;
+      if (authFailed) {
+        // No usable token: quietly create guest access so everyone gets the same menu.
+        try {
+          await ensureGuestAccess({ force: true });
+          await resolveAccount();
+        } catch (guestErr: any) {
+          connectionError = guestErr?.message || String(guestErr);
+        }
+      } else {
+        connectionError = errorMsg;
+      }
     }
-    const meDurationMs = Date.now() - meStart;
 
-    // Build menu structure dynamically by role and auth status
     const mainMenu: MenuChoice[] = [];
-    
-    // If authentication failed, show ONLY "Get Started", "About", and "Exit"
-    if (authFailed) {
-      mainMenu.push({
-        label: "🚀 Get Started (Create Account)",
-        action: async () => {
-          restoreRawMode();
-          clearScreen();
-          try {
-            process.stdout.write("\n");
-            process.stdout.write(colorWhite("UPLINK") + colorDim("  Create Account\n"));
-            process.stdout.write("\n");
 
-            const label = (await promptLine("Label (optional): ")).trim();
-            const expiresInput = (await promptLine("Expires in days (optional): ")).trim();
-            const expiresDays = expiresInput ? Number(expiresInput) : undefined;
-
-            if (expiresDays && (isNaN(expiresDays) || expiresDays <= 0)) {
-              restoreRawMode();
-              return "Invalid expiration days. Please enter a positive number or leave empty.";
-            }
-
-            process.stdout.write("\nCreating your token...\n");
-            process.stdout.write("");
-            let result;
-            try {
-              result = await unauthenticatedRequest("POST", "/v1/signup", {
-                label: label || undefined,
-                expiresInDays: expiresDays || undefined,
-              });
-              if (!result) {
-                restoreRawMode();
-                return "❌ Error: No response from server.";
-              }
-            } catch (err: any) {
-              restoreRawMode();
-              const errorMsg = err?.message || String(err);
-              console.error("\n❌ Signup error:", errorMsg);
-              if (errorMsg.includes("429") || errorMsg.includes("RATE_LIMIT")) {
-                return "⚠️  Too many signup attempts. Please try again later.";
-              }
-              return `❌ Error creating account: ${errorMsg}`;
-            }
-
-            if (!result || !result.token) {
-              restoreRawMode();
-              return "❌ Error: Invalid response from server. Token not received.";
-            }
-
-            const token = result.token;
-            const tokenId = result.id;
-            const userId = result.userId;
-
-            process.stdout.write("\n");
-            process.stdout.write(colorGreen("✓") + " Account created\n");
-            process.stdout.write("\n");
-            process.stdout.write(colorDim("├─") + " Token     " + token + "\n");
-            process.stdout.write(colorDim("├─") + " ID        " + tokenId + "\n");
-            process.stdout.write(colorDim("├─") + " User      " + userId + "\n");
-            process.stdout.write(colorDim("├─") + " Role      " + result.role + "\n");
-            if (result.expiresAt) {
-              process.stdout.write(colorDim("└─") + " Expires   " + result.expiresAt + "\n");
-            } else {
-              process.stdout.write(colorDim("└─") + " Expires   " + colorDim("never") + "\n");
-            }
-            process.stdout.write("\n");
-            process.stdout.write(colorDim("!") + " Save this token securely — shown only once\n");
-
-            // Try to automatically add token to shell config
-            const detected = tokenConfig.detectShellConfigFile();
-            let configFile: string | null = detected.configFile;
-            let shellName = detected.shellName;
-
-            let tokenAdded = false;
-            const tokenExists = configFile ? tokenConfig.shellConfigHasToken(configFile) : false;
-
-            if (configFile) {
-              const promptText = tokenExists
-                ? `\n→ Update existing token in ~/.${shellName}rc? (Y/n): `
-                : `\n→ Add token to ~/.${shellName}rc? (Y/n): `;
-              
-              const addToken = (await promptLine(promptText)).trim().toLowerCase();
-              if (addToken !== "n" && addToken !== "no") {
-                try {
-                  const res = tokenConfig.upsertShellToken(configFile, token);
-                  tokenAdded = res.wrote;
-                  if (tokenExists) {
-                    console.log(colorGreen(`\n✓ Token updated in ~/.${shellName}rc`));
-                  } else {
-                    console.log(colorGreen(`\n✓ Token added to ~/.${shellName}rc`));
-                  }
-                  if (!res.verifyOk) {
-                    console.log(
-                      colorRed(`\n! Token may not have been written correctly. Check ~/.${shellName}rc`)
-                    );
-                  }
-                } catch (err: any) {
-                  if (err?.message?.includes("UNSAFE_SHELL_CONFIG_PERMISSIONS")) {
-                    console.log(
-                      colorRed(
-                        `\n! Could not write to ~/.${shellName}rc: file is group/world writable. Fix permissions first.`
-                      )
-                    );
-                    console.log(colorDim(`  chmod 600 ~/.${shellName}rc`));
-                  } else {
-                    console.log(colorRed(`\n! Could not write to ~/.${shellName}rc: ${err.message}`));
-                  }
-                  console.log(`\n  Please add manually:`);
-                  console.log(colorDim(`  echo 'export AGENTCLOUD_TOKEN=${token}' >> ~/.${shellName}rc`));
-                }
-              }
-            } else {
-              console.log(colorDim(`\n→ Could not detect your shell. Add the token manually:`));
-              console.log(colorDim(`  echo 'export AGENTCLOUD_TOKEN=${token}' >> ~/.zshrc  # for zsh`));
-              console.log(colorDim(`  echo 'export AGENTCLOUD_TOKEN=${token}' >> ~/.bashrc  # for bash`));
-            }
-
-            if (!tokenAdded) {
-            process.stdout.write("\n");
-            process.stdout.write(colorDim("!") + " Set this token as an environment variable:\n\n");
-            process.stdout.write(colorDim("  ") + "export AGENTCLOUD_TOKEN=" + token + "\n");
-            if (configFile) {
-              process.stdout.write(colorDim(`\n  Or add to ~/.${shellName}rc:\n`));
-              process.stdout.write(colorDim("  ") + `echo 'export AGENTCLOUD_TOKEN=${token}' >> ~/.${shellName}rc\n`);
-              process.stdout.write(colorDim("  ") + `source ~/.${shellName}rc\n`);
-            }
-            process.stdout.write(colorDim("\n  Then restart this menu.\n\n"));
-            }
-
-            restoreRawMode();
-
-            if (tokenAdded) {
-              process.env.AGENTCLOUD_TOKEN = token;
-              // Use stdout writes to avoid buffering/race with process.exit()
-              process.stdout.write(`\n${colorGreen("✓")} Token saved to ~/.${shellName}rc\n`);
-              process.stdout.write(`\n${colorDim("→")} Next: run in your terminal:\n`);
-              process.stdout.write(colorDim(`   source ~/.${shellName}rc && uplink\n\n`));
-              
-              setTimeout(() => {
-                process.exit(0);
-              }, 3000);
-              
-              return undefined as any;
-            }
-
-            console.log("\nPress Enter to continue...");
-            await promptLine("");
-            restoreRawMode();
-            return "Token created! Please set AGENTCLOUD_TOKEN environment variable and restart the menu.";
-          } catch (err: any) {
-            restoreRawMode();
-            const errorMsg = err?.message || String(err);
-            if (errorMsg.includes("429") || errorMsg.includes("RATE_LIMIT")) {
-              return "⚠️  Too many signup attempts. Please try again later.";
-            }
-            return `❌ Error creating account: ${errorMsg}`;
-          }
-        },
-      });
-      
+    if (!accountType) {
+      // API unreachable (or guest provisioning failed): minimal offline menu.
       mainMenu.push({
-        label: "Find a domain",
-        action: async () => {
-          restoreRawMode();
-          return launchDomainking();
-        },
-      });
-
-      mainMenu.push({
-        label: "About",
+        label: "Connection details",
         action: async () => {
           return [
-            "Uplink CLI",
-            "Open source CLI for sharing localhost and hosting apps.",
-            "Interactive menu + agent-friendly commands for automation.",
+            `Could not reach ${apiBase}.`,
+            "",
+            connectionError ?? "Unknown error.",
             "",
-            "Website: https://uplink.spot",
-            "GitHub: https://github.com/firstprinciplecode/uplink",
-            "Issues: https://github.com/firstprinciplecode/uplink/issues",
+            "Check your network, then run uplink again.",
           ].join("\n");
         },
       });
-
-      mainMenu.push({
-        label: "Exit",
-        action: async () => {
-          return "Goodbye!";
-        },
-      });
+      mainMenu.push(aboutItem);
+      mainMenu.push(exitItem);
     } else {
-      // Only show other menu items if authentication succeeded
 
     const shareMenu = buildManageTunnelsMenu({
       apiRequest,
@@ -263,21 +159,22 @@ export async function startMenuSession(): Promise<void> {
       colorRed,
     });
 
-    const aliasesMenu = buildManageAliasesMenu({
-      apiRequest,
-      promptLine,
-      restoreRawMode,
-      inlineSelect,
-      findTunnelClients: tunnelClients.findTunnelClients,
-      truncate,
-    });
-
     shareMenu.subMenu = shareMenu.subMenu || [];
-    if (aliasesMenu.subMenu) {
-      shareMenu.subMenu.push({
-        label: "Aliases",
-        subMenu: aliasesMenu.subMenu,
+    if (accountType !== "guest") {
+      const aliasesMenu = buildManageAliasesMenu({
+        apiRequest,
+        promptLine,
+        restoreRawMode,
+        inlineSelect,
+        findTunnelClients: tunnelClients.findTunnelClients,
+        truncate,
       });
+      if (aliasesMenu.subMenu) {
+        shareMenu.subMenu.push({
+          label: "Aliases",
+          subMenu: aliasesMenu.subMenu,
+        });
+      }
     }
     if (isAdmin) {
       shareMenu.subMenu.push({
@@ -301,21 +198,31 @@ export async function startMenuSession(): Promise<void> {
 
     mainMenu.push(shareMenu);
 
-    mainMenu.push(
-      buildHostingMenu({
-        promptLine,
-        restoreRawMode,
-        inlineSelect,
-      })
-    );
-
-    mainMenu.push(
-      buildDomainsMenu({
-        promptLine,
-        restoreRawMode,
-        inlineSelect,
-      })
-    );
+    if (accountType === "guest") {
+      mainMenu.push({
+        label: "Check domain availability",
+        action: buildFindDomainAction({ promptLine, restoreRawMode }),
+      });
+      mainMenu.push({
+        label: "Continue with email  (unlock hosting + domains)",
+        action: continueWithEmail,
+      });
+    } else {
+      mainMenu.push(
+        buildHostingMenu({
+          promptLine,
+          restoreRawMode,
+          inlineSelect,
+        })
+      );
+      mainMenu.push(
+        buildDomainsMenu({
+          promptLine,
+          restoreRawMode,
+          inlineSelect,
+        })
+      );
+    }
 
     // Admin-only: Usage section
     if (isAdmin) {
@@ -352,31 +259,9 @@ export async function startMenuSession(): Promise<void> {
       );
     }
 
-    mainMenu.push({
-      label: "About",
-      action: async () => {
-        return [
-          "Uplink CLI",
-          "Open source CLI for sharing localhost and hosting apps.",
-          "Interactive menu + agent-friendly commands for automation.",
-          "",
-          "Website: https://uplink.spot",
-          "GitHub: https://github.com/firstprinciplecode/uplink",
-          "Issues: https://github.com/firstprinciplecode/uplink/issues",
-        ].join("\n");
-      },
-    });
-
-    mainMenu.push({
-      label: "Exit",
-      action: async () => "Goodbye!",
-    });
-    }
-
-    if (!process.stdin.isTTY || !process.stdout.isTTY) {
-      console.error("Uplink menu needs an interactive terminal. Use `uplink --help` for commands.");
-      process.exit(1);
+    mainMenu.push(aboutItem);
+    mainMenu.push(exitItem);
     }
 
     await runInkMenu({ tree: mainMenu, getStatus: fetchMenuSnapshot });
-}
+}