fix(cli): address PR #55 review feedback

- register --branch on compute start/stop/suspend/status (was consumed by
  LifeOpts but never registered → "unknown option") and on services
  scale/upgrade (now accept opts.branch ?? p.branch)
- branchMerge: default target to opts.into ?? p.branch (drop hardcoded
  'main'); guard the created/skipped destructure against error bodies
- dedup: export q() from services.ts and reuse it in compute.ts

typecheck + build clean; 79 tests pass; --branch verified on compute + scale.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: jwfing

src/commands/branch.ts

@@ -43,12 +43,13 @@ export async function branchDelete(name: string): Promise<void> {
 export async function branchMerge(source: string, opts: { into?: string } = {}): Promise<void> {
   const api = await ApiClient.load()
   const p = await requireProject()
-  const target = opts.into ?? p.branch ?? 'main'
+  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 as {
-    created: Array<{ type: string; name: string }>
-    skipped: Array<{ type: string; name: string; reason: string }>
+  const { created = [], skipped = [] } = (res.body ?? {}) as {
+    created?: Array<{ type: string; name: string }>
+    skipped?: Array<{ type: string; name: string; reason: string }>
   }
   info(`merged ${source} → ${target}: ${created.length} created, ${skipped.length} skipped`)
   for (const c of created) info(`  + ${c.type}/${c.name}`)

src/commands/compute.ts

@@ -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'
 
 type Opts = { branch?: string; group?: string; json?: boolean }
 
@@ -51,7 +51,7 @@ async function lifecycle(verb: 'start' | 'stop' | 'suspend', serviceName: string
   const api = await ApiClient.load()
   const p = await requireProject()
   const branch = opts.branch ?? p.branch
-  const { services } = await api.request('GET', `/projects/${p.projectId}/services${branch ? `?branch=${encodeURIComponent(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)) return
@@ -67,7 +67,7 @@ export async function computeStatus(serviceName: string | undefined, opts: LifeO
   const api = await ApiClient.load()
   const p = await requireProject()
   const branch = opts.branch ?? p.branch
-  const { services } = await api.request('GET', `/projects/${p.projectId}/services${branch ? `?branch=${encodeURIComponent(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) return printJson(r)

src/commands/services.ts

@@ -5,7 +5,7 @@ import { info, printJson, handleApproval, renderNextActions } from '../util.js'
 export const SERVICE_TYPES = ['postgres', 'storage', 'compute'] as const
 export type ServiceType = (typeof SERVICE_TYPES)[number]
 
-function q(branch?: string): string {
+export function q(branch?: string): string {
   return branch ? `?branch=${encodeURIComponent(branch)}` : ''
 }
 
@@ -106,12 +106,12 @@ export async function servicesSetAccess(type: string, name: string, access: stri
 }
 
 // insta services scale compute <name> <number> [region]
-export async function servicesScale(type: string, name: string, number: string, region: string | undefined, _opts: { json?: boolean }): Promise<void> {
+export async function servicesScale(type: string, name: string, number: string, region: string | undefined, _opts: { json?: boolean; branch?: string }): Promise<void> {
   assertType(type, ['compute'])
   const machineCount = parseCount(number)
   const api = await ApiClient.load()
   const p = await requireProject()
-  const { services } = await api.request('GET', `/projects/${p.projectId}/services${q(p.branch)}`)
+  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)) return
@@ -120,11 +120,11 @@ export async function servicesScale(type: string, name: string, number: string,
 }
 
 // insta services upgrade <compute|postgres> <name> <new-spec>
-export async function servicesUpgrade(type: string, name: string, spec: string, _opts: { json?: boolean }): Promise<void> {
+export async function servicesUpgrade(type: string, name: string, spec: string, _opts: { json?: boolean; branch?: string }): Promise<void> {
   assertType(type, ['compute', 'postgres'])
   const api = await ApiClient.load()
   const p = await requireProject()
-  const { services } = await api.request('GET', `/projects/${p.projectId}/services${q(p.branch)}`)
+  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)) return

src/index.ts

@@ -105,9 +105,9 @@ svc.command('remove <type> <name>').description('Remove a service and destroy it
 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')
@@ -134,13 +134,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)))