@jmoyers/harness 0.1.10 → 0.1.20

package/src/mux/harness-core-ui.ts

@@ -2,9 +2,22 @@ import { basename } from 'node:path';
 import { padOrTrimDisplay } from './dual-pane-core.ts';
 import { buildProjectTreeLines } from './project-tree.ts';
 import { wrapTextForColumns } from '../terminal/snapshot-oracle.ts';
-import { formatUiButton } from '../ui/kit.ts';
+import { UiKit } from '../../packages/harness-ui/src/kit.ts';
+import {
+  buildProjectPaneGitHubReviewLines,
+  type ProjectPaneGitHubReviewComment,
+  type ProjectPaneGitHubReviewSummary,
+  type ProjectPaneGitHubReviewThread,
+  type ProjectPaneGitHubToggleAction,
+} from './project-pane-github-review.ts';
 
-export type ProjectPaneAction = 'conversation.new' | 'project.close';
+const UI_KIT = new UiKit();
+
+export type ProjectPaneAction =
+  | 'conversation.new'
+  | 'project.close'
+  | 'project.github.refresh'
+  | ProjectPaneGitHubToggleAction;
 export type TaskStatus = 'draft' | 'ready' | 'in-progress' | 'completed';
 export type TaskPaneAction =
   | 'task.create'
@@ -23,6 +36,7 @@ export interface ProjectPaneSnapshot {
   readonly directoryId: string;
   readonly path: string;
   readonly lines: readonly string[];
+  readonly actionBySourceLineIndex: Readonly<Record<number, ProjectPaneAction>>;
   readonly actionLineIndexByKind: {
     readonly conversationNew: number;
     readonly projectClose: number;
@@ -47,7 +61,7 @@ export interface TaskPaneTaskRecord {
   readonly taskId: string;
   readonly repositoryId: string | null;
   readonly title: string;
-  readonly description: string;
+  readonly body: string;
   readonly status: TaskStatus;
   readonly orderIndex: number;
   readonly completedAt: string | null;
@@ -81,103 +95,107 @@ export interface TaskPaneView {
   readonly top: number;
 }
 
-export const PROJECT_PANE_NEW_CONVERSATION_BUTTON_LABEL = formatUiButton({
+export const PROJECT_PANE_NEW_CONVERSATION_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'new thread',
   prefixIcon: '+',
 });
-export const PROJECT_PANE_CLOSE_PROJECT_BUTTON_LABEL = formatUiButton({
+export const PROJECT_PANE_CLOSE_PROJECT_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'close project',
   prefixIcon: '<',
 });
-export const TASKS_PANE_ADD_TASK_BUTTON_LABEL = formatUiButton({
+const PROJECT_PANE_REFRESH_GITHUB_BUTTON_LABEL = UI_KIT.formatButton({
+  label: 'refresh review',
+  prefixIcon: 'R',
+});
+export const TASKS_PANE_ADD_TASK_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'add task',
   prefixIcon: '+',
 });
-export const TASKS_PANE_ADD_REPOSITORY_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_ADD_REPOSITORY_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'add repository',
   prefixIcon: '+',
 });
-export const TASKS_PANE_EDIT_REPOSITORY_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_EDIT_REPOSITORY_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'edit repository',
   prefixIcon: 'e',
 });
-export const TASKS_PANE_ARCHIVE_REPOSITORY_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_ARCHIVE_REPOSITORY_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'archive repository',
   prefixIcon: 'x',
 });
-export const TASKS_PANE_EDIT_TASK_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_EDIT_TASK_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'edit task',
   prefixIcon: 'e',
 });
-export const TASKS_PANE_DELETE_TASK_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_DELETE_TASK_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'delete task',
   prefixIcon: 'x',
 });
-export const TASKS_PANE_READY_TASK_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_READY_TASK_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'mark ready',
   prefixIcon: 'r',
 });
-export const TASKS_PANE_DRAFT_TASK_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_DRAFT_TASK_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'mark draft',
   prefixIcon: 'd',
 });
-export const TASKS_PANE_COMPLETE_TASK_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_COMPLETE_TASK_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'mark complete',
   prefixIcon: 'c',
 });
-export const TASKS_PANE_REORDER_UP_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_REORDER_UP_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'move up',
   prefixIcon: '^',
 });
-export const TASKS_PANE_REORDER_DOWN_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_REORDER_DOWN_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'move down',
   prefixIcon: 'v',
 });
-export const TASKS_PANE_FOOTER_EDIT_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_FOOTER_EDIT_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'edit ^E',
   prefixIcon: '✎',
 });
-export const TASKS_PANE_FOOTER_DELETE_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_FOOTER_DELETE_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'delete ^?',
   prefixIcon: '⌫',
 });
-export const TASKS_PANE_FOOTER_COMPLETE_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_FOOTER_COMPLETE_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'complete ^S',
   prefixIcon: '✓',
 });
-export const TASKS_PANE_FOOTER_DRAFT_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_FOOTER_DRAFT_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'draft ^R',
   prefixIcon: '◇',
 });
-export const TASKS_PANE_FOOTER_REPOSITORY_EDIT_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_FOOTER_REPOSITORY_EDIT_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'repo edit E',
   prefixIcon: '✎',
 });
-export const TASKS_PANE_FOOTER_REPOSITORY_ARCHIVE_BUTTON_LABEL = formatUiButton({
+export const TASKS_PANE_FOOTER_REPOSITORY_ARCHIVE_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'repo archive X',
   prefixIcon: '⌫',
 });
-export const CONVERSATION_EDIT_ARCHIVE_BUTTON_LABEL = formatUiButton({
+export const CONVERSATION_EDIT_ARCHIVE_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'archive thread',
   prefixIcon: 'x',
 });
-export const NEW_THREAD_MODAL_CODEX_BUTTON = formatUiButton({
+export const NEW_THREAD_MODAL_CODEX_BUTTON = UI_KIT.formatButton({
   label: 'codex',
   prefixIcon: '◆',
 });
-export const NEW_THREAD_MODAL_CLAUDE_BUTTON = formatUiButton({
+export const NEW_THREAD_MODAL_CLAUDE_BUTTON = UI_KIT.formatButton({
   label: 'claude',
   prefixIcon: '◇',
 });
-export const NEW_THREAD_MODAL_CURSOR_BUTTON = formatUiButton({
+export const NEW_THREAD_MODAL_CURSOR_BUTTON = UI_KIT.formatButton({
   label: 'cursor',
   prefixIcon: '◈',
 });
-export const NEW_THREAD_MODAL_TERMINAL_BUTTON = formatUiButton({
+export const NEW_THREAD_MODAL_TERMINAL_BUTTON = UI_KIT.formatButton({
   label: 'terminal',
   prefixIcon: '▣',
 });
-export const NEW_THREAD_MODAL_CRITIQUE_BUTTON = formatUiButton({
+export const NEW_THREAD_MODAL_CRITIQUE_BUTTON = UI_KIT.formatButton({
   label: 'critique',
   prefixIcon: '▤',
 });
@@ -434,6 +452,96 @@ function normalizeTaskPaneRow(text: string, cols: number): string {
   return `│${padOrTrimDisplay(text, innerCols)}│`;
 }
 
+function sanitizeInlineText(value: string): string {
+  return value.replace(/\s+/gu, ' ').trim();
+}
+
+function formatGitHubAuthor(login: string | null): string {
+  const normalized = login?.trim() ?? '';
+  return normalized.length > 0 ? `@${normalized}` : '@unknown';
+}
+
+function githubPrStateLabel(review: NonNullable<ProjectPaneGitHubReviewSummary['pr']>): string {
+  if (review.isDraft || review.state === 'draft') {
+    return 'draft';
+  }
+  if (review.state === 'merged') {
+    return 'merged';
+  }
+  if (review.state === 'closed') {
+    return 'closed';
+  }
+  return 'open';
+}
+
+function threadCommentCount(threads: readonly ProjectPaneGitHubReviewThread[]): number {
+  let count = 0;
+  for (const thread of threads) {
+    count += thread.comments.length;
+  }
+  return count;
+}
+
+function appendCommentDetails(
+  pushLine: (line: string, action?: ProjectPaneAction | null) => void,
+  comment: ProjectPaneGitHubReviewComment,
+  index: number,
+): void {
+  pushLine(
+    `  comment ${String(index + 1)} (${comment.commentId}) by ${formatGitHubAuthor(comment.authorLogin)}`,
+  );
+  pushLine(`    created ${comment.createdAt}`);
+  if (comment.updatedAt !== comment.createdAt) {
+    pushLine(`    updated ${comment.updatedAt}`);
+  }
+  if (comment.url !== null) {
+    pushLine(`    url ${comment.url}`);
+  }
+  const bodyLines = comment.body.split(/\r?\n/gu);
+  pushLine('    body');
+  let wroteBodyLine = false;
+  for (const bodyLine of bodyLines) {
+    const trimmedEnd = bodyLine.trimEnd();
+    if (trimmedEnd.length === 0) {
+      continue;
+    }
+    pushLine(`      ${trimmedEnd}`);
+    wroteBodyLine = true;
+  }
+  if (!wroteBodyLine) {
+    pushLine('      (empty)');
+  }
+}
+
+function appendThreadDetails(
+  pushLine: (line: string, action?: ProjectPaneAction | null) => void,
+  label: string,
+  threads: readonly ProjectPaneGitHubReviewThread[],
+): void {
+  pushLine(`${label} (${String(threads.length)})`);
+  if (threads.length === 0) {
+    pushLine('  (none)');
+    return;
+  }
+  for (const thread of threads) {
+    const parts = [
+      thread.isResolved ? 'resolved' : 'open',
+      ...(thread.isOutdated ? ['outdated'] : []),
+      ...(thread.resolvedByLogin === null
+        ? []
+        : [`resolved by ${formatGitHubAuthor(thread.resolvedByLogin)}`]),
+    ];
+    pushLine(`[thread ${thread.threadId}] ${parts.join(', ')}`);
+    if (thread.comments.length === 0) {
+      pushLine('  (no comments)');
+      continue;
+    }
+    for (let commentIndex = 0; commentIndex < thread.comments.length; commentIndex += 1) {
+      appendCommentDetails(pushLine, thread.comments[commentIndex]!, commentIndex);
+    }
+  }
+}
+
 export function resolveGoldenModalSize(
   viewportCols: number,
   viewportRows: number,
@@ -461,23 +569,182 @@ export function resolveGoldenModalSize(
 
 export function buildProjectPaneSnapshot(directoryId: string, path: string): ProjectPaneSnapshot {
   const projectName = basename(path) || path;
-  const actionLineIndexByKind = {
-    conversationNew: 3,
-    projectClose: 4,
-  } as const;
+  const lines: string[] = [];
+  const actionBySourceLineIndex: Record<number, ProjectPaneAction> = {};
+  const pushLine = (line: string, action: ProjectPaneAction | null = null): number => {
+    const index = lines.length;
+    lines.push(line);
+    if (action !== null) {
+      actionBySourceLineIndex[index] = action;
+    }
+    return index;
+  };
+  pushLine(`project ${projectName}`);
+  pushLine(`path ${path}`);
+  pushLine('');
+  const conversationNewLineIndex = pushLine(
+    PROJECT_PANE_NEW_CONVERSATION_BUTTON_LABEL,
+    'conversation.new',
+  );
+  const projectCloseLineIndex = pushLine(PROJECT_PANE_CLOSE_PROJECT_BUTTON_LABEL, 'project.close');
+  pushLine(PROJECT_PANE_REFRESH_GITHUB_BUTTON_LABEL, 'project.github.refresh');
+  pushLine('');
+  for (const line of buildProjectTreeLines(path)) {
+    pushLine(line);
+  }
   return {
     directoryId,
     path,
-    lines: [
-      `project ${projectName}`,
-      `path ${path}`,
-      '',
-      PROJECT_PANE_NEW_CONVERSATION_BUTTON_LABEL,
-      PROJECT_PANE_CLOSE_PROJECT_BUTTON_LABEL,
-      '',
-      ...buildProjectTreeLines(path),
-    ],
-    actionLineIndexByKind,
+    lines,
+    actionBySourceLineIndex,
+    actionLineIndexByKind: {
+      conversationNew: conversationNewLineIndex,
+      projectClose: projectCloseLineIndex,
+    },
+  };
+}
+
+interface BuildProjectPaneSnapshotOptions {
+  readonly githubReview?: ProjectPaneGitHubReviewSummary | null;
+  readonly expandedNodeIds?: ReadonlySet<string>;
+}
+
+export function buildProjectPaneSnapshotWithOptions(
+  directoryId: string,
+  path: string,
+  options: BuildProjectPaneSnapshotOptions = {},
+): ProjectPaneSnapshot {
+  const base = buildProjectPaneSnapshot(directoryId, path);
+  if (options.githubReview === undefined || options.githubReview === null) {
+    return base;
+  }
+  const lines: string[] = [];
+  const actionBySourceLineIndex: Record<number, ProjectPaneAction> = {};
+  const pushBaseLine = (line: string, action: ProjectPaneAction | null = null): number => {
+    const index = lines.length;
+    lines.push(line);
+    if (action !== null) {
+      actionBySourceLineIndex[index] = action;
+    }
+    return index;
+  };
+  const lineCountBeforeTree = Math.min(
+    base.lines.length,
+    base.actionLineIndexByKind.projectClose + 2,
+  );
+  for (let index = 0; index < lineCountBeforeTree; index += 1) {
+    const action = base.actionBySourceLineIndex[index] ?? null;
+    pushBaseLine(base.lines[index]!, action);
+  }
+  const reviewLines = buildProjectPaneGitHubReviewLines({
+    review: options.githubReview,
+    expandedNodeIds: options.expandedNodeIds ?? new Set<string>(),
+  });
+  for (let index = 0; index < reviewLines.lines.length; index += 1) {
+    const action = reviewLines.actionByRelativeLineIndex[index] ?? null;
+    pushBaseLine(reviewLines.lines[index]!, action);
+  }
+  pushBaseLine('');
+  const treeStartIndex = lineCountBeforeTree;
+  for (let index = treeStartIndex; index < base.lines.length; index += 1) {
+    pushBaseLine(base.lines[index]!);
+  }
+  return {
+    directoryId: base.directoryId,
+    path: base.path,
+    lines,
+    actionBySourceLineIndex,
+    actionLineIndexByKind: {
+      conversationNew: base.actionLineIndexByKind.conversationNew,
+      projectClose: base.actionLineIndexByKind.projectClose,
+    },
+  };
+}
+
+export function buildGitHubReviewPaneSnapshot(
+  directoryId: string,
+  path: string,
+  review: ProjectPaneGitHubReviewSummary | null,
+): ProjectPaneSnapshot {
+  const base = buildProjectPaneSnapshot(directoryId, path);
+  const lines: string[] = [];
+  const actionBySourceLineIndex: Record<number, ProjectPaneAction> = {};
+  const pushLine = (line: string, action: ProjectPaneAction | null = null): void => {
+    const index = lines.length;
+    lines.push(line);
+    if (action !== null) {
+      actionBySourceLineIndex[index] = action;
+    }
+  };
+  const lineCountBeforeTree = Math.min(
+    base.lines.length,
+    base.actionLineIndexByKind.projectClose + 2,
+  );
+  for (let index = 0; index < lineCountBeforeTree; index += 1) {
+    const action = base.actionBySourceLineIndex[index] ?? null;
+    pushLine(base.lines[index]!, action);
+  }
+  pushLine('github pull request');
+  pushLine(PROJECT_PANE_REFRESH_GITHUB_BUTTON_LABEL, 'project.github.refresh');
+  pushLine('');
+
+  if (review === null) {
+    pushLine('status not loaded');
+    pushLine('select refresh review to load latest state');
+  } else if (review.status === 'loading') {
+    pushLine('status loading GitHub review data…');
+  } else if (review.status === 'error') {
+    const message =
+      review.errorMessage === null ? 'unknown error' : sanitizeInlineText(review.errorMessage);
+    pushLine(`status error ${message}`);
+  } else {
+    const branchName = review.branchName?.trim() ?? '';
+    const branchSource = review.branchSource === null ? '' : ` (${review.branchSource})`;
+    pushLine(`branch ${branchName.length > 0 ? branchName : '(none)'}${branchSource}`);
+    if (review.pr === null) {
+      pushLine('pr none for tracked branch');
+    } else {
+      const pr = review.pr;
+      const openCommentCount = threadCommentCount(review.openThreads);
+      const resolvedCommentCount = threadCommentCount(review.resolvedThreads);
+      pushLine(
+        `pr #${String(pr.number)} ${githubPrStateLabel(pr)} ${sanitizeInlineText(pr.title)}`,
+      );
+      pushLine(`url ${pr.url}`);
+      pushLine(`author ${formatGitHubAuthor(pr.authorLogin)}`);
+      pushLine(`branches ${pr.headBranch} -> ${pr.baseBranch}`);
+      pushLine(`created ${pr.createdAt}`);
+      pushLine(`updated ${pr.updatedAt}`);
+      if (pr.mergedAt !== null) {
+        pushLine(`merged ${pr.mergedAt}`);
+      }
+      if (pr.closedAt !== null) {
+        pushLine(`closed ${pr.closedAt}`);
+      }
+      pushLine(
+        `review threads ${String(review.openThreads.length)} open / ${String(review.resolvedThreads.length)} resolved`,
+      );
+      pushLine(
+        `review comments ${String(openCommentCount + resolvedCommentCount)} total (${String(
+          openCommentCount,
+        )} open, ${String(resolvedCommentCount)} resolved)`,
+      );
+      pushLine('');
+      appendThreadDetails(pushLine, 'open threads', review.openThreads);
+      pushLine('');
+      appendThreadDetails(pushLine, 'resolved threads', review.resolvedThreads);
+    }
+  }
+
+  return {
+    directoryId: base.directoryId,
+    path: base.path,
+    lines,
+    actionBySourceLineIndex,
+    actionLineIndexByKind: {
+      conversationNew: base.actionLineIndexByKind.conversationNew,
+      projectClose: base.actionLineIndexByKind.projectClose,
+    },
   };
 }
 
@@ -518,6 +785,10 @@ export function projectPaneActionAtRow(
   const nextTop = Math.max(0, Math.min(maxTop, scrollTop));
   const normalizedRow = Math.max(0, Math.min(safeRows - 1, rowIndex));
   const line = wrappedLines[nextTop + normalizedRow]!;
+  const mappedAction = snapshot.actionBySourceLineIndex[line.sourceLineIndex];
+  if (mappedAction !== undefined) {
+    return mappedAction;
+  }
   if (line.sourceLineIndex === snapshot.actionLineIndexByKind.conversationNew) {
     return 'conversation.new';
   }

package/src/mux/input-shortcuts.ts

@@ -1,21 +1,8 @@
-type MuxGlobalShortcutAction =
-  | 'mux.app.quit'
-  | 'mux.app.interrupt-all'
-  | 'mux.command-menu.toggle'
-  | 'mux.gateway.profile.toggle'
-  | 'mux.gateway.status-timeline.toggle'
-  | 'mux.gateway.render-trace.toggle'
-  | 'mux.conversation.new'
-  | 'mux.conversation.critique.open-or-create'
-  | 'mux.conversation.next'
-  | 'mux.conversation.previous'
-  | 'mux.conversation.titles.refresh-all'
-  | 'mux.conversation.interrupt'
-  | 'mux.conversation.archive'
-  | 'mux.conversation.takeover'
-  | 'mux.conversation.delete'
-  | 'mux.directory.add'
-  | 'mux.directory.close';
+import {
+  DEFAULT_MUX_SHORTCUT_BINDINGS_RAW,
+  MUX_GLOBAL_SHORTCUT_ACTION_ORDER,
+  type MuxGlobalShortcutAction,
+} from './keybinding-registry.ts';
 
 interface KeyStroke {
   readonly key: string;
@@ -30,54 +17,14 @@ interface ParsedShortcutBinding {
   readonly originalText: string;
 }
 
-interface ResolvedMuxShortcutBindings {
+export interface ResolvedMuxShortcutBindings {
   readonly rawByAction: Readonly<Record<MuxGlobalShortcutAction, readonly string[]>>;
   readonly parsedByAction: Readonly<
     Record<MuxGlobalShortcutAction, readonly ParsedShortcutBinding[]>
   >;
 }
 
-const ACTION_ORDER: readonly MuxGlobalShortcutAction[] = [
-  'mux.app.quit',
-  'mux.app.interrupt-all',
-  'mux.command-menu.toggle',
-  'mux.gateway.profile.toggle',
-  'mux.gateway.status-timeline.toggle',
-  'mux.gateway.render-trace.toggle',
-  'mux.conversation.new',
-  'mux.conversation.critique.open-or-create',
-  'mux.conversation.next',
-  'mux.conversation.previous',
-  'mux.conversation.titles.refresh-all',
-  'mux.conversation.interrupt',
-  'mux.conversation.archive',
-  'mux.conversation.takeover',
-  'mux.conversation.delete',
-  'mux.directory.add',
-  'mux.directory.close',
-];
-
-const DEFAULT_MUX_SHORTCUT_BINDINGS_RAW: Readonly<
-  Record<MuxGlobalShortcutAction, readonly string[]>
-> = {
-  'mux.app.quit': [],
-  'mux.app.interrupt-all': ['ctrl+c'],
-  'mux.command-menu.toggle': ['ctrl+p', 'cmd+p'],
-  'mux.gateway.profile.toggle': ['ctrl+shift+p'],
-  'mux.gateway.status-timeline.toggle': ['alt+r'],
-  'mux.gateway.render-trace.toggle': ['ctrl+]'],
-  'mux.conversation.new': ['ctrl+t'],
-  'mux.conversation.critique.open-or-create': ['ctrl+g'],
-  'mux.conversation.next': ['ctrl+j'],
-  'mux.conversation.previous': ['ctrl+k'],
-  'mux.conversation.titles.refresh-all': ['ctrl+r'],
-  'mux.conversation.interrupt': [],
-  'mux.conversation.archive': [],
-  'mux.conversation.takeover': ['ctrl+l'],
-  'mux.conversation.delete': ['ctrl+x'],
-  'mux.directory.add': ['ctrl+o'],
-  'mux.directory.close': ['ctrl+w'],
-};
+const ACTION_ORDER = MUX_GLOBAL_SHORTCUT_ACTION_ORDER;
 
 const KEY_TOKEN_ALIASES = new Map<string, string>([
   ['cmd', 'meta'],
@@ -541,10 +488,18 @@ function strokesEqual(left: KeyStroke, right: KeyStroke): boolean {
 
 function parseBindingsForAction(rawBindings: readonly string[]): readonly ParsedShortcutBinding[] {
   const parsed: ParsedShortcutBinding[] = [];
+
+  const pushIfUnique = (candidate: ParsedShortcutBinding): void => {
+    if (parsed.some((existing) => strokesEqual(existing.stroke, candidate.stroke))) {
+      return;
+    }
+    parsed.push(candidate);
+  };
+
   for (const raw of rawBindings) {
     const normalized = parseShortcutBinding(raw);
     if (normalized !== null) {
-      parsed.push(normalized);
+      pushIfUnique(normalized);
     }
   }
   return parsed;
@@ -553,57 +508,11 @@ function parseBindingsForAction(rawBindings: readonly string[]): readonly Parsed
 function withDefaultBindings(
   overrides: Readonly<Record<string, readonly string[]> | undefined>,
 ): Readonly<Record<MuxGlobalShortcutAction, readonly string[]>> {
-  return {
-    'mux.app.quit':
-      overrides?.['mux.app.quit'] ?? DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.app.quit'],
-    'mux.app.interrupt-all':
-      overrides?.['mux.app.interrupt-all'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.app.interrupt-all'],
-    'mux.command-menu.toggle':
-      overrides?.['mux.command-menu.toggle'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.command-menu.toggle'],
-    'mux.gateway.profile.toggle':
-      overrides?.['mux.gateway.profile.toggle'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.gateway.profile.toggle'],
-    'mux.gateway.status-timeline.toggle':
-      overrides?.['mux.gateway.status-timeline.toggle'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.gateway.status-timeline.toggle'],
-    'mux.gateway.render-trace.toggle':
-      overrides?.['mux.gateway.render-trace.toggle'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.gateway.render-trace.toggle'],
-    'mux.conversation.new':
-      overrides?.['mux.conversation.new'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.conversation.new'],
-    'mux.conversation.critique.open-or-create':
-      overrides?.['mux.conversation.critique.open-or-create'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.conversation.critique.open-or-create'],
-    'mux.conversation.next':
-      overrides?.['mux.conversation.next'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.conversation.next'],
-    'mux.conversation.previous':
-      overrides?.['mux.conversation.previous'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.conversation.previous'],
-    'mux.conversation.titles.refresh-all':
-      overrides?.['mux.conversation.titles.refresh-all'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.conversation.titles.refresh-all'],
-    'mux.conversation.interrupt':
-      overrides?.['mux.conversation.interrupt'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.conversation.interrupt'],
-    'mux.conversation.archive':
-      overrides?.['mux.conversation.archive'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.conversation.archive'],
-    'mux.conversation.takeover':
-      overrides?.['mux.conversation.takeover'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.conversation.takeover'],
-    'mux.conversation.delete':
-      overrides?.['mux.conversation.delete'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.conversation.delete'],
-    'mux.directory.add':
-      overrides?.['mux.directory.add'] ?? DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.directory.add'],
-    'mux.directory.close':
-      overrides?.['mux.directory.close'] ??
-      DEFAULT_MUX_SHORTCUT_BINDINGS_RAW['mux.directory.close'],
-  };
+  const rawByAction = {} as Record<MuxGlobalShortcutAction, readonly string[]>;
+  for (const action of ACTION_ORDER) {
+    rawByAction[action] = overrides?.[action] ?? DEFAULT_MUX_SHORTCUT_BINDINGS_RAW[action];
+  }
+  return rawByAction;
 }
 
 export function resolveMuxShortcutBindings(
@@ -616,6 +525,7 @@ export function resolveMuxShortcutBindings(
       'mux.app.quit': parseBindingsForAction(rawByAction['mux.app.quit']),
       'mux.app.interrupt-all': parseBindingsForAction(rawByAction['mux.app.interrupt-all']),
       'mux.command-menu.toggle': parseBindingsForAction(rawByAction['mux.command-menu.toggle']),
+      'mux.debug-bar.toggle': parseBindingsForAction(rawByAction['mux.debug-bar.toggle']),
       'mux.gateway.profile.toggle': parseBindingsForAction(
         rawByAction['mux.gateway.profile.toggle'],
       ),