gitroots 0.5.0 → 0.6.1

package/src/commands/pr.js

@@ -1,322 +0,0 @@
-// gitroots pr list · view · diff · approve · review · merge
-import { c, h, pad } from '../ui/ansi.js';
-import { line, runSteps, confirm } from '../ui/term.js';
-import { dot, json, next } from '../ui/components.js';
-import { tryGit } from '../git/checks.js';
-import { sampleNote } from '../connected.js';
-
-export async function run(_cmd, rest, flags, store) {
-  const [sub = 'list', ...args] = rest;
-  switch (sub) {
-    case 'list': case 'ls': return list(args, flags, store);
-    case 'view': case 'show': return view(args, flags, store);
-    case 'diff': return diff(args, flags, store);
-    case 'approve': return approve(args, flags, store);
-    case 'review': return review(args, flags, store);
-    case 'merge': return merge(args, flags, store);
-    case 'create': case 'new': case 'open': return create(args, flags, store);
-    default:
-      if (/^#?\d+$/.test(sub)) return view([sub], flags, store);
-      throw new Error(`unknown: gitroots pr ${sub} · list, view, diff, create, approve, review, merge`);
-  }
-}
-
-function stateCell(p, me) {
-  if (p.state === 'merged') return c.g(`✓ merged ${p.mergedAt || ''}`.trim());
-  if (p.state === 'closed') return c.m('○ closed');
-  if (p.state === 'draft') return c.m('○ draft');
-  if (p.checks.state === 'fail') return c.r('✕ checks failed');
-  if (p.checks.state === 'running') return c.i('○ checks running');
-  if (p.changesRequested) return c.r('✕ changes requested');
-  if (p.needs && p.needs.who === me && !p.approvals.some((a) => a.by === me)) return c.w('◐ needs you');
-  if (p.approvals.length >= p.required) return c.g('✓ ready to merge');
-  return c.m(`○ waiting for ${p.required - p.approvals.length} more`);
-}
-
-function checksCell(p) {
-  return p.checks.state === 'pass' ? c.g('✓') : p.checks.state === 'fail' ? c.r('✕') : c.i('⠼');
-}
-
-function list([repo], flags, store) {
-  const want = flags.state || 'all';
-  let prs = store.prs(repo).filter((p) => want === 'all' || p.state === want);
-  prs = [...prs].sort((a, b) => b.number - a.number);
-  if (flags.json) { json(prs); return 0; }
-  const me = store.org.user;
-  line(`  ${h(`${pad('#', 7)}${pad('TITLE', 40)}${pad('FROM → INTO', 35)}${pad('AUTHOR', 10)}${pad('APPROVALS', 12)}${pad('CHECKS', 9)}STATE`)}`);
-  for (const p of prs) {
-    const num = stateCell(p, me).includes('needs you') ? c.b(pad(String(p.number), 7)) : pad(String(p.number), 7);
-    const agent = p.agent ? `   ${c.m(p.agent)}` : '';
-    line(`  ${num}${pad(p.title, 40)}${pad(`${p.from} → ${p.into}`, 35)}${pad(p.author, 10)}${pad(`${p.approvals.length} / ${p.required}`, 12)}${pad(checksCell(p), 9)}${stateCell(p, me)}${agent}`);
-  }
-  if (!prs.length) line(c.m('  no pull requests'));
-  const mine = prs.find((p) => stateCell(p, me).includes('needs you'));
-  sampleNote(store, 'pull requests are');
-  line();
-  line(next(`gitroots pr view ${(mine || prs[0] || { number: '<n>' }).number}`));
-  return 0;
-}
-
-function needPr(args, store) {
-  if (!args[0]) throw new Error('which pull request? e.g. gitroots pr view 412');
-  return store.pr(args[0]);
-}
-
-function view(args, flags, store) {
-  const p = needPr(args, store);
-  if (flags.json) { json(p); return 0; }
-  const me = store.org.user;
-  const add = p.files.reduce((n, f) => n + f.add, 0);
-  const del = p.files.reduce((n, f) => n + f.del, 0);
-  line(`  ${c.b(`#${p.number} ${p.title}`)}   ${c.m(`${p.repo} · ${p.from} → ${p.into} · opened by ${p.author} · ${p.opened}`)}`);
-  line();
-  if (p.files.length) {
-    line(`  ${c.s(pad('files', 12))}${p.files.length} changed   ${c.g(`+${add}`)}  ${c.r(`−${del}`)}`);
-    for (const f of p.files.slice(0, 3)) {
-      line(`  ${' '.repeat(12)}${pad(f.path, 51)}${c.g(pad(`+${f.add}`, 5))}${c.r(`−${f.del}`)}${f.flag ? `   ${c.w(`◐ ${f.flag}`)}` : ''}`);
-    }
-    if (p.files.length > 3) line(`  ${' '.repeat(12)}${c.m(`+ ${p.files.length - 3} more · gitroots pr diff ${p.number}`)}`);
-  } else {
-    line(`  ${c.s(pad('commits', 12))}${p.commits}`);
-  }
-  const ch = p.checks;
-  const checks = ch.state === 'pass'
-    ? `${c.g('✓')} tests ${ch.tests || 'pass'}   ${c.g('✓')} lint   ${c.g('✓')} secrets scan   ${c.g('✓')} branch rules`
-    : ch.state === 'fail' ? `${c.r('✕')} ${ch.failed}` : `${c.i('⠼')} running`;
-  line(`  ${c.s(pad('checks', 12))}${checks}`);
-  const appr = p.approvals.map((a) => `${c.g('✓')} ${a.by} ${c.m(`· ${a.ago}`)}`);
-  const missing = p.required - p.approvals.length;
-  if (missing > 0) {
-    if (p.needs && !p.approvals.some((a) => a.by === p.needs.who)) appr.push(`${c.w('○')} ${p.needs.who === me ? 'you' : p.needs.who} ${c.m(`(needed · ${p.needs.why})`)}`);
-    const others = missing - (p.needs && !p.approvals.some((a) => a.by === p.needs.who) ? 1 : 0);
-    if (others > 0) appr.push(c.m(`○ ${others} more`));
-  }
-  line(`  ${c.s(pad('approvals', 12))}${appr.join('    ')}`);
-  if (p.changesRequested) line(`  ${c.s(pad('review', 12))}${c.r('✕')} changes requested by ${p.changesRequested.by} ${c.m(`· ${p.changesRequested.note}`)}`);
-  for (const n of p.notes) line(`  ${c.s(pad('notes', 12))}${c.w('◐')} ${n}`);
-  line();
-  if (p.state === 'merged') line(next(`gitroots audit --pr ${p.number}`));
-  else if (missing > 0 && !p.approvals.some((a) => a.by === me)) line(`  ${c.g(`→ gitroots pr approve ${p.number}`)}     ${c.m('or')}  ${c.s(`gitroots pr review ${p.number} --request-changes`)}   ${dot()}   ${c.s(`gitroots pr diff ${p.number}`)}`);
-  else if (missing <= 0) line(`  ${next(`gitroots pr merge ${p.number}`)}`);
-  else line(`  ${c.m(`waiting for ${missing} more approval${missing > 1 ? 's' : ''}`)}`);
-  return 0;
-}
-
-function diff(args, flags, store) {
-  const p = needPr(args, store);
-  if (flags.json) { json(p.files); return 0; }
-  if (!p.files.length) { line(c.m(`  no file list recorded for #${p.number}`)); return 0; }
-  const max = Math.max(...p.files.map((f) => f.add + f.del));
-  line(`  ${c.b(`#${p.number}`)} ${c.m(`${p.from} → ${p.into}`)}`);
-  line();
-  for (const f of p.files) {
-    const n = Math.max(1, Math.round(((f.add + f.del) / max) * 30));
-    const a = Math.round((f.add / (f.add + f.del || 1)) * n);
-    line(`  ${pad(f.path, 52)}${c.g(pad(`+${f.add}`, 6))}${c.r(pad(`−${f.del}`, 6))}${c.g('+'.repeat(a))}${c.r('−'.repeat(n - a))}${f.flag ? `  ${c.w(`◐ ${f.flag}`)}` : ''}`);
-  }
-  line();
-  line(next(`gitroots pr approve ${p.number}`));
-  return 0;
-}
-
-function approve(args, flags, store) {
-  const p = needPr(args, store);
-  const me = store.org.user;
-  if (p.state !== 'open') throw new Error(`#${p.number} is ${p.state}`);
-  if (p.author === me) throw new Error(`you opened #${p.number} · someone else has to approve it`);
-  if (p.approvals.some((a) => a.by === me)) {
-    if (flags.json) { json({ pr: p.number, approvals: p.approvals.length, already: true }); return 0; }
-    line(`  ${c.m('○')} You already approved #${p.number} ${dot()} ${p.approvals.length} / ${p.required} approvals`);
-    return 0;
-  }
-  p.approvals.push({ by: me, ago: 'just now', note: flags.m || flags.message || '' });
-  if (p.changesRequested && p.changesRequested.by === me) delete p.changesRequested;
-  const extra = p.needs && p.needs.who === me ? ` ${dot()} ${p.needs.why.replace(/^tech lead for /, 'tech lead sign-off for ')} recorded` : '';
-  const ev = store.record({ actor: me, action: 'approve', target: `PR #${p.number}`, decision: 'recorded', note: flags.m || '', repo: p.repo, pr: p.number });
-  store.save();
-  if (flags.json) { json({ pr: p.number, approvals: p.approvals.length, required: p.required, event: ev.id }); return 0; }
-  line(`  ${c.g('✓')} Approved #${p.number} ${dot()} ${p.approvals.length} / ${p.required} approvals${extra} ${c.m(`· ${ev.id}`)}`);
-  line();
-  line(p.approvals.length >= p.required ? next(`gitroots pr merge ${p.number}`) : c.m(`  waiting for ${p.required - p.approvals.length} more`));
-  return 0;
-}
-
-function review(args, flags, store) {
-  const p = needPr(args, store);
-  const me = store.org.user;
-  const note = flags.m || flags.message || '';
-  if (flags.approve) return approve(args, flags, store);
-  if (flags['request-changes']) {
-    if (!note) throw new Error('say what needs to change: -m "…"');
-    p.changesRequested = { by: me, note };
-    p.approvals = p.approvals.filter((a) => a.by !== me);
-    const ev = store.record({ actor: me, action: 'request changes', target: `PR #${p.number}`, decision: 'recorded', note, repo: p.repo, pr: p.number });
-    store.save();
-    if (flags.json) { json({ pr: p.number, changesRequested: true, event: ev.id }); return 0; }
-    line(`  ${c.r('✕')} Changes requested on #${p.number} ${dot()} ${p.author} notified ${c.m(`· ${ev.id}`)}`);
-    return 0;
-  }
-  if (!note) throw new Error('usage: gitroots pr review <n> --request-changes -m "…" | --approve | --comment -m "…"');
-  const ev = store.record({ actor: me, action: 'comment', target: `PR #${p.number}`, decision: 'recorded', note, repo: p.repo, pr: p.number });
-  store.save();
-  if (flags.json) { json({ pr: p.number, comment: note, event: ev.id }); return 0; }
-  line(`  ${c.g('✓')} Comment added to #${p.number} ${c.m(`· ${ev.id}`)}`);
-  return 0;
-}
-
-async function merge(args, flags, store) {
-  const p = needPr(args, store);
-  const me = store.org.user;
-  if (p.state === 'draft') throw new Error(`#${p.number} is a draft · mark it ready first`);
-  if (p.state !== 'open') throw new Error(`#${p.number} is already ${p.state}`);
-  const rule = store.ruleFor(p.repo, p.into);
-  const method = flags.rebase ? 'rebase' : flags['merge-commit'] ? 'merge commit' : 'squash';
-  const json_ = Boolean(flags.json);
-
-  if (!json_) {
-    line(`  ${c.b(`#${p.number} ${p.title}`)}   ${c.m(`${p.from} → ${p.into} · ${p.commits} commits · ${method}`)}`);
-    const ok = await confirm(`Merge into ${c.b(p.into)}?`, { assumeYes: flags.yes || flags.y });
-    if (!ok) { line(c.m('  nothing merged')); return 1; }
-    line();
-  }
-
-  const conflictBase = store.branches(p.repo).find((b) => b.name === p.into)?.commit || 'HEAD';
-  const steps = [
-    {
-      name: 'Approvals', live: 'counting approvals…', ms: 600,
-      run: async () => (p.approvals.length >= p.required
-        ? { detail: `${p.approvals.length} / ${p.required} · ${p.approvals.map((a) => a.by).join(', ')}` }
-        : { status: 'fail', detail: `${p.approvals.length} / ${p.required} · needs ${p.required - p.approvals.length} more` }),
-    },
-    {
-      name: 'Checks', live: 'waiting for the latest run…', ms: 900,
-      run: async () => (p.checks.state === 'pass' ? { detail: `tests ${p.checks.tests || 'pass'} · lint · secrets scan` }
-        : p.checks.state === 'fail' ? { status: 'fail', detail: p.checks.failed } : { status: 'fail', detail: 'still running · try again when they finish' }),
-    },
-    {
-      name: 'Branch rules', live: `checking ${p.into} rules…`, ms: 600,
-      run: async () => (p.changesRequested ? { status: 'fail', detail: `changes requested by ${p.changesRequested.by}` }
-        : { detail: `${p.into}: ${rule.protected ? `PR only, ${rule.approvals} approvals, checks green` : 'open branch'}` }),
-    },
-    { name: 'Conflicts', live: `test-merging into ${p.into}…`, ms: 800, ok: `none with ${p.into} at ${conflictBase}` },
-    { name: 'Merge', live: `pushing to ${store.repo(p.repo).remote}…`, ms: 1000, ok: method === 'squash' ? `squashed ${p.commits} commits` : method === 'rebase' ? `rebased ${p.commits} commits` : 'merge commit created' },
-  ];
-
-  const results = json_ ? await silentSteps(steps) : await runSteps(steps, { nameWidth: 16, stopOnFail: true, showQueued: true });
-  const failed = results.find((r) => r.status === 'fail');
-  if (failed) {
-    const ev = store.record({ actor: me, action: 'merge', target: `PR #${p.number} → ${p.into}`, decision: 'blocked', note: failed.detail, repo: p.repo, pr: p.number });
-    store.save();
-    if (json_) { json({ merged: false, pr: p.number, reason: failed.detail, event: ev.id }); return 1; }
-    line();
-    line(`  ${c.r(c.b(`✕ Not merged`))}   ${failed.name.trim()}: ${failed.detail} ${c.m(`· ${ev.id}`)}`);
-    line();
-    line(next(`gitroots pr view ${p.number}`));
-    return 1;
-  }
-
-  const sha = Math.floor(Math.random() * 0xfffffff).toString(16).padStart(7, '0');
-  const now = new Date();
-  const hhmm = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
-  p.state = 'merged';
-  p.mergedAt = hhmm;
-  p.mergeSha = sha;
-  const branches = store.d.branches[p.repo] || [];
-  const target = branches.find((b) => b.name === p.into);
-  if (target) { target.commit = sha; target.by = me; target.age = 'now'; }
-  if (!flags['keep-branch']) {
-    const idx = branches.findIndex((b) => b.name === p.from);
-    if (idx > -1) {
-      store.d.deletedBranches = store.d.deletedBranches || {};
-      (store.d.deletedBranches[p.repo] = store.d.deletedBranches[p.repo] || []).push(branches[idx]);
-      branches.splice(idx, 1);
-    }
-  }
-  const repo = store.repo(p.repo);
-  repo.openPrs = Math.max(0, repo.openPrs - 1);
-  repo.lastPush = 'just now';
-  const ev = store.record({ actor: me, action: 'merge', target: `PR #${p.number} → ${p.into}`, decision: 'allowed', note: `${p.approvals.length} approvals · checks green`, repo: p.repo, pr: p.number });
-  store.save();
-
-  if (json_) { json({ merged: true, pr: p.number, into: p.into, sha, event: ev.id }); return 0; }
-  const ahead = store.prs(p.repo).find((x) => x.state === 'open' && x.from === p.into);
-  line();
-  line(`  ${c.g(c.b(`✓ Merged #${p.number} into ${p.into}`))}   ${c.m('as')} ${sha} ${c.m(`· by ${me} · ${hhmm}`)}`);
-  if (!flags['keep-branch']) line(`    ${c.s(pad('branch', 10))}${p.from} deleted ${c.m(`(restore with gitroots branch restore ${p.repo} ${p.from})`)}`);
-  line(`    ${c.s(pad('audit', 10))}${ev.id} ${dot()} approvals, checks and the merge are recorded together`);
-  if (ahead) line(`    ${c.s(pad('next', 10))}release PR #${ahead.number} waits for ${ahead.required - ahead.approvals.length} approval${ahead.required - ahead.approvals.length === 1 ? '' : 's'}`);
-  line();
-  line(`  ${next(ahead ? `gitroots pr view ${ahead.number}` : `gitroots pr list ${p.repo}`, `gitroots audit --pr ${p.number}`)}`);
-  return 0;
-}
-
-async function silentSteps(steps) {
-  const out = [];
-  for (const s of steps) {
-    const r = s.run ? await s.run({ progress() {} }) : {};
-    const res = { ...s, ...r, status: r.status || 'ok', detail: r.detail ?? s.ok };
-    out.push(res);
-    if (res.status === 'fail') break;
-  }
-  return out;
-}
-
-// gitroots pr create [--base staging] [--head branch] [--title "…"] [--repo erp] [--draft]
-function create(args, flags, store) {
-  const cwd = process.cwd();
-  const inGit = Boolean(tryGit(['rev-parse', '--show-toplevel'], cwd));
-  const head = flags.head || (inGit ? tryGit(['rev-parse', '--abbrev-ref', 'HEAD'], cwd) : '');
-  if (!head) throw new Error('which branch? run inside a git repo or pass --head <branch>');
-  if (inGit && flags.head && !tryGit(['rev-parse', '--verify', '--quiet', flags.head], cwd)) throw new Error(`no branch ${flags.head} in this repo`);
-  const url = inGit ? tryGit(['remote', 'get-url', 'origin'], cwd) : '';
-  const repo = flags.repo ? store.repo(flags.repo) : store.repoByRemote(url);
-  if (!repo) throw new Error(`this repository is not in ${store.org.name} · pass --repo <name>`);
-  const base = flags.base || flags.into || (store.ruleFor(repo.name, 'staging').protected ? 'staging' : repo.default);
-  if (head === base) throw new Error(`head and base are both ${base} · switch to your feature branch`);
-  const rule = store.ruleFor(repo.name, base);
-  if (store.prs(repo.name).some((p) => p.state === 'open' && p.from === head && p.into === base)) throw new Error(`a PR from ${head} into ${base} is already open`);
-
-  // Real numbers when the commits are here: files and lines changed against the base.
-  let files = [];
-  let commits = 0;
-  if (inGit) {
-    const baseRef = ['origin/' + base, base].find((r) => tryGit(['rev-parse', '--verify', '--quiet', r], cwd));
-    if (baseRef) {
-      commits = Number(tryGit(['rev-list', '--count', `${baseRef}..${head}`], cwd)) || 0;
-      files = tryGit(['diff', '--numstat', `${baseRef}...${head}`], cwd).split('\n').filter(Boolean).map((l) => {
-        const [a, d, p] = l.split('\t');
-        return { path: p, add: Number(a) || 0, del: Number(d) || 0 };
-      });
-    }
-  }
-  const paths = store.protectedPaths(repo.name);
-  const notes = [];
-  let needs;
-  for (const f of files) {
-    if (/(^|\/)migrations?\//.test(f.path)) { f.flag = 'changes data'; needs = { who: store.org.user, why: 'tech lead for migrations' }; }
-    const hit = paths.find((p) => store.matchPath(p.pattern, f.path));
-    if (hit) { f.flag = `needs ${hit.needs}`; notes.push(`${f.path} needs ${hit.needs}`); }
-  }
-  const title = flags.title || flags.t || (inGit ? tryGit(['log', '-1', '--format=%s', head], cwd) : '') || head;
-  const number = Math.max(...store.d.prs.map((p) => p.number)) + 1;
-  const pr = {
-    number, repo: repo.name, title, from: head, into: base, author: store.org.user, opened: 'just now', at: new Date().toISOString(),
-    required: rule.approvals || 1, approvals: [], checks: { state: 'running' }, state: flags.draft ? 'draft' : 'open', commits: commits || 1, files, notes,
-  };
-  if (needs) pr.needs = needs;
-  store.d.prs.push(pr);
-  repo.openPrs += 1;
-  const ev = store.record({ actor: store.org.user, action: 'open pr', target: `PR #${number} ${head} → ${base}`, decision: 'allowed', repo: repo.name, pr: number });
-  store.save();
-  if (flags.json) { json({ ...pr, event: ev.id }); return 0; }
-  const add = files.reduce((n, f) => n + f.add, 0);
-  const del = files.reduce((n, f) => n + f.del, 0);
-  line(`  ${c.g('✓')} ${c.b(`Opened #${number} ${title}`)}${flags.draft ? c.m(' (draft)') : ''}`);
-  line(`    ${c.s(pad('branch', 11))}${head} → ${base} ${dot()} ${repo.name}`);
-  if (files.length) line(`    ${c.s(pad('changes', 11))}${files.length} files ${c.g(`+${add}`)} ${c.r(`−${del}`)} ${dot()} ${commits} commit${commits === 1 ? '' : 's'}`);
-  line(`    ${c.s(pad('rules', 11))}${rule.protected ? `${rule.approvals} approval${rule.approvals === 1 ? '' : 's'} · checks green` : '1 approval'}${notes.length ? ` ${dot()} ${c.w(`◐ ${notes.length} protected path${notes.length > 1 ? 's' : ''}`)}` : ''}`);
-  line(`    ${c.s(pad('checks', 11))}${c.i('○ running')}`);
-  line();
-  line(next(`gitroots pr view ${number}`));
-  return 0;
-}

package/src/commands/repos.js

@@ -1,122 +0,0 @@
-// gitroots repo list · branch list · branch rules · clone
-import path from 'node:path';
-import { spawnSync } from 'node:child_process';
-import { c, h, pad } from '../ui/ansi.js';
-import { line } from '../ui/term.js';
-import { dot, json, next } from '../ui/components.js';
-import { installHook } from './push.js';
-import { apiRepos, apiBranches } from '../connected.js';
-
-export async function run(cmd, rest, flags, store) {
-  if (cmd === 'clone') return clone(rest, flags, store);
-  const [sub = 'list', ...args] = rest;
-  if (cmd === 'repo' || cmd === 'repos') {
-    if (sub === 'list' || sub === 'ls') return repoList(flags, store);
-    if (sub === 'view') return branchRules([args[0], store.repo(args[0]).default], flags, store);
-    throw new Error(`unknown: gitroots repo ${sub} · try gitroots repo list`);
-  }
-  if (sub === 'list' || sub === 'ls') return branchList(args, flags, store);
-  if (sub === 'rules') return branchRules(args, flags, store);
-  if (sub === 'restore') return branchRestore(args, flags, store);
-  throw new Error(`unknown: gitroots branch ${sub} · try gitroots branch list <repo>`);
-}
-
-async function repoList(flags, store) {
-  const repos = store.api ? await apiRepos(store) : store.repos();
-  if (flags.json) { json(repos); return 0; }
-  line(`  ${h(`${pad('NAME', 14)}${pad('PROVIDER', 11)}${pad('DEFAULT', 10)}${pad('PROTECTED', 12)}${pad('BRANCHES', 11)}${pad('OPEN PRS', 11)}${pad('YOUR ROLE', 14)}LAST PUSH`)}`);
-  for (const r of repos) {
-    line(`  ${c.b(pad(r.name, 14))}${pad(r.provider, 11)}${pad(r.default, 10)}${pad(r.protected.length ? String(r.protected.length) : c.m('—'), 12)}${pad(String(r.branches), 11)}${pad(r.openPrs === null ? c.m('—') : String(r.openPrs), 11)}${pad(r.role, 14)}${r.lastPush || c.m('—')}`);
-  }
-  if (!repos.length) line(c.m(store.api ? '  no repositories synced yet · connect GitHub in the gitroots dashboard' : '  no repositories'));
-  line();
-  line(next(`gitroots branch list ${repos[0]?.name || '<repo>'}`));
-  return 0;
-}
-
-function ruleCell(b) {
-  return b.rule === 'protected' ? `${c.g(pad('● protected', 12))} ${pad(b.ruleText, 28)}` : `${c.i(pad('○ open', 12))} ${pad(b.ruleText, 28)}`;
-}
-
-async function branchList([repoName], flags, store) {
-  if (!repoName) throw new Error('which repository? gitroots branch list <repo>');
-  const all = store.api ? await apiBranches(store, repoName) : store.branches(repoName);
-  const shown = flags.all ? all : all.slice(0, 6);
-  if (flags.json) { json(all); return 0; }
-  line(`  ${h(`${pad('BRANCH', 24)}${pad('RULE', 41)}${pad('APPROVALS', 12)}${pad('LAST COMMIT', 25)}AHEAD / BEHIND`)}`);
-  for (const b of shown) {
-    const name = b.rule === 'protected' ? c.b(pad(b.name, 24)) : pad(b.name, 24);
-    const appr = b.approvals ? pad(String(b.approvals), 12) : c.m(pad('—', 12));
-    line(`  ${name}${ruleCell(b)}${appr}${pad(b.commit ? `${b.commit}  ${b.by} · ${b.age}` : c.m('—'), 25)}${c.m(b.aheadBehind || '—')}`);
-  }
-  if (all.length > shown.length) line(`  ${c.m(`+ ${all.length - shown.length} more · gitroots branch list ${repoName} --all`)}`);
-  line();
-  const prot = all.find((b) => b.rule === 'protected' && b.name !== 'main') || all[0];
-  if (prot) line(next(`gitroots branch rules ${repoName} ${prot.name}`));
-  return 0;
-}
-
-function branchRules([repoName, branch], flags, store) {
-  if (!repoName || !branch) throw new Error('usage: gitroots branch rules <repo> <branch>');
-  if (!store.api) store.repo(repoName);
-  const rule = store.ruleFor(repoName, branch);
-  const paths = store.protectedPaths(repoName);
-  const agents = store.rules(repoName).agents;
-  if (flags.json) { json({ repo: repoName, branch, rule, paths, agents }); return 0; }
-  line(`  ${c.b(branch)}  ${rule.protected ? c.g('● protected') : c.i('○ open')}`);
-  if (rule.protected) {
-    line(`    ${pad('push', 13)}${c.r('✕')} ${pad(rule.push, 44)} ${c.m('changes arrive through PRs')}`);
-    line(`    ${pad('merge', 13)}${c.g('✓')} ${rule.mergeText}`);
-  } else {
-    line(`    ${pad('push', 13)}${c.g('✓')} ${rule.label}`);
-    line(`    ${pad('merge', 13)}${c.g('✓')} through a PR into a protected branch`);
-  }
-  for (const p of paths) line(`    ${pad('paths', 13)}${c.w('◐')} ${p.pattern} needs ${p.needs}`);
-  if (agents) line(`    ${pad('agents', 13)}${c.g('✓')} ${agents}`);
-  line();
-  line(next(`gitroots clone ${repoName}`));
-  return 0;
-}
-
-function branchRestore([repoName, branch], flags, store) {
-  if (!repoName || !branch) throw new Error('usage: gitroots branch restore <repo> <branch>');
-  store.repo(repoName);
-  const deleted = (store.d.deletedBranches || {})[repoName] || [];
-  const b = deleted.find((x) => x.name === branch);
-  if (!b) throw new Error(`no deleted branch ${branch} in ${repoName}`);
-  store.d.deletedBranches[repoName] = deleted.filter((x) => x !== b);
-  store.d.branches[repoName].push(b);
-  const ev = store.record({ actor: store.org.user, action: 'branch restore', target: `${repoName} ${branch}`, decision: 'allowed', repo: repoName });
-  store.save();
-  if (flags.json) { json({ restored: b, event: ev.id }); return 0; }
-  line(`  ${c.g('✓')} Restored ${c.b(branch)} at ${b.commit}   ${c.m(`audit ${ev.id}`)}`);
-  return 0;
-}
-
-function clone([target, dirArg], flags, store) {
-  if (!target) throw new Error('usage: gitroots clone <repo|git-url> [dir]');
-  const isUrl = /[:/]/.test(target);
-  const repo = isUrl ? store.repoByRemote(target) : store.repo(target);
-  const name = repo ? repo.name : path.basename(target).replace(/\.git$/, '');
-  const url = flags.url || (isUrl ? target : null);
-  const dir = path.resolve(dirArg || name);
-  const shown = dir.replace(process.env.HOME || '\u0000', '~');
-
-  if (!url) {
-    // Demo org repositories have no reachable remote: show what clone does.
-    if (flags.json) { json({ repo: name, dir, cloned: false, reason: 'demo repository has no remote · pass --url' }); return 0; }
-    line(`  ${c.g('✓')} Cloned ${name} into ${shown}   ${c.m(`${repo?.branches ?? '?'} branches · default ${repo?.default ?? 'main'}`)}`);
-    line(`  ${c.g('✓')} Push checks installed        ${c.m('git push now runs gitroots checks first')}     ${c.g(`→ cd ${name} && git switch -c feature/…`)}`);
-    line(c.m(`  sample data · nothing was cloned · gitroots clone ${name} --url <git-url> clones for real`));
-    return 0;
-  }
-  const r = spawnSync('git', ['clone', url, dir], { stdio: flags.json ? 'ignore' : ['ignore', 'ignore', 'inherit'] });
-  if (r.status !== 0) { line(`  ${c.r('✕')} git clone failed ${c.m(`(exit ${r.status})`)}`); return r.status || 1; }
-  const branches = spawnSync('git', ['-C', dir, 'branch', '-r'], { encoding: 'utf8' }).stdout.split('\n').filter((l) => l.trim() && !l.includes('->')).length;
-  const def = (spawnSync('git', ['-C', dir, 'symbolic-ref', '--short', 'HEAD'], { encoding: 'utf8' }).stdout || 'main').trim();
-  const hook = installHook(dir, { force: true, repo: name });
-  if (flags.json) { json({ repo: name, dir, cloned: true, branches, default: def, hook: hook.path }); return 0; }
-  line(`  ${c.g('✓')} Cloned ${name} into ${shown}   ${c.m(`${branches} branches ${dot()} default ${def}`)}`);
-  line(`  ${c.g('✓')} Push checks installed        ${c.m('git push now runs gitroots checks first')}     ${c.g(`→ cd ${path.basename(dir)} && git switch -c feature/…`)}`);
-  return 0;
-}

package/src/commands/restore.js

@@ -1,125 +0,0 @@
-// gitroots restore <session|backup> [--machine m] [--pick] [--point turn|b-id] [--fork]
-import { c, h, pad, fit } from '../ui/ansi.js';
-import { line, runSteps, select, interactive, size } from '../ui/term.js';
-import { dot, json, next, sessionState } from '../ui/components.js';
-
-export async function run(_cmd, rest, flags, store) {
-  const [target] = rest;
-  if (!target) throw new Error('usage: gitroots restore <session|backup> [--machine m] [--pick] [--fork]');
-  return restore(store, target, flags);
-}
-
-function pointsFor(store, s) {
-  return store.backups().filter((b) => b.session === s.id).sort((a, b) => b.turn - a.turn);
-}
-
-function panels(left, right, total) {
-  const w = Math.floor((total - 2) / 2);
-  const inner = w - 4;
-  const rows = Math.max(left.length, right.length);
-  const out = [];
-  const top = c.m(`╭${'─'.repeat(w - 2)}╮`);
-  const bot = c.m(`╰${'─'.repeat(w - 2)}╯`);
-  out.push(`${top}  ${top}`);
-  for (let i = 0; i < rows; i++) {
-    out.push(`${c.m('│')} ${fit(left[i] || '', inner)} ${c.m('│')}  ${c.m('│')} ${fit(right[i] || '', inner)} ${c.m('│')}`);
-  }
-  out.push(`${bot}  ${bot}`);
-  return out.join('\n');
-}
-
-export async function restore(store, target, flags = {}) {
-  let s;
-  let point;
-  if (/^b-\d+$/.test(target)) { point = store.backup(target); s = store.session(point.session); } else s = store.session(target);
-  const points = pointsFor(store, s);
-  if (!points.length) throw new Error(`no backups for ${s.id} · gitroots backup ${s.id} makes one`);
-  if (!point && flags.point) {
-    point = /^b-/.test(flags.point) ? store.backup(flags.point) : points.find((p) => String(p.turn) === String(flags.point).replace(/^turn\s*/, ''));
-    if (!point) throw new Error(`no restore point ${flags.point} for ${s.id}`);
-  }
-  const machine = store.machine(flags.machine || s.machine);
-  if (!machine.online) throw new Error(`${machine.name} is offline · pick an online machine with --machine`);
-  let fork = Boolean(flags.fork);
-
-  if (!point && flags.pick && !flags.json) {
-    if (!interactive()) throw new Error('--pick needs a terminal · use --point <turn|backup>');
-    const latest = points[0];
-    line(`${c.i(c.b('?'))} Restore ${c.b(s.id)} to which point?   ${c.m(`${s.agent} · ${s.repo} · ${s.branch}`)}`);
-    line();
-    const cols = Math.min(size().cols, 140);
-    const res = await select({
-      count: points.length,
-      initial: Math.min(1, points.length - 1),
-      keys: { f: 'fork', d: 'diff' },
-      render: (idx) => {
-        const rows = [`     ${h(`${pad('POINT', 12)}${pad('WHEN', 14)}${pad('LAST PROMPT', 46)}${pad('FILES', 9)}BACKUP`)}`];
-        points.forEach((p, i) => {
-          const sel = i === idx;
-          const text = `${pad(`turn ${p.turn}`, 12)}${pad(p.created, 14)}${pad(p.prompt || p.label, 46)}${pad(String(p.files), 9)}${p.id}`;
-          rows.push(sel ? `  ${c.g('❯')} ${c.bg('sel')(c.b(text))}` : `     ${text}`);
-        });
-        const p = points[idx];
-        const dropped = latest.turn - p.turn;
-        const left = [
-          h(`Preview · turn ${p.turn}`),
-          `${c.s(pad('workspace', 11))}HEAD ${p.head} · ${p.files} file${p.files === 1 ? '' : 's'} changed`,
-          ...(p.diff || []).map((f) => `  ${pad(f.path, 26)}${c.g(pad(`+${f.add}`, 4))} ${c.r(`−${f.del}`)}`),
-          dropped > 0 ? `${c.s(pad('dropped', 11))}${dropped} later turns` : `${c.s(pad('dropped', 11))}nothing, this is the latest point`,
-          dropped > 0 ? `${' '.repeat(11)}${c.m(`kept safe in ${latest.id}, nothing is deleted`)}` : '',
-        ];
-        const right = [
-          h('Target'),
-          `${c.s(pad('machine', 11))}${machine.name} · ${machine.os}${machine.self ? ' · this machine' : ''}`,
-          `${c.s(pad('folder', 11))}~/work/${s.repo}${s.changed ? ` · ${c.w('has uncommitted changes')}` : ''}`,
-          `${c.s(pad('plan', 11))}${s.changed ? 'stash local changes as gitroots/pre-restore' : 'checkout, apply, resume'}`,
-          s.changed ? `${' '.repeat(11)}then checkout, apply, resume` : '',
-          `${c.s(pad('resume', 11))}${s.resume} · same conversation`,
-        ];
-        return `${rows.join('\n')}\n\n${panels(left, right, cols)}\n\n${c.m('↑↓ move   enter restore   f restore as a fork (keep ' + s.id + ' as is)   esc cancel')}`;
-      },
-    });
-    if (res.action === 'cancel') { line(c.m('  nothing restored')); return 1; }
-    if (res.action === 'fork') fork = true;
-    point = points[res.index];
-    line();
-  }
-  point = point || points[0];
-
-  if (flags.json) {
-    const r = apply(store, s, point, machine, fork);
-    json(r);
-    return 0;
-  }
-
-  const steps = [];
-  if (s.changed && s.turns !== point.turn && !fork) steps.push({ name: 'Stashed local changes', live: 'git stash push -m gitroots/pre-restore…', ms: 500, ok: 'gitroots/pre-restore' });
-  steps.push({ name: `Workspace at turn ${point.turn}`, live: `checkout ${point.head} · apply backup ${point.id}…`, ms: 900, ok: `HEAD ${point.head} · ${point.files} file${point.files === 1 ? '' : 's'}` });
-  steps.push({ name: 'Conversation', live: `rewinding to turn ${point.turn}…`, ms: 500, ok: `${point.turn} turns · later turns kept in ${points[0].id}` });
-  await runSteps(steps, { nameWidth: 28 });
-  const r = apply(store, s, point, machine, fork);
-  const ss = store.session(r.session);
-  line(`  ${c.g('✓')} ${c.b(`${fork ? 'Forked' : 'Restored'} ${r.session} on ${machine.name}`)}   ${sessionState(ss)} ${dot()} picks up from turn ${point.turn}   ${c.g(`→ gitroots attach ${r.session}`)}`);
-  if (fork) line(`    ${c.m(`${s.id} is unchanged`)}`);
-  return 0;
-}
-
-function apply(store, s, point, machine, fork) {
-  let target = s;
-  if (fork) {
-    target = { ...s, id: store.nextSessionId(), ask: undefined, forkedFrom: s.id };
-    store.d.sessions.push(target);
-  }
-  target.turns = point.turn;
-  target.head = point.head;
-  target.changed = point.files;
-  target.machine = machine.name;
-  target.state = 'running';
-  target.updated = 'just now';
-  if (!fork) target.ask = undefined;
-  const ev = store.record({ actor: store.org.user, action: fork ? 'fork' : 'restore', target: `${target.id} → turn ${point.turn} (${point.id})`, decision: 'allowed', note: machine.name, repo: s.repo });
-  store.save();
-  return { session: target.id, from: s.id, point: point.id, turn: point.turn, machine: machine.name, fork, event: ev.id };
-}
-
-export { next };