@jkwd/inbase 0.1.4 → 0.1.6

package/apps/explorer/src/App.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Canvas } from '@react-three/fiber'
-import { emptyIntent, fetchAgentIntent, inspectTargetFile, performAgentAction, persistSessionBlueprint } from './agentIntent'
+import { emptyIntent, fetchAgentIntent, fetchAgentIntents, inspectTargetFile, performAgentAction, persistSessionBlueprint } from './agentIntent'
 import { fetchCodebase } from './codebase'
 import {
   layoutWorld,
@@ -8,6 +8,8 @@ import {
   standInFront,
   relationTravelTarget,
   withPreviewGraph,
+  filterGraphToChangePaths,
+  mapPointOntoFolder,
 } from './layout'
 import { World } from './scene/World'
 import { HUD } from './ui/HUD'
@@ -49,6 +51,7 @@ function intentSignature(intent: AgentIntent) {
     updatedAt: intent.updatedAt,
     status: intent.status,
     phase: intent.phase,
+    stalledWait: intent.stalledWait,
     sessionId: intent.sessionId,
     creationMode: intent.creationMode,
     diffId: intent.diffId,
@@ -61,6 +64,8 @@ function intentSignature(intent: AgentIntent) {
     addedFunctions: intent.addedFunctions,
     addedVariables: intent.addedVariables,
     addedImports: intent.addedImports,
+    changedFunctions: intent.changedFunctions,
+    changedVariables: intent.changedVariables,
   })
 }
 
@@ -100,7 +105,17 @@ function Explorer({
   graph: CodebaseGraph
   onRefreshGraph: () => Promise<void>
 }) {
-  const [intent, setIntent] = useState<AgentIntent>(emptyIntent)
+  const [intents, setIntents] = useState<AgentIntent[]>([])
+  const [focusedSessionId, setFocusedSessionId] = useState<string | null>(null)
+  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 [userBlocks, setUserBlocks] = useState<UserCreatedBlock[]>([])
@@ -156,6 +171,59 @@ function Explorer({
     if (previewing) markCreatedFolders(world, intent.createFolders ?? [])
     return withUserCreatedLayout(world, userBlocks, userIslands)
   }, [intent.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 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)
+    for (const item of blueprintImports) ids.add(item.file)
+    return [...ids]
+  }, [
+    blueprintFunctions,
+    blueprintImports,
+    blueprintVariables,
+    intent.creates,
+    intent.deletes,
+    intent.files,
+    userBlocks,
+  ])
+  const changeFolderPaths = useMemo(() => {
+    const paths = new Set<string>()
+    for (const path of intent.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])
+  const hasChangeSet =
+    changeFileIds.length > 0 || changeFolderPaths.length > 0
+  const changePathGraph = useMemo(() => {
+    if (!hasChangeSet) return displayGraph
+    return filterGraphToChangePaths(
+      displayGraph,
+      changeFileIds,
+      changeFolderPaths,
+    )
+  }, [changeFileIds, changeFolderPaths, displayGraph, hasChangeSet])
+  const changePathLayout = useMemo(() => {
+    if (!hasChangeSet) return layout
+    const world = layoutWorld(changePathGraph)
+    markCreatedFolders(world, [
+      ...(intent.createFolders ?? []),
+      ...userIslands.map((island) => island.path || island.id),
+    ])
+    return world
+  }, [
+    changePathGraph,
+    hasChangeSet,
+    intent.createFolders,
+    layout,
+    userIslands,
+  ])
   const [mode, setMode] = useState<ViewMode>('map')
   const [landAt, setLandAt] = useState<[number, number]>([
     layout.spawn[0],
@@ -166,18 +234,39 @@ function Explorer({
   const [selectedTick, setSelectedTick] = useState(0)
   const [selectedFolder, setSelectedFolder] = useState<string | null>(null)
   const [aimedRelation, setAimedRelation] = useState<AimedRelation | null>(null)
+  const [aimedFileId, setAimedFileId] = useState<string | null>(null)
+  const [inspectTick, setInspectTick] = useState(0)
   const [flyTo, setFlyTo] = useState<FlyTo | null>(null)
   const [locked, setLocked] = useState(false)
   const [currentFolder, setCurrentFolder] = useState(graph.targetName)
   const [followLook, setFollowLook] = useState(false)
   const [importedBy, setImportedBy] = useState(false)
+  const [changePathsOnly, setChangePathsOnly] = useState(false)
   const lastIntentSig = useRef<string | null>(null)
-  const viewedDiffId = useRef<string | null>(null)
-  const browsingHistory = useRef(false)
+  const viewedDiffId = useRef<Record<string, string | null>>({})
+  const browsingHistory = useRef<Record<string, boolean>>({})
 
-  const applyIntent = useCallback((next: AgentIntent) => {
-    setIntent(next)
-    viewedDiffId.current = next.diffId
+  const applyIntent = useCallback((next: AgentIntent, sessionId?: string) => {
+    const targetId = next.sessionId ?? sessionId ?? null
+    setIntents((current) => {
+      const nextList =
+        !targetId || next.status === 'idle' || !next.sessionId
+          ? current.filter((item) => item.sessionId !== targetId)
+          : current.some((item) => item.sessionId === targetId)
+            ? current.map((item) => (item.sessionId === targetId ? next : item))
+            : [...current, next]
+      setFocusedSessionId((currentFocus) => {
+        if (
+          currentFocus &&
+          nextList.some((item) => item.sessionId === currentFocus)
+        ) {
+          return currentFocus
+        }
+        return nextList[0]?.sessionId ?? null
+      })
+      return nextList
+    })
+    if (targetId && next.sessionId) viewedDiffId.current[targetId] = next.diffId
   }, [])
 
   const rememberWalk = useCallback((x: number, z: number) => {
@@ -213,6 +302,22 @@ function Explorer({
     setMode('walk')
   }, [])
 
+  const landFromMap = useCallback(
+    (x: number, z: number) => {
+      if (!changePathsOnly || !hasChangeSet) {
+        land(x, z)
+        return
+      }
+      const mapped = mapPointOntoFolder(x, z, changePathLayout, layout, [
+        layout.spawn[0],
+        layout.spawn[2],
+      ])
+      if (!mapped) return
+      land(mapped[0], mapped[1])
+    },
+    [changePathLayout, changePathsOnly, hasChangeSet, land, layout],
+  )
+
   const travelToFile = useCallback(
     (fileId: string, fly: boolean) => {
       const placed = layout.files[fileId]
@@ -244,23 +349,25 @@ function Explorer({
 
   const runWorkflowAction = useCallback(
     async (
+      sessionId: string,
       action: WorkflowAction,
-      options: { instruction?: string; step?: number } = {},
+      options: { instruction?: string; step?: number; stepByStep?: boolean } = {},
     ) => {
-      if (!intent.sessionId) return
+      const current = intents.find((item) => item.sessionId === sessionId)
+      if (!current?.sessionId) return
       if (
         (action === 'continue' || action === 'instruct') &&
-        (!intent.diffId || !intent.isActiveDiff)
+        (!current.diffId || !current.isActiveDiff)
       ) {
         return
       }
       try {
         const next = await performAgentAction(
           action,
-          intent.sessionId,
+          current.sessionId,
           {
             ...options,
-            diffId: intent.diffId ?? undefined,
+            diffId: current.diffId ?? undefined,
             ...(action === 'blueprint_send'
               ? {
                   userCreatedBlocks: namedCreatedBlocks(userBlocks),
@@ -272,10 +379,15 @@ function Explorer({
               : {}),
           },
         )
-        browsingHistory.current = false
-        lastIntentSig.current = intentSignature(next)
-        applyIntent(next)
-        if (action === 'invoke' || action === 'continue' || action === 'stop') {
+        browsingHistory.current[sessionId] = false
+        lastIntentSig.current = null
+        applyIntent(next, sessionId)
+        if (
+          action === 'invoke' ||
+          action === 'continue' ||
+          action === 'stop' ||
+          action === 'set_step_by_step'
+        ) {
           await onRefreshGraph()
         }
       } catch {
@@ -287,9 +399,7 @@ function Explorer({
       blueprintFunctions,
       blueprintImports,
       blueprintVariables,
-      intent.diffId,
-      intent.isActiveDiff,
-      intent.sessionId,
+      intents,
       onRefreshGraph,
       userBlocks,
       userIslands,
@@ -297,28 +407,29 @@ function Explorer({
   )
 
   const navigateDiff = useCallback(
-    async (diffId: string) => {
+    async (sessionId: string, diffId: string) => {
+      const current = intents.find((item) => item.sessionId === sessionId)
+      if (!current) return
       try {
-        const latest = intent.chain.at(-1)?.id
-        browsingHistory.current = diffId !== latest
-        if (intent.sessionId) {
-          try {
-            await inspectTargetFile({
-              sessionId: intent.sessionId,
-              diffId,
-            })
-          } catch {
-            // Still show the historical preview if disk replay failed.
-          }
+        const latest = current.chain.at(-1)?.id
+        browsingHistory.current[sessionId] = diffId !== latest
+        try {
+          await inspectTargetFile({
+            sessionId,
+            diffId,
+          })
+        } catch {
+          // Still show the historical preview if disk replay failed.
         }
-        const next = await fetchAgentIntent(diffId)
-        lastIntentSig.current = intentSignature(next)
-        applyIntent(next)
+        const next = await fetchAgentIntent(sessionId, diffId)
+        lastIntentSig.current = null
+        applyIntent(next, sessionId)
+        setFocusedSessionId(sessionId)
       } catch {
         // Keep the current chain position if navigation failed.
       }
     },
-    [applyIntent, intent.chain, intent.sessionId],
+    [applyIntent, intents],
   )
 
   const inspectFile = useCallback(
@@ -370,7 +481,7 @@ function Explorer({
   }, [])
 
   useEffect(() => {
-    if (!intent.sessionId) {
+    if (!creationIntent?.sessionId) {
       setUserBlocks([])
       setUserIslands([])
       setBlueprintFunctions([])
@@ -380,13 +491,13 @@ 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(intent.userCreatedBlocks).filter(
+    const nextBlocks = parseUserCreatedBlocks(creationIntent.userCreatedBlocks).filter(
       (block) => !knownFiles.has(block.id),
     )
-    const nextIslands = parseUserCreatedIslands(intent.userCreatedIslands).filter(
+    const nextIslands = parseUserCreatedIslands(creationIntent.userCreatedIslands).filter(
       (island) => !knownFolders.has(island.path),
     )
-    if (intent.creationMode) {
+    if (creationIntent.creationMode) {
       setUserBlocks((current) =>
         current.some((block) => block.naming) || current.length > 0
           ? current
@@ -398,28 +509,29 @@ function Explorer({
           : nextIslands,
       )
       setBlueprintFunctions((current) =>
-        current.length > 0 ? current : intent.blueprintFunctions,
+        current.length > 0 ? current : creationIntent.blueprintFunctions,
       )
       setBlueprintVariables((current) =>
-        current.length > 0 ? current : intent.blueprintVariables,
+        current.length > 0 ? current : creationIntent.blueprintVariables,
       )
       setBlueprintImports((current) =>
-        current.length > 0 ? current : intent.blueprintImports,
+        current.length > 0 ? current : creationIntent.blueprintImports,
       )
       return
     }
     setUserBlocks(nextBlocks)
     setUserIslands(nextIslands)
-    setBlueprintFunctions(intent.blueprintFunctions)
-    setBlueprintVariables(intent.blueprintVariables)
-    setBlueprintImports(intent.blueprintImports)
+    setBlueprintFunctions(creationIntent.blueprintFunctions)
+    setBlueprintVariables(creationIntent.blueprintVariables)
+    setBlueprintImports(creationIntent.blueprintImports)
   }, [
-    intent.blueprintFunctions,
-    intent.blueprintImports,
-    intent.blueprintVariables,
-    intent.creationMode,
-    intent.userCreatedBlocks,
-    intent.userCreatedIslands,
+    creationIntent?.blueprintFunctions,
+    creationIntent?.blueprintImports,
+    creationIntent?.blueprintVariables,
+    creationIntent?.creationMode,
+    creationIntent?.sessionId,
+    creationIntent?.userCreatedBlocks,
+    creationIntent?.userCreatedIslands,
     graph,
   ])
 
@@ -431,8 +543,8 @@ function Explorer({
       variables: PatchSymbolAddition[] = blueprintVariables,
       imports: PatchImportAddition[] = blueprintImports,
     ) => {
-      if (!intent.sessionId || !intent.creationMode) return
-      persistSessionBlueprint(intent.sessionId, {
+      if (!creationIntent?.sessionId || !creationIntent.creationMode) return
+      persistSessionBlueprint(creationIntent.sessionId, {
         userCreatedBlocks: namedCreatedBlocks(blocks),
         userCreatedIslands: namedCreatedIslands(islands),
         addedFunctions: functions,
@@ -444,8 +556,8 @@ function Explorer({
       blueprintFunctions,
       blueprintImports,
       blueprintVariables,
-      intent.creationMode,
-      intent.sessionId,
+      creationIntent?.creationMode,
+      creationIntent?.sessionId,
       userBlocks,
       userIslands,
     ],
@@ -453,7 +565,7 @@ function Explorer({
 
   const placeBlock = useCallback(
     (spot: { x: number; z: number; folder: string }) => {
-      if (!intent.creationMode) return
+      if (!creationMode) return
       setUserBlocks((current) => {
         if (current.some((block) => block.naming)) return current
         return [
@@ -471,12 +583,12 @@ function Explorer({
       })
       document.exitPointerLock()
     },
-    [intent.creationMode],
+    [creationMode],
   )
 
   const placeBlockOnFolder = useCallback(
     (folderPath: string) => {
-      if (!intent.creationMode) return
+      if (!creationMode) return
       const fileCount = displayGraph.files.filter(
         (file) => file.folder === folderPath,
       ).length
@@ -484,7 +596,7 @@ function Explorer({
       if (!spot) return
       placeBlock(spot)
     },
-    [displayGraph.files, intent.creationMode, layout, placeBlock],
+    [displayGraph.files, creationMode, layout, placeBlock],
   )
 
   const commitBlockName = useCallback(
@@ -521,7 +633,7 @@ function Explorer({
 
   const placeIsland = useCallback(
     (parent: string) => {
-      if (!intent.creationMode) return
+      if (!creationMode) return
       setUserIslands((current) => {
         if (current.some((island) => island.naming)) return current
         return [
@@ -537,15 +649,15 @@ function Explorer({
       })
       document.exitPointerLock()
     },
-    [intent.creationMode],
+    [creationMode],
   )
 
   const placeIslandOnFolder = useCallback(
     (parent: string) => {
-      if (!intent.creationMode) return
+      if (!creationMode) return
       placeIsland(parent)
     },
-    [intent.creationMode, placeIsland],
+    [creationMode, placeIsland],
   )
 
   const commitIslandName = useCallback(
@@ -579,7 +691,7 @@ function Explorer({
   }, [])
 
   const deleteSelectedCreatedBlock = useCallback(() => {
-    if (!intent.creationMode || !selectedId) return false
+    if (!creationMode || !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)
@@ -587,7 +699,7 @@ function Explorer({
     persistBlueprint(next, userIslands)
     setSelectedId(null)
     return true
-  }, [intent.creationMode, persistBlueprint, selectedId, userBlocks, userIslands])
+  }, [creationMode, persistBlueprint, selectedId, userBlocks, userIslands])
 
   const selectFile = useCallback(
     (fileId: string | null) => {
@@ -596,9 +708,17 @@ function Explorer({
         setSelectedFolder(null)
         setSelectedTick((tick) => tick + 1)
       }
-      if (fileId && intent.creationMode) document.exitPointerLock()
+      if (fileId && creationMode) document.exitPointerLock()
     },
-    [intent.creationMode],
+    [creationMode],
+  )
+
+  const inspectBlock = useCallback(
+    (fileId: string) => {
+      selectFile(fileId)
+      setInspectTick((tick) => tick + 1)
+    },
+    [selectFile],
   )
 
   const selectFolder = useCallback((folderPath: string | null) => {
@@ -606,9 +726,29 @@ function Explorer({
     if (folderPath) setSelectedId(null)
   }, [])
 
+  useEffect(() => {
+    if (!changePathsOnly || !hasChangeSet) return
+    if (selectedFolder && !changePathLayout.folders[selectedFolder]) {
+      setSelectedFolder(null)
+    }
+    if (
+      selectedId &&
+      !changePathGraph.files.some((file) => file.id === selectedId)
+    ) {
+      setSelectedId(null)
+    }
+  }, [
+    changePathGraph.files,
+    changePathLayout.folders,
+    changePathsOnly,
+    hasChangeSet,
+    selectedFolder,
+    selectedId,
+  ])
+
   const addBlueprintFunction = useCallback(
     (fileId: string, rawName: string) => {
-      if (!intent.creationMode || fileId.startsWith('draft:')) return false
+      if (!creationMode || fileId.startsWith('draft:')) return false
       const name = rawName.trim()
       if (!isBlueprintSymbolName(name)) return false
       const exists =
@@ -631,7 +771,7 @@ function Explorer({
       blueprintImports,
       blueprintVariables,
       displayGraph.files,
-      intent.creationMode,
+      creationMode,
       persistBlueprint,
       userBlocks,
       userIslands,
@@ -640,7 +780,7 @@ function Explorer({
 
   const addBlueprintVariable = useCallback(
     (fileId: string, rawName: string) => {
-      if (!intent.creationMode || fileId.startsWith('draft:')) return false
+      if (!creationMode || fileId.startsWith('draft:')) return false
       const name = rawName.trim()
       if (!isBlueprintSymbolName(name)) return false
       const exists =
@@ -663,7 +803,7 @@ function Explorer({
       blueprintImports,
       blueprintVariables,
       displayGraph.files,
-      intent.creationMode,
+      creationMode,
       persistBlueprint,
       userBlocks,
       userIslands,
@@ -672,7 +812,7 @@ function Explorer({
 
   const addBlueprintImport = useCallback(
     (fileId: string, raw: string) => {
-      if (!intent.creationMode || fileId.startsWith('draft:')) return false
+      if (!creationMode || fileId.startsWith('draft:')) return false
       const parsed = parseBlueprintImport(
         raw,
         fileId,
@@ -702,7 +842,7 @@ function Explorer({
       blueprintImports,
       blueprintVariables,
       displayGraph.files,
-      intent.creationMode,
+      creationMode,
       persistBlueprint,
       userBlocks,
       userIslands,
@@ -711,7 +851,7 @@ function Explorer({
 
   const removeBlueprintFunction = useCallback(
     (fileId: string, name: string) => {
-      if (!intent.creationMode) return
+      if (!creationMode) return
       const next = blueprintFunctions.filter(
         (item) => !(item.file === fileId && item.name === name),
       )
@@ -722,7 +862,7 @@ function Explorer({
       blueprintFunctions,
       blueprintImports,
       blueprintVariables,
-      intent.creationMode,
+      creationMode,
       persistBlueprint,
       userBlocks,
       userIslands,
@@ -731,7 +871,7 @@ function Explorer({
 
   const removeBlueprintVariable = useCallback(
     (fileId: string, name: string) => {
-      if (!intent.creationMode) return
+      if (!creationMode) return
       const next = blueprintVariables.filter(
         (item) => !(item.file === fileId && item.name === name),
       )
@@ -742,7 +882,7 @@ function Explorer({
       blueprintFunctions,
       blueprintImports,
       blueprintVariables,
-      intent.creationMode,
+      creationMode,
       persistBlueprint,
       userBlocks,
       userIslands,
@@ -751,7 +891,7 @@ function Explorer({
 
   const removeBlueprintImport = useCallback(
     (fileId: string, name: string, from: string) => {
-      if (!intent.creationMode) return
+      if (!creationMode) return
       const next = blueprintImports.filter(
         (item) =>
           !(item.file === fileId && item.name === name && item.from === from),
@@ -769,7 +909,7 @@ function Explorer({
       blueprintFunctions,
       blueprintImports,
       blueprintVariables,
-      intent.creationMode,
+      creationMode,
       persistBlueprint,
       userBlocks,
       userIslands,
@@ -820,6 +960,11 @@ function Explorer({
     setImportedBy((current) => !current)
   }, [])
 
+  const toggleChangePathsOnly = useCallback(() => {
+    if (!hasChangeSet) return
+    setChangePathsOnly((current) => !current)
+  }, [hasChangeSet])
+
   useEffect(() => {
     const onKey = (event: KeyboardEvent) => {
       if (event.repeat || event.code !== 'KeyK') return
@@ -840,19 +985,70 @@ function Explorer({
     return () => window.removeEventListener('keydown', onKey)
   }, [toggleImportedBy])
 
+  useEffect(() => {
+    if (mode !== 'map' || !hasChangeSet) return
+    const onKey = (event: KeyboardEvent) => {
+      if (event.repeat || event.code !== 'KeyC') return
+      const target = event.target
+      if (
+        target instanceof HTMLElement &&
+        (target.tagName === 'TEXTAREA' ||
+          target.tagName === 'INPUT' ||
+          target.tagName === 'SELECT' ||
+          target.isContentEditable)
+      ) {
+        return
+      }
+      event.preventDefault()
+      toggleChangePathsOnly()
+    }
+    window.addEventListener('keydown', onKey)
+    return () => window.removeEventListener('keydown', onKey)
+  }, [hasChangeSet, mode, toggleChangePathsOnly])
+
   useEffect(() => {
     let cancelled = false
     const poll = async () => {
       try {
-        const next = await fetchAgentIntent(
-          browsingHistory.current ? viewedDiffId.current ?? undefined : undefined,
-        )
-        const signature = intentSignature(next)
+        const bundle = await fetchAgentIntents()
+        const merged: AgentIntent[] = []
+        for (const next of bundle.intents) {
+          const sessionId = next.sessionId
+          if (
+            sessionId &&
+            browsingHistory.current[sessionId] &&
+            viewedDiffId.current[sessionId]
+          ) {
+            merged.push(
+              await fetchAgentIntent(sessionId, viewedDiffId.current[sessionId] ?? undefined),
+            )
+          } else {
+            merged.push(next)
+          }
+        }
+        const signature = JSON.stringify(merged.map(intentSignature))
         if (cancelled || signature === lastIntentSig.current) {
           return
         }
         lastIntentSig.current = signature
-        applyIntent(next)
+        setIntents(merged)
+        for (const next of merged) {
+          if (next.sessionId && !browsingHistory.current[next.sessionId]) {
+            viewedDiffId.current[next.sessionId] = next.diffId
+          }
+        }
+        setFocusedSessionId((current) => {
+          if (current && merged.some((item) => item.sessionId === current)) {
+            return current
+          }
+          if (
+            bundle.focusedSessionId &&
+            merged.some((item) => item.sessionId === bundle.focusedSessionId)
+          ) {
+            return bundle.focusedSessionId
+          }
+          return merged[0]?.sessionId ?? null
+        })
       } catch {
         // Explorer may be running without the intent endpoint yet.
       }
@@ -865,7 +1061,7 @@ function Explorer({
       cancelled = true
       window.clearInterval(timer)
     }
-  }, [applyIntent])
+  }, [])
 
   const plannedIds = previewing ? [...intent.files, ...intent.creates] : []
   const blueprintImportEdges = blueprintImports.flatMap((item) => {
@@ -883,6 +1079,7 @@ function Explorer({
       <div className="stage">
         <Canvas
           shadows={false}
+          dpr={[1, 1.5]}
           gl={{ antialias: true, toneMappingExposure: 1.25 }}
           camera={{
             position: layout.spawn,
@@ -903,7 +1100,7 @@ function Explorer({
             onSelectFolder={selectFolder}
             onLockedChange={setLocked}
             onFolderChange={setCurrentFolder}
-            onLand={land}
+            onLand={landFromMap}
             onWalkPosition={rememberWalk}
             onContext={persistUserContext}
             plannedIds={plannedIds}
@@ -915,29 +1112,44 @@ function Explorer({
             flyTo={flyTo}
             aimedRelation={aimedRelation}
             onAimRelation={setAimedRelation}
+            onAimFile={setAimedFileId}
+            onInspect={inspectBlock}
             onTravelTo={flyAlongRelation}
             importedBy={importedBy}
             namingId={namingId}
             namingIslandId={namingIslandId}
-            onPlaceBlock={intent.creationMode ? placeBlock : undefined}
-            onPlaceIsland={intent.creationMode ? placeIsland : undefined}
+            onPlaceBlock={creationMode ? placeBlock : undefined}
+            onPlaceIsland={creationMode ? placeIsland : undefined}
             onCommitName={commitBlockName}
             onCancelName={cancelBlockName}
             userCreatedBlocks={userBlocks}
             userCreatedIslands={userIslands}
+            mapGraph={
+              changePathsOnly && hasChangeSet ? changePathGraph : null
+            }
+            mapLayout={
+              changePathsOnly && hasChangeSet ? changePathLayout : null
+            }
           />
         </Canvas>
       </div>
       <HUD
         graph={displayGraph}
+        layout={layout}
         mode={mode}
         locked={locked}
         selectedId={selectedId}
         selectedTick={selectedTick}
+        inspectTick={inspectTick}
         selectedFolder={selectedFolder}
+        landAt={landAt}
         aimedRelation={aimedRelation}
+        aimedFileId={aimedFileId}
         currentFolder={currentFolder}
         intent={intent}
+        intents={intents}
+        focusedSessionId={focusedSessionId}
+        onFocusSession={setFocusedSessionId}
         onWorkflowAction={runWorkflowAction}
         onNavigateDiff={navigateDiff}
         onOpenMap={openMap}
@@ -946,6 +1158,9 @@ function Explorer({
         onToggleFollowLook={toggleFollowLook}
         importedBy={importedBy}
         onToggleImportedBy={toggleImportedBy}
+        changePathsOnly={changePathsOnly}
+        hasChangeSet={hasChangeSet}
+        onToggleChangePathsOnly={toggleChangePathsOnly}
         naming={naming}
         namingIsland={Boolean(namingIslandId)}
         onCommitIslandName={(name) => {
@@ -966,6 +1181,10 @@ function Explorer({
         onMapAddFile={placeBlockOnFolder}
         onMapAddFolder={placeIslandOnFolder}
         onInspectFile={inspectFile}
+        onInspectBlock={inspectBlock}
+        plannedIds={plannedIds}
+        createdIds={plannedCreates}
+        deletedIds={deletedIds}
       />
     </>
   )