reslop 0.2.6 → 0.3.0

package/lib/{session → input}/actions.js

@@ -1,6 +1,13 @@
 'use strict';
 
-const LIST_PANES = ['files', 'branches', 'commits', 'npm'];
+const LIST_PANES = [
+  'files',
+  'branches',
+  'commits',
+  'npm',
+  'packages',
+  'agents',
+];
 
 const ACTIONS = {
   add: ['a'],
@@ -10,20 +17,20 @@ const ACTIONS = {
   commit: ['c'],
   prev: ['left', 'p', 'k'],
   next: ['right', 'n', 'j'],
-  check: ['x', ' '],
+  check: [' '],
   layout: ['m'],
-  feedback: ['f'],
+  feedback: [],
   tasks: ['t'],
   code: ['e'],
   branch: ['b'],
   file: ['f'],
   diff: ['d'],
-  quit: ['q', 'ctrl-c'],
+  quit: ['ctrl-c'],
 };
 const ACTION_IDS = Object.keys(ACTIONS);
 
 const BRANCH_ACTIONS = {
-  newBranch: ['n'],
+  newBranch: ['insert'],
   rebase: ['e'],
   drop: ['delete'],
   pull: ['p'],
@@ -31,73 +38,148 @@ const BRANCH_ACTIONS = {
 };
 
 const COMMIT_ACTIONS = {
-  amend: ['a'],
+  newCommit: ['insert'],
   apply: ['p'],
   reword: ['e'],
-  fixup: ['x'],
   drop: ['delete'],
   view: ['v'],
 };
 
+const PACKAGE_ACTIONS = {
+  packageNew: ['insert'],
+  packageDrop: ['delete'],
+  packageWanted: ['w'],
+  packageLatest: ['l'],
+};
+
 const NPM_ACTIONS = {
   npm: ['n'],
   npmEdit: ['e'],
-  npmNew: ['i'],
+  npmNew: ['insert'],
   npmDrop: ['delete'],
   npmLogs: ['l'],
-  npmStop: ['escape'],
+  npmStop: ['s'],
   npmVerbose: ['v'],
   npmRerun: ['r'],
 };
 
-const DASH_ACTIONS = {
-  dashFiles: ['f'],
-  dashDiffs: ['d'],
-  dashTasks: ['t'],
-  dashBranches: ['b'],
-  dashCommits: ['c'],
-  dashRun: ['r'],
-  dashNpm: ['n'],
+const AGENT_ACTIONS = {
+  agentModel: ['m'],
+  agentEffort: ['e'],
+  agentFast: ['a'],
+  agentContext: ['t'],
+  agentReview: ['p'],
+  agentStop: ['s'],
+  agentRerun: ['r'],
 };
-const DASH_IDS = Object.keys(DASH_ACTIONS);
-const DASH_BLOCKS = {
-  dashFiles: 'files',
-  dashDiffs: 'diffs',
-  dashCommits: 'commits',
-  dashBranches: 'branches',
-  dashNpm: 'npm',
-  dashRun: 'run',
-  dashTasks: 'tasks',
+
+const AGENT_LIST_ACTIONS = {
+  agentModel: AGENT_ACTIONS.agentModel,
+  agentEffort: AGENT_ACTIONS.agentEffort,
+  agentFast: AGENT_ACTIONS.agentFast,
+  agentContext: AGENT_ACTIONS.agentContext,
+  agentReview: AGENT_ACTIONS.agentReview,
 };
-const DASH_ALLOWED = [...DASH_IDS, 'quit', 'theme'];
+
+const DASH_TILES = [
+  { id: 'files', key: 'f', action: 'dashFiles', footer: true },
+  { id: 'diffs', key: 'd', action: 'dashDiffs', footer: true },
+  { id: 'tasks', key: 't', action: 'dashTasks', footer: true },
+  { id: 'branches', key: 'b', action: 'dashBranches', footer: true },
+  { id: 'commits', key: 'c', action: 'dashCommits', footer: true },
+  { id: 'run', key: 'r', action: 'dashRun', footer: true },
+  { id: 'npm', key: 'n', action: 'dashNpm', footer: true },
+  { id: 'agents', key: 'a', action: 'dashAgents', footer: false },
+];
+const DASH_ACTIONS = {};
+const DASH_BLOCKS = {};
+const DASH_KEYS = {};
+for (const tile of DASH_TILES) {
+  if (tile.footer) DASH_ACTIONS[tile.action] = [tile.key];
+  DASH_BLOCKS[tile.action] = tile.id;
+  DASH_KEYS[tile.key] = tile.action;
+}
+const DASH_IDS = Object.keys(DASH_ACTIONS);
+const DASH_ALLOWED = [
+  ...Object.keys(DASH_BLOCKS),
+  'back',
+  'pull',
+  'push',
+  'quit',
+  'theme',
+];
+const REPOS_ALLOWED = [
+  'repoLeft',
+  'repoRight',
+  'repoUp',
+  'repoDown',
+  'open',
+  'back',
+  'quit',
+  'theme',
+];
 const DASH_HIDDEN = ACTION_IDS.filter((id) => id !== 'quit');
 
 const ACTION_HOT = {
   prev: '←',
   next: '→',
   drop: 'del',
+  newBranch: 'ins',
+  newCommit: 'ins',
+  feedback: 'q',
+  check: 'space',
+  taskUp: 'ctrl+up',
+  taskDown: 'ctrl+down',
+  taskNudge: 'up/dn',
+  plan: 'p',
+  import: 'i',
+  theme: 'l',
+  lines: '+l',
+  npmNew: 'ins',
   npmDrop: 'del',
-  npmStop: 'esc',
+  npmStop: 's',
+  packageNew: 'ins',
+  packageDrop: 'del',
 };
 
 const ACTION_LABEL = {
   ...DASH_BLOCKS,
   revert: 'drop',
-  check: 'x',
+  check: 'space',
+  taskUp: 'ctrl+up',
+  taskDown: 'ctrl+down',
+  taskNudge: 'ctrl+up/dn',
+  plan: 'plan',
+  import: 'import',
+  theme: 'light',
+  lines: 'ctrl+l',
   layout: 'mode',
   tasks: 'tasks',
   view: 'view',
   code: 'edit',
   reword: 'edit',
   drop: 'delete',
-  newBranch: 'new',
+  newBranch: 'insert',
+  newCommit: 'insert',
+  feedback: 'quote',
   npmEdit: 'edit',
   npmNew: 'insert',
   npmDrop: 'delete',
   npmLogs: 'cleanup',
-  npmStop: 'esc',
+  packageNew: 'insert',
+  packageDrop: 'delete',
+  packageWanted: 'wanted',
+  packageLatest: 'latest',
+  npmStop: 'stop',
   npmVerbose: 'verbose',
   npmRerun: 're-run',
+  agentModel: 'model',
+  agentEffort: 'effort',
+  agentFast: 'fast',
+  agentContext: 'context',
+  agentReview: 'plan',
+  agentStop: 'stop',
+  agentRerun: 're-run',
   quit: 'q',
   prev: '←',
   next: '→',
@@ -113,7 +195,7 @@ const DIFF_DISABLED = [
   'diff',
 ];
 const UNIT_DISABLED = [...DIFF_DISABLED, 'layout', 'ignore'];
-const FILES_DISABLED = ['layout', 'feedback', 'code'];
+const FILES_DISABLED = ['layout', 'feedback'];
 const FILES_HIDDEN = [
   ...FILES_DISABLED,
   'check',
@@ -126,7 +208,7 @@ const FILES_HIDDEN = [
   'branch',
 ];
 const FILES_GIT_DISABLED = ['add', 'unstage', 'revert', 'ignore'];
-const FILES_TASKS_DISABLED = [...FILES_GIT_DISABLED, ...FILES_DISABLED];
+const FILES_TASKS_DISABLED = [...FILES_GIT_DISABLED, ...FILES_DISABLED, 'code'];
 const TASKS_DISABLED = [
   'add',
   'unstage',
@@ -163,8 +245,44 @@ const BRANCHES_DISABLED = [
 const COMMITS_DISABLED = BRANCHES_DISABLED.filter((id) => id !== 'commit');
 const NPM_DISABLED = [...BRANCHES_DISABLED, 'pull', 'push'];
 
-const isTasksTarget = (item) =>
-  !!(item && (item.kind === 'tasks' || item.origin === 'task'));
+const isTasksTarget = (item) => {
+  if (!item) return false;
+  const tasks = item.kind === 'tasks';
+  const task = item.origin === 'task';
+  return tasks || task;
+};
+
+const DIFF_MOVE_IDS = ['add', 'unstage', 'revert'];
+
+const entryHasDiff = (entry) => {
+  if (!entry || entry.kind === 'tasks') return false;
+  const keys = [
+    'added',
+    'removed',
+    'stagedAdded',
+    'stagedRemoved',
+    'unstagedAdded',
+    'unstagedRemoved',
+    'remaining',
+  ];
+  let total = 0;
+  for (const key of keys) total += entry[key] ?? 0;
+  return total > 0;
+};
+
+const lineHasDiff = (line) => {
+  if (!line) return false;
+  return line.type === 'add' || line.type === 'del';
+};
+
+const withoutMoves = (off, hasDiff) => {
+  if (hasDiff) return off;
+  const next = off.slice();
+  for (const id of DIFF_MOVE_IDS) {
+    if (!next.includes(id)) next.push(id);
+  }
+  return next;
+};
 
 const diffGitDisabled = (item) => {
   if (!item || isTasksTarget(item)) return [];
@@ -172,13 +290,8 @@ const diffGitDisabled = (item) => {
   return ['unstage'];
 };
 
-const BRANCH_REMOTE = ['pull', 'push'];
-
-const branchGitDisabled = (item) => {
-  const off = item && !item.current ? [] : ['rebase', 'drop'];
-  if (!item || !item.current) return [...off, ...BRANCH_REMOTE];
-  return off;
-};
+const branchGitDisabled = (item) =>
+  item && !item.current ? [] : ['rebase', 'drop'];
 
 const isFixupCommit = (item) =>
   `${item && item.subject ? item.subject : ''}`.startsWith('fixup!');
@@ -196,24 +309,44 @@ const commitWriteDisabled = (item) => {
   return ['amend', 'apply'];
 };
 
+const commitChord = (item) => {
+  if (!item || item.pending || !item.sha) return 'commit';
+  if (item.head) return 'amend';
+  return 'fixup';
+};
+
 const commitGitDisabled = (item) => {
   const off = [...commitWriteDisabled(item)];
   if (!isFixupCommit(item)) off.push('apply');
-  if (item && item.canCommit === true) return off;
-  return [...off, 'commit', 'fixup'];
+  const chord = commitChord(item);
+  const ready = item && item.canCommit === true;
+  if (chord === 'amend') return off;
+  if (!ready) off.push('commit');
+  return off;
 };
 
 const disabledActions = (pane, item) => {
   const onTodos = isTasksTarget(item);
-  if (pane === 'files') return onTodos ? FILES_TASKS_DISABLED : FILES_DISABLED;
-  if (pane === 'unit') return [...UNIT_DISABLED, ...diffGitDisabled(item)];
+  if (pane === 'dashboard' || pane === 'repos') return [];
+  if (pane === 'files') {
+    const base = onTodos ? FILES_TASKS_DISABLED : FILES_DISABLED;
+    if (onTodos) return base;
+    return withoutMoves(base, entryHasDiff(item));
+  }
+  if (pane === 'unit') {
+    const off = [...UNIT_DISABLED, ...diffGitDisabled(item)];
+    const onDiff = !item || item.lineDiff !== false;
+    return withoutMoves(off, onDiff);
+  }
   if (pane === 'branches') {
     return [...BRANCHES_DISABLED, ...branchGitDisabled(item)];
   }
   if (pane === 'commits') {
     return [...COMMITS_DISABLED, ...commitWriteDisabled(item)];
   }
-  if (pane === 'npm') return NPM_DISABLED;
+  if (pane === 'npm' || pane === 'packages' || pane === 'agents') {
+    return NPM_DISABLED;
+  }
   if (pane === 'tasks' || onTodos) return TASKS_DISABLED;
   return [...DIFF_DISABLED, ...diffGitDisabled(item)];
 };
@@ -250,25 +383,37 @@ 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 COMMIT_KEYS = { ...keysForActions(COMMIT_ACTIONS), c: 'commit' };
+const COMMIT_KEYS = { ...keysForActions(COMMIT_ACTIONS), s: 'push' };
 const NPM_KEYS = {
   e: 'npmEdit',
-  i: 'npmNew',
+  insert: 'npmNew',
   delete: 'npmDrop',
   l: 'npmLogs',
 };
-const DASH_KEYS = keysForActions(DASH_ACTIONS);
-const SCREEN_KEYS = DASH_KEYS;
+const SCREEN_KEYS = keysForActions(DASH_ACTIONS);
 const PANE_KEYS = {
-  dashboard: DASH_KEYS,
+  dashboard: { ...DASH_KEYS, p: 'pull', s: 'push' },
   files: REVIEW_DROP,
-  diff: REVIEW_DROP,
-  unit: REVIEW_DROP,
+  diff: DIFF_KEYS,
+  unit: DIFF_KEYS,
   branches: BRANCH_KEYS,
   commits: COMMIT_KEYS,
   npm: NPM_KEYS,
-  tasks: { delete: 'drop' },
+  packages: keysForActions(PACKAGE_ACTIONS),
+  agents: keysForActions(AGENT_LIST_ACTIONS),
+  tasks: { delete: 'drop', p: 'plan', i: 'import' },
+  repos: {
+    left: 'repoLeft',
+    right: 'repoRight',
+    up: 'repoUp',
+    down: 'repoDown',
+    k: 'repoUp',
+    j: 'repoDown',
+    p: 'repoLeft',
+    n: 'repoRight',
+  },
 };
 
 const KEY_TO_ACTION = {
@@ -291,13 +436,17 @@ const actionFromKey = (key, pane) => {
   return KEY_TO_ACTION[key] ?? null;
 };
 
-const actionKeys = (id) =>
-  ACTIONS[id] ??
-  BRANCH_ACTIONS[id] ??
-  COMMIT_ACTIONS[id] ??
-  NPM_ACTIONS[id] ??
-  DASH_ACTIONS[id] ??
-  [];
+const ACTION_KEYS = {
+  ...DASH_ACTIONS,
+  ...AGENT_ACTIONS,
+  ...PACKAGE_ACTIONS,
+  ...NPM_ACTIONS,
+  ...COMMIT_ACTIONS,
+  ...BRANCH_ACTIONS,
+  ...ACTIONS,
+};
+
+const actionKeys = (id) => ACTION_KEYS[id] ?? [];
 
 const actionLetter = (id) => ACTION_HOT[id] ?? actionKeys(id)[0];
 
@@ -315,15 +464,13 @@ const YES_NO = [
 
 const CONFIRM = {
   confirmQuit: {
-    choices: [
-      { letter: 'f', label: 'finish as ready', lead: ' ' },
-      { letter: 'c', label: 'continue next time', lead: '  ' },
-    ],
+    choices: YES_NO,
+    prefix: (view) => view.quitWarning || ' exit will terminate subprocesses',
     keys: {
-      f: 'ready',
-      c: 'editing',
-      'ctrl-c': 'ready',
+      y: 'confirm',
+      n: 'cancel',
       escape: 'cancel',
+      'ctrl-c': 'cancel',
     },
   },
   confirmUpdate: {
@@ -356,6 +503,25 @@ const CONFIRM = {
       escape: 'cancel',
     },
   },
+  confirmCommit: {
+    choices: [
+      { letter: 'esc', label: 'esc cancel', lead: '  ' },
+      { letter: 'u', label: 'update', lead: '  ' },
+      { letter: 'c', label: 'commit', lead: '  ' },
+      { letter: 'a', label: 'amend', lead: '  ' },
+      { letter: 'f', label: 'fixup', lead: '  ' },
+    ],
+    prefix: ' what do you want to do?',
+    keys: {
+      esc: 'cancel',
+      escape: 'cancel',
+      enter: 'update',
+      u: 'update',
+      c: 'commit',
+      a: 'amend',
+      f: 'fixup',
+    },
+  },
 };
 
 const CONFIRM_MODE = Object.keys(CONFIRM);
@@ -377,14 +543,14 @@ const promptFromChoices = (choices) =>
 
 module.exports = {
   LIST_PANES,
+  DASH_TILES,
   DASH_IDS,
   DASH_BLOCKS,
   DASH_ALLOWED,
   DASH_HIDDEN,
+  REPOS_ALLOWED,
   ACTIONS,
   ACTION_IDS,
-  BRANCH_ACTIONS,
-  COMMIT_ACTIONS,
   DIFF_DISABLED,
   UNIT_DISABLED,
   FILES_DISABLED,
@@ -396,6 +562,9 @@ module.exports = {
   COMMITS_DISABLED,
   NPM_DISABLED,
   disabledActions,
+  entryHasDiff,
+  lineHasDiff,
+  withoutMoves,
   diffGitDisabled,
   branchGitDisabled,
   commitGitDisabled,

package/lib/{editor.js → input/editor.js}

@@ -1,9 +1,8 @@
 'use strict';
 
-const ansi = require('./ansi.js');
-const { graphemes, visibleWidth } = ansi;
-const wrap = require('./wrap.js');
-const { wrapMove } = wrap;
+const { clamp } = require('../common/utilities.js');
+const { graphemes, visibleWidth } = require('../term/ansi.js');
+const { wrapMove } = require('../term/wrap.js');
 
 const UNDO_CAP = 100;
 const WORD_RE = /[\p{L}\p{N}_]/u;
@@ -127,7 +126,7 @@ class Editor {
   place(offset) {
     this.wantCol = null;
     this.anchor = null;
-    this.cursor = Math.max(0, Math.min(offset, this.text.length));
+    this.cursor = clamp(offset, 0, this.text.length);
   }
 
   backspace() {
@@ -145,8 +144,8 @@ class Editor {
     if (this.removeSpan()) return;
     const { parts, i, pos } = graphemeIndex(this.text, this.cursor);
     if (i >= parts.length) return;
-    const next =
-      this.text.slice(0, pos) + this.text.slice(pos + parts[i].length);
+    const size = parts[i].length;
+    const next = this.text.slice(0, pos) + this.text.slice(pos + size);
     this.edit(next, this.cursor);
   }
 
@@ -206,7 +205,7 @@ class Editor {
     }
     const rows = this.text.split('\n');
     const { line, col } = this.linePos();
-    const next = Math.min(Math.max(line + delta, 0), rows.length - 1);
+    const next = clamp(line + delta, 0, rows.length - 1);
     if (next === line) return;
     let cursor = 0;
     for (let i = 0; i < next; i++) cursor += rows[i].length + 1;

package/lib/{keys.js → input/keys.js}

@@ -1,15 +1,8 @@
 'use strict';
 
-const actions = require('./session/actions.js');
+const actions = require('./actions.js');
 
-const { ACTIONS, ACTION_IDS, BRANCH_ACTIONS, COMMIT_ACTIONS } = actions;
-const { DASH_IDS, DASH_HIDDEN } = actions;
-const { DIFF_DISABLED, FILES_GIT_DISABLED, FILES_HIDDEN } = actions;
-const { TASKS_DISABLED, BRANCHES_DISABLED } = actions;
-const { COMMITS_DISABLED, UNIT_DISABLED, NPM_DISABLED } = actions;
-const { diffGitDisabled, branchGitDisabled, commitGitDisabled } = actions;
-const { actionLetter, buttonWord } = actions;
-const { CONFIRM, confirmPrefix, promptFromChoices } = actions;
+const { ACTIONS } = actions;
 
 const CSI_KEYS = {
   A: 'up',
@@ -18,16 +11,38 @@ const CSI_KEYS = {
   D: 'left',
   H: 'home',
   F: 'end',
+  Z: 'shift-tab',
+};
+
+const SS3_KEYS = {
+  ...CSI_KEYS,
+  P: 'f1',
+  Q: 'f2',
+  R: 'f3',
+  S: 'f4',
 };
 
 const CSI_TILDE = {
   1: 'home',
+  2: 'insert',
   3: 'delete',
   4: 'end',
   5: 'pageUp',
   6: 'pageDown',
   7: 'home',
   8: 'end',
+  11: 'f1',
+  12: 'f2',
+  13: 'f3',
+  14: 'f4',
+  15: 'f5',
+  17: 'f6',
+  18: 'f7',
+  19: 'f8',
+  20: 'f9',
+  21: 'f10',
+  23: 'f11',
+  24: 'f12',
 };
 
 const CSI_MAX = 16;
@@ -46,14 +61,16 @@ const MOUSE_WHEEL = {
   65: 'wheelDown',
 };
 
+const ARROW_KEYS = ['left', 'right', 'up', 'down'];
+const EDGE_KEYS = ['home', 'end'];
+
 const NEED_MORE = { needMore: true };
 
 const keyAt = (key, end) => ({ event: { type: 'key', key }, end });
 
 const modifiedKey = (base, modText) => {
-  const arrow =
-    base === 'left' || base === 'right' || base === 'up' || base === 'down';
-  const end = base === 'home' || base === 'end';
+  const arrow = ARROW_KEYS.includes(base);
+  const end = EDGE_KEYS.includes(base);
   if (!arrow && !end) return base;
   const mod = parseInt(modText, 10);
   const bits = Number.isFinite(mod) ? mod - 1 : 0;
@@ -121,7 +138,7 @@ const parseEsc = (text, start) => {
   if (rest.startsWith('\x1b[')) return parseCsi(rest, start);
   if (rest.startsWith('\x1bO')) {
     if (rest.length < 3) return NEED_MORE;
-    const key = CSI_KEYS[rest[2]];
+    const key = SS3_KEYS[rest[2]];
     return key ? keyAt(key, start + 3) : keyAt('escape', start + 1);
   }
   return keyAt('escape', start + 1);
@@ -161,6 +178,11 @@ const decodeChunk = (text, carry = '') => {
   return { events, carry: '' };
 };
 
+const isTextKey = (key) => {
+  if (!key || key.length !== 1) return false;
+  return key.charCodeAt(0) >= 32;
+};
+
 const hitAction = (hits, x) => {
   for (const hit of hits) {
     if (x >= hit.x0 && x < hit.x1) return hit.id;
@@ -168,29 +190,4 @@ const hitAction = (hits, x) => {
   return null;
 };
 
-module.exports = {
-  ACTIONS,
-  ACTION_IDS,
-  DASH_IDS,
-  DASH_HIDDEN,
-  BRANCH_ACTIONS,
-  COMMIT_ACTIONS,
-  DIFF_DISABLED,
-  FILES_HIDDEN,
-  FILES_GIT_DISABLED,
-  TASKS_DISABLED,
-  BRANCHES_DISABLED,
-  COMMITS_DISABLED,
-  NPM_DISABLED,
-  UNIT_DISABLED,
-  diffGitDisabled,
-  branchGitDisabled,
-  commitGitDisabled,
-  decodeChunk,
-  actionLetter,
-  buttonWord,
-  hitAction,
-  CONFIRM,
-  confirmPrefix,
-  promptFromChoices,
-};
+module.exports = { ACTIONS, decodeChunk, hitAction, isTextKey };