insta 0.0.74 → 0.0.76

package/dist/commands/compute.js

@@ -672,6 +672,10 @@ export function volumeDeleteError(e) {
 // 403/400 messages carry the upgrade hints and must reach the user verbatim (the guard prints
 // ApiError messages as-is).
 export async function computeVolume(serviceName, opts) {
+    if (opts.delete && opts.mountPath !== undefined)
+        throw new Error('--delete cannot be combined with --mount-path');
+    if (opts.mountPath !== undefined && !opts.size)
+        throw new Error('--mount-path requires --size when attaching a volume');
     if (opts.delete && opts.size)
         throw new Error('--delete cannot be combined with --size (one changes the volume, the other destroys it)');
     const api = await ApiClient.load();
@@ -703,7 +707,7 @@ export async function computeVolume(serviceName, opts) {
         return;
     }
     const sizeGib = parseVolumeGib(opts.size);
-    const res = await api.rawRequest('PUT', `/projects/${p.projectId}/services/${id}/volume`, { sizeGib });
+    const res = await api.rawRequest('PUT', `/projects/${p.projectId}/services/${id}/volume`, { sizeGib, ...(opts.mountPath !== undefined ? { mountPath: opts.mountPath } : {}) });
     if (handleApproval(res, opts.json))
         return;
     if (opts.json)

package/dist/commands/domain.js

@@ -15,7 +15,9 @@ export function searchLines(results) {
     const w = Math.max(...results.map((r) => r.domainName.length));
     return results.map((r) => r.purchasable
         ? `  ${r.domainName.padEnd(w)}  ${usd(r.priceCents)}${r.renewalPriceCents !== undefined ? `  (renews ${usd(r.renewalPriceCents)}/yr)` : ''}`
-        : `  ${r.domainName.padEnd(w)}  unavailable${r.reason ? ` — ${r.reason}` : ''}`);
+        // The platform's default reason for every unpurchasable row IS `unavailable`, so passing it
+        // through prints the word twice.
+        : `  ${r.domainName.padEnd(w)}  unavailable${r.reason && r.reason !== 'unavailable' ? ` — ${r.reason}` : ''}`);
 }
 export async function domainSearch(keyword, opts, deps) {
     const { api, orgId } = await orgDeps(opts, deps);
@@ -33,8 +35,6 @@ export async function domainSearch(keyword, opts, deps) {
 }
 export async function domainBuy(name, opts, deps) {
     const { api, project: p } = await domainDeps(deps);
-    const branch = opts.branch ?? p.branch;
-    const { target } = await domainTarget(api, p.projectId, branch, name, opts.group);
     // JSON.stringify drops undefined but keeps NaN as null, which the platform rejects as a type
     // error rather than a bad term — so a malformed --years is refused here, with the reason.
     let years;
@@ -43,38 +43,65 @@ export async function domainBuy(name, opts, deps) {
         if (!Number.isInteger(years))
             die(`--years must be a whole number of years, not ${opts.years}`);
     }
-    const res = await api.rawRequest('POST', `/projects/${p.projectId}/domains/orders`, { domainName: name, years, branch, group: target.name });
+    const res = await api.rawRequest('POST', `/projects/${p.projectId}/domains/orders`, { domainName: name, years });
     if (handleApproval(res, opts.json))
         return;
     if (opts.json)
         return printJson(res.body);
     const { order } = res.body;
     info(`${order.domainName} — ${usd(order.priceCents)} for ${order.years} year${order.years === 1 ? '' : 's'}${order.renewalPriceCents !== null ? `, then ${usd(order.renewalPriceCents)}/yr` : ''}`);
-    info(`attaches to ${target.name}${order.branch ? ` (branch ${order.branch})` : ''} as ${order.domainName} and www.${order.domainName} once paid`);
     presentUrl(order.checkoutUrl, 'Complete the payment in your browser:', opts.open);
-    info(`then: insta domain status ${order.domainName}`);
+    info(`then attach it: insta domain attach ${order.domainName}`);
+}
+// The bought name `host` sits under. At most one name can match: only apex names are sold, so no bought
+// domain is ever a subdomain of another.
+export function ownerOf(host, owned) {
+    return owned.find((d) => host === d.domainName || host.endsWith(`.${d.domainName}`)) ?? null;
 }
-export async function domainAttach(name, opts, deps) {
+/**
+ * Point one hostname at a compute service. `host` is a bought name — which binds it and its www —
+ * or any subdomain of one, which binds only that; the rest of the domain is left as it is.
+ */
+export async function domainAttach(host, opts, deps) {
     const { api, project: p } = await domainDeps(deps);
+    const name = host.trim().toLowerCase();
+    const { items } = await api.request('GET', `/projects/${p.projectId}/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 o = ownerOf(name, orders);
+        if (o)
+            die(`${o.domainName} is not registered yet — its order is ${o.status}: insta domain status ${o.domainName}`);
+        die(`no domain this org bought covers ${name} — for a domain you own elsewhere: insta compute set-domain ${name}`);
+    }
     const branch = opts.branch ?? p.branch;
     const { target } = await domainTarget(api, p.projectId, branch, name, opts.group);
-    const res = await api.rawRequest('POST', `/projects/${p.projectId}/domains/${encodeURIComponent(name)}/attach`, { branch, group: target.name });
+    const hostname = name === owner.domainName ? undefined : name;
+    const res = await api.rawRequest('POST', `/projects/${p.projectId}/domains/${encodeURIComponent(owner.domainName)}/attach`, { hostname, branch, group: target.name });
     if (handleApproval(res, opts.json))
         return;
     if (opts.json)
         return printJson(res.body);
-    const d = res.body;
-    info(`${d.domainName} will attach to ${target.name} as ${d.hostnames.map((h) => h.hostname).join(' and ')}`);
-    info(`then: insta domain status ${d.domainName}`);
+    // What THIS call asked for. Reading it back off the answer would also name a hostname some
+    // earlier attach left pending, which this command did not touch.
+    const asked = hostname ? [hostname] : [owner.domainName, `www.${owner.domainName}`];
+    info(`${asked.join(' and ')} will attach to ${target.name}`);
+    info(`then: insta domain status ${owner.domainName}`);
 }
 // ---- list / status ----
 function domainLines(d) {
-    const out = [`${d.domainName}  ${d.status}${d.service ? `  → ${d.service}` : ''}${d.expiresAt ? `  (expires ${d.expiresAt.slice(0, 10)}${d.autorenew ? ', auto-renews' : ''})` : ''}`];
-    if (d.status === 'detached' || d.status === 'attach_failed')
-        out.push(`  attach it again: insta domain attach ${d.domainName}`);
+    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')) {
+        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;
+        out.push(`  nothing serving — ${(retry.length ? retry : [d.domainName]).map((h) => `insta domain attach ${h}`).join('; ')}`);
+    }
     const w = Math.max(0, ...d.hostnames.map((x) => x.hostname.length));
     for (const h of d.hostnames)
-        out.push(`  ${h.hostname.padEnd(w)}  ${h.state}${h.reason ? ` — ${h.reason}` : ''}`);
+        out.push(`  ${h.hostname.padEnd(w)}  ${h.state}${h.service ? ` → ${h.service}` : ''}${h.reason ? ` — ${h.reason}` : ''}`);
     return out;
 }
 function orderStatusLines(o) {
@@ -89,7 +116,7 @@ export async function domainList(opts, deps) {
     if (opts.json)
         return printJson(r);
     if (!r.items.length)
-        return info('no domains bought through InstaCloud in this project (search: insta domain search <keyword>)');
+        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))
             info(line);
@@ -97,6 +124,7 @@ export async function domainList(opts, deps) {
 export async function domainStatus(name, opts, deps) {
     const { api, project: p } = await domainDeps(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`),
@@ -104,7 +132,7 @@ export async function domainStatus(name, opts, deps) {
     const domain = domains.find((d) => d.domainName === host) ?? null;
     const order = orders.find((o) => o.domainName === host) ?? null;
     if (!domain && !order)
-        die(`${host} was not bought through this project`);
+        die(`${host} was not bought through this org`);
     if (opts.json)
         return printJson({ domain, order });
     for (const line of domain ? domainLines(domain) : orderStatusLines(order))

package/dist/commands/services.js

@@ -90,6 +90,7 @@ export function servicesAddRequestBody(type, name, branch, opts) {
         // false. Omitted means the platform default.
         ...(opts.alwaysOn !== undefined ? { alwaysOn: opts.alwaysOn } : {}),
         ...(opts.volume !== undefined ? { volumeGib: parseVolumeGib(opts.volume) } : {}),
+        ...(opts.mountPath !== undefined ? { volumeMountPath: opts.mountPath } : {}),
     };
 }
 export async function servicesAdd(type, name, opts = {}) {
@@ -108,6 +109,8 @@ export async function servicesAdd(type, name, opts = {}) {
     // Presence, not truthiness: `--no-always-on` is an explicit false and is just as compute-only.
     if (opts.alwaysOn !== undefined && type !== 'compute')
         throw new Error('--always-on / --no-always-on is only valid for compute services (for postgres, use `insta db always-on on|off` after creation)');
+    if (opts.mountPath !== undefined && (type !== 'compute' || opts.volume === undefined))
+        throw new Error('--mount-path requires --volume on a compute service');
     if (opts.volume !== undefined) {
         if (type !== 'compute')
             throw new Error('--volume is only valid for compute services (postgres has one by default — grow it with `insta db volume --size`)');
@@ -138,7 +141,7 @@ export async function servicesAdd(type, name, opts = {}) {
 export function serviceAddedLine(type, name, branch, svc) {
     const access = svc.type === 'storage' ? `  [${svc.public ? 'public' : 'private'}]` : '';
     const img = svc.image ? `  running ${svc.image}${svc.port ? `:${svc.port}` : ''}` : '';
-    const vol = svc.volume_gib ? `  vol ${svc.volume_gib}Gi at /data` : '';
+    const vol = svc.volume_gib ? `  vol ${svc.volume_gib}Gi at ${svc.volume_mount_path ?? "/data"}` : '';
     // The major belongs next to the connect hint: it decides which psql/pg_dump to reach for.
     const pg = svc.type === 'postgres' ? pgBadge(svc.pg_version) : '';
     return `added ${type} service ${name} on ${branch ?? 'default'} (${svc.id})${access}${svc.region ? `  ${svc.region}` : ''}${img}${vol}${pg}${svc.domain ? ` — ${svc.domain}` : ''}`;
@@ -153,7 +156,7 @@ export function pgBadge(v) {
 // billingLines in billing.ts). Compute rows show the running image when the platform reports one.
 export function serviceListLine(s) {
     const extra = s.type === 'compute'
-        ? `  x${s.machine_count}${s.volume_gib ? `  vol ${s.volume_gib}Gi` : ''}${s.image ? `  running ${s.image}${s.port ? `:${s.port}` : ''}` : ''}`
+        ? `  x${s.machine_count}${s.volume_gib ? `  vol ${s.volume_gib}Gi at ${s.volume_mount_path ?? '/data'}` : ''}${s.image ? `  running ${s.image}${s.port ? `:${s.port}` : ''}` : ''}`
         : ['redis', 'mysql', 'mongodb'].includes(s.type) ? `  tcp/${s.port ?? defaultDatabasePort(s.type)}${s.volume_gib ? `  vol ${s.volume_gib}Gi` : ''}`
             : s.type === 'storage' ? `  ${s.public ? 'public' : 'private'}`
                 // Postgres major, so the reader picks matching pg_dump/psql BEFORE connecting (a newer client

package/dist/commands/template.js

@@ -352,7 +352,14 @@ export async function templateDeploy(target, opts = {}, deps = {}) {
     const onAutoResolved = quiet ? undefined : (v) => info(`  ${v.name}: ${v.generate ? `platform-generated (${v.generate})` : `default (${v.default})`}`);
     const variables = await resolveVariables(vars, given, { tty, ask, onAutoResolved });
     // The endpoint takes the branch NAME directly (branchId is its uuid alias) — no lookup needed.
-    const body = { ...(mode.kind === 'registry' ? { templateCode: mode.code } : { manifest }), branch: branchName, variables };
+    // Presence, not truthiness: `--region ''` must reach the platform's 400 rather than be dropped
+    // into the default region. An omitted flag still sends no key, so a retry keeps the recorded one.
+    const body = {
+        ...(mode.kind === 'registry' ? { templateCode: mode.code } : { manifest }),
+        branch: branchName,
+        variables,
+        ...(opts.region !== undefined ? { region: opts.region } : {}),
+    };
     let res;
     try {
         res = await api.rawRequest('POST', `/projects/${p.projectId}/template-deployments`, body);
@@ -371,9 +378,10 @@ export async function templateDeploy(target, opts = {}, deps = {}) {
     if (handleApproval(res, opts.json))
         return;
     const deploymentId = res.body.deploymentId ?? (res.body.deployment ?? res.body).id;
+    const acceptedRegion = (res.body.deployment ?? res.body).region;
     const codeLabel = manifest?.code ?? target;
     if (!quiet)
-        info(`deploying template ${codeLabel} to branch ${branchName} (${deploymentId})`);
+        info(`deploying template ${codeLabel} to branch ${branchName}${acceptedRegion ? ` in ${acceptedRegion}` : ''} (${deploymentId})`);
     // The poll route is keyed by deployment id, not project: name the project so agent mode signs
     // with the project-bound session (a bootstrap session is rejected as "for a different project").
     const dep = await watchDeployment((id) => api.request('GET', `/template-deployments/${id}`, undefined, { projectId: p.projectId }), deploymentId, quiet ? () => { } : info, deps.wait);

package/dist/index.js

@@ -150,7 +150,8 @@ svc.command('add [type] [name]').description('Provision a service on demand (ass
     .option('--port <n>', 'compute only: port the image listens on (default 8080)')
     .option('--always-on', 'compute only: create as always-on — never scales to zero (the default for new compute services; all plans; billing is actual usage either way)')
     .option('--no-always-on', 'compute only: create as scale-to-zero — idle machines suspend and wake on the next request')
-    .option('--volume <gi>', 'compute only: attach a persistent /data volume of this many whole Gi (also attachable later: `insta compute volume <name> --size <gi>`). Any plan may attach up to its own plan cap (10Gi free, 50Gi paid by default; the bare `insta compute volume <name>` read prints it as plan max); a size above the free cap is paid. Volume services keep 1 machine and stop (cold wake) instead of suspend when idle')
+    .option('--mount-path <path>', 'compute only: container mount path for a new volume (requires --volume; default /data; fixed after attachment)')
+    .option('--volume <gi>', 'compute only: attach a persistent volume of this many whole Gi (also attachable later: `insta compute volume <name> --size <gi>`). Any plan may attach up to its own plan cap (10Gi free, 50Gi paid by default; the bare `insta compute volume <name>` read prints it as plan max); a size above the free cap is paid. Volume services keep 1 machine and stop (cold wake) instead of suspend when idle')
     .option('--json')
     .action(guard(async (type, name, o) => {
     const a = await resolveServiceArgs(type, name, serviceArgsDeps(o.json), o);
@@ -278,7 +279,8 @@ compute.command('watch-paths [service]').description("Show or change which paths
     .option('--json').option('--branch <branch>', 'branch (default: current)').action(guard((service, o) => githubCmd.computeWatchPaths(service, o)));
 compute.command('disconnect-repo [service]').description('Disconnect the GitHub repository from a compute service. The service keeps running its current image; pushes no longer deploy it, and its build history stays')
     .option('--json').option('--branch <branch>', 'branch (default: current)').action(guard((service, o) => githubCmd.computeDisconnectRepo(service, o)));
-compute.command('volume [service]').description("Show, attach, grow, or delete a compute service's persistent /data volume. No flag: print size, mount path, and the plan cap (any plan). --size on a volumeless service ATTACHES one (any plan up to its own plan cap — 10Gi free, 50Gi paid by default — which is also what a disk with no size named is born at; a size above the free cap is paid; the disk mounts at /data on the next deploy); on a volume-bearing one it grows (paid plans; grow-only — a provisioned disk cannot shrink). --delete DESTROYS the disk and ALL its data immediately (no detach, no undo; billing stops now, and suspend fast-wake + scale-out return). Billing is actual data stored — the size is a cap, not a price")
+compute.command('volume [service]').description("Show, attach, grow, or delete a compute service's persistent volume. No flag: print size, mount path, and the plan cap (any plan). --size on a volumeless service ATTACHES one (any plan up to its own plan cap — 10Gi free, 50Gi paid by default — which is also what a disk with no size named is born at; a size above the free cap is paid; the disk mounts at --mount-path (default /data) on the next deploy); on a volume-bearing one it grows (paid plans; grow-only — a provisioned disk cannot shrink). --delete DESTROYS the disk and ALL its data immediately (no detach, no undo; billing stops now, and suspend fast-wake + scale-out return). Billing is actual data stored — the size is a cap, not a price")
+    .option('--mount-path <path>', 'container mount path for a new volume (requires --size; default /data; fixed after attachment)')
     .option('--size <gi>', 'new size in whole Gi, e.g. 10 (must be ≥ the current size)')
     .option('--delete', 'destroy the volume and ALL its data (irreversible; download anything you need first)')
     .option('--json').option('--branch <branch>', 'branch (default: current)').action(guard((service, o) => computeCmd.computeVolume(service, o)));
@@ -335,6 +337,7 @@ tpl.command('info <code>').description('Show a template: version, upstream pin,
     .option('--json').action(guard((code, o) => template.templateInfo(code, o)));
 tpl.command('deploy <code-or-dir-or-url>').description('Deploy a template onto a branch — a registry code, a local directory containing insta.template.yaml (a path-looking target is always read as a directory), or a github.com URL (https://github.com/<owner>/<repo>[/tree/<ref>[/<dir>]]) whose manifest is fetched with your own git credentials. Missing required variables are prompted for on a terminal; generator-backed (secret:N) and defaulted ones are resolved by the platform')
     .option('--branch <b>', 'target branch (default: current)')
+    .option('--region <region>', 'region for every service the template creates, e.g. us-east (see `insta regions`)')
     .option('--set <NAME=value>', 'set a template variable (repeatable)', (v, prev) => [...prev, v], [])
     .option('-y, --yes', 'non-interactive: missing required variables fail with a --set list instead of prompting')
     .option('--json')
@@ -361,14 +364,14 @@ const dom = program.command('domain').description('Buy a domain through InstaClo
 dom.command('search <keyword>').description('Search purchasable names with prices (a label like "myapp" or a full name like "myapp.com")')
     .option('--tlds <list>', 'comma-separated TLDs to include').option('--org <id>', "target org (default: linked project's org)").option('--json')
     .action(guard((keyword, o) => domainCmd.domainSearch(keyword, o)));
-dom.command('buy <name>').description('Buy a domain and attach it to a branch compute service — pay at the printed Stripe Checkout link (gated: domain.purchase)')
-    .option('--years <n>', 'registration term in years (default 1)').option('--branch <b>').option('--group <g>', "compute service (default: the branch's sole compute service)")
+dom.command('buy <name>').description('Buy a domain — pay at the printed Stripe Checkout link. It serves nothing until you attach it (gated: domain.purchase)')
+    .option('--years <n>', 'registration term in years (default 1)')
     .option('--no-open', 'print the checkout URL instead of opening a browser').option('--json')
     .action(guard((name, o) => domainCmd.domainBuy(name, o)));
-dom.command('attach <name>').description('Attach a bought domain whose service was deleted (or whose attach failed) to a compute service (gated: deploy)')
+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((name, o) => domainCmd.domainAttach(name, o)));
-dom.command('list').description('Domains bought through InstaCloud in this project, with attach state per hostname').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')
     .action(guard((o) => domainCmd.domainList(o)));
 dom.command('status <name>').description("A bought domain's order and attach state").option('--json')
     .action(guard((name, o) => domainCmd.domainStatus(name, o)));

package/package.json

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