@ibgib/space-gib 0.0.34 → 0.0.35

package/src/client/ui/component/nested-chat/chat/chat.mts

@@ -166,106 +166,21 @@ export class ChatComponentInstance
         const { ib } = getIbAndGib({ ibGibAddr: addr });
 
         if (addr === ROOT_ADDR || ib === 'root' || ib.includes('space-gib')) {
-            this.el.contextTitleEl.textContent = 'Thread: src/index.ts';
+            this.el.contextTitleEl.textContent = 'Thread: Workspace';
         } else if (ib.startsWith('comment')) {
             const pieces = ib.split(' ');
             const preview = pieces.length > 1 ? pieces.slice(1).join(' ') : 'Comment Thread';
             this.el.contextTitleEl.textContent = `Thread: "${preview.slice(0, 24)}..."`;
+        } else if (ib.startsWith('file ')) {
+            const file = ib.replace('file ', '');
+            this.el.contextTitleEl.textContent = `Thread: ${file}`;
         } else {
             this.el.contextTitleEl.textContent = `Thread: ${ib.slice(0, 20)}`;
         }
     }
 
     private loadInitialMessages(): void {
-        const addr = this.ibGibAddr ?? ROOT_ADDR;
-        const { ib } = getIbAndGib({ ibGibAddr: addr });
-
-        if (ib.includes('boundary') || ib.includes('try/catch') || ib.includes('boot')) {
-            // Nested replies for the error boundary comment thread
-            this.messages = [
-                {
-                    id: 'submsg-1',
-                    addr: 'comment boundary-rationale^gib_b1',
-                    author: 'Charlie',
-                    avatar: '👩‍🔬',
-                    role: 'Peer',
-                    timestamp: '3m ago',
-                    text: 'Wrapping boot() in a top-level error boundary prevents uncaught rejections from freezing the virtual canvas.',
-                    replyCount: 1,
-                },
-                {
-                    id: 'submsg-2',
-                    addr: 'comment boundary-event^gib_b2',
-                    author: 'Bob',
-                    avatar: '👨‍🚀',
-                    role: 'Peer',
-                    timestamp: '1m ago',
-                    text: 'Agreed! Let us also dispatch an EVENT_IBGIB_UI_MESSAGE so the status bar shows the error banner.',
-                    replyCount: 0,
-                }
-            ];
-        } else if (ib.includes('rationale') || ib.includes('index.ts') || ib.includes('indexeddb')) {
-            // Nested replies for the architectural rationale comment thread
-            this.messages = [
-                {
-                    id: 'submsg-3',
-                    addr: 'comment offline-merkle^gib_a1',
-                    author: 'Bob',
-                    avatar: '👨‍🚀',
-                    role: 'Peer',
-                    timestamp: '5m ago',
-                    text: 'The local IndexedDB space works completely offline without network roundtrips.',
-                    replyCount: 0,
-                },
-                {
-                    id: 'submsg-4',
-                    addr: 'comment sync-keystone^gib_a2',
-                    author: 'Alice',
-                    avatar: '👩‍💻',
-                    role: 'Keystone',
-                    timestamp: '2m ago',
-                    text: 'Exactly! Remote peer hubs synchronize automatically via WebSockets whenever connectivity is detected.',
-                    replyCount: 0,
-                }
-            ];
-        } else {
-            // Default file / root comments
-            this.messages = [
-                {
-                    id: 'msg-1',
-                    addr: 'comment index-arch-rationale^gib_1',
-                    author: 'Alice',
-                    avatar: '👩‍💻',
-                    role: 'Keystone',
-                    timestamp: '10m ago',
-                    anchor: 'src/index.ts#L1-18',
-                    text: 'Architectural Rationale: This entrypoint initializes the virtual repository workspace within the browser’s local IndexedDB metaspace.',
-                    replyCount: 2,
-                },
-                {
-                    id: 'msg-2',
-                    addr: 'comment index-try-catch^gib_2',
-                    author: 'Bob',
-                    avatar: '👨‍🚀',
-                    role: 'Peer',
-                    timestamp: '6m ago',
-                    anchor: 'src/index.ts#L36-42',
-                    text: 'Looks super clean! Should we add an async try/catch boundary around boot() as well?',
-                    replyCount: 2,
-                },
-                {
-                    id: 'msg-3',
-                    addr: 'comment index-agent-analysis^gib_3',
-                    author: 'Agent',
-                    avatar: '🤖',
-                    role: 'Agent',
-                    timestamp: '4m ago',
-                    anchor: 'src/index.ts#L43-50',
-                    text: 'Static analysis confirms that initOrchestration provides a root failure boundary.',
-                    replyCount: 0,
-                }
-            ];
-        }
+        this.messages = [];
     }
 
     private async initEnterBehavior(): Promise<void> {

package/src/client/ui/component/nested-chat/nested-chat.mts

@@ -99,7 +99,7 @@ export class NestedChatComponentInstance
 
     private ensureValidIbGibAddr(addr: string): IbGibAddr {
         if (!addr || addr === ROOT_ADDR) {
-            return 'file src/index.ts^index_tjp';
+            return ROOT_ADDR;
         }
         if (!addr.includes('^')) {
             return `file ${addr}^${addr.replace(/[^a-zA-Z0-9]/g, '_')}_tjp`;
@@ -123,13 +123,15 @@ export class NestedChatComponentInstance
 
             this.bindEvents();
 
-            // Only activate initial thread if an ibGibAddr was explicitly provided to the component
-            if (this.ibGibAddr) {
+            // Only activate initial thread if an ibGibAddr was explicitly provided (not ROOT_ADDR)
+            if (this.ibGibAddr && this.ibGibAddr !== ROOT_ADDR) {
                 const rootAddr = this.ensureValidIbGibAddr(this.ibGibAddr);
-                setTimeout(async () => {
-                    console.log(`${lc} activating initial root thread: ${rootAddr}`);
-                    await this.activateIbGib({ addr: rootAddr });
-                }, 0);
+                if (rootAddr && rootAddr !== ROOT_ADDR) {
+                    setTimeout(async () => {
+                        console.log(`${lc} activating initial root thread: ${rootAddr}`);
+                        await this.activateIbGib({ addr: rootAddr });
+                    }, 0);
+                }
             }
 
         } catch (error) {
@@ -350,7 +352,7 @@ export class NestedChatComponentInstance
 
         const { ib } = getIbAndGib({ ibGibAddr: addr });
         if (addr === ROOT_ADDR || ib === 'root' || ib.includes('file') || !addr.includes('comment')) {
-            const fileTitle = ib.startsWith('file ') ? ib.replace('file ', '') : 'src/index.ts';
+            const fileTitle = ib.startsWith('file ') ? ib.replace('file ', '') : (ib === 'root' || addr === ROOT_ADDR ? 'Workspace' : ib);
             return {
                 shortTitle: this.formatShortTitle(fileTitle),
                 fullText: `Root Thread: ${fileTitle}`,

package/src/client/ui/component/timeline/timeline.css

@@ -2,15 +2,25 @@
   display: flex;
   flex-direction: column;
   width: 100%;
+  height: 100%;
+  min-height: 0;
   box-sizing: border-box;
   margin: 0;
   padding: 0;
 }
 
+:host([collapsed]) {
+  height: auto !important;
+  flex: 0 0 auto !important;
+}
+
 .timeline-root {
   display: flex;
   flex-direction: column;
   width: 100%;
+  height: 100%;
+  min-height: 0;
+  overflow: hidden;
   user-select: none;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
   box-sizing: border-box;
@@ -23,7 +33,7 @@
   display: flex;
   align-items: center;
   gap: 0.35rem;
-  padding: 0.4rem 0.6rem;
+  padding: 0.28rem 0.5rem;
   background: rgba(255, 255, 255, 0.04);
   border: 1px solid rgba(255, 255, 255, 0.08);
   border-radius: 6px;
@@ -35,6 +45,8 @@
   outline: none;
   box-sizing: border-box;
   margin: 0;
+  flex: 0 0 auto !important;
+  flex-shrink: 0 !important;
 }
 
 .timeline-header:hover {
@@ -135,6 +147,9 @@
 .timeline-stream-container {
   display: flex;
   flex-direction: column;
+  flex: 1 1 0px;
+  min-height: 0;
+  overflow-y: auto;
   position: relative;
   padding: 0.35rem 0.2rem 0.5rem 0.8rem;
   box-sizing: border-box;

package/src/client/ui/component/timeline/timeline.mts

@@ -87,98 +87,8 @@ export class TimelineComponentInstance
 
     private branchName: string = 'main';
     private isTimelineExpanded: boolean = true;
-    private selectedHash: string = '3e8f1c2';
-
-    private snapshots: TimelineItem[] = [
-        {
-            hash: '3e8f1c2a05d8f99e32b4f17c802e3b4a',
-            shortHash: '3e8f1c2',
-            message: 'feat: implement cosmos navigation and orbital drift',
-            author: 'Bill Raiford <bill@ibgib.space>',
-            timestamp: '2m ago',
-            isTip: true,
-            branch: 'main',
-            parentHash: 'a7b4d90',
-            changedFiles: [
-                { path: 'src/client/ui/component/cosmos-navigator/cosmos-navigator.mts', status: 'M', additions: 18, deletions: 4 },
-                { path: 'src/client/ui/shell/space-gib-shell-service.mts', status: 'M', additions: 32, deletions: 6 },
-                { path: 'src/client/css/layout.css', status: 'M', additions: 14, deletions: 2 },
-            ],
-            diffPreview: `@@ -848,6 +848,20 @@
--        this.launchProjectile({ ... });
-+        // Make activity bar visible BEFORE zoom flight starts
-+        window.dispatchEvent(new CustomEvent('space-gib-activity-bar-expand-requested'));
-+        setTimeout(() => {
-+            this.launchProjectile({ ... });
-+        }, 180);`
-        },
-        {
-            hash: 'a7b4d9089f21c4320b9e8471da329188',
-            shortHash: 'a7b4d90',
-            message: 'style: polish firecracker big bang compression',
-            author: 'Bill Raiford <bill@ibgib.space>',
-            timestamp: '1h ago',
-            branch: 'main',
-            parentHash: 'f2098b1',
-            changedFiles: [
-                { path: 'src/client/ui/component/cosmos-navigator/cosmos-navigator.css', status: 'M', additions: 24, deletions: 11 },
-                { path: 'src/client/ui/component/cosmos-navigator/cosmos-navigator.mts', status: 'M', additions: 12, deletions: 5 },
-            ],
-            diffPreview: `@@ -430,8 +430,12 @@
--        btn.classList.add('compressing');
-+        // Firecracker high velocity rotation
-+        btn.classList.add('compressing');
-+        this.triggerBigBangExplosion();`
-        },
-        {
-            hash: 'f2098b191c4998721fae390c91834789',
-            shortHash: 'f2098b1',
-            message: 'refactor: decouple activity bar and cosmos controls',
-            author: 'Bill Raiford <bill@ibgib.space>',
-            timestamp: 'yesterday',
-            branch: 'main',
-            parentHash: 'c019a4e',
-            changedFiles: [
-                { path: 'src/client/ui/shell/cosmic-big-bang.mts', status: 'M', additions: 40, deletions: 52 },
-                { path: 'src/client/ui/shell/space-gib-shell-service.mts', status: 'M', additions: 75, deletions: 18 },
-            ],
-            diffPreview: `@@ -120,7 +120,7 @@
--    public toggleActivityBar(): void {
-+    public expandActivityBar(): void {`
-        },
-        {
-            hash: 'c019a4ee899201bdcf88132582910fa2',
-            shortHash: 'c019a4e',
-            message: 'feat: primordial singularity and big bang stage',
-            author: 'Bill Raiford <bill@ibgib.space>',
-            timestamp: '3d ago',
-            branch: 'main',
-            parentHash: '0000000',
-            changedFiles: [
-                { path: 'src/client/ui/component/cosmos-navigator/cosmos-navigator.mts', status: 'A', additions: 450, deletions: 0 },
-                { path: 'src/client/ui/component/cosmos-navigator/cosmos-navigator.html', status: 'A', additions: 95, deletions: 0 },
-            ],
-            diffPreview: `@@ -0,0 +1,95 @@
-+<div id="cosmos-nav-root" class="cosmos-nav-root">
-+  <canvas id="bg-canvas"></canvas>
-+</div>`
-        },
-        {
-            hash: '00000000000000000000000000000000',
-            shortHash: '0000000',
-            message: 'Initial commit (empty space genesis)',
-            author: 'Bill Raiford <bill@ibgib.space>',
-            timestamp: '5d ago',
-            branch: 'main',
-            changedFiles: [
-                { path: 'package.json', status: 'A', additions: 35, deletions: 0 },
-                { path: 'README.md', status: 'A', additions: 20, deletions: 0 },
-            ],
-            diffPreview: `@@ -0,0 +1,20 @@
-+# space-gib
-+Decentralized VCS and superspaces.`
-        }
-    ];
+    private selectedHash: string = '';
+    private snapshots: TimelineItem[] = [];
 
     get el(): TimelineElements {
         if (!this.elements) {
@@ -203,6 +113,7 @@ export class TimelineComponentInstance
                 contentEl: shadow.getElementById('timeline-root') as HTMLDivElement,
             };
 
+            this.toggleAttribute('collapsed', !this.isTimelineExpanded);
             this.bindHandlers();
             this.renderSnapshots();
         } catch (error) {
@@ -238,6 +149,15 @@ export class TimelineComponentInstance
         if (!container) { return; }
         container.innerHTML = '';
 
+        if (this.snapshots.length === 0) {
+            container.innerHTML = `
+                <div class="empty-timeline-msg" style="padding: 16px 12px; font-size: 11px; color: #8a99a8; font-style: italic; text-align: center;">
+                    No commits on branch [${this.branchName}] yet.
+                </div>
+            `;
+            return;
+        }
+
         for (const item of this.snapshots) {
             const row = document.createElement('div');
             row.className = `timeline-item ${item.shortHash === this.selectedHash ? 'selected' : ''} ${item.isTip ? 'is-tip' : ''}`;
@@ -268,6 +188,11 @@ export class TimelineComponentInstance
         }
     }
 
+    public setSnapshots(snapshots: TimelineItem[]): void {
+        this.snapshots = snapshots || [];
+        this.renderSnapshots();
+    }
+
     public selectTimelineItem(hash: string): void {
         this.selectedHash = hash;
         const shadow = this.shadowRoot;
@@ -288,8 +213,23 @@ export class TimelineComponentInstance
         }
     }
 
+    public addSnapshot(snapshot: TimelineItem): void {
+        for (const s of this.snapshots) {
+            s.isTip = false;
+        }
+        snapshot.isTip = true;
+        this.snapshots.unshift(snapshot);
+        this.renderSnapshots();
+    }
+
+    public clearSnapshots(): void {
+        this.snapshots = [];
+        this.renderSnapshots();
+    }
+
     public toggleTimelineAccordion(): void {
         this.isTimelineExpanded = !this.isTimelineExpanded;
+        this.toggleAttribute('collapsed', !this.isTimelineExpanded);
         const chevron = this.el.timelineHeaderEl.querySelector('.chevron-icon');
 
         if (this.isTimelineExpanded) {
@@ -301,9 +241,13 @@ export class TimelineComponentInstance
             this.el.timelineHeaderEl.classList.remove('expanded');
             this.el.timelineHeaderEl.classList.add('collapsed');
             this.el.timelineStreamContainerEl.classList.add('hidden');
-            // if (chevron) chevron.textContent = '▶';
             if (chevron) { chevron.textContent = '▼'; }
         }
+        this.dispatchEvent(new CustomEvent('space-gib-accordion-toggled', {
+            detail: { isExpanded: this.isTimelineExpanded },
+            bubbles: true,
+            composed: true,
+        }));
     }
 
     override async disconnected(): Promise<void> {

package/src/client/ui/router/space-gib-router-helpers.mts

@@ -2,199 +2,50 @@
  * @module client/ui/router/space-gib-router-helpers
  *
  * Route parsing and formatting helpers for the Space-Gib Client Router.
- * Pure isomorphic functions with zero DOM dependency.
+ * Delegates universal Cosmos & Galaxy routes to @ibgib/web-gib,
+ * while handling space-gib specific routes (/admin/review).
  */
 
 import {
-    SpaceGibRouteInfo, SpaceGibTenant,
+    parseCosmosRoute,
+    formatCosmosRoute,
+    isSameCosmosRoute,
+    safeDecode,
+    ParseCosmosRouteOptions,
+    CosmosRouteInfo,
+} from '@ibgib/web-gib/dist/ui/router/index.mjs';
+
+import {
+    SpaceGibRouteInfo,
+    AdminReviewRouteInfo,
 } from './space-gib-router-types.mjs';
 
-/**
- * Safely decodes a URI component, returning the raw string if decoding fails.
- */
-function safeDecode(str: string): string {
-    try {
-        return decodeURIComponent(str);
-    } catch {
-        return str;
-    }
-}
+export { safeDecode };
+export type ParseSpaceGibRouteOptions = ParseCosmosRouteOptions;
 
 /**
  * Parses a browser pathname into a structured SpaceGibRouteInfo.
- *
- * Supports:
- * - Polycosmos: / or /polycosmos or /@:siteUsername or /keystone/:keystoneTjp
- * - Cosmos: /:cosmos or /@:siteUsername/:cosmos or /keystone/:keystoneTjp/:cosmos
- * - Code Galaxy: /:cosmos/code/:galaxyId[/:branch[/*filePath]]
- * - Notes Galaxy: /:cosmos/notes/:galaxyId[/:topicTjp]
- * - Raw Addr (Snapshot): /:cosmos/:spaceId/addr/:ibGibAddr
- * - Raw Tjp (Living Tip): /:cosmos/:spaceId/tjp/:tjpAddr
- * - Admin Review: /admin/review[/:tjpGib]
+ * Handles /admin/review explicitly, and delegates all Cosmos / Galaxy / Raw routes to @ibgib/web-gib.
  */
-export function parseSpaceGibRoute(pathname: string): SpaceGibRouteInfo {
+export function parseSpaceGibRoute(pathname: string, opts?: ParseSpaceGibRouteOptions): SpaceGibRouteInfo {
     let p = (pathname || '').trim();
 
-    let queryObj: Record<string, string> | undefined;
-    const qIdx = p.indexOf('?');
-    if (qIdx !== -1) {
-        const qStr = p.substring(qIdx + 1);
-        p = p.substring(0, qIdx);
-        const searchParams = new URLSearchParams(qStr);
-        const q: Record<string, string> = {};
-        searchParams.forEach((val, key) => {
-            q[key] = val;
-        });
-        if (Object.keys(q).length > 0) {
-            queryObj = q;
-        }
-    }
-    const hIdx = p.indexOf('#');
-    if (hIdx !== -1) { p = p.substring(0, hIdx); }
+    // Check query string/hash for /admin/review prefix
+    let cleanPath = p;
+    const qIdx = cleanPath.indexOf('?');
+    if (qIdx !== -1) { cleanPath = cleanPath.substring(0, qIdx); }
+    const hIdx = cleanPath.indexOf('#');
+    if (hIdx !== -1) { cleanPath = cleanPath.substring(0, hIdx); }
 
-    if (!p || p === '/') {
-        return { kind: 'polycosmos' };
-    }
-
-    // Special Route: /admin/review
-    if (p === '/admin/review') {
+    if (cleanPath === '/admin/review') {
         return { kind: 'admin-review' };
     }
-    if (p.startsWith('/admin/review/')) {
-        const tjpGib = safeDecode(p.slice('/admin/review/'.length)).trim();
+    if (cleanPath.startsWith('/admin/review/')) {
+        const tjpGib = safeDecode(cleanPath.slice('/admin/review/'.length)).trim();
         return { kind: 'admin-review', ...(tjpGib ? { tjpGib } : {}) };
     }
 
-    const rawSegments = p.split('/').filter(s => s.length > 0);
-    if (rawSegments.length === 0) {
-        return { kind: 'polycosmos' };
-    }
-
-    // Extract tenant prefix if present (@username or /keystone/tjp)
-    let tenant: SpaceGibTenant | undefined;
-    let segIdx = 0;
-
-    if (rawSegments[0].startsWith('@')) {
-        const username = safeDecode(rawSegments[0].slice(1)).trim();
-        if (username) {
-            tenant = { type: 'username', siteUsername: username };
-            segIdx = 1;
-        }
-    } else if (rawSegments[0] === 'keystone' && rawSegments.length > 1) {
-        const keystoneTjp = safeDecode(rawSegments[1]).trim();
-        if (keystoneTjp) {
-            tenant = { type: 'keystone', keystoneTjp };
-            segIdx = 2;
-        }
-    }
-
-    const remaining = rawSegments.slice(segIdx);
-
-    // If only tenant specifier was given (e.g. /@bill or /keystone/tjp123)
-    if (remaining.length === 0) {
-        return { kind: 'polycosmos', ...(tenant ? { tenant } : {}) };
-    }
-
-    if (remaining.length === 1 && remaining[0] === 'polycosmos') {
-        return { kind: 'polycosmos', ...(tenant ? { tenant } : {}) };
-    }
-
-    const cosmos = safeDecode(remaining[0]).trim();
-
-    if (remaining.length === 1) {
-        return { kind: 'cosmos', ...(tenant ? { tenant } : {}), cosmos };
-    }
-
-    const second = safeDecode(remaining[1]).trim();
-
-    // Code Galaxy: /:cosmos/code/:galaxyId[/:branch[/*filePath]]
-    if (second === 'code') {
-        const galaxyId = remaining[2] ? safeDecode(remaining[2]).trim() : '';
-        if (!galaxyId) {
-            return { kind: 'cosmos', ...(tenant ? { tenant } : {}), cosmos };
-        }
-        const branch = remaining[3] ? safeDecode(remaining[3]).trim() : undefined;
-        const filePath = remaining.length > 4 ? remaining.slice(4).map(safeDecode).join('/') : undefined;
-        return {
-            kind: 'code-galaxy',
-            ...(tenant ? { tenant } : {}),
-            cosmos,
-            galaxyId,
-            ...(branch ? { branch } : {}),
-            ...(filePath ? { filePath } : {}),
-        };
-    }
-
-    // Notes Galaxy: /:cosmos/notes/:galaxyId[/tjp/:tjp1/:tjp2...] or [/addr/:addr1/:addr2...] or [/:topicTjp]
-    if (second === 'notes') {
-        const galaxyId = remaining[2] ? safeDecode(remaining[2]).trim() : '';
-        if (!galaxyId) {
-            return { kind: 'cosmos', ...(tenant ? { tenant } : {}), cosmos };
-        }
-
-        let trailMode: 'tjp' | 'addr' | undefined;
-        let trail: string[] | undefined;
-        let topicTjp: string | undefined;
-
-        if (remaining.length > 3) {
-            const modeCandidate = safeDecode(remaining[3]).trim();
-            if (modeCandidate === 'tjp' || modeCandidate === 'addr') {
-                trailMode = modeCandidate;
-                const trailSegments = remaining.slice(4).map(s => safeDecode(s).trim()).filter(s => s.length > 0);
-                if (trailSegments.length > 0) {
-                    trail = trailSegments;
-                    topicTjp = trailSegments[0];
-                }
-            } else {
-                // Backward compatibility / shorthand: /notes/:galaxyId/:topicTjp
-                topicTjp = modeCandidate;
-                trailMode = 'tjp';
-                trail = [modeCandidate];
-            }
-        }
-
-        return {
-            kind: 'notes-galaxy',
-            ...(tenant ? { tenant } : {}),
-            cosmos,
-            galaxyId,
-            ...(trailMode ? { trailMode } : {}),
-            ...(trail ? { trail } : {}),
-            ...(topicTjp ? { topicTjp } : {}),
-            ...(queryObj ? { query: queryObj } : {}),
-        };
-    }
-
-    // Mechanism 1: Space-Qualified Raw Addrs
-    // /:cosmos/:spaceId/addr/:ibGibAddr
-    // /:cosmos/:spaceId/tjp/:tjpAddr
-    if (remaining.length >= 4) {
-        const third = safeDecode(remaining[2]).trim();
-        const spaceId = second;
-        if (third === 'addr') {
-            const ibGibAddr = safeDecode(remaining.slice(3).join('/')).trim();
-            return {
-                kind: 'raw-addr',
-                ...(tenant ? { tenant } : {}),
-                cosmos,
-                spaceId,
-                ibGibAddr,
-            };
-        }
-        if (third === 'tjp') {
-            const tjpAddr = safeDecode(remaining.slice(3).join('/')).trim();
-            return {
-                kind: 'raw-tjp',
-                ...(tenant ? { tenant } : {}),
-                cosmos,
-                spaceId,
-                tjpAddr,
-            };
-        }
-    }
-
-    // Fallback: Cosmos route
-    return { kind: 'cosmos', ...(tenant ? { tenant } : {}), cosmos };
+    return parseCosmosRoute(pathname, opts) as SpaceGibRouteInfo;
 }
 
 /**
@@ -204,62 +55,7 @@ export function formatSpaceGibRoute(route: SpaceGibRouteInfo): string {
     if (route.kind === 'admin-review') {
         return `/admin/review${route.tjpGib ? `/${encodeURIComponent(route.tjpGib)}` : ''}`;
     }
-
-    let prefix = '';
-    if (route.tenant) {
-        if (route.tenant.type === 'username') {
-            prefix = `/@${encodeURIComponent(route.tenant.siteUsername)}`;
-        } else if (route.tenant.type === 'keystone') {
-            prefix = `/keystone/${encodeURIComponent(route.tenant.keystoneTjp)}`;
-        }
-    }
-
-    switch (route.kind) {
-        case 'polycosmos':
-            return prefix ? `${prefix}/polycosmos` : '/';
-
-        case 'cosmos':
-            return `${prefix}/${encodeURIComponent(route.cosmos)}`;
-
-        case 'code-galaxy': {
-            let res = `${prefix}/${encodeURIComponent(route.cosmos)}/code/${encodeURIComponent(route.galaxyId)}`;
-            if (route.branch) {
-                res += `/${encodeURIComponent(route.branch)}`;
-                if (route.filePath) {
-                    res += `/${route.filePath.split('/').map(encodeURIComponent).join('/')}`;
-                }
-            }
-            return res;
-        }
-
-        case 'notes-galaxy': {
-            let res = `${prefix}/${encodeURIComponent(route.cosmos)}/notes/${encodeURIComponent(route.galaxyId)}`;
-            if (route.trail && route.trail.length > 0) {
-                const mode = route.trailMode || 'tjp';
-                res += `/${mode}/${route.trail.map(encodeURIComponent).join('/')}`;
-            } else if (route.topicTjp) {
-                res += `/${encodeURIComponent(route.topicTjp)}`;
-            }
-            if (route.query && Object.keys(route.query).length > 0) {
-                const sp = new URLSearchParams();
-                for (const [k, v] of Object.entries(route.query)) {
-                    if (v !== undefined) { sp.set(k, v); }
-                }
-                const qs = sp.toString();
-                if (qs) { res += `?${qs}`; }
-            }
-            return res;
-        }
-
-        case 'raw-addr':
-            return `${prefix}/${encodeURIComponent(route.cosmos)}/${encodeURIComponent(route.spaceId)}/addr/${encodeURIComponent(route.ibGibAddr)}`;
-
-        case 'raw-tjp':
-            return `${prefix}/${encodeURIComponent(route.cosmos)}/${encodeURIComponent(route.spaceId)}/tjp/${encodeURIComponent(route.tjpAddr)}`;
-
-        default:
-            return '/';
-    }
+    return formatCosmosRoute(route as CosmosRouteInfo);
 }
 
 /**
@@ -268,5 +64,9 @@ export function formatSpaceGibRoute(route: SpaceGibRouteInfo): string {
 export function isSameRoute(a?: SpaceGibRouteInfo, b?: SpaceGibRouteInfo): boolean {
     if (!a && !b) { return true; }
     if (!a || !b) { return false; }
-    return formatSpaceGibRoute(a) === formatSpaceGibRoute(b);
+    if (a.kind === 'admin-review' || b.kind === 'admin-review') {
+        if (a.kind !== b.kind) { return false; }
+        return (a as AdminReviewRouteInfo).tjpGib === (b as AdminReviewRouteInfo).tjpGib;
+    }
+    return isSameCosmosRoute(a as CosmosRouteInfo, b as CosmosRouteInfo);
 }