reslop 0.1.3 → 0.1.5

package/lib/render.js

@@ -11,7 +11,7 @@ const wrap = require('./wrap.js');
 
 const { tokenize, overlayTokens } = highlight;
 const { ACTIONS, ACTION_IDS, actionLetter, buttonWord } = keys;
-const { FILES_DISABLED } = keys;
+const { disabledActions } = keys;
 const { wrapPlain, wrapMultiline, cursorInWrap } = wrap;
 const { THEME, CODE_FG, codeFg, paint, visibleWidth } = ansi;
 const { truncateVisible, fg, RESET, ESC, EL, seq } = ansi;
@@ -118,7 +118,7 @@ const INFO_STATUS = [
   'staged',
   'unstaged',
   'not staged',
-  'reverted',
+  'dropped',
   'already staged',
   'read only',
   'last block',
@@ -130,14 +130,29 @@ const INFO_STATUS = [
   'mixed',
   'side-by-side',
   'saved',
+  'reloaded',
   'not a diff block',
+  'committed',
+  'amended',
+  'fixup',
 ];
 
-const QUIT_FINISH = 'f';
-const QUIT_CONTINUE = 'c';
-const QUIT_FINISH_LABEL = 'finish as ready';
-const QUIT_CONTINUE_LABEL = 'continue next time';
-const QUIT_PROMPT = ` ${QUIT_FINISH_LABEL}  ${QUIT_CONTINUE_LABEL}`;
+const QUIT_CHOICES = [
+  { letter: 'f', label: 'finish as ready', lead: ' ' },
+  { letter: 'c', label: 'continue next time', lead: '  ' },
+  { letter: 'd', label: 'discard', lead: '  ' },
+];
+const QUIT_PROMPT = QUIT_CHOICES.map(
+  (choice) => `${choice.lead}${choice.label}`,
+).join('');
+const COMMIT_CHOICES = [
+  { letter: 'c', label: 'commit', lead: ' ' },
+  { letter: 'a', label: 'amend', lead: '  ' },
+  { letter: 'f', label: 'fixup', lead: '  ' },
+];
+const COMMIT_PROMPT = COMMIT_CHOICES.map(
+  (choice) => `${choice.lead}${choice.label}`,
+).join('');
 
 const GUTTER_W = 2;
 const BUTTON_GAP = '  ';
@@ -414,17 +429,21 @@ const paintHeader = (view, width, color) => {
   return `${out}${RESET}`;
 };
 
-const bodyLines = (item, layout) => {
+const bodyLines = (item, layout, overlay) => {
   if (item.file.isBinary) {
     const text = '(binary)';
     return [{ type: 'ctx', text, spans: [{ text, changed: false }] }];
   }
   if (!item.hunk) return [];
   const radius = item.dep ? Number.MAX_SAFE_INTEGER : undefined;
-  return displayLines(item.hunk, item.blockId, layout, radius);
+  return displayLines(item.hunk, item.blockId, layout, radius, overlay);
 };
 
-const sourceEmpty = (line) => !line || !(line.text ?? '').trim();
+const sourceEmpty = (line) => {
+  if (!line) return true;
+  if (line.editStart !== undefined) return false;
+  return !(line.text ?? '').trim();
+};
 
 const displayRowEmpty = (row, split) => {
   if (!split) return sourceEmpty(row);
@@ -470,12 +489,13 @@ const paintMarkedWord = (label, letter, color, mark) => {
   return out;
 };
 
-const layoutButtons = (width, compact = false, disabled = []) => {
+const layoutButtons = (width, compact = false, hidden = []) => {
+  const ids = ACTION_IDS.filter((id) => !hidden.includes(id));
   const build = (short) => {
     const hits = [];
     const parts = [];
     let x = 0;
-    for (const id of ACTION_IDS) {
+    for (const id of ids) {
       const action = { id, ...ACTIONS[id] };
       const letter = actionLetter(action);
       const word = buttonWord(action);
@@ -483,16 +503,15 @@ const layoutButtons = (width, compact = false, disabled = []) => {
       const piece = `${BUTTON_GAP}${label}`;
       const w = visibleWidth(piece);
       if (x + w > width && parts.length) break;
-      const isDisabled = disabled.includes(id);
-      if (!isDisabled) hits.push({ id, x0: x, x1: x + w });
-      parts.push({ action, piece, letter, label, disabled: isDisabled });
+      hits.push({ id, x0: x, x1: x + w });
+      parts.push({ action, piece, letter, label });
       x += w;
     }
     return { hits, parts, width: x };
   };
   if (compact) return build(true);
   const words = build(false);
-  if (words.parts.length === ACTION_IDS.length) return words;
+  if (words.parts.length === ids.length) return words;
   return build(true);
 };
 
@@ -501,11 +520,7 @@ const paintButtons = (layout, width, color) => {
   let used = 0;
   for (const part of layout.parts) {
     out += paint(BUTTON_GAP, THEME.buttonFg, THEME.buttonBg, color);
-    if (part.disabled) {
-      out += paint(part.label, THEME.buttonFg, THEME.buttonBg, color);
-    } else {
-      out += paintMarkedWord(part.label, part.letter, color, BUTTON_MARK);
-    }
+    out += paintMarkedWord(part.label, part.letter, color, BUTTON_MARK);
     used += visibleWidth(part.piece);
   }
   if (used < width) {
@@ -514,12 +529,15 @@ const paintButtons = (layout, width, color) => {
   return out;
 };
 
+const remoteCounts = (kind, { counts, notes, sourceLabel }) => {
+  const n = counts.pr ?? 0;
+  const label = sourceLabel || kind;
+  return ` ${kind} ${label}  ${n}  ${notes}`;
+};
+
 const COUNTS_KIND = {
-  pr: ({ counts, notes, sourceLabel }) => {
-    const n = counts.pr ?? 0;
-    const label = sourceLabel || 'pr';
-    return ` pr ${label}  ${n}  ${notes}`;
-  },
+  pr: (args) => remoteCounts('pr', args),
+  mr: (args) => remoteCounts('mr', args),
   commit: ({ counts, notes, revShort }) => {
     const n = counts.commit ?? 0;
     return ` commit ${revShort}  ${n}  ${notes}`;
@@ -535,7 +553,7 @@ const COUNTS_KIND = {
 };
 
 const countsKind = (sourceKind, revShort) => {
-  if (sourceKind === 'pr') return 'pr';
+  if (sourceKind === 'pr' || sourceKind === 'mr') return sourceKind;
   if (revShort) return 'commit';
   return 'worktree';
 };
@@ -543,20 +561,22 @@ const countsKind = (sourceKind, revShort) => {
 const countsLine = (counts, revShort, sourceKind, sourceLabel) => {
   const feedback = counts.feedback ?? 0;
   const todo = counts.todo ?? 0;
-  const notes = `feedback ${feedback}  todo ${todo}`;
+  const code = counts.code ?? 0;
+  const notes = `feedback ${feedback}  todo ${todo}  code ${code}`;
   const kind = countsKind(sourceKind, revShort);
   return COUNTS_KIND[kind]({ counts, notes, sourceLabel, revShort });
 };
 
-const paintQuitPrompt = (width, color) => {
+const paintChoicePrompt = (choices, width, color) => {
   const bgRgb = THEME.chromeBg;
-  let body = QUIT_PROMPT;
+  let body = choices.map((choice) => `${choice.lead}${choice.label}`).join('');
   if (color) {
-    const finish = ` ${QUIT_FINISH_LABEL}`;
-    const rest = `  ${QUIT_CONTINUE_LABEL}`;
-    const paintQuit = (label, letter) =>
-      paintMarkedWord(label, letter, color, QUIT_MARK);
-    body = paintQuit(finish, QUIT_FINISH) + paintQuit(rest, QUIT_CONTINUE);
+    body = choices
+      .map((choice) => {
+        const label = `${choice.lead}${choice.label}`;
+        return paintMarkedWord(label, choice.letter, color, QUIT_MARK);
+      })
+      .join('');
   }
   const pad = Math.max(0, width - visibleWidth(body));
   return body + fill(pad, THEME.mutedFg, bgRgb, color);
@@ -564,7 +584,12 @@ const paintQuitPrompt = (width, color) => {
 
 const paintStatusLine = (view, status, width, color) => {
   const { mode, counts, revShort, sourceKind, sourceLabel } = view;
-  if (mode === 'confirmQuit') return paintQuitPrompt(width, color);
+  if (mode === 'confirmQuit') {
+    return paintChoicePrompt(QUIT_CHOICES, width, color);
+  }
+  if (mode === 'confirmCommit') {
+    return paintChoicePrompt(COMMIT_CHOICES, width, color);
+  }
   const left = countsLine(counts ?? {}, revShort, sourceKind, sourceLabel);
   let right = '';
   let msgFg = THEME.chromeFg;
@@ -677,6 +702,12 @@ const paintFileRow = (entry, width, color, selected, cols) => {
 
 const todoInnerWidth = (width) => Math.max(1, width - 2);
 
+const codeInnerWidth = (width, layout = 'unified') => {
+  const lineW = layout === 'side' ? splitWidths(width).rightW : width;
+  const gutterW = Math.min(GUTTER_W, Math.max(0, lineW));
+  return Math.max(1, lineW - gutterW);
+};
+
 const checkLeadLen = (text) => {
   const match = CHECK_LEAD.exec(text);
   return match ? match[0].length : 0;
@@ -789,11 +820,11 @@ const paintIdleNote = (view, width, color) => {
 
 const paintNotePanel = (view, width, color, cap) => {
   const empty = { rows: [], cursor: null, templateHits: [] };
-  if ((view.pane ?? 'diff') === 'files') return empty;
   const compose = view.compose;
-  if (compose && compose.kind === 'feedback') {
+  if (compose && (compose.kind === 'feedback' || compose.kind === 'commit')) {
     return paintComposeNote(view, width, color, cap);
   }
+  if ((view.pane ?? 'diff') === 'files') return empty;
   return paintIdleNote(view, width, color);
 };
 
@@ -848,34 +879,93 @@ const wrapSoftLine = (line, width) => {
   const gutterW = Math.min(GUTTER_W, Math.max(0, width));
   const budget = Math.max(1, width - gutterW);
   const rows = wrapPlain(line.text ?? '', budget);
-  return rows.map((text) => {
-    const spans = [{ text, changed: false }];
-    return { ...line, text, spans };
-  });
+  const changed = line.wrap === true;
+  const pieces = [];
+  let used = 0;
+  for (let i = 0; i < rows.length; i++) {
+    const text = rows[i];
+    const last = i === rows.length - 1;
+    const spans = [{ text, changed }];
+    const next = { ...line, text, spans, editLast: last };
+    if (line.editStart !== undefined) {
+      next.editStart = line.editStart + used;
+      if (last) next.editEnd = line.editEnd;
+      else next.editEnd = next.editStart + text.length;
+    }
+    used += text.length;
+    pieces.push(next);
+  }
+  return pieces;
+};
+
+const shouldWrap = (line) => {
+  if (!line) return false;
+  if (SOFT_WRAP.includes(line.type)) return true;
+  return line.wrap === true;
 };
 
 const expandSoftRows = (lines, width, split) => {
-  const wrapWidth = split ? splitWidths(width).leftW : width;
+  const { leftW, rightW } = splitWidths(width);
   const out = [];
   for (const row of lines) {
-    const line = split ? row.left || row.right : row;
-    if (!line || !SOFT_WRAP.includes(line.type)) {
-      out.push(row);
+    if (!split) {
+      if (!shouldWrap(row)) {
+        out.push(row);
+        continue;
+      }
+      for (const part of wrapSoftLine(row, width)) out.push(part);
       continue;
     }
-    const parts = wrapSoftLine(line, wrapWidth);
-    for (const part of parts) {
-      if (split) out.push({ left: part, right: part });
-      else out.push(part);
+    const right = row.right;
+    if (shouldWrap(right)) {
+      const parts = wrapSoftLine(right, rightW);
+      out.push({ left: row.left, right: parts[0] });
+      for (let i = 1; i < parts.length; i++) {
+        out.push({ left: null, right: parts[i] });
+      }
+      continue;
     }
+    const left = row.left;
+    if (shouldWrap(left)) {
+      const parts = wrapSoftLine(left, leftW);
+      for (const part of parts) out.push({ left: part, right: part });
+      continue;
+    }
+    out.push(row);
   }
   return out;
 };
 
-const paintBodyDiff = (item, layout, width, color) => {
+const onCodePiece = (line, cursor) => {
+  if (!line || line.editStart === undefined) return false;
+  if (cursor < line.editStart) return false;
+  if (line.editLast) return cursor <= line.editEnd;
+  return cursor < line.editEnd;
+};
+
+const codeCursorInRows = (rows, split, width, cursor) => {
+  if (cursor === undefined || cursor === null) return null;
+  const { leftW, rightW } = splitWidths(width);
+  for (let i = 0; i < rows.length; i++) {
+    const line = split ? rows[i].right : rows[i];
+    if (!onCodePiece(line, cursor)) continue;
+    const lineW = split ? rightW : width;
+    const gutterW = Math.min(GUTTER_W, Math.max(0, lineW));
+    const take = Math.min(cursor - line.editStart, line.text.length);
+    const col = visibleWidth(line.text.slice(0, take));
+    const x0 = split ? leftW + 1 : 0;
+    return { x: x0 + gutterW + col + 1, row: i };
+  }
+  return null;
+};
+
+const paintBodyDiff = (view, width, color) => {
+  const item = view.item;
+  const layout = view.layout ?? 'unified';
+  const overlay = view.codeOverlay;
   const lang = detectLang(itemPath(item));
   const splitBody = layout === 'side' && !item.file.isBinary;
-  const raw = dropLeadingEmpty(bodyLines(item, layout), splitBody);
+  const raw = dropLeadingEmpty(bodyLines(item, layout, overlay), splitBody);
   const lines = expandSoftRows(raw, width, splitBody);
   const body = [];
   if (splitBody) {
@@ -887,7 +977,9 @@ const paintBodyDiff = (item, layout, width, color) => {
       body.push(paintDiffLine(line, width, color, item.origin, lang));
     }
   }
-  return { body, splitBody };
+  const edit = overlay ? overlay.cursor : null;
+  const cursor = codeCursorInRows(lines, splitBody, width, edit);
+  return { body, splitBody, cursor };
 };
 
 const bodyKind = (view) => {
@@ -908,7 +1000,7 @@ const BODY_PAINT = {
     fileHits: [],
   }),
   diff: (view, width, color) => ({
-    ...paintBodyDiff(view.item, view.layout ?? 'unified', width, color),
+    ...paintBodyDiff(view, width, color),
     fileHits: [],
     todoOwners: [],
   }),
@@ -1025,14 +1117,17 @@ const frameResult = (text, painted, layout, windowed, hits, bodyH) => {
   };
 };
 
+const hiddenActions = (view) => {
+  const pane = view.pane ?? 'diff';
+  return disabledActions(pane, view.item);
+};
+
 const renderFrame = (view, options = {}) => {
   const width = Math.max(20, options.width ?? 80);
   const height = Math.max(6, options.height ?? 24);
   const color = options.color ?? true;
   const rows = [paintHeader(view, width, color)];
-  const pane = view.pane ?? 'diff';
-  const disabled = pane === 'files' ? FILES_DISABLED : [];
-  const layout = layoutButtons(width, false, disabled);
+  const layout = layoutButtons(width, false, hiddenActions(view));
   const notes = frameNotes(view, width, height, color);
   const headerLines = rows.length;
   const bodyH = notes.bodyH;
@@ -1077,9 +1172,8 @@ const presentRows = (rows, options = {}) => {
 };
 
 module.exports = {
-  QUIT_FINISH,
-  QUIT_CONTINUE,
   QUIT_PROMPT,
+  COMMIT_PROMPT,
   DEL_CHAR_BG,
   ADD_CHAR_BG,
   paintDiffLine,
@@ -1087,6 +1181,7 @@ module.exports = {
   layoutButtons,
   todoInnerWidth,
   noteInnerWidth,
+  codeInnerWidth,
   renderFrame,
   presentCursor,
   presentRows,

package/lib/review.js

@@ -16,6 +16,8 @@ const FEED_BLOCK_ONLY = /^block (\d+)$/;
 const FEED_META = /^<!-- reslop:(.*) -->\s*$/;
 const FEED_SUFFIX = /^(.*) - (.+):(\d+):(\d+):(\d+)$/;
 const CHECK_ITEM = /^- \[([ xX])\] (.*)$/;
+const CODE_HEAD = /^- \[([ xX])\] code `([^`]+)`\s*$/;
+const FENCE_LINE = /^(`{3,})\s*$/;
 const FILE_QUOTE = /^> (.+)$/;
 const STATUS_LINE = /^status:\s*(\S+)\s*$/;
 const GIT_ORIGINS = ['unstaged', 'staged', 'untracked', 'commit', 'pr'];
@@ -28,6 +30,7 @@ const AGENT_INSTRUCTIONS = [
   'Execute reviews with `status: ready` or `status: partial`.',
   'Do not start `editing` or `done` review files.',
   'Work through unchecked items. After finishing one, mark it `[x]`.',
+  'For `code` items, replace added lines at that location with the fence.',
   'Set `status` to `partial` if some remain, or `done` if all are `[x]`.',
   'Do not redo items already marked `[x]`.',
 ].join('\n');
@@ -169,13 +172,14 @@ const createStore = (reviewPath, templates = []) => ({
   dirty: false,
   nextTodoId: 1,
   feedback: new Map(),
+  code: new Map(),
   todos: [],
   templates: [...templates],
   status: 'editing',
 });
 
 const noteCounts = (store) => {
-  const counts = { feedback: 0, todo: 0 };
+  const counts = { feedback: 0, todo: 0, code: 0 };
   if (!store) return counts;
   for (const todo of store.todos) {
     if (todo.text.trim()) counts.todo += 1;
@@ -183,12 +187,13 @@ const noteCounts = (store) => {
   for (const note of store.feedback.values()) {
     if (note.text.trim()) counts.feedback += 1;
   }
+  counts.code = store.code.size;
   return counts;
 };
 
 const hasNotes = (store) => {
   const counts = noteCounts(store);
-  return counts.feedback > 0 || counts.todo > 0;
+  return counts.feedback > 0 || counts.todo > 0 || counts.code > 0;
 };
 
 const rememberTemplate = (store, prevText, nextText) => {
@@ -224,6 +229,29 @@ const setFeedback = (store, key, note) => {
   store.dirty = true;
 };
 
+const setCode = (store, key, note) => {
+  const prev = store.code.get(key);
+  if (note.clear) {
+    if (!prev) return;
+    store.code.delete(key);
+    store.dirty = true;
+    return;
+  }
+  const text = note.text ?? '';
+  if (prev && prev.text === text) return;
+  store.code.set(key, {
+    file: note.file,
+    oldStart: note.oldStart ?? 0,
+    newStart: note.newStart ?? 0,
+    blockId: note.blockId ?? 0,
+    origin: note.origin ?? '',
+    header: note.header ?? '',
+    text,
+    done: note.done ?? prev?.done ?? false,
+  });
+  store.dirty = true;
+};
+
 const addTodo = (store, file, text = '') => {
   const id = store.nextTodoId;
   store.nextTodoId += 1;
@@ -330,6 +358,20 @@ const storeFeedback = (store, note, key) => {
   store.feedback.set(key || feedbackKey(next), next);
 };
 
+const storeCode = (store, note, key) => {
+  const next = {
+    file: note.file,
+    oldStart: note.oldStart ?? 0,
+    newStart: note.newStart ?? 0,
+    blockId: note.blockId ?? 0,
+    origin: note.origin ?? '',
+    header: note.header ?? '',
+    text: note.text,
+    done: note.done ?? false,
+  };
+  store.code.set(key || feedbackKey(next), next);
+};
+
 const feedbackLine = (note) => {
   const loc = feedbackKey(note);
   return `${checkboxLine(note.text, note.done)} - ${loc}`;
@@ -368,7 +410,7 @@ const parseFeedSuffix = (textItem) => {
 const fileGroup = (groups, file) => {
   let group = groups.get(file);
   if (!group) {
-    group = { todos: [], feedback: [] };
+    group = { todos: [], feedback: [], code: [] };
     groups.set(file, group);
   }
   return group;
@@ -385,6 +427,10 @@ const groupReviewNotes = (store) => {
     if (!note.text.trim()) continue;
     fileGroup(groups, note.file).feedback.push({ key, note });
   }
+  for (const key of store.code.keys()) {
+    const note = store.code.get(key);
+    fileGroup(groups, note.file).code.push({ key, note });
+  }
   return groups;
 };
 
@@ -405,6 +451,26 @@ const reviewHeader = (store) => {
   ];
 };
 
+const fenceFor = (text) => {
+  let n = 3;
+  for (const line of text.split('\n')) {
+    const match = /^(`{3,})/.exec(line);
+    if (!match) continue;
+    if (match[1].length >= n) n = match[1].length + 1;
+  }
+  return '`'.repeat(n);
+};
+
+const emitCodeItem = (lines, note) => {
+  const loc = feedbackKey(note);
+  const mark = note.done ? 'x' : ' ';
+  const fence = fenceFor(note.text);
+  lines.push(`- [${mark}] code \`${loc}\``);
+  lines.push(fence);
+  if (note.text !== '') lines.push(note.text);
+  lines.push(fence);
+};
+
 const emitReviewGroups = (lines, groups) => {
   for (const file of groups.keys()) {
     const group = groups.get(file);
@@ -416,6 +482,9 @@ const emitReviewGroups = (lines, groups) => {
     for (const item of group.feedback) {
       lines.push(feedbackLine(item.note));
     }
+    for (const item of group.code) {
+      emitCodeItem(lines, item.note);
+    }
     lines.push('');
   }
 };
@@ -543,18 +612,90 @@ const applyReviewLine = (store, file, section, pending, line) => {
   return { file, section, pending };
 };
 
+const startCodePending = (line) => {
+  const match = CODE_HEAD.exec(line);
+  if (!match) return null;
+  const loc = parseLoc(match[2]);
+  if (!loc) return null;
+  return {
+    done: isDoneMark(match[1]),
+    origin: loc.origin,
+    file: loc.file,
+    oldStart: loc.oldStart,
+    newStart: loc.newStart,
+    blockId: loc.blockId,
+    open: '',
+    lines: [],
+  };
+};
+
+const storeCodeNote = (store, pending, text) => {
+  storeCode(store, {
+    file: pending.file,
+    oldStart: pending.oldStart,
+    newStart: pending.newStart,
+    blockId: pending.blockId,
+    origin: pending.origin,
+    header: '',
+    text,
+    done: pending.done,
+  });
+};
+
+const flushPendingCode = (store, pending) => {
+  if (!pending) return;
+  const text = pending.open ? pending.lines.join('\n') : '';
+  storeCodeNote(store, pending, text);
+};
+
+const takeCodeLine = (store, pending, line) => {
+  const fence = FENCE_LINE.exec(line);
+  if (!pending.open) {
+    if (fence) {
+      pending.open = fence[1];
+      return pending;
+    }
+    if (!line.trim()) return pending;
+    storeCodeNote(store, pending, '');
+    return 'fallthrough';
+  }
+  if (fence && fence[1].length >= pending.open.length) {
+    storeCodeNote(store, pending, pending.lines.join('\n'));
+    return null;
+  }
+  pending.lines.push(line);
+  return pending;
+};
+
 const parseReview = (text, reviewPath, templates = []) => {
   const store = createStore(reviewPath, templates);
   store.status = parseFrontmatterStatus(text) || 'editing';
   let file = '';
   let section = '';
   let pending = null;
+  let pendingCode = null;
   for (const line of text.split('\n')) {
+    if (pendingCode) {
+      const nextCode = takeCodeLine(store, pendingCode, line);
+      if (nextCode === 'fallthrough') {
+        pendingCode = null;
+      } else {
+        pendingCode = nextCode;
+        continue;
+      }
+    }
+    const started = startCodePending(line);
+    if (started) {
+      pending = flushPendingFeedback(store, pending);
+      pendingCode = started;
+      continue;
+    }
     const next = applyReviewLine(store, file, section, pending, line);
     file = next.file;
     section = next.section;
     pending = next.pending;
   }
+  flushPendingCode(store, pendingCode);
   flushPendingFeedback(store, pending);
   store.dirty = false;
   return store;
@@ -679,6 +820,7 @@ module.exports = {
   hasNotes,
   rememberTemplate,
   setFeedback,
+  setCode,
   addTodo,
   removeTodo,
   setTodoText,

package/lib/select.js

@@ -7,12 +7,6 @@ const { fg: fgSeq, bg: bgSeq, seq } = ansi;
 const { stripAnsi, graphemes, graphemeWidth } = ansi;
 
 const CSI_FINAL = /[@-~]/;
-const SGR_RESET = 0;
-const SGR_FG = 38;
-const SGR_BG = 48;
-const SGR_DEFAULT_FG = 39;
-const SGR_DEFAULT_BG = 49;
-const SGR_TRUECOLOR = 2;
 
 const isRange = (sel) => {
   if (!sel || !sel.start || !sel.end) return false;
@@ -81,7 +75,8 @@ const parseParams = (body) => {
 };
 
 const applyRgb = (state, field, params, i) => {
-  const isTruecolor = params[i + 1] === SGR_TRUECOLOR;
+  const TRUECOLOR = 2;
+  const isTruecolor = params[i + 1] === TRUECOLOR;
   const hasRgb = isTruecolor && i + 4 < params.length;
   if (!hasRgb) return 1;
   state[field] = [params[i + 2], params[i + 3], params[i + 4]];
@@ -89,18 +84,18 @@ const applyRgb = (state, field, params, i) => {
 };
 
 const SGR = {
-  [SGR_RESET]: (state) => {
+  0: (state) => {
     state.fg = null;
     state.bg = null;
     return 1;
   },
-  [SGR_FG]: (state, params, i) => applyRgb(state, 'fg', params, i),
-  [SGR_BG]: (state, params, i) => applyRgb(state, 'bg', params, i),
-  [SGR_DEFAULT_FG]: (state) => {
+  38: (state, params, i) => applyRgb(state, 'fg', params, i),
+  48: (state, params, i) => applyRgb(state, 'bg', params, i),
+  39: (state) => {
     state.fg = null;
     return 1;
   },
-  [SGR_DEFAULT_BG]: (state) => {
+  49: (state) => {
     state.bg = null;
     return 1;
   },