reslop 0.2.7 → 0.3.1

package/lib/session/dispatch.js

@@ -1,33 +1,30 @@
 'use strict';
 
-const compose = require('./compose.js');
-const { COMPOSE_LEAVE } = compose;
-const commit = require('./commit.js');
-const { hasStagedChanges, listedCommits } = commit;
-const actions = require('./actions.js');
+const { COMPOSE_LEAVE } = require('./compose.js');
+const { listedCommits } = require('./commit.js');
+const actions = require('../input/actions.js');
 const { LIST_PANES, DASH_BLOCKS, DASH_ALLOWED, CONFIRM_MODE } = actions;
 const { REPOS_ALLOWED } = actions;
 const { disabledActions, actionFromKey, confirmKey, lineHasDiff } = actions;
-const changeActions = require('./change-actions.js');
-const { onCommand } = changeActions;
+const { onCommand } = require('./change-actions.js');
 const filesPane = require('./files-pane.js');
-const pointer = require('./pointer.js');
-const { handlePointer } = pointer;
-const finder = require('./find.js');
-const { FIND_PANES, startFind, onFindKey } = finder;
+const { handlePointer } = require('./pointer.js');
+const { FIND_PANES, startFind, onFindKey } = require('./find.js');
+const { startImport, stopImport, onImportKey } = require('./import.js');
+const { unitBodyLines } = require('./view.js');
 
 const currentTarget = (ui) => {
   if (ui.pane === 'files') return ui.fileCursorEntry();
   if (ui.pane === 'branches') return ui.branches[ui.branchCursor];
   if (ui.pane === 'commits') {
     const entry = listedCommits(ui.commits.commits)[ui.commitCursor];
-    const canCommit = hasStagedChanges(ui);
+    const canCommit = ui.commits.staged;
     const unstagedCurrent = !ui.rev && !ui.revShort;
     return { ...entry, canCommit, unstagedCurrent };
   }
   if (ui.pane !== 'unit') return ui.current();
   const item = ui.current();
-  const lines = ui.view().unitLines ?? [];
+  const lines = unitBodyLines(ui);
   if (!lines.length) return item;
   const line = lines[ui.nav.unitLine] ?? null;
   const lineDiff = lineHasDiff(line);
@@ -53,6 +50,7 @@ const HANDLERS = {
   next: filesPane.onNext,
   prev: filesPane.onPrev,
   layout: filesPane.onLayout,
+  lines: filesPane.onLineNumbers,
   theme: filesPane.onTheme,
   files: filesPane.onFiles,
   open: (ui) => {
@@ -97,6 +95,10 @@ const HANDLERS = {
     if (ui.pane === 'tasks') return void ui.composer.tasks.removeFocusedTask();
     ui.gitBranches.onDropBranch();
   },
+  taskUp: (ui) => ui.composer.tasks.moveIssue(-1),
+  taskDown: (ui) => ui.composer.tasks.moveIssue(1),
+  plan: (ui) => ui.composer.tasks.togglePlanMenu(),
+  import: (ui) => startImport(ui),
   npm: (ui) => ui.npm.open(),
   npmEdit: (ui) => ui.npm.edit(),
   npmNew: (ui) => ui.npm.create(),
@@ -106,9 +108,17 @@ const HANDLERS = {
   packageWanted: (ui) => ui.packages.updateWanted(),
   packageLatest: (ui) => ui.packages.updateLatest(),
   npmLogs: (ui) => ui.npm.askLogs(),
-  npmStop: (ui) => ui.npm.closeView(),
+  npmStop: (ui) => ui.npm.stop(),
   npmVerbose: (ui) => ui.npm.toggleVerbose(),
   npmRerun: (ui) => ui.npm.rerun(),
+  agentModel: (ui) => ui.agents.openPick('model'),
+  agentEffort: (ui) => ui.agents.openPick('effort'),
+  agentFast: (ui) => ui.agents.toggleFast(),
+  agentContext: (ui) => ui.agents.openPick('context'),
+  agentReview: (ui) => ui.agents.openPick('plan'),
+  agentContinue: (ui) => ui.agents.continueSession(),
+  agentStop: (ui) => ui.agents.stop(),
+  agentRerun: (ui) => ui.agents.rerun(),
   quit: (ui) => ui.onQuit(),
   repoLeft: (ui) => ui.workspace.move(-1, 0),
   repoRight: (ui) => ui.workspace.move(1, 0),
@@ -119,10 +129,15 @@ const HANDLERS = {
 
 const dispatchAction = (ui, action) => {
   if (CONFIRM_MODE.includes(ui.mode)) return;
+  if (ui.mode === 'import') stopImport(ui);
+  if (action === 'lines' && (ui.pane === 'diff' || ui.pane === 'unit')) {
+    return void filesPane.onLineNumbers(ui);
+  }
   if (ui.mode === 'compose') {
     if (!COMPOSE_LEAVE.includes(action)) return;
-    const result = ui.composer.saveCompose();
-    if (result && result.kind === 'error') return;
+    const after = () => dispatchAction(ui, action);
+    const result = ui.composer.saveCompose({ after });
+    if (result.kind === 'saving') return;
   }
   const pane = ui.pane;
   if (pane === 'repos' && !REPOS_ALLOWED.includes(action)) return;
@@ -137,8 +152,7 @@ const dispatchAction = (ui, action) => {
 
 const CONFIRMATIONS = {
   confirmQuit: {
-    ready: (ui) => ui.finishQuit('ready'),
-    editing: (ui) => ui.finishQuit('editing'),
+    confirm: (ui) => ui.confirmQuit(),
     cancel: (ui) => ui.cancelQuit(),
   },
   confirmUpdate: {
@@ -164,6 +178,7 @@ const CONFIRMATIONS = {
     cancel: (ui) => ui.gitBranches.cancelPush(),
   },
   confirmCommit: {
+    update: (ui) => ui.commits.chooseCommit('update'),
     commit: (ui) => ui.commits.chooseCommit('commit'),
     amend: (ui) => ui.commits.chooseCommit('amend'),
     fixup: (ui) => ui.commits.chooseCommit('fixup'),
@@ -179,6 +194,7 @@ const confirmChoice = (ui, key) => {
 
 const NPM_VIEW_KEYS = {
   escape: (ui) => ui.npm.closeView(),
+  s: (ui) => ui.npm.stop(),
   r: (ui) => ui.npm.rerun(),
   v: (ui) => ui.npm.toggleVerbose(),
   e: () => {},
@@ -190,31 +206,80 @@ const NPM_LIST_KEYS = {
   'ctrl-down': (ui) => ui.npm.reorder(1),
   up: (ui) => ui.npm.move(-1),
   down: (ui) => ui.npm.move(1),
+  right: (ui) => ui.npm.focusRuns(),
+  left: (ui) => ui.npm.focusCommands(),
+  tab: (ui) => ui.npm.toggleFocus(),
+  'shift-tab': (ui) => ui.npm.toggleFocus(),
+};
+
+const AGENT_VIEW_KEYS = {
+  escape: (ui) => ui.agents.closeView(),
+  s: (ui) => ui.agents.stop(),
+  r: (ui) => ui.agents.rerun(),
+  e: () => {},
+  m: () => {},
+  a: () => {},
+  t: () => {},
+  f: () => {},
+};
+
+const AGENT_LIST_KEYS = {
+  right: (ui) => ui.agents.focusRuns(),
+  left: (ui) => ui.agents.focusCli(),
+  tab: (ui) => ui.agents.toggleFocus(),
+  'shift-tab': (ui) => ui.agents.toggleFocus(),
 };
 
 const npmKey = (ui, key) => {
   if (ui.pane !== 'npm') return null;
-  if (ui.npm.viewing && Object.hasOwn(NPM_VIEW_KEYS, key)) {
-    return NPM_VIEW_KEYS[key];
+  if (ui.npm.viewing) {
+    if (Object.hasOwn(NPM_VIEW_KEYS, key)) return NPM_VIEW_KEYS[key];
+    if (key === 'up' || key === 'down') return NPM_LIST_KEYS[key];
+    return null;
   }
   return Object.hasOwn(NPM_LIST_KEYS, key) ? NPM_LIST_KEYS[key] : null;
 };
 
+const agentKey = (ui, key) => {
+  if (ui.pane !== 'agents') return null;
+  if (ui.agents.pick) return () => ui.agents.onPickKey(key);
+  const keys = ui.agents.viewing ? AGENT_VIEW_KEYS : AGENT_LIST_KEYS;
+  return Object.hasOwn(keys, key) ? keys[key] : null;
+};
+
+const planMenuKey = (ui, key) => {
+  if (!ui.composer.tasks.planOpen || ui.pane !== 'tasks') return false;
+  ui.composer.tasks.onPlanKey(key);
+  return true;
+};
+
 const handleKey = (ui, key) => {
   if (CONFIRM_MODE.includes(ui.mode)) return void confirmChoice(ui, key);
+  if (planMenuKey(ui, key)) return;
+  if (ui.pane === 'tasks' && (key === 'ctrl-up' || key === 'ctrl-down')) {
+    if (ui.mode === 'import') stopImport(ui);
+    const delta = key === 'ctrl-up' ? -1 : 1;
+    return void ui.composer.tasks.moveIssue(delta);
+  }
+  if (key === 'ctrl-l' && (ui.pane === 'diff' || ui.pane === 'unit')) {
+    return void filesPane.onLineNumbers(ui);
+  }
   if (ui.mode === 'compose') {
     return void ui.runComposeCommand(ui.composer.handleKey(key));
   }
   if (ui.mode === 'find') return void onFindKey(ui, key);
+  if (ui.mode === 'import') return void onImportKey(ui, key);
   if (key === '/' && FIND_PANES.includes(ui.pane)) return void startFind(ui);
   const onNpmKey = npmKey(ui, key);
   if (onNpmKey) return void onNpmKey(ui);
+  const onAgentKey = agentKey(ui, key);
+  if (onAgentKey) return void onAgentKey(ui);
   if (key === 'escape') return void filesPane.onEscape(ui);
   const tasks = ui.composer.tasks;
   const toggle = key === ' ';
   if (toggle && tasks.toggleFocusedTask()) return;
   if (tasks.typeIntoTask(key)) return;
-  const action = actionFromKey(key, ui.pane, ui.fileScope);
+  const action = actionFromKey(key, ui.pane);
   if (action) ui.dispatch(action);
 };
 

package/lib/session/files-pane.js

@@ -1,15 +1,12 @@
 'use strict';
 
-const ansi = require('../ansi.js');
-const files = require('../files.js');
-const { THEME_NAMES, setTheme, themeName } = ansi;
-const { isTasksEntry, TASKS_FILE } = files;
-const npm = require('../render/npm.js');
-const { logViewRows } = npm;
-const unit = require('./unit.js');
-const actions = require('./actions.js');
-const { LIST_PANES } = actions;
-const { setFileScope, openUnitFile, moveUnitBlock } = unit;
+const { clamp } = require('../common/utilities.js');
+const { THEME_NAMES, setTheme, themeName } = require('../term/ansi.js');
+const { isTasksEntry, TASKS_FILE } = require('../common/files.js');
+const { logViewRows } = require('../render/log.js');
+const { setFileScope, openUnitFile, moveUnitBlock } = require('./unit.js');
+const { LIST_PANES } = require('../input/actions.js');
+const { saveUiPrefs, LAYOUT_LABEL } = require('./prefs.js');
 
 const LAYOUTS = ['unified', 'mixed', 'side'];
 
@@ -31,12 +28,8 @@ const syncFileCursor = (ui) => {
 
 const showFiles = (ui) => {
   const nav = ui.nav;
-  const held =
-    nav.tasksOpen === true ||
-    nav.pane === 'branches' ||
-    nav.pane === 'commits' ||
-    nav.pane === 'npm' ||
-    nav.pane === 'packages';
+  const listed = nav.pane !== 'files' && LIST_PANES.includes(nav.pane);
+  const held = nav.tasksOpen === true || listed;
   nav.pane = 'files';
   nav.resetListScroll('files');
   nav.clearSelection();
@@ -67,15 +60,22 @@ const showDashboard = (ui) => {
   ui.dashboard.enter();
 };
 
-const HOME_CHILDREN = ['files', 'branches', 'commits', 'npm', 'packages'];
-
 const returnsHome = (ui) => {
   if (!ui.dashboardHome) return false;
   const { pane, tasksOpen } = ui.nav;
-  return HOME_CHILDREN.includes(pane) || tasksOpen === true;
+  return LIST_PANES.includes(pane) || tasksOpen === true;
 };
 
 const onEscape = (ui) => {
+  if (ui.nav.pane === 'agents' && ui.agents.pick) {
+    return void ui.agents.closePick();
+  }
+  if (ui.nav.pane === 'agents' && ui.agents.viewing) {
+    return void ui.agents.closeView();
+  }
+  if (ui.nav.pane === 'npm' && ui.npm.viewing) {
+    return void ui.npm.closeView();
+  }
   if (ui.nav.pane === 'repos') return void ui.onQuit();
   if (ui.nav.pane === 'dashboard' && ui.workspaceRoot) {
     return void ui.workspace.show();
@@ -112,6 +112,7 @@ const onOpenFile = (ui) => {
   }
   if (ui.nav.pane === 'commits') return void ui.commits.onShowDiff();
   if (ui.nav.pane === 'npm') return void ui.npm.run();
+  if (ui.nav.pane === 'agents') return void ui.agents.start();
   if (ui.nav.pane !== 'files') {
     if (ui.nav.tasksOpen) ui.composer.tasks.editFocusedTask();
     return;
@@ -144,7 +145,7 @@ const onFileMove = (ui, delta) => {
   }
   const last = list.length - 1;
   const moved = ui.nav.fileCursor + delta;
-  const next = Math.min(last, Math.max(0, moved));
+  const next = clamp(moved, 0, last);
   if (next === ui.nav.fileCursor) return;
   ui.nav.fileCursor = next;
   const entry = list[next];
@@ -191,7 +192,8 @@ const scrollStep = (ui, fraction) => {
   const fallback = Math.max(1, rows - 4);
   const bodyH = frame?.bodyH ?? fallback;
   const viewing = ui.nav.pane === 'npm' && ui.npm.viewing;
-  const viewRows = viewing ? logViewRows(bodyH) : bodyH;
+  const agentLog = ui.nav.pane === 'agents' && ui.agents.viewing;
+  const viewRows = viewing || agentLog ? logViewRows(bodyH) : bodyH;
   const height = Math.max(1, viewRows);
   const span = Math.floor(height * Math.abs(fraction));
   const n = Math.max(1, span);
@@ -200,6 +202,10 @@ const scrollStep = (ui, fraction) => {
 };
 
 const onScroll = (ui, delta) => {
+  if (ui.composer.tasks.planOpen && ui.nav.pane === 'tasks') {
+    const step = delta < 0 ? -1 : 1;
+    return void ui.composer.tasks.movePlan(step);
+  }
   if (ui.nav.pane === 'dashboard') return;
   if (ui.nav.pane === 'files') return void onFileMove(ui, delta);
   if (ui.nav.pane === 'branches') {
@@ -209,12 +215,13 @@ const onScroll = (ui, delta) => {
     return void ui.commits.onCommitMove(delta);
   }
   if (ui.nav.pane === 'npm') return void ui.npm.move(delta);
+  if (ui.nav.pane === 'agents') return void ui.agents.move(delta);
   if (ui.nav.pane === 'packages') {
     const count = ui.dashboard.packageCount();
     const nav = ui.nav;
     const next = nav.packagesCursor + delta;
     const last = Math.max(0, count - 1);
-    nav.packagesCursor = Math.max(0, Math.min(last, next));
+    nav.packagesCursor = clamp(next, 0, last);
     ui.status = '';
     return;
   }
@@ -253,10 +260,22 @@ const onLayout = (ui) => {
   const i = LAYOUTS.indexOf(ui.layout);
   const next = (i < 0 ? 0 : i + 1) % LAYOUTS.length;
   ui.layout = LAYOUTS[next];
-  const name = LAYOUTS[next] === 'side' ? 'side-by-side' : LAYOUTS[next];
-  ui.status = name;
+  ui.status = LAYOUT_LABEL[ui.layout] || ui.layout;
   ui.nav.scroll = 0;
   ui.nav.clearSelection();
+  saveUiPrefs(ui.top || ui.cwd, { layout: ui.layout });
+};
+
+const saveLineNumbers = (ui) => {
+  const shown = ui.lineNumbers === true;
+  saveUiPrefs(ui.top || ui.cwd, { lineNumbers: shown });
+};
+
+const onLineNumbers = (ui) => {
+  ui.lineNumbers = ui.lineNumbers !== true;
+  ui.status = ui.lineNumbers ? 'line numbers' : 'no line numbers';
+  saveLineNumbers(ui);
+  ui.composer.syncCodeScroll();
 };
 
 const onTheme = (ui) => {
@@ -264,12 +283,13 @@ const onTheme = (ui) => {
   const next = THEME_NAMES[(i + 1) % THEME_NAMES.length];
   setTheme(next);
   ui.status = next;
+  saveUiPrefs(ui.top || ui.cwd, { theme: next });
 };
 
 const onHome = (ui) => onJump(ui, false);
 const onEnd = (ui) => onJump(ui, true);
-const onFileScope = (ui) => setFileScope(ui, 'file');
-const onDiffScope = (ui) => setFileScope(ui, 'diff');
+const onFileScope = (ui, quiet) => setFileScope(ui, 'file', quiet === true);
+const onDiffScope = (ui, quiet) => setFileScope(ui, 'diff', quiet === true);
 
 module.exports = {
   fileCursorEntry,
@@ -287,6 +307,7 @@ module.exports = {
   onHome,
   onEnd,
   onLayout,
+  onLineNumbers,
   onTheme,
   onFileScope,
   onDiffScope,

package/lib/session/find.js

@@ -1,20 +1,18 @@
 'use strict';
 
-const files = require('../files.js');
-const { isTasksEntry, TASKS_FILE } = files;
-const find = require('../find.js');
-const { fileMatches } = find;
+const { isTasksEntry, TASKS_FILE } = require('../common/files.js');
+const { fileMatches } = require('../common/find.js');
+const { lineKey, lineField } = require('../input/line-edit.js');
 
 const FIND_PANES = ['files', 'diff'];
 
-const isTypeKey = (key) =>
-  Boolean(key) && key.length === 1 && key.charCodeAt(0) >= 32;
-
 const startFind = (ui) => {
   if (ui.mode !== 'review') return;
   if (!FIND_PANES.includes(ui.pane)) return;
   ui.mode = 'find';
-  ui.nav.find = { query: '', at: 0 };
+  const find = lineField('query');
+  find.at = 0;
+  ui.nav.find = find;
   ui.status = '';
 };
 
@@ -56,21 +54,6 @@ const showHit = (ui, jump) => {
   focusMatch(ui, hits[at], jump);
 };
 
-const typeFind = (ui, key) => {
-  const state = ui.nav.find;
-  state.query += key;
-  state.at = 0;
-  showHit(ui, true);
-};
-
-const eraseFind = (ui) => {
-  const state = ui.nav.find;
-  if (!state.query) return void stopFind(ui);
-  state.query = state.query.slice(0, -1);
-  state.at = 0;
-  showHit(ui, true);
-};
-
 const moveFind = (ui, delta) => {
   const state = ui.nav.find;
   if (!state.query) return;
@@ -83,12 +66,16 @@ const onFindKey = (ui, key) => {
     ui.mode = 'review';
     return;
   }
-  if (key === 'ctrl-c') return void ui.onQuit();
   if (key === 'escape' || key === 'enter') return void stopFind(ui);
-  if (key === 'backspace') return void eraseFind(ui);
-  if (key === 'up' || key === 'left') return void moveFind(ui, -1);
-  if (key === 'down' || key === 'right') return void moveFind(ui, 1);
-  if (isTypeKey(key)) typeFind(ui, key);
+  if (key === 'backspace' && !ui.nav.find.query) return void stopFind(ui);
+  const handled = lineKey(ui.nav.find.editor, key, ui, true);
+  if (handled === 'text') {
+    ui.nav.find.at = 0;
+    showHit(ui, true);
+  }
+  if (handled) return;
+  if (key === 'up') return void moveFind(ui, -1);
+  if (key === 'down') moveFind(ui, 1);
 };
 
-module.exports = { FIND_PANES, startFind, stopFind, onFindKey };
+module.exports = { FIND_PANES, startFind, onFindKey };

package/lib/session/import.js

@@ -0,0 +1,93 @@
+'use strict';
+
+const { remoteKind, selectChangeSource } = require('../source/source.js');
+const { lineKey, lineField } = require('../input/line-edit.js');
+
+const changeRepositoryUrl = (change) => {
+  if (!change?.url || !change.repository) return '';
+  try {
+    const url = new URL(change.url);
+    return `${url.origin}/${change.repository}`;
+  } catch {
+    return '';
+  }
+};
+
+const startImport = (ui) => {
+  if (ui.mode !== 'review' || ui.pane !== 'tasks') return;
+  ui.composer.tasks.closePlanMenu();
+  ui.mode = 'import';
+  const defaultUrl = ui.repositoryUrl || changeRepositoryUrl(ui.change);
+  ui.nav.import = lineField('url', defaultUrl);
+  ui.status = '';
+};
+
+const stopImport = (ui) => {
+  ui.mode = 'review';
+  ui.nav.import = null;
+  ui.status = '';
+};
+
+const noteImport = (ui, message) => {
+  ui.status = message;
+  if (ui.uiOpen) ui.paint();
+};
+
+const finishImport = (ui, store, loaded) => {
+  const imported = loaded && loaded.imported;
+  if (!imported || ui.review.store !== store) {
+    noteImport(ui, 'import failed');
+    return;
+  }
+  store.applyImportedNotes(imported);
+  ui.flushReview();
+  noteImport(ui, 'imported');
+};
+
+const runImport = (ui, selected) => {
+  const kind = remoteKind(selected);
+  if (!kind) return Promise.resolve(null);
+  const load = ui[kind.option] ?? kind.load;
+  const target = kind.target(selected);
+  if (!load || !target) return Promise.resolve(null);
+  const fetch = ui.fetchImpl ?? globalThis.fetch;
+  const options = { cwd: ui.top || ui.cwd, token: kind.token(), fetch };
+  return Promise.resolve().then(() => load(target, options));
+};
+
+const submitImport = (ui) => {
+  const state = ui.nav.import;
+  const url = state ? state.url.trim() : '';
+  const store = ui.review.store;
+  stopImport(ui);
+  if (!url) return;
+  const selected = selectChangeSource([url]);
+  if (!remoteKind(selected)) {
+    ui.status = 'bad url';
+    return;
+  }
+  ui.status = 'importing';
+  const pending = runImport(ui, selected);
+  ui.importPromise = pending;
+  pending.then(
+    (loaded) => finishImport(ui, store, loaded),
+    (error) => {
+      const message = error instanceof Error ? error.message : '';
+      noteImport(ui, message || 'import failed');
+    },
+  );
+};
+
+const onImportKey = (ui, key) => {
+  const state = ui.nav.import;
+  if (!state) {
+    ui.mode = 'review';
+    return;
+  }
+  if (key === 'escape') return void stopImport(ui);
+  if (key === 'enter') return void submitImport(ui);
+  if (key === 'backspace' && !state.url) return void stopImport(ui);
+  lineKey(state.editor, key, ui, true);
+};
+
+module.exports = { startImport, stopImport, onImportKey };

package/lib/session/items.js

@@ -1,11 +1,13 @@
 'use strict';
 
-const files = require('../files.js');
-const { itemPath, TASKS_FILE, isTaskItem } = files;
-const review = require('../review.js');
-const { feedbackKey } = review;
-const diff = require('../diff/diff.js');
-const { refreshIndexPatches } = diff;
+const {
+  itemPath,
+  TASKS_FILE,
+  isTaskItem,
+  groupByPath,
+} = require('../common/files.js');
+const { feedbackKey } = require('../review/review.js');
+const { refreshIndexPatches } = require('../diff/diff.js');
 
 const depChangeKey = (item) => {
   const change = item.dep && item.dep.change;
@@ -72,17 +74,6 @@ const takeBucket = (map, key, used) => {
   return null;
 };
 
-const groupByPath = (items) => {
-  const groups = new Map();
-  for (const item of items) {
-    const rel = itemPath(item) || '';
-    const list = groups.get(rel) ?? [];
-    list.push(item);
-    groups.set(rel, list);
-  }
-  return groups;
-};
-
 const alignGroup = (prev, next) => {
   if (!prev.length) return next;
   if (!next.length) return [];