@jkwd/inbase 0.1.19 → 0.1.20

package/apps/explorer/src/userCreated.ts

@@ -3,6 +3,8 @@ import { folderOfFile, folderParent } from './layout'
 import type {
   BlueprintNote,
   BlueprintNoteKind,
+  BlueprintPointer,
+  BlueprintPointerKind,
   CodebaseGraph,
   FileNode,
   PatchImportAddition,
@@ -437,6 +439,101 @@ export function dropBlueprintSymbolNote(
   )
 }
 
+export function blueprintPointerKey(
+  pointer: Pick<BlueprintPointer, 'kind' | 'path' | 'name'>,
+) {
+  return pointer.kind === 'file' || pointer.kind === 'folder'
+    ? `${pointer.kind}:${pointer.path}`
+    : `${pointer.kind}:${pointer.path}:${pointer.name ?? ''}`
+}
+
+function parseBlueprintPointer(value: unknown): BlueprintPointer | null {
+  if (!value || typeof value !== 'object') return null
+  const item = value as Partial<BlueprintPointer>
+  const path = typeof item.path === 'string' ? item.path.trim() : ''
+  if (!path) return null
+  if (item.kind === 'file' || item.kind === 'folder') {
+    return { kind: item.kind, path }
+  }
+  if (item.kind !== 'function' && item.kind !== 'variable') return null
+  const name = typeof item.name === 'string' ? item.name.trim() : ''
+  if (!name) return null
+  return { kind: item.kind, path, name }
+}
+
+export function parseBlueprintPointers(value: unknown): BlueprintPointer[] {
+  if (!Array.isArray(value)) return []
+  const seen = new Set<string>()
+  const pointers: BlueprintPointer[] = []
+  for (const item of value) {
+    const parsed = parseBlueprintPointer(item)
+    if (!parsed) continue
+    const key = blueprintPointerKey(parsed)
+    if (seen.has(key)) continue
+    seen.add(key)
+    pointers.push(parsed)
+  }
+  return pointers
+}
+
+export function findBlueprintPointer(
+  pointers: BlueprintPointer[],
+  kind: BlueprintPointerKind,
+  path: string,
+  name?: string,
+) {
+  return pointers.some((item) =>
+    kind === 'file' || kind === 'folder'
+      ? item.kind === kind && item.path === path
+      : item.kind === kind && item.path === path && item.name === name,
+  )
+}
+
+export function toggleBlueprintPointer(
+  pointers: BlueprintPointer[],
+  next: {
+    kind: BlueprintPointerKind
+    path: string
+    name?: string
+  },
+): BlueprintPointer[] {
+  const path = next.path.trim()
+  if (!path || path.startsWith('draft:')) return pointers
+  const key = blueprintPointerKey({ ...next, path })
+  const without = pointers.filter((item) => blueprintPointerKey(item) !== key)
+  if (without.length !== pointers.length) return without
+  if (next.kind === 'file' || next.kind === 'folder') {
+    return [...without, { kind: next.kind, path }]
+  }
+  const name = (next.name ?? '').trim()
+  if (!name) return without
+  return [...without, { kind: next.kind, path, name }]
+}
+
+export function dropBlueprintFilePointers(
+  pointers: BlueprintPointer[],
+  fileIds: Iterable<string>,
+  folderPaths: Iterable<string> = [],
+) {
+  const files = new Set(fileIds)
+  const folders = new Set(folderPaths)
+  return pointers.filter((item) =>
+    item.kind === 'folder' ? !folders.has(item.path) : !files.has(item.path),
+  )
+}
+
+export function dropBlueprintSymbolPointer(
+  pointers: BlueprintPointer[],
+  path: string,
+  kind: 'function' | 'variable',
+  name: string,
+) {
+  return pointers.filter(
+    (item) =>
+      !(item.kind === kind && item.path === path && item.name === name),
+  )
+}
+
 export function parseBlueprintImport(
   raw: string,
   file: string,

package/apps/explorer/vite.config.ts

@@ -114,6 +114,7 @@ function blueprintIntentFields() {
     blueprintVariables: blueprint.addedVariables,
     blueprintImports: blueprint.addedImports,
     blueprintNotes: blueprint.notes,
+    blueprintPointers: blueprint.pointers,
   }
 }
 
@@ -267,6 +268,7 @@ async function decideIntent(req: IncomingMessage, res: ServerResponse) {
       addedVariables?: unknown[]
       addedImports?: unknown[]
       notes?: unknown[]
+      pointers?: unknown[]
       files?: unknown[]
       fileId?: string
     }
@@ -360,6 +362,7 @@ async function decideIntent(req: IncomingMessage, res: ServerResponse) {
         addedVariables: body.addedVariables,
         addedImports: body.addedImports,
         notes: body.notes,
+        pointers: body.pointers,
       })
     } else if (action === 'blueprint_clear') {
       clearBlueprint(dataDir)
@@ -375,6 +378,7 @@ async function decideIntent(req: IncomingMessage, res: ServerResponse) {
         addedVariables: body.addedVariables,
         addedImports: body.addedImports,
         notes: body.notes,
+        pointers: body.pointers,
       })
     } else if (action === 'setup_session') {
       const manifest = setupSession(dataDir, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jkwd/inbase",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "A first-person 3D map of a codebase, with a visual coding workflow for Cursor.",
   "license": "MIT",
   "author": "Joris Kuijper",

package/skill/inbase/SKILL.md

@@ -43,8 +43,8 @@ over the recorded diffs.
 live project files with Write, StrReplace, and Delete for that step only. Then
 run `inbase propose-patch` with no patch file. Inbase diffs the working tree
 against the snapshot taken at invoke and stores that patch. A later instruction
-replaces the withdrawn step; edit from the accepted live files, not from the
-withdrawn proposal. Do not write a unified diff yourself.
+updates that live proposal; edit those files, then propose-patch again. Wait
+for **Accept proposal** before the next step. Do not write a unified diff yourself.
 
 The visualizer stores immutable diffs under
 `.inbase/diff-sessions/<session-id>/diffs/`. Inbase must already be running
@@ -180,11 +180,15 @@ npx inbase wait-for-approval --session "<session-id>"
 12. Read the wait command output. Reply in chat with the `VISUAL_CODER_ACK`
     line first, then:
 
-   - Exit `0` (`VISUAL_CODER_ACK execute` / `VISUAL_CODER_EXECUTE`): the
-     highlighted step was invoked. If this is a later step, implement it now —
-     do not explore, re-plan, or run `wait-for-blueprint`. Re-read the shared
-     `blueprint.json` if you need placed files. Edit live files for that step
-     only, record with `inbase propose-patch` (no patch file), then wait again.
+   - Exit `0` (`VISUAL_CODER_ACK execute` / `VISUAL_CODER_EXECUTE`): follow
+     the printed `VISUAL_CODER_EXECUTE` line. If it says **Update the current
+     proposal**, edit those live files, record with `inbase propose-patch` (no
+     patch file), then wait again for **Accept proposal**. Do not start the
+     next step and do not report a new plan. Otherwise the highlighted step
+     was invoked: implement that step now — do not explore, re-plan, or run
+     `wait-for-blueprint`. Re-read the shared `blueprint.json` if you need
+     placed files. Edit live files for that step only, record with
+     `inbase propose-patch` (no patch file), then wait again.
    - Exit `6` (`VISUAL_CODER_ACK blueprint` / `VISUAL_CODER_BLUEPRINT`): the
      shared blueprint changed. Follow the latest files, islands, functions,
      variables, and imports. Do not omit, rename, relocate, or replace them.
@@ -195,19 +199,12 @@ npx inbase wait-for-approval --session "<session-id>"
      stored session diffs. The shared blueprint remains. Optionally run
      `--clear` if anything remains, tell the user the feature is done, and
      **stop**. Do not propose another patch.
-   - Exit `4` (`VISUAL_CODER_ACK replan` / `VISUAL_CODER_REPLAN`): do **not**
-     edit project files and do not rewrite an earlier accepted patch. The
-     withdrawn proposal is no longer live; disk is baseline + accepted patch
-     files. Follow the text between `VISUAL_CODER_INSTRUCTION_START` and
-     `VISUAL_CODER_INSTRUCTION_END`, read the shared `blueprint.json` when
-     it is enabled (files, islands, `addedFunctions`, `addedVariables`,
-     `addedImports`). The blueprint stays leading. If the new instruction would
-     differ from it, ask the user before replacing the plan. Read
-     `user-context.json` (follow the viewpoint only if `followLook` is true),
-     replace the plan from the current step onward using `inbase report-plan`,
-     then wait for the next `VISUAL_CODER_EXECUTE` before editing again. The
-     replacement edits must sit on the accepted live files, not the withdrawn
-     proposal.
+   - Exit `4` (`VISUAL_CODER_ACK replan` / `VISUAL_CODER_REPLAN`): live files
+     still contain the current proposal. Do not reset them and do not report a
+     new plan. Follow the text between `VISUAL_CODER_INSTRUCTION_START` and
+     `VISUAL_CODER_INSTRUCTION_END`, edit those live files, then
+     `inbase propose-patch`. Wait for **Accept proposal**. Do not start the
+     next step.
    - Exit `2` (`VISUAL_CODER_ACK stopped` / `VISUAL_CODER_STOPPED`) or `3`
      (`VISUAL_CODER_ACK timeout`): make no further project changes.