@jkwd/inbase 0.1.19 → 0.1.21

package/apps/explorer/src/ui/HUD.tsx

@@ -2,6 +2,7 @@ import { useEffect, useRef, useState, type ReactNode } from 'react'
 import { persistAddContextFiles, persistInitialInstruction, persistRemoveContextFile } from '../agentIntent'
 import { NameInput } from './NameInput'
 import { SelectionThumbnail } from '../scene/SelectionThumbnail'
+import { CanvasErrorBoundary } from './CanvasErrorBoundary'
 import {
   canStopSession,
   isReviewingIntent,
@@ -10,6 +11,8 @@ import {
   type AimedRelation,
   type BlueprintNote,
   type BlueprintNoteKind,
+  type BlueprintPointer,
+  type BlueprintPointerKind,
   type BranchChanges,
   type CodebaseGraph,
   type PatchImportAddition,
@@ -18,7 +21,8 @@ import {
   type WorldLayout,
   type WorkflowAction,
 } from '../types'
-import { findBlueprintNote } from '../userCreated'
+import { findBlueprintNote, findBlueprintPointer } from '../userCreated'
+import { EyeIcon } from './EyeIcon'
 import { beginKeyboardIsolation, shouldIgnoreShortcut } from '../keyboard'
 
 function reviewTitle(status: AgentIntentStatus) {
@@ -311,25 +315,43 @@ function BlueprintSymbolRow({
   className,
   hasNote,
   noteOpen,
+  pointed,
   canEdit,
   canRemove,
   onRemove,
   onOpenNote,
+  onTogglePoint,
 }: {
   name: string
   className?: string
   hasNote: boolean
   noteOpen?: boolean
+  pointed?: boolean
   canEdit: boolean
   canRemove?: boolean
   onRemove?: () => void
   onOpenNote: () => void
+  onTogglePoint?: () => void
 }) {
   return (
     <li>
       <span className={className}>{name}</span>
       {canEdit && (
         <div className="hud-item-actions">
+          {onTogglePoint && (
+            <button
+              className="hud-item-point"
+              type="button"
+              data-pointed={pointed ? 'true' : 'false'}
+              aria-label={
+                pointed ? `Stop pointing to ${name}` : `Point to ${name}`
+              }
+              aria-pressed={Boolean(pointed)}
+              onClick={onTogglePoint}
+            >
+              <EyeIcon size={13} />
+            </button>
+          )}
           <button
             className="hud-item-note"
             type="button"
@@ -570,7 +592,8 @@ function blueprintIsDefined(intent: AgentIntent) {
     (intent.blueprintFunctions?.length ?? 0) > 0 ||
     (intent.blueprintVariables?.length ?? 0) > 0 ||
     (intent.blueprintImports?.length ?? 0) > 0 ||
-    (intent.blueprintNotes?.length ?? 0) > 0
+    (intent.blueprintNotes?.length ?? 0) > 0 ||
+    (intent.blueprintPointers?.length ?? 0) > 0
   )
 }
 
@@ -680,6 +703,11 @@ function sessionLiveStatus(intent: AgentIntent) {
   if (intent.awaitingAttach) {
     return { text: 'Waiting for /inbase in Cursor', busy: false }
   }
+  if (intent.status === 'pending') {
+    return intent.listening
+      ? { text: 'LLM is listening — accept or send an instruction', busy: false }
+      : { text: 'Review this step', busy: false }
+  }
   if (kind === 'execute') {
     return { text: `LLM received ${detail}`, busy: true }
   }
@@ -708,11 +736,6 @@ function sessionLiveStatus(intent: AgentIntent) {
       ? { text: 'LLM is listening — run the next step', busy: false }
       : { text: 'Plan ready', busy: false }
   }
-  if (intent.status === 'pending') {
-    return intent.listening
-      ? { text: 'LLM is listening — accept or send an instruction', busy: false }
-      : { text: 'Review this step', busy: false }
-  }
   if (
     kind === 'attached' ||
     intent.status === 'blueprint' ||
@@ -797,13 +820,16 @@ function SessionPanel({
   const [contextBusy, setContextBusy] = useState(false)
   const [contextError, setContextError] = useState<string | null>(null)
   const sessionId = intent.sessionId
-  const pending = intent.status === 'pending' && intent.isActiveDiff
+  const latestEntry = intent.isActiveDiff ? intent.chain.at(-1) : null
+  const pending =
+    latestEntry?.status === 'pending' ||
+    (intent.status === 'pending' && intent.isActiveDiff)
   const askingBlueprint = intent.status === 'blueprint_ask'
   const sendingBlueprint = intent.status === 'blueprint'
   const canPlace = Boolean(intent.creationMode)
   const preparing = intent.status === 'preparing'
-  const planReady = intent.status === 'planned'
   const working = intent.status === 'working' || intent.status === 'replanning'
+  const planReady = intent.status === 'planned' && !pending
   const previewing = intent.preview
   const chainIndex = intent.chainIndex ?? 0
   const previousDiff = intent.chain[chainIndex - 1]
@@ -812,10 +838,6 @@ function SessionPanel({
     intent.step && intent.steps?.length > 0
       ? `Step ${intent.step} of ${intent.steps.length}`
       : 'Patch'
-  const lastStep =
-    typeof intent.step === 'number' &&
-    intent.steps.length > 0 &&
-    intent.step >= intent.steps.length
   const stepByStep = intent.stepByStep !== false
   const addedFunctions = intent.addedFunctions ?? []
   const addedVariables = intent.addedVariables ?? []
@@ -826,25 +848,27 @@ function SessionPanel({
     intent.status === 'finished'
       ? intent.steps.map((step) => step.index)
       : intent.chain
-          .filter(
-            (entry) =>
-              entry.status === 'applied' || entry.status === 'extended',
-          )
+          .filter((entry) => entry.status === 'applied')
           .map((entry) => entry.step),
   )
   if (intent.status === 'approved' && typeof intent.step === 'number') {
     acceptedSteps.add(intent.step)
   }
-  const proposalStep =
-    pending && typeof intent.step === 'number' ? intent.step : null
+  const proposalStep = pending
+    ? (latestEntry?.status === 'pending' ? latestEntry.step : intent.step)
+    : null
   const processingStep =
     working && typeof intent.step === 'number' ? intent.step : null
   const invokeStep =
-    planReady && !working
+    planReady && !working && proposalStep === null
       ? (intent.steps.find((step) => !acceptedSteps.has(step.index)) ?? null)
       : null
   const canRunNext = stepByStep && Boolean(invokeStep)
   const canAcceptProposal = proposalStep !== null
+  const lastStep =
+    typeof proposalStep === 'number' &&
+    intent.steps.length > 0 &&
+    proposalStep >= intent.steps.length
   const panelDone =
     intent.status === 'finished' ||
     intent.status === 'approved' ||
@@ -1071,7 +1095,7 @@ function SessionPanel({
                   {intent.steps.map((step) => {
                     const proposed = proposalStep === step.index
                     const processing = processingStep === step.index
-                    const accepted = acceptedSteps.has(step.index)
+                    const accepted = acceptedSteps.has(step.index) && !proposed
                     const creating = processing && !proposed
                     const showStepAction =
                       creating ||
@@ -1270,7 +1294,7 @@ function SessionPanel({
                       value={instruction}
                       maxLength={4000}
                       rows={3}
-                      placeholder="Describe what should change in the next diff…"
+                      placeholder="Describe what should change in this proposal…"
                       onChange={(event) => setInstruction(event.target.value)}
                       onKeyDown={(event) => event.stopPropagation()}
                     />
@@ -1546,6 +1570,11 @@ function explorerInstructions({
           ? [
               { id: 'space', keys: ['Space'], label: 'Place file' },
               { id: 'b-island', keys: ['B'], label: 'Place island' },
+              {
+                id: 'point-to',
+                keys: ['Point to'],
+                label: 'Keep a file, folder, or function in mind',
+              },
             ]
           : []),
         ...backspace,
@@ -1629,7 +1658,7 @@ function explorerInstructions({
               {
                 id: 'add-file-folder',
                 keys: ['Right-click'],
-                label: 'Add file or folder',
+                label: 'Add file or folder, or point to a folder',
               },
             ]
           : []),
@@ -1739,6 +1768,7 @@ type HUDProps = {
   blueprintVariables?: PatchSymbolAddition[]
   blueprintImports?: PatchImportAddition[]
   blueprintNotes?: BlueprintNote[]
+  blueprintPointers?: BlueprintPointer[]
   onAddBlueprintFunction?: (fileId: string, name: string) => boolean
   onAddBlueprintVariable?: (fileId: string, name: string) => boolean
   onAddBlueprintImport?: (fileId: string, raw: string) => boolean
@@ -1755,6 +1785,11 @@ type HUDProps = {
     name?: string
     note: string
   }) => void
+  onToggleBlueprintPointer?: (next: {
+    kind: BlueprintPointerKind
+    path: string
+    name?: string
+  }) => void
   onMapAddFile?: (folderPath: string) => void
   onMapAddFolder?: (folderPath: string) => void
   onInspectFile?: (fileId: string) => void
@@ -1814,6 +1849,7 @@ export function HUD({
   blueprintVariables = [],
   blueprintImports = [],
   blueprintNotes = [],
+  blueprintPointers = [],
   onAddBlueprintFunction,
   onAddBlueprintVariable,
   onAddBlueprintImport,
@@ -1821,6 +1857,7 @@ export function HUD({
   onRemoveBlueprintVariable,
   onRemoveBlueprintImport,
   onSetBlueprintNote,
+  onToggleBlueprintPointer,
   onMapAddFile,
   onMapAddFolder,
   onInspectFile,
@@ -1950,6 +1987,16 @@ export function HUD({
   const selectedFileNote = selected
     ? findBlueprintNote(blueprintNotes, selected.id, 'file')
     : ''
+  const selectedFilePointed = selected
+    ? findBlueprintPointer(blueprintPointers, 'file', selected.id)
+    : false
+  const selectedFolderPointed = selectedFolderNode
+    ? findBlueprintPointer(
+        blueprintPointers,
+        'folder',
+        selectedFolderNode.path,
+      )
+    : false
   const openFileNote = () => {
     if (!selected || !onSetBlueprintNote) return
     setInstructionsOpen(false)
@@ -2282,6 +2329,20 @@ export function HUD({
               Inspect file
             </button>
           )}
+          {canEditBlueprint && onToggleBlueprintPointer && (
+            <button
+              className="hud-button hud-inspect hud-point"
+              type="button"
+              data-pointed={selectedFilePointed ? 'true' : 'false'}
+              aria-pressed={selectedFilePointed}
+              onClick={() =>
+                onToggleBlueprintPointer({ kind: 'file', path: selected.id })
+              }
+            >
+              <EyeIcon size={15} />
+              {selectedFilePointed ? 'Stop pointing' : 'Point to file'}
+            </button>
+          )}
           {canEditBlueprint && onSetBlueprintNote && (
             <button
               className="hud-button hud-inspect"
@@ -2373,10 +2434,26 @@ export function HUD({
                   }
                   canEdit={Boolean(canEditBlueprint && onSetBlueprintNote)}
                   canRemove={Boolean(canEditBlueprint && symbol.intended)}
+                  pointed={findBlueprintPointer(
+                    blueprintPointers,
+                    'function',
+                    selected.id,
+                    symbol.name,
+                  )}
                   onRemove={() =>
                     onRemoveBlueprintFunction?.(selected.id, symbol.name)
                   }
                   onOpenNote={() => openSymbolNote('function', symbol.name)}
+                  onTogglePoint={
+                    onToggleBlueprintPointer
+                      ? () =>
+                          onToggleBlueprintPointer({
+                            kind: 'function',
+                            path: selected.id,
+                            name: symbol.name,
+                          })
+                      : undefined
+                  }
                 />
               ))}
               {extraAddedFunctions.map((item) => (
@@ -2398,7 +2475,23 @@ export function HUD({
                     noteEditor.name === item.name
                   }
                   canEdit={Boolean(canEditBlueprint && onSetBlueprintNote)}
+                  pointed={findBlueprintPointer(
+                    blueprintPointers,
+                    'function',
+                    selected.id,
+                    item.name,
+                  )}
                   onOpenNote={() => openSymbolNote('function', item.name)}
+                  onTogglePoint={
+                    onToggleBlueprintPointer
+                      ? () =>
+                          onToggleBlueprintPointer({
+                            kind: 'function',
+                            path: selected.id,
+                            name: item.name,
+                          })
+                      : undefined
+                  }
                 />
               ))}
             </ul>
@@ -2439,10 +2532,26 @@ export function HUD({
                   }
                   canEdit={Boolean(canEditBlueprint && onSetBlueprintNote)}
                   canRemove={Boolean(canEditBlueprint && symbol.intended)}
+                  pointed={findBlueprintPointer(
+                    blueprintPointers,
+                    'variable',
+                    selected.id,
+                    symbol.name,
+                  )}
                   onRemove={() =>
                     onRemoveBlueprintVariable?.(selected.id, symbol.name)
                   }
                   onOpenNote={() => openSymbolNote('variable', symbol.name)}
+                  onTogglePoint={
+                    onToggleBlueprintPointer
+                      ? () =>
+                          onToggleBlueprintPointer({
+                            kind: 'variable',
+                            path: selected.id,
+                            name: symbol.name,
+                          })
+                      : undefined
+                  }
                 />
               ))}
               {extraAddedVariables.map((item) => (
@@ -2464,7 +2573,23 @@ export function HUD({
                     noteEditor.name === item.name
                   }
                   canEdit={Boolean(canEditBlueprint && onSetBlueprintNote)}
+                  pointed={findBlueprintPointer(
+                    blueprintPointers,
+                    'variable',
+                    selected.id,
+                    item.name,
+                  )}
                   onOpenNote={() => openSymbolNote('variable', item.name)}
+                  onTogglePoint={
+                    onToggleBlueprintPointer
+                      ? () =>
+                          onToggleBlueprintPointer({
+                            kind: 'variable',
+                            path: selected.id,
+                            name: item.name,
+                          })
+                      : undefined
+                  }
                 />
               ))}
             </ul>
@@ -2608,6 +2733,24 @@ export function HUD({
               ))}
             </ul>
           )}
+          {canPlace && onToggleBlueprintPointer && (
+            <button
+              className="hud-button hud-inspect hud-point"
+              type="button"
+              data-pointed={selectedFolderPointed ? 'true' : 'false'}
+              aria-pressed={selectedFolderPointed}
+              disabled={naming || selectedFolderNode.path.startsWith('draft:')}
+              onClick={() =>
+                onToggleBlueprintPointer({
+                  kind: 'folder',
+                  path: selectedFolderNode.path,
+                })
+              }
+            >
+              <EyeIcon size={15} />
+              {selectedFolderPointed ? 'Stop pointing' : 'Point to folder'}
+            </button>
+          )}
           {canPlace && mapping && onMapAddFile && onMapAddFolder && (
             <div className="hud-decide hud-map-blueprint">
               <button
@@ -2634,7 +2777,8 @@ export function HUD({
       )}
 
       {mapping && thumbnailVisible && (
-        <SelectionThumbnail
+        <CanvasErrorBoundary fallback={null}>
+          <SelectionThumbnail
           graph={graph}
           layout={layout}
           selectedId={selectedId}
@@ -2646,6 +2790,20 @@ export function HUD({
           plannedIds={plannedIds}
           createdIds={createdIds}
           deletedIds={deletedIds}
+          pointedFileIds={
+            blueprintHidden
+              ? []
+              : blueprintPointers.flatMap((item) =>
+                  item.kind === 'folder' ? [] : [item.path],
+                )
+          }
+          pointedFolderPaths={
+            blueprintHidden
+              ? []
+              : blueprintPointers.flatMap((item) =>
+                  item.kind === 'folder' ? [item.path] : [],
+                )
+          }
           onMinimize={() => {
             setThumbnailMaximized(false)
             setThumbnailMinimized((current) => !current)
@@ -2660,6 +2818,7 @@ export function HUD({
             setThumbnailMaximized(false)
           }}
         />
+        </CanvasErrorBoundary>
       )}
       </div>
 

package/apps/explorer/src/ui/MapContextMenu.tsx

@@ -10,15 +10,19 @@ export type MapContextMenuState = {
 
 type MapContextMenuProps = {
   menu: MapContextMenuState | null
+  pointed?: boolean
   onAddFile: (folder: string) => void
   onAddFolder: (folder: string) => void
+  onPointToFolder?: (folder: string) => void
   onClose: () => void
 }
 
 export function MapContextMenu({
   menu,
+  pointed = false,
   onAddFile,
   onAddFolder,
+  onPointToFolder,
   onClose,
 }: MapContextMenuProps) {
   useEffect(() => {
@@ -48,7 +52,7 @@ export function MapContextMenu({
 
   const pad = 8
   const width = 176
-  const height = 84
+  const height = onPointToFolder ? 126 : 84
   const left = Math.min(
     Math.max(pad, menu.x),
     window.innerWidth - width - pad,
@@ -85,6 +89,19 @@ export function MapContextMenu({
       >
         Add folder
       </button>
+      {onPointToFolder && (
+        <button
+          type="button"
+          role="menuitem"
+          aria-pressed={pointed}
+          onClick={() => {
+            onPointToFolder(menu.folder)
+            onClose()
+          }}
+        >
+          {pointed ? 'Stop pointing' : 'Point to folder'}
+        </button>
+      )}
     </div>,
     document.body,
   )

package/apps/explorer/src/userCreated.ts

@@ -3,6 +3,8 @@ import { folderOfFile, folderParent } from './layout'
 import type {
   BlueprintNote,
   BlueprintNoteKind,
+  BlueprintPointer,
+  BlueprintPointerKind,
   CodebaseGraph,
   FileNode,
   PatchImportAddition,
@@ -437,6 +439,101 @@ export function dropBlueprintSymbolNote(
   )
 }
 
+export function blueprintPointerKey(
+  pointer: Pick<BlueprintPointer, 'kind' | 'path' | 'name'>,
+) {
+  return pointer.kind === 'file' || pointer.kind === 'folder'
+    ? `${pointer.kind}:${pointer.path}`
+    : `${pointer.kind}:${pointer.path}:${pointer.name ?? ''}`
+}
+
+function parseBlueprintPointer(value: unknown): BlueprintPointer | null {
+  if (!value || typeof value !== 'object') return null
+  const item = value as Partial<BlueprintPointer>
+  const path = typeof item.path === 'string' ? item.path.trim() : ''
+  if (!path) return null
+  if (item.kind === 'file' || item.kind === 'folder') {
+    return { kind: item.kind, path }
+  }
+  if (item.kind !== 'function' && item.kind !== 'variable') return null
+  const name = typeof item.name === 'string' ? item.name.trim() : ''
+  if (!name) return null
+  return { kind: item.kind, path, name }
+}
+
+export function parseBlueprintPointers(value: unknown): BlueprintPointer[] {
+  if (!Array.isArray(value)) return []
+  const seen = new Set<string>()
+  const pointers: BlueprintPointer[] = []
+  for (const item of value) {
+    const parsed = parseBlueprintPointer(item)
+    if (!parsed) continue
+    const key = blueprintPointerKey(parsed)
+    if (seen.has(key)) continue
+    seen.add(key)
+    pointers.push(parsed)
+  }
+  return pointers
+}
+
+export function findBlueprintPointer(
+  pointers: BlueprintPointer[],
+  kind: BlueprintPointerKind,
+  path: string,
+  name?: string,
+) {
+  return pointers.some((item) =>
+    kind === 'file' || kind === 'folder'
+      ? item.kind === kind && item.path === path
+      : item.kind === kind && item.path === path && item.name === name,
+  )
+}
+
+export function toggleBlueprintPointer(
+  pointers: BlueprintPointer[],
+  next: {
+    kind: BlueprintPointerKind
+    path: string
+    name?: string
+  },
+): BlueprintPointer[] {
+  const path = next.path.trim()
+  if (!path || path.startsWith('draft:')) return pointers
+  const key = blueprintPointerKey({ ...next, path })
+  const without = pointers.filter((item) => blueprintPointerKey(item) !== key)
+  if (without.length !== pointers.length) return without
+  if (next.kind === 'file' || next.kind === 'folder') {
+    return [...without, { kind: next.kind, path }]
+  }
+  const name = (next.name ?? '').trim()
+  if (!name) return without
+  return [...without, { kind: next.kind, path, name }]
+}
+
+export function dropBlueprintFilePointers(
+  pointers: BlueprintPointer[],
+  fileIds: Iterable<string>,
+  folderPaths: Iterable<string> = [],
+) {
+  const files = new Set(fileIds)
+  const folders = new Set(folderPaths)
+  return pointers.filter((item) =>
+    item.kind === 'folder' ? !folders.has(item.path) : !files.has(item.path),
+  )
+}
+
+export function dropBlueprintSymbolPointer(
+  pointers: BlueprintPointer[],
+  path: string,
+  kind: 'function' | 'variable',
+  name: string,
+) {
+  return pointers.filter(
+    (item) =>
+      !(item.kind === kind && item.path === path && item.name === name),
+  )
+}
+
 export function parseBlueprintImport(
   raw: string,
   file: string,

package/apps/explorer/vite.config.ts

@@ -114,6 +114,7 @@ function blueprintIntentFields() {
     blueprintVariables: blueprint.addedVariables,
     blueprintImports: blueprint.addedImports,
     blueprintNotes: blueprint.notes,
+    blueprintPointers: blueprint.pointers,
   }
 }
 
@@ -267,6 +268,7 @@ async function decideIntent(req: IncomingMessage, res: ServerResponse) {
       addedVariables?: unknown[]
       addedImports?: unknown[]
       notes?: unknown[]
+      pointers?: unknown[]
       files?: unknown[]
       fileId?: string
     }
@@ -360,6 +362,7 @@ async function decideIntent(req: IncomingMessage, res: ServerResponse) {
         addedVariables: body.addedVariables,
         addedImports: body.addedImports,
         notes: body.notes,
+        pointers: body.pointers,
       })
     } else if (action === 'blueprint_clear') {
       clearBlueprint(dataDir)
@@ -375,6 +378,7 @@ async function decideIntent(req: IncomingMessage, res: ServerResponse) {
         addedVariables: body.addedVariables,
         addedImports: body.addedImports,
         notes: body.notes,
+        pointers: body.pointers,
       })
     } else if (action === 'setup_session') {
       const manifest = setupSession(dataDir, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jkwd/inbase",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "A first-person 3D map of a codebase, with a visual coding workflow for Cursor.",
   "license": "MIT",
   "author": "Joris Kuijper",