@jkwd/inbase 0.1.4 → 0.1.6

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

@@ -8,9 +8,14 @@ import { SelectionController } from './SelectionController'
 import { UserContextTracker } from './UserContextTracker'
 import { BlockPlacer } from './BlockPlacer'
 import { IslandPlacer } from './IslandPlacer'
-import { folderOfFile, filesImporting } from '../layout'
+import {
+  fileChangeKind,
+  filesImporting,
+  folderChangeHighlights,
+  folderOfFile,
+  mapPointOntoFolder,
+} from '../layout'
 import { WORLD_VOID } from '../theme'
-import type { ChangeKind } from '../theme'
 import type {
   CodebaseGraph,
   FileNode,
@@ -49,6 +54,8 @@ type WorldProps = {
   flyTo: FlyTo | null
   aimedRelation: AimedRelation | null
   onAimRelation: (aim: AimedRelation | null) => void
+  onAimFile?: (fileId: string | null) => void
+  onInspect?: (fileId: string) => void
   onTravelTo: (fromId: string, toId: string) => void
   importedBy?: boolean
   namingId?: string | null
@@ -59,6 +66,8 @@ type WorldProps = {
   userCreatedBlocks?: UserCreatedBlock[]
   userCreatedIslands?: UserCreatedIsland[]
   namingIslandId?: string | null
+  mapGraph?: CodebaseGraph | null
+  mapLayout?: WorldLayout | null
 }
 
 export function World({
@@ -85,6 +94,8 @@ export function World({
   flyTo,
   aimedRelation,
   onAimRelation,
+  onAimFile,
+  onInspect,
   onTravelTo,
   importedBy = false,
   namingId = null,
@@ -95,10 +106,18 @@ export function World({
   onCancelName,
   userCreatedBlocks = [],
   userCreatedIslands = [],
+  mapGraph = null,
+  mapLayout = null,
 }: WorldProps) {
   const created = new Set(createdIds)
   const deleted = new Set(deletedIds)
   const mapping = mode === 'map'
+  const viewGraph = mapping && mapGraph ? mapGraph : graph
+  const viewLayout = mapping && mapLayout ? mapLayout : layout
+  const mapMarker =
+    viewLayout === layout
+      ? landAt
+      : mapPointOntoFolder(landAt[0], landAt[1], layout, viewLayout)
   const placing = Boolean(namingId || namingIslandId)
   const planned = new Set(plannedIds)
   const ghosts = previewFiles
@@ -127,37 +146,12 @@ export function World({
     Boolean(selectedFolder) ||
     planned.size > 0 ||
     deleted.size > 0
-  const highlightedFolders: Partial<Record<string, ChangeKind>> = {}
-  const folderKinds = new Map<string, Set<ChangeKind>>()
-  const addFolderKind = (id: string, kind: ChangeKind) => {
-    const folder = folderOfFile(id)
-    const kinds = folderKinds.get(folder) ?? new Set<ChangeKind>()
-    kinds.add(kind)
-    folderKinds.set(folder, kinds)
-  }
-  for (const id of planned) {
-    addFolderKind(id, created.has(id) ? 'add' : 'edit')
-  }
-  for (const id of deleted) addFolderKind(id, 'remove')
-  for (const [folder, kinds] of folderKinds) {
-    if (kinds.size === 1) highlightedFolders[folder] = [...kinds][0]
-  }
-  if (planned.size > 0 || deleted.size > 0) {
-    for (const folder of Object.values(layout.folders)) {
-      if (!folder.added) continue
-      const kinds = folderKinds.get(folder.path)
-      if (!kinds || kinds.size === 1) {
-        highlightedFolders[folder.path] ??= 'add'
-      }
-    }
-  }
-
-  const changeKindOf = (id: string): ChangeKind | null => {
-    if (deleted.has(id)) return 'remove'
-    if (created.has(id)) return 'add'
-    if (planned.has(id)) return 'edit'
-    return null
-  }
+  const highlightedFolders = folderChangeHighlights(
+    planned,
+    created,
+    deleted,
+    viewLayout.folders,
+  )
 
   return (
     <>
@@ -170,9 +164,9 @@ export function World({
       />
       <ambientLight intensity={mapping ? 0.7 : 0.42} />
       <MapView
-        layout={layout}
+        layout={viewLayout}
         enabled={mapping}
-        marker={landAt}
+        marker={mapMarker}
         highlightedFolders={highlightedFolders}
         selectedFolder={selectedFolder}
         onLand={onLand}
@@ -181,26 +175,28 @@ export function World({
         onTravelTo={onTravelTo}
       />
 
-      {Object.values(layout.folders).map((folder) => (
+      {Object.values(viewLayout.folders).map((folder) => (
         <FolderArea
           key={folder.path}
           folder={folder}
           naming={folder.path === namingIslandId}
           selected={folder.path === selectedFolder}
           mapMode={mapping}
-          highlightKind={highlightedFolders[folder.path] ?? null}
+          highlightKind={
+            mapping ? highlightedFolders[folder.path] ?? null : null
+          }
         />
       ))}
-      {layout.bridges.map((bridge) => (
-        <Bridge key={bridge.id} bridge={bridge} />
+      {viewLayout.bridges.map((bridge) => (
+        <Bridge key={bridge.id} bridge={bridge} folders={viewLayout.folders} />
       ))}
-      {graph.files.map((file) => {
-        const placed = layout.files[file.id]
+      {viewGraph.files.map((file) => {
+        const placed = viewLayout.files[file.id]
         if (!placed) return null
         const selected = file.id === selectedId
         const isRelated = related.has(file.id)
         const isPlanned = planned.has(file.id) || deleted.has(file.id)
-        const changeKind = changeKindOf(file.id)
+        const changeKind = fileChangeKind(file.id, planned, created, deleted)
         const naming = file.id === namingId
         return (
           <FileBlock
@@ -267,8 +263,8 @@ export function World({
       <RelationLines
         selectedId={selectedId}
         aimedRelation={aimedRelation}
-        files={graph.files}
-        layout={layout}
+        files={viewGraph.files}
+        layout={viewLayout}
         extras={ghosts}
         plannedEdges={plannedImports}
         fromAbove={mapping}
@@ -302,6 +298,8 @@ export function World({
       <SelectionController
         locked={locked && !mapping}
         onSelect={onSelect}
+        onInspect={onInspect}
+        onAimFile={onAimFile}
         onAimRelation={onAimRelation}
         onTravelTo={onTravelTo}
         files={{ ...layout.files, ...ghosts }}

package/apps/explorer/src/theme.ts

@@ -54,10 +54,16 @@ export const CHANGE_HIGHLIGHT: Record<
   },
 }
 
+export const FILE_SELECTION = {
+  color: '#c026ff',
+  emissive: '#6d00b8',
+}
+
 export const MAP_SELECTION = {
   color: '#000000',
+  island: FILE_SELECTION.color,
   islandPad: 0.38,
-  blockPad: 0.2,
+  blockPad: 0.1,
 }
 
 export function fileHeight(lines: number) {
@@ -104,11 +110,18 @@ export function dimColor(hex: string, amount = 0.32) {
   return `#${channel(0)}${channel(2)}${channel(4)}`
 }
 
-export function folderFloorColor(path: string) {
+function folderHue(path: string) {
   let hash = 0
   for (let i = 0; i < path.length; i += 1) {
     hash = path.charCodeAt(i) + ((hash << 5) - hash)
   }
-  const hue = Math.abs(hash) % 360
-  return `hsl(${hue}, 16%, 18%)`
+  return Math.abs(hash) % 360
+}
+
+export function folderFloorColor(path: string) {
+  return `hsl(${folderHue(path)}, 5%, 48%)`
+}
+
+export function folderAisleColor(path: string) {
+  return `hsl(${folderHue(path)}, 6%, 40%)`
 }

package/apps/explorer/src/types.ts

@@ -152,6 +152,13 @@ export function isReviewingIntent(status: AgentIntentStatus) {
   )
 }
 
+export function canStopSession(intent: {
+  sessionId: string | null
+  status: AgentIntentStatus
+}) {
+  return Boolean(intent.sessionId) && intent.status !== 'idle'
+}
+
 export type PlanStep = {
   index: number
   title: string
@@ -207,6 +214,12 @@ export type WorkflowAction =
   | 'blueprint_no'
   | 'blueprint_send'
   | 'blueprint_update'
+  | 'set_step_by_step'
+
+export type AgentIntentBundle = {
+  focusedSessionId: string | null
+  intents: AgentIntent[]
+}
 
 export type AgentIntent = {
   updatedAt: string | null
@@ -215,6 +228,7 @@ export type AgentIntent = {
   feature: string | null
   steps: PlanStep[]
   step: number | null
+  stepByStep: boolean
   files: string[]
   creates: string[]
   deletes: string[]
@@ -224,6 +238,8 @@ export type AgentIntent = {
   addedFunctions: PatchSymbolAddition[]
   addedVariables: PatchSymbolAddition[]
   addedImports: PatchImportAddition[]
+  changedFunctions: PatchSymbolAddition[]
+  changedVariables: PatchSymbolAddition[]
   reason: string | null
   sessionId: string | null
   diffId: string | null
@@ -234,6 +250,7 @@ export type AgentIntent = {
   preview: boolean
   phase: WorkflowPhase | null
   working: boolean
+  stalledWait: boolean
   creationMode: boolean
   canEnterBlueprint: boolean
   blueprintSessionId: string | null