@jkwd/inbase 0.1.9 → 0.1.11

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,
@@ -75,6 +91,11 @@ export const emptyIntent: AgentIntent = {
   phase: null,
   working: false,
   stalledWait: false,
+  llmIdle: false,
+  awaitingAttach: false,
+  listening: false,
+  lastAck: null,
+  initialInstruction: null,
   creationMode: false,
   canEnterBlueprint: false,
   blueprintSessionId: null,
@@ -90,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,
@@ -119,6 +141,12 @@ function normalize(data: Partial<AgentIntent> | null | undefined): AgentIntent {
     phase: data?.phase ?? null,
     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:
@@ -222,6 +250,56 @@ 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',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      action: 'focus',
+      sessionId,
+    }),
+  }).catch(() => {
+    // Keep the local focused session if the server could not record it.
+  })
+}
+
+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
+  }
+}

package/apps/explorer/src/index.css

@@ -251,6 +251,19 @@ button {
   background: rgba(25, 28, 34, 0.94);
 }
 
+.map-change-mark {
+  pointer-events: none;
+  user-select: none;
+  color: #f4f7fb;
+  font-size: 32px;
+  font-weight: 800;
+  line-height: 1;
+  letter-spacing: 0;
+  -webkit-text-stroke: 0.09em #11151c;
+  paint-order: stroke fill;
+  text-shadow: 0 0 0.12em #11151c;
+}
+
 .map-you-are-here {
   display: grid;
   justify-items: center;
@@ -443,6 +456,11 @@ button {
   flex: none;
 }
 
+.hud-icon-button[aria-disabled='true'] {
+  opacity: 0.55;
+  cursor: default;
+}
+
 .hud-tooltip {
   position: absolute;
   right: 0;
@@ -533,6 +551,24 @@ button {
   overflow-y: auto;
 }
 
+.hud-session-tabs {
+  display: flex;
+  gap: 6px;
+  flex: 0 0 auto;
+  pointer-events: auto;
+  overflow-x: auto;
+  max-width: 100%;
+}
+
+.hud-session-tab {
+  flex: 1 1 0;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 13px;
+}
+
 .hud-left-stack .hud-panel-planned {
   position: relative;
   top: auto;
@@ -553,10 +589,6 @@ button {
   flex: 0 0 auto;
 }
 
-.hud-left-stack .hud-panel-planned[data-focused='false'] {
-  opacity: 0.86;
-}
-
 .hud-left-stack .hud-panel-planned[data-focused='true'] {
   box-shadow: 0 0 0 1px #9ad8ff;
 }
@@ -628,6 +660,11 @@ button {
   margin: -4px 0 8px;
 }
 
+.hud-panel-chrome-heading {
+  min-width: 0;
+  flex: 1 1 auto;
+}
+
 .hud-panel[data-minimized='true'] {
   overflow: hidden;
   padding-bottom: 12px;
@@ -649,6 +686,24 @@ button {
   white-space: nowrap;
 }
 
+.hud-panel-planned .hud-panel-chrome-title {
+  color: #e7ebf2;
+  font-size: 14px;
+  letter-spacing: 0.02em;
+  text-transform: none;
+}
+
+.hud-panel-chrome-subtitle {
+  overflow: hidden;
+  color: #8b95a5;
+  font-size: 10px;
+  font-weight: 600;
+  letter-spacing: 0.08em;
+  text-transform: uppercase;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .hud-mode-switch {
   display: flex;
   align-items: center;
@@ -874,24 +929,28 @@ button {
   min-width: 0;
 }
 
-.hud-steps li[data-next='true'] {
+.hud-steps li[data-active='true']:not([data-done='true']) {
   color: #ffffff;
 }
 
-.hud-steps li[data-next='true'] .hud-step-title {
+.hud-steps li[data-active='true']:not([data-done='true']) .hud-step-title {
   color: #ffffff;
   text-decoration: underline;
   text-underline-offset: 3px;
 }
 
-.hud-steps li[data-current='true']:not([data-next='true']):not([data-done='true']) {
-  color: #9ad8ff;
-}
-
 .hud-steps li[data-done='true'],
 .hud-steps li[data-done='true'] .hud-step-title {
   color: #3dff78;
   font-weight: 600;
+}
+
+.hud-steps li[data-done='true'][data-active='true'] .hud-step-title {
+  text-decoration: underline;
+  text-underline-offset: 3px;
+}
+
+.hud-steps li[data-done='true']:not([data-active='true']) .hud-step-title {
   text-decoration: none;
 }
 
@@ -922,6 +981,52 @@ button {
   font-size: 11px;
 }
 
+.hud-setup {
+  display: grid;
+  gap: 16px;
+  margin-top: 12px;
+}
+
+.hud-setup-heading {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin: 0 0 8px;
+  color: #8b95a5;
+  font-size: 11px;
+  font-weight: 600;
+  letter-spacing: 0.08em;
+  text-transform: uppercase;
+}
+
+.hud-setup-tag {
+  padding: 2px 6px;
+  border: 1px solid #3a4250;
+  border-radius: 3px;
+  color: #8b95a5;
+  font-size: 10px;
+  font-weight: 600;
+  letter-spacing: 0.04em;
+  text-transform: none;
+}
+
+.hud-setup-tag[data-ready='true'] {
+  border-color: #5d9ec4;
+  color: #d7eef8;
+}
+
+.hud-setup-section p {
+  margin: 0;
+  color: #b7c0ce;
+  font-size: 12px;
+  line-height: 1.45;
+}
+
+.hud-setup-section .hud-instruction {
+  margin-top: 0;
+}
+
 .hud-instruction textarea {
   width: 100%;
   resize: vertical;
@@ -947,6 +1052,43 @@ button {
   font-size: 12px;
 }
 
+.hud-live {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 9px;
+  margin: 2px 0 10px;
+  padding: 8px 10px;
+  border-radius: 8px;
+  background: rgba(154, 216, 255, 0.08);
+  border: 1px solid rgba(154, 216, 255, 0.22);
+  color: #d7eef8;
+  font-size: 12px;
+}
+
+.hud-live[data-busy='false'] {
+  background: rgba(255, 255, 255, 0.04);
+  border-color: rgba(255, 255, 255, 0.12);
+  color: #c5d0d8;
+}
+
+.hud-live[data-flash='true'] {
+  animation: hud-live-flash 0.65s ease;
+}
+
+.hud-live .hud-button {
+  margin-left: auto;
+}
+
+@keyframes hud-live-flash {
+  from {
+    background: rgba(154, 216, 255, 0.32);
+  }
+  to {
+    background: rgba(154, 216, 255, 0.08);
+  }
+}
+
 .hud-working .hud-button {
   margin-left: auto;
 }

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

@@ -1,5 +1,6 @@
-import { Suspense } from 'react'
+import { Suspense, useRef } from 'react'
 import { Billboard, Edges, Html, Text } from '@react-three/drei'
+import { useFrame, useThree } from '@react-three/fiber'
 import { CHANGE_HIGHLIGHT, CONFIG, dimColor, fileColor, FILE_SELECTION, MAP_SELECTION, type ChangeKind } from '../theme'
 import { NameInput } from '../ui/NameInput'
 import { MapSelectBorder } from './MapSelectBorder'
@@ -40,6 +41,50 @@ function fileLabel(name: string, changeKind: ChangeKind | null, added: boolean)
   return name
 }
 
+function changeMark(changeKind: ChangeKind | null, added: boolean) {
+  if (changeKind === 'remove') return 'D'
+  if (changeKind === 'add' || added) return 'A'
+  if (changeKind === 'edit') return 'U'
+  return null
+}
+
+function MapChangeMark({
+  mark,
+  width,
+  depth,
+  height,
+}: {
+  mark: string
+  width: number
+  depth: number
+  height: number
+}) {
+  const camera = useThree((state) => state.camera)
+  const markRef = useRef<HTMLDivElement>(null)
+
+  useFrame(() => {
+    const el = markRef.current
+    if (!el) return
+    const zoom = 'zoom' in camera ? Number(camera.zoom) : 1
+    const px = Math.min(width, depth) * 0.78 * zoom
+    el.style.fontSize = `${Math.max(px, 1)}px`
+  })
+
+  return (
+    <Html
+      position={[0, height / 2 + 0.12, 0]}
+      center
+      occlude={false}
+      zIndexRange={[120, 100]}
+      style={{ pointerEvents: 'none' }}
+    >
+      <div ref={markRef} className="map-change-mark">
+        {mark}
+      </div>
+    </Html>
+  )
+}
+
 export function FileBlock({
   file,
   placed,
@@ -63,9 +108,11 @@ export function FileBlock({
     changeKind && highlightMapChange && !selected
       ? CHANGE_HIGHLIGHT[changeKind]
       : null
-  const color = added || file.userCreated ? '#7ec8e8' : fileColor(file.language)
+  const isAdded = added || Boolean(file.userCreated)
+  const color = isAdded ? '#7ec8e8' : fileColor(file.language)
   const muted = dimColor(color, 0.32)
-  const label = fileLabel(file.name, changeKind, added || Boolean(file.userCreated))
+  const label = fileLabel(file.name, changeKind, isAdded)
+  const mark = changeMark(changeKind, isAdded)
   const labelColor = aimed
     ? '#9ad8ff'
     : highlight
@@ -105,7 +152,7 @@ export function FileBlock({
                     ? FILE_SELECTION.emissive
                     : related
                       ? '#1f4a44'
-                      : added || file.userCreated
+                      : isAdded
                         ? '#2a5064'
                         : dimmed
                           ? muted
@@ -120,7 +167,7 @@ export function FileBlock({
                     ? 0.55
                     : related
                       ? 0.18
-                      : added || file.userCreated
+                      : isAdded
                         ? 0.22
                         : dimmed
                           ? 0.08
@@ -148,6 +195,9 @@ export function FileBlock({
           userData={{ fileId: file.id }}
         />
       )}
+      {mapMode && !naming && mark && (
+        <MapChangeMark mark={mark} width={width} depth={depth} height={height} />
+      )}
       {naming && onCommitName && onCancelName && (
         <Html
           position={[0, height / 2 + 0.42, 0]}

package/apps/explorer/src/types.ts

@@ -114,6 +114,7 @@ export type UserContext = {
     z: number
   }
   followLook?: boolean
+  showBranchChanges?: boolean
   userCreatedBlocks?: UserCreatedBlock[]
   userCreatedIslands?: UserCreatedIsland[]
 }
@@ -160,6 +161,40 @@ export function canStopSession(intent: {
   return Boolean(intent.sessionId) && intent.status !== 'idle'
 }
 
+export function llmIsMakingChanges(intent: {
+  working: boolean
+  preview: boolean
+  status: AgentIntentStatus
+}) {
+  return (
+    intent.working ||
+    intent.preview ||
+    intent.status === 'preparing' ||
+    intent.status === 'working' ||
+    intent.status === 'replanning' ||
+    intent.status === 'pending' ||
+    intent.status === 'extend' ||
+    intent.status === 'extended'
+  )
+}
+
+export type BranchChanges = {
+  available: boolean
+  branch: string | null
+  base: string | null
+  files: string[]
+  creates: string[]
+  deletes: string[]
+  createFolders: string[]
+  createLines: Record<string, number>
+  imports: PatchImport[]
+  addedFunctions: PatchSymbolAddition[]
+  addedVariables: PatchSymbolAddition[]
+  addedImports: PatchImportAddition[]
+  changedFunctions: PatchSymbolAddition[]
+  changedVariables: PatchSymbolAddition[]
+}
+
 export type PlanStep = {
   index: number
   title: string
@@ -215,6 +250,7 @@ export type WorkflowAction =
   | 'blueprint_no'
   | 'blueprint_send'
   | 'blueprint_update'
+  | 'focus'
   | 'set_step_by_step'
 
 export type AgentIntentBundle = {
@@ -226,6 +262,7 @@ export type AgentIntent = {
   updatedAt: string | null
   showMap: boolean
   status: AgentIntentStatus
+  name: string | null
   feature: string | null
   steps: PlanStep[]
   step: number | null
@@ -252,6 +289,15 @@ export type AgentIntent = {
   phase: WorkflowPhase | null
   working: boolean
   stalledWait: boolean
+  llmIdle?: boolean
+  awaitingAttach?: boolean
+  listening?: boolean
+  lastAck?: {
+    kind: string
+    detail: string
+    at: string | null
+  } | null
+  initialInstruction?: string | null
   creationMode: boolean
   canEnterBlueprint: boolean
   blueprintSessionId: string | null