@jmoyers/harness 0.1.11 → 0.1.20

package/src/mux/workspace-rail-model.ts

@@ -1,10 +1,16 @@
 import type { ConversationRailSessionSummary } from './conversation-rail.ts';
-import { formatUiButton } from '../ui/kit.ts';
+import type {
+  ProjectPaneGitHubReviewSummary,
+  ProjectPaneGitHubReviewThread,
+} from './project-pane-github-review.ts';
+import { UiKit } from '../../packages/harness-ui/src/kit.ts';
 import type {
   StreamSessionController,
   StreamSessionDisplayPhase,
 } from '../control-plane/stream-protocol.ts';
 
+const UI_KIT = new UiKit();
+
 interface WorkspaceRailGitSummary {
   readonly branch: string;
   readonly changedFiles: number;
@@ -61,17 +67,25 @@ interface WorkspaceRailModel {
   readonly directories: readonly WorkspaceRailDirectorySummary[];
   readonly conversations: readonly WorkspaceRailConversationSummary[];
   readonly processes: readonly WorkspaceRailProcessSummary[];
+  readonly showGitHubIntegration?: boolean;
+  readonly visibleGitHubDirectoryKeys?: ReadonlySet<string> | readonly string[];
+  readonly expandedGitHubDirectoryKeys?: ReadonlySet<string> | readonly string[];
+  readonly githubReviewByDirectoryKey?: ReadonlyMap<string, ProjectPaneGitHubReviewSummary>;
   readonly showTaskPlanningUi?: boolean;
+  readonly showNimEntry?: boolean;
+  readonly showTasksEntry?: boolean;
   readonly activeProjectId: string | null;
+  readonly activeGitHubProjectId?: string | null;
   readonly activeRepositoryId?: string | null;
   readonly activeConversationId: string | null;
   readonly projectSelectionEnabled?: boolean;
+  readonly githubSelectionEnabled?: boolean;
   readonly repositorySelectionEnabled?: boolean;
   readonly homeSelectionEnabled?: boolean;
+  readonly nimSelectionEnabled?: boolean;
+  readonly tasksSelectionEnabled?: boolean;
   readonly repositoriesCollapsed?: boolean;
   readonly collapsedRepositoryGroupIds?: readonly string[];
-  readonly shortcutHint?: string;
-  readonly shortcutsCollapsed?: boolean;
   readonly nowMs?: number;
 }
 
@@ -83,10 +97,10 @@ interface WorkspaceRailViewRow {
     | 'conversation-body'
     | 'process-title'
     | 'process-meta'
+    | 'github-header'
+    | 'github-detail'
     | 'repository-header'
     | 'repository-row'
-    | 'shortcut-header'
-    | 'shortcut-body'
     | 'action'
     | 'muted';
   readonly text: string;
@@ -100,7 +114,7 @@ interface WorkspaceRailViewRow {
 
 const NEW_THREAD_INLINE_LABEL = '[+ thread]';
 const UNTRACKED_REPOSITORY_GROUP_ID = 'untracked';
-const ADD_PROJECT_BUTTON_LABEL = formatUiButton({
+const ADD_PROJECT_BUTTON_LABEL = UI_KIT.formatButton({
   label: 'add project',
   prefixIcon: '>',
 });
@@ -110,8 +124,11 @@ type WorkspaceRailAction =
   | 'conversation.delete'
   | 'project.add'
   | 'home.open'
+  | 'nim.open'
+  | 'tasks.open'
   | 'project.close'
-  | 'shortcuts.toggle'
+  | 'project.github.open'
+  | 'project.github.toggle'
   | 'repository.toggle'
   | 'repository.add'
   | 'repository.edit'
@@ -243,6 +260,60 @@ function trackedProjectGitSuffix(git: WorkspaceRailGitSummary): string {
   return ` (${git.branch}:+${String(git.additions)},-${String(git.deletions)})`;
 }
 
+function githubReviewCommentCount(threads: readonly ProjectPaneGitHubReviewThread[]): number {
+  let total = 0;
+  for (const thread of threads) {
+    total += thread.comments.length;
+  }
+  return total;
+}
+
+function githubPrLifecycleLabel(pr: NonNullable<ProjectPaneGitHubReviewSummary['pr']>): string {
+  if (pr.isDraft || pr.state === 'draft') {
+    return 'draft';
+  }
+  if (pr.state === 'merged') {
+    return 'merged';
+  }
+  if (pr.state === 'closed') {
+    return 'closed';
+  }
+  return 'open';
+}
+
+function githubRailSummarySuffix(review: ProjectPaneGitHubReviewSummary | null): string {
+  if (review === null) {
+    return '(not loaded)';
+  }
+  if (review.status === 'loading') {
+    return '(loading)';
+  }
+  if (review.status === 'error') {
+    return '(error)';
+  }
+  if (review.pr === null) {
+    return '(no pr)';
+  }
+  const unresolvedCommentCount = githubReviewCommentCount(review.openThreads);
+  const detailParts = [
+    `#${String(review.pr.number)} ${githubPrLifecycleLabel(review.pr)}`,
+    `unresolved ${String(unresolvedCommentCount)}`,
+  ];
+  if (review.pr.ciRollup === 'failure') {
+    detailParts.push('ci failed');
+  }
+  return `(${detailParts.join(', ')})`;
+}
+
+function sanitizeInlineText(value: string): string {
+  return value.replace(/\s+/gu, ' ').trim();
+}
+
+function formatAuthor(login: string | null): string {
+  const normalized = login?.trim() ?? '';
+  return normalized.length > 0 ? `@${normalized}` : '@unknown';
+}
+
 function conversationDisplayTitle(conversation: WorkspaceRailConversationSummary): string {
   const title = conversation.title.trim();
   if (title.length === 0) {
@@ -280,8 +351,29 @@ function buildContentRows(
 ): readonly WorkspaceRailViewRow[] {
   const rows: WorkspaceRailViewRow[] = [];
   const showTaskPlanningUi = model.showTaskPlanningUi ?? true;
+  const showNimEntry = model.showNimEntry ?? true;
+  const showGitHubIntegration = model.showGitHubIntegration ?? false;
+  const visibleGitHubDirectoryKeys =
+    model.visibleGitHubDirectoryKeys === undefined
+      ? new Set<string>()
+      : model.visibleGitHubDirectoryKeys instanceof Set
+        ? model.visibleGitHubDirectoryKeys
+        : new Set(model.visibleGitHubDirectoryKeys);
+  const expandedGitHubDirectoryKeys =
+    model.expandedGitHubDirectoryKeys === undefined
+      ? new Set<string>()
+      : model.expandedGitHubDirectoryKeys instanceof Set
+        ? model.expandedGitHubDirectoryKeys
+        : new Set(model.expandedGitHubDirectoryKeys);
+  const githubReviewByDirectoryKey =
+    model.githubReviewByDirectoryKey ?? new Map<string, ProjectPaneGitHubReviewSummary>();
+  const showTasksEntry = model.showTasksEntry ?? showTaskPlanningUi;
   const homeSelectionEnabled = model.homeSelectionEnabled ?? false;
+  const nimSelectionEnabled = model.nimSelectionEnabled ?? false;
+  const tasksSelectionEnabled = model.tasksSelectionEnabled ?? false;
   const projectSelectionEnabled = model.projectSelectionEnabled ?? false;
+  const githubSelectionEnabled = model.githubSelectionEnabled ?? false;
+  const activeGitHubProjectId = model.activeGitHubProjectId ?? null;
   const repositorySelectionEnabled = model.repositorySelectionEnabled ?? false;
   const collapsedRepositoryGroupIds = new Set(model.collapsedRepositoryGroupIds ?? []);
   const repositoryById = new Map(
@@ -367,6 +459,21 @@ function buildContentRows(
 
   if (showTaskPlanningUi) {
     pushRow(rows, 'dir-header', '├─ 🏠 home', homeSelectionEnabled, null, null, null, 'home.open');
+    if (showNimEntry) {
+      pushRow(rows, 'dir-header', '├─ 🦎 nim', nimSelectionEnabled, null, null, null, 'nim.open');
+    }
+    if (showTasksEntry) {
+      pushRow(
+        rows,
+        'dir-header',
+        '├─ 🗂️ tasks',
+        tasksSelectionEnabled,
+        null,
+        null,
+        null,
+        'tasks.open',
+      );
+    }
   }
 
   if (orderedRepositoryGroupIds.length === 0) {
@@ -424,6 +531,132 @@ function buildContentRows(
       const conversations = model.conversations.filter(
         (conversation) => conversation.directoryKey === directory.key,
       );
+      const processes = model.processes.filter((process) => process.directoryKey === directory.key);
+
+      const githubVisibleForDirectory =
+        visibleGitHubDirectoryKeys.has(directory.key) ||
+        (githubSelectionEnabled && directory.key === activeGitHubProjectId);
+      if (showGitHubIntegration && group.tracked && githubVisibleForDirectory) {
+        const githubReview = githubReviewByDirectoryKey.get(directory.key) ?? null;
+        const githubSelected = githubSelectionEnabled && directory.key === activeGitHubProjectId;
+        const githubExpanded = expandedGitHubDirectoryKeys.has(directory.key);
+        const githubTreePrefix = `${projectChildPrefix}├─ `;
+        const githubDetailPrefix = `${projectChildPrefix}│    `;
+        pushRow(
+          rows,
+          'github-header',
+          `${githubTreePrefix}${githubExpanded ? '▼' : '▶'} github pr ${githubRailSummarySuffix(
+            githubReview,
+          )}`,
+          githubSelected,
+          null,
+          directory.key,
+          repositoryId,
+          'project.github.open',
+        );
+        if (githubExpanded) {
+          if (githubReview === null) {
+            pushRow(
+              rows,
+              'github-detail',
+              `${githubDetailPrefix}status not loaded`,
+              githubSelected,
+              null,
+              directory.key,
+              repositoryId,
+              null,
+            );
+          } else if (githubReview.status === 'loading') {
+            pushRow(
+              rows,
+              'github-detail',
+              `${githubDetailPrefix}status loading GitHub review data…`,
+              githubSelected,
+              null,
+              directory.key,
+              repositoryId,
+              null,
+            );
+          } else if (githubReview.status === 'error') {
+            const message =
+              githubReview.errorMessage === null
+                ? 'unknown error'
+                : sanitizeInlineText(githubReview.errorMessage);
+            pushRow(
+              rows,
+              'github-detail',
+              `${githubDetailPrefix}status error ${message}`,
+              githubSelected,
+              null,
+              directory.key,
+              repositoryId,
+              null,
+            );
+          } else if (githubReview.pr === null) {
+            const branchName = githubReview.branchName?.trim() ?? '';
+            pushRow(
+              rows,
+              'github-detail',
+              `${githubDetailPrefix}branch ${branchName.length > 0 ? branchName : '(none)'}`,
+              githubSelected,
+              null,
+              directory.key,
+              repositoryId,
+              null,
+            );
+            pushRow(
+              rows,
+              'github-detail',
+              `${githubDetailPrefix}no pull request for tracked branch`,
+              githubSelected,
+              null,
+              directory.key,
+              repositoryId,
+              null,
+            );
+          } else {
+            const pr = githubReview.pr;
+            pushRow(
+              rows,
+              'github-detail',
+              `${githubDetailPrefix}pr #${String(pr.number)} ${githubPrLifecycleLabel(pr)} ${sanitizeInlineText(pr.title)}`,
+              githubSelected,
+              null,
+              directory.key,
+              repositoryId,
+              null,
+            );
+            pushRow(
+              rows,
+              'github-detail',
+              `${githubDetailPrefix}from ${pr.headBranch} -> ${pr.baseBranch} by ${formatAuthor(
+                pr.authorLogin,
+              )}`,
+              githubSelected,
+              null,
+              directory.key,
+              repositoryId,
+              null,
+            );
+            pushRow(
+              rows,
+              'github-detail',
+              `${githubDetailPrefix}threads ${String(githubReview.openThreads.length)} open / ${String(
+                githubReview.resolvedThreads.length,
+              )} resolved (${String(
+                githubReviewCommentCount(githubReview.openThreads) +
+                  githubReviewCommentCount(githubReview.resolvedThreads),
+              )} comments)`,
+              githubSelected,
+              null,
+              directory.key,
+              repositoryId,
+              null,
+            );
+          }
+        }
+      }
+
       for (
         let conversationIndex = 0;
         conversationIndex < conversations.length;
@@ -434,6 +667,8 @@ function buildContentRows(
         const active =
           !projectSelectionEnabled &&
           !homeSelectionEnabled &&
+          !nimSelectionEnabled &&
+          !tasksSelectionEnabled &&
           !repositorySelectionEnabled &&
           conversation.sessionId === model.activeConversationId;
         const projection = projectWorkspaceRailConversation(conversation, {
@@ -472,8 +707,6 @@ function buildContentRows(
           );
         }
       }
-
-      const processes = model.processes.filter((process) => process.directoryKey === directory.key);
       for (const process of processes) {
         pushRow(
           rows,
@@ -502,70 +735,6 @@ function buildContentRows(
   return rows;
 }
 
-function shortcutDescriptionRows(shortcutHint: string | undefined): readonly string[] {
-  const normalized = shortcutHint?.trim();
-  if (normalized === undefined || normalized.length === 0) {
-    return [
-      'ctrl+t new thread',
-      'ctrl+g critique thread',
-      'ctrl+x archive thread',
-      'ctrl+l take over thread',
-      'ctrl+o add project',
-      'ctrl+w close project',
-      'ctrl+j/k switch nav',
-      '→ expand repo',
-      '← collapse repo',
-      'ctrl+k ctrl+j expand all repos',
-      'ctrl+k ctrl+0 collapse all repos',
-      'ctrl+c quit mux',
-    ];
-  }
-  if (normalized.includes('\n')) {
-    return normalized
-      .split('\n')
-      .map((line) => line.trim())
-      .filter((line) => line.length > 0);
-  }
-  return normalized
-    .split(/\s{2,}/u)
-    .map((segment) => segment.trim())
-    .filter((segment) => segment.length > 0);
-}
-
-function shortcutRows(
-  shortcutHint: string | undefined,
-  shortcutsCollapsed: boolean,
-): readonly WorkspaceRailViewRow[] {
-  const rows: WorkspaceRailViewRow[] = [
-    {
-      kind: 'shortcut-header',
-      text: `├─ shortcuts ${shortcutsCollapsed ? '[+]' : '[-]'}`,
-      active: false,
-      conversationSessionId: null,
-      directoryKey: null,
-      repositoryId: null,
-      railAction: 'shortcuts.toggle',
-      conversationStatus: null,
-    },
-  ];
-  if (!shortcutsCollapsed) {
-    const descriptions = shortcutDescriptionRows(shortcutHint);
-    for (const description of descriptions) {
-      rows.push({
-        kind: 'shortcut-body',
-        text: `│  ${description}`,
-        active: false,
-        conversationSessionId: null,
-        directoryKey: null,
-        repositoryId: null,
-        railAction: null,
-        conversationStatus: null,
-      });
-    }
-  }
-  return rows;
-}
-
 export function buildWorkspaceRailViewRows(
   model: WorkspaceRailModel,
   maxRows: number,
@@ -573,15 +742,8 @@ export function buildWorkspaceRailViewRows(
   const safeRows = Math.max(1, maxRows);
   const nowMs = model.nowMs ?? Date.now();
   const contentRows = buildContentRows(model, nowMs);
-  const renderedShortcuts = shortcutRows(model.shortcutHint, model.shortcutsCollapsed ?? false);
-
-  if (safeRows <= renderedShortcuts.length) {
-    return renderedShortcuts.slice(renderedShortcuts.length - safeRows);
-  }
-
-  const contentCapacity = safeRows - renderedShortcuts.length;
-  const rows: WorkspaceRailViewRow[] = [...contentRows.slice(0, Math.max(0, contentCapacity - 1))];
-  while (rows.length < contentCapacity) {
+  const rows: WorkspaceRailViewRow[] = [...contentRows.slice(0, Math.max(0, safeRows - 1))];
+  while (rows.length < safeRows) {
     rows.push({
       kind: 'muted',
       text: '│',
@@ -603,12 +765,11 @@ export function buildWorkspaceRailViewRows(
     railAction: 'project.add',
     conversationStatus: null,
   };
-  const projectActionRowIndex = Math.max(0, contentCapacity - 3);
+  const projectActionRowIndex = Math.max(0, safeRows - 3);
   rows.splice(projectActionRowIndex, 0, projectActionRow);
-  if (rows.length > contentCapacity) {
-    rows.length = contentCapacity;
+  if (rows.length > safeRows) {
+    rows.length = safeRows;
   }
-  rows.push(...renderedShortcuts);
   return rows;
 }
 
@@ -644,27 +805,32 @@ export function actionAtWorkspaceRailCell(
   if (row === undefined) {
     return null;
   }
-  if (row.railAction !== null) {
+  const normalizedCol = Math.max(0, Math.floor(colIndex));
+
+  if (row.kind === 'github-header') {
+    const collapsedGlyphCol = row.text.indexOf('▶');
+    const expandedGlyphCol = row.text.indexOf('▼');
+    const glyphCol = collapsedGlyphCol >= 0 ? collapsedGlyphCol : expandedGlyphCol;
+    if (glyphCol >= 0 && normalizedCol === glyphCol) {
+      return 'project.github.toggle';
+    }
     return row.railAction;
   }
-  if (row.kind !== 'dir-header') {
-    return null;
-  }
-  if (!row.text.includes(NEW_THREAD_INLINE_LABEL)) {
-    return null;
-  }
-  const buttonStart =
-    paneCols === null
-      ? row.text.lastIndexOf(NEW_THREAD_INLINE_LABEL)
-      : Math.max(0, Math.floor(paneCols) - NEW_THREAD_INLINE_LABEL.length);
-  const normalizedCol = Math.max(0, Math.floor(colIndex));
-  if (
-    normalizedCol < buttonStart ||
-    normalizedCol >= buttonStart + NEW_THREAD_INLINE_LABEL.length
-  ) {
-    return null;
+
+  if (row.kind === 'dir-header' && row.text.includes(NEW_THREAD_INLINE_LABEL)) {
+    const buttonStart =
+      paneCols === null
+        ? row.text.lastIndexOf(NEW_THREAD_INLINE_LABEL)
+        : Math.max(0, Math.floor(paneCols) - NEW_THREAD_INLINE_LABEL.length);
+    if (
+      normalizedCol >= buttonStart &&
+      normalizedCol < buttonStart + NEW_THREAD_INLINE_LABEL.length
+    ) {
+      return 'conversation.new';
+    }
   }
-  return 'conversation.new';
+
+  return row.railAction;
 }
 
 export function projectIdAtWorkspaceRailRow(

package/src/mux/workspace-rail.ts

@@ -1,20 +1,51 @@
 import {
-  createUiSurface,
+  SurfaceBuffer,
   DEFAULT_UI_STYLE,
-  drawUiText,
-  fillUiRow,
-  renderUiSurfaceAnsiRows,
   type UiStyle,
-} from '../ui/surface.ts';
-import { paintUiRow } from '../ui/kit.ts';
+} from '../../packages/harness-ui/src/surface.ts';
+import { UiKit } from '../../packages/harness-ui/src/kit.ts';
 import { measureDisplayWidth } from '../terminal/snapshot-oracle.ts';
 import { buildWorkspaceRailViewRows } from './workspace-rail-model.ts';
 import { getActiveMuxTheme, type MuxWorkspaceRailTheme } from '../ui/mux-theme.ts';
 
 type WorkspaceRailModel = Parameters<typeof buildWorkspaceRailViewRows>[0];
 type WorkspaceRailViewRow = ReturnType<typeof buildWorkspaceRailViewRows>[number];
+type UiSurface = SurfaceBuffer;
 
 const INLINE_THREAD_BUTTON_LABEL = '[+ thread]';
+const uiKit = new UiKit();
+
+function createUiSurface(cols: number, rows: number, style: UiStyle): UiSurface {
+  return new SurfaceBuffer(cols, rows, style);
+}
+
+function drawUiText(
+  surface: UiSurface,
+  col: number,
+  row: number,
+  text: string,
+  style: UiStyle,
+): void {
+  surface.drawText(col, row, text, style);
+}
+
+function fillUiRow(surface: UiSurface, row: number, style: UiStyle): void {
+  surface.fillRow(row, style);
+}
+
+function paintUiRow(
+  surface: UiSurface,
+  row: number,
+  text: string,
+  textStyle: UiStyle,
+  fillStyle: UiStyle,
+): void {
+  uiKit.paintRow(surface, row, text, textStyle, fillStyle);
+}
+
+function renderUiSurfaceAnsiRows(surface: UiSurface): readonly string[] {
+  return surface.renderAnsiRows();
+}
 
 function conversationStatusIconStyle(
   status: WorkspaceRailViewRow['conversationStatus'],
@@ -167,6 +198,14 @@ function paintWorkspaceRailRow(
     drawTreeRow(surface, rowIndex, row, theme, theme.metaStyle, theme.activeRowStyle);
     return;
   }
+  if (row.kind === 'github-header') {
+    drawTreeRow(surface, rowIndex, row, theme, theme.headerStyle, theme.activeRowStyle);
+    return;
+  }
+  if (row.kind === 'github-detail') {
+    drawTreeRow(surface, rowIndex, row, theme, theme.metaStyle, theme.activeRowStyle);
+    return;
+  }
   if (row.kind === 'conversation-title' || row.kind === 'conversation-body') {
     drawConversationRow(surface, rowIndex, row, theme);
     return;
@@ -191,22 +230,6 @@ function paintWorkspaceRailRow(
     paintUiRow(surface, rowIndex, row.text, theme.repositoryRowStyle, theme.normalStyle);
     return;
   }
-  if (row.kind === 'shortcut-header') {
-    const buttonLabel = row.text.endsWith('[+]') ? '[+]' : row.text.endsWith('[-]') ? '[-]' : null;
-    if (buttonLabel === null) {
-      drawTreeRow(surface, rowIndex, row, theme, theme.headerStyle, theme.activeRowStyle);
-    } else {
-      drawTreeRow(surface, rowIndex, row, theme, theme.headerStyle, theme.activeRowStyle, {
-        buttonLabel,
-        buttonStyle: theme.actionStyle,
-      });
-    }
-    return;
-  }
-  if (row.kind === 'shortcut-body') {
-    paintUiRow(surface, rowIndex, row.text, theme.shortcutStyle);
-    return;
-  }
   if (row.kind === 'action') {
     drawActionRow(surface, rowIndex, row, theme);
     return;

package/src/pty/session-broker.ts

@@ -124,7 +124,7 @@ class SingleSessionBroker {
     for (const handlers of this.attachments.values()) {
       handlers.onData({
         cursor: entry.cursor,
-        chunk: Buffer.from(fullChunk),
+        chunk: fullChunk,
       });
     }
   }

package/{scripts → src/recording}/terminal-recording-gif-lib.ts

@@ -1,8 +1,8 @@
 import { writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { createCanvas, type SKRSContext2D } from '@napi-rs/canvas';
-import type { TerminalSnapshotFrame } from '../src/terminal/snapshot-oracle.ts';
-import { readTerminalRecording } from '../src/recording/terminal-recording.ts';
+import type { TerminalSnapshotFrame } from '../terminal/snapshot-oracle.ts';
+import { readTerminalRecording } from './terminal-recording.ts';
 
 type GifEncPalette = number[][];
 type TerminalRecording = ReturnType<typeof readTerminalRecording>;