@abyssinia-labs/sokie 0.4.0 → 0.5.0-staging.125

package/dist/sokie.mjs

@@ -24033,9 +24033,9 @@ var require___dev__ = __commonJS((exports, module) => {
 
 // package.json
 var name = "@abyssinia-labs/sokie";
-var version = "0.4.0";
+var version = "0.5.0-staging.125";
 var sokie = {
-  site: "https://sokie.sh"
+  site: "https://staging.sokie.sh"
 };
 
 // src/command.ts
@@ -65881,6 +65881,332 @@ from ${DEV_SECRETS_FILE}, which must be gitignored.`,
   run: run5
 };
 
+// src/commands/domains.ts
+import { stdin as stdin4 } from "node:process";
+
+// src/domains-api.ts
+var query2 = (name3) => makeFunctionReference(name3);
+var mutation2 = (name3) => makeFunctionReference(name3);
+var domainFn = {
+  workspace: query2("domains:workspace"),
+  hostnames: query2("domains:hostnames"),
+  addWorkspace: mutation2("domains:add"),
+  removeWorkspace: mutation2("domains:remove"),
+  checkWorkspace: mutation2("domains:checkNow"),
+  forServer: query2("serverDomains:forServer"),
+  addExact: mutation2("serverDomains:addExact"),
+  removeExact: mutation2("serverDomains:removeExact"),
+  checkServer: mutation2("serverDomains:checkNow")
+};
+
+// src/domains.ts
+var USAGE = new Set(["BAD_DOMAIN", "BARE_DOMAIN", "OUR_DOMAIN", "BAD_NAME"]);
+function refused3(out, error62) {
+  if (!(error62 instanceof ConvexError))
+    return null;
+  const data = error62.data;
+  if (typeof data !== "object" || data === null)
+    return null;
+  const { code: code2, message } = data;
+  if (typeof code2 !== "string" || typeof message !== "string")
+    return null;
+  return fail(out, code2.toLowerCase(), message, USAGE.has(code2) ? EXIT.usage : EXIT.no);
+}
+var STATUS = {
+  waiting: { text: "waiting for DNS", tone: "warn" },
+  issuing: { text: "getting a certificate", tone: "warn" },
+  live: { text: "live", tone: "ok" },
+  problem: { text: "needs a fix", tone: "fail" }
+};
+function statusOf2(view) {
+  return STATUS[view.status];
+}
+function recordLines(records) {
+  const width = Math.max(...records.map((r) => r.name.length));
+  return records.map((r) => `  ${r.type.padEnd(7)} ${r.name.padEnd(width)}   ${r.value}`);
+}
+async function allHostnames(client) {
+  const rows = [];
+  let cursor = null;
+  for (;; ) {
+    const page = await client.query(domainFn.hostnames, {
+      paginationOpts: { numItems: 100, cursor }
+    });
+    rows.push(...page.page);
+    if (page.isDone)
+      return rows;
+    cursor = page.continueCursor;
+  }
+}
+function hostnameLines(rows) {
+  const server = Math.max(...rows.map((r) => r.serverName.length));
+  const host = Math.max(...rows.map((r) => r.hostname.length));
+  return rows.map((row) => {
+    const status = statusOf2(row);
+    const own2 = row.kind === "exact" ? "  (its own domain)" : "";
+    return {
+      text: `  ${row.serverName.padEnd(server)}   ${row.hostname.padEnd(host)}   ${status.text}${own2}`,
+      tone: status.tone
+    };
+  });
+}
+async function listDomains(out, client) {
+  const setup = await client.query(domainFn.workspace, {});
+  const hostnames = await allHostnames(client);
+  if (!setup.configured) {
+    await out.line("Custom domains aren't set up on this Sokie deployment yet.", "dim");
+  } else if (!setup.available && !setup.domain && hostnames.length === 0) {
+    await out.line("Custom domains come with Pro and Scale. Upgrade on the Billing page.", "dim");
+  }
+  const domain2 = setup.domain;
+  if (domain2) {
+    const verified = domain2.status === "verified";
+    const servers = `${domain2.hostnameCount} server${domain2.hostnameCount === 1 ? "" : "s"}`;
+    await out.line(`${domain2.domain}   ${verified ? `verified   ${servers}` : "waiting for its records"}`, verified ? "ok" : "warn");
+    if (!verified)
+      for (const line of recordLines(domain2.records))
+        await out.line(line);
+  }
+  if (hostnames.length > 0) {
+    if (domain2)
+      await out.line();
+    for (const line of hostnameLines(hostnames))
+      await out.line(line.text, line.tone);
+  }
+  if (setup.configured && setup.available && !domain2 && hostnames.length === 0) {
+    await out.line("No custom domains. sokie domains add mcp.acme.com verifies one for the workspace.");
+  }
+  await out.result({ ok: true, domain: domain2, hostnames });
+  return EXIT.ok;
+}
+async function findDomain(client, domain2) {
+  const wanted = domain2.trim().toLowerCase().replace(/\.+$/, "");
+  const setup = await client.query(domainFn.workspace, {});
+  if (setup.domain?.domain === wanted)
+    return { workspace: setup.domain };
+  const row = (await allHostnames(client)).find((h) => h.hostname === wanted);
+  return row ? { hostname: row } : null;
+}
+async function checkDomains(out, client, server) {
+  if (server)
+    await client.mutation(domainFn.checkServer, { serverId: server.serverId });
+  else
+    await client.mutation(domainFn.checkWorkspace, {});
+  await out.line(`Checking ${server ? `${server.slug}'s domains` : "the workspace domain"} now. sokie domains shows what Sokie finds.`);
+  await out.result({ ok: true, checking: server ? server.slug : "workspace" });
+  return EXIT.ok;
+}
+
+// src/domains-add.ts
+var POLL_MS2 = 5000;
+var WAIT_MS2 = 30 * 60000;
+async function followWorkspace(out, client, deps) {
+  const seen = { txt: false, cname: false };
+  for (let waited = 0;waited < WAIT_MS2; waited += POLL_MS2) {
+    const domain2 = (await client.query(domainFn.workspace, {})).domain;
+    if (!domain2)
+      return null;
+    if (domain2.found.txt && !seen.txt)
+      await out.line("  ✓ TXT found", "ok");
+    if (domain2.found.cname && !seen.cname)
+      await out.line("  ✓ CNAME found", "ok");
+    Object.assign(seen, domain2.found);
+    if (domain2.status === "verified") {
+      await out.line(`  ✓ ${domain2.domain} is verified`, "ok");
+      return followNames(out, client, domain2.domain, deps, WAIT_MS2 - waited);
+    }
+    await deps.sleep(POLL_MS2);
+  }
+  await out.line("Still waiting. Sokie keeps checking; sokie domains shows where it stands.", "dim");
+  return null;
+}
+async function followNames(out, client, domain2, deps, left) {
+  let names = [];
+  for (let waited = 0;waited < left; waited += POLL_MS2) {
+    names = (await allHostnames(client)).filter((h) => h.hostname.endsWith(`.${domain2}`));
+    if (names.length > 0 && names.every((h) => h.status === "live")) {
+      const list = names.map((h) => h.serverName).join(", ");
+      await out.line(`  ● ${names.length} server${names.length === 1 ? "" : "s"} live under it: ${list}`, "ok");
+      await out.line("New servers get theirs as they are made.", "dim");
+      return names;
+    }
+    await deps.sleep(POLL_MS2);
+  }
+  await out.line("Servers are still getting their certificates; sokie domains shows each.", "dim");
+  return names;
+}
+async function followExact(out, client, server, deps) {
+  let said = "";
+  for (let waited = 0;waited < WAIT_MS2; waited += POLL_MS2) {
+    const card = await client.query(domainFn.forServer, { serverId: server.serverId });
+    const exact = card.exact;
+    if (!exact)
+      return null;
+    const now = exact.status === "problem" ? exact.problem ?? "problem" : exact.status;
+    if (now !== said) {
+      said = now;
+      if (exact.status === "waiting")
+        await out.line("  ◐ waiting for DNS", "warn");
+      if (exact.status === "issuing")
+        await out.line("  ◐ getting a certificate", "warn");
+      if (exact.status === "problem")
+        await out.line(`  ✕ ${exact.problem ?? ""}`, "fail");
+    }
+    if (exact.status === "live") {
+      const shown = exact.primary ? `, now the address Sokie shows for ${server.slug}` : "";
+      await out.line(`  ● live · https://${exact.hostname}/mcp${shown}`, "ok");
+      const others = [card.name?.hostname, card.ownHost].filter(Boolean).join(" and ");
+      if (others)
+        await out.line(`${others} keep${others.includes(" and ") ? "" : "s"} working.`, "dim");
+      return exact;
+    }
+    await deps.sleep(POLL_MS2);
+  }
+  await out.line("Still waiting. Sokie keeps checking; sokie domains shows where it stands.", "dim");
+  return null;
+}
+async function addDomain(out, client, domain2, options, deps) {
+  const { server, wait } = options;
+  try {
+    if (!server) {
+      const added2 = await client.mutation(domainFn.addWorkspace, { domain: domain2 });
+      await out.line("A workspace domain: every server here gets a name under it. Add these two records, once:", "strong");
+      await out.line();
+      for (const line of recordLines(added2.records))
+        await out.line(line);
+      await out.line();
+      if (!wait) {
+        await out.line("At Cloudflare, leave the CNAME DNS only. Sokie checks every minute.", "dim");
+        await out.result({ ok: true, domain: added2 });
+        return EXIT.ok;
+      }
+      await out.line("At Cloudflare, leave the CNAME DNS only. Waiting for both (Ctrl+C stops waiting; Sokie keeps checking)…", "dim");
+      const names = await followWorkspace(out, client, deps);
+      await out.result({ ok: true, domain: added2, ...names ? { hostnames: names } : {} });
+      return EXIT.ok;
+    }
+    const added = await client.mutation(domainFn.addExact, { serverId: server.serverId, domain: domain2 });
+    if (added.records) {
+      await out.line(`An exact domain for ${server.slug}. Add these records:`, "strong");
+      for (const line of recordLines(added.records))
+        await out.line(line);
+      await out.line("The TXT proves the domain is yours. At Cloudflare, leave the CNAME DNS only.", "dim");
+    } else {
+      await out.line(`${added.hostname} is under your workspace domain: nothing to add.`, "strong");
+    }
+    const live = wait ? await followExact(out, client, server, deps) : null;
+    await out.result({ ok: true, server: server.slug, hostname: live ?? added });
+    return EXIT.ok;
+  } catch (error62) {
+    const failure = refused3(out, error62);
+    if (failure)
+      return failure;
+    throw error62;
+  }
+}
+async function removeDomain(out, client, domain2, yes, deps) {
+  const found = await findDomain(client, domain2);
+  if (!found) {
+    return fail(out, "not_found", `${domain2} isn't one of this workspace's domains.`, EXIT.no);
+  }
+  if ("hostname" in found && found.hostname.kind === "workspace") {
+    return fail(out, "is_a_name", `${found.hostname.hostname} is ${found.hostname.serverName}'s name under the workspace domain. Rename it on the server's Settings tab, or remove the workspace domain.`, EXIT.no);
+  }
+  const what = "workspace" in found ? `${found.workspace.domain} and every server's name under it` : `${found.hostname.hostname} from ${found.hostname.serverName}`;
+  if (!yes) {
+    if (!deps.interactive || out.json) {
+      return fail(out, "needs_confirmation", "Confirm it in a terminal, or pass --yes.", EXIT.usage);
+    }
+    if (!await deps.confirm(`Remove ${what}? It stops answering at once.`)) {
+      await out.line("Nothing changed.", "dim");
+      await out.result({ ok: false, error: { code: "declined", message: "Nothing changed." } });
+      return EXIT.no;
+    }
+  }
+  if ("workspace" in found)
+    await client.mutation(domainFn.removeWorkspace, {});
+  else
+    await client.mutation(domainFn.removeExact, { serverId: found.hostname.serverId });
+  await out.line(`Removed ${what}. Each server's own address keeps working.`, "ok");
+  await out.result({
+    ok: true,
+    removed: "workspace" in found ? found.workspace.domain : found.hostname.hostname
+  });
+  return EXIT.ok;
+}
+
+// src/commands/domains.ts
+var VERBS2 = ["list", "add", "remove", "check"];
+async function runDomains(argv, out, deps) {
+  const { values, positionals } = parseCommandArgs(argv, {
+    ...SITE_OPTION,
+    server: { type: "string" },
+    wait: { type: "boolean", default: false },
+    yes: { type: "boolean", default: false }
+  });
+  const [verb = "list", domain2, ...rest] = positionals;
+  if (!VERBS2.includes(verb)) {
+    throw new UsageError(`No "${verb}": say add, remove or check, or nothing to list domains.`);
+  }
+  if ((verb === "add" || verb === "remove") && (!domain2 || rest.length > 0)) {
+    throw new UsageError(`Give one domain: sokie domains ${verb} mcp.acme.com.`);
+  }
+  if ((verb === "list" || verb === "check") && domain2) {
+    throw new UsageError(`sokie domains ${verb === "list" ? "" : "check "}takes no domain.`);
+  }
+  const wait = {
+    interactive: deps.interactive ?? stdin4.isTTY === true,
+    confirm: deps.confirm ?? confirm,
+    sleep: deps.sleep ?? ((ms) => new Promise((done) => setTimeout(done, ms)))
+  };
+  return deps.signedIn(out, values.site, async (_info, client) => {
+    try {
+      const server = values.server ? await serverBySlug(client, values.server) : null;
+      if (verb === "add") {
+        return await addDomain(out, client, domain2 ?? "", { server, wait: values.wait }, wait);
+      }
+      if (verb === "remove")
+        return await removeDomain(out, client, domain2 ?? "", values.yes, wait);
+      if (verb === "check")
+        return await checkDomains(out, client, server);
+      return await listDomains(out, client);
+    } catch (error62) {
+      if (error62 instanceof DeployError)
+        return fail(out, error62.code, error62.message, EXIT.no);
+      throw error62;
+    }
+  });
+}
+var domainsCommand = {
+  name: "domains",
+  synopsis: "sokie domains [add <domain> [--server <slug>] [--wait] | remove <domain> [--yes] | check [--server <slug>]] [--site <url>]",
+  summary: "Serve your servers at your own domain: one for the workspace, or one per server.",
+  help: `With no verb, lists the workspace domain and every address its servers
+answer on, with where each stands. Custom domains come with Pro and Scale.
+
+add <domain>
+  Verifies a workspace domain, like mcp.acme.com: every server gets a name
+  under it, like stripe-billing.mcp.acme.com. Prints the two DNS records to
+  add (a TXT that proves it's yours, a wildcard CNAME).
+add <domain> --server <slug>
+  Gives one server an exact domain, like billing.acme.com, shown as its
+  address once live. Prints its TXT and CNAME records.
+  --wait  Follows the domain until it's live. Ctrl+C stops waiting; Sokie
+          keeps checking every minute either way.
+
+remove <domain>
+  Removes the workspace domain, with every server's name under it, or a
+  server's exact domain. Asks first; --yes doesn't.
+
+check
+  Looks at the DNS records now instead of at the next minute, and starts
+  again if Sokie had stopped after three days. --server checks a server's.
+
+A bare domain like acme.com can't point here: use a subdomain.
+${SITE_HELP}`,
+  run: (argv, out) => runDomains(argv, out, { signedIn: withSignedIn })
+};
+
 // src/commands/edit.ts
 import { resolve as resolve7 } from "node:path";
 
@@ -66332,10 +66658,10 @@ the file would change.`,
 // src/commands/init.ts
 import { existsSync as existsSync12, mkdirSync as mkdirSync7, readFileSync as readFileSync10, writeFileSync as writeFileSync9 } from "node:fs";
 import { basename as basename2, dirname as dirname7, extname, join as join13, relative as relative2, resolve as resolve9, sep as sep3 } from "node:path";
-import { stdin as stdin4, stdout } from "node:process";
+import { stdin as stdin5, stdout } from "node:process";
 var FETCH_TIMEOUT_MS = 30000;
 var TERMINAL3 = {
-  interactive: stdin4.isTTY === true && stdout.isTTY === true,
+  interactive: stdin5.isTTY === true && stdout.isTTY === true,
   askSecret: readSecretValue
 };
 function perCaller(auth2) {
@@ -66482,8 +66808,8 @@ function openBrowser(url2) {
 }
 
 // src/commands/link.ts
-var POLL_MS2 = 2000;
-var WAIT_MS2 = 10 * 60 * 1000;
+var POLL_MS3 = 2000;
+var WAIT_MS3 = 10 * 60 * 1000;
 var DIALOG_WAIT_MS = 20 * 60 * 1000;
 var DEPS = {
   signedIn: withSignedIn,
@@ -66524,7 +66850,7 @@ async function runLink(argv, out, deps = DEPS) {
       deps.open(started.url);
       if (!repo)
         await out.line("Pick the repository and folder there. Waiting for the link…");
-      const deadline = deps.now() + (repo ? WAIT_MS2 : DIALOG_WAIT_MS);
+      const deadline = deps.now() + (repo ? WAIT_MS3 : DIALOG_WAIT_MS);
       for (;; ) {
         const status = await client.query(fn.linkRequest, { requestId: started.requestId });
         if (status.status === "linked") {
@@ -66536,7 +66862,7 @@ async function runLink(argv, out, deps = DEPS) {
         if (status.status !== "pending" || deps.now() > deadline) {
           return fail(out, "link_failed", status.message ?? "The link request expired. Run `sokie link` again.", EXIT.no);
         }
-        await deps.sleep(POLL_MS2);
+        await deps.sleep(POLL_MS3);
       }
     } catch (error62) {
       if (error62 instanceof DeployError)
@@ -66630,7 +66956,7 @@ function startCallbackServer() {
 }
 
 // src/commands/login.ts
-var WAIT_MS3 = 5 * 60 * 1000;
+var WAIT_MS4 = 5 * 60 * 1000;
 var PASTE_PORT = 53682;
 async function clientIdFor(info2) {
   const stored = readCredentials(info2.site);
@@ -66669,7 +66995,7 @@ async function run7(argv, out) {
     await out.line(url2, "dim");
     openBrowser(url2);
     try {
-      ({ code: code2, iss } = await server.wait(state, WAIT_MS3));
+      ({ code: code2, iss } = await server.wait(state, WAIT_MS4));
     } catch (error62) {
       return fail(out, "login_refused", error62 instanceof Error ? error62.message : String(error62), EXIT.no);
     } finally {
@@ -67576,6 +67902,7 @@ var COMMANDS = [
   deploysCommand,
   linkCommand,
   secretsCommand,
+  domainsCommand,
   logsCommand,
   auditCommand,
   configCommand,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@abyssinia-labs/sokie",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.5.0-staging.125",
   "description": "Turn an OpenAPI or Swagger spec into an MCP server, run it on your machine, and deploy it to Sokie. The sokie command (alias sok).",
   "license": "Apache-2.0",
   "homepage": "https://sokie.sh/docs/cli",
@@ -10,7 +10,7 @@
   },
   "author": "Abyssinia Labs <hello@sokie.sh> (https://sokie.sh)",
   "sokie": {
-    "site": "https://sokie.sh"
+    "site": "https://staging.sokie.sh"
   },
   "keywords": [
     "mcp",