From e8687a3496c69508b2967a39405e519f878f1148 Mon Sep 17 00:00:00 2001
From: Egor Kraev <egor.kraev@gmail.com>
Date: Thu, 8 Oct 2026 14:15:09 +0200
Subject: [PATCH 1/4] =?UTF-8?q?Worktree=20name=20search:=20a=20text=20box?=
 =?UTF-8?q?=20in=20the=20sidebar=20header=20lists=20only=20worktrees=20who?=
 =?UTF-8?q?se=20label=20contains=20its=20text,=20ignoring=20case,=20with?=
 =?UTF-8?q?=20a=20=C3=97=20to=20empty=20it;=20each=20repo=20keeps=20its=20?=
 =?UTF-8?q?own,=20across=20reloads?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../changes/worktree-name-search/proposal.md  | 20 +++++
 .../worktree-name-search/specs/web/spec.md    | 24 ++++++
 .../changes/worktree-name-search/tasks.md     |  8 ++
 src/web/main/styles.css                       | 53 ++++++++++++-
 src/web/ui/app.tsx                            | 38 +++++++++
 src/web/ui/sidebar.test.ts                    | 78 ++++++++++++++++++-
 src/web/ui/sidebar.ts                         | 39 +++++++---
 src/web/ui/view.ts                            | 23 +++++-
 test/e2e/contract.ts                          |  4 +
 test/e2e/sidebar.spec.ts                      | 63 +++++++++++++++
 10 files changed, 335 insertions(+), 15 deletions(-)
 create mode 100644 openspec/changes/worktree-name-search/proposal.md
 create mode 100644 openspec/changes/worktree-name-search/specs/web/spec.md
 create mode 100644 openspec/changes/worktree-name-search/tasks.md

diff --git a/openspec/changes/worktree-name-search/proposal.md b/openspec/changes/worktree-name-search/proposal.md
new file mode 100644
index 0000000..9f52c79
--- /dev/null
+++ b/openspec/changes/worktree-name-search/proposal.md
@@ -0,0 +1,20 @@
+## Why
+
+A repo with many worktrees makes the sidebar long; the "Starred" toggle narrows it only to worktrees starred beforehand, so finding one by its branch name means scrolling.
+
+## What Changes
+
+- Web: a text box in the sidebar header, between the title and the "Starred" toggle, listing only the worktrees whose label contains its text (trimmed, ignoring case), together with the "Starred" toggle; the selected worktree stays listed. A × beside it, shown while it holds text, empties it. Each repo keeps its own text, stored per browser across reloads (`wtd.searches`). A sidebar too narrow for one header row puts the box on its own row.
+
+## Capabilities
+
+### New Capabilities
+
+### Modified Capabilities
+- `web`: worktree name search.
+
+## Impact
+
+- Code: `src/web/ui/{sidebar.ts,view.ts,app.tsx}`, `src/web/main/styles.css`.
+- Architecture, wire, upgrade: no change.
+- Tests: `src/web/ui/sidebar.test.ts`; `test/e2e/sidebar.spec.ts` (search per repo, persistence, ×, combined with "Starred").
diff --git a/openspec/changes/worktree-name-search/specs/web/spec.md b/openspec/changes/worktree-name-search/specs/web/spec.md
new file mode 100644
index 0000000..dc882ca
--- /dev/null
+++ b/openspec/changes/worktree-name-search/specs/web/spec.md
@@ -0,0 +1,24 @@
+## ADDED Requirements
+
+### Requirement: Worktree name search
+The sidebar header SHALL hold, between its title and the checked filter's toggle, a text box for the selected repo: while it holds text, the sidebar SHALL list only the worktrees whose label contains that text, trimmed and ignoring case, that the checked filter also lists, and the selected worktree. While it holds text, a control beside it SHALL empty it. Each repo SHALL keep its own text, stored per browser across reloads; a repo without one SHALL list every worktree the checked filter lists. The text SHALL play no part in which worktree is selected without a stored selection.
+
+#### Scenario: Search narrows the list
+- **WHEN** a repo has worktrees on `feature/login`, `fix/Logout` and `docs`, `feature/login` is selected and the user types `LOG`
+- **THEN** the sidebar lists `feature/login` and `fix/Logout` only
+
+#### Scenario: Selected worktree stays listed
+- **WHEN** the selected worktree's label does not contain the typed text
+- **THEN** it stays listed and selected
+
+#### Scenario: Search belongs to its repo and persists
+- **WHEN** text is typed in one repo, another repo is selected and the page is reloaded
+- **THEN** the other repo shows an empty box and all its worktrees, and the first repo shows its text and lists only the matching worktrees
+
+#### Scenario: Clear control empties the search
+- **WHEN** the user activates the clear control
+- **THEN** the box is empty and focused, the clear control is gone, and every worktree is listed, also after a reload
+
+#### Scenario: Search with "checked only"
+- **WHEN** the search is `feat` and the checked filter is "checked only"
+- **THEN** only checked worktrees whose label contains `feat`, and the selected worktree, are listed
diff --git a/openspec/changes/worktree-name-search/tasks.md b/openspec/changes/worktree-name-search/tasks.md
new file mode 100644
index 0000000..1657fb2
--- /dev/null
+++ b/openspec/changes/worktree-name-search/tasks.md
@@ -0,0 +1,8 @@
+## 1. Web
+
+- [x] 1.1 `searchOf`, `withSearch`, `matchesSearch` and the search in `visibleWorktrees` (not in `defaultWorktree`) with unit tests; `wtd.searches` and `setSearch` in the view; the text box and × in the sidebar header
+- [x] 1.2 e2e: the search lists matching worktrees ignoring case, keeps the selected one, belongs to its repo, persists across a reload, × empties it; it applies together with "checked only"
+
+## 2. Final gates
+
+- [x] 2.1 `pnpm test` green (incl. Playwright); `pnpm lint` exits 0; `openspec validate worktree-name-search --strict` passes
diff --git a/src/web/main/styles.css b/src/web/main/styles.css
index 1839816..399cfe2 100644
--- a/src/web/main/styles.css
+++ b/src/web/main/styles.css
@@ -122,6 +122,7 @@ input:focus-visible,
   overflow: hidden;
   background: var(--panel);
   border-right: 1px solid var(--border);
+  container-type: inline-size;
 }
 
 /* Over the sidebar's right border, so the terminal layer never covers it. */
@@ -145,13 +146,63 @@ input:focus-visible,
 
 .sidebar-header {
   display: flex;
+  flex-wrap: wrap;
   align-items: center;
   justify-content: space-between;
+  gap: 6px 10px;
   min-height: 38px;
-  padding: 0 10px 0 13px;
+  padding: 6px 10px 6px 13px;
+  box-sizing: border-box;
   border-bottom: 1px solid var(--border);
 }
 
+/* Too narrow for one row: the search takes its own row below. */
+@container (max-width: 250px) {
+  .worktree-search {
+    order: 1;
+    flex-basis: 100%;
+  }
+}
+
+.worktree-search {
+  position: relative;
+  display: flex;
+  flex: 1 1 60px;
+  min-width: 0;
+}
+
+.worktree-search input {
+  width: 100%;
+  min-width: 0;
+  height: 22px;
+  box-sizing: border-box;
+  padding: 0 20px 0 7px;
+  font: inherit;
+  font-size: 12px;
+  color: var(--text);
+  background: var(--bg);
+  border: 1px solid var(--border);
+  border-radius: 5px;
+}
+
+.worktree-search input::placeholder {
+  color: var(--muted);
+}
+
+.worktree-search button {
+  position: absolute;
+  top: 0;
+  right: 0;
+  height: 22px;
+  padding: 0 6px;
+  line-height: 1;
+  color: var(--muted);
+}
+
+.worktree-search button:hover {
+  color: var(--text);
+}
+
 .sidebar-title {
   color: var(--muted);
   font-size: 11px;
diff --git a/src/web/ui/app.tsx b/src/web/ui/app.tsx
index f600095..13b7a55 100644
--- a/src/web/ui/app.tsx
+++ b/src/web/ui/app.tsx
@@ -966,6 +966,43 @@ const SidebarResizer = ({ view }: { view: View }) => {
   );
 };
 
+/** The selected repo's worktree name search, with a button clearing it. */
+const WorktreeSearch = ({ view }: { view: View }) => {
+  const input = useRef<HTMLInputElement>(null);
+  const search = view.search.value;
+  return (
+    <span class="worktree-search">
+      <input
+        ref={input}
+        type="text"
+        spellcheck={false}
+        autocomplete="off"
+        placeholder="Filter"
+        aria-label="Filter worktrees by name"
+        data-testid="worktree-search"
+        value={search}
+        onInput={(event) => {
+          view.setSearch(event.currentTarget.value);
+        }}
+      />
+      {search !== '' && (
+        <button
+          type="button"
+          aria-label="Clear the worktree filter"
+          title="Clear the worktree filter"
+          data-testid="worktree-search-clear"
+          onClick={() => {
+            view.setSearch('');
+            input.current?.focus();
+          }}
+        >
+          ×
+        </button>
+      )}
+    </span>
+  );
+};
+
 const Workspace = ({ client, manager, view }: AppProps) => {
   const tab = view.tab.value;
   const repo = view.repo.value;
@@ -977,6 +1014,7 @@ const Workspace = ({ client, manager, view }: AppProps) => {
       <nav class="sidebar" style={{ width: px(view.sidebarWidth.value) }}>
         <div class="sidebar-header">
           <span class="sidebar-title">Worktrees</span>
+          <WorktreeSearch view={view} />
           <label class="star-filter" title="Show starred worktrees only">
             <span>Starred</span>
             {/* Keyed by repo: switching repos mounts it in place, so only a click animates it. */}
diff --git a/src/web/ui/sidebar.test.ts b/src/web/ui/sidebar.test.ts
index 19b0660..e20e5cc 100644
--- a/src/web/ui/sidebar.test.ts
+++ b/src/web/ui/sidebar.test.ts
@@ -5,12 +5,15 @@ import {
   defaultWorktree,
   filterOf,
   keptNote,
+  matchesSearch,
   parseSidebarWidth,
   removalReasons,
+  searchOf,
   SIDEBAR_WIDTH,
   sidebarEntries,
   visibleWorktrees,
   withFilter,
+  withSearch,
   worktreeLabel,
   type SidebarEntry,
 } from './sidebar.js';
@@ -123,16 +126,51 @@ describe('visibleWorktrees', () => {
   ];
 
   it('lists every entry with the all filter', () => {
-    expect(visibleWorktrees(entries, 'all', null)).toEqual(entries);
+    expect(visibleWorktrees(entries, 'all', '', null)).toEqual(entries);
   });
 
   it('lists only checked entries with the checked filter', () => {
-    expect(visibleWorktrees(entries, 'checked', null).map((e) => e.path)).toEqual(['/a', '/c']);
+    expect(visibleWorktrees(entries, 'checked', '', null).map((e) => e.path)).toEqual(['/a', '/c']);
   });
 
   it('keeps the selected entry listed with the checked filter', () => {
-    expect(visibleWorktrees(entries, 'checked', '/b').map((e) => e.path)).toEqual(['/a', '/b', '/c']);
-    expect(visibleWorktrees(entries, 'checked', '/d').map((e) => e.path)).toEqual(['/a', '/c', '/d']);
+    expect(visibleWorktrees(entries, 'checked', '', '/b').map((e) => e.path)).toEqual(['/a', '/b', '/c']);
+    expect(visibleWorktrees(entries, 'checked', '', '/d').map((e) => e.path)).toEqual(['/a', '/c', '/d']);
+  });
+
+  describe('with a name search', () => {
+    const named: SidebarEntry[] = [
+      { path: '/m', label: 'main', prunable: false, gone: false, checked: false },
+      { path: '/f', label: 'feature/Login', prunable: false, gone: false, checked: true },
+      { path: '/g', label: 'fix/logout', prunable: false, gone: false, checked: false },
+      { path: '/h', label: 'wt2 @ 0123456', prunable: false, gone: false, checked: true },
+    ];
+    const paths = (filter: 'all' | 'checked', search: string, selected: string | null = null): string[] =>
+      visibleWorktrees(named, filter, search, selected).map((e) => e.path);
+
+    it('lists the entries whose label contains the search, ignoring case', () => {
+      expect(paths('all', 'log')).toEqual(['/f', '/g']);
+      expect(paths('all', 'LOGIN')).toEqual(['/f']);
+      expect(paths('all', '@ 0123')).toEqual(['/h']);
+    });
+
+    it('ignores surrounding whitespace, and a blank search lists every entry', () => {
+      expect(paths('all', '  fix ')).toEqual(['/g']);
+      expect(paths('all', '   ')).toEqual(['/m', '/f', '/g', '/h']);
+    });
+
+    it('lists nothing when no label matches', () => {
+      expect(paths('all', 'nope')).toEqual([]);
+    });
+
+    it('applies together with the checked filter', () => {
+      expect(paths('checked', 'log')).toEqual(['/f']);
+    });
+
+    it('keeps the selected entry listed when it does not match', () => {
+      expect(paths('all', 'log', '/m')).toEqual(['/m', '/f', '/g']);
+      expect(paths('checked', 'log', '/g')).toEqual(['/f', '/g']);
+    });
   });
 });
 
@@ -199,6 +237,38 @@ describe('repo filters', () => {
   });
 });
 
+describe('repo searches', () => {
+  it('searches nothing in a repo without an entry', () => {
+    expect(searchOf({ '0:/b': 'x' }, '0:/a')).toBe('');
+  });
+
+  it('sets one repo’s search without touching the others, keeping the text as typed', () => {
+    const searches = withSearch({ '0:/b': 'x' }, '0:/a', ' Feat ');
+    expect(searches).toEqual({ '0:/a': ' Feat ', '0:/b': 'x' });
+    expect(searchOf(searches, '0:/a')).toBe(' Feat ');
+    expect(searchOf(searches, '1:/a')).toBe('');
+  });
+
+  it('replaces a repo’s search and drops its entry when emptied', () => {
+    expect(withSearch({ '0:/a': 'x', '0:/b': 'y' }, '0:/a', 'z')).toEqual({ '0:/a': 'z', '0:/b': 'y' });
+    expect(withSearch({ '0:/a': 'x', '0:/b': 'y' }, '0:/a', '')).toEqual({ '0:/b': 'y' });
+  });
+});
+
+describe('matchesSearch', () => {
+  it.each([
+    ['a substring', 'feature/login', 'ture/lo', true],
+    ['the whole label', 'main', 'main', true],
+    ['another case', 'Feature/Login', 'feature/LOGIN', true],
+    ['a trimmed search', 'main', ' ain\t', true],
+    ['an empty search', 'main', '', true],
+    ['a non-substring', 'main', 'mian', false],
+    ['a search longer than the label', 'main', 'mains', false],
+  ])('%s', (_name, label, search, expected) => {
+    expect(matchesSearch(label, search)).toBe(expected);
+  });
+});
+
 describe('removalReasons', () => {
   const safe = { base: 'origin/main', ahead: 0, changes: 0, running: [] };
 
diff --git a/src/web/ui/sidebar.ts b/src/web/ui/sidebar.ts
index 7fe4d92..a87ee46 100644
--- a/src/web/ui/sidebar.ts
+++ b/src/web/ui/sidebar.ts
@@ -18,14 +18,31 @@ export type WorktreeFilter = 'all' | 'checked';
 /** Each repo's filter by repo key; a repo without an entry shows all. */
 export type RepoFilters = Readonly<Record<string, string>>;
 
+/** Each repo's name search by repo key; a repo without an entry searches nothing. */
+export type RepoSearches = Readonly<Record<string, string>>;
+
+/** `record` with the repo `key` set to `value`; null drops its entry. */
+const withEntry = (record: Readonly<Record<string, string>>, key: string, value: string | null): Readonly<Record<string, string>> => {
+  const rest = Object.fromEntries(Object.entries(record).filter(([k]) => k !== key));
+  return value === null ? rest : { ...rest, [key]: value };
+};
+
 /** The filter of the repo `key`. */
 export const filterOf = (filters: RepoFilters, key: string): WorktreeFilter => (filters[key] === 'checked' ? 'checked' : 'all');
 
 /** `filters` with the repo `key` set to `filter`; showing all drops its entry. */
-export const withFilter = (filters: RepoFilters, key: string, filter: WorktreeFilter): RepoFilters => {
-  const rest = Object.fromEntries(Object.entries(filters).filter(([k]) => k !== key));
-  return filter === 'all' ? rest : { ...rest, [key]: filter };
-};
+export const withFilter = (filters: RepoFilters, key: string, filter: WorktreeFilter): RepoFilters =>
+  withEntry(filters, key, filter === 'all' ? null : filter);
+
+/** The name search of the repo `key`. */
+export const searchOf = (searches: RepoSearches, key: string): string => searches[key] ?? '';
+
+/** `searches` with the repo `key` set to `search`; an empty search drops its entry. */
+export const withSearch = (searches: RepoSearches, key: string, search: string): RepoSearches =>
+  withEntry(searches, key, search === '' ? null : search);
+
+/** Whether `label` contains `search`, trimmed, ignoring case; a blank search matches every label. */
+export const matchesSearch = (label: string, search: string): boolean => label.toLowerCase().includes(search.trim().toLowerCase());
 
 /** Sidebar width bounds and default, in pixels. */
 export const SIDEBAR_WIDTH = { min: 160, max: 640, initial: 260 } as const;
@@ -58,13 +75,17 @@ export const sidebarEntries = (state: {
   return entries;
 };
 
-/** The entries the filter shows; the selected entry is always shown. */
-export const visibleWorktrees = (entries: readonly SidebarEntry[], filter: WorktreeFilter, selected: string | null): SidebarEntry[] =>
-  filter === 'all' ? [...entries] : entries.filter((e) => e.checked || e.path === selected);
+/** The entries the filter and the name search show; the selected entry is always shown. */
+export const visibleWorktrees = (
+  entries: readonly SidebarEntry[],
+  filter: WorktreeFilter,
+  search: string,
+  selected: string | null,
+): SidebarEntry[] => entries.filter((e) => e.path === selected || ((filter === 'all' || e.checked) && matchesSearch(e.label, search)));
 
-/** The worktree selected without a stored selection: the first the filter shows, else the first entry. */
+/** The worktree selected without a stored selection: the first the filter shows, else the first entry; the search plays no part. */
 export const defaultWorktree = (entries: readonly SidebarEntry[], filter: WorktreeFilter): string | null =>
-  (visibleWorktrees(entries, filter, null)[0] ?? entries[0])?.path ?? null;
+  (visibleWorktrees(entries, filter, '', null)[0] ?? entries[0])?.path ?? null;
 
 /** What the daemon reported deleting a worktree would lose. */
 export interface RemovalRisks {
diff --git a/src/web/ui/view.ts b/src/web/ui/view.ts
index bdc843c..af5df5b 100644
--- a/src/web/ui/view.ts
+++ b/src/web/ui/view.ts
@@ -35,10 +35,13 @@ import {
   keptNote,
   parseSidebarWidth,
   removalReasons,
+  searchOf,
   sidebarEntries,
   visibleWorktrees,
   withFilter,
+  withSearch,
   type RepoFilters,
+  type RepoSearches,
   type SidebarEntry,
   type WorktreeFilter,
 } from './sidebar.js';
@@ -56,6 +59,7 @@ export const PANE_HEADER = 20;
 const REPO_KEY = 'wtd.repo';
 const WORKTREES_KEY = 'wtd.worktrees';
 const FILTERS_KEY = 'wtd.filters';
+const SEARCHES_KEY = 'wtd.searches';
 const SIDEBAR_WIDTH_KEY = 'wtd.sidebarWidth';
 
 const load = (key: string): string | null => localStorage.getItem(key);
@@ -185,6 +189,7 @@ export class View {
   readonly selectedRepo = signal<string | null>(load(REPO_KEY));
   readonly selections = signal<Readonly<Record<string, string>>>(loadRecord(WORKTREES_KEY));
   readonly filters = signal<RepoFilters>(loadRecord(FILTERS_KEY));
+  readonly searches = signal<RepoSearches>(loadRecord(SEARCHES_KEY));
   readonly sidebarWidth = signal<number>(parseSidebarWidth(load(SIDEBAR_WIDTH_KEY)));
   /** The terminal area in client coordinates. */
   readonly area = signal<Rect>({ left: 0, top: 0, width: 0, height: 0 });
@@ -234,6 +239,11 @@ export class View {
     const tab = this.tab.value;
     return tab === null ? 'all' : filterOf(this.filters.value, repoKey(tab.host, tab.repo));
   });
+  /** The selected repo's name search. */
+  readonly search = computed<string>(() => {
+    const tab = this.tab.value;
+    return tab === null ? '' : searchOf(this.searches.value, repoKey(tab.host, tab.repo));
+  });
   readonly entries = computed<SidebarEntry[]>(() => {
     const repo = this.repo.value;
     return repo === null ? [] : sidebarEntries(repo);
@@ -246,7 +256,9 @@ export class View {
     if (stored !== undefined && entries.some((e) => e.path === stored)) return stored;
     return defaultWorktree(entries, this.filter.value);
   });
-  readonly listed = computed<SidebarEntry[]>(() => visibleWorktrees(this.entries.value, this.filter.value, this.worktree.value));
+  readonly listed = computed<SidebarEntry[]>(() =>
+    visibleWorktrees(this.entries.value, this.filter.value, this.search.value, this.worktree.value),
+  );
   readonly terminals = computed<Terminal[]>(() => {
     const worktree = this.worktree.value;
     return (this.repo.value?.terminals ?? []).filter((t) => t.worktree === worktree);
@@ -393,6 +405,15 @@ export class View {
     localStorage.setItem(FILTERS_KEY, JSON.stringify(filters));
   }
 
+  /** Sets the selected repo's name search; empty shows every worktree. */
+  setSearch(search: string): void {
+    const tab = this.tab.value;
+    if (tab === null) return;
+    const searches = withSearch(this.searches.value, repoKey(tab.host, tab.repo), search);
+    this.searches.value = searches;
+    localStorage.setItem(SEARCHES_KEY, JSON.stringify(searches));
+  }
+
   /** Sets the sidebar width, within its bounds, without storing it. */
   resizeSidebar(width: number): void {
     this.sidebarWidth.value = clampSidebarWidth(width);
diff --git a/test/e2e/contract.ts b/test/e2e/contract.ts
index 3ec9644..0d3f8df 100644
--- a/test/e2e/contract.ts
+++ b/test/e2e/contract.ts
@@ -62,6 +62,10 @@ export const TID = {
   worktreeLabel: 'worktree-label',
   /** Checkbox input: checked = show checked worktrees only, in the selected repo; each repo keeps its own, across reloads. */
   filterChecked: 'filter-checked',
+  /** Text input between the sidebar title and `filterChecked`: lists only worktrees whose label contains its trimmed text, ignoring case, plus the selected one; each repo keeps its own, across reloads. */
+  worktreeSearch: 'worktree-search',
+  /** Button beside `worktreeSearch`, present only while it holds text; empties it. */
+  worktreeSearchClear: 'worktree-search-clear',
   /** Context menu of a worktree entry; Escape or a press outside closes it. */
   worktreeMenu: 'worktree-menu',
   /** Menu item: deletes the worktree, at once when nothing would be lost, else after the confirmation; `disabled` for the main worktree, a locked or gone one, or an unconnected host. */
diff --git a/test/e2e/sidebar.spec.ts b/test/e2e/sidebar.spec.ts
index 00e465d..66e24b0 100644
--- a/test/e2e/sidebar.spec.ts
+++ b/test/e2e/sidebar.spec.ts
@@ -190,6 +190,69 @@ test.describe('checked filter', () => {
   });
 });
 
+test.describe('name search', () => {
+  test('lists the worktrees whose label contains the text, belongs to its repo, persists, and × empties it', async ({ hub, page }) => {
+    const { repo, worktrees } = makeRepoWith(hub, 'app', ['feature/login', 'fix/Logout', 'docs']);
+    const [login = '', logout = '', docs = ''] = worktrees;
+    const second = makeRepoWith(hub, 'second', ['logbook']);
+    const [logbook = ''] = second.worktrees;
+    hub.writeRepos([repo, second.repo]);
+    await openUi(hub, page);
+    await selectWorktree(page, docs);
+    const search = page.locator(byTestId(TID.worktreeSearch));
+    const clear = page.locator(byTestId(TID.worktreeSearchClear));
+    await expect(clear).toHaveCount(0);
+
+    // Ignores case; the selected worktree stays listed although it does not match.
+    await search.fill('LOG');
+    await expect.poll(async () => (await listedWorktrees(page)).sort()).toEqual([login, logout, docs].sort());
+    await selectWorktree(page, login);
+    await search.fill('log');
+    await expect.poll(async () => (await listedWorktrees(page)).sort()).toEqual([login, logout].sort());
+    await search.fill('login');
+    await expect.poll(() => listedWorktrees(page)).toEqual([login]);
+
+    await page.reload();
+    await expect(search).toHaveValue('login');
+    await expect.poll(() => listedWorktrees(page)).toEqual([login]);
+
+    // The other repo has no search of its own; searching there leaves the first repo's.
+    await selectRepo(page, second.repo);
+    await expect(search).toHaveValue('');
+    await expect.poll(async () => (await listedWorktrees(page)).sort()).toEqual([second.repo, logbook].sort());
+    await selectWorktree(page, logbook);
+    await search.fill('book');
+    await expect.poll(() => listedWorktrees(page)).toEqual([logbook]);
+    await selectRepo(page, repo);
+    await expect(search).toHaveValue('login');
+    await expect.poll(() => listedWorktrees(page)).toEqual([login]);
+
+    await clear.click();
+    await expect(search).toHaveValue('');
+    await expect(search).toBeFocused();
+    await expect(clear).toHaveCount(0);
+    await expect.poll(async () => (await listedWorktrees(page)).sort()).toEqual([repo, login, logout, docs].sort());
+    await page.reload();
+    await expect(search).toHaveValue('');
+    await selectRepo(page, second.repo);
+    await expect(search).toHaveValue('book');
+  });
+
+  test('applies together with "checked only"', async ({ hub, page }) => {
+    const { repo, worktrees } = makeRepoWith(hub, 'app', ['feat-a', 'feat-b', 'other']);
+    const [a = '', b = '', other = ''] = worktrees;
+    hub.writeRepos([repo]);
+    await openUi(hub, page);
+    await selectWorktree(page, a);
+    await page.locator(checkbox(a)).check();
+    await page.locator(checkbox(other)).check();
+    await page.locator(byTestId(TID.worktreeSearch)).fill('feat');
+    await expect.poll(async () => (await listedWorktrees(page)).sort()).toEqual([a, b].sort());
+    await page.locator(byTestId(TID.filterChecked)).check();
+    await expect.poll(() => listedWorktrees(page)).toEqual([a]);
+  });
+});
+
 test.describe('sidebar width', () => {
   test('dragging the sidebar edge resizes the sidebar within bounds, arrow keys nudge it, and the width survives a reload', async ({
     hub,

From 5a6a05e81a362189c132fbd88f27674403d17355 Mon Sep 17 00:00:00 2001
From: Egor Kraev <egor.kraev@gmail.com>
Date: Fri, 9 Oct 2026 15:12:09 +0200
Subject: [PATCH 2/4] Review fixes: a page setting the browser refuses to store
 still applies and the page says saving failed; the search scenarios list what
 the checked filter lists

---
 .../changes/worktree-name-search/proposal.md  |  1 +
 .../worktree-name-search/specs/web/spec.md    | 10 ++++++---
 .../changes/worktree-name-search/tasks.md     |  1 +
 src/web/ui/view.ts                            | 22 ++++++++++++++-----
 test/e2e/sidebar.spec.ts                      | 19 ++++++++++++++++
 5 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/openspec/changes/worktree-name-search/proposal.md b/openspec/changes/worktree-name-search/proposal.md
index 9f52c79..8a949d3 100644
--- a/openspec/changes/worktree-name-search/proposal.md
+++ b/openspec/changes/worktree-name-search/proposal.md
@@ -5,6 +5,7 @@ A repo with many worktrees makes the sidebar long; the "Starred" toggle narrows
 ## What Changes
 
 - Web: a text box in the sidebar header, between the title and the "Starred" toggle, listing only the worktrees whose label contains its text (trimmed, ignoring case), together with the "Starred" toggle; the selected worktree stays listed. A × beside it, shown while it holds text, empties it. Each repo keeps its own text, stored per browser across reloads (`wtd.searches`). A sidebar too narrow for one header row puts the box on its own row.
+- Web: a setting of the page the browser refuses to store (storage full or blocked) still applies, and the page shows that saving failed, instead of the handler throwing.
 
 ## Capabilities
 
diff --git a/openspec/changes/worktree-name-search/specs/web/spec.md b/openspec/changes/worktree-name-search/specs/web/spec.md
index dc882ca..6b8f00b 100644
--- a/openspec/changes/worktree-name-search/specs/web/spec.md
+++ b/openspec/changes/worktree-name-search/specs/web/spec.md
@@ -1,7 +1,7 @@
 ## ADDED Requirements
 
 ### Requirement: Worktree name search
-The sidebar header SHALL hold, between its title and the checked filter's toggle, a text box for the selected repo: while it holds text, the sidebar SHALL list only the worktrees whose label contains that text, trimmed and ignoring case, that the checked filter also lists, and the selected worktree. While it holds text, a control beside it SHALL empty it. Each repo SHALL keep its own text, stored per browser across reloads; a repo without one SHALL list every worktree the checked filter lists. The text SHALL play no part in which worktree is selected without a stored selection.
+The sidebar header SHALL hold, between its title and the checked filter's toggle, a text box for the selected repo: while it holds text, the sidebar SHALL list only the worktrees whose label contains that text, trimmed and ignoring case, that the checked filter also lists, and the selected worktree. While it holds text, a control beside it SHALL empty it. Each repo SHALL keep its own text, stored per browser across reloads; a repo without one SHALL list every worktree the checked filter lists. The text SHALL play no part in which worktree is selected without a stored selection. When the browser refuses to store a setting of the page, the change SHALL still apply and the page SHALL show that saving failed.
 
 #### Scenario: Search narrows the list
 - **WHEN** a repo has worktrees on `feature/login`, `fix/Logout` and `docs`, `feature/login` is selected and the user types `LOG`
@@ -13,12 +13,16 @@ The sidebar header SHALL hold, between its title and the checked filter's toggle
 
 #### Scenario: Search belongs to its repo and persists
 - **WHEN** text is typed in one repo, another repo is selected and the page is reloaded
-- **THEN** the other repo shows an empty box and all its worktrees, and the first repo shows its text and lists only the matching worktrees
+- **THEN** the other repo shows an empty box and every worktree its checked filter lists, and the first repo shows its text and lists only the matching worktrees and the selected one
 
 #### Scenario: Clear control empties the search
 - **WHEN** the user activates the clear control
-- **THEN** the box is empty and focused, the clear control is gone, and every worktree is listed, also after a reload
+- **THEN** the box is empty and focused, the clear control is gone, and every worktree the checked filter lists is listed, with the selected one, also after a reload
 
 #### Scenario: Search with "checked only"
 - **WHEN** the search is `feat` and the checked filter is "checked only"
 - **THEN** only checked worktrees whose label contains `feat`, and the selected worktree, are listed
+
+#### Scenario: Refused storage write
+- **WHEN** the browser refuses to store the search and the user types text
+- **THEN** the list is narrowed by the text and the page shows that saving its settings failed
diff --git a/openspec/changes/worktree-name-search/tasks.md b/openspec/changes/worktree-name-search/tasks.md
index 1657fb2..4ac3106 100644
--- a/openspec/changes/worktree-name-search/tasks.md
+++ b/openspec/changes/worktree-name-search/tasks.md
@@ -2,6 +2,7 @@
 
 - [x] 1.1 `searchOf`, `withSearch`, `matchesSearch` and the search in `visibleWorktrees` (not in `defaultWorktree`) with unit tests; `wtd.searches` and `setSearch` in the view; the text box and × in the sidebar header
 - [x] 1.2 e2e: the search lists matching worktrees ignoring case, keeps the selected one, belongs to its repo, persists across a reload, × empties it; it applies together with "checked only"
+- [x] 1.3 The view's settings writes report a refused write on the page; e2e: a refused write still narrows the list and shows the notice
 
 ## 2. Final gates
 
diff --git a/src/web/ui/view.ts b/src/web/ui/view.ts
index 733172f..57364f1 100644
--- a/src/web/ui/view.ts
+++ b/src/web/ui/view.ts
@@ -382,7 +382,7 @@ export class View {
   selectRepo(tab: RepoTab): void {
     const key = repoKey(tab.host, tab.repo);
     this.selectedRepo.value = key;
-    localStorage.setItem(REPO_KEY, key);
+    this.store(REPO_KEY, key);
   }
 
   /** Selects `path` in the current repo, timing the switch. */
@@ -392,7 +392,7 @@ export class View {
     if (tab === null) return;
     const selections = { ...this.selections.value, [repoKey(tab.host, tab.repo)]: path };
     this.selections.value = selections;
-    localStorage.setItem(WORKTREES_KEY, JSON.stringify(selections));
+    this.store(WORKTREES_KEY, JSON.stringify(selections));
     markAfterPaint(SWITCH_END);
   }
 
@@ -402,7 +402,7 @@ export class View {
     if (tab === null) return;
     const filters = withFilter(this.filters.value, repoKey(tab.host, tab.repo), filter);
     this.filters.value = filters;
-    localStorage.setItem(FILTERS_KEY, JSON.stringify(filters));
+    this.store(FILTERS_KEY, JSON.stringify(filters));
   }
 
   /** Sets the selected repo's name search; empty shows every worktree. */
@@ -411,7 +411,17 @@ export class View {
     if (tab === null) return;
     const searches = withSearch(this.searches.value, repoKey(tab.host, tab.repo), search);
     this.searches.value = searches;
-    localStorage.setItem(SEARCHES_KEY, JSON.stringify(searches));
+    this.store(SEARCHES_KEY, JSON.stringify(searches));
+  }
+
+  /** Stores `value` at `key`, reporting a refused write (storage full or blocked) on the page. */
+  private store(key: string, value: string): void {
+    try {
+      localStorage.setItem(key, value);
+    } catch (error) {
+      if (!(error instanceof DOMException)) throw error;
+      this.notice.value = `Saving the page's settings failed: ${error.message}`;
+    }
   }
 
   /** Sets the sidebar width, within its bounds, without storing it. */
@@ -421,7 +431,7 @@ export class View {
 
   /** Stores the sidebar width for later sessions. */
   storeSidebarWidth(): void {
-    localStorage.setItem(SIDEBAR_WIDTH_KEY, String(this.sidebarWidth.value));
+    this.store(SIDEBAR_WIDTH_KEY, String(this.sidebarWidth.value));
   }
 
   /** Shows the tab of `termId` at once, then stores it as the worktree's active tab. */
@@ -674,7 +684,7 @@ export class View {
       .then(() => {
         if (this.addRepo.peek()?.host === host) this.addRepo.value = null;
         this.selectedRepo.value = repoKey(host, repo);
-        localStorage.setItem(REPO_KEY, repoKey(host, repo));
+        this.store(REPO_KEY, repoKey(host, repo));
       })
       .catch((error: unknown) => {
         this.updateAddRepo(host, { error: describe(error) });
diff --git a/test/e2e/sidebar.spec.ts b/test/e2e/sidebar.spec.ts
index 958c33a..723ef1c 100644
--- a/test/e2e/sidebar.spec.ts
+++ b/test/e2e/sidebar.spec.ts
@@ -238,6 +238,25 @@ test.describe('name search', () => {
     await expect(search).toHaveValue('book');
   });
 
+  test('a refused storage write still narrows the list and is reported on the page', async ({ hub, page }) => {
+    const { repo, worktrees } = makeRepoWith(hub, 'app', ['feat', 'docs']);
+    const [feat = ''] = worktrees;
+    hub.writeRepos([repo]);
+    await page.addInitScript(() => {
+      // eslint-disable-next-line @typescript-eslint/unbound-method -- called below with each storage as `this`
+      const setItem = Storage.prototype.setItem;
+      Storage.prototype.setItem = function (this: Storage, key: string, value: string): void {
+        if (key === 'wtd.searches') throw new DOMException('The quota has been exceeded.', 'QuotaExceededError');
+        setItem.call(this, key, value);
+      };
+    });
+    await openUi(hub, page);
+    await selectWorktree(page, feat);
+    await page.locator(byTestId(TID.worktreeSearch)).fill('fea');
+    await expect.poll(() => listedWorktrees(page)).toEqual([feat]);
+    await expect(page.locator(byTestId(TID.notice))).toContainText("Saving the page's settings failed: The quota has been exceeded.");
+  });
+
   test('applies together with "checked only"', async ({ hub, page }) => {
     const { repo, worktrees } = makeRepoWith(hub, 'app', ['feat-a', 'feat-b', 'other']);
     const [a = '', b = '', other = ''] = worktrees;

From 251944a4dca4bf4f672a1312a37c5ce2a594db7c Mon Sep 17 00:00:00 2001
From: Egor Kraev <egor.kraev@gmail.com>
Date: Fri, 9 Oct 2026 15:19:22 +0200
Subject: [PATCH 3/4] The shim reinstall test waits for the shim's exec before
 reading the daemon's script, instead of sometimes reading the shell's

---
 test/process/install-local.test.ts | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/test/process/install-local.test.ts b/test/process/install-local.test.ts
index 8dbe3de..9180ded 100644
--- a/test/process/install-local.test.ts
+++ b/test/process/install-local.test.ts
@@ -324,8 +324,21 @@ describe('reinstalling', () => {
     const newest = readlinkSync(paths.current).split('/').pop() ?? '';
     const child = spawn(paths.shim, ['daemon'], { env: host.env(), stdio: 'ignore', detached: true });
     child.unref();
-    const pid = await waitUntil(() => daemonPidsOf(host.stateHome)[0], 'the shim daemon', 10_000);
-    const script = readFileSync(`/proc/${String(pid)}/cmdline`, 'utf8').split('\0')[1] ?? '';
+    const script = await waitUntil(
+      () => {
+        const pid = daemonPidsOf(host.stateHome)[0];
+        if (pid === undefined) return undefined;
+        try {
+          // Until its `exec`, the process is the shell running the shim, with the shim as its script.
+          const arg = readFileSync(`/proc/${String(pid)}/cmdline`, 'utf8').split('\0')[1];
+          return arg?.endsWith('/wtd.mjs') === true ? arg : undefined;
+        } catch {
+          return undefined; // The process exited while we looked.
+        }
+      },
+      'the shim to exec the daemon',
+      10_000,
+    );
     expect(script === join(paths.current, 'wtd.mjs') || script.includes(`/versions/${newest}/`)).toBe(true);
   });
 });

From 67f4a876d923df6942b74652d692b93d0677bf16 Mon Sep 17 00:00:00 2001
From: Egor Kraev <egor.kraev@gmail.com>
Date: Fri, 9 Oct 2026 15:23:40 +0200
Subject: [PATCH 4/4] Test the name search on the labels sidebarEntries builds
 for detached and gone worktrees

---
 src/web/ui/sidebar.test.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/web/ui/sidebar.test.ts b/src/web/ui/sidebar.test.ts
index dffea61..d22717e 100644
--- a/src/web/ui/sidebar.test.ts
+++ b/src/web/ui/sidebar.test.ts
@@ -154,6 +154,12 @@ describe('visibleWorktrees', () => {
       expect(paths('all', '@ 0123')).toEqual(['/h']);
     });
 
+    it('searches the directory labels of detached and gone worktrees', () => {
+      const built = sidebarEntries({ worktrees: [main, detached], terminals: [terminal(1, '/gone/wt3')], checked: [] });
+      expect(visibleWorktrees(built, 'all', 'WT2 @', null).map((e) => e.path)).toEqual([detached.path]);
+      expect(visibleWorktrees(built, 'all', 'wt3', null).map((e) => e.path)).toEqual(['/gone/wt3']);
+    });
+
     it('ignores surrounding whitespace, and a blank search lists every entry', () => {
       expect(paths('all', '  fix ')).toEqual(['/g']);
       expect(paths('all', '   ')).toEqual(['/m', '/f', '/g', '/h']);