@jkwd/inbase 0.1.18 → 0.1.20

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

@@ -10,15 +10,19 @@ export type MapContextMenuState = {
 
 type MapContextMenuProps = {
   menu: MapContextMenuState | null
+  pointed?: boolean
   onAddFile: (folder: string) => void
   onAddFolder: (folder: string) => void
+  onPointToFolder?: (folder: string) => void
   onClose: () => void
 }
 
 export function MapContextMenu({
   menu,
+  pointed = false,
   onAddFile,
   onAddFolder,
+  onPointToFolder,
   onClose,
 }: MapContextMenuProps) {
   useEffect(() => {
@@ -48,7 +52,7 @@ export function MapContextMenu({
 
   const pad = 8
   const width = 176
-  const height = 84
+  const height = onPointToFolder ? 126 : 84
   const left = Math.min(
     Math.max(pad, menu.x),
     window.innerWidth - width - pad,
@@ -85,6 +89,19 @@ export function MapContextMenu({
       >
         Add folder
       </button>
+      {onPointToFolder && (
+        <button
+          type="button"
+          role="menuitem"
+          aria-pressed={pointed}
+          onClick={() => {
+            onPointToFolder(menu.folder)
+            onClose()
+          }}
+        >
+          {pointed ? 'Stop pointing' : 'Point to folder'}
+        </button>
+      )}
     </div>,
     document.body,
   )

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

@@ -23,6 +23,8 @@ import {
   sendBlueprint,
   sessionIntent,
   setInitialInstruction,
+  addContextFiles,
+  removeContextFile,
   setStepByStep,
   setupSession,
   focusSession,
@@ -112,6 +114,7 @@ function blueprintIntentFields() {
     blueprintVariables: blueprint.addedVariables,
     blueprintImports: blueprint.addedImports,
     blueprintNotes: blueprint.notes,
+    blueprintPointers: blueprint.pointers,
   }
 }
 
@@ -265,6 +268,9 @@ async function decideIntent(req: IncomingMessage, res: ServerResponse) {
       addedVariables?: unknown[]
       addedImports?: unknown[]
       notes?: unknown[]
+      pointers?: unknown[]
+      files?: unknown[]
+      fileId?: string
     }
     const action = body.action
     const blueprintActions = new Set([
@@ -288,6 +294,8 @@ async function decideIntent(req: IncomingMessage, res: ServerResponse) {
       action !== 'focus' &&
       action !== 'set_step_by_step' &&
       action !== 'set_initial_instruction' &&
+      action !== 'add_context_files' &&
+      action !== 'remove_context_file' &&
       action !== 'setup_session'
     ) {
       sendJson(res, 400, { error: 'invalid workflow action' })
@@ -342,7 +350,6 @@ async function decideIntent(req: IncomingMessage, res: ServerResponse) {
         body.instruction ?? '',
         targetRoot,
       )
-      rescanTarget('after withdrawing a patch')
     } else if (action === 'blueprint_yes') {
       answerBlueprint(dataDir, body.sessionId, true)
     } else if (action === 'blueprint_no') {
@@ -355,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)
@@ -370,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, {
@@ -381,6 +390,14 @@ async function decideIntent(req: IncomingMessage, res: ServerResponse) {
       return
     } else if (action === 'set_initial_instruction') {
       setInitialInstruction(dataDir, body.sessionId, body.instruction ?? '')
+    } else if (action === 'add_context_files') {
+      addContextFiles(dataDir, body.sessionId, body.files ?? [])
+    } else if (action === 'remove_context_file') {
+      if (!body.fileId) {
+        sendJson(res, 400, { error: 'fileId is required' })
+        return
+      }
+      removeContextFile(dataDir, body.sessionId, body.fileId)
     } else if (action === 'focus') {
       focusSession(dataDir, body.sessionId)
     } else if (action === 'set_step_by_step') {

package/bin/session.mjs

@@ -122,21 +122,37 @@ function emitApprovalHandshake(store, dataDir, sessionId, manifest, initialDiff)
   if (manifest.phase === 'working') {
     const next = manifest.steps.find((step) => step.index === manifest.currentStep)
     const title = next?.title
+    const guidance =
+      typeof manifest.pendingInstruction === 'string'
+        ? manifest.pendingInstruction.trim()
+        : ''
+    const updating = Boolean(guidance)
     signalAck(
       store,
       dataDir,
       sessionId,
       'execute',
-      title
-        ? `step ${manifest.currentStep} — ${title}`
-        : `step ${manifest.currentStep}`,
+      updating
+        ? 'a new instruction'
+        : title
+          ? `step ${manifest.currentStep} — ${title}`
+          : `step ${manifest.currentStep}`,
     )
+    const instruction = updating
+      ? `\nVISUAL_CODER_INSTRUCTION_START\n${guidance}\nVISUAL_CODER_INSTRUCTION_END`
+      : ''
     const continuing = (manifest.diffs?.length ?? 0) > 0
-    console.log(
-      continuing
-        ? `VISUAL_CODER_EXECUTE Step ${manifest.currentStep} is invoked${title ? `: ${title}` : ''}. Continue immediately: edit live files for this step only, then inbase propose-patch --session ${sessionId} with no patch file. Do not explore, re-plan, or run wait-for-blueprint.`
-        : `VISUAL_CODER_EXECUTE Step ${manifest.currentStep} is invoked${title ? `: ${title}` : ''}. Re-read the shared blueprint.json before implementing; the user can place files and islands at any time. Edit the live project files for this step only (Write, StrReplace, Delete). Then record the step with inbase propose-patch --session ${sessionId} — no patch file. Inbase diffs those edits against the invoke snapshot and stores the patch. Do not write a unified diff yourself.`,
-    )
+    if (updating) {
+      console.log(
+        `VISUAL_CODER_EXECUTE Update the current proposal for step ${manifest.currentStep}${title ? `: ${title}` : ''}. Live files already contain that proposal — do not reset them. Follow the instruction between VISUAL_CODER_INSTRUCTION_START and END, edit those live files, then inbase propose-patch --session ${sessionId} with no patch file. Do not report a new plan.${instruction}`,
+      )
+    } else {
+      console.log(
+        continuing
+          ? `VISUAL_CODER_EXECUTE Step ${manifest.currentStep} is invoked${title ? `: ${title}` : ''}. Continue immediately: edit live files for this step only, then inbase propose-patch --session ${sessionId} with no patch file. Do not explore, re-plan, or run wait-for-blueprint.`
+          : `VISUAL_CODER_EXECUTE Step ${manifest.currentStep} is invoked${title ? `: ${title}` : ''}. Re-read the shared blueprint.json before implementing; the user can place files and islands at any time. Edit the live project files for this step only (Write, StrReplace, Delete). Then record the step with inbase propose-patch --session ${sessionId} — no patch file. Inbase diffs those edits against the invoke snapshot and stores the patch. Do not write a unified diff yourself.`,
+      )
+    }
     process.exit(0)
   }
   if (manifest.phase === 'replanning') {
@@ -145,13 +161,13 @@ function emitApprovalHandshake(store, dataDir, sessionId, manifest, initialDiff)
       dataDir,
       sessionId,
       'replan',
-      `revise the plan from step ${manifest.currentStep}`,
+      `revise the current proposal for step ${manifest.currentStep}`,
     )
     const instruction = manifest.pendingInstruction
       ? `\nVISUAL_CODER_INSTRUCTION_START\n${manifest.pendingInstruction}\nVISUAL_CODER_INSTRUCTION_END`
       : ''
     console.log(
-      `VISUAL_CODER_REPLAN Keep accepted patch files before step ${manifest.currentStep}. Disk is baseline + accepted patches. Do not edit project files until the next EXECUTE. The shared blueprint remains leading; if this instruction would differ from it, ask the user before replacing the plan. Report the revised tail with inbase report-plan, then wait for invocation.${instruction}`,
+      `VISUAL_CODER_REPLAN Live files still contain the current proposal for step ${manifest.currentStep}. Do not reset them. Follow the instruction between VISUAL_CODER_INSTRUCTION_START and END, edit those live files, then inbase propose-patch. Do not report a new plan.${instruction}`,
     )
     process.exit(4)
   }
@@ -179,7 +195,7 @@ export async function attachSession(args) {
   console.log(`VISUAL_CODER_SESSION ${manifest.sessionId}`)
   printAck('attached', manifest.name || manifest.sessionId)
   console.log(
-    `VISUAL_CODER_ATTACHED Attached to the next waiting visualizer session ${manifest.name || manifest.sessionId} (${manifest.phase}). Use --session ${manifest.sessionId} for every later command. Run inbase wait-for-blueprint --session ${manifest.sessionId} to read the optional blueprint and instruction; it does not wait.`,
+    `VISUAL_CODER_ATTACHED Attached to the next waiting visualizer session ${manifest.name || manifest.sessionId} (${manifest.phase}). Use --session ${manifest.sessionId} for every later command. Run inbase wait-for-blueprint --session ${manifest.sessionId} to read the optional blueprint, instruction, and attached files; it does not wait.`,
   )
 }
 
@@ -243,6 +259,20 @@ export async function waitForBlueprint(args) {
     console.log(instruction)
     console.log('VISUAL_CODER_INSTRUCTION_END')
   }
+  const attached = store.contextFileHandshake(config.dataDir, sessionId)
+  if (attached.files.length > 0) {
+    console.log(
+      'Honor the user\'s attached context files. Read each path with your file tools before planning. They are session-only attachments, not project files to create. Use any printed VISUAL_CODER_CONTEXT_FILE contents directly.',
+    )
+    console.log('VISUAL_CODER_CONTEXT_FILES_START')
+    console.log(JSON.stringify(attached.files, null, 2))
+    console.log('VISUAL_CODER_CONTEXT_FILES_END')
+    for (const file of attached.texts) {
+      console.log(`VISUAL_CODER_CONTEXT_FILE_START ${file.name}`)
+      console.log(file.content)
+      console.log('VISUAL_CODER_CONTEXT_FILE_END')
+    }
+  }
   process.exit(0)
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jkwd/inbase",
-  "version": "0.1.18",
+  "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/commands/inbase.md

@@ -14,4 +14,4 @@ npx inbase attach
 
 2. Read `VISUAL_CODER_SESSION` from the output. That id is the session to use for every later `inbase` command.
 
-3. Continue the Inbase visual edits skill from `wait-for-blueprint` onward with that `--session` id. `/inbase` already started the session. `wait-for-blueprint` only reads the optional blueprint and instruction; it does not wait.
+3. Continue the Inbase visual edits skill from `wait-for-blueprint` onward with that `--session` id. `/inbase` already started the session. `wait-for-blueprint` only reads the optional blueprint, instruction, and attached files; it does not wait.

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
@@ -85,7 +85,7 @@ new plan.
 ## Required sequence
 
 1. **Read the current layout**. `/inbase` already started the session. Run
-   this once to load the optional blueprint and instruction — it returns
+   this once to load the optional blueprint, instruction, and attached files — it returns
    immediately. Do not wait for the user to send a blueprint. Then report a
    plan.
 
@@ -98,7 +98,11 @@ npx inbase wait-for-blueprint --session "<session-id>"
    keep placing at any time.
    If `wait-for-blueprint` prints `VISUAL_CODER_INSTRUCTION_START` /
    `VISUAL_CODER_INSTRUCTION_END`, that text is the user's request for this
-   session. Plan from that instruction and the blueprint together. The
+   session. If it prints `VISUAL_CODER_CONTEXT_FILES_START` /
+   `VISUAL_CODER_CONTEXT_FILES_END`, those are session-only files the user
+   dropped as initial context. Read each `path` (and any printed
+   `VISUAL_CODER_CONTEXT_FILE` contents). They are not project files to create.
+   Plan from that instruction, attached files, and the blueprint together. The
    instruction does not override an enabled blueprint; if they conflict,
    ask the user.
 3. Read the handshake output between `VISUAL_CODER_BLUEPRINT_START` and
@@ -176,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.
@@ -191,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.
 
@@ -220,7 +221,7 @@ npx inbase propose-patch --session "<session-id>" --clear
   from **Setup LLM session** in the map
 - Edit files on a direct chat request; reply with the `/skipinbase` line and stop
 - Invent a session id for `/inbase`; run `npx inbase attach` with no `--session`
-- Skip `inbase wait-for-blueprint`; it returns immediately and provides the optional blueprint and instruction
+- Skip `inbase wait-for-blueprint`; it returns immediately and provides the optional blueprint, instruction, and attached files
 - Treat the chat request, viewpoint, or your own plan as overriding an enabled blueprint
 - Skip, rename, relocate, or replace the shared `blueprint.json` files, islands, functions, variables, or imports when `enabled` is true
 - Silently differ from the blueprint; ask the user first