insta 0.0.70 → 0.0.72

package/README.md

@@ -222,7 +222,7 @@ build never reaches a production installer.
 | `insta run <cmd>` | Run a command with the branch bundle injected, nothing written to disk |
 | `insta deploy [dir]` | Deploy a source directory (built remotely) or `--image <url>` |
 | `insta compute` | `start` · `stop` · `suspend` · `status` · `set-domain` · `check-domain` · `remove-domain` |
-| `insta domain` | Buy a domain through InstaCloud: `search` · `buy` · `attach` · `list` · `status` · `contact` |
+| `insta domain` | Buy a domain through InstaCloud: `search` · `buy` · `attach` · `list` · `status` |
 | `insta db` | `url` (print the postgres DSN) · `connect` (psql session) · `limits` · `stats` · `always-on` · `volume` |
 | `insta regions` | Regions available for postgres and compute |
 | `insta manifest` | Agent-legible view of every branch and its URLs |

package/dist/agent.js

@@ -66,7 +66,7 @@ export async function loadAgentSession(apiUrl, projectId, cwd = process.cwd()) {
 // scope.projectId. A miss fails HERE, naming the route, instead of on the platform as a
 // "for a different project" 403 whose setup hint cannot help — keep this list in step with the
 // account-level paths in src/commands/.
-export const ACCOUNT_ROUTES = new Set(['agent', 'auth', 'me', 'orgs', 'regions', 'templates', 'tokens', 'github']);
+export const ACCOUNT_ROUTES = new Set(['agent', 'auth', 'me', 'orgs', 'regions', 'templates', 'tokens']);
 export async function agentHeaders(api, method, path, rawBody, scope = {}) {
     if (!mode)
         return {};

package/dist/commands/domain.js

@@ -1,4 +1,3 @@
-import { readFile } from 'node:fs/promises';
 import { ApiClient } from '../api.js';
 import { info, printJson, handleApproval, die } from '../util.js';
 import { presentUrl, resolveOrgId } from './billing.js';
@@ -32,60 +31,10 @@ export async function domainSearch(keyword, opts, deps) {
     if (buyable)
         info(`buy one: insta domain buy ${buyable.domainName}`);
 }
-const CONTACT_KEYS = ['firstName', 'lastName', 'companyName', 'address1', 'address2', 'city', 'state', 'zip', 'country', 'email', 'phone'];
-export function contactFromOpts(opts, file) {
-    if (file !== undefined)
-        return file;
-    const out = {};
-    for (const k of CONTACT_KEYS)
-        if (opts[k] !== undefined)
-            out[k] = opts[k];
-    return Object.keys(out).length ? out : undefined;
-}
-async function readContactFile(path) {
-    if (!path)
-        return undefined;
-    try {
-        return JSON.parse(await readFile(path, 'utf8'));
-    }
-    catch (e) {
-        throw new Error(`cannot read ${path} as JSON: ${e.message}`);
-    }
-}
-function contactLines(c) {
-    if (!c)
-        return ['no registrant contact set — set one with: insta domain contact set --first-name … (or --contact-file contact.json)'];
-    return [
-        `${c.firstName} ${c.lastName}${c.companyName ? ` (${c.companyName} — the organization is the legal registrant)` : ''}`,
-        `${c.address1}${c.address2 ? `, ${c.address2}` : ''}, ${c.city}, ${c.state} ${c.zip}, ${c.country}`,
-        `${c.email}  ${c.phone}`,
-    ];
-}
-export async function domainContactShow(opts, deps) {
-    const { api, orgId } = await orgDeps(opts, deps);
-    const r = await api.request('GET', `/orgs/${orgId}/domains/contact`);
-    if (opts.json)
-        return printJson(r);
-    for (const line of contactLines(r.contact))
-        info(line);
-}
-export async function domainContactSet(opts, deps) {
-    const { api, orgId } = await orgDeps(opts, deps);
-    const contact = contactFromOpts(opts, await readContactFile(opts.contactFile));
-    if (!contact)
-        die('pass the contact as flags (--first-name … --phone) or as --contact-file <contact.json>');
-    const r = await api.request('PUT', `/orgs/${orgId}/domains/contact`, contact);
-    if (opts.json)
-        return printJson(r);
-    info('registrant contact saved:');
-    for (const line of contactLines(r.contact))
-        info(`  ${line}`);
-}
 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);
-    const contact = await readContactFile(opts.contactFile);
     // 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;
@@ -94,7 +43,7 @@ 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, contact });
+    const res = await api.rawRequest('POST', `/projects/${p.projectId}/domains/orders`, { domainName: name, years, branch, group: target.name });
     if (handleApproval(res, opts.json))
         return;
     if (opts.json)

package/dist/commands/github.js

@@ -81,8 +81,8 @@ const sleepSeconds = (s) => new Promise((r) => setTimeout(r, s * 1000));
 const pollDelay = (s) => Math.min(Math.max(s, 1), 60);
 // GitHub shows the person a code to type; the platform holds the device code and finishes the exchange,
 // so nothing secret passes through the CLI.
-export async function authorizeTerminal(api, orgId, wait = sleepSeconds) {
-    const start = await api.request('POST', `/orgs/${encodeURIComponent(orgId)}/github/device`, {});
+export async function authorizeTerminal(api, wait = sleepSeconds) {
+    const start = await api.request('POST', '/me/github/device', {});
     const deadline = Date.parse(start.expiresAt);
     // A NaN deadline makes every comparison false, which reads as an instant expiry — or, inverted, as a
     // loop with no way out. Fail on it rather than guess which.
@@ -100,7 +100,7 @@ export async function authorizeTerminal(api, orgId, wait = sleepSeconds) {
         await wait(interval);
         let answer;
         try {
-            answer = await api.request('POST', `/orgs/${encodeURIComponent(orgId)}/github/device/poll`, { state: start.state });
+            answer = await api.request('POST', '/me/github/device/poll', { state: start.state });
         }
         catch (e) {
             // A dropped link, or the per-IP limiter this cadence already tripped on the login flow, must not
@@ -120,41 +120,18 @@ export async function authorizeTerminal(api, orgId, wait = sleepSeconds) {
     }
     throw new Error('the GitHub authorization expired before it was confirmed — run the command again');
 }
-// Only the platform's own "you have no usable authorization" may send the person to GitHub: any other
-// failure is real, and a device flow cannot fix it.
-const needsAuthorization = (e) => e instanceof ApiError && e.status === 400 && /not linked|no longer accepted/i.test(e.message);
-// The repositories THIS caller's GitHub account can reach — the same question the platform asks again
-// when the connect lands, so a repo missing here would be refused there anyway.
-// Someone has to read the code and type it at GitHub. A terminal qualifies, and so does agent mode —
-// an agent relays the URL to the person driving it — but --json and a bare pipe have no reader, and a
-// ten-minute wait there is a stall where the old code failed with something to act on.
+// Device authorization needs a person to read the code; JSON and bare pipes must fail promptly.
 export function canAuthorizeHere(opts = {}) {
     if (opts.json)
         return false;
     return !!agentMode() || !!process.stderr.isTTY;
 }
-export async function findCallerRepo(api, orgId, ref, authorize = authorizeTerminal, canAuthorize = canAuthorizeHere()) {
-    if (!orgId)
-        throw new Error('this directory is linked without an org — set INSTA_ORG_ID alongside INSTA_PROJECT_ID, or link it with `insta project link`');
-    let repos;
-    try {
-        repos = (await api.request('POST', `/orgs/${encodeURIComponent(orgId)}/github/repos`, {})).repos ?? [];
-    }
-    catch (e) {
-        // Two 403s carry an action; a third kind would be guessed at, so it is rethrown as the platform put it.
-        if (e instanceof ApiError && e.status === 403 && /unclassified_agent_action/.test(e.message)) {
-            throw new Error('this backend does not let an agent authorize GitHub yet — connect the repository from the console, or pass --public for a public repository');
-        }
-        if (e instanceof ApiError && e.status === 403 && /requires admin/i.test(e.message)) {
-            throw new Error('connecting a repository needs the org admin role — ask an admin to connect it, or pass --public for a public repository');
-        }
-        if (!needsAuthorization(e))
-            throw e;
-        if (!canAuthorize) {
-            throw new Error('this GitHub account is not authorized for InstaCloud yet, and nothing here can read the code GitHub shows — run `insta compute connect-repo` from a terminal, connect the repository from the console, or pass --public for a public repository');
-        }
-        repos = await authorize(api, orgId);
+export async function findCallerRepo(api, ref, authorize = authorizeTerminal, canAuthorize = canAuthorizeHere()) {
+    const mine = await api.request('GET', '/me/github/repos');
+    if (!mine.linked && !canAuthorize) {
+        throw new Error('this GitHub account is not authorized for InstaCloud yet, and nothing here can read the code GitHub shows — run `insta compute connect-repo` from a terminal, connect the repository from the console, or pass --public for a public repository');
     }
+    const repos = mine.linked ? mine.repos : await authorize(api);
     const whole = (n) => n !== null && n !== '' && Number.isInteger(Number(n)) && Number(n) > 0;
     const hit = repos.find((r) => r.owner.toLowerCase() === ref.owner.toLowerCase() && r.repo.toLowerCase() === ref.repo.toLowerCase());
     if (hit && whole(hit.installationId) && whole(hit.id))
@@ -187,7 +164,7 @@ export async function computeConnectRepo(rawRef, serviceName, opts) {
     const svc = await targetService(api, p.projectId, opts.branch ?? p.branch, serviceName);
     const src = opts.public
         ? { source: 'public', ...ref }
-        : { source: 'app', ...(await findCallerRepo(api, p.orgId, ref, authorizeTerminal, canAuthorizeHere(opts))), ...ref };
+        : { source: 'app', ...(await findCallerRepo(api, ref, authorizeTerminal, canAuthorizeHere(opts))), ...ref };
     // Detection must scan the branch that will be built: the build refuses commands that differ from what it detects there.
     const detected = await api.request('POST', `/projects/${p.projectId}/github/detect`, { ...src, ...(opts.repoBranch ? { ref: opts.repoBranch } : {}) });
     const candidate = pickCandidate(detected.services, opts.rootDir);

package/dist/index.js

@@ -355,7 +355,6 @@ dom.command('search <keyword>').description('Search purchasable names with price
     .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)")
-    .option('--contact-file <path>', 'registrant contact as JSON (default: the org contact from `insta domain contact set`)')
     .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)')
@@ -365,15 +364,6 @@ dom.command('list').description('Domains bought through InstaCloud in this proje
     .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)));
-const domContact = dom.command('contact').description("Show the org's default registrant contact (the legal registrant of every domain bought with it)")
-    .option('--org <id>').option('--json').action(guard((o) => domainCmd.domainContactShow(o)));
-domContact.command('set').description('Set the org default registrant contact (admin) from flags or --contact-file <path>; --company-name makes that organization the legal registrant')
-    .option('--first-name <s>').option('--last-name <s>').option('--company-name <s>').option('--address1 <s>').option('--address2 <s>').option('--city <s>').option('--state <s>').option('--zip <s>')
-    .option('--country <cc>', 'ISO 3166-1 alpha-2, e.g. US').option('--email <s>').option('--phone <e164>', 'E.164, e.g. +14155550100')
-    .option('--contact-file <path>', 'JSON file with the contact fields').option('--org <id>').option('--json')
-    // `contact --org X set` parks --org on the GROUP (enablePositionalOptions); without this merge the
-    // wrong org's registrant contact is written, and that field is legal ownership.
-    .action(guard((o) => domainCmd.domainContactSet({ ...domContact.opts(), ...o })));
 const bill = program.command('billing').description('Current billing cycle overview (tier / used / included / overage / credits / forecast + per-dimension & per-project breakdown)')
     .option('--org <id>', 'target org (default: linked project\'s org)').option('--json')
     .action(guard((o) => billing(o)));

package/package.json

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