From 4d24428e8dfc0051c1f46662f20173842203ec1c Mon Sep 17 00:00:00 2001
From: "codexbot.disnetdev.com (did:plc:hbonvqr5ysrscg5wdyb5klie)"
 <codexbot.disnetdev.com@noreply.radial>
Date: Tue, 4 Aug 2026 17:06:29 +0000
Subject: [PATCH] Fix saved view navigation and replacement

Co-Authored-By: codexbot.disnetdev.com (did:plc:hbonvqr5ysrscg5wdyb5klie) <codexbot.disnetdev.com@noreply.radial>
---
 packages/core/src/labels.ts                   |  3 +++
 packages/sidecar/src/commands.ts              |  3 ++-
 .../ui/src/lib/components/FilterBar.svelte    | 19 ++++++++-------
 packages/ui/src/lib/components/Rail.svelte    | 18 ++------------
 packages/ui/src/lib/filters.test.ts           | 13 ++++++++++
 packages/ui/src/lib/filters.ts                | 11 +++++++++
 packages/ui/src/lib/views.test.ts             | 13 +++++++++-
 packages/ui/src/lib/views.ts                  | 24 ++++++++++++++-----
 packages/ui/src/routes/+layout.svelte         |  1 +
 9 files changed, 72 insertions(+), 33 deletions(-)

diff --git a/packages/core/src/labels.ts b/packages/core/src/labels.ts
index 6dce58b..c7ec096 100644
--- a/packages/core/src/labels.ts
+++ b/packages/core/src/labels.ts
@@ -18,6 +18,9 @@ export const LABEL_MAX_LENGTH = 100
 /** `com.disnetdev.radial.labelGoal.labels` item-count ceiling. Same consequence. */
 export const LABELS_MAX = 20
 
+/** A saved-view name as every writer keys it: trimmed, with runs of whitespace collapsed. */
+export const normalizeViewName = (value: string): string => value.replace(/\s+/g, ' ').trim()
+
 /**
  * One label, as it should be written: outer whitespace gone, inner whitespace collapsed to single
  * spaces. `undefined` when nothing survives, so a caller can drop it.
diff --git a/packages/sidecar/src/commands.ts b/packages/sidecar/src/commands.ts
index 54fffd3..f84b4a4 100644
--- a/packages/sidecar/src/commands.ts
+++ b/packages/sidecar/src/commands.ts
@@ -8,6 +8,7 @@ import {
   joinRkey,
   normalizeArtifactTitle,
   normalizeLabels,
+  normalizeViewName,
   parseLabelList,
   spaceNonce,
   type Collection,
@@ -302,7 +303,7 @@ function labelSet(args: string[]): string[] {
 
 /** `--name` for a saved view, bounded by the lexicon for the same reason labels are. */
 function viewName(args: string[]): string {
-  const name = required(args, '--name').replace(/\s+/g, ' ').trim()
+  const name = normalizeViewName(required(args, '--name'))
   if (name === '') throw new Error('--name cannot be empty')
   if (name.length > LABEL_MAX_LENGTH) {
     throw new Error(
diff --git a/packages/ui/src/lib/components/FilterBar.svelte b/packages/ui/src/lib/components/FilterBar.svelte
index 28cd411..608bec1 100644
--- a/packages/ui/src/lib/components/FilterBar.svelte
+++ b/packages/ui/src/lib/components/FilterBar.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { replaceState } from '$app/navigation'
   import { page } from '$app/state'
-  import type { GoalView } from '@radial/core'
+  import { normalizeViewName, type GoalView } from '@radial/core'
   import { account } from '$lib/auth.svelte.js'
   import { participates } from '$lib/admin.js'
   import { filter, setFilter, setState, toggleLabel, clearFilter } from '$lib/filters.svelte.js'
-  import { filterFromParams, filterQuery, narrowing, type GoalState } from '$lib/filters.js'
+  import { filterFromParams, filterHref, narrowing, type GoalState } from '$lib/filters.js'
   import { hasLabel, labelsOf } from '$lib/labels.js'
   import type { Space } from '$lib/space.js'
   import { toast, ui } from '$lib/ui.svelte.js'
@@ -53,11 +53,11 @@
     setFilter(filterFromParams(page.url.searchParams))
   })
   $effect(() => {
-    const query = filterQuery(filter.current)
-    if (query === page.url.search) return
+    const href = filterHref(`${page.url.pathname}${page.url.search}`, filter.current)
+    if (href === `${page.url.pathname}${page.url.search}`) return
     // `replaceState`, never `pushState`: pressing four chips in a row should not put four entries in
     // front of the reader's Back button between them and the page they came from.
-    replaceState(`${page.url.pathname}${query}`, page.state)
+    replaceState(href, page.state)
   })
 
   // Counts over the list this bar governs, not the space: a chip reading "4" beside a project's goals
@@ -83,10 +83,11 @@
   let error = $state('')
   let field = $state<HTMLInputElement | undefined>(undefined)
 
-  const existing = $derived(findView(space.index, live ? me : undefined, name.trim()))
+  const normalizedName = $derived(normalizeViewName(name))
+  const existing = $derived(findView(space.index, live ? me : undefined, normalizedName))
 
   async function save(): Promise<void> {
-    if (busy || name.trim() === '') return
+    if (busy || normalizedName === '') return
     busy = true
     error = ''
     try {
@@ -100,7 +101,7 @@
           filter: { ...filter.current, ...(scopedProject ? { project: scopedProject } : {}) },
         }),
       )
-      toast(existing ? `View “${name.trim()}” updated` : `View “${name.trim()}” saved`)
+      toast(existing ? `View “${normalizedName}” updated` : `View “${normalizedName}” saved`)
       naming = false
       name = ''
     } catch (failure) {
@@ -163,7 +164,7 @@
             }
           }}
         />
-        <button class="btn btn-p" type="button" disabled={busy || name.trim() === ''} onclick={() => void save()}>
+        <button class="btn btn-p" type="button" disabled={busy || normalizedName === ''} onclick={() => void save()}>
           {busy ? '…' : existing ? 'Replace' : 'Save'}
         </button>
         <button class="btn" type="button" disabled={busy} onclick={() => (naming = false)}>Cancel</button>
diff --git a/packages/ui/src/lib/components/Rail.svelte b/packages/ui/src/lib/components/Rail.svelte
index 0a1969c..88ef4cb 100644
--- a/packages/ui/src/lib/components/Rail.svelte
+++ b/packages/ui/src/lib/components/Rail.svelte
@@ -22,8 +22,7 @@
   import { agentDids, askWithAgent, isAwaiting, isMoving, liveUnits } from '$lib/units.js'
   import { reviewQueue, unjudged } from '$lib/verdicts.js'
   import { toast, ui } from '$lib/ui.svelte.js'
-  import { filterQuery } from '$lib/filters.js'
-  import { myViews, viewCount, viewDeleteArgs, viewFilter } from '$lib/views.js'
+  import { myViews, viewCount, viewDeleteArgs, viewHref } from '$lib/views.js'
   import { write } from '$lib/write.js'
   import Glyph from './Glyph.svelte'
   import Pie from './Pie.svelte'
@@ -75,19 +74,6 @@
   // that keeps one path into a narrowed list (the URL) whether the reader got there from here, from a
   // link somebody sent them, or from pressing chips.
   const views = $derived(myViews(space.index, me))
-  const viewHref = (view: (typeof views)[number]): string => {
-    const filter = viewFilter(view)
-    const project = filter.project
-      ? liveProjects(space.index).find((candidate) => candidate.target.uri === filter.project)
-      : undefined
-    // A view pinned to a project lands on that project's page, where the pin is already implied — so
-    // it is dropped from the query rather than restated. Anything else goes to the space-wide list,
-    // which exists precisely because a view cut by label alone spans every project.
-    return project
-      ? `${projectHref(project)}${filterQuery({ ...filter, project: undefined })}`
-      : `${spaceHref(space, '/goals')}${filterQuery(filter)}`
-  }
-
   let removing = $state('')
   async function removeView(name: string): Promise<void> {
     if (removing) return
@@ -161,7 +147,7 @@
         <div class="rail-head">Views</div>
         <ul class="nav">
           {#each views as view (view.name)}
-            {@const href = viewHref(view)}
+            {@const href = viewHref(space.index, space.uri, view)}
             <li class="view-item">
               <a
                 class="nav-item"
diff --git a/packages/ui/src/lib/filters.test.ts b/packages/ui/src/lib/filters.test.ts
index 8288253..bb20b21 100644
--- a/packages/ui/src/lib/filters.test.ts
+++ b/packages/ui/src/lib/filters.test.ts
@@ -4,6 +4,7 @@ import {
   EMPTY_FILTER,
   applyFilter,
   filterFromParams,
+  filterHref,
   filterQuery,
   filterToParams,
   goalMatchesFilter,
@@ -86,6 +87,18 @@ describe('a filter in the URL', () => {
   it('is appendable to an href', () => {
     expect(filterQuery(filter({ state: 'live' }))).toBe('?state=live')
   })
+
+  it('merges filter keys without discarding unrelated navigation context', () => {
+    const href = filterHref('/goals?space=at%3A%2F%2Fs&unit=one&label=old', filter({
+      labels: ['infra', 'ux'],
+      state: 'ended',
+    }))
+    const params = new URL(href, 'https://radl.app').searchParams
+    expect(params.get('space')).toBe('at://s')
+    expect(params.get('unit')).toBe('one')
+    expect(params.getAll('label')).toEqual(['infra', 'ux'])
+    expect(params.get('state')).toBe('ended')
+  })
 })
 
 describe('composition with quick find', () => {
diff --git a/packages/ui/src/lib/filters.ts b/packages/ui/src/lib/filters.ts
index 8e923b6..8fdd6da 100644
--- a/packages/ui/src/lib/filters.ts
+++ b/packages/ui/src/lib/filters.ts
@@ -55,6 +55,7 @@ export const labelCorpus = (goal: GoalView): string => goal.labels.join(' ')
 const LABEL_PARAM = 'label'
 const STATE_PARAM = 'state'
 const PROJECT_PARAM = 'project'
+const FILTER_PARAMS = [LABEL_PARAM, STATE_PARAM, PROJECT_PARAM] as const
 
 /**
  * A filter as query parameters, so any narrowed list is a link somebody can send or bookmark.
@@ -95,3 +96,13 @@ export function filterQuery(filter: GoalFilter): string {
   const query = filterToParams(filter).toString()
   return query === '' ? '' : `?${query}`
 }
+
+/** Merge a filter into an href without disturbing navigation context such as `space` or `unit`. */
+export function filterHref(href: string, filter: GoalFilter): string {
+  const [path, query = ''] = href.split('?')
+  const params = new URLSearchParams(query)
+  for (const key of FILTER_PARAMS) params.delete(key)
+  for (const [key, value] of filterToParams(filter)) params.append(key, value)
+  const encoded = params.toString()
+  return `${path}${encoded ? `?${encoded}` : ''}`
+}
diff --git a/packages/ui/src/lib/views.test.ts b/packages/ui/src/lib/views.test.ts
index 8aa3a54..9814d9e 100644
--- a/packages/ui/src/lib/views.test.ts
+++ b/packages/ui/src/lib/views.test.ts
@@ -2,7 +2,7 @@ import type { GoalView, MaterializedIndex, SavedViewView } from '@radial/core'
 import { describe, expect, it } from 'vitest'
 import { EMPTY_FILTER, goalMatchesFilter, type GoalFilter } from './filters.js'
 import { buildFixtureSpace } from './fixture.js'
-import { findView, myViews, viewCount, viewFilter, viewMatches, viewDeleteArgs, viewSaveArgs } from './views.js'
+import { findView, myViews, viewCount, viewFilter, viewHref, viewMatches, viewDeleteArgs, viewSaveArgs } from './views.js'
 
 // A saved view is a filter with a name. The thing worth proving is that it is the SAME filter — a
 // second predicate here would drift from `filters.ts` and two members would disagree about what a
@@ -66,6 +66,7 @@ describe('which views are mine', () => {
     // Not case-insensitive: the record key is the name as written, so a lookup that folded case
     // would claim a re-save was going to overwrite something it would in fact sit beside.
     expect(findView(index, TIM, 'infra')).toBeUndefined()
+    expect(findView(index, TIM, '  Infra\n ')?.name).toBe('Infra')
   })
 
   it('reads the fixture space, where the views are Tim personal records', () => {
@@ -79,6 +80,16 @@ describe('which views are mine', () => {
   })
 })
 
+describe('the href that applies a view', () => {
+  it('keeps the space locator separate from every filter parameter', () => {
+    const href = viewHref(indexWith([]), SPACE, view({ labels: ['infra'], state: 'live' }))
+    const params = new URL(href, 'https://radl.app').searchParams
+    expect(params.get('space')).toBe(SPACE)
+    expect(params.getAll('label')).toEqual(['infra'])
+    expect(params.get('state')).toBe('live')
+  })
+})
+
 describe('the argv that saves and deletes a view', () => {
   it('names every label and always states the state', () => {
     expect(
diff --git a/packages/ui/src/lib/views.ts b/packages/ui/src/lib/views.ts
index b552d24..4f13143 100644
--- a/packages/ui/src/lib/views.ts
+++ b/packages/ui/src/lib/views.ts
@@ -10,10 +10,11 @@
 // should find the views they made at a desk. Views are personal — the fold surfaces everybody's
 // because records are public regardless, and this module is what narrows that to yours.
 
-import type { MaterializedIndex, SavedViewView } from '@radial/core'
-import { goalMatchesFilter, type GoalFilter } from './filters.js'
+import { normalizeViewName, type MaterializedIndex, type SavedViewView } from '@radial/core'
+import { filterHref, goalMatchesFilter, type GoalFilter } from './filters.js'
 import { normalizeLabels } from './labels.js'
 import type { GoalView } from '@radial/core'
+import { liveProjects, projectHref, withSpace } from './space.js'
 
 /** A view as the filter it stands for. The single bridge between a record and the predicate. */
 export const viewFilter = (view: SavedViewView): GoalFilter => ({
@@ -48,13 +49,24 @@ export const myViews = (index: MaterializedIndex, did: string | undefined): Save
             a.name.toLowerCase().localeCompare(b.name.toLowerCase()) || a.name.localeCompare(b.name),
         )
 
-/** A view of this member's with this name, matched the way a re-save overwrites: exactly. */
+/** A view of this member's with this name, matched after the same normalization every writer uses. */
 export const findView = (
   index: MaterializedIndex,
   did: string | undefined,
   name: string,
 ): SavedViewView | undefined =>
-  myViews(index, did).find((view) => view.name === name)
+  myViews(index, did).find((view) => view.name === normalizeViewName(name))
+
+/** The route a saved view opens, with its filter merged beside the required space locator. */
+export function viewHref(index: MaterializedIndex, spaceUri: string, view: SavedViewView): string {
+  const filter = viewFilter(view)
+  const project = filter.project
+    ? liveProjects(index).find((candidate) => candidate.target.uri === filter.project)
+    : undefined
+  return project
+    ? filterHref(projectHref(project), { ...filter, project: undefined })
+    : filterHref(withSpace('/goals', spaceUri), filter)
+}
 
 /**
  * The argument vector `radial view save` takes — the whole of what a "Save as view…" prompt produces.
@@ -76,7 +88,7 @@ export function viewSaveArgs(fields: {
     '--space',
     space,
     '--name',
-    name.trim(),
+    normalizeViewName(name),
     ...normalizeLabels(filter.labels).flatMap((label) => ['--label', label]),
     // Written even when it is the default, unlike the URL: a view is a record somebody will read back
     // months from now, and a `state` that has to be inferred from its absence is one more thing that
@@ -94,5 +106,5 @@ export const viewDeleteArgs = (fields: { space: string; name: string }): string[
   '--space',
   fields.space,
   '--name',
-  fields.name.trim(),
+  normalizeViewName(fields.name),
 ]
diff --git a/packages/ui/src/routes/+layout.svelte b/packages/ui/src/routes/+layout.svelte
index 1ef50ac..eabe42a 100644
--- a/packages/ui/src/routes/+layout.svelte
+++ b/packages/ui/src/routes/+layout.svelte
@@ -179,6 +179,7 @@
   // ask it for, and nothing is written.
   const LISTS: Record<string, string> = {
     '/': 'Goals',
+    '/goals': 'Goals',
     '/space': 'Space',
     '/me': 'For me',
     '/awaiting': 'Awaiting input',
-- 
2.51.2