@jkwd/inbase 0.1.10 → 0.1.12

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, persistSessionFocus } 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,
@@ -13,9 +14,14 @@ import {
 } from './layout'
 import { World } from './scene/World'
 import { HUD } from './ui/HUD'
+import {
+  MapContextMenu,
+  type MapContextMenuState,
+} from './ui/MapContextMenu'
 import {
   fetchUserContext,
   persistFollowLook,
+  persistShowBranchChanges,
   persistUserContext,
 } from './userContext'
 import {
@@ -34,6 +40,7 @@ import {
 } from './userCreated'
 import {
   isPatchPreview,
+  llmIsMakingChanges,
   type AgentIntent,
   type AimedRelation,
   type CodebaseGraph,
@@ -53,7 +60,12 @@ function intentSignature(intent: AgentIntent) {
     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,
@@ -76,8 +88,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
@@ -137,13 +156,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 canPlace = Boolean(intent.sessionId && intent.creationMode)
-  const previewing = intent.preview || isPatchPreview(intent.status)
-  const plannedCreates = previewing ? intent.creates : []
+  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<
@@ -163,15 +196,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,
   ])
@@ -193,15 +226,23 @@ function Explorer({
     ],
   )
   const layout = useMemo(() => {
-    const world = layoutWorld(previewGraph)
-    if (previewing) markCreatedFolders(world, intent.createFolders ?? [])
+    const world = layoutWorld(
+      withUserCreatedGraph(previewGraph, [], userIslands),
+    )
+    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)
@@ -211,20 +252,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(() => {
@@ -239,14 +280,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,
   ])
@@ -259,6 +300,7 @@ function Explorer({
   const [selectedId, setSelectedId] = useState<string | null>(null)
   const [selectedTick, setSelectedTick] = useState(0)
   const [selectedFolder, setSelectedFolder] = useState<string | null>(null)
+  const [mapMenu, setMapMenu] = useState<MapContextMenuState | null>(null)
   const [aimedRelation, setAimedRelation] = useState<AimedRelation | null>(null)
   const [aimedFileId, setAimedFileId] = useState<string | null>(null)
   const [inspectTick, setInspectTick] = useState(0)
@@ -301,6 +343,14 @@ function Explorer({
     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]
   }, [])
@@ -418,7 +468,6 @@ function Explorer({
         lastIntentSig.current = null
         applyIntent(next, sessionId)
         if (
-          action === 'invoke' ||
           action === 'continue' ||
           action === 'stop' ||
           action === 'set_step_by_step'
@@ -509,6 +558,9 @@ function Explorer({
       if (typeof context?.followLook === 'boolean') {
         setFollowLook(context.followLook)
       }
+      if (typeof context?.showBranchChanges === 'boolean') {
+        setWantBranchChanges(context.showBranchChanges)
+      }
     })
     return () => {
       cancelled = true
@@ -680,12 +732,14 @@ function Explorer({
   const placeIsland = useCallback(
     (parent: string) => {
       if (!canPlace) return
+      let placedId: string | null = null
       setUserIslands((current) => {
         if (current.some((island) => island.naming)) return current
+        placedId = `draft:${Date.now()}`
         return [
           ...current,
           {
-            id: `draft:${Date.now()}`,
+            id: placedId,
             name: '',
             path: '',
             parent,
@@ -693,6 +747,10 @@ function Explorer({
           },
         ]
       })
+      if (placedId) {
+        setSelectedFolder(placedId)
+        setSelectedId(null)
+      }
       document.exitPointerLock()
     },
     [canPlace],
@@ -727,14 +785,23 @@ function Explorer({
       )
       setUserIslands(next)
       persistBlueprint(userBlocks, next)
+      setSelectedFolder(resolved.path)
+      setSelectedId(null)
       return true
     },
     [graph.folders, persistBlueprint, userBlocks, userIslands],
   )
 
-  const cancelIslandName = useCallback((id: string) => {
-    setUserIslands((current) => current.filter((island) => island.id !== id))
-  }, [])
+  const cancelIslandName = useCallback(
+    (id: string) => {
+      const draft = userIslands.find((island) => island.id === id)
+      setUserIslands((current) => current.filter((island) => island.id !== id))
+      setSelectedFolder((selected) =>
+        selected === id ? draft?.parent ?? null : selected,
+      )
+    },
+    [userIslands],
+  )
 
   const deleteSelectedCreatedBlock = useCallback(() => {
     if (!canPlace || !selectedId) return false
@@ -974,6 +1041,10 @@ function Explorer({
     return () => window.removeEventListener('keydown', onKey)
   }, [cancelBlockName, cancelIslandName, namingId, namingIslandId])
 
+  useEffect(() => {
+    if (mode !== 'map' || naming) setMapMenu(null)
+  }, [mode, naming])
+
   useEffect(() => {
     const onKey = (event: KeyboardEvent) => {
       if (event.repeat || event.code !== 'Backspace') return
@@ -1002,6 +1073,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)
   }, [])
@@ -1031,6 +1114,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) => {
@@ -1111,23 +1236,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 (
     <>
@@ -1162,7 +1287,7 @@ function Explorer({
             plannedImports={plannedImports}
             createdIds={plannedCreates}
             deletedIds={deletedIds}
-            createLines={intent.createLines ?? {}}
+            createLines={changeSet.createLines ?? {}}
             flyTo={flyTo}
             aimedRelation={aimedRelation}
             onAimRelation={setAimedRelation}
@@ -1174,6 +1299,7 @@ function Explorer({
             namingIslandId={namingIslandId}
             onPlaceBlock={canPlace ? placeBlock : undefined}
             onPlaceIsland={canPlace ? placeIsland : undefined}
+            onBlueprintMenu={canPlace ? setMapMenu : undefined}
             onCommitName={commitBlockName}
             onCancelName={cancelBlockName}
             userCreatedBlocks={userBlocks}
@@ -1203,12 +1329,18 @@ function Explorer({
         intents={intents}
         focusedSessionId={focusedSessionId}
         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}
@@ -1241,6 +1373,12 @@ function Explorer({
         createdIds={plannedCreates}
         deletedIds={deletedIds}
       />
+      <MapContextMenu
+        menu={mapMenu}
+        onAddFile={placeBlockOnFolder}
+        onAddFolder={placeIslandOnFolder}
+        onClose={() => setMapMenu(null)}
+      />
     </>
   )
 }

package/apps/explorer/src/agentIntent.ts

@@ -45,10 +45,26 @@ function normalizeImportAdditions(value: unknown): PatchImportAddition[] {
   })
 }
 
+function normalizeAck(
+  value: unknown,
+): AgentIntent['lastAck'] {
+  if (!value || typeof value !== 'object') return null
+  const kind = (value as { kind?: unknown }).kind
+  if (typeof kind !== 'string' || kind.trim() === '') return null
+  const detail = (value as { detail?: unknown }).detail
+  const at = (value as { at?: unknown }).at
+  return {
+    kind,
+    detail: typeof detail === 'string' ? detail : '',
+    at: typeof at === 'string' ? at : null,
+  }
+}
+
 export const emptyIntent: AgentIntent = {
   updatedAt: null,
   showMap: false,
   status: 'idle',
+  name: null,
   feature: null,
   steps: [],
   step: null,
@@ -76,6 +92,10 @@ export const emptyIntent: AgentIntent = {
   working: false,
   stalledWait: false,
   llmIdle: false,
+  awaitingAttach: false,
+  listening: false,
+  lastAck: null,
+  initialInstruction: null,
   creationMode: false,
   canEnterBlueprint: false,
   blueprintSessionId: null,
@@ -91,6 +111,7 @@ function normalize(data: Partial<AgentIntent> | null | undefined): AgentIntent {
     updatedAt: data?.updatedAt ?? null,
     showMap: Boolean(data?.showMap),
     status: data?.status ?? 'idle',
+    name: data?.name ?? null,
     feature: data?.feature ?? null,
     steps: Array.isArray(data?.steps) ? data.steps : [],
     step: typeof data?.step === 'number' ? data.step : null,
@@ -121,6 +142,11 @@ function normalize(data: Partial<AgentIntent> | null | undefined): AgentIntent {
     working: Boolean(data?.working),
     stalledWait: Boolean(data?.stalledWait),
     llmIdle: Boolean(data?.llmIdle),
+    awaitingAttach: Boolean(data?.awaitingAttach),
+    listening: Boolean(data?.listening),
+    lastAck: normalizeAck(data?.lastAck),
+    initialInstruction:
+      typeof data?.initialInstruction === 'string' ? data.initialInstruction : null,
     creationMode: Boolean(data?.creationMode),
     canEnterBlueprint: Boolean(data?.canEnterBlueprint),
     blueprintSessionId:
@@ -224,6 +250,20 @@ export function persistSessionBlueprint(
   })
 }
 
+export function persistInitialInstruction(sessionId: string, instruction: string) {
+  fetch('/api/agent-intent', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      action: 'set_initial_instruction',
+      sessionId,
+      instruction,
+    }),
+  }).catch(() => {
+    // Keep the local instruction if the session handshake is no longer open.
+  })
+}
+
 export function persistSessionFocus(sessionId: string) {
   fetch('/api/agent-intent', {
     method: 'POST',
@@ -237,6 +277,29 @@ export function persistSessionFocus(sessionId: string) {
   })
 }
 
+export async function setupVisualizerSession(name?: string) {
+  const response = await fetch('/api/agent-intent', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      action: 'setup_session',
+      name,
+    }),
+  })
+  if (!response.ok) {
+    const detail = await response.text()
+    let message = detail || 'Could not set up the LLM session'
+    try {
+      const parsed = JSON.parse(detail) as { error?: string }
+      if (parsed?.error) message = parsed.error
+    } catch {
+      // Use the raw body when it is not JSON.
+    }
+    throw new Error(message)
+  }
+  return normalize((await response.json()) as AgentIntent)
+}
+
 export async function inspectTargetFile(payload: {
   sessionId?: string | null
   diffId?: string | null

package/apps/explorer/src/branchChanges.ts

@@ -0,0 +1,54 @@
+import type { BranchChanges } from './types'
+
+export const emptyBranchChanges: BranchChanges = {
+  available: false,
+  branch: null,
+  base: null,
+  files: [],
+  creates: [],
+  deletes: [],
+  createFolders: [],
+  createLines: {},
+  imports: [],
+  addedFunctions: [],
+  addedVariables: [],
+  addedImports: [],
+  changedFunctions: [],
+  changedVariables: [],
+}
+
+function normalize(data: Partial<BranchChanges> | null | undefined): BranchChanges {
+  return {
+    available: Boolean(data?.available),
+    branch: typeof data?.branch === 'string' ? data.branch : null,
+    base: typeof data?.base === 'string' ? data.base : null,
+    files: Array.isArray(data?.files) ? data.files : [],
+    creates: Array.isArray(data?.creates) ? data.creates : [],
+    deletes: Array.isArray(data?.deletes) ? data.deletes : [],
+    createFolders: Array.isArray(data?.createFolders) ? data.createFolders : [],
+    createLines:
+      data?.createLines && typeof data.createLines === 'object'
+        ? data.createLines
+        : {},
+    imports: Array.isArray(data?.imports) ? data.imports : [],
+    addedFunctions: Array.isArray(data?.addedFunctions) ? data.addedFunctions : [],
+    addedVariables: Array.isArray(data?.addedVariables) ? data.addedVariables : [],
+    addedImports: Array.isArray(data?.addedImports) ? data.addedImports : [],
+    changedFunctions: Array.isArray(data?.changedFunctions)
+      ? data.changedFunctions
+      : [],
+    changedVariables: Array.isArray(data?.changedVariables)
+      ? data.changedVariables
+      : [],
+  }
+}
+
+export async function fetchBranchChanges(): Promise<BranchChanges> {
+  try {
+    const response = await fetch(`/api/branch-changes?t=${Date.now()}`)
+    if (!response.ok) return emptyBranchChanges
+    return normalize((await response.json()) as BranchChanges)
+  } catch {
+    return emptyBranchChanges
+  }
+}