carlyemail 0.5.0 → 0.6.0

package/carlyemail.js

@@ -18,7 +18,7 @@ import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { randomBytes } from "node:crypto";
 
-export const VERSION = "0.5.0";
+export const VERSION = "0.6.0";
 
 const DEFAULT_API = "https://api.carlyemail.com";
 const CONFIG_DIR = join(homedir(), ".carlyemail");
@@ -229,6 +229,28 @@ function suggestUsername() {
   return `agent-${randomBytes(2).toString("hex")}`;
 }
 
+/**
+ * Ask the server to email a sign-in code and remember which address it went to,
+ * so a later `verify` knows to exchange the code for a key rather than confirm
+ * a sign-up. `known` distinguishes "you told me this account exists" (signup
+ * got `account_exists`) from the server's deliberately non-committal answer.
+ */
+async function startSignin(ctx, human_email, { known = false } = {}) {
+  await request(ctx.config, "POST", "/v0/agent/sign-in", {
+    auth: false,
+    body: { human_email },
+  });
+  saveConfig({ ...ctx.config, pending_signin: human_email }, ctx.configFile, ctx.configDir);
+  ctx.print(
+    arrow(
+      known
+        ? `a sign-in code is on its way to ${human_email} (good for 10 minutes), then:`
+        : `if ${human_email} has an account, a code is on its way (good for 10 minutes), then:`
+    )
+  );
+  ctx.print(`    carlyemail verify <code>`);
+}
+
 define(
   "signup",
   "Create an account and an inbox",
@@ -258,19 +280,33 @@ define(
     const display_name =
       typeof ctx.flags["display-name"] === "string" ? ctx.flags["display-name"] : undefined;
 
-    const out = await request(ctx.config, "POST", "/v0/agent/sign-up", {
-      auth: false,
-      body: { human_email, username, source: "cli", display_name },
-    });
+    let out;
+    try {
+      out = await request(ctx.config, "POST", "/v0/agent/sign-up", {
+        auth: false,
+        body: { human_email, username, source: "cli", display_name },
+      });
+    } catch (error) {
+      // An existing account is not a dead end. Fall through to the sign-in
+      // flow the same way the console does, without being asked — the person
+      // typed their address wanting a working key, not an error about which
+      // command would have produced one.
+      if (error instanceof ApiError && error.code === "account_exists") {
+        ctx.print(`${human_email} already has an account — signing in instead.`);
+        await startSignin(ctx, human_email, { known: true });
+        return;
+      }
+      throw error;
+    }
 
     // Saved before anything else is printed: the key is returned exactly once
     // and is unrecoverable afterwards, so losing it to a later crash would
     // cost the account.
-    const saved = saveConfig(
-      { ...ctx.config, api_key: out.api_key, organization_id: out.organization_id },
-      ctx.configFile,
-      ctx.configDir
-    );
+    const config = { ...ctx.config, api_key: out.api_key, organization_id: out.organization_id };
+    // A sign-in abandoned before its code arrived must not re-route the
+    // `verify` that belongs to this fresh sign-up.
+    delete config.pending_signin;
+    const saved = saveConfig(config, ctx.configFile, ctx.configDir);
 
     ctx.print(ok(bold(out.inbox_id)));
     ctx.print(ok(`key saved to ${saved}`));
@@ -278,7 +314,22 @@ define(
     ctx.print(arrow(`check ${human_email} for a 6-digit code, then:`));
     ctx.print(`    carlyemail verify <code>`);
     ctx.print("");
-    ctx.print(dim("Until it is confirmed the account can read its own mail but not send."));
+    ctx.print(dim(`Until the code is confirmed the account can only email ${human_email}.`));
+  }
+);
+
+define(
+  "signin",
+  "Sign in to an existing account with an emailed code",
+  "carlyemail signin you@example.com",
+  async (ctx) => {
+    let human_email = ctx.positional[0] || ctx.flags["human-email"];
+    if (typeof human_email !== "string" || !human_email) {
+      const answer = await ctx.ask("The account's owner email: ");
+      if (answer) human_email = answer;
+    }
+    if (!human_email) throw new UsageError("carlyemail signin you@example.com");
+    await startSignin(ctx, human_email);
   }
 );
 
@@ -286,8 +337,24 @@ define("verify", "Confirm the owner email with the code", "carlyemail verify 123
   const code = ctx.positional[0] || ctx.flags.code;
   if (!code) throw new UsageError("the 6-digit code is required: carlyemail verify 123456");
 
+  // A pending sign-in and a sign-up confirmation are the same step to the
+  // person typing the code, but different calls: one trades the code for a new
+  // key, the other upgrades the key sign-up already saved. The config
+  // remembers which one is open.
+  if (ctx.config.pending_signin) {
+    const out = await request(ctx.config, "POST", "/v0/agent/sign-in/verify", {
+      auth: false,
+      body: { human_email: ctx.config.pending_signin, otp_code: String(code) },
+    });
+    const config = { ...ctx.config, api_key: out.api_key, organization_id: out.organization_id };
+    delete config.pending_signin;
+    const saved = saveConfig(config, ctx.configFile, ctx.configDir);
+    ctx.print(ok(`signed in — key saved to ${saved}`));
+    return;
+  }
+
   await request(ctx.config, "POST", "/v0/agent/verify", { body: { otp_code: String(code) } });
-  ctx.print(ok("verified — this account can send now"));
+  ctx.print(ok("verified — this account can send anywhere now"));
 });
 
 define("whoami", "Show the key's identity and scope", "carlyemail whoami", async (ctx) => {
@@ -726,9 +793,9 @@ define("plan", "Show the current plan and its limits", "carlyemail plan", async
   ctx.print(`  ${dim("email")}     ${cap(billing.monthly_emails)} a month`);
 });
 
-define("upgrade", "Get a checkout link for a paid plan", "carlyemail upgrade developer", async (ctx) => {
+define("upgrade", "Get a checkout link for a paid plan", "carlyemail upgrade startup", async (ctx) => {
   const plan = ctx.positional[0] || ctx.flags.plan;
-  if (!plan) throw new UsageError("which plan? carlyemail upgrade developer|startup");
+  if (!plan) throw new UsageError("which plan? carlyemail upgrade startup|business");
   const out = await request(ctx.config, "POST", "/v0/billing/checkout", { body: { plan } });
   emit(ctx, out, () => {
     ctx.print(arrow("open this to upgrade:"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carlyemail",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Real email inboxes your agent can send, receive and reply from. SDK and CLI.",
   "keywords": [
     "email",
@@ -11,13 +11,8 @@
     "mcp",
     "cli"
   ],
-  "homepage": "https://carlyemail.com",
+  "homepage": "https://docs.carlyemail.com",
   "bugs": "https://docs.carlyemail.com/support",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/shirschfield/carlyemail.git",
-    "directory": "cli"
-  },
   "license": "MIT",
   "author": "SWH Labs LLC",
   "type": "module",