@jkwd/inbase 0.1.13 → 0.1.16

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

@@ -4,6 +4,7 @@ import { PerspectiveCamera, PointerLockControls } from '@react-three/drei'
 import type { PointerLockControls as PointerLockControlsImpl } from 'three-stdlib'
 import * as THREE from 'three'
 import { CONFIG } from '../theme'
+import { isKeyboardIsolated, shouldIgnoreShortcut } from '../keyboard'
 import type { FlyTo, ViewMode, WorldLayout } from '../types'
 
 const lookDir = new THREE.Vector3()
@@ -143,15 +144,7 @@ export function Player({
 
   useEffect(() => {
     const onKey = (event: KeyboardEvent, down: boolean) => {
-      if (
-        event.target instanceof HTMLElement &&
-        (event.target.tagName === 'TEXTAREA' ||
-          event.target.tagName === 'INPUT' ||
-          event.target.tagName === 'SELECT' ||
-          event.target.isContentEditable)
-      ) {
-        return
-      }
+      if (shouldIgnoreShortcut(event)) return
       if (event.code === 'KeyW' || event.code === 'ArrowUp') keys.current.forward = down
       if (event.code === 'KeyS' || event.code === 'ArrowDown') keys.current.back = down
       if (event.code === 'KeyA' || event.code === 'ArrowLeft') keys.current.left = down
@@ -235,6 +228,13 @@ export function Player({
           setSteering(true)
         }
       } else if (walking && locked) {
+        if (isKeyboardIsolated()) {
+          keys.current.forward = false
+          keys.current.back = false
+          keys.current.left = false
+          keys.current.right = false
+          keys.current.sprint = false
+        }
         camera.getWorldDirection(front.current)
         front.current.y = 0
         front.current.normalize()

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

@@ -9,6 +9,7 @@ import {
   folderOfFile,
 } from '../layout'
 import { CONFIG, WORLD_VOID, type ChangeKind } from '../theme'
+import { shouldIgnoreShortcut } from '../keyboard'
 import type { CodebaseGraph, PlacedFile, PlacedFolder, WorldLayout } from '../types'
 import { FileBlock } from './FileBlock'
 import { FolderArea } from './FolderArea'
@@ -903,6 +904,7 @@ export function SelectionThumbnail({
     if (!maximized) return
     const onKeyDown = (event: KeyboardEvent) => {
       if (event.key !== 'Escape') return
+      if (shouldIgnoreShortcut(event)) return
       event.preventDefault()
       onMaximize?.()
     }

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

@@ -19,7 +19,7 @@ import {
   folderOfFile,
   mapPointOntoFolder,
 } from '../layout'
-import { WORLD_VOID } from '../theme'
+import { WORLD_VOID, CONFIG, fileHeight } from '../theme'
 import type {
   CodebaseGraph,
   FileNode,
@@ -33,6 +33,7 @@ import type {
   ViewMode,
   WorldLayout,
 } from '../types'
+import { toCreatedFile } from '../userCreated'
 
 type WorldProps = {
   graph: CodebaseGraph
@@ -67,8 +68,11 @@ type WorldProps = {
   onBlueprintMenu?: (menu: MapBlueprintMenu) => void
   onCommitName?: (id: string, name: string) => boolean
   onCancelName?: (id: string) => void
+  onCommitIslandName?: (id: string, name: string) => boolean
+  onCancelIslandName?: (id: string) => void
   userCreatedBlocks?: UserCreatedBlock[]
   userCreatedIslands?: UserCreatedIsland[]
+  overlayBlocks?: UserCreatedBlock[]
   namingIslandId?: string | null
   mapGraph?: CodebaseGraph | null
   mapLayout?: WorldLayout | null
@@ -108,8 +112,11 @@ export function World({
   onBlueprintMenu,
   onCommitName,
   onCancelName,
+  onCommitIslandName,
+  onCancelIslandName,
   userCreatedBlocks = [],
   userCreatedIslands = [],
+  overlayBlocks = [],
   mapGraph = null,
   mapLayout = null,
 }: WorldProps) {
@@ -226,6 +233,7 @@ export function World({
         marker={mapMarker}
         highlightedFolders={highlightedFolders}
         selectedFolder={selectedFolder}
+        namingFolderPath={namingIslandId}
         onLand={onLand}
         onSelect={onSelect}
         onSelectFolder={onSelectFolder}
@@ -248,6 +256,18 @@ export function World({
               mapping ? highlightedFolders[folder.path] ?? null : null
             }
             labelVisible={!lod || lod.folderLabels.has(folder.path)}
+            onCommitName={
+              folder.path === namingIslandId && onCommitIslandName
+                ? (name) => {
+                    onCommitIslandName(folder.path, name)
+                  }
+                : undefined
+            }
+            onCancelName={
+              folder.path === namingIslandId && onCancelIslandName
+                ? () => onCancelIslandName(folder.path)
+                : undefined
+            }
           />
         )
       })}
@@ -309,6 +329,31 @@ export function World({
         )
       })}
       <DistantFileBlocks items={distantFiles} />
+      {overlayBlocks.map((block) => {
+        const file = toCreatedFile(block)
+        const height = fileHeight(12)
+        const placed: PlacedFile = {
+          id: block.id,
+          position: [block.x, height / 2 + 0.42, block.z],
+          size: [CONFIG.fileWidth, height, CONFIG.fileDepth],
+          aisleFace: 1,
+        }
+        return (
+          <FileBlock
+            key={`blueprint:${block.id}`}
+            file={file}
+            placed={placed}
+            selected={file.id === selectedId}
+            related={false}
+            planned={false}
+            changeKind="add"
+            added
+            dimmed={false}
+            mapMode={mapping}
+            labelVisible
+          />
+        )
+      })}
       {Object.values(ghosts).map((placed) => {
         const file: FileNode = {
           id: placed.id,

package/apps/explorer/src/types.ts

@@ -216,6 +216,15 @@ export type PatchImportAddition = {
   file: string
 }
 
+export type BlueprintNoteKind = 'file' | 'function' | 'variable'
+
+export type BlueprintNote = {
+  file: string
+  kind: BlueprintNoteKind
+  name?: string
+  note: string
+}
+
 export type AimedRelation = {
   from: string
   to: string
@@ -250,13 +259,29 @@ export type WorkflowAction =
   | 'blueprint_no'
   | 'blueprint_send'
   | 'blueprint_update'
+  | 'blueprint_clear'
+  | 'blueprint_cleanup'
+  | 'blueprint_set_hidden'
   | 'focus'
   | 'set_step_by_step'
 
+export type SharedBlueprint = {
+  hidden: boolean
+  revision: number
+  enabled: boolean
+  userCreatedBlocks: UserCreatedBlock[]
+  userCreatedIslands: UserCreatedIsland[]
+  addedFunctions: PatchSymbolAddition[]
+  addedVariables: PatchSymbolAddition[]
+  addedImports: PatchImportAddition[]
+  notes: BlueprintNote[]
+}
+
 export type AgentIntentBundle = {
   focusedSessionId: string | null
   nextAttachSessionId: string | null
   intents: AgentIntent[]
+  blueprint: SharedBlueprint
 }
 
 export type AgentIntent = {
@@ -301,10 +326,13 @@ export type AgentIntent = {
   initialInstruction?: string | null
   creationMode: boolean
   canEnterBlueprint: boolean
+  blueprintHidden?: boolean
+  blueprintRevision?: number
   blueprintSessionId: string | null
   userCreatedBlocks: UserCreatedBlock[]
   userCreatedIslands: UserCreatedIsland[]
   blueprintFunctions: PatchSymbolAddition[]
   blueprintVariables: PatchSymbolAddition[]
   blueprintImports: PatchImportAddition[]
+  blueprintNotes: BlueprintNote[]
 }

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

@@ -15,6 +15,10 @@ export class CanvasErrorBoundary extends Component<Props, State> {
     return { failed: true }
   }
 
+  componentDidCatch(error: Error) {
+    console.error('Visualizer canvas error', error)
+  }
+
   render() {
     if (this.state.failed) {
       return (