@jkwd/inbase 0.1.4 → 0.1.6

package/README.md

@@ -1,4 +1,9 @@
-# Inbase
+<p align="center">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="docs/inbase-logo-white.png" />
+    <img src="docs/inbase-logo.png" alt="InBase — Dive into your codebase" width="520" />
+  </picture>
+</p>
 
 A first-person 3D map of a JavaScript or TypeScript codebase. Files become blocks, folders become walkable areas, and imports become lines in the air.
 

package/apps/explorer/scripts/patch-lib.d.ts

@@ -46,14 +46,23 @@ export function extractPatchAdditions(
   addedFunctions: PatchSymbolAddition[]
   addedVariables: PatchSymbolAddition[]
   addedImports: PatchImportAddition[]
+  changedFunctions: PatchSymbolAddition[]
+  changedVariables: PatchSymbolAddition[]
 }
 
 export function accumulatePatchAdditions(patches?: string[]): {
   addedFunctions: PatchSymbolAddition[]
   addedVariables: PatchSymbolAddition[]
   addedImports: PatchImportAddition[]
+  changedFunctions: PatchSymbolAddition[]
+  changedVariables: PatchSymbolAddition[]
 }
 
+export function applyUnifiedPatchToContents(
+  files: Map<string, string>,
+  patch: string,
+): ReturnType<typeof parseUnifiedPatch>
+
 export function applyUnifiedPatch(
   patch: string,
   targetRoot: string,
@@ -74,6 +83,7 @@ export const emptyIntent: {
   feature: null
   steps: unknown[]
   step: null
+  stepByStep: boolean
   files: string[]
   creates: string[]
   deletes: string[]
@@ -83,6 +93,8 @@ export const emptyIntent: {
   addedFunctions: PatchSymbolAddition[]
   addedVariables: PatchSymbolAddition[]
   addedImports: PatchImportAddition[]
+  changedFunctions: PatchSymbolAddition[]
+  changedVariables: PatchSymbolAddition[]
   reason: null
   sessionId: null
   diffId: null
@@ -93,6 +105,7 @@ export const emptyIntent: {
   preview: boolean
   phase: null
   working: boolean
+  stalledWait: boolean
   creationMode: boolean
   canEnterBlueprint: boolean
   blueprintSessionId: string | null

package/apps/explorer/scripts/patch-lib.mjs

@@ -39,7 +39,7 @@ function parseHunks(section) {
   let current = null
 
   for (const line of lines) {
-    const header = line.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/)
+    const header = line.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)$/)
     if (header) {
       if (current) hunks.push(current)
       current = {
@@ -47,6 +47,7 @@ function parseHunks(section) {
         oldCount: Number(header[2] ?? '1'),
         newStart: Number(header[3]),
         newCount: Number(header[4] ?? '1'),
+        headerContext: (header[5] ?? '').trim(),
         lines: [],
       }
       continue
@@ -182,30 +183,107 @@ function emptyAdditions() {
     addedFunctions: [],
     addedVariables: [],
     addedImports: [],
+    changedFunctions: [],
+    changedVariables: [],
   }
 }
 
+function isImportLine(line) {
+  return /^\s*import\b/.test(line)
+}
+
+function isTopLevelSymbolLine(line) {
+  return extractSymbols(line).length > 0 && !/^\s/.test(line)
+}
+
+function enclosingChangedSymbols(entry) {
+  if (entry.kind === 'add') return []
+  const found = []
+  const seen = new Set()
+
+  for (const hunk of entry.hunks) {
+    const contextLines = []
+    let addedTopLevel = false
+    let hasBodyEdit = false
+    for (const line of hunk.lines) {
+      const tag = line[0]
+      const body = line.slice(1)
+      if (tag === ' ') contextLines.push(body)
+      if (tag !== '+' && tag !== '-') continue
+      if (tag === '+' && isTopLevelSymbolLine(body)) addedTopLevel = true
+      if (
+        !addedTopLevel &&
+        extractSymbols(body).length === 0 &&
+        !isImportLine(body) &&
+        body.trim()
+      ) {
+        hasBodyEdit = true
+      }
+    }
+    if (!hasBodyEdit) continue
+    for (const symbol of [
+      ...extractSymbols(hunk.headerContext ?? ''),
+      ...extractSymbols(contextLines.join('\n')),
+    ]) {
+      const key = `${symbol.kind}:${symbol.name}`
+      if (seen.has(key)) continue
+      seen.add(key)
+      found.push(symbol)
+    }
+  }
+
+  return found
+}
+
 function applyEntriesToAdditions(current, entries) {
   const functions = new Map(
-    current.addedFunctions.map((item) => [additionKey(item.file, item.name), item]),
+    (current.addedFunctions ?? []).map((item) => [additionKey(item.file, item.name), item]),
   )
   const variables = new Map(
-    current.addedVariables.map((item) => [additionKey(item.file, item.name), item]),
+    (current.addedVariables ?? []).map((item) => [additionKey(item.file, item.name), item]),
+  )
+  const changedFunctions = new Map(
+    (current.changedFunctions ?? []).map((item) => [
+      additionKey(item.file, item.name),
+      item,
+    ]),
+  )
+  const changedVariables = new Map(
+    (current.changedVariables ?? []).map((item) => [
+      additionKey(item.file, item.name),
+      item,
+    ]),
   )
   const imports = new Map(
-    current.addedImports.map((item) => [additionKey(item.file, item.name, item.from), item]),
+    (current.addedImports ?? []).map((item) => [
+      additionKey(item.file, item.name, item.from),
+      item,
+    ]),
   )
 
-  const dropFile = (fileId) => {
-    for (const key of [...functions.keys()]) {
-      if (functions.get(key).file === fileId) functions.delete(key)
+  const dropFrom = (bucket, fileId) => {
+    for (const key of [...bucket.keys()]) {
+      if (bucket.get(key).file === fileId) bucket.delete(key)
     }
-    for (const key of [...variables.keys()]) {
-      if (variables.get(key).file === fileId) variables.delete(key)
-    }
-    for (const key of [...imports.keys()]) {
-      if (imports.get(key).file === fileId) imports.delete(key)
+  }
+
+  const dropFile = (fileId) => {
+    dropFrom(functions, fileId)
+    dropFrom(variables, fileId)
+    dropFrom(changedFunctions, fileId)
+    dropFrom(changedVariables, fileId)
+    dropFrom(imports, fileId)
+  }
+
+  const markChanged = (kind, file, name) => {
+    const key = additionKey(file, name)
+    if (kind === 'function') {
+      if (functions.has(key)) return
+      changedFunctions.set(key, { name, file })
+      return
     }
+    if (variables.has(key)) return
+    changedVariables.set(key, { name, file })
   }
 
   for (const entry of entries) {
@@ -224,15 +302,36 @@ function applyEntriesToAdditions(current, entries) {
     )
 
     for (const symbol of removedSymbols) {
-      if (keptSymbolKeys.has(`${symbol.kind}:${symbol.name}`)) continue
-      if (symbol.kind === 'function') functions.delete(additionKey(entry.id, symbol.name))
-      else variables.delete(additionKey(entry.id, symbol.name))
+      const key = additionKey(entry.id, symbol.name)
+      if (keptSymbolKeys.has(`${symbol.kind}:${symbol.name}`)) {
+        markChanged(symbol.kind, entry.id, symbol.name)
+        continue
+      }
+      if (symbol.kind === 'function') {
+        functions.delete(key)
+        changedFunctions.delete(key)
+      } else {
+        variables.delete(key)
+        changedVariables.delete(key)
+      }
     }
     for (const symbol of addedSymbols) {
-      if (previousSymbolKeys.has(`${symbol.kind}:${symbol.name}`)) continue
+      if (previousSymbolKeys.has(`${symbol.kind}:${symbol.name}`)) {
+        markChanged(symbol.kind, entry.id, symbol.name)
+        continue
+      }
       const item = { name: symbol.name, file: entry.id }
-      if (symbol.kind === 'function') functions.set(additionKey(entry.id, symbol.name), item)
-      else variables.set(additionKey(entry.id, symbol.name), item)
+      const key = additionKey(entry.id, symbol.name)
+      if (symbol.kind === 'function') {
+        changedFunctions.delete(key)
+        functions.set(key, item)
+      } else {
+        changedVariables.delete(key)
+        variables.set(key, item)
+      }
+    }
+    for (const symbol of enclosingChangedSymbols(entry)) {
+      markChanged(symbol.kind, entry.id, symbol.name)
     }
 
     const removedBindings = extractImportBindings(removedSource(entry))
@@ -262,6 +361,8 @@ function applyEntriesToAdditions(current, entries) {
     addedFunctions: [...functions.values()],
     addedVariables: [...variables.values()],
     addedImports: [...imports.values()],
+    changedFunctions: [...changedFunctions.values()],
+    changedVariables: [...changedVariables.values()],
   }
 }
 
@@ -345,30 +446,58 @@ function applyHunks(original, hunks) {
   return `${lines.join('\n')}\n`
 }
 
-export function applyUnifiedPatch(patch, targetRoot) {
+export function applyUnifiedPatchToContents(files, patch) {
   const parsed = parseUnifiedPatch(patch)
   if (parsed.entries.length === 0) {
     throw new Error('Patch did not contain any file changes')
   }
 
   for (const file of parsed.entries) {
-    const absolute = path.join(targetRoot, file.id)
     if (file.kind === 'delete') {
-      if (fs.existsSync(absolute)) fs.rmSync(absolute)
+      files.delete(file.id)
       continue
     }
 
     const original =
-      file.kind === 'add' || !fs.existsSync(absolute)
-        ? ''
-        : fs.readFileSync(absolute, 'utf8')
+      file.kind === 'add' || !files.has(file.id) ? '' : files.get(file.id)
 
     if (file.kind === 'modify' && original === '') {
       throw new Error(`Cannot modify missing file ${file.id}`)
     }
 
+    files.set(file.id, applyHunks(original, file.hunks))
+  }
+
+  return parsed
+}
+
+export function applyUnifiedPatch(patch, targetRoot) {
+  const parsed = parseUnifiedPatch(patch)
+  if (parsed.entries.length === 0) {
+    throw new Error('Patch did not contain any file changes')
+  }
+
+  const files = new Map()
+  for (const file of parsed.entries) {
+    const absolute = path.join(targetRoot, file.id)
+    if (
+      file.kind !== 'add' &&
+      fs.existsSync(absolute) &&
+      fs.statSync(absolute).isFile()
+    ) {
+      files.set(file.id, fs.readFileSync(absolute, 'utf8'))
+    }
+  }
+  applyUnifiedPatchToContents(files, patch)
+
+  for (const file of parsed.entries) {
+    const absolute = path.join(targetRoot, file.id)
+    if (file.kind === 'delete') {
+      if (fs.existsSync(absolute)) fs.rmSync(absolute)
+      continue
+    }
     fs.mkdirSync(path.dirname(absolute), { recursive: true })
-    fs.writeFileSync(absolute, applyHunks(original, file.hunks))
+    fs.writeFileSync(absolute, files.get(file.id))
   }
 
   return parsed
@@ -381,6 +510,7 @@ export const emptyIntent = {
   feature: null,
   steps: [],
   step: null,
+  stepByStep: true,
   files: [],
   creates: [],
   deletes: [],
@@ -390,6 +520,8 @@ export const emptyIntent = {
   addedFunctions: [],
   addedVariables: [],
   addedImports: [],
+  changedFunctions: [],
+  changedVariables: [],
   reason: null,
   sessionId: null,
   diffId: null,
@@ -400,6 +532,7 @@ export const emptyIntent = {
   preview: false,
   phase: null,
   working: false,
+  stalledWait: false,
   creationMode: false,
   canEnterBlueprint: false,
   blueprintSessionId: null,
@@ -435,6 +568,8 @@ export function overlayPatch(intent, patchText, knownFileIds = []) {
       addedFunctions: [],
       addedVariables: [],
       addedImports: [],
+      changedFunctions: [],
+      changedVariables: [],
     }
   }
 
@@ -451,6 +586,8 @@ export function overlayPatch(intent, patchText, knownFileIds = []) {
       addedFunctions: base.addedFunctions ?? [],
       addedVariables: base.addedVariables ?? [],
       addedImports: base.addedImports ?? [],
+      changedFunctions: base.changedFunctions ?? [],
+      changedVariables: base.changedVariables ?? [],
     }
   }
 

package/apps/explorer/scripts/session-store.d.ts

@@ -37,6 +37,7 @@ export type DiffManifest = {
   activeDiffId: string | null
   pendingInstruction: string | null
   workStartedAt: string | null
+  stepByStep: boolean
   createdAt: string
   updatedAt: string
   diffs: DiffEntry[]
@@ -45,10 +46,33 @@ export type DiffManifest = {
 export function assertSessionId(value: unknown): string
 export function readActiveSession(dataDir: string): string | null
 export function writeActiveSession(dataDir: string, sessionId: string | null): void
+export function touchSessionConnection(dataDir: string, sessionId: string): void
+export function isSessionConnected(
+  dataDir: string,
+  sessionId: string,
+  waiterIds?: Set<string>,
+): boolean
+export function listStoredSessionIds(dataDir: string): string[]
+export function listOpenSessionIds(
+  dataDir: string,
+  waiterIds?: Set<string>,
+): string[]
+export function discardInactiveDiffSessions(
+  dataDir: string,
+  targetRoot?: string | null,
+  waiterIds?: Iterable<string>,
+): string[]
+export function listSessionIntents(
+  dataDir: string,
+  knownFileIds?: string[],
+): Array<Record<string, unknown>>
 export function readBlueprintSession(dataDir: string): string | null
 export function writeBlueprintSession(dataDir: string, sessionId: string | null): void
 export function readManifest(dataDir: string, sessionId: string): DiffManifest | null
 export function writeManifest(dataDir: string, manifest: DiffManifest): void
+export function isSessionStopped(dataDir: string, sessionId: string): boolean
+export function isWorkflowStopped(dataDir: string, sessionId: string): boolean
+export function sessionStoppedError(sessionId: string): Error
 export function startSession(
   dataDir: string,
   input: {
@@ -107,6 +131,18 @@ export function reportPlan(
     stepTitles: string[]
   },
 ): DiffManifest
+export function isStepByStep(manifest: DiffManifest | null | undefined): boolean
+export function autoAdvance(
+  dataDir: string,
+  sessionId: string,
+  targetRoot?: string | null,
+): DiffManifest | null
+export function setStepByStep(
+  dataDir: string,
+  sessionId: string,
+  enabled: boolean,
+  targetRoot?: string | null,
+): DiffManifest
 export function invokeStep(
   dataDir: string,
   sessionId: string,
@@ -118,6 +154,7 @@ export function sessionIntent(
   sessionId: string,
   knownFileIds?: string[],
   selectedDiffId?: string,
+  waiterIds?: Set<string>,
 ): Record<string, unknown> | null
 export function resolveTargetFile(
   targetRoot: string,