reslop 0.2.7 → 0.3.1

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

@@ -1,6 +1,13 @@
 'use strict';
 
-const LIST_PANES = ['files', 'branches', 'commits', 'npm', 'packages'];
+const LIST_PANES = [
+  'files',
+  'branches',
+  'commits',
+  'npm',
+  'packages',
+  'agents',
+];
 
 const ACTIONS = {
   add: ['a'],
@@ -51,37 +58,65 @@ const NPM_ACTIONS = {
   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'],
+  agentContinue: ['c'],
+  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,
+  agentContinue: AGENT_ACTIONS.agentContinue,
 };
-const DASH_ALLOWED = [...DASH_IDS, 'pull', 'push', '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',
 ];
@@ -95,10 +130,16 @@ const ACTION_HOT = {
   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',
 };
@@ -107,7 +148,13 @@ const ACTION_LABEL = {
   ...DASH_BLOCKS,
   revert: 'drop',
   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',
@@ -125,9 +172,17 @@ const ACTION_LABEL = {
   packageDrop: 'delete',
   packageWanted: 'wanted',
   packageLatest: 'latest',
-  npmStop: 'esc',
+  npmStop: 'stop',
   npmVerbose: 'verbose',
   npmRerun: 're-run',
+  agentModel: 'model',
+  agentEffort: 'effort',
+  agentFast: 'fast',
+  agentContext: 'context',
+  agentReview: 'plan',
+  agentContinue: 'continue',
+  agentStop: 'stop',
+  agentRerun: 're-run',
   quit: 'q',
   prev: '←',
   next: '→',
@@ -193,8 +248,12 @@ 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'];
 
@@ -214,8 +273,10 @@ const entryHasDiff = (entry) => {
   return total > 0;
 };
 
-const lineHasDiff = (line) =>
-  !!line && (line.type === 'add' || line.type === 'del');
+const lineHasDiff = (line) => {
+  if (!line) return false;
+  return line.type === 'add' || line.type === 'del';
+};
 
 const withoutMoves = (off, hasDiff) => {
   if (hasDiff) return off;
@@ -286,7 +347,9 @@ const disabledActions = (pane, item) => {
   if (pane === 'commits') {
     return [...COMMITS_DISABLED, ...commitWriteDisabled(item)];
   }
-  if (pane === 'npm' || pane === 'packages') 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)];
 };
@@ -323,7 +386,7 @@ const keysForActions = (actions) => {
 
 const PANE_ONLY = ['branch', 'file', 'diff'];
 const REVIEW_DROP = { d: 'revert' };
-const DIFF_KEYS = { ...REVIEW_DROP, q: 'feedback' };
+const DIFF_KEYS = { ...REVIEW_DROP, q: 'feedback', 'ctrl-l': 'lines' };
 const BRANCH_KEYS = keysForActions(BRANCH_ACTIONS);
 const COMMIT_KEYS = { ...keysForActions(COMMIT_ACTIONS), s: 'push' };
 const NPM_KEYS = {
@@ -332,8 +395,7 @@ const NPM_KEYS = {
   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, p: 'pull', s: 'push' },
   files: REVIEW_DROP,
@@ -343,7 +405,8 @@ const PANE_KEYS = {
   commits: COMMIT_KEYS,
   npm: NPM_KEYS,
   packages: keysForActions(PACKAGE_ACTIONS),
-  tasks: { delete: 'drop' },
+  agents: keysForActions(AGENT_LIST_ACTIONS),
+  tasks: { delete: 'drop', p: 'plan', i: 'import' },
   repos: {
     left: 'repoLeft',
     right: 'repoRight',
@@ -376,14 +439,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] ??
-  PACKAGE_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];
 
@@ -401,15 +467,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: {
@@ -445,6 +509,7 @@ const CONFIRM = {
   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: '  ' },
@@ -453,6 +518,8 @@ const CONFIRM = {
     keys: {
       esc: 'cancel',
       escape: 'cancel',
+      enter: 'update',
+      u: 'update',
       c: 'commit',
       a: 'amend',
       f: 'fixup',
@@ -479,6 +546,7 @@ const promptFromChoices = (choices) =>
 
 module.exports = {
   LIST_PANES,
+  DASH_TILES,
   DASH_IDS,
   DASH_BLOCKS,
   DASH_ALLOWED,
@@ -486,8 +554,6 @@ module.exports = {
   REPOS_ALLOWED,
   ACTIONS,
   ACTION_IDS,
-  BRANCH_ACTIONS,
-  COMMIT_ACTIONS,
   DIFF_DISABLED,
   UNIT_DISABLED,
   FILES_DISABLED,

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() {
@@ -140,13 +139,22 @@ class Editor {
     this.edit(next, this.cursor - size);
   }
 
+  backspaceWord() {
+    this.wantCol = null;
+    if (this.removeSpan()) return;
+    const { parts, i } = graphemeIndex(this.text, this.cursor);
+    const start = offsetAt(parts, wordIndex(parts, i, -1));
+    if (start === this.cursor) return;
+    this.edit(this.text.slice(0, start) + this.text.slice(this.cursor), start);
+  }
+
   delete() {
     this.wantCol = null;
     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 +214,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,16 +1,8 @@
 'use strict';
 
-const actions = require('./session/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 { entryHasDiff, lineHasDiff, withoutMoves } = actions;
-const { actionLetter, buttonWord } = actions;
-const { CONFIRM, confirmPrefix, promptFromChoices } = actions;
+const actions = require('./actions.js');
+
+const { ACTIONS } = actions;
 
 const CSI_KEYS = {
   A: 'up',
@@ -19,6 +11,7 @@ const CSI_KEYS = {
   D: 'left',
   H: 'home',
   F: 'end',
+  Z: 'shift-tab',
 };
 
 const SS3_KEYS = {
@@ -52,6 +45,10 @@ const CSI_TILDE = {
   24: 'f12',
 };
 
+const CSI_U = {
+  127: 'backspace',
+};
+
 const CSI_MAX = 16;
 
 const LITERAL_KEY = {
@@ -68,19 +65,22 @@ 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';
-  if (!arrow && !end) return base;
+  const arrow = ARROW_KEYS.includes(base);
+  const end = EDGE_KEYS.includes(base);
   const mod = parseInt(modText, 10);
   const bits = Number.isFinite(mod) ? mod - 1 : 0;
   const ctrl = (bits & 4) !== 0;
   const shift = (bits & 1) !== 0;
+  if (base === 'backspace' && ctrl) return 'ctrl-backspace';
+  if (!arrow && !end) return base;
   if (ctrl && shift && arrow) return `ctrl-shift-${base}`;
   if (ctrl && arrow) return `ctrl-${base}`;
   if (shift) return `shift-${base}`;
@@ -89,7 +89,9 @@ const modifiedKey = (base, modText) => {
 
 const keyFromCsi = (paramsText, final) => {
   const params = paramsText ? paramsText.split(';') : [];
-  const base = final === '~' ? CSI_TILDE[params[0]] : CSI_KEYS[final];
+  let base = CSI_KEYS[final];
+  if (final === '~') base = CSI_TILDE[params[0]];
+  if (final === 'u') base = CSI_U[params[0]];
   if (!base) return null;
   if (params.length < 2) return base;
   return modifiedKey(base, params[1]);
@@ -183,6 +185,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;
@@ -190,32 +197,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,
-  entryHasDiff,
-  lineHasDiff,
-  withoutMoves,
-  branchGitDisabled,
-  commitGitDisabled,
-  decodeChunk,
-  actionLetter,
-  buttonWord,
-  hitAction,
-  CONFIRM,
-  confirmPrefix,
-  promptFromChoices,
-};
+module.exports = { ACTIONS, decodeChunk, hitAction, isTextKey };

package/lib/input/line-edit.js

@@ -0,0 +1,78 @@
+'use strict';
+
+const { Editor } = require('./editor.js');
+const { isTextKey } = require('./keys.js');
+const clipboard = require('../term/clipboard.js');
+
+const copyLine = (editor, ui) => {
+  const text = editor.selectedText();
+  if (!text) return;
+  const ok = clipboard.copyText(text, ui.stdout);
+  ui.status = ok ? 'copied' : 'copy failed';
+};
+
+const cutLine = (editor, ui) => {
+  if (!editor.hasSelect()) return;
+  copyLine(editor, ui);
+  editor.removeSpan();
+};
+
+const pasteLine = (editor) => {
+  const raw = clipboard.pasteText() ?? '';
+  const text = `${raw}`.replaceAll('\r', '').replaceAll('\n', '');
+  if (text) editor.insert(text);
+};
+
+const EDIT_OP = {
+  left: (editor) => editor.move(-1),
+  right: (editor) => editor.move(1),
+  'shift-left': (editor) => editor.move(-1, true),
+  'shift-right': (editor) => editor.move(1, true),
+  'ctrl-left': (editor) => editor.moveWord(-1),
+  'ctrl-right': (editor) => editor.moveWord(1),
+  'ctrl-shift-left': (editor) => editor.moveWord(-1, true),
+  'ctrl-shift-right': (editor) => editor.moveWord(1, true),
+  backspace: (editor) => editor.backspace(),
+  'ctrl-backspace': (editor) => editor.backspaceWord(),
+  delete: (editor) => editor.delete(),
+};
+
+const LINE_OP = {
+  ...EDIT_OP,
+  'ctrl-x': cutLine,
+  'ctrl-v': (editor) => pasteLine(editor),
+};
+
+const END_OP = {
+  home: (editor) => editor.home(),
+  end: (editor) => editor.end(),
+  'shift-home': (editor) => editor.home(true),
+  'shift-end': (editor) => editor.end(true),
+};
+
+const LINE_ENDS = { ...LINE_OP, ...END_OP };
+
+const lineKey = (editor, key, ui, ends) => {
+  if (key === 'ctrl-c') {
+    copyLine(editor, ui);
+    return 'caret';
+  }
+  const op = (ends ? LINE_ENDS : LINE_OP)[key];
+  if (!op && !isTextKey(key)) return null;
+  const before = editor.text;
+  if (op) op(editor, ui);
+  else editor.insert(key);
+  return editor.text === before ? 'caret' : 'text';
+};
+
+const lineField = (name, text = '') => {
+  const editor = new Editor(text);
+  return {
+    editor,
+    get [name]() {
+      return editor.text;
+    },
+  };
+};
+
+module.exports = { EDIT_OP, copyLine, cutLine, lineKey, lineField };

package/lib/input/menu-pick.js

@@ -0,0 +1,70 @@
+'use strict';
+
+const { clamp } = require('../common/utilities.js');
+const { Editor } = require('./editor.js');
+
+const MENU_ROWS = 8;
+
+const menuRows = (bodyH, fraction = 1) => {
+  const height = Math.min(bodyH > 0 ? bodyH : MENU_ROWS, MENU_ROWS);
+  return Math.max(1, Math.floor(height * fraction));
+};
+
+const pickDelta = (key, page, half) => {
+  const steps = {
+    up: -1,
+    down: 1,
+    pageUp: -page,
+    pageDown: page,
+    'ctrl-b': -page,
+    'ctrl-f': page,
+    'ctrl-u': -half,
+    'ctrl-d': half,
+    home: -Infinity,
+    end: Infinity,
+  };
+  return Object.hasOwn(steps, key) ? steps[key] : 0;
+};
+
+class MenuPick {
+  constructor(field, cursor) {
+    this.field = field;
+    this.cursor = cursor;
+    this.scroll = 0;
+    this.editor = new Editor('');
+  }
+
+  get query() {
+    return this.editor.text;
+  }
+
+  filter(items) {
+    const query = this.query.trim().toLowerCase();
+    if (!query) return items;
+    return items.filter((name) => name.toLowerCase().includes(query));
+  }
+
+  touch() {
+    this.cursor = 0;
+    this.scroll = 0;
+  }
+
+  move(delta, items, isOff) {
+    const last = items.length - 1;
+    const step = delta < 0 ? -1 : 1;
+    const goal = clamp(this.cursor + delta, 0, last);
+    let cursor = this.cursor;
+    for (let next = cursor; next !== goal;) {
+      next += step;
+      if (!isOff(items[next])) cursor = next;
+    }
+    if (isOff(items[cursor])) {
+      let scan = goal;
+      while (scan >= 0 && scan <= last && isOff(items[scan])) scan += step;
+      if (scan >= 0 && scan <= last) cursor = scan;
+    }
+    this.cursor = cursor;
+  }
+}
+
+module.exports = { menuRows, pickDelta, MenuPick };