@jkwd/inbase 0.1.19 → 0.1.20

package/apps/explorer/src/scene/SelectionThumbnail.tsx

@@ -30,6 +30,8 @@ type SelectionThumbnailProps = {
   plannedIds?: string[]
   createdIds?: string[]
   deletedIds?: string[]
+  pointedFileIds?: string[]
+  pointedFolderPaths?: string[]
   onMinimize?: () => void
   onMaximize?: () => void
   onHide: () => void
@@ -464,6 +466,8 @@ function ThumbnailScene({
   planned,
   created,
   deleted,
+  pointedFiles,
+  pointedFolders,
   zoom,
   zoomRef,
   panRef,
@@ -481,6 +485,8 @@ function ThumbnailScene({
   planned: Set<string>
   created: Set<string>
   deleted: Set<string>
+  pointedFiles: Set<string>
+  pointedFolders: Set<string>
   zoom: number
   zoomRef: { current: number }
   panRef: { current: Vec3 }
@@ -496,15 +502,18 @@ function ThumbnailScene({
         const selected = file.id === target.selectedFileId
         const related = target.relatedIds.has(file.id)
         const changeKind = fileChangeKind(file.id, planned, created, deleted)
+        const pointed = pointedFiles.has(file.id)
         const dimmed =
           Boolean(target.selectedFileId) &&
           !selected &&
           !related &&
-          !changeKind
+          !changeKind &&
+          !pointed
         let priority = placed.size[1]
         if (selected) priority += 1000
         else if (related) priority += 400
         else if (changeKind) priority += 300
+        else if (pointed) priority += 250
         else if (file.userCreated) priority += 80
         if (dimmed) priority -= 200
         return {
@@ -517,7 +526,7 @@ function ThumbnailScene({
           priority,
         }
       }),
-    [created, deleted, planned, target],
+      [created, deleted, planned, pointedFiles, target],
   )
 
   return (
@@ -554,12 +563,14 @@ function ThumbnailScene({
       <FolderArea
         folder={target.folder}
         highlightKind={highlightedFolders[target.folder.path] ?? null}
+        pointed={pointedFolders.has(target.folder.path)}
         previewLabels={zoom < 1.45}
       />
       {target.files.map(({ file, placed }) => {
         const selected = file.id === target.selectedFileId
         const related = target.relatedIds.has(file.id)
         const changeKind = fileChangeKind(file.id, planned, created, deleted)
+        const pointed = pointedFiles.has(file.id)
         return (
           <FileBlock
             key={file.id}
@@ -570,6 +581,7 @@ function ThumbnailScene({
             planned={Boolean(changeKind)}
             changeKind={changeKind}
             added={created.has(file.id) || file.userCreated}
+            pointed={pointed}
             highlightMapChange
             previewLabels
             labelVisible={visibleLabelIds.has(file.id)}
@@ -577,7 +589,8 @@ function ThumbnailScene({
               Boolean(target.selectedFileId) &&
               !selected &&
               !related &&
-              !changeKind
+              !changeKind &&
+              !pointed
             }
           />
         )

package/apps/explorer/src/scene/World.tsx

@@ -73,6 +73,8 @@ type WorldProps = {
   userCreatedBlocks?: UserCreatedBlock[]
   userCreatedIslands?: UserCreatedIsland[]
   overlayBlocks?: UserCreatedBlock[]
+  pointedFileIds?: string[]
+  pointedFolderPaths?: string[]
   namingIslandId?: string | null
   mapGraph?: CodebaseGraph | null
   mapLayout?: WorldLayout | null
@@ -117,11 +119,15 @@ export function World({
   userCreatedBlocks = [],
   userCreatedIslands = [],
   overlayBlocks = [],
+  pointedFileIds = [],
+  pointedFolderPaths = [],
   mapGraph = null,
   mapLayout = null,
 }: WorldProps) {
   const created = new Set(createdIds)
   const deleted = new Set(deletedIds)
+  const pointedFiles = new Set(pointedFileIds)
+  const pointedFolders = new Set(pointedFolderPaths)
   const mapping = mode === 'map'
   const viewGraph = mapping && mapGraph ? mapGraph : graph
   const viewLayout = mapping && mapLayout ? mapLayout : layout
@@ -169,17 +175,19 @@ export function World({
     if (selectedId) ids.add(selectedId)
     if (namingId) ids.add(namingId)
     if (aimedRelation?.flyTo) ids.add(aimedRelation.flyTo)
+    for (const id of pointedFileIds) ids.add(id)
     if (ghostKey) {
       for (const id of ghostKey.split('|')) ids.add(id)
     }
     return ids
-  }, [aimedRelation?.flyTo, ghostKey, namingId, selectedId])
+  }, [aimedRelation?.flyTo, ghostKey, namingId, pointedFileIds, selectedId])
   const keepFolderPaths = useMemo(() => {
     const paths = new Set<string>()
     if (selectedFolder) paths.add(selectedFolder)
     if (namingIslandId) paths.add(namingIslandId)
+    for (const path of pointedFolderPaths) paths.add(path)
     return paths
-  }, [namingIslandId, selectedFolder])
+  }, [namingIslandId, pointedFolderPaths, selectedFolder])
   const originLod = useMemo(() => {
     if (mapping) return null
     return computeWalkLod({
@@ -254,6 +262,7 @@ export function World({
             highlightKind={
               mapping ? highlightedFolders[folder.path] ?? null : null
             }
+            pointed={pointedFolders.has(folder.path)}
             labelVisible={!lod || lod.folderLabels.has(folder.path)}
             onCommitName={
               folder.path === namingIslandId && onCommitIslandName
@@ -285,14 +294,22 @@ export function World({
         const changeKind = fileChangeKind(file.id, planned, created, deleted)
         const naming = file.id === namingId
         const aimed = file.id === aimedRelation?.flyTo
+        const pointed = pointedFiles.has(file.id)
         const detailed =
-          selected || isRelated || isPlanned || naming || aimed || Boolean(changeKind)
+          selected ||
+          isRelated ||
+          isPlanned ||
+          naming ||
+          aimed ||
+          pointed ||
+          Boolean(changeKind)
         if (lod && !lod.files.has(file.id)) return null
         const dimmed =
           hasFocus &&
           !selected &&
           !isRelated &&
           !changeKind &&
+          !pointed &&
           !patchLinked.has(file.id) &&
           !folderFileIds.has(file.id)
         if (lod && !detailed && !lod.labels.has(file.id)) {
@@ -310,6 +327,7 @@ export function World({
             changeKind={changeKind}
             added={created.has(file.id) || file.userCreated}
             aimed={aimed}
+            pointed={pointed}
             dimmed={dimmed}
             naming={naming}
             mapMode={mapping}
@@ -347,6 +365,7 @@ export function World({
             planned={false}
             changeKind="add"
             added
+            pointed={pointedFiles.has(file.id)}
             dimmed={false}
             mapMode={mapping}
             labelVisible

package/apps/explorer/src/types.ts

@@ -225,6 +225,14 @@ export type BlueprintNote = {
   note: string
 }
 
+export type BlueprintPointerKind = 'file' | 'folder' | 'function' | 'variable'
+
+export type BlueprintPointer = {
+  kind: BlueprintPointerKind
+  path: string
+  name?: string
+}
+
 export type AimedRelation = {
   from: string
   to: string
@@ -275,6 +283,7 @@ export type SharedBlueprint = {
   addedVariables: PatchSymbolAddition[]
   addedImports: PatchImportAddition[]
   notes: BlueprintNote[]
+  pointers: BlueprintPointer[]
 }
 
 export type AgentIntentBundle = {
@@ -341,4 +350,5 @@ export type AgentIntent = {
   blueprintVariables: PatchSymbolAddition[]
   blueprintImports: PatchImportAddition[]
   blueprintNotes: BlueprintNote[]
+  blueprintPointers: BlueprintPointer[]
 }

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

@@ -0,0 +1,26 @@
+export function EyeIcon({
+  size = 18,
+  title,
+}: {
+  size?: number
+  title?: string
+}) {
+  return (
+    <svg
+      viewBox="0 0 24 24"
+      width={size}
+      height={size}
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      aria-hidden={title ? undefined : true}
+      role={title ? 'img' : undefined}
+    >
+      {title ? <title>{title}</title> : null}
+      <path d="M2 12s3.5-7 10-7 10 7 10 7-3.5 7-10 7-10-7-10-7Z" />
+      <circle cx="12" cy="12" r="3" />
+    </svg>
+  )
+}

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

@@ -10,6 +10,8 @@ import {
   type AimedRelation,
   type BlueprintNote,
   type BlueprintNoteKind,
+  type BlueprintPointer,
+  type BlueprintPointerKind,
   type BranchChanges,
   type CodebaseGraph,
   type PatchImportAddition,
@@ -18,7 +20,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 +314,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 +591,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 +702,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 +735,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 +819,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 +837,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 +847,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 +1094,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 +1293,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 +1569,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 +1657,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 +1767,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 +1784,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 +1848,7 @@ export function HUD({
   blueprintVariables = [],
   blueprintImports = [],
   blueprintNotes = [],
+  blueprintPointers = [],
   onAddBlueprintFunction,
   onAddBlueprintVariable,
   onAddBlueprintImport,
@@ -1821,6 +1856,7 @@ export function HUD({
   onRemoveBlueprintVariable,
   onRemoveBlueprintImport,
   onSetBlueprintNote,
+  onToggleBlueprintPointer,
   onMapAddFile,
   onMapAddFolder,
   onInspectFile,
@@ -1950,6 +1986,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 +2328,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 +2433,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 +2474,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 +2531,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 +2572,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 +2732,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
@@ -2646,6 +2788,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)

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,
   )