insta 0.0.18 → 0.0.20

package/dist/commands/branch.js

@@ -38,4 +38,22 @@ export async function branchDelete(name) {
         return;
     info(`deleted branch ${name}`);
 }
+// insta branch merge <source> [--into <target>] — structurally merge source's services into target
+// (default target: current branch). No data is copied; existing services are left untouched.
+export async function branchMerge(source, opts = {}) {
+    const api = await ApiClient.load();
+    const p = await requireProject();
+    const target = opts.into ?? p.branch;
+    if (!target)
+        throw new Error('no target branch — pass --into <branch> (or link a branch first)');
+    const res = await api.rawRequest('POST', `/projects/${p.projectId}/branches/${encodeURIComponent(target)}/merge`, { from: source });
+    if (handleApproval(res))
+        return;
+    const { created = [], skipped = [] } = (res.body ?? {});
+    info(`merged ${source} → ${target}: ${created.length} created, ${skipped.length} skipped`);
+    for (const c of created)
+        info(`  + ${c.type}/${c.name}`);
+    for (const s of skipped)
+        info(`  = ${s.type}/${s.name} (${s.reason})`);
+}
 //# sourceMappingURL=branch.js.map

package/dist/commands/compute.js

@@ -1,6 +1,6 @@
 import { ApiClient, requireProject } from '../api.js';
 import { info, printJson, handleApproval } from '../util.js';
-import { resolveComputeServiceId } from './services.js';
+import { resolveComputeServiceId, q } from './services.js';
 // Attach a developer-owned custom domain to a branch's compute service. Fly issues the cert + routes
 // it; the platform returns the DNS records to set in your OWN zone.
 export async function setDomain(host, opts) {
@@ -46,7 +46,8 @@ function printDomain(r, json) {
 async function lifecycle(verb, serviceName, opts) {
     const api = await ApiClient.load();
     const p = await requireProject();
-    const { services } = await api.request('GET', `/projects/${p.projectId}/services`);
+    const branch = opts.branch ?? p.branch;
+    const { services } = await api.request('GET', `/projects/${p.projectId}/services${q(branch)}`);
     const id = resolveComputeServiceId(services, serviceName);
     const res = await api.rawRequest('POST', `/projects/${p.projectId}/services/${id}/${verb}`);
     if (handleApproval(res))
@@ -61,7 +62,8 @@ export const computeSuspend = (service, opts) => lifecycle('suspend', service, o
 export async function computeStatus(serviceName, opts) {
     const api = await ApiClient.load();
     const p = await requireProject();
-    const { services } = await api.request('GET', `/projects/${p.projectId}/services`);
+    const branch = opts.branch ?? p.branch;
+    const { services } = await api.request('GET', `/projects/${p.projectId}/services${q(branch)}`);
     const id = resolveComputeServiceId(services, serviceName);
     const r = await api.request('GET', `/projects/${p.projectId}/services/${id}/state`);
     if (opts.json)

package/dist/commands/services.js

@@ -2,6 +2,9 @@
 import { ApiClient, requireProject } from '../api.js';
 import { info, printJson, handleApproval, renderNextActions } from '../util.js';
 export const SERVICE_TYPES = ['postgres', 'storage', 'compute'];
+export function q(branch) {
+    return branch ? `?branch=${encodeURIComponent(branch)}` : '';
+}
 // ---- pure, unit-tested helpers (throw plain Errors; the CLI guard turns them into clean output) ----
 // Validate a service-type argument against the allowed set for a command.
 export function assertType(type, allowed = SERVICE_TYPES) {
@@ -38,40 +41,69 @@ export function resolveComputeServiceId(services, name) {
     return compute[0].id;
 }
 // ---- commands ----
-export async function servicesAdd(type, name) {
+export async function servicesAdd(type, name, opts = {}) {
     assertType(type);
+    if (opts.public && type !== 'storage')
+        throw new Error('--public is only valid for storage services');
     const api = await ApiClient.load();
     const p = await requireProject();
-    const res = await api.rawRequest('POST', `/projects/${p.projectId}/services`, { type, name });
+    const branch = opts.branch ?? p.branch;
+    const res = await api.rawRequest('POST', `/projects/${p.projectId}/services`, { type, name, ...(branch ? { branch } : {}), public: !!opts.public });
     if (handleApproval(res))
         return;
     const svc = res.body.service;
-    info(`added ${type} service ${name} (${svc.id})${svc.domain ? ` — ${svc.domain}` : ''}`);
+    const access = svc.type === 'storage' ? `  [${svc.public ? 'public' : 'private'}]` : '';
+    info(`added ${type} service ${name} on ${branch ?? 'default'} (${svc.id})${access}${svc.domain ? ` — ${svc.domain}` : ''}`);
     renderNextActions(res.body.nextActions);
 }
 export async function servicesList(opts) {
     const api = await ApiClient.load();
     const p = await requireProject();
-    const { services } = await api.request('GET', `/projects/${p.projectId}/services`);
+    const branch = opts.branch ?? p.branch;
+    const { services } = await api.request('GET', `/projects/${p.projectId}/services${q(branch)}`);
     if (opts.json)
         return printJson(services);
     if (!services.length)
-        return info('(no services — add one with `insta services add <postgres|storage|compute> <name>`)');
+        return info(`(no services on ${branch ?? 'default'} — add one with \`insta services add <postgres|storage|compute> <name>\`)`);
     for (const s of services) {
-        const extra = s.type === 'compute' ? `  x${s.machine_count}` : '';
+        const extra = s.type === 'compute' ? `  x${s.machine_count}` : s.type === 'storage' ? `  ${s.public ? 'public' : 'private'}` : '';
         info(`${s.type}/${s.name}  [${s.status}]${extra}${s.domain ? `  ${s.domain}` : ''}  ${s.id}`);
     }
 }
-export async function servicesRemove(type, name) {
+export async function servicesRemove(type, name, opts = {}) {
     assertType(type);
     const api = await ApiClient.load();
     const p = await requireProject();
-    const { services } = await api.request('GET', `/projects/${p.projectId}/services`);
+    const branch = opts.branch ?? p.branch;
+    const { services } = await api.request('GET', `/projects/${p.projectId}/services${q(branch)}`);
     const id = resolveServiceId(services, type, name);
     const res = await api.rawRequest('DELETE', `/projects/${p.projectId}/services/${id}`);
     if (handleApproval(res))
         return;
-    info(`removed ${type} service ${name}`);
+    info(`removed ${type} service ${name} from ${branch ?? 'default'}`);
+}
+// Validate a bucket access-mode argument.
+export function parseAccess(raw) {
+    if (raw === 'public')
+        return true;
+    if (raw === 'private')
+        return false;
+    throw new Error(`access must be public|private, got: ${raw}`);
+}
+// insta services set-access storage <name> <public|private>
+export async function servicesSetAccess(type, name, access, _opts) {
+    assertType(type, ['storage']);
+    const isPublic = parseAccess(access);
+    const api = await ApiClient.load();
+    const p = await requireProject();
+    const { services } = await api.request('GET', `/projects/${p.projectId}/services${q(p.branch)}`);
+    const id = resolveServiceId(services, type, name);
+    const res = await api.rawRequest('PUT', `/projects/${p.projectId}/services/${id}/access`, { public: isPublic });
+    if (handleApproval(res))
+        return;
+    if (_opts.json)
+        return printJson(res.body.service);
+    info(`set storage ${name} access to ${access}`);
 }
 // insta services scale compute <name> <number> [region]
 export async function servicesScale(type, name, number, region, _opts) {
@@ -79,7 +111,7 @@ export async function servicesScale(type, name, number, region, _opts) {
     const machineCount = parseCount(number);
     const api = await ApiClient.load();
     const p = await requireProject();
-    const { services } = await api.request('GET', `/projects/${p.projectId}/services`);
+    const { services } = await api.request('GET', `/projects/${p.projectId}/services${q(_opts.branch ?? p.branch)}`);
     const id = resolveServiceId(services, type, name);
     const res = await api.rawRequest('POST', `/projects/${p.projectId}/services/${id}/scale`, { machineCount, region });
     if (handleApproval(res))
@@ -93,7 +125,7 @@ export async function servicesUpgrade(type, name, spec, _opts) {
     assertType(type, ['compute', 'postgres']);
     const api = await ApiClient.load();
     const p = await requireProject();
-    const { services } = await api.request('GET', `/projects/${p.projectId}/services`);
+    const { services } = await api.request('GET', `/projects/${p.projectId}/services${q(_opts.branch ?? p.branch)}`);
     const id = resolveServiceId(services, type, name);
     const res = await api.rawRequest('POST', `/projects/${p.projectId}/services/${id}/upgrade`, { spec });
     if (handleApproval(res))

package/dist/ensure-skills.js

@@ -47,9 +47,13 @@ export async function installSkills(deps) {
     const run = deps.run ?? defaultRunner;
     const print = deps.print ?? ((s) => process.stdout.write(s + '\n'));
     try {
-        print('  installing related agent skills (insta, neon-postgres, tigris, better-auth) via `npx skills add` …');
+        print('  installing related agent skills (insta, neon-postgres, tigris, better-auth) …');
         for (const s of SKILLS) {
-            const r = await run('npx', s.args, true); // streamed so the user sees download progress
+            // Don't stream: the `skills` tool's clack UI (clone spinner, banners) is noise. Run it
+            // silent (stdio 'ignore') and let the per-skill ✓/failed line below be the clean output —
+            // it appears as each skill finishes, so there's still live progress. (Also avoids the
+            // child inheriting a piped stdin.)
+            const r = await run('npx', s.args);
             print(r.ok ? `  ${s.label} ✓` : `  ${s.label} failed — add manually: npx ${s.args.join(' ')}`);
         }
         const added = ensureGitignore(deps.cwd, SKILL_DIRS);

package/dist/index.js

@@ -83,17 +83,25 @@ br.command('create <name>').option('--from <branch>', 'parent branch (default: c
 br.command('list').option('--json').action(guard((o) => branch.branchList(o)));
 br.command('switch <name>').action(guard((name) => branch.branchSwitch(name)));
 br.command('delete <name>').action(guard((name) => branch.branchDelete(name)));
+br.command('merge <source>').description('Merge a branch service set into another (structural, no data)')
+    .option('--into <branch>', 'target branch (default: current)').action(guard((source, o) => branch.branchMerge(source, o)));
 // ---- services (opt-in postgres/storage/compute) ----
 const svc = program.command('services').alias('svc').description('Manage project services (postgres|storage|compute)');
 svc.command('add <type> <name>').description('Provision a service on demand (assigns a default domain for postgres/compute)')
-    .action(guard((type, name) => services.servicesAdd(type, name)));
-svc.command('list').option('--json').action(guard((o) => services.servicesList(o)));
+    .option('--branch <branch>', 'target branch (default: current)')
+    .option('--public', 'storage only: serve the bucket with anonymous public-read (default private)')
+    .action(guard((type, name, o) => services.servicesAdd(type, name, o)));
+svc.command('list').option('--json').option('--branch <branch>', 'branch (default: current)')
+    .action(guard((o) => services.servicesList(o)));
 svc.command('remove <type> <name>').description('Remove a service and destroy its resources')
-    .action(guard((type, name) => services.servicesRemove(type, name)));
+    .option('--branch <branch>', 'branch (default: current)')
+    .action(guard((type, name, o) => services.servicesRemove(type, name, o)));
+svc.command('set-access <type> <name> <access>').description('Set a storage service bucket access mode (access: public|private)')
+    .option('--json').action(guard((type, name, access, o) => services.servicesSetAccess(type, name, access, o)));
 svc.command('scale <type> <name> <number> [region]').description('Set a compute service machine count (paid plans only)')
-    .option('--json').action(guard((type, name, number, region, o) => services.servicesScale(type, name, number, region, o)));
+    .option('--json').option('--branch <branch>', 'branch (default: current)').action(guard((type, name, number, region, o) => services.servicesScale(type, name, number, region, o)));
 svc.command('upgrade <type> <name> <spec>').description('Change a compute/postgres service spec (paid plans only)')
-    .option('--json').action(guard((type, name, spec, o) => services.servicesUpgrade(type, name, spec, o)));
+    .option('--json').option('--branch <branch>', 'branch (default: current)').action(guard((type, name, spec, o) => services.servicesUpgrade(type, name, spec, o)));
 // ---- secrets (seam) ----
 const sec = program.command('secrets').description('Fetch the credential bundle (secret seam) into .env')
     .option('--branch <branch>').option('-o, --output <file>', 'output file (default .env)').option('--print', 'print instead of writing').option('--json')
@@ -117,13 +125,13 @@ compute.command('check-domain <host>').description("Show a custom domain's cert
 compute.command('remove-domain <host>').description('Detach a custom domain (gated: deploy)')
     .option('--branch <b>').option('--group <g>').action(guard((host, o) => computeCmd.removeDomain(host, o)));
 compute.command('start [service]').description('Bring a compute service online (persistent — re-enables auto-wake)')
-    .option('--json').action(guard((service, o) => computeCmd.computeStart(service, o)));
+    .option('--json').option('--branch <branch>', 'branch (default: current)').action(guard((service, o) => computeCmd.computeStart(service, o)));
 compute.command('stop [service]').description('Take a compute service offline; traffic will NOT wake it until `start`')
-    .option('--json').action(guard((service, o) => computeCmd.computeStop(service, o)));
+    .option('--json').option('--branch <branch>', 'branch (default: current)').action(guard((service, o) => computeCmd.computeStop(service, o)));
 compute.command('suspend [service]').description('Suspend a compute service (RAM snapshot); stays down until `start`')
-    .option('--json').action(guard((service, o) => computeCmd.computeSuspend(service, o)));
+    .option('--json').option('--branch <branch>', 'branch (default: current)').action(guard((service, o) => computeCmd.computeSuspend(service, o)));
 compute.command('status [service]').description("Show a compute service's desired vs. live state")
-    .option('--json').action(guard((service, o) => computeCmd.computeStatus(service, o)));
+    .option('--json').option('--branch <branch>', 'branch (default: current)').action(guard((service, o) => computeCmd.computeStatus(service, o)));
 // ---- manifest ----
 program.command('manifest').description('Print an agent-legible view of the project environments').option('--json').action(guard((o) => manifest(o)));
 // ---- observability ----
@@ -161,7 +169,7 @@ ob.command('sync').description('Upload findings into the project timeline').acti
 // ---- policy ----
 const pol = program.command('policy').description('Governance policy');
 pol.command('get').option('--json').action(guard((o) => govern.policyGet(o)));
-pol.command('set <action> <decision>').description('action: secrets.read|secrets.write|deploy|project.delete|branch.delete|service.add|service.remove|service.scale|service.upgrade; decision: allow|deny|approve').action(guard((a, d) => govern.policySet(a, d)));
+pol.command('set <action> <decision>').description('action: secrets.read|secrets.write|deploy|project.delete|branch.delete|service.add|service.remove|service.scale|service.upgrade|service.setAccess; decision: allow|deny|approve').action(guard((a, d) => govern.policySet(a, d)));
 // ---- self-update ----
 program.command('upgrade').description('Update the insta CLI to the latest release (binary or npm install)')
     .action(guard(() => selfUpdate.upgrade()));

package/package.json

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