@jkwd/inbase 0.1.9 → 0.1.11

package/apps/explorer/src/App.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Canvas } from '@react-three/fiber'
-import { emptyIntent, fetchAgentIntent, fetchAgentIntents, inspectTargetFile, performAgentAction, persistSessionBlueprint } from './agentIntent'
+import { emptyIntent, fetchAgentIntent, fetchAgentIntents, inspectTargetFile, performAgentAction, persistSessionBlueprint, persistSessionFocus, setupVisualizerSession } from './agentIntent'
+import { emptyBranchChanges, fetchBranchChanges } from './branchChanges'
 import { fetchCodebase, updateCodebase } from './codebase'
 import {
   layoutWorld,
@@ -16,6 +17,7 @@ import { HUD } from './ui/HUD'
 import {
   fetchUserContext,
   persistFollowLook,
+  persistShowBranchChanges,
   persistUserContext,
 } from './userContext'
 import {
@@ -34,6 +36,7 @@ import {
 } from './userCreated'
 import {
   isPatchPreview,
+  llmIsMakingChanges,
   type AgentIntent,
   type AimedRelation,
   type CodebaseGraph,
@@ -52,7 +55,13 @@ function intentSignature(intent: AgentIntent) {
     status: intent.status,
     phase: intent.phase,
     stalledWait: intent.stalledWait,
+    llmIdle: intent.llmIdle,
+    awaitingAttach: intent.awaitingAttach,
+    listening: intent.listening,
+    lastAck: intent.lastAck,
     sessionId: intent.sessionId,
+    name: intent.name,
+    feature: intent.feature,
     creationMode: intent.creationMode,
     diffId: intent.diffId,
     chain: intent.chain,
@@ -75,8 +84,15 @@ export default function App() {
   const [updatingModel, setUpdatingModel] = useState(false)
   const updatingModelRef = useRef(false)
 
+  const graphSig = useRef<string | null>(null)
   const applyGraph = useCallback((next: CodebaseGraph | null, failed: string) => {
     if (next) {
+      const signature = JSON.stringify(next)
+      if (signature === graphSig.current) {
+        setLoadError(null)
+        return true
+      }
+      graphSig.current = signature
       setGraph(next)
       setLoadError(null)
       return true
@@ -136,17 +152,27 @@ function Explorer({
 }) {
   const [intents, setIntents] = useState<AgentIntent[]>([])
   const [focusedSessionId, setFocusedSessionId] = useState<string | null>(null)
+  const [wantBranchChanges, setWantBranchChanges] = useState(false)
+  const [branchChanges, setBranchChanges] = useState(emptyBranchChanges)
   const intent =
     intents.find((item) => item.sessionId === focusedSessionId) ??
     intents[0] ??
     emptyIntent
-  const creationIntent =
-    intents.find((item) => item.creationMode) ??
-    intents.find((item) => item.status === 'blueprint') ??
-    null
-  const creationMode = Boolean(creationIntent?.creationMode)
-  const previewing = intent.preview || isPatchPreview(intent.status)
-  const plannedCreates = previewing ? intent.creates : []
+  const canPlace = Boolean(intent.sessionId && intent.creationMode)
+  const llmBusy = intents.some(llmIsMakingChanges)
+  const llmPreviewing = intent.preview || isPatchPreview(intent.status)
+  const showingBranchChanges =
+    wantBranchChanges &&
+    !llmBusy &&
+    !llmPreviewing &&
+    branchChanges.available
+  const changeSet = llmPreviewing
+    ? intent
+    : showingBranchChanges
+      ? branchChanges
+      : emptyIntent
+  const previewing = llmPreviewing || showingBranchChanges
+  const plannedCreates = previewing ? changeSet.creates : []
   const [userBlocks, setUserBlocks] = useState<UserCreatedBlock[]>([])
   const [userIslands, setUserIslands] = useState<UserCreatedIsland[]>([])
   const [blueprintFunctions, setBlueprintFunctions] = useState<
@@ -166,15 +192,15 @@ function Explorer({
     return withPreviewGraph(
       graph,
       plannedCreates,
-      intent.createLines ?? {},
-      intent.createFolders ?? [],
-      intent.imports ?? [],
+      changeSet.createLines ?? {},
+      changeSet.createFolders ?? [],
+      changeSet.imports ?? [],
     )
   }, [
+    changeSet.createFolders,
+    changeSet.createLines,
+    changeSet.imports,
     graph,
-    intent.createFolders,
-    intent.createLines,
-    intent.imports,
     plannedCreates,
     previewing,
   ])
@@ -197,14 +223,20 @@ function Explorer({
   )
   const layout = useMemo(() => {
     const world = layoutWorld(previewGraph)
-    if (previewing) markCreatedFolders(world, intent.createFolders ?? [])
+    if (previewing) markCreatedFolders(world, changeSet.createFolders ?? [])
     return withUserCreatedLayout(world, userBlocks, userIslands)
-  }, [intent.createFolders, previewGraph, previewing, userBlocks, userIslands])
+  }, [
+    changeSet.createFolders,
+    previewGraph,
+    previewing,
+    userBlocks,
+    userIslands,
+  ])
   const changeFileIds = useMemo(() => {
     const ids = new Set<string>()
-    for (const id of intent.files) ids.add(id)
-    for (const id of intent.creates) ids.add(id)
-    for (const id of intent.deletes) ids.add(id)
+    for (const id of changeSet.files) ids.add(id)
+    for (const id of changeSet.creates) ids.add(id)
+    for (const id of changeSet.deletes) ids.add(id)
     for (const block of userBlocks) ids.add(block.id)
     for (const item of blueprintFunctions) ids.add(item.file)
     for (const item of blueprintVariables) ids.add(item.file)
@@ -214,20 +246,20 @@ function Explorer({
     blueprintFunctions,
     blueprintImports,
     blueprintVariables,
-    intent.creates,
-    intent.deletes,
-    intent.files,
+    changeSet.creates,
+    changeSet.deletes,
+    changeSet.files,
     userBlocks,
   ])
   const changeFolderPaths = useMemo(() => {
     const paths = new Set<string>()
-    for (const path of intent.createFolders ?? []) paths.add(path)
+    for (const path of changeSet.createFolders ?? []) paths.add(path)
     for (const island of userIslands) {
       if (island.path) paths.add(island.path)
       else if (island.id) paths.add(island.id)
     }
     return [...paths]
-  }, [intent.createFolders, userIslands])
+  }, [changeSet.createFolders, userIslands])
   const hasChangeSet =
     changeFileIds.length > 0 || changeFolderPaths.length > 0
   const changePathGraph = useMemo(() => {
@@ -242,14 +274,14 @@ function Explorer({
     if (!hasChangeSet) return layout
     const world = layoutWorld(changePathGraph)
     markCreatedFolders(world, [
-      ...(intent.createFolders ?? []),
+      ...(changeSet.createFolders ?? []),
       ...userIslands.map((island) => island.path || island.id),
     ])
     return world
   }, [
     changePathGraph,
+    changeSet.createFolders,
     hasChangeSet,
-    intent.createFolders,
     layout,
     userIslands,
   ])
@@ -273,6 +305,8 @@ function Explorer({
   const lastIntentSig = useRef<string | null>(null)
   const viewedDiffId = useRef<Record<string, string | null>>({})
   const browsingHistory = useRef<Record<string, boolean>>({})
+  const loadedBlueprintSession = useRef<string | null>(null)
+  const seenSessionIds = useRef<Set<string>>(new Set())
 
   const applyIntent = useCallback((next: AgentIntent, sessionId?: string) => {
     const targetId = next.sessionId ?? sessionId ?? null
@@ -297,6 +331,19 @@ function Explorer({
     if (targetId && next.sessionId) viewedDiffId.current[targetId] = next.diffId
   }, [])
 
+  const focusSessionPanel = useCallback((sessionId: string) => {
+    setFocusedSessionId(sessionId)
+    persistSessionFocus(sessionId)
+  }, [])
+
+  const setupLlmSession = useCallback(async () => {
+    const next = await setupVisualizerSession()
+    lastIntentSig.current = null
+    applyIntent(next, next.sessionId ?? undefined)
+    if (next.sessionId) setFocusedSessionId(next.sessionId)
+    return next
+  }, [applyIntent])
+
   const rememberWalk = useCallback((x: number, z: number) => {
     walkPos.current = [x, z]
   }, [])
@@ -414,7 +461,6 @@ function Explorer({
         lastIntentSig.current = null
         applyIntent(next, sessionId)
         if (
-          action === 'invoke' ||
           action === 'continue' ||
           action === 'stop' ||
           action === 'set_step_by_step'
@@ -505,6 +551,9 @@ function Explorer({
       if (typeof context?.followLook === 'boolean') {
         setFollowLook(context.followLook)
       }
+      if (typeof context?.showBranchChanges === 'boolean') {
+        setWantBranchChanges(context.showBranchChanges)
+      }
     })
     return () => {
       cancelled = true
@@ -512,7 +561,8 @@ function Explorer({
   }, [])
 
   useEffect(() => {
-    if (!creationIntent?.sessionId) {
+    if (!intent.sessionId) {
+      loadedBlueprintSession.current = null
       setUserBlocks([])
       setUserIslands([])
       setBlueprintFunctions([])
@@ -522,13 +572,23 @@ function Explorer({
     }
     const knownFiles = new Set(graph.files.map((file) => file.id))
     const knownFolders = new Set(graph.folders.map((folder) => folder.path))
-    const nextBlocks = parseUserCreatedBlocks(creationIntent.userCreatedBlocks).filter(
+    const nextBlocks = parseUserCreatedBlocks(intent.userCreatedBlocks).filter(
       (block) => !knownFiles.has(block.id),
     )
-    const nextIslands = parseUserCreatedIslands(creationIntent.userCreatedIslands).filter(
+    const nextIslands = parseUserCreatedIslands(intent.userCreatedIslands).filter(
       (island) => !knownFolders.has(island.path),
     )
-    if (creationIntent.creationMode) {
+    const switched = loadedBlueprintSession.current !== intent.sessionId
+    if (switched) {
+      loadedBlueprintSession.current = intent.sessionId
+      setUserBlocks(nextBlocks)
+      setUserIslands(nextIslands)
+      setBlueprintFunctions(intent.blueprintFunctions)
+      setBlueprintVariables(intent.blueprintVariables)
+      setBlueprintImports(intent.blueprintImports)
+      return
+    }
+    if (intent.creationMode) {
       setUserBlocks((current) =>
         current.some((block) => block.naming) || current.length > 0
           ? current
@@ -540,29 +600,29 @@ function Explorer({
           : nextIslands,
       )
       setBlueprintFunctions((current) =>
-        current.length > 0 ? current : creationIntent.blueprintFunctions,
+        current.length > 0 ? current : intent.blueprintFunctions,
       )
       setBlueprintVariables((current) =>
-        current.length > 0 ? current : creationIntent.blueprintVariables,
+        current.length > 0 ? current : intent.blueprintVariables,
       )
       setBlueprintImports((current) =>
-        current.length > 0 ? current : creationIntent.blueprintImports,
+        current.length > 0 ? current : intent.blueprintImports,
       )
       return
     }
     setUserBlocks(nextBlocks)
     setUserIslands(nextIslands)
-    setBlueprintFunctions(creationIntent.blueprintFunctions)
-    setBlueprintVariables(creationIntent.blueprintVariables)
-    setBlueprintImports(creationIntent.blueprintImports)
+    setBlueprintFunctions(intent.blueprintFunctions)
+    setBlueprintVariables(intent.blueprintVariables)
+    setBlueprintImports(intent.blueprintImports)
   }, [
-    creationIntent?.blueprintFunctions,
-    creationIntent?.blueprintImports,
-    creationIntent?.blueprintVariables,
-    creationIntent?.creationMode,
-    creationIntent?.sessionId,
-    creationIntent?.userCreatedBlocks,
-    creationIntent?.userCreatedIslands,
+    intent.blueprintFunctions,
+    intent.blueprintImports,
+    intent.blueprintVariables,
+    intent.creationMode,
+    intent.sessionId,
+    intent.userCreatedBlocks,
+    intent.userCreatedIslands,
     graph,
   ])
 
@@ -574,8 +634,8 @@ function Explorer({
       variables: PatchSymbolAddition[] = blueprintVariables,
       imports: PatchImportAddition[] = blueprintImports,
     ) => {
-      if (!creationIntent?.sessionId || !creationIntent.creationMode) return
-      persistSessionBlueprint(creationIntent.sessionId, {
+      if (!intent.sessionId || !intent.creationMode) return
+      persistSessionBlueprint(intent.sessionId, {
         userCreatedBlocks: namedCreatedBlocks(blocks),
         userCreatedIslands: namedCreatedIslands(islands),
         addedFunctions: functions,
@@ -587,8 +647,8 @@ function Explorer({
       blueprintFunctions,
       blueprintImports,
       blueprintVariables,
-      creationIntent?.creationMode,
-      creationIntent?.sessionId,
+      intent.creationMode,
+      intent.sessionId,
       userBlocks,
       userIslands,
     ],
@@ -596,7 +656,7 @@ function Explorer({
 
   const placeBlock = useCallback(
     (spot: { x: number; z: number; folder: string }) => {
-      if (!creationMode) return
+      if (!canPlace) return
       setUserBlocks((current) => {
         if (current.some((block) => block.naming)) return current
         return [
@@ -614,12 +674,12 @@ function Explorer({
       })
       document.exitPointerLock()
     },
-    [creationMode],
+    [canPlace],
   )
 
   const placeBlockOnFolder = useCallback(
     (folderPath: string) => {
-      if (!creationMode) return
+      if (!canPlace) return
       const fileCount = displayGraph.files.filter(
         (file) => file.folder === folderPath,
       ).length
@@ -627,7 +687,7 @@ function Explorer({
       if (!spot) return
       placeBlock(spot)
     },
-    [displayGraph.files, creationMode, layout, placeBlock],
+    [displayGraph.files, canPlace, layout, placeBlock],
   )
 
   const commitBlockName = useCallback(
@@ -664,7 +724,7 @@ function Explorer({
 
   const placeIsland = useCallback(
     (parent: string) => {
-      if (!creationMode) return
+      if (!canPlace) return
       setUserIslands((current) => {
         if (current.some((island) => island.naming)) return current
         return [
@@ -680,15 +740,15 @@ function Explorer({
       })
       document.exitPointerLock()
     },
-    [creationMode],
+    [canPlace],
   )
 
   const placeIslandOnFolder = useCallback(
     (parent: string) => {
-      if (!creationMode) return
+      if (!canPlace) return
       placeIsland(parent)
     },
-    [creationMode, placeIsland],
+    [canPlace, placeIsland],
   )
 
   const commitIslandName = useCallback(
@@ -722,7 +782,7 @@ function Explorer({
   }, [])
 
   const deleteSelectedCreatedBlock = useCallback(() => {
-    if (!creationMode || !selectedId) return false
+    if (!canPlace || !selectedId) return false
     const selected = userBlocks.find((block) => block.id === selectedId)
     if (!selected || selected.naming) return false
     const next = userBlocks.filter((block) => block.id !== selectedId)
@@ -730,7 +790,7 @@ function Explorer({
     persistBlueprint(next, userIslands)
     setSelectedId(null)
     return true
-  }, [creationMode, persistBlueprint, selectedId, userBlocks, userIslands])
+  }, [canPlace, persistBlueprint, selectedId, userBlocks, userIslands])
 
   const selectFile = useCallback(
     (fileId: string | null) => {
@@ -739,9 +799,9 @@ function Explorer({
         setSelectedFolder(null)
         setSelectedTick((tick) => tick + 1)
       }
-      if (fileId && creationMode) document.exitPointerLock()
+      if (fileId && canPlace) document.exitPointerLock()
     },
-    [creationMode],
+    [canPlace],
   )
 
   const inspectBlock = useCallback(
@@ -779,7 +839,7 @@ function Explorer({
 
   const addBlueprintFunction = useCallback(
     (fileId: string, rawName: string) => {
-      if (!creationMode || fileId.startsWith('draft:')) return false
+      if (!canPlace || fileId.startsWith('draft:')) return false
       const name = rawName.trim()
       if (!isBlueprintSymbolName(name)) return false
       const exists =
@@ -802,7 +862,7 @@ function Explorer({
       blueprintImports,
       blueprintVariables,
       displayGraph.files,
-      creationMode,
+      canPlace,
       persistBlueprint,
       userBlocks,
       userIslands,
@@ -811,7 +871,7 @@ function Explorer({
 
   const addBlueprintVariable = useCallback(
     (fileId: string, rawName: string) => {
-      if (!creationMode || fileId.startsWith('draft:')) return false
+      if (!canPlace || fileId.startsWith('draft:')) return false
       const name = rawName.trim()
       if (!isBlueprintSymbolName(name)) return false
       const exists =
@@ -834,7 +894,7 @@ function Explorer({
       blueprintImports,
       blueprintVariables,
       displayGraph.files,
-      creationMode,
+      canPlace,
       persistBlueprint,
       userBlocks,
       userIslands,
@@ -843,7 +903,7 @@ function Explorer({
 
   const addBlueprintImport = useCallback(
     (fileId: string, raw: string) => {
-      if (!creationMode || fileId.startsWith('draft:')) return false
+      if (!canPlace || fileId.startsWith('draft:')) return false
       const parsed = parseBlueprintImport(
         raw,
         fileId,
@@ -873,7 +933,7 @@ function Explorer({
       blueprintImports,
       blueprintVariables,
       displayGraph.files,
-      creationMode,
+      canPlace,
       persistBlueprint,
       userBlocks,
       userIslands,
@@ -882,7 +942,7 @@ function Explorer({
 
   const removeBlueprintFunction = useCallback(
     (fileId: string, name: string) => {
-      if (!creationMode) return
+      if (!canPlace) return
       const next = blueprintFunctions.filter(
         (item) => !(item.file === fileId && item.name === name),
       )
@@ -893,7 +953,7 @@ function Explorer({
       blueprintFunctions,
       blueprintImports,
       blueprintVariables,
-      creationMode,
+      canPlace,
       persistBlueprint,
       userBlocks,
       userIslands,
@@ -902,7 +962,7 @@ function Explorer({
 
   const removeBlueprintVariable = useCallback(
     (fileId: string, name: string) => {
-      if (!creationMode) return
+      if (!canPlace) return
       const next = blueprintVariables.filter(
         (item) => !(item.file === fileId && item.name === name),
       )
@@ -913,7 +973,7 @@ function Explorer({
       blueprintFunctions,
       blueprintImports,
       blueprintVariables,
-      creationMode,
+      canPlace,
       persistBlueprint,
       userBlocks,
       userIslands,
@@ -922,7 +982,7 @@ function Explorer({
 
   const removeBlueprintImport = useCallback(
     (fileId: string, name: string, from: string) => {
-      if (!creationMode) return
+      if (!canPlace) return
       const next = blueprintImports.filter(
         (item) =>
           !(item.file === fileId && item.name === name && item.from === from),
@@ -940,7 +1000,7 @@ function Explorer({
       blueprintFunctions,
       blueprintImports,
       blueprintVariables,
-      creationMode,
+      canPlace,
       persistBlueprint,
       userBlocks,
       userIslands,
@@ -987,6 +1047,18 @@ function Explorer({
     })
   }, [])
 
+  const canToggleBranchChanges = !llmBusy && (wantBranchChanges || branchChanges.available)
+
+  const toggleShowBranchChanges = useCallback(() => {
+    if (llmBusy) return
+    if (!wantBranchChanges && !branchChanges.available) return
+    setWantBranchChanges((current) => {
+      const next = !current
+      persistShowBranchChanges(next)
+      return next
+    })
+  }, [branchChanges.available, llmBusy, wantBranchChanges])
+
   const toggleImportedBy = useCallback(() => {
     setImportedBy((current) => !current)
   }, [])
@@ -1016,6 +1088,48 @@ function Explorer({
     return () => window.removeEventListener('keydown', onKey)
   }, [toggleImportedBy])
 
+  useEffect(() => {
+    const onKey = (event: KeyboardEvent) => {
+      if (event.repeat || event.code !== 'KeyG') return
+      const target = event.target
+      if (
+        target instanceof HTMLElement &&
+        (target.tagName === 'TEXTAREA' ||
+          target.tagName === 'INPUT' ||
+          target.tagName === 'SELECT' ||
+          target.isContentEditable)
+      ) {
+        return
+      }
+      if (!canToggleBranchChanges) return
+      event.preventDefault()
+      toggleShowBranchChanges()
+    }
+    window.addEventListener('keydown', onKey)
+    return () => window.removeEventListener('keydown', onKey)
+  }, [canToggleBranchChanges, toggleShowBranchChanges])
+
+  useEffect(() => {
+    let cancelled = false
+    const load = async () => {
+      const next = await fetchBranchChanges()
+      if (!cancelled) setBranchChanges(next)
+    }
+    void load()
+    if (!wantBranchChanges || llmBusy) {
+      return () => {
+        cancelled = true
+      }
+    }
+    const timer = window.setInterval(() => {
+      void load()
+    }, 2000)
+    return () => {
+      cancelled = true
+      window.clearInterval(timer)
+    }
+  }, [llmBusy, updatingModel, wantBranchChanges])
+
   useEffect(() => {
     if (mode !== 'map' || !hasChangeSet) return
     const onKey = (event: KeyboardEvent) => {
@@ -1068,15 +1182,24 @@ function Explorer({
             viewedDiffId.current[next.sessionId] = next.diffId
           }
         }
+        const nextIds = new Set(
+          merged
+            .map((item) => item.sessionId)
+            .filter((id): id is string => Boolean(id)),
+        )
+        const serverFocus = bundle.focusedSessionId
+        const appeared =
+          serverFocus != null && !seenSessionIds.current.has(serverFocus)
+        seenSessionIds.current = nextIds
         setFocusedSessionId((current) => {
-          if (current && merged.some((item) => item.sessionId === current)) {
+          if (appeared && serverFocus && nextIds.has(serverFocus)) {
+            return serverFocus
+          }
+          if (current && nextIds.has(current)) {
             return current
           }
-          if (
-            bundle.focusedSessionId &&
-            merged.some((item) => item.sessionId === bundle.focusedSessionId)
-          ) {
-            return bundle.focusedSessionId
+          if (serverFocus && nextIds.has(serverFocus)) {
+            return serverFocus
           }
           return merged[0]?.sessionId ?? null
         })
@@ -1087,23 +1210,23 @@ function Explorer({
     void poll()
     const timer = window.setInterval(() => {
       void poll()
-    }, 700)
+    }, 250)
     return () => {
       cancelled = true
       window.clearInterval(timer)
     }
   }, [])
 
-  const plannedIds = previewing ? [...intent.files, ...intent.creates] : []
+  const plannedIds = previewing ? [...changeSet.files, ...changeSet.creates] : []
   const blueprintImportEdges = blueprintImports.flatMap((item) => {
     if (!displayGraph.files.some((file) => file.id === item.from)) return []
     return [{ from: item.file, to: item.from }]
   })
   const plannedImports = [
-    ...(previewing ? (intent.imports ?? []) : []),
+    ...(previewing ? (changeSet.imports ?? []) : []),
     ...blueprintImportEdges,
   ]
-  const deletedIds = previewing ? intent.deletes : []
+  const deletedIds = previewing ? changeSet.deletes : []
 
   return (
     <>
@@ -1138,7 +1261,7 @@ function Explorer({
             plannedImports={plannedImports}
             createdIds={plannedCreates}
             deletedIds={deletedIds}
-            createLines={intent.createLines ?? {}}
+            createLines={changeSet.createLines ?? {}}
             flyTo={flyTo}
             aimedRelation={aimedRelation}
             onAimRelation={setAimedRelation}
@@ -1148,8 +1271,8 @@ function Explorer({
             importedBy={importedBy}
             namingId={namingId}
             namingIslandId={namingIslandId}
-            onPlaceBlock={creationMode ? placeBlock : undefined}
-            onPlaceIsland={creationMode ? placeIsland : undefined}
+            onPlaceBlock={canPlace ? placeBlock : undefined}
+            onPlaceIsland={canPlace ? placeIsland : undefined}
             onCommitName={commitBlockName}
             onCancelName={cancelBlockName}
             userCreatedBlocks={userBlocks}
@@ -1178,13 +1301,19 @@ function Explorer({
         intent={intent}
         intents={intents}
         focusedSessionId={focusedSessionId}
-        onFocusSession={setFocusedSessionId}
+        onFocusSession={focusSessionPanel}
+        onSetupSession={setupLlmSession}
         onWorkflowAction={runWorkflowAction}
         onNavigateDiff={navigateDiff}
         onOpenMap={openMap}
         onWalk={openWalk}
         followLook={followLook}
         onToggleFollowLook={toggleFollowLook}
+        showBranchChanges={showingBranchChanges}
+        branchChanges={branchChanges}
+        canShowBranchChanges={canToggleBranchChanges}
+        llmMakingChanges={llmBusy}
+        onToggleShowBranchChanges={toggleShowBranchChanges}
         onUpdateModel={onUpdateModel}
         updatingModel={updatingModel}
         importedBy={importedBy}