@meistrari/remy-cli 1.25.0 → 1.26.0-rc.0

package/README.md

@@ -40,6 +40,8 @@ On first use, Remy opens browser-based device authorization, validates your Codi
 
 Run `remy update` to install a newer CLI release using the package manager that owns your installation (mise, Bun, pnpm, or npm). No sign-in is required. Use `remy --version` to print the installed version.
 
+For mise installations, updates change the existing owning TOML or `.tool-versions` config to the exact new version and keep the previous installation available for running processes. Shared-cache npm installs are supported.
+
 Stable versions check npm’s `latest` channel. Release candidates check both `rc` and `latest` and choose the newer version; Remy never downgrades. To switch from stable to RC, use the explicit `@rc` install command above.
 
 Each interactive `remy` or `remy dashboard` startup checks for an update before sign-in or the splash. When one is available, type `y` or `yes`, then Enter, to upgrade. Press Enter or type `n` to continue with the current version. Lookup failures or a two-second timeout let startup continue. After a successful upgrade, Remy exits and asks you to run it again. Installation failures exit with an error so you can resolve the package-manager problem and retry.
@@ -68,7 +70,7 @@ The new-session request and conversation composers share path completion and att
 
 Terminal follow-ups default to **Steer**, targeting the work currently in progress. Press `Ctrl+Enter` to queue a message as **Next**, which waits for current work to finish. Plain `Enter` continues to send as Steer. Failed submissions retain their mode, attachments, settings, and idempotency key when retried with `Ctrl+R`. Remy can replay sessions containing queued-message dispatch, withdrawal, and failure events. Messages withdrawn or failed before reaching Remy show an activity notice; an active submission ends as cancelled or failed instead of waiting for a turn that never started.
 
-Use Up/Down to select a session in the dashboard, Left/Right to load the adjacent page, and `Enter` to open it. Remy loads the complete retained conversation before showing the session view, then streams new activity as it arrives. Press `s` to search the loaded page by session ID, title, or number; `Enter` keeps the search active and `Esc` clears it. Press `f` to filter sessions by lifecycle status or `a` to filter by author. Both pickers use checkboxes: Up/Down or `j`/`k` moves, `Space` toggles, Right/`l` checks, Left/`h` clears, `G` and `gg` jump to the last and first option, and `Enter` applies every checked value. An empty picker means all values. Press `s` inside either picker to fuzzy-search its options; `Enter` keeps the matching list and `Esc` cancels the search. Press `Esc` outside search to discard staged checkbox changes. Filters apply to the complete remote result set and reset pagination to its first page. After the dashboard list or repository-review list has focus, Vim keys work too: `j`/`k` move, `h`/`l` go to the previous/next dashboard page (or clear/mark a repository), `G` goes to the last row, and `gg` goes to the first row. Press `Shift+L` in the dashboard to start a logout confirmation. In any message composer, plain `Enter` and `Shift+Enter` submit; `Option+Enter` on macOS (`Alt+Enter` elsewhere) inserts a newline. `Ctrl+J` also inserts a newline for terminals that do not report the Option/Alt modifier. `Cmd+Left`/`Cmd+Right` move to the start or end of the current line, as do `Home`/`End`, which many macOS terminals send for those keys; `Ctrl+D` deletes the character after the cursor. In the session view, `Ctrl+C` first clears a non-empty draft; press it again with an empty composer to exit. The conversation header keeps the numbered session title on its first line and repository, pull request, work state, elapsed time, connection state, and the agent's current `Harness · Model · Effort` on its second line. The header also keeps the last provider-reported context observation across reconnects, such as `Context 50% left · 62,000 used`; when the provider does not report a context window, it shows only used tokens. This is an observation, not a live occupancy guarantee or billing total.
+Use Up/Down to select a session in the dashboard, Left/Right to load the adjacent page, and `Enter` to open it. Remy shows the session header and composer immediately after session details load, while retained conversation history loads in the background. You can start drafting immediately; sending is paused until history finishes, and your draft stays intact. New activity then streams as it arrives. Press `s` to fuzzy-search all accessible sessions through the API by author, repository, branch name, pull request title/number, or session number/ID/title; `Enter` applies immediately and keeps the search active; `Esc` clears it. Typing refreshes results after a short pause. Matching ignores case and query whitespace and finds characters in order within a field (for example, `grch` matches `Grace Hopper`); numbers also accept `#`. Search combines with your other filters and stays active across pages. Session rows and compact cards show the repository and session work branch (`Branch pending` when unassigned). Press `f` to filter sessions by lifecycle status, `a` by author, or `r` by repository. These pickers use checkboxes: Up/Down or `j`/`k` moves, `Space` toggles, Right/`l` checks, Left/`h` clears, `G` and `gg` jump to the last and first option, and `Enter` applies every checked value. An empty picker means all values. Press `s` inside a picker to fuzzy-search its options; `Enter` keeps the matching list and `Esc` cancels the search. Press `Esc` outside search to discard staged checkbox changes. Press `b` to filter by a case-insensitive part of a branch name; Enter applies it, an empty value clears it, and Esc discards edits. Repository and branch filters must match the same repository in a session. Filters apply to the complete remote result set and reset pagination to its first page. After the dashboard list or repository-review list has focus, Vim keys work too: `j`/`k` move, `h`/`l` go to the previous/next dashboard page (or clear/mark a repository), `G` goes to the last row, and `gg` goes to the first row. Press `Shift+L` in the dashboard to start a logout confirmation. In any message composer, plain `Enter` and `Shift+Enter` submit; `Option+Enter` on macOS (`Alt+Enter` elsewhere) inserts a newline. `Ctrl+J` also inserts a newline for terminals that do not report the Option/Alt modifier. `Cmd+Left`/`Cmd+Right` move to the start or end of the current line, as do `Home`/`End`, which many macOS terminals send for those keys; `Ctrl+D` deletes the character after the cursor. In the session view, `Ctrl+C` first clears a non-empty draft; press it again with an empty composer to exit. The conversation header keeps the numbered session title on its first line and repository, pull request, work state, elapsed time, connection state, and the agent's current `Harness · Model · Effort` on its second line. The header also keeps the last provider-reported context observation across reconnects, such as `Context 50% left · 62,000 used`; when the provider does not report a context window, it shows only used tokens. This is an observation, not a live occupancy guarantee or billing total.
 
 If a connected session loses its activity stream, Remy retries for up to two minutes and resumes from the last received event. After the live stream stays connected for at least 30 seconds, the next disconnect starts a fresh retry window. Connections that drop sooner share the existing window and backoff. While a submitted message is still awaiting its outcome, retries continue beyond that window.
 
@@ -98,7 +100,7 @@ Command and attachment feedback share progress, success, failure, and attention
 
 Enter `/compact` to admit a durable main-thread context compaction control without sending a human message. Remy reports request admission immediately and shows the eventual completed, no-op, failed, or unknown provider result in retained activity. Compaction waits for a safe point and does not interrupt active work or jump ahead of an earlier Next message. While admission is pending, you can keep editing or open other commands; repeated `/compact` invocations do not send another request.
 
-Drag to select visible text in any Remy view; Remy copies it to the local clipboard and emits OSC 52 for terminal or remote-session clipboard support, then clears the selection highlight. Published file artifacts show their filename and muted, full web preview URL; open the URL in a browser to select that artifact in its session. Tela Page rows retain their canonical Page URL. Downloads are explicit through `/files`; artifact bytes are never printed in the terminal. When the conversation has focus, press `Tab` to return to the composer.
+Drag to select visible text in any Remy view; Remy copies it to the local clipboard and emits OSC 52 for terminal or remote-session clipboard support, then clears the selection highlight. Published file artifacts show their filename and muted, full web preview URL; open the URL in a browser to select that artifact in its session. Tela Page rows retain their canonical Page URL. Downloads are explicit through `/files`; artifact bytes are never printed in the terminal. Clicking the conversation keeps keyboard focus in the composer. Mouse scrolling and drag-to-select still work. Code blocks and expanded code/output use colored text on a distinct background without copyable gutter bars or added line indentation.
 
 | Control | Result |
 | --- | --- |
@@ -129,7 +131,7 @@ After a session becomes terminal, press `Esc` to return to the dashboard or `n`
 
 `Shift+L` in the dashboard and `/logout` in a session ask for confirmation; press `y` to sign out or `Esc` to cancel. In the dashboard and repository-review list, Vim navigation is also available: `j`/`k` move, `h`/`l` change dashboard pages (or clear/mark a repository), `G` goes to the last row, and `gg` goes to the first row.
 
-Drag to select visible text in any Remy view; Remy copies it to the local clipboard and emits OSC 52 for terminal or remote-session clipboard support, then clears the selection highlight. When the conversation has focus, press `Tab` to return to the composer.
+Drag to select visible text in any Remy view; Remy copies it to the local clipboard and emits OSC 52 for terminal or remote-session clipboard support, then clears the selection highlight. Clicking the conversation keeps keyboard focus in the composer. Mouse scrolling and drag-to-select still work. Code blocks and expanded code/output use colored text on a distinct background without copyable gutter bars or added line indentation.
 
 </details>
 

package/dist/remy.js

@@ -33544,7 +33544,8 @@ var sessionDetailResponseSchema = exports_external2.object({
   }).passthrough()),
   repositories: exports_external2.array(exports_external2.strictObject({
     id: exports_external2.string(),
-    full_name: exports_external2.string()
+    full_name: exports_external2.string(),
+    branch_name: exports_external2.string().nullable().optional()
   })),
   connections: exports_external2.array(sessionConnectionSchema).max(1),
   artifacts: exports_external2.array(sessionArtifactSchema),
@@ -33594,7 +33595,8 @@ var sessionSummarySchema = exports_external2.object({
   source: sessionSourceSchema,
   repositories: exports_external2.array(exports_external2.strictObject({
     id: exports_external2.string(),
-    full_name: exports_external2.string()
+    full_name: exports_external2.string(),
+    branch_name: exports_external2.string().nullable().default(null)
   })),
   created_by: sessionCreatorSchema,
   created_at: exports_external2.string(),
@@ -33747,6 +33749,9 @@ async function listSessions({
   after,
   statuses,
   creatorUserIds,
+  repositoryIds,
+  branchName,
+  search,
   signal
 }) {
   const searchParams = new URLSearchParams;
@@ -33758,6 +33763,12 @@ async function listSessions({
     searchParams.append("status", status);
   for (const creatorUserId of creatorUserIds ?? [])
     searchParams.append("creator_user_id", creatorUserId);
+  for (const repositoryId of repositoryIds ?? [])
+    searchParams.append("repository_id", repositoryId);
+  if (branchName)
+    searchParams.set("branch_name", branchName);
+  if (search)
+    searchParams.set("search", search);
   const suffix = searchParams.size > 0 ? `?${searchParams.toString()}` : "";
   const response = await client.request(`/v1/sessions${suffix}`, { signal });
   const parsed = sessionListResponseSchema.safeParse(await parseJson2(response, "Session list response was not valid JSON."));
@@ -33777,7 +33788,7 @@ async function listSessions({
         draft: pullRequest.draft
       })),
       source: sessionSourceLabel(session.source),
-      repositories: session.repositories.map((repository) => ({ id: repository.id, fullName: repository.full_name })),
+      repositories: session.repositories.map((repository) => ({ id: repository.id, fullName: repository.full_name, branchName: repository.branch_name })),
       creator: sessionCreatorLabel(session.created_by),
       createdAt: session.created_at,
       updatedAt: session.updated_at
@@ -34592,17 +34603,23 @@ function formatSessionJson({
 `;
 }
 // src/version.ts
-var remyCliVersion = "1.25.0";
+var remyCliVersion = "1.26.0-rc.0";
 
 // src/self-update.ts
 import { spawn } from "child_process";
 import { realpath } from "fs/promises";
-import { join as join3, relative, isAbsolute } from "path";
+import { join as join3, isAbsolute } from "path";
 import { createInterface } from "readline/promises";
 var {semver } = globalThis.Bun;
 var packageName = "@meistrari/remy-cli";
 var versionSchema = exports_external2.string().regex(/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-rc\.(0|[1-9]\d*))?$/);
 var tagsSchema = exports_external2.object({ latest: versionSchema, rc: versionSchema.optional() });
+var miseInstallationsSchema = exports_external2.array(exports_external2.object({
+  install_path: exports_external2.string(),
+  active: exports_external2.boolean(),
+  installed: exports_external2.boolean(),
+  source: exports_external2.object({ type: exports_external2.string(), path: exports_external2.string() }).optional()
+}));
 function createCliUpdates({
   currentVersion,
   entryPath,
@@ -34650,11 +34667,26 @@ function createCliUpdates({
       };
       let argv;
       let updatedEntry = runningEntry;
-      const miseRoot = await probe(["mise", "where", `npm:${packageName}@${currentVersion}`]);
-      const miseRelative = miseRoot ? relative(miseRoot, runningEntry) : "";
-      const usesMise = miseRoot !== "" && miseRelative !== "" && !miseRelative.startsWith("..") && !isAbsolute(miseRelative);
+      const miseRoot = await probe(["mise", "where", `npm:${packageName}`]);
+      let miseRelative = "";
+      if (miseRoot) {
+        for (const layout of ["node_modules", "lib/node_modules"]) {
+          const candidate = join3(layout, packageName, "dist", "remy.js");
+          if (await matchesEntry(join3(miseRoot, candidate))) {
+            miseRelative = candidate;
+            break;
+          }
+        }
+      }
+      const usesMise = miseRelative !== "";
       if (usesMise) {
-        argv = ["mise", "upgrade", `npm:${packageName}@${version5}`, "--bump", "--no-prune"];
+        const lookup = await probe(["mise", "ls", `npm:${packageName}`, "--current", "--json"]);
+        const installations = lookup ? miseInstallationsSchema.parse(JSON.parse(lookup)) : [];
+        const owners = installations.filter((installation) => installation.active && installation.installed && installation.install_path === miseRoot);
+        const source = owners.length === 1 ? owners[0]?.source : undefined;
+        if (!source || !["mise.toml", ".tool-versions"].includes(source.type) || !isAbsolute(source.path))
+          throw new Error("Cannot identify the owning mise config for this Remy installation. Update it with mise directly, then retry remy --version.");
+        argv = ["mise", "use", "--path", source.path, "--pin", `npm:${packageName}@${version5}`];
       } else {
         const bunBin = await probe(["bun", "pm", "bin", "-g"]);
         if (bunBin && await matchesEntry(join3(bunBin, "remy"))) {
@@ -34679,7 +34711,7 @@ function createCliUpdates({
       if (result.exitCode !== 0)
         throw new Error(`Remy update failed: ${argv[0]} exited with code ${result.exitCode}. Resolve the package manager error and retry remy update.`);
       if (usesMise) {
-        const located = await runProcess({ argv: ["mise", "where", `npm:${packageName}@${version5}`], signal, display: false });
+        const located = await runProcess({ argv: ["mise", "where", `npm:${packageName}`], signal, display: false });
         if (located.exitCode !== 0 || !located.stdout.trim())
           throw new Error("Update finished but the new mise installation could not be located. Check remy --version before retrying.");
         updatedEntry = join3(located.stdout.trim(), miseRelative);
@@ -35071,6 +35103,7 @@ function createSessionViewState({ detail, activeMessageId }) {
     title: detail.title ?? null,
     aggregateStatus: detail.status,
     ...detail.agentStatus === undefined ? {} : { agentStatus: detail.agentStatus },
+    historyStatus: "ready",
     connectionStatus: "connected",
     pullRequest: toSessionPullRequest(detail),
     agent: toSessionAgentSettings(detail.agent),
@@ -36390,19 +36423,22 @@ function createRemoteSessionController(dependencies) {
     ready = new Promise((resolve) => {
       resolveReady = resolve;
     });
+    state = { ...createSessionViewState({ detail: input.detail, activeMessageId: dependencies.activeMessageId }), historyStatus: "loading" };
     const cache = await readSessionCache(cachePath).catch((error93) => {
       handleCacheError(error93);
       return null;
     });
     cachedLastRetainedEventId = input.mode === "live" ? input.lastRetainedEventId ?? cache?.lastRetainedEventId : undefined;
-    state = createSessionViewState({
-      detail: input.detail,
-      activeMessageId: dependencies.activeMessageId ?? cache?.activeMessageId
-    });
+    if (stopped)
+      return;
+    state = { ...getState(), activeMessageId: dependencies.activeMessageId ?? cache?.activeMessageId };
     if (input.mode === "cold-resume") {
       const hydrationGeneration = beginReasoningAttempt();
       await hydrateRetainedHistoryFromBeginning(hydrationGeneration);
     }
+    if (stopped)
+      return;
+    state = { ...getState(), historyStatus: "ready" };
     resolveReady();
     publishState();
     try {
@@ -37746,7 +37782,7 @@ function createWorkspaceController({ client, sessionId, signal, operations = {},
       }
       return;
     }
-    if (selection.kind !== "changes" && selection.repositoryId !== event.repositoryId)
+    if (event.kind !== "turn-ended" && selection.kind !== "changes" && selection.repositoryId !== event.repositoryId)
       return;
     if (event.kind === "initialized") {
       if (initializedRepositories.has(event.repositoryId))
@@ -37784,10 +37820,10 @@ import { BoxRenderable as BoxRenderable2, TextRenderable, TextareaRenderable } f
 import { dim as dim2, fg as fg3, StyledText as StyledText4 } from "@opentui/core";
 
 // src/tui/theme.ts
-import { bold, dim, fg as fg2, stringToStyledText, StyledText as StyledText3 } from "@opentui/core";
+import { bg as bg2, bold, dim, fg as fg2, stringToStyledText, StyledText as StyledText3 } from "@opentui/core";
 
 // src/tui/markdown.ts
-import { fg, StyledText as StyledText2, TextAttributes as TextAttributes2 } from "@opentui/core";
+import { bg, fg, StyledText as StyledText2, TextAttributes as TextAttributes2 } from "@opentui/core";
 
 // ../../node_modules/.bun/marked@17.0.1/node_modules/marked/lib/marked.esm.js
 function L() {
@@ -39254,7 +39290,7 @@ function renderCodeBlock(token, palette) {
 `)) {
     chunks.push(plain(`
 `, { color: palette.body, attributes: 0 }));
-    chunks.push(plain("\u2502 ", { color: palette.codeBar, attributes: 0 }), plain(line, { color: palette.code, attributes: 0 }));
+    chunks.push(plain(line, { color: palette.code, background: palette.codeBackground, attributes: 0 }));
   }
   return chunks;
 }
@@ -39347,6 +39383,8 @@ function trimTrailingNewlines(chunks) {
 }
 function plain(text, style) {
   const chunk = fg(style.color)(text);
+  if (style.background)
+    chunk.bg = bg(style.background)(text).bg;
   if (style.attributes)
     chunk.attributes = style.attributes;
   if (style.link)
@@ -39364,6 +39402,7 @@ var PALETTE = {
   codeLabel: "#64748B",
   codeText: "#93C5FD",
   codeBar: "#475569",
+  codeBackground: "#20252E",
   reasoning: "#C084FC",
   progress: "#60A5FA",
   tool: "#22D3EE",
@@ -39519,7 +39558,7 @@ function renderFencedCodeBody(text) {
 `)) {
       chunks.push(...stringToStyledText(`
 `).chunks);
-      chunks.push(fg2(PALETTE.codeBar)("\u2502 "), fg2(PALETTE.codeText)(line));
+      chunks.push(bg2(PALETTE.codeBackground)(fg2(PALETTE.codeText)(line)));
     }
     cursor = start + fence.length;
   }
@@ -39539,7 +39578,8 @@ function renderFormattedMessageBody(text, role2) {
     muted: PALETTE.dimText,
     code: PALETTE.codeText,
     codeLabel: PALETTE.codeLabel,
-    codeBar: PALETTE.codeBar
+    codeBar: PALETTE.codeBar,
+    codeBackground: PALETTE.codeBackground
   });
   if (formattedMessages.size >= FORMATTED_MESSAGE_CACHE_LIMIT)
     formattedMessages.delete(formattedMessages.keys().next().value);
@@ -39547,14 +39587,12 @@ function renderFormattedMessageBody(text, role2) {
   return formatted;
 }
 function renderCodeSnippet({ text, language = "code", indent = "" }) {
-  const gutter = `${indent}\u2502 `;
   return new StyledText3([
     ...indent ? [dim(fg2(PALETTE.dimText)(indent))] : [],
     dim(fg2(PALETTE.codeLabel)(language)),
     fg2(PALETTE.codeText)(`
-${gutter}${text.replaceAll(`
-`, `
-${gutter}`)}`)
+`),
+    bg2(PALETTE.codeBackground)(fg2(PALETTE.codeText)(text))
   ]);
 }
 function formatTime(occurredAt) {
@@ -39740,12 +39778,12 @@ function renderKeyHints({ hints, width }) {
 }
 
 // src/tui/selection.ts
-import { bg, bold as bold2, fg as fg5 } from "@opentui/core";
+import { bg as bg3, bold as bold2, fg as fg5 } from "@opentui/core";
 function selectionLabel({ text, checked }) {
   return checked ? bold2(fg5(PALETTE.humanAccent)(text)) : fg5(PALETTE.dimText)(text);
 }
 function highlightSelection({ chunks, cursor }) {
-  return cursor ? chunks.map((chunk) => bg(PALETTE.selectionBg)(chunk)) : chunks;
+  return cursor ? chunks.map((chunk) => bg3(PALETTE.selectionBg)(chunk)) : chunks;
 }
 
 // src/tui/renderer.ts
@@ -40638,7 +40676,9 @@ var lifecycleStatusOptions = [
 ];
 async function createDashboardTui({
   initialPage,
-  initialFilters = { statuses: [], creators: [] },
+  initialFilters = { statuses: [], creators: [], repositories: [], branchName: "" },
+  repositories: initialRepositories = [],
+  loadRepositories,
   authors: initialAuthors = [],
   loadAuthors,
   loadPage,
@@ -40649,23 +40689,27 @@ async function createDashboardTui({
   let keyHandler;
   let resizeHandler;
   let refreshTimer;
+  let searchTimer;
   let contentScrollHandler;
   let rendererDestroyed2 = false;
   const loadPageAbortController = new AbortController;
   try {
     let stopPageRefresh = function() {
+      clearTimeout(searchTimer);
       if (refreshTimer !== undefined) {
         clearInterval(refreshTimer);
         refreshTimer = undefined;
       }
       loadPageAbortController.abort();
+    }, currentOptionState = function() {
+      return filterMode?.kind === "creator" || filterMode?.kind === "repository" ? optionStates[filterMode.kind] : undefined;
     }, render = function() {
       const contentWidth = Math.max(1, renderer.width - TUI_LAYOUT.dashboardGutter * 2);
-      const sessions = visibleDashboardSessions({ sessions: page.sessions, query: sessionSearchQuery });
+      const sessions = page.sessions.map((session) => prioritizeSessionMatches(session, filters, sessionSearchQuery));
       const rowsBelow = rowsBelowVisibleWindow({ sessionCount: sessions.length, selectedIndex, height: renderer.height });
       const isNarrow = renderer.width < TUI_LAYOUT.dashboardCardBreakpoint;
       const selectedSession = filterMode ? undefined : sessions[selectedIndex];
-      const sessionRows = filterMode ? formatFilterMenu({ mode: filterMode, authors, width: contentWidth }) : sessions.length === 0 ? stringToStyledText2(sessionSearchQuery ? "No sessions match the search." : hasActiveFilters(filters) ? "No sessions match the active filters." : "No remote sessions yet.") : isNarrow ? formatSessionCard({
+      const sessionRows = filterMode ? formatFilterMenu({ mode: filterMode, authors, repositories, width: contentWidth }) : sessions.length === 0 ? stringToStyledText2(sessionSearchQuery ? "No sessions match the search." : hasActiveFilters(filters) ? "No sessions match the active filters." : "No remote sessions yet.") : isNarrow ? formatSessionCard({
         session: selectedSession,
         selectedIndex,
         sessionCount: sessions.length,
@@ -40715,7 +40759,7 @@ async function createDashboardTui({
       else if (activeSearchComposer === "session")
         sessionSearchComposer.render();
       separator.content = activeSearchComposer ? "" : renderComposerDivider({ width: contentWidth });
-      footer.content = filterMode ? dashboardFilterFooter({ mode: filterMode, loadingPage, loadingAuthors, pageError, authorError, width: contentWidth }) : dashboardFooter({ loadingPage, pageError, rowsBelow, logoutConfirmationOpen, sessionSearchOpen, width: contentWidth });
+      footer.content = filterMode ? dashboardFilterFooter({ mode: filterMode, loadingPage, loadingOptions: currentOptionState()?.loading ?? false, pageError, optionError: currentOptionState()?.error, width: contentWidth }) : dashboardFooter({ loadingPage, pageError, rowsBelow, logoutConfirmationOpen, sessionSearchOpen, width: contentWidth });
       renderer.requestRender();
     }, finish = function(value) {
       if (settled)
@@ -40730,7 +40774,7 @@ async function createDashboardTui({
       stopPageRefresh();
       rejectDraft(error93);
     }, moveSelectionTo = function(index) {
-      const sessions = visibleDashboardSessions({ sessions: page.sessions, query: sessionSearchQuery });
+      const sessions = page.sessions;
       if (sessions.length === 0)
         return;
       selectedIndex = Math.max(0, Math.min(index, sessions.length - 1));
@@ -40738,6 +40782,10 @@ async function createDashboardTui({
     }, applyFilterSearch = function() {
       if (!filterMode?.searching)
         return;
+      if (filterMode.kind === "branch") {
+        applyFilters({ ...filters, statuses: filterMode.statuses, creators: filterMode.creators, repositories: filterMode.repositories, branchName: filterMode.query.trim() });
+        return;
+      }
       filterMode = { ...filterMode, searching: false, selectedIndex: 0 };
       filterSearchComposer.textarea.setText("");
       render();
@@ -40756,6 +40804,7 @@ async function createDashboardTui({
         return;
       sessionSearchOpen = false;
       selectedIndex = 0;
+      loadSessionSearch();
       render();
     }, cancelSessionSearch = function() {
       if (!sessionSearchOpen)
@@ -40764,6 +40813,7 @@ async function createDashboardTui({
       sessionSearchQuery = "";
       selectedIndex = 0;
       sessionSearchComposer.textarea.setText("");
+      loadSessionSearch();
       render();
     }, handleSessionKey = function(key) {
       if (logoutConfirmationOpen) {
@@ -40784,22 +40834,21 @@ async function createDashboardTui({
         return;
       }
       if (filterMode) {
-        const options = visibleDashboardFilterOptions({ mode: filterMode, authors });
+        const options = visibleDashboardFilterOptions({ mode: filterMode, authors, repositories });
         if (key.name === "escape") {
           key.preventDefault();
-          if (filterMode.searching) {
+          if (filterMode.searching && filterMode.kind !== "branch") {
             cancelFilterSearch();
             return;
           }
           filterMode = undefined;
           pageError = undefined;
-          authorError = undefined;
           render();
           return;
         }
         if (filterMode.searching)
           return;
-        if (loadingAuthors) {
+        if (currentOptionState()?.loading) {
           key.preventDefault();
           return;
         }
@@ -40836,7 +40885,7 @@ async function createDashboardTui({
           if (!option)
             return;
           const selected = key.name === "space" ? !isDashboardFilterOptionSelected({ mode: filterMode, option }) : key.name === "right" || key.name === "l";
-          filterMode = updateDashboardFilterSelection({ mode: filterMode, option, selected, authors });
+          filterMode = updateDashboardFilterSelection({ mode: filterMode, option, selected, authors, repositories });
           render();
           return;
         }
@@ -40849,7 +40898,7 @@ async function createDashboardTui({
         }
         if (key.name === "return" || key.name === "enter") {
           key.preventDefault();
-          const nextFilters = { statuses: [...filterMode.statuses], creators: [...filterMode.creators] };
+          const nextFilters = { ...filters, statuses: [...filterMode.statuses], creators: [...filterMode.creators], repositories: [...filterMode.repositories], branchName: filterMode.branchName };
           applyFilters(nextFilters);
         }
         return;
@@ -40882,7 +40931,7 @@ async function createDashboardTui({
       if (listFocused && (key.name === "G" || key.name === "g" && key.shift)) {
         key.preventDefault();
         awaitingVimGoToTop = false;
-        moveSelectionTo(visibleDashboardSessions({ sessions: page.sessions, query: sessionSearchQuery }).length - 1);
+        moveSelectionTo(page.sessions.length - 1);
         return;
       }
       if (listFocused && key.name === "g") {
@@ -40907,7 +40956,9 @@ async function createDashboardTui({
       awaitingVimGoToTop = false;
       if (key.name === "return" || key.name === "enter") {
         key.preventDefault();
-        const session = visibleDashboardSessions({ sessions: page.sessions, query: sessionSearchQuery })[selectedIndex];
+        if (loadingPage || sessionSearchQuery.trim() !== (filters.search ?? ""))
+          return;
+        const session = page.sessions[selectedIndex];
         if (session)
           finish({ kind: "session", sessionId: session.id });
         return;
@@ -40922,13 +40973,27 @@ async function createDashboardTui({
         openSessionSearch();
         return;
       }
+      if (["f", "a", "r", "b"].includes(key.name) && (loadingPage || sessionSearchQuery.trim() !== (filters.search ?? "")))
+        return;
       if (key.name === "f") {
         key.preventDefault();
-        authorError = undefined;
         filterMode = createFilterMode({ kind: "status", filters });
         render();
         return;
       }
+      if (key.name === "r" || key.name === "b") {
+        key.preventDefault();
+        filterMode = createFilterMode({ kind: key.name === "r" ? "repository" : "branch", filters });
+        if (filterMode.kind === "branch") {
+          filterMode.searching = true;
+          filterMode.query = filters.branchName;
+          filterSearchComposer.textarea.setText(filters.branchName);
+        }
+        render();
+        if (key.name === "r")
+          loadRepositoryOptions();
+        return;
+      }
       if (key.name === "a") {
         key.preventDefault();
         openAuthorFilter();
@@ -40971,17 +41036,22 @@ async function createDashboardTui({
     let selectedIndex = 0;
     let loadingPage = false;
     let pageRequestInFlight = false;
+    let pageRequestVersion = 0;
     let pageError;
-    let authorError;
+    const optionStates = {
+      creator: { loading: false, error: undefined },
+      repository: { loading: false, error: undefined }
+    };
+    let repositories = initialRepositories;
+    let repositoriesLoaded = loadRepositories === undefined || initialRepositories.length > 0;
     let authors = initialAuthors;
     let authorsLoaded = loadAuthors === undefined || initialAuthors.length > 0;
-    let loadingAuthors = false;
     let awaitingVimGoToTop = false;
     let logoutConfirmationOpen = false;
     let filters = initialFilters;
     let filterMode;
     let sessionSearchOpen = false;
-    let sessionSearchQuery = "";
+    let sessionSearchQuery = initialFilters.search ?? "";
     root.onMouseDown = (event) => {
       if (filterMode?.searching || sessionSearchOpen)
         return;
@@ -41021,7 +41091,7 @@ async function createDashboardTui({
       renderer,
       parent: filterSearchRegion,
       tag: "Search",
-      placeholder: "Search by ID, title, or number\u2026",
+      placeholder: "Search sessions, authors, repositories, branches, or PRs\u2026",
       screenPaddingX: 2,
       onSubmit: () => applySessionSearch(),
       onContentChange: () => {
@@ -41029,104 +41099,151 @@ async function createDashboardTui({
           return;
         sessionSearchQuery = sessionSearchComposer.textarea.plainText;
         selectedIndex = 0;
+        pageRequestVersion += 1;
+        loadingPage = true;
+        clearTimeout(searchTimer);
+        searchTimer = setTimeout(() => {
+          searchTimer = undefined;
+          loadSessionSearch();
+        }, 200);
         render();
       }
     });
     async function loadAdjacentPage(direction) {
-      if (pageRequestInFlight)
+      if (pageRequestInFlight || loadingPage || sessionSearchQuery.trim() !== (filters.search ?? ""))
         return;
       const canLoad = direction === "next" ? page.hasMore : page.canGoPrevious;
       if (!canLoad)
         return;
+      const requestVersion = ++pageRequestVersion;
       pageRequestInFlight = true;
       loadingPage = true;
       pageError = undefined;
       render();
       try {
         const loadedPage = await loadPage({ target: direction, signal: loadPageAbortController.signal });
-        if (destroyed || settled)
+        if (destroyed || settled || requestVersion !== pageRequestVersion)
           return;
         page = loadedPage;
         pageIndex = Math.max(1, pageIndex + (direction === "next" ? 1 : -1));
-        const sessions = visibleDashboardSessions({ sessions: page.sessions, query: sessionSearchQuery });
+        const sessions = page.sessions;
         selectedIndex = direction === "next" ? 0 : Math.max(0, sessions.length - 1);
       } catch (error93) {
-        if (!destroyed && !settled)
+        if (!destroyed && !settled && requestVersion === pageRequestVersion)
           pageError = error93 instanceof Error ? error93.message : String(error93);
       } finally {
-        pageRequestInFlight = false;
-        loadingPage = false;
-        if (!destroyed && !settled)
-          render();
+        if (requestVersion === pageRequestVersion) {
+          pageRequestInFlight = false;
+          loadingPage = false;
+          if (!destroyed && !settled)
+            render();
+        }
       }
     }
     async function refreshCurrentPage() {
-      if (pageRequestInFlight || destroyed || settled)
+      if (pageRequestInFlight || loadingPage || destroyed || settled || sessionSearchQuery.trim() !== (filters.search ?? ""))
         return;
+      const requestVersion = ++pageRequestVersion;
       pageRequestInFlight = true;
       try {
         const refreshedPage = await loadPage({ target: "current", signal: loadPageAbortController.signal });
-        if (destroyed || settled)
+        if (destroyed || settled || requestVersion !== pageRequestVersion)
           return;
-        const selectedSessionId = visibleDashboardSessions({ sessions: page.sessions, query: sessionSearchQuery })[selectedIndex]?.id;
+        const selectedSessionId = page.sessions[selectedIndex]?.id;
         page = refreshedPage;
-        const refreshedSelectedIndex = selectedSessionId ? visibleDashboardSessions({ sessions: page.sessions, query: sessionSearchQuery }).findIndex((session) => session.id === selectedSessionId) : -1;
+        const refreshedSelectedIndex = selectedSessionId ? page.sessions.findIndex((session) => session.id === selectedSessionId) : -1;
         selectedIndex = refreshedSelectedIndex >= 0 ? refreshedSelectedIndex : Math.max(0, Math.min(selectedIndex, page.sessions.length - 1));
         pageError = undefined;
         render();
       } catch (error93) {
-        if (!destroyed && !settled) {
+        if (!destroyed && !settled && requestVersion === pageRequestVersion) {
           pageError = error93 instanceof Error ? error93.message : String(error93);
           render();
         }
       } finally {
-        pageRequestInFlight = false;
+        if (requestVersion === pageRequestVersion)
+          pageRequestInFlight = false;
       }
     }
     async function applyFilters(nextFilters) {
-      if (loadingPage)
-        return;
+      const appliedFilterMode = filterMode;
+      const requestVersion = ++pageRequestVersion;
+      pageRequestInFlight = true;
       loadingPage = true;
       pageError = undefined;
-      authorError = undefined;
       render();
       try {
-        page = await loadPage({ filters: nextFilters, signal: loadPageAbortController.signal });
+        const loadedPage = await loadPage({ filters: nextFilters, signal: loadPageAbortController.signal });
+        if (destroyed || settled || requestVersion !== pageRequestVersion)
+          return;
+        page = loadedPage;
         filters = nextFilters;
         pageIndex = 1;
         selectedIndex = 0;
-        filterMode = undefined;
+        if (filterMode === appliedFilterMode)
+          filterMode = undefined;
       } catch (error93) {
-        pageError = error93 instanceof Error ? error93.message : String(error93);
+        if (!destroyed && !settled && requestVersion === pageRequestVersion)
+          pageError = error93 instanceof Error ? error93.message : String(error93);
       } finally {
-        loadingPage = false;
-        render();
+        if (requestVersion === pageRequestVersion) {
+          pageRequestInFlight = false;
+          loadingPage = false;
+          if (!destroyed && !settled)
+            render();
+        }
+      }
+    }
+    async function loadRepositoryOptions() {
+      if (repositoriesLoaded || optionStates.repository.loading || !loadRepositories)
+        return;
+      optionStates.repository.loading = true;
+      optionStates.repository.error = undefined;
+      render();
+      try {
+        const loaded = await loadRepositories();
+        if (destroyed || settled)
+          return;
+        repositories = loaded;
+        repositoriesLoaded = true;
+      } catch (error93) {
+        if (!destroyed && !settled)
+          optionStates.repository.error = error93 instanceof Error ? error93.message : String(error93);
+      } finally {
+        optionStates.repository.loading = false;
+        if (!destroyed && !settled)
+          render();
       }
     }
     async function openAuthorFilter() {
       filterMode = createFilterMode({ kind: "creator", filters });
-      authorError = undefined;
+      optionStates.creator.error = undefined;
       render();
-      if (authorsLoaded || loadingAuthors || !loadAuthors)
+      if (authorsLoaded || optionStates.creator.loading || !loadAuthors)
         return;
-      loadingAuthors = true;
+      optionStates.creator.loading = true;
       render();
       try {
-        authors = await loadAuthors();
+        const loaded = await loadAuthors();
+        if (destroyed || settled)
+          return;
+        authors = loaded;
         authorsLoaded = true;
         if (filterMode?.kind === "creator") {
           const firstSelectedIndex = authors.findIndex((author) => filterMode?.creators.some((creator) => creator.id === author.id));
           filterMode = { ...filterMode, selectedIndex: Math.max(0, firstSelectedIndex) };
         }
       } catch (error93) {
-        authorError = error93 instanceof Error ? error93.message : String(error93);
+        if (!destroyed && !settled)
+          optionStates.creator.error = error93 instanceof Error ? error93.message : String(error93);
       } finally {
-        loadingAuthors = false;
-        render();
+        optionStates.creator.loading = false;
+        if (!destroyed && !settled)
+          render();
       }
     }
     async function moveSelection(direction) {
-      const sessions = visibleDashboardSessions({ sessions: page.sessions, query: sessionSearchQuery });
+      const sessions = page.sessions;
       if (loadingPage || sessions.length === 0)
         return;
       const isBoundary = direction === "next" ? selectedIndex === sessions.length - 1 : selectedIndex === 0;
@@ -41137,6 +41254,12 @@ async function createDashboardTui({
       }
       await loadAdjacentPage(direction);
     }
+    async function loadSessionSearch() {
+      clearTimeout(searchTimer);
+      searchTimer = undefined;
+      const search = sessionSearchQuery.trim();
+      await applyFilters({ ...filters, search: search || undefined });
+    }
     inputHandler = (sequence) => {
       if (sequence === "\x03") {
         finish({ kind: "interrupt" });
@@ -41215,7 +41338,8 @@ function formatSessionRow({ session, selected, width }) {
   const title = truncateText(session.title ?? "Untitled session", Math.max(8, Math.min(40, Math.floor(width * 0.24))));
   const attribution = `${session.creator} (${session.source})`;
   const metadataWidth = Math.max(0, width - Bun.stringWidth(prefix + title + activity.label) - 4);
-  const metadata = truncateText(`${attribution} \xB7 ${outcome} \xB7 ${updated}`, metadataWidth);
+  const work = session.repositories.length > 0 ? `${sessionRepositoryBranches(session, Math.max(0, Math.floor(metadataWidth * 0.6)))} \xB7 ` : "";
+  const metadata = truncateText(`${work}${attribution} \xB7 ${outcome} \xB7 ${updated}`, metadataWidth);
   const line = [
     fg7(PALETTE.dimText)(prefix),
     fg7(PALETTE.bodyText)(title),
@@ -41243,14 +41367,18 @@ function createFilterMode({ kind, filters }) {
     selectedIndex: 0,
     statuses: [...filters.statuses],
     creators: [...filters.creators],
+    repositories: [...filters.repositories],
+    branchName: filters.branchName,
     query: "",
     searching: false
   };
 }
-function formatFilterMenu({ mode, authors, width }) {
-  const options = visibleDashboardFilterOptions({ mode, authors });
-  const selectedCount = mode.kind === "status" ? mode.statuses.length : mode.creators.length;
-  const heading = `${mode.kind === "status" ? "Filter by status" : "Filter by author"} \xB7 ${selectedCount} selected \xB7 empty shows all`;
+function formatFilterMenu({ mode, authors, repositories, width }) {
+  if (mode.kind === "branch")
+    return stringToStyledText2("Filter by branch \xB7 contains text \xB7 empty shows all");
+  const options = visibleDashboardFilterOptions({ mode, authors, repositories });
+  const selectedCount = mode.kind === "status" ? mode.statuses.length : mode.kind === "repository" ? mode.repositories.length : mode.creators.length;
+  const heading = `${mode.kind === "status" ? "Filter by status" : mode.kind === "repository" ? "Filter by repository" : "Filter by author"} \xB7 ${selectedCount} selected \xB7 empty shows all`;
   const rows = options.map((option, index) => {
     const active = isDashboardFilterOptionSelected({ mode, option });
     const label = `${active ? "[x]" : "[ ]"} ${truncateText(option.label, Math.max(1, width - 4))}`;
@@ -41265,16 +41393,16 @@ function formatFilterMenu({ mode, authors, width }) {
   ], `
 `);
 }
-function dashboardFilterOptions({ kind, authors }) {
-  return kind === "status" ? lifecycleStatusOptions.map((option) => ({ kind: "status", id: option.value, label: option.label })) : authors.map((author) => ({ kind: "creator", id: author.id, label: author.name }));
+function dashboardFilterOptions({ kind, authors, repositories }) {
+  return kind === "status" ? lifecycleStatusOptions.map((option) => ({ kind: "status", id: option.value, label: option.label })) : kind === "repository" ? repositories.map((repository) => ({ kind: "repository", id: repository.id, label: repository.fullName })) : authors.map((author) => ({ kind: "creator", id: author.id, label: author.name }));
 }
-function visibleDashboardFilterOptions({ mode, authors }) {
-  return dashboardFilterOptions({ kind: mode.kind, authors }).filter((option) => fuzzyMatches(option.label, mode.query));
+function visibleDashboardFilterOptions({ mode, authors, repositories }) {
+  return dashboardFilterOptions({ kind: mode.kind, authors, repositories }).filter((option) => fuzzyMatches(option.label, mode.query));
 }
 function isDashboardFilterOptionSelected({ mode, option }) {
-  return option.kind === "status" ? mode.statuses.includes(option.id) : mode.creators.some((creator) => creator.id === option.id);
+  return option.kind === "status" ? mode.statuses.includes(option.id) : option.kind === "repository" ? mode.repositories.some((repository) => repository.id === option.id) : mode.creators.some((creator) => creator.id === option.id);
 }
-function updateDashboardFilterSelection({ mode, option, selected, authors }) {
+function updateDashboardFilterSelection({ mode, option, selected, authors, repositories }) {
   if (option.kind === "status") {
     const selectedStatuses = new Set(mode.statuses);
     if (selected)
@@ -41286,6 +41414,14 @@ function updateDashboardFilterSelection({ mode, option, selected, authors }) {
       statuses: lifecycleStatusOptions.map((entry2) => entry2.value).filter((status) => selectedStatuses.has(status))
     };
   }
+  if (option.kind === "repository") {
+    const ids = new Set(mode.repositories.map((repository) => repository.id));
+    if (selected)
+      ids.add(option.id);
+    else
+      ids.delete(option.id);
+    return { ...mode, repositories: repositories.filter((repository) => ids.has(repository.id)).map(({ id, fullName }) => ({ id, fullName })) };
+  }
   const selectedCreatorIds = new Set(mode.creators.map((creator) => creator.id));
   if (selected)
     selectedCreatorIds.add(option.id);
@@ -41313,7 +41449,7 @@ function formatSessionPreview({ session, width }) {
       fg7(PALETTE.dimText)(" \xB7 "),
       bold3(fg7(activity.color)(activity.label))
     ],
-    [fg7(PALETTE.dimText)(truncateText(`Work: ${sessionWork(session)}`, width))],
+    [fg7(PALETTE.dimText)(truncateText(`Work: ${sessionWork(session, width)}`, width))],
     [fg7(PALETTE.bodyText)(truncateText(`Outcome: ${sessionOutcome(session)}`, width))],
     [fg7(PALETTE.dimText)(truncateText(`Created by: ${session.creator} \xB7 Updated ${formatUpdatedAt(session.updatedAt ?? session.createdAt)}`, width))]
   ], `
@@ -41324,7 +41460,7 @@ function formatSessionCard({ session, selectedIndex, sessionCount, width }) {
   const lines = [
     `Session #${session.sessionNumber} \xB7 ${selectedIndex + 1} of ${sessionCount}`,
     truncateText(session.title ?? "Untitled session", width),
-    truncateText(`Work: ${sessionWork(session)}`, width),
+    truncateText(`Work: ${sessionWork(session, width)}`, width),
     `Now: ${activity.label}`,
     truncateText(`Outcome: ${sessionOutcome(session)}`, width),
     truncateText(`Created by: ${session.creator} \xB7 Updated ${formatUpdatedAt(session.updatedAt ?? session.createdAt)}`, width)
@@ -41357,9 +41493,33 @@ function sessionActivityPresentation(session) {
     return { ...agent, label: "Ready" };
   return agent;
 }
-function sessionWork(session) {
-  const repositories = session.repositories.map((repository) => repository.fullName).join(", ") || "No repository selected";
-  return `${repositories} \xB7 ${session.source}`;
+function prioritizeSessionMatches(session, filters, query) {
+  const filteredRepositories = session.repositories.filter((repository2) => (filters.repositories.length === 0 || filters.repositories.some((selected) => selected.id === repository2.id)) && (!filters.branchName || repository2.branchName?.toLowerCase().includes(filters.branchName.toLowerCase())));
+  const repository = filteredRepositories.find((repository2) => fuzzyMatches(repository2.fullName, query) || fuzzyMatches(repository2.branchName ?? "", query)) ?? filteredRepositories[0];
+  const pullRequest = session.pullRequests.find((pullRequest2) => matchesPullRequestSearch(pullRequest2, query));
+  return {
+    ...session,
+    repositories: repository ? [repository, ...session.repositories.filter((item) => item !== repository)] : session.repositories,
+    pullRequests: pullRequest ? [pullRequest, ...session.pullRequests.filter((item) => item !== pullRequest)] : session.pullRequests
+  };
+}
+function matchesPullRequestSearch(pullRequest, query) {
+  return fuzzyMatches(`#${pullRequest.number}`, query) || fuzzyMatches(pullRequest.title, query);
+}
+function sessionRepositoryBranches(session, width) {
+  const repository = session.repositories[0];
+  if (!repository)
+    return truncateText("No repository selected", width);
+  const more = session.repositories.length > 1 ? ` +${session.repositories.length - 1}` : "";
+  const available = Math.max(0, width - Bun.stringWidth(more) - 3);
+  const name = truncateText(repository.fullName, Math.floor(available / 2));
+  const branch = truncateText(repository.branchName ?? "Branch pending", Math.max(0, available - Bun.stringWidth(name)));
+  return `${name} \xB7 ${branch}${more}`;
+}
+function sessionWork(session, width) {
+  const source = truncateText(session.source, Math.floor(width / 4));
+  const repositories = sessionRepositoryBranches(session, Math.max(0, width - Bun.stringWidth(source) - 9));
+  return `${repositories} \xB7 ${source}`;
 }
 function sessionOutcome(session) {
   const first = session.pullRequests[0];
@@ -41382,14 +41542,8 @@ function formatUpdatedAt(value) {
     return `${Math.floor(seconds / (60 * 60))}h ago`;
   return new Date(milliseconds).toLocaleDateString(undefined, { month: "short", day: "numeric" });
 }
-function matchesSessionSearch({ session, query }) {
-  return fuzzyMatches(session.id, query) || fuzzyMatches(session.title ?? "", query) || fuzzyMatches(String(session.sessionNumber), query);
-}
-function visibleDashboardSessions({ sessions, query }) {
-  return sessions.filter((session) => matchesSessionSearch({ session, query }));
-}
 function dashboardStatusBand({ page, pageIndex, filters, sessionSearchQuery }) {
-  const openCount = visibleDashboardSessions({ sessions: page.sessions, query: sessionSearchQuery }).filter((session) => session.status === "open").length;
+  const openCount = page.sessions.filter((session) => session.status === "open").length;
   const paging = [`page ${pageIndex}`];
   if (page.canGoPrevious)
     paging.push("\u2190 prev");
@@ -41398,12 +41552,14 @@ function dashboardStatusBand({ page, pageIndex, filters, sessionSearchQuery }) {
   const activeFilters = [
     filters.statuses.length > 0 ? `status: ${filters.statuses.map(sessionStatusLabel).join(", ")}` : undefined,
     filters.creators.length > 0 ? `author: ${filters.creators.map((creator) => creator.name).join(", ")}` : undefined,
+    filters.repositories.length > 0 ? `repo: ${filters.repositories.map((repository) => repository.fullName).join(", ")}` : undefined,
+    filters.branchName ? `branch: ${filters.branchName}` : undefined,
     sessionSearchQuery ? `search: ${sessionSearchQuery}` : undefined
   ].filter((value) => value !== undefined);
   return `remy \xB7 sessions \xB7 ${openCount} open${activeFilters.length > 0 ? ` \xB7 ${activeFilters.join(" \xB7 ")}` : ""} \xB7 ${paging.join(" \xB7 ")}`;
 }
 function hasActiveFilters(filters) {
-  return filters.statuses.length > 0 || filters.creators.length > 0;
+  return filters.statuses.length > 0 || filters.creators.length > 0 || filters.repositories.length > 0 || filters.branchName.length > 0;
 }
 function dashboardFooter({ loadingPage, pageError, rowsBelow, logoutConfirmationOpen, sessionSearchOpen, width }) {
   if (logoutConfirmationOpen)
@@ -41419,19 +41575,24 @@ function dashboardFooter({ loadingPage, pageError, rowsBelow, logoutConfirmation
     parts.push(`\u2193 ${rowsBelow} more below`);
   return joinStyled([
     ...parts.length > 0 ? [[fg7(pageError ? PALETTE.failure : PALETTE.dimText)(parts.join(" \xB7 "))]] : [],
-    renderKeyHints({ hints: [{ key: "\u2191\u2193", action: "move" }, { key: "\u23CE", action: "open" }, { key: "s", action: "search" }, { key: "f", action: "status" }, { key: "a", action: "author" }, { key: "n", action: "new session" }, { key: "\u21E7l", action: "log out" }, { key: "q", action: "quit" }], width })
+    renderKeyHints({ hints: [{ key: "\u2191\u2193", action: "move" }, { key: "\u23CE", action: "open" }, { key: "s", action: "search" }, { key: "f", action: "status" }, { key: "a", action: "author" }, { key: "r", action: "repository" }, { key: "b", action: "branch" }, { key: "n", action: "new session" }, { key: "\u21E7l", action: "log out" }, { key: "q", action: "quit" }], width })
   ], `
 `);
 }
-function dashboardFilterFooter({ mode, loadingPage, loadingAuthors, pageError, authorError, width }) {
-  if (loadingAuthors)
-    return joinStyled([[fg7(PALETTE.progress)("Loading authors\u2026")], renderKeyHints({ hints: [{ key: "Esc", action: "cancel" }], width })], " \xB7 ");
+function dashboardFilterFooter({ mode, loadingPage, loadingOptions, pageError, optionError, width }) {
+  if (loadingOptions)
+    return joinStyled([[fg7(PALETTE.progress)("Loading filter options\u2026")], renderKeyHints({ hints: [{ key: "Esc", action: "cancel" }], width })], " \xB7 ");
   if (loadingPage)
     return stringToStyledText2("Applying filter\u2026");
-  if (mode.searching)
-    return renderKeyHints({ hints: [{ key: "type", action: "to filter" }, { key: "\u23CE", action: "apply search" }, { key: "Esc", action: "cancel search" }], width });
+  if (mode.searching) {
+    return joinStyled([
+      ...pageError ? [[fg7(PALETTE.failure)(`Could not apply filter: ${pageError}`)]] : [],
+      renderKeyHints({ hints: [{ key: "type", action: "to filter" }, { key: "\u23CE", action: mode.kind === "branch" ? "apply branch" : "apply search" }, { key: "Esc", action: "cancel" }], width })
+    ], `
+`);
+  }
   return joinStyled([
-    ...authorError ? [[fg7(PALETTE.failure)(`Could not load authors: ${authorError}`)]] : [],
+    ...optionError ? [[fg7(PALETTE.failure)(`Could not load filter options: ${optionError}`)]] : [],
     ...pageError ? [[fg7(PALETTE.failure)(`Could not apply filter: ${pageError}`)]] : [],
     renderKeyHints({ hints: [{ key: "\u2191\u2193/jk", action: "move" }, { key: "space", action: "toggle" }, { key: "\u2190\u2192/hl", action: "mark" }, { key: "s", action: "search" }, { key: "\u23CE", action: "apply" }, { key: "Esc", action: "cancel" }], width })
   ], `
@@ -41442,7 +41603,7 @@ async function createDefaultRenderer() {
 }
 
 // src/tui/new-session-wizard.ts
-import { bg as bg2, bold as bold4, CliRenderEvents as CliRenderEvents4, dim as dim6, fg as fg11, StyledText as StyledText10, stringToStyledText as stringToStyledText3, TextRenderable as TextRenderable4 } from "@opentui/core";
+import { bg as bg4, bold as bold4, CliRenderEvents as CliRenderEvents4, dim as dim6, fg as fg11, StyledText as StyledText10, stringToStyledText as stringToStyledText3, TextRenderable as TextRenderable4 } from "@opentui/core";
 
 // src/tui/attachment-presentation.ts
 import { dim as dim4, fg as fg9, StyledText as StyledText8 } from "@opentui/core";
@@ -41492,7 +41653,7 @@ var SPINNER_INTERVAL_MS = 80;
 // src/tui/path-completion.ts
 import { readdir } from "fs/promises";
 import { homedir } from "os";
-import { basename as basename5, dirname as dirname5, isAbsolute as isAbsolute2, join as join8, relative as relative2, resolve as resolve2, sep } from "path";
+import { basename as basename5, dirname as dirname5, isAbsolute as isAbsolute2, join as join8, relative, resolve as resolve2, sep } from "path";
 var maximumCandidates = 50;
 async function completePathToken({ text, cwd, homeDirectory = homedir() }) {
   const token = activePathToken(text);
@@ -41512,7 +41673,7 @@ async function completePathToken({ text, cwd, homeDirectory = homedir() }) {
   }
   return entries.filter((entry2) => entry2.name.toLowerCase().startsWith(prefix.toLowerCase())).sort((left, right) => left.name.localeCompare(right.name)).slice(0, maximumCandidates).map((entry2) => {
     const completedPath = join8(directory, entry2.name);
-    const replacementPath = pathUsesTilde ? `~/${relative2(homeDirectory, completedPath)}` : isAbsolute2(pathText) ? completedPath : relative2(cwd, completedPath) || entry2.name;
+    const replacementPath = pathUsesTilde ? `~/${relative(homeDirectory, completedPath)}` : isAbsolute2(pathText) ? completedPath : relative(cwd, completedPath) || entry2.name;
     const normalized = replacementPath.split(sep).join("/");
     const suffix = entry2.isDirectory() ? "/" : "";
     const completed = `${normalized}${suffix}`;
@@ -42920,7 +43081,7 @@ function renderStepIndicator({ step, hasInstallationChoice, hasBranchChoice = fa
 function renderSelectableRow({ label, isCursor }) {
   const line = `${isCursor ? "> " : "  "}${label}`;
   const styled = fg11(PALETTE.bodyText)(line);
-  return [isCursor ? bg2(PALETTE.selectionBg)(styled) : styled];
+  return [isCursor ? bg4(PALETTE.selectionBg)(styled) : styled];
 }
 function renderRepositoryRow({ repository, isCursor, isChecked, source }) {
   const marker = isChecked ? "[x]" : "[ ]";
@@ -42944,7 +43105,7 @@ async function createDefaultRenderer2() {
 }
 
 // src/tui/session-view.ts
-import { CliRenderEvents as CliRenderEvents5, bg as bg3, bold as bold5, dim as dim7, fg as fg12, link as link2, StyledText as StyledText11, stringToStyledText as stringToStyledText5, TextRenderable as TextRenderable5 } from "@opentui/core";
+import { CliRenderEvents as CliRenderEvents5, bg as bg5, bold as bold5, dim as dim7, fg as fg12, link as link2, StyledText as StyledText11, stringToStyledText as stringToStyledText5, TextRenderable as TextRenderable5 } from "@opentui/core";
 
 // src/tui/session-mcps-view.ts
 import { stringToStyledText as stringToStyledText4 } from "@opentui/core";
@@ -43323,7 +43484,7 @@ async function createSessionTui({
 `), joinStyled(liveContent, `
 
 `)], ""));
-      composer.placeholder = lifecycleRequestState.kind === "pending" ? `${lifecycleOperationPresentParticiple(lifecycleRequestState.operation)} the session \u2014 messages are paused.` : renderer.height <= 10 ? "Message Remy\u2026 \xB7 Enter sends" : idleComposerPlaceholder;
+      composer.placeholder = latestState.historyStatus === "loading" ? "Draft a message\u2026 \xB7 sending waits for history" : lifecycleRequestState.kind === "pending" ? `${lifecycleOperationPresentParticiple(lifecycleRequestState.operation)} the session \u2014 messages are paused.` : renderer.height <= 10 ? "Message Remy\u2026 \xB7 Enter sends" : idleComposerPlaceholder;
       resizeComposer(composer);
       if (latestState.aggregateStatus === "open")
         composerLayout.render();
@@ -43332,6 +43493,7 @@ async function createSessionTui({
       const commandMenu = renderSlashCommandMenu({ commands: slashCompletions, selectedIndex: slashCompletionIndex, width: renderer.width - 2, maxRows: completionMenuRows(renderer.height) });
       const agentSettingsMenu = agentSettingsPicker && latestState.aggregateStatus === "open" ? renderAgentSettingsPicker({ picker: agentSettingsPicker, width: renderer.width - 2, maxRows: completionMenuRows(renderer.height) }) : undefined;
       const composerStatus = [
+        latestState.historyStatus === "loading" ? renderFeedback({ kind: "progress", message: "Loading conversation\u2026 You can draft now; sending is paused." }) : undefined,
         composerDraft.workspaceContexts?.length ? renderFeedback({ kind: "info", message: `${composerDraft.workspaceContexts.length} workspace context(s) \xB7 /context to review/remove` }) : undefined,
         attachmentFeedback ? renderAttachmentFeedback(attachmentFeedback) : undefined,
         composerFeedback ? renderFeedback(composerFeedback) : undefined,
@@ -43995,6 +44157,12 @@ ${segment.excerpt}`).join(`
           render();
       }
     }
+    transcriptScrollBox.onMouseDown = (event) => {
+      if (latestState.aggregateStatus === "open" && event.button === 0) {
+        event.preventDefault();
+        composer.focus();
+      }
+    };
     for (const text of [transcript, liveTranscript]) {
       let pressedLink;
       text.onMouseDown = (event) => {
@@ -44048,6 +44216,10 @@ ${segment.excerpt}`).join(`
       }
       if (!ownsAttachmentPreparation(preparationOwner))
         return;
+      if (latestState.historyStatus === "loading") {
+        invalidateAttachmentPreparation();
+        return;
+      }
       if (lifecycleRequestState.kind === "pending") {
         composerFeedback = { kind: "progress", message: `${lifecycleOperationPresentParticiple(lifecycleRequestState.operation)} the session \u2014 messages are paused.` };
         render();
@@ -44514,8 +44686,8 @@ function renderTerminalSessionBand({ aggregateStatus, width }) {
   const status = sessionStatusLabel(aggregateStatus).toLowerCase();
   return joinStyled([
     new StyledText11([
-      bg3(PALETTE.selectionBg)(bold5(fg12(PALETTE.systemAccent)(` Session ${status} `))),
-      bg3(PALETTE.selectionBg)(fg12(PALETTE.bodyText)("\u2014 this conversation is closed. "))
+      bg5(PALETTE.selectionBg)(bold5(fg12(PALETTE.systemAccent)(` Session ${status} `))),
+      bg5(PALETTE.selectionBg)(fg12(PALETTE.bodyText)("\u2014 this conversation is closed. "))
     ]),
     renderKeyHints({ hints: [{ key: "esc", action: "return to dashboard" }, { key: "n", action: "new session" }, { key: "m", action: "MCPs" }, { key: "ctrl+f", action: "files" }, { key: "ctrl+l", action: "links" }], width })
   ], `
@@ -45224,7 +45396,7 @@ function isPng(bytes) {
 }
 
 // src/tui/remy-splash.ts
-import { bold as bold6, BoxRenderable as BoxRenderable5, fg as fg13, NativeImage, StyledText as StyledText12, TextRenderable as TextRenderable6, bg as bg4 } from "@opentui/core";
+import { bold as bold6, BoxRenderable as BoxRenderable5, fg as fg13, NativeImage, StyledText as StyledText12, TextRenderable as TextRenderable6, bg as bg6 } from "@opentui/core";
 
 // src/tui/remy-mark.ts
 var remyPixelFieldSource = new URL("../assets/remy-pixel-field.png", import.meta.url);
@@ -45498,7 +45670,7 @@ function renderMark(field, frame, rows = markRows) {
     const flush = () => {
       if (runLength === 0)
         return;
-      chunks.push(fg13(grey(runTop))(bg4(grey(runBottom))(upperHalfBlock.repeat(runLength))));
+      chunks.push(fg13(grey(runTop))(bg6(grey(runBottom))(upperHalfBlock.repeat(runLength))));
       runLength = 0;
     };
     for (let column = 0;column < columns; column++) {
@@ -46070,7 +46242,7 @@ async function dashboard({
   const openDashboardTui = dependencies.openDashboardTui ?? createDashboardTui;
   const pages = [initialSessions];
   let pageIndex = 0;
-  let filters = { statuses: [], creators: [] };
+  let filters = { statuses: [], creators: [], repositories: [], branchName: "" };
   let authors;
   let activeDashboardGeneration = 0;
   function holdTransitionScreen() {
@@ -46079,8 +46251,9 @@ async function dashboard({
   function createDashboardPageLoader({ generation }) {
     const loadingPages = new Map;
     let pageLoadTail = Promise.resolve();
+    let filterRequestNumber = 0;
     return async (input) => {
-      const requestKey = "filters" in input ? `filters:${JSON.stringify(input.filters)}` : input.target;
+      const requestKey = "filters" in input ? `filters:${++filterRequestNumber}` : input.target;
       const matchingPageLoad = loadingPages.get(requestKey);
       if (matchingPageLoad)
         return await matchingPageLoad;
@@ -46095,6 +46268,9 @@ async function dashboard({
             limit: 20,
             ...nextFilters.statuses.length > 0 ? { statuses: nextFilters.statuses } : {},
             ...nextFilters.creators.length > 0 ? { creatorUserIds: nextFilters.creators.map((creator) => creator.id) } : {},
+            ...nextFilters.repositories.length > 0 ? { repositoryIds: nextFilters.repositories.map((repository) => repository.id) } : {},
+            ...nextFilters.branchName ? { branchName: nextFilters.branchName } : {},
+            ...nextFilters.search ? { search: nextFilters.search } : {},
             signal: input.signal
           }));
           if (generation !== activeDashboardGeneration)
@@ -46113,6 +46289,9 @@ async function dashboard({
             after,
             ...filters.statuses.length > 0 ? { statuses: filters.statuses } : {},
             ...filters.creators.length > 0 ? { creatorUserIds: filters.creators.map((creator) => creator.id) } : {},
+            ...filters.repositories.length > 0 ? { repositoryIds: filters.repositories.map((repository) => repository.id) } : {},
+            ...filters.branchName ? { branchName: filters.branchName } : {},
+            ...filters.search ? { search: filters.search } : {},
             signal
           }));
           if (generation !== activeDashboardGeneration)
@@ -46133,6 +46312,9 @@ async function dashboard({
           after: current.nextCursor,
           ...filters.statuses.length > 0 ? { statuses: filters.statuses } : {},
           ...filters.creators.length > 0 ? { creatorUserIds: filters.creators.map((creator) => creator.id) } : {},
+          ...filters.repositories.length > 0 ? { repositoryIds: filters.repositories.map((repository) => repository.id) } : {},
+          ...filters.branchName ? { branchName: filters.branchName } : {},
+          ...filters.search ? { search: filters.search } : {},
           signal
         }));
         if (generation !== activeDashboardGeneration)
@@ -46172,6 +46354,9 @@ async function dashboard({
         limit: 20,
         ...filters.statuses.length > 0 ? { statuses: filters.statuses } : {},
         ...filters.creators.length > 0 ? { creatorUserIds: filters.creators.map((creator) => creator.id) } : {},
+        ...filters.repositories.length > 0 ? { repositoryIds: filters.repositories.map((repository) => repository.id) } : {},
+        ...filters.branchName ? { branchName: filters.branchName } : {},
+        ...filters.search ? { search: filters.search } : {},
         signal: dependencies.abortSignal
       })));
       pageIndex = 0;
@@ -46182,6 +46367,7 @@ async function dashboard({
     const action = await renderRemyView({
       open: async () => await openDashboardTui({
         initialPage: pages[0],
+        loadRepositories: async () => await repositories,
         initialFilters: filters,
         loadAuthors: loadDashboardAuthors,
         loadPage: loadDashboardPage
@@ -46660,6 +46846,10 @@ var workspaceInvalidationEventSchema = exports_external2.object({
   type: exports_external2.enum(["session.workspace.git.initialized", "session.workspace.git.committed", "session.workspace.git.pushed"]),
   payload: exports_external2.object({ repository: exports_external2.object({ id: exports_external2.string().min(1) }) })
 });
+var mainAgentTurnEndedEventSchema = exports_external2.object({
+  type: exports_external2.literal("agent.turn.ended"),
+  actor: exports_external2.object({ type: exports_external2.literal("main") })
+});
 async function runAttachedSession({
   dependencies,
   operations,
@@ -46706,6 +46896,9 @@ async function runAttachedSession({
   const aborted3 = interactive ? new Promise((_resolve, reject) => {
     rejectAborted = reject;
   }) : undefined;
+  aborted3?.catch(() => {
+    return;
+  });
   const abortHandler = () => {
     stop();
     rejectAborted(dependencies.abortSignal?.reason instanceof Error ? dependencies.abortSignal.reason : new Error("interrupted"));
@@ -46722,11 +46915,12 @@ async function runAttachedSession({
       });
     }
     const startPromise = controller.start(start);
-    await Promise.race([
-      controller.waitUntilReady(),
-      startPromise,
-      ...aborted3 ? [aborted3] : []
-    ]);
+    const controllerFailed = startPromise.then(async () => await new Promise(() => {}));
+    controllerFailed.catch(() => {
+      return;
+    });
+    if (!interactive)
+      await Promise.race([controller.waitUntilReady(), startPromise, ...aborted3 ? [aborted3] : []]);
     if (interactive) {
       if (dependencies.abortSignal?.aborted)
         throw dependencies.abortSignal.reason ?? new Error("interrupted");
@@ -46799,7 +46993,7 @@ async function runAttachedSession({
             savePastedImage: async (input) => await writePastedImage({ ...input, temporaryDirectory: tmpdir2() }),
             attachPromptPaths: async (input) => await uploadPromptPaths({ operations, ...input })
           }),
-          waitForAction: async (tui) => await Promise.race([tui.waitForAction(), aborted3])
+          waitForAction: async (tui) => await Promise.race([tui.waitForAction(), aborted3, controllerFailed])
         });
         if (!action)
           throw dependencies.abortSignal?.reason ?? new Error("interrupted");
@@ -46852,6 +47046,10 @@ async function runAttachedSession({
               connection = state.connectionStatus;
               if (frame?.kind !== "retained")
                 return;
+              if (mainAgentTurnEndedEventSchema.safeParse(frame.data.event).success) {
+                invalidateWorkspace({ kind: "turn-ended" });
+                return;
+              }
               const event = workspaceInvalidationEventSchema.safeParse(frame.data.event);
               if (!event.success)
                 return;
@@ -46882,7 +47080,7 @@ async function runAttachedSession({
                     view.invalidate(event);
                 }
                 mountedView = view;
-                return await Promise.race([view.waitForAction(), aborted3]);
+                return await Promise.race([view.waitForAction(), aborted3, controllerFailed]);
               }
             });
             if (!result2 || result2.kind === "interrupt")

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meistrari/remy-cli",
-    "version": "1.25.0",
+    "version": "1.26.0-rc.0",
     "description": "Remy, the Coding Agent terminal client.",
     "type": "module",
     "bin": {