From af3cd453240427c12697457ccba5b1a62ee4983a Mon Sep 17 00:00:00 2001
From: Hibryda <hibryda@protonmail.com>
Date: Wed, 11 Mar 2026 05:46:22 +0100
Subject: [PATCH] refactor(components): apply branded types at Svelte component
 call sites

---
 .../components/Workspace/AgentSession.svelte  | 21 ++++++++++---------
 .../components/Workspace/ProjectBox.svelte    |  3 ++-
 .../components/Workspace/ProjectHeader.svelte |  5 +++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/v2/src/lib/components/Workspace/AgentSession.svelte b/v2/src/lib/components/Workspace/AgentSession.svelte
index c9436ed..bb923d6 100644
--- a/v2/src/lib/components/Workspace/AgentSession.svelte
+++ b/v2/src/lib/components/Workspace/AgentSession.svelte
@@ -19,6 +19,7 @@
   import type { AgentMessage } from '../../adapters/claude-messages';
   import { getProvider, getDefaultProviderId } from '../../providers/registry.svelte';
   import { loadAnchorsForProject } from '../../stores/anchors.svelte';
+  import { SessionId, ProjectId } from '../../types/ids';
   import AgentPane from '../Agent/AgentPane.svelte';
 
   interface Props {
@@ -31,17 +32,17 @@
   let providerId = $derived(project.provider ?? getDefaultProviderId());
   let providerMeta = $derived(getProvider(providerId));
 
-  let sessionId = $state(crypto.randomUUID());
+  let sessionId = $state(SessionId(crypto.randomUUID()));
   let lastState = $state<ProjectAgentState | null>(null);
   let loading = $state(true);
   let hasRestoredHistory = $state(false);
 
   function handleNewSession() {
-    sessionId = crypto.randomUUID();
+    sessionId = SessionId(crypto.randomUUID());
     hasRestoredHistory = false;
     lastState = null;
-    registerSessionProject(sessionId, project.id, providerId);
-    trackProject(project.id, sessionId);
+    registerSessionProject(sessionId, ProjectId(project.id), providerId);
+    trackProject(ProjectId(project.id), sessionId);
     onsessionid?.(sessionId);
   }
 
@@ -58,7 +59,7 @@
       const state = await loadProjectAgentState(projectId);
       lastState = state;
       if (state?.last_session_id) {
-        sessionId = state.last_session_id as ReturnType<typeof crypto.randomUUID>;
+        sessionId = SessionId(state.last_session_id);
 
         // Restore cached messages into the agent store
         const records = await loadAgentMessages(projectId);
@@ -67,18 +68,18 @@
           hasRestoredHistory = true;
         }
       } else {
-        sessionId = crypto.randomUUID();
+        sessionId = SessionId(crypto.randomUUID());
       }
     } catch (e) {
       console.warn('Failed to load project agent state:', e);
-      sessionId = crypto.randomUUID();
+      sessionId = SessionId(crypto.randomUUID());
     } finally {
       loading = false;
       // Load persisted anchors for this project
-      loadAnchorsForProject(project.id);
+      loadAnchorsForProject(ProjectId(project.id));
       // Register session -> project mapping for persistence + health tracking
-      registerSessionProject(sessionId, project.id, providerId);
-      trackProject(project.id, sessionId);
+      registerSessionProject(sessionId, ProjectId(project.id), providerId);
+      trackProject(ProjectId(project.id), sessionId);
       onsessionid?.(sessionId);
     }
   }
diff --git a/v2/src/lib/components/Workspace/ProjectBox.svelte b/v2/src/lib/components/Workspace/ProjectBox.svelte
index 18ef39d..cf4565d 100644
--- a/v2/src/lib/components/Workspace/ProjectBox.svelte
+++ b/v2/src/lib/components/Workspace/ProjectBox.svelte
@@ -15,6 +15,7 @@
   import { getProjectHealth, setStallThreshold } from '../../stores/health.svelte';
   import { fsWatchProject, fsUnwatchProject, onFsWriteDetected, fsWatcherStatus } from '../../adapters/fs-watcher-bridge';
   import { recordExternalWrite } from '../../stores/conflicts.svelte';
+  import { ProjectId } from '../../types/ids';
   import { notify, dismissNotification } from '../../stores/notifications.svelte';
 
   interface Props {
@@ -89,7 +90,7 @@
     let unlisten: (() => void) | null = null;
     onFsWriteDetected((event) => {
       if (event.project_id !== projectId) return;
-      const isNew = recordExternalWrite(projectId, event.file_path, event.timestamp_ms);
+      const isNew = recordExternalWrite(ProjectId(projectId), event.file_path, event.timestamp_ms);
       if (isNew) {
         const shortName = event.file_path.split('/').pop() ?? event.file_path;
         notify('warning', `External write: ${shortName} — file also modified by agent`);
diff --git a/v2/src/lib/components/Workspace/ProjectHeader.svelte b/v2/src/lib/components/Workspace/ProjectHeader.svelte
index 2114fc8..481c5fd 100644
--- a/v2/src/lib/components/Workspace/ProjectHeader.svelte
+++ b/v2/src/lib/components/Workspace/ProjectHeader.svelte
@@ -3,6 +3,7 @@
   import { PROJECT_ACCENTS } from '../../types/groups';
   import type { ProjectHealth } from '../../stores/health.svelte';
   import { acknowledgeConflicts } from '../../stores/conflicts.svelte';
+  import { ProjectId } from '../../types/ids';
 
   interface Props {
     project: ProjectConfig;
@@ -85,7 +86,7 @@
       <button
         class="info-conflict info-conflict-external"
         title="{health.externalConflictCount} external write{health.externalConflictCount > 1 ? 's' : ''} — files modified outside agent — click to dismiss"
-        onclick={(e: MouseEvent) => { e.stopPropagation(); acknowledgeConflicts(project.id); }}
+        onclick={(e: MouseEvent) => { e.stopPropagation(); acknowledgeConflicts(ProjectId(project.id)); }}
       >
         ⚡ {health.externalConflictCount} ext write{health.externalConflictCount > 1 ? 's' : ''} ✕
       </button>
@@ -95,7 +96,7 @@
       <button
         class="info-conflict"
         title="{health.fileConflictCount - (health.externalConflictCount ?? 0)} agent conflict{health.fileConflictCount - (health.externalConflictCount ?? 0) > 1 ? 's' : ''} — click to dismiss"
-        onclick={(e: MouseEvent) => { e.stopPropagation(); acknowledgeConflicts(project.id); }}
+        onclick={(e: MouseEvent) => { e.stopPropagation(); acknowledgeConflicts(ProjectId(project.id)); }}
       >
         ⚠ {health.fileConflictCount - (health.externalConflictCount ?? 0)} conflict{health.fileConflictCount - (health.externalConflictCount ?? 0) > 1 ? 's' : ''} ✕
       </button>