gitroots 0.6.1 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitroots",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "gitroots CLI: code governance and agent sessions.",
   "type": "module",
   "bin": {

package/src/runtime.js

@@ -5,7 +5,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-export const VERSION = '0.6.1';
+export const VERSION = '0.6.3';
 
 // Default download location for install.sh / gitroots update. Override with GITROOTS_DOWNLOAD_BASE.
 export const DOWNLOAD_BASE = process.env.GITROOTS_DOWNLOAD_BASE || 'https://gitroots.com/cli';

package/src/session/logo.js

@@ -1,107 +1,35 @@
-// The gitroots logo as terminal pixel art: the 4×4 mark and the "gitroots" wordmark.
-// One pixel is one column wide and half a row tall (▀ ▄ █ with fg/bg colors), so pixels are about square.
-import { state as colorState, c, width, fit } from '../ui/ansi.js';
-
-// Colors sampled from assets/logo.png.
-const CELLS = [
-  ['#B3DA44', '#97D039', '#59B238', '#20944D'],
-  ['#7AC135', '#64B532', '#238B32', '#07753E'],
-  ['#1D872F', '#12743D', '#096736', '#09512E'],
-  ['#075833', '#0A5229', '#0A3E28', '#0A3929'],
-];
-const WORD = '#E3EDFC';
-
-// 8 px tall glyphs: ascenders in rows 0-1, x-height 2-5, descender 6-7.
-const GLYPHS = {
-  g: ['....', '....', '.###', '#..#', '#..#', '.###', '...#', '.##.'],
-  i: ['#', '.', '#', '#', '#', '#', '.', '.'],
-  t: ['.#.', '.#.', '###', '.#.', '.#.', '.##', '...', '...'],
-  r: ['...', '...', '#.#', '##.', '#..', '#..', '...', '...'],
-  o: ['....', '....', '.##.', '#..#', '#..#', '.##.', '....', '....'],
-  s: ['....', '....', '.###', '#...', '..##', '###.', '....', '....'],
-};
-
-const CELL = 2;
-const GAP = 1;
-const MARK = 4 * CELL + 3 * GAP; // 11 px
-const SPACE = 4;
-
-function canvas() {
-  const word = [...'gitroots'].reduce((rows, ch, i) => rows.map((r, y) => r + (i ? '.' : '') + GLYPHS[ch][y]), Array(8).fill(''));
-  let H = Math.max(MARK, 8);
-  if (H % 2) H += 1;
-  const W = MARK + SPACE + word[0].length;
-  const px = Array.from({ length: H }, () => Array(W).fill(null));
-  for (let r = 0; r < 4; r++) {
-    for (let col = 0; col < 4; col++) {
-      for (let y = 0; y < CELL; y++) for (let x = 0; x < CELL; x++) px[r * (CELL + GAP) + y][col * (CELL + GAP) + x] = CELLS[r][col];
-    }
+// The welcome header from the gitroots CLI design:
+//
+//   [logo]  │  v0.6.2 · code governance and agent sessions
+//           │  Secure it to the root, scale with confidence.
+//
+// Terminals that can show images (iTerm2, Ghostty, WezTerm, Kitty) get the real assets/logo.png.
+// Others (Terminal.app, …) print a plain bold "gitroots" in its place, as the design specifies.
+import { c, width, state as colorState } from '../ui/ansi.js';
+import { imageProtocol, logoImage } from '../ui/term.js';
+
+const IMG_ROWS = 3;
+const IMG_COLS = 22; // logo.png is 3.38:1; terminal cells are about 1:2
+
+const word = (s) => (colorState.color ? `\x1b[1m${colorState.truecolor ? '\x1b[38;2;227;237;252m' : '\x1b[38;5;255m'}${s}\x1b[39;22m` : s);
+
+/**
+ * Print the header. `lines` are the text lines beside the divider (two in the design).
+ * Returns the number of rows printed.
+ */
+export function printWelcome(write, lines) {
+  const proto = colorState.color ? imageProtocol() : null;
+  const rows = proto ? IMG_ROWS : Math.max(2, lines.length);
+  const logoCol = proto ? IMG_COLS : width('gitroots');
+  const out = [];
+  for (let i = 0; i < rows; i++) {
+    const logo = proto ? ' '.repeat(logoCol) : i === 0 ? word('gitroots') : ' '.repeat(logoCol);
+    out.push(`  ${logo}   ${c.m('│')}   ${lines[i] ?? ''}`);
   }
-  const oy = Math.floor((H - 8) / 2);
-  word.forEach((row, y) => [...row].forEach((ch, x) => { if (ch === '#') px[oy + y][MARK + SPACE + x] = WORD; }));
-  return { px, W, H };
-}
-
-const rgb = (hex) => [1, 3, 5].map((i) => parseInt(hex.slice(i, i + 2), 16));
-
-// Nearest xterm-256 color for terminals without truecolor.
-function x256([r, g, b]) {
-  const q = (v) => (v < 48 ? 0 : v < 115 ? 1 : Math.floor((v - 35) / 40));
-  const lv = [0, 95, 135, 175, 215, 255];
-  const [qr, qg, qb] = [q(r), q(g), q(b)];
-  const cube = 16 + 36 * qr + 6 * qg + qb;
-  const dc = (lv[qr] - r) ** 2 + (lv[qg] - g) ** 2 + (lv[qb] - b) ** 2;
-  const gray = Math.max(0, Math.min(23, Math.round(((r + g + b) / 3 - 8) / 10)));
-  const gv = 8 + gray * 10;
-  const dg = (gv - r) ** 2 + (gv - g) ** 2 + (gv - b) ** 2;
-  return dg < dc ? 232 + gray : cube;
-}
-
-const fg = (hex) => (colorState.truecolor ? `\x1b[38;2;${rgb(hex).join(';')}m` : `\x1b[38;5;${x256(rgb(hex))}m`);
-const bg = (hex) => (colorState.truecolor ? `\x1b[48;2;${rgb(hex).join(';')}m` : `\x1b[48;5;${x256(rgb(hex))}m`);
-
-let cached = null;
-/** The logo as terminal lines (6 rows × 48 columns). */
-export function logoLines() {
-  if (cached && cached.color === colorState.color && cached.tc === colorState.truecolor) return cached.lines;
-  const { px, W, H } = canvas();
-  const lines = [];
-  for (let y = 0; y < H; y += 2) {
-    let s = '';
-    for (let x = 0; x < W; x++) {
-      const top = px[y][x];
-      const bot = px[y + 1][x];
-      if (!colorState.color) { s += top && bot ? '█' : top ? '▀' : bot ? '▄' : ' '; continue; }
-      if (!top && !bot) s += ' ';
-      else if (top && bot && top === bot) s += `${fg(top)}█\x1b[39m`;
-      else if (top && bot) s += `${fg(top)}${bg(bot)}▀\x1b[39;49m`;
-      else if (top) s += `${fg(top)}▀\x1b[39m`;
-      else s += `${fg(bot)}▄\x1b[39m`;
-    }
-    lines.push(s);
-  }
-  cached = { color: colorState.color, tc: colorState.truecolor, lines };
-  return lines;
-}
-
-/** Welcome box: the logo with the info lines beside it (or under it in narrow terminals). */
-export function welcomeBox(info, cols) {
-  const logo = logoLines();
-  const logoW = width(logo[0]);
-  const infoW = Math.max(...info.map((l) => width(l)));
-  const side = cols >= logoW + infoW + 12;
-  const inner = Math.max(logoW + 4, Math.min(cols - 2, side ? logoW + infoW + 9 : Math.max(logoW, infoW) + 6));
-  const b = (s) => c.g(s);
-  const row = (s) => `${b('│')}  ${fit(s, inner - 4)}${' '.repeat(Math.max(0, inner - 4 - width(fit(s, inner - 4))))}  ${b('│')}`;
-  const out = [b(`╭${'─'.repeat(inner)}╮`), row('')];
-  if (side) {
-    const off = Math.max(0, Math.floor((logo.length - info.length) / 2));
-    for (let i = 0; i < logo.length; i++) out.push(row(`${logo[i]}     ${info[i - off] || ''}`));
-  } else {
-    for (const l of logo) out.push(row(l));
-    out.push(row(''));
-    for (const l of info) out.push(row(l));
+  write(`${out.join('\n')}\n`);
+  if (proto) {
+    const esc = logoImage(IMG_COLS, IMG_ROWS);
+    if (esc) write(`\x1b7\x1b[${rows}A\r\x1b[2C${esc}\x1b8`);
   }
-  out.push(row(''), b(`╰${'─'.repeat(inner)}╯`));
-  return out;
+  return rows;
 }

package/src/session/repl.js

@@ -8,7 +8,7 @@ import { VERSION } from '../runtime.js';
 import { tryGit } from '../git/checks.js';
 import { localSessions, shortPath } from '../agents/local.js';
 import { remoteFullName } from '../rules.js';
-import { welcomeBox } from './logo.js';
+import { printWelcome } from './logo.js';
 import { COMMANDS, find, match, suggest } from './registry.js';
 
 const MENU_ROWS = 8;
@@ -33,21 +33,24 @@ export function words(text) {
   return outw;
 }
 
+// The design's welcome: logo │ version + tagline, then who you are and where you are.
 function header(ctx) {
   const cfg = readConfig();
-  const { cols } = size();
   const top = tryGit(['rev-parse', '--show-toplevel']);
   const branch = top ? tryGit(['rev-parse', '--abbrev-ref', 'HEAD']) : '';
   const repo = top ? remoteFullName(tryGit(['remote', 'get-url', 'origin'])) || top.split('/').pop() : '';
-  const who = ctx.api.signedIn
-    ? `${c.b(cfg.user?.name || cfg.username)} ${c.m('·')} ${cfg.org ? `${cfg.org.name} ${c.m(`(${cfg.org.role})`)}` : c.w('no workspace · /workspace')} ${c.m(`· ${ctx.api.host}`)}`
-    : `${c.w('Not signed in')} ${c.m('· /login to connect your gitroots account')}`;
-  return welcomeBox([
-    `${c.s(`v${VERSION}`)} ${c.m('· code governance and agent sessions')}`,
-    '',
-    who,
-    c.m(`${shortPath(process.cwd())}${repo ? ` · ${repo}${branch ? ` @ ${branch}` : ''}` : ''}`),
-  ], cols);
+  write('\n');
+  printWelcome(write, [
+    `${c.s(`v${VERSION}`)}  ${c.m('·')}  ${c.s('code governance and agent sessions')}`,
+    c.g('Secure it to the root, scale with confidence.'),
+  ]);
+  write('\n');
+  if (ctx.api.signedIn) {
+    write(`  ${c.g('✓')} Signed in as ${c.b(cfg.user?.name || cfg.username)}  ${c.m(`${cfg.org ? `${cfg.org.name} · ${cfg.org.role}` : 'no workspace · /workspace'} · ${ctx.api.host}`)}\n`);
+  } else {
+    write(`  ${c.w('◐')} Not signed in  ${c.m('·')} ${c.g('/login')} ${c.m('connects your gitroots account')}\n`);
+  }
+  write(`    ${c.m(`${shortPath(process.cwd())}${repo ? ` · ${repo}${branch ? ` @ ${branch}` : ''}` : ''}`)}\n`);
 }
 
 class Repl {
@@ -169,7 +172,7 @@ class Repl {
         this.notice = c.w('  press ctrl-c again to exit');
         break;
       case 'ctrl-d': if (!this.input) return this.exit(); this.input = this.input.slice(0, this.pos) + this.input.slice(this.pos + 1); break;
-      case 'ctrl-l': write('\x1b[2J\x1b[H'); this.drawn = 0; write(`${header(this.ctx).join('\n')}\n\n`); break;
+      case 'ctrl-l': write('\x1b[2J\x1b[H'); this.drawn = 0; header(this.ctx); write('\n'); break;
       case 'left': this.pos = Math.max(0, this.pos - 1); break;
       case 'right': this.pos = Math.min(this.input.length, this.pos + 1); break;
       case 'home': case 'ctrl-a': this.pos = 0; break;
@@ -229,7 +232,7 @@ class Repl {
       return;
     }
     if (cmd.name === 'exit') return this.exit();
-    if (cmd.name === 'clear') { write('\x1b[2J\x1b[3J\x1b[H'); write(`${header(this.ctx).join('\n')}\n\n`); this.draw(); return; }
+    if (cmd.name === 'clear') { write('\x1b[2J\x1b[3J\x1b[H'); header(this.ctx); write('\n'); this.draw(); return; }
     if (cmd.name === 'help') { printHelp(true); write('\n'); this.draw(); return; }
     await this.run(cmd, rest);
   }
@@ -293,8 +296,8 @@ class Repl {
   }
 
   start() {
-    write(`\n${header(this.ctx).join('\n')}\n`);
-    write(`  ${c.m('Type')} ${c.g('/')} ${c.m('to pick a command, or')} ${c.g('/help')} ${c.m('for all of them.')}${this.ctx.api.signedIn ? '' : `  ${c.m('Start with')} ${c.g('/login')}${c.m('.')}`}\n\n`);
+    header(this.ctx);
+    write(`\n  ${c.m('Type')} ${c.g('/')} ${c.m('to pick a command, or')} ${c.g('/help')} ${c.m('for all of them.')}\n\n`);
     process.stdin.setRawMode(true);
     process.stdin.resume();
     process.stdin.on('data', this.onData);

package/src/ui/ansi.js

@@ -23,6 +23,8 @@ function detectTruecolor() {
   const tp = env.TERM_PROGRAM || '';
   if (['iTerm.app', 'WezTerm', 'ghostty', 'vscode', 'Hyper'].includes(tp)) return true;
   if (env.WT_SESSION) return true;
+  // Terminal.app gained 24-bit color in macOS 26 (Terminal 460+).
+  if (tp === 'Apple_Terminal' && Number(String(env.TERM_PROGRAM_VERSION || '').split('.')[0]) >= 460) return true;
   const term = env.TERM || '';
   return /kitty|ghostty|direct|truecolor/.test(term);
 }