reslop 0.3.1 → 0.3.2

package/lib/input/actions.js

@@ -59,6 +59,7 @@ const NPM_ACTIONS = {
   npmDrop: ['delete'],
   npmLogs: ['l'],
   npmStop: ['s'],
+  npmSolve: ['s'],
   npmVerbose: ['v'],
   npmRerun: ['r'],
 };
@@ -69,7 +70,8 @@ const AGENT_ACTIONS = {
   agentFast: ['a'],
   agentContext: ['t'],
   agentReview: ['p'],
-  agentContinue: ['c'],
+  agentInstall: ['i'],
+  agentStart: ['s'],
   agentStop: ['s'],
   agentRerun: ['r'],
 };
@@ -80,7 +82,8 @@ const AGENT_LIST_ACTIONS = {
   agentFast: AGENT_ACTIONS.agentFast,
   agentContext: AGENT_ACTIONS.agentContext,
   agentReview: AGENT_ACTIONS.agentReview,
-  agentContinue: AGENT_ACTIONS.agentContinue,
+  agentInstall: AGENT_ACTIONS.agentInstall,
+  agentStart: AGENT_ACTIONS.agentStart,
 };
 
 const DASH_TILES = [
@@ -102,6 +105,11 @@ for (const tile of DASH_TILES) {
   DASH_KEYS[tile.key] = tile.action;
 }
 const DASH_IDS = Object.keys(DASH_ACTIONS);
+const WORKTREE_ACTIONS = {
+  worktreeNew: ['insert'],
+  worktreeDrop: ['delete'],
+  worktreeBranch: ['w'],
+};
 const DASH_ALLOWED = [
   ...Object.keys(DASH_BLOCKS),
   'back',
@@ -117,17 +125,28 @@ const REPOS_ALLOWED = [
   'repoDown',
   'open',
   'back',
+  'worktreeNew',
+  'worktreeDrop',
   'quit',
   'theme',
 ];
 const DASH_HIDDEN = ACTION_IDS.filter((id) => id !== 'quit');
 
 const ACTION_HOT = {
+  textCut: 'ctrl+x',
+  textCopy: 'ctrl+c',
+  textPaste: 'ctrl+v',
+  textDelete: 'del',
+  textSelectAll: 'ctrl+a',
+  open: 'enter',
   prev: '←',
   next: '→',
   drop: 'del',
+  worktreeDrop: 'del',
+  worktreeBranch: 'w',
   newBranch: 'ins',
   newCommit: 'ins',
+  worktreeNew: 'ins',
   feedback: 'q',
   check: 'space',
   taskUp: 'ctrl+up',
@@ -145,7 +164,13 @@ const ACTION_HOT = {
 };
 
 const ACTION_LABEL = {
+  textCut: 'ctrl+x cut',
+  textCopy: 'ctrl+c copy',
+  textPaste: 'ctrl+v paste',
+  textDelete: 'delete',
+  textSelectAll: 'ctrl+a select all',
   ...DASH_BLOCKS,
+  open: 'enter open',
   revert: 'drop',
   check: 'space',
   taskUp: 'ctrl+up',
@@ -163,6 +188,9 @@ const ACTION_LABEL = {
   drop: 'delete',
   newBranch: 'insert',
   newCommit: 'insert',
+  worktreeNew: 'insert',
+  worktreeDrop: 'delete',
+  worktreeBranch: 'worktree',
   feedback: 'quote',
   npmEdit: 'edit',
   npmNew: 'insert',
@@ -173,6 +201,7 @@ const ACTION_LABEL = {
   packageWanted: 'wanted',
   packageLatest: 'latest',
   npmStop: 'stop',
+  npmSolve: 'solve',
   npmVerbose: 'verbose',
   npmRerun: 're-run',
   agentModel: 'model',
@@ -180,7 +209,8 @@ const ACTION_LABEL = {
   agentFast: 'fast',
   agentContext: 'context',
   agentReview: 'plan',
-  agentContinue: 'continue',
+  agentInstall: 'install',
+  agentStart: 'start',
   agentStop: 'stop',
   agentRerun: 're-run',
   quit: 'q',
@@ -387,7 +417,12 @@ const keysForActions = (actions) => {
 const PANE_ONLY = ['branch', 'file', 'diff'];
 const REVIEW_DROP = { d: 'revert' };
 const DIFF_KEYS = { ...REVIEW_DROP, q: 'feedback', 'ctrl-l': 'lines' };
-const BRANCH_KEYS = keysForActions(BRANCH_ACTIONS);
+const BRANCH_KEYS = {
+  ...keysForActions(BRANCH_ACTIONS),
+  w: 'worktreeBranch',
+  left: 'treeLeft',
+  right: 'treeRight',
+};
 const COMMIT_KEYS = { ...keysForActions(COMMIT_ACTIONS), s: 'push' };
 const NPM_KEYS = {
   e: 'npmEdit',
@@ -416,6 +451,8 @@ const PANE_KEYS = {
     j: 'repoDown',
     p: 'repoLeft',
     n: 'repoRight',
+    insert: 'worktreeNew',
+    delete: 'worktreeDrop',
   },
 };
 
@@ -430,7 +467,8 @@ const KEY_TO_ACTION = {
 };
 
 const actionFromKey = (key, pane) => {
-  if (LIST_PANES.includes(pane) && (key === 'left' || key === 'right')) {
+  const sideways = key === 'left' || key === 'right';
+  if (LIST_PANES.includes(pane) && sideways && pane !== 'branches') {
     return null;
   }
   const paneKeys = PANE_KEYS[pane];
@@ -446,6 +484,7 @@ const ACTION_KEYS = {
   ...NPM_ACTIONS,
   ...COMMIT_ACTIONS,
   ...BRANCH_ACTIONS,
+  ...WORKTREE_ACTIONS,
   ...ACTIONS,
 };
 
@@ -453,6 +492,17 @@ const actionKeys = (id) => ACTION_KEYS[id] ?? [];
 
 const actionLetter = (id) => ACTION_HOT[id] ?? actionKeys(id)[0];
 
+const ACTION_CAPTION = {
+  open: 'open',
+  check: 'check',
+  textCut: 'cut',
+  textCopy: 'copy',
+  textPaste: 'paste',
+  textSelectAll: 'select all',
+};
+
+const actionCaption = (id) => ACTION_CAPTION[id] ?? ACTION_LABEL[id] ?? id;
+
 const buttonWord = (id) => {
   const word = ACTION_LABEL[id] ?? ACTION_HOT[id] ?? id;
   const mark = actionLetter(id);
@@ -489,6 +539,15 @@ const CONFIRM = {
       escape: 'decline',
     },
   },
+  confirmAgentInstall: {
+    choices: YES_NO,
+    prefix: (view) => ` install ${view.agentInstallPackage ?? ''}?`,
+    keys: {
+      y: 'confirm',
+      n: 'cancel',
+      escape: 'cancel',
+    },
+  },
   confirmDrop: {
     choices: YES_NO,
     prefix: (view) => ` drop ${view.dropName ?? ''}?`,
@@ -498,6 +557,24 @@ const CONFIRM = {
       escape: 'cancel',
     },
   },
+  confirmWorktree: {
+    choices: YES_NO,
+    prefix: (view) => ` remove ${view.dropName ?? ''}?`,
+    keys: {
+      y: 'confirm',
+      n: 'cancel',
+      escape: 'cancel',
+    },
+  },
+  confirmCreateWorktree: {
+    choices: YES_NO,
+    prefix: (view) => ` create ${view.worktreeTarget ?? ''}?`,
+    keys: {
+      y: 'confirm',
+      n: 'cancel',
+      escape: 'cancel',
+    },
+  },
   confirmPush: {
     choices: [{ letter: 'f', label: 'force push', lead: ' ' }],
     prefix: ' Need force-push?',
@@ -574,6 +651,7 @@ module.exports = {
   isFixupCommit,
   actionFromKey,
   actionLetter,
+  actionCaption,
   buttonWord,
   CONFIRM,
   CONFIRM_MODE,

package/lib/input/keys.js

@@ -45,10 +45,15 @@ const CSI_TILDE = {
   24: 'f12',
 };
 
+// Kitty CSI-u and xterm modifyOtherKeys. 13 is Enter, 10 is line feed.
 const CSI_U = {
+  10: 'enter',
+  13: 'enter',
   127: 'backspace',
 };
 
+const MODIFY_OTHER = '27';
+
 const CSI_MAX = 16;
 
 const LITERAL_KEY = {
@@ -80,6 +85,12 @@ const modifiedKey = (base, modText) => {
   const ctrl = (bits & 4) !== 0;
   const shift = (bits & 1) !== 0;
   if (base === 'backspace' && ctrl) return 'ctrl-backspace';
+  if (base === 'enter') {
+    if (ctrl && shift) return 'ctrl-shift-enter';
+    if (ctrl) return 'ctrl-enter';
+    if (shift) return 'shift-enter';
+    return 'enter';
+  }
   if (!arrow && !end) return base;
   if (ctrl && shift && arrow) return `ctrl-shift-${base}`;
   if (ctrl && arrow) return `ctrl-${base}`;
@@ -87,8 +98,19 @@ const modifiedKey = (base, modText) => {
   return base;
 };
 
+const NEWLINE_KEYS = ['ctrl-enter', 'shift-enter', 'ctrl-shift-enter'];
+
+const isNewlineKey = (key) => NEWLINE_KEYS.includes(key);
+
+const otherModified = (params) => {
+  const base = CSI_U[params[2]];
+  if (!base) return null;
+  return modifiedKey(base, params[1] ?? '1');
+};
+
 const keyFromCsi = (paramsText, final) => {
   const params = paramsText ? paramsText.split(';') : [];
+  if (final === '~' && params[0] === MODIFY_OTHER) return otherModified(params);
   let base = CSI_KEYS[final];
   if (final === '~') base = CSI_TILDE[params[0]];
   if (final === 'u') base = CSI_U[params[0]];
@@ -115,6 +137,7 @@ const mouseKind = (button, press) => {
   const wheel = MOUSE_WHEEL[button];
   if (wheel) return wheel;
   if (!press) return 'release';
+  if ((button & 35) === 35) return 'move';
   return button & 32 ? 'drag' : 'press';
 };
 
@@ -197,4 +220,10 @@ const hitAction = (hits, x) => {
   return null;
 };
 
-module.exports = { ACTIONS, decodeChunk, hitAction, isTextKey };
+module.exports = {
+  ACTIONS,
+  decodeChunk,
+  hitAction,
+  isTextKey,
+  isNewlineKey,
+};

package/lib/input/line-edit.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { Editor } = require('./editor.js');
-const { isTextKey } = require('./keys.js');
+const { isTextKey, isNewlineKey } = require('./keys.js');
 const clipboard = require('../term/clipboard.js');
 
 const copyLine = (editor, ui) => {
@@ -57,6 +57,10 @@ const lineKey = (editor, key, ui, ends) => {
     copyLine(editor, ui);
     return 'caret';
   }
+  if (isNewlineKey(key)) {
+    editor.insert('\n');
+    return 'text';
+  }
   const op = (ends ? LINE_ENDS : LINE_OP)[key];
   if (!op && !isTextKey(key)) return null;
   const before = editor.text;

package/lib/render/agents.js

@@ -17,7 +17,7 @@ const { flexCell, tableLines, titleAside } = table;
 const logPaint = require('./log.js');
 const { LOG_PAD_X } = logPaint;
 const { paintNpmLog, withLogScroller } = logPaint;
-const { paintField } = require('./field.js');
+const { paintField, queryTones, fieldHit } = require('./field.js');
 
 const BUBBLE = '●';
 const BUBBLE_GAP = 1;
@@ -45,14 +45,8 @@ const COL_TITLES = {
 
 const agentFields = (row) => {
   if (!row.bin) {
-    return {
-      name: row.name,
-      model: row.model || '',
-      effort: '',
-      fast: '',
-      context: '',
-      plan: 'not installed',
-    };
+    const none = { model: '', effort: '', fast: '', context: '', plan: '' };
+    return { name: row.name, ...none };
   }
   const levels = row.efforts ?? [];
   return {
@@ -166,7 +160,28 @@ const cellFace = (text, width, query, end = false) => {
   return end && !query ? `${pad}${shown}` : `${shown}${pad}`;
 };
 
+// A missing agent has no settings: the row says what would bring it
+const paintHintRow = (row, width, color, selected, cols) => {
+  const prefix = ' '.repeat(PAD_W);
+  const tail = ' '.repeat(TAIL);
+  const gap = cols.gap || ' ';
+  const name = cellFace(row.name, cols.nameW, '');
+  const taken = PAD_W + TAIL + visibleWidth(name) + visibleWidth(gap);
+  const hint = cellFace(row.hint || 'not installed', width - taken, '');
+  const fgRgb = selected ? THEME.chromeFg : THEME.mutedFg;
+  const bgRgb = selected ? THEME.buttonBg : THEME.ctxBg;
+  const text = `${prefix}${name}${gap}${hint}${tail}`;
+  if (!color) return { row: text, spans: [] };
+  let out = `${seq(fgRgb, bgRgb)}${EL}`;
+  out += paint(`${prefix}${name}`, THEME.mutedFg, bgRgb, color);
+  out += paint(gap, fgRgb, bgRgb, color);
+  out += paint(hint, THEME.warnFg, bgRgb, color);
+  out += paint(tail, fgRgb, bgRgb, color);
+  return { row: out, spans: [] };
+};
+
 const paintAgentRow = (row, width, color, selected, cols, search) => {
+  if (!row.bin) return paintHintRow(row, width, color, selected, cols);
   const fields = agentFields(row);
   const prefix = ' '.repeat(PAD_W);
   const rest = Math.max(1, width - PAD_W - TAIL);
@@ -183,6 +198,17 @@ const paintAgentRow = (row, width, color, selected, cols, search) => {
     ),
     plan: cellFace(fields.plan, cols.planW, typedQuery(search, 'plan'), true),
   };
+  if (!color && search?.editor) {
+    const size = colW(cols, search.field);
+    search.editor.reveal(size);
+    cells[search.field] = paintField(
+      search.query,
+      search.editor,
+      size,
+      false,
+      queryTones(THEME.warnFg, THEME.buttonBg),
+    );
+  }
   let mid = name;
   for (const field of VALUE_FIELDS) {
     if (colW(cols, field)) mid += `${gap}${cells[field]}`;
@@ -193,11 +219,9 @@ const paintAgentRow = (row, width, color, selected, cols, search) => {
   const fgRgb = selected ? THEME.chromeFg : THEME.mutedFg;
   const bgRgb = selected ? THEME.buttonBg : THEME.ctxBg;
   if (!color) return { row: `${prefix}${mid}${pad}${tail}`, spans };
-  const nameFg = row.bin ? THEME.buttonHotFg : THEME.mutedFg;
-  const modelFg = row.bin ? THEME.shaFg : THEME.shaDarkFg;
-  const valueFg = row.bin ? THEME.buttonHotFg : fgRgb;
+  const valueFg = THEME.buttonHotFg;
   const tones = {
-    model: { fg: modelFg, bold: Boolean(row.bin) },
+    model: { fg: THEME.shaFg, bold: true },
     effort: { fg: valueFg, bold: false },
     fast: { fg: valueFg, bold: false, glue: true },
     context: { fg: valueFg, bold: false },
@@ -205,7 +229,7 @@ const paintAgentRow = (row, width, color, selected, cols, search) => {
   };
   let out = `${seq(fgRgb, bgRgb)}${EL}`;
   out += paint(prefix, fgRgb, bgRgb, color);
-  out += paint(name, nameFg, bgRgb, color, Boolean(row.bin));
+  out += paint(name, valueFg, bgRgb, color, true);
   for (const field of VALUE_FIELDS) {
     const size = colW(cols, field);
     if (!size) continue;
@@ -219,14 +243,10 @@ const paintAgentRow = (row, width, color, selected, cols, search) => {
     out += paint(gap, valueFg, bgRgb, color);
     if (query && search.editor) {
       search.editor.reveal(size);
-      const queryTones = {
-        plain: { fg: THEME.searchFg, bg: THEME.searchBg },
-        select: { fg: THEME.chromeFg, bg: THEME.checkBg },
-        caret: { fg: THEME.searchOnFg, bg: THEME.searchOnBg },
-      };
-      out += paintField(query, search.editor, size, color, queryTones);
+      const typed = queryTones(THEME.warnFg, bgRgb);
+      out += paintField(query, search.editor, size, color, typed);
     } else if (query) {
-      out += paint(face, THEME.searchFg, THEME.searchBg, color, true);
+      out += paint(face, THEME.warnFg, bgRgb, color, true);
     } else {
       out += paint(face, tone.fg, bgRgb, color, tone.bold);
     }
@@ -273,7 +293,7 @@ const overlayMenu = (painted, view, cols, gap, width, color, headerLines) => {
   const boxW = menuBoxWidth(options, columnW, width - x);
   if (x + boxW > width) x = Math.max(0, width - boxW);
   const origin = down ? rowAt + 1 : Math.max(0, rowAt - box.span);
-  const faces = menuFaces(options, box, boxW, color, off);
+  const faces = menuFaces(options, box, boxW, color, view.agentQuery, off);
   const body = painted.body.slice();
   const fileHits = painted.fileHits.slice();
   for (let i = 0; i < faces.length && origin + i < body.length; i++) {
@@ -289,7 +309,13 @@ const overlayMenu = (painted, view, cols, gap, width, color, headerLines) => {
       field: 'menu',
     });
   }
-  return { ...painted, body, fileHits, menuScroll: box.start };
+  const editHits = painted.editHits.slice();
+  if (view.agentEditor) {
+    const start = fieldX(cols, gap, field);
+    const hit = fieldHit(view.agentEditor, start, columnW, rowHit.y);
+    editHits.push({ ...hit, row: rowAt });
+  }
+  return { ...painted, body, fileHits, editHits, menuScroll: box.start };
 };
 
 const chooserSplit = (width) => {
@@ -625,7 +651,7 @@ const agentName = (item) => {
 
 const agentsBlock = (model, width, height, ctx, tile) => {
   const data = model.agents;
-  if (!data || !data.ready) return waiting('detecting clis…');
+  if (!data || !data.ready) return waiting('detecting agents…');
   const aside = [seg(`${data.running || 0}`, 'key', true)];
   const titleLine = titleAside(tile, aside, width);
   const items = data.items ?? [];

package/lib/render/branches.js

@@ -5,9 +5,12 @@ const { shortAge } = require('../common/format.js');
 const primitives = require('./primitives.js');
 
 const { THEME, paint, visibleWidth, trimVisible, seq, EL } = ansi;
-const { MARK_W, markPrefix, branchLabel, editSpan } = primitives;
-const { paintCursorList, fieldWindow } = primitives;
+const { markPrefix, branchLabel, paintCursorList } = primitives;
+const { paintBodyFill } = primitives;
 const { measureColumns, padColumns, joinColumns, paintColumns } = primitives;
+const { paintNameEdit } = require('./name-edit.js');
+const { paintTreeBand } = require('./repos.js');
+const { tileHits, pageFill } = require('./tiles.js');
 
 const BRANCH_COL_ALIGN = {
   sha: 'end',
@@ -92,27 +95,23 @@ const paintBranchRow = (entry, width, color, selected, cols) => {
   return out + paint(tail, fgRgb, bgRgb, color);
 };
 
-const paintBranchEdit = (compose, width, color) => {
-  const prefix = markPrefix(true);
-  const rest = Math.max(1, width - MARK_W);
-  const text = `${compose.text ?? ''}`.replaceAll('\n', ' ');
-  const win = fieldWindow(text, compose.cursor, compose.scrollCol, rest);
-  const gap = ' '.repeat(Math.max(0, rest - visibleWidth(win.text)));
-  const fgRgb = THEME.chromeFg;
-  const bgRgb = THEME.buttonBg;
-  let row = `${prefix}${win.text}${gap}`;
-  if (color) {
-    row = `${seq(fgRgb, bgRgb)}${EL}`;
-    row += paint(prefix, fgRgb, bgRgb, color);
-    row += paint(win.text, THEME.buttonHotFg, bgRgb, color);
-    row += paint(gap, fgRgb, bgRgb, color);
-  }
-  const textX = MARK_W + 1;
-  const edit = editSpan(1, textX, textX + rest, 0, text);
-  const cursor = { x: textX + win.col, scroll: win.scroll };
-  return { row, cursor, edits: [{ ...edit, scroll: win.scroll }] };
-};
+// A title and the five lines of a tile
+const TREES_H = 6;
+const LIST_MIN_H = 4;
+// A blank line above the tiles, one under them, one under the list
+const TREES_GAPS = 3;
+
+// The tiles of the worktrees show when the list of branches can spare it
+const treesHeight = (bodyH) =>
+  bodyH - TREES_GAPS - LIST_MIN_H >= TREES_H ? TREES_H : 0;
+
+const shiftRows = (list, by) => ({
+  ...list,
+  cursor: list.cursor ? { ...list.cursor, row: list.cursor.row + by } : null,
+  editHits: list.editHits.map((span) => ({ ...span, row: span.row + by })),
+});
 
+// The worktrees above the branches; one element is selected, a tile or a branch
 const paintBodyBranches = (view, width, color, bodyH, headerLines) => {
   const branches = view.branches ?? [];
   const cols = measureColumns(branches, branchRowFields, BRANCH_COL_ALIGN);
@@ -123,12 +122,41 @@ const paintBodyBranches = (view, width, color, bodyH, headerLines) => {
   cols.name = Math.min(BRANCH_NAME_MAX, cols.name);
   const cursor = view.branchCursor ?? 0;
   const { compose } = view;
-  const branchEdit = compose?.kind === 'branch';
-  const edit = branchEdit ? paintBranchEdit(compose, width, color) : null;
-  const pane = { width, color, bodyH, headerLines, offset: view.listScroll };
+  const trees = view.trees ? treesHeight(bodyH) : 0;
+  const typing = compose?.kind === 'branch' || compose?.kind === 'worktree';
+  const typed = typing ? paintNameEdit(compose, width, color) : null;
+  const above = trees && compose?.kind === 'worktree' ? typed : null;
+  const edit = above ? null : typed;
+  const lead = above ? 1 : 0;
+  const top = trees ? lead + 1 + trees + 1 : 0;
+  const room = trees ? bodyH - top - 1 : bodyH;
+  const pane = { width, color, bodyH: room, headerLines: headerLines + top };
+  pane.offset = view.listScroll;
+  if (trees) pane.pad = 0;
+  const picked = !view.treeFocus;
   const paintRow = (entry, selected) =>
-    paintBranchRow(entry, width, color, selected, cols);
-  return paintCursorList(branches, cursor, pane, paintRow, edit);
+    paintBranchRow(entry, width, color, selected && picked, cols);
+  const list = paintCursorList(branches, cursor, pane, paintRow, edit);
+  if (!trees) return list;
+  const band = paintTreeBand(view.trees, width, trees, color);
+  const hits = tileHits(band.bands, headerLines + lead + 1);
+  const treeHits = hits.map((hit) => ({ ...hit, tree: true }));
+  const head = above ? [above.row] : [];
+  const gap = pageFill(width, color);
+  const tail = paintBodyFill(width, color, 'files');
+  const body = [...head, gap, ...band.rows, gap, ...list.body, tail];
+  const fileHits = [...treeHits, ...list.fileHits];
+  const moved = shiftRows(list, top);
+  const typedAbove = above ? { ...above.cursor, row: 0 } : null;
+  const spans = above ? above.edits.map((span) => ({ ...span, row: 0 })) : [];
+  return {
+    ...moved,
+    body,
+    fileHits,
+    cursor: typedAbove ?? moved.cursor,
+    editHits: [...spans, ...moved.editHits],
+    gridCols: band.cols,
+  };
 };
 
 module.exports = { paintBodyBranches };

package/lib/render/field.js

@@ -4,6 +4,16 @@ const ansi = require('../term/ansi.js');
 
 const { THEME, paint, graphemes, graphemeWidth, visibleWidth } = ansi;
 const { fileMatches } = require('../common/find.js');
+const { editSpan } = require('./primitives.js');
+
+// Inline fields paint their own selection; their spans map pointer positions.
+const fieldHit = (editor, x, width, y) => ({
+  ...editSpan(x + 1, x + 1, x + width + 1, 0, editor.text),
+  editor,
+  y,
+  scroll: editor.scrollCol,
+  live: false,
+});
 
 const pieceKind = (index, cursor, lo, hi) => {
   if (index === cursor) return 'caret';
@@ -62,6 +72,12 @@ const paintField = (text, editor, room, color, tones) => {
   return out + paint(pad, plain.fg, plain.bg, color);
 };
 
+const queryTones = (fgRgb, bgRgb) => ({
+  plain: { fg: fgRgb, bg: bgRgb },
+  select: { fg: THEME.chromeFg, bg: THEME.checkBg },
+  caret: { fg: THEME.searchOnFg, bg: THEME.searchOnBg },
+});
+
 const paintPlanFace = (view, face, fgRgb, bgRgb, color) => {
   const editor = view.planEditor;
   if (!editor || !view.planQuery) {
@@ -69,11 +85,7 @@ const paintPlanFace = (view, face, fgRgb, bgRgb, color) => {
   }
   const room = visibleWidth(face);
   if (room) editor.reveal(room);
-  const tones = {
-    plain: { fg: THEME.searchFg, bg: THEME.searchBg },
-    select: { fg: THEME.chromeFg, bg: THEME.checkBg },
-    caret: { fg: THEME.searchOnFg, bg: THEME.searchOnBg },
-  };
+  const tones = queryTones(fgRgb, bgRgb);
   return paintField(view.planQuery, editor, room, color, tones);
 };
 
@@ -125,7 +137,9 @@ const paintFindStatus = (view, width, color) => {
 
 module.exports = {
   paintField,
+  queryTones,
   paintPlanFace,
   paintImportStatus,
   paintFindStatus,
+  fieldHit,
 };

package/lib/render/footer.js

@@ -296,9 +296,10 @@ const agentListDim = (view) => {
   const off = [];
   if (!installed || levels.length < 2) off.push('agentEffort');
   if (!installed) off.push('agentFast');
-  if (!installed || !sizes.length) off.push('agentContext');
+  if (!installed || sizes.length < 2) off.push('agentContext');
   if ((view.agentPlanCount ?? 0) < 2) off.push('agentReview');
-  if (!view.agentCanContinue) off.push('agentContinue');
+  if (installed || !row || !row.installable) off.push('agentInstall');
+  if (!view.agentCanStart) off.push('agentStart');
   return off;
 };
 
@@ -331,14 +332,16 @@ const dimFooterActions = (view) => {
 const GIT_FOOTER = ['add', 'unstage', 'revert', 'ignore'];
 
 const FOOTER_EXTRA = {
-  repos: ['theme'],
+  repos: ['theme', 'worktreeNew', 'worktreeDrop'],
   dashboard: ['theme', 'pull', 'push'],
   unit: ['add', 'unstage', 'revert', 'feedback', 'code', 'lines'],
   files: [...GIT_FOOTER, 'code'],
   diff: [...GIT_FOOTER, 'feedback', 'code', 'layout', 'lines'],
-  branches: ['newBranch', 'rebase', 'drop', 'pull', 'push'],
+  branches: ['newBranch', 'worktreeBranch', 'rebase', 'drop', 'pull', 'push'],
+  trees: ['worktreeNew', 'worktreeDrop', 'pull', 'push'],
   commits: ['newCommit', 'apply', 'reword', 'drop', 'view', 'pull', 'push'],
   npmLog: ['npmVerbose', 'npmStop', 'npmRerun'],
+  npmFailedLog: ['npmVerbose', 'npmSolve', 'npmRerun'],
   npm: ['npmEdit', 'npmNew', 'npmDrop', 'npmLogs'],
   packages: ['packageNew', 'packageDrop', 'packageWanted', 'packageLatest'],
   agentLog: ['agentStop', 'agentRerun'],
@@ -348,14 +351,18 @@ const FOOTER_EXTRA = {
     'agentFast',
     'agentContext',
     'agentReview',
-    'agentContinue',
+    'agentInstall',
+    'agentStart',
   ],
   tasks: ['plan', 'import', 'drop', 'check', 'taskNudge'],
 };
 
 const extraFooterActions = (view) => {
   const { pane } = view;
-  if (pane === 'npm' && view.npmView) return FOOTER_EXTRA.npmLog;
+  if (pane === 'branches' && view.treeFocus) return FOOTER_EXTRA.trees;
+  if (pane === 'npm' && view.npmView) {
+    return view.npmCanSolve ? FOOTER_EXTRA.npmFailedLog : FOOTER_EXTRA.npmLog;
+  }
   if (pane === 'npm') return FOOTER_EXTRA.npm;
   if (pane === 'agents' && view.agentView) return FOOTER_EXTRA.agentLog;
   if (pane === 'agents') return FOOTER_EXTRA.agents;
@@ -382,4 +389,5 @@ module.exports = {
   paintFooter,
   footerHits,
   footerLayout,
+  dimFooterActions,
 };