insta 0.0.79 → 0.0.80

package/dist/commands/billing.js

@@ -5,7 +5,11 @@ import { cycleLine, dimensionLines } from './metrics.js';
 export async function resolveOrgId(opts) {
     if (opts.org)
         return opts.org;
-    return (await requireProject()).orgId;
+    // `ProjectConfig.orgId` is typed string but INSTA_PROJECT_ID resolves a project with no org.
+    const orgId = (await requireProject()).orgId;
+    if (!orgId)
+        die('INSTA_PROJECT_ID names no organization — set INSTA_ORG_ID, or pass --org <id>');
+    return orgId;
 }
 // Format the billing overview into printable lines (pure, so it's unit-testable).
 // `org` is the caller's --org, echoed into the portal hint: `billing` and `billing portal` resolve

package/dist/commands/domain.js

@@ -36,7 +36,10 @@ export async function domainSearch(keyword, opts, deps) {
 export async function domainBuy(name, opts, deps) {
     const years = whole('--years', opts.years);
     const { api, project: p } = await domainDeps(deps);
-    const res = await api.rawRequest('POST', `/projects/${p.projectId}/domains/orders`, { domainName: name, years });
+    const orgId = p.orgId || die('this project link names no organization — set INSTA_ORG_ID');
+    // The org route still signs for a PROJECT in agent mode: `domain.purchase` is read there, and a
+    // bootstrap session names none, so the platform refuses it.
+    const res = await api.rawRequest('POST', `/orgs/${orgId}/domains/orders`, { domainName: name, years }, { projectId: p.projectId });
     if (handleApproval(res, opts.json))
         return;
     if (opts.json)
@@ -57,12 +60,13 @@ export function ownerOf(host, owned) {
  */
 export async function domainAttach(host, opts, deps) {
     const { api, project: p } = await domainDeps(deps);
+    const orgId = p.orgId || die('this project link names no organization — set INSTA_ORG_ID');
     const name = host.trim().toLowerCase();
-    const { items } = await api.request('GET', `/projects/${p.projectId}/domains`);
+    const { items } = await api.request('GET', `/orgs/${orgId}/domains`);
     const owner = ownerOf(name, items);
     if (!owner) {
         // The domains list holds registered names only; a bought name still registering is an order.
-        const { items: orders } = await api.request('GET', `/projects/${p.projectId}/domains/orders`);
+        const { items: orders } = await api.request('GET', `/orgs/${orgId}/domains/orders`);
         const o = ownerOf(name, orders);
         if (o)
             die(`${o.domainName} is not registered yet — its order is ${o.status}: insta domain status ${o.domainName}`);
@@ -83,10 +87,10 @@ export async function domainAttach(host, opts, deps) {
     info(`then: insta domain status ${owner.domainName}`);
 }
 // ---- list / status ----
-function domainLines(d) {
+function domainLines(d, linked = true) {
     const out = [`${d.domainName}  ${d.status}${d.expiresAt ? `  (expires ${d.expiresAt.slice(0, 10)}${d.autorenew ? ', auto-renews' : ''})` : ''}`];
     // Vacuously true for a domain with no hostnames, which is every domain until something attaches.
-    if (d.hostnames.every((h) => h.state === 'failed')) {
+    if (linked && d.hostnames.every((h) => h.state === 'failed')) {
         const names = d.hostnames.map((h) => h.hostname);
         // Attaching the bought name itself re-attaches its www.
         const retry = names.includes(d.domainName) ? names.filter((h) => h !== `www.${d.domainName}`) : names;
@@ -97,30 +101,29 @@ function domainLines(d) {
         out.push(`  ${h.hostname.padEnd(w)}  ${h.state}${h.service ? ` → ${h.service}` : ''}${h.reason ? ` — ${h.reason}` : ''}`);
     return out;
 }
-function orderStatusLines(o) {
+function orderStatusLines(o, linked = true) {
     const out = [`order ${o.id}: ${o.domainName} — ${o.status}${o.failedReason ? ` — ${o.failedReason}` : ''}`];
-    if (o.status === 'canceled')
+    if (linked && o.status === 'canceled')
         out.push(`  the checkout closed without payment — order again: insta domain buy ${o.domainName}`);
     return out;
 }
 export async function domainList(opts, deps) {
-    const { api, project: p } = await domainDeps(deps);
-    const r = await api.request('GET', `/projects/${p.projectId}/domains`);
+    const { api, orgId } = await orgDeps(opts, deps);
+    const r = await api.request('GET', `/orgs/${orgId}/domains`);
     if (opts.json)
         return printJson(r);
     if (!r.items.length)
         return info('no domains bought through InstaCloud in this org (search: insta domain search <keyword>)');
     for (const d of r.items)
-        for (const line of domainLines(d))
+        for (const line of domainLines(d, !opts.org))
             info(line);
 }
 export async function domainStatus(name, opts, deps) {
-    const { api, project: p } = await domainDeps(deps);
+    const { api, orgId } = await orgDeps(opts, deps);
     const host = name.trim().toLowerCase();
-    // Both are the ORG's; the project in the path is the scope the agent policy is read at.
     const [{ items: domains }, { items: orders }] = await Promise.all([
-        api.request('GET', `/projects/${p.projectId}/domains`),
-        api.request('GET', `/projects/${p.projectId}/domains/orders`),
+        api.request('GET', `/orgs/${orgId}/domains`),
+        api.request('GET', `/orgs/${orgId}/domains/orders`),
     ]);
     const domain = domains.find((d) => d.domainName === host) ?? null;
     const order = orders.find((o) => o.domainName === host) ?? null;
@@ -128,7 +131,7 @@ export async function domainStatus(name, opts, deps) {
         die(`${host} was not bought through this org`);
     if (opts.json)
         return printJson({ domain, order });
-    for (const line of domain ? domainLines(domain) : orderStatusLines(order))
+    for (const line of domain ? domainLines(domain, !opts.org) : orderStatusLines(order, !opts.org))
         info(line);
 }
 export function recordLines(records) {

package/dist/index.js

@@ -371,9 +371,11 @@ dom.command('buy <name>').description('Buy a domain — pay at the printed Strip
 dom.command('attach <hostname>').description('Point a bought domain, or any subdomain of one, at a compute service — `abc.com` binds it and its www, `api.abc.com` binds only that (gated: deploy)')
     .option('--branch <b>').option('--group <g>', "compute service (default: the branch's sole compute service)").option('--json')
     .action(guard((hostname, o) => domainCmd.domainAttach(hostname, o)));
-dom.command('list').description("Domains bought through InstaCloud in this org — a domain belongs to the org, each of its hostnames to a service").option('--json')
+dom.command('list').description("Domains bought through InstaCloud in this org — a domain belongs to the org, each of its hostnames to a service")
+    .option('--org <id>', "target org (default: linked project's org)").option('--json')
     .action(guard((o) => domainCmd.domainList(o)));
-dom.command('status <name>').description("A bought domain's order and attach state").option('--json')
+dom.command('status <name>').description("A bought domain's order and attach state")
+    .option('--org <id>', "target org (default: linked project's org)").option('--json')
     .action(guard((name, o) => domainCmd.domainStatus(name, o)));
 const rec = dom.command('records').description('DNS records of a bought domain — the zone InstaCloud holds at the registrar');
 rec.command('list <domain>').description('Every record in the zone, managed ones marked')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "insta",
-  "version": "0.0.79",
+  "version": "0.0.80",
   "type": "module",
   "description": "InstaCloud CLI — a thin client of the platform control-plane API.",
   "keywords": [