@jkwd/inbase 0.1.5 → 0.1.7

package/README.md

@@ -1,5 +1,8 @@
 <p align="center">
-  <img src="docs/inbase-logo.png" alt="InBase — Dive into your codebase" width="520" />
+  <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[]
@@ -52,7 +53,10 @@ export function isSessionConnected(
   waiterIds?: Set<string>,
 ): boolean
 export function listStoredSessionIds(dataDir: string): string[]
-export function listOpenSessionIds(dataDir: string): string[]
+export function listOpenSessionIds(
+  dataDir: string,
+  waiterIds?: Set<string>,
+): string[]
 export function discardInactiveDiffSessions(
   dataDir: string,
   targetRoot?: string | null,
@@ -127,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,
@@ -138,6 +154,7 @@ export function sessionIntent(
   sessionId: string,
   knownFileIds?: string[],
   selectedDiffId?: string,
+  waiterIds?: Set<string>,
 ): Record<string, unknown> | null
 export function resolveTargetFile(
   targetRoot: string,

package/apps/explorer/scripts/session-store.mjs

@@ -1,10 +1,10 @@
 import fs from 'node:fs'
-import os from 'node:os'
 import path from 'node:path'
 import { spawnSync } from 'node:child_process'
 import {
   accumulatePatchAdditions,
   applyUnifiedPatch,
+  applyUnifiedPatchToContents,
   collectCreateFolders,
   extractPatchImports,
   foldersFromFileIds,
@@ -13,6 +13,7 @@ import {
 
 const SESSION_ID = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/
 const CONNECTED_TTL_MS = 15_000
+const STALLED_WAIT_MS = 2_000
 
 export function assertSessionId(value) {
   if (typeof value !== 'string' || !SESSION_ID.test(value) || value === '.' || value === '..') {
@@ -170,6 +171,13 @@ function isGeneratingPhase(phase) {
   return phase === 'preparing' || phase === 'working' || phase === 'replanning'
 }
 
+function isStalledWorking(manifest, waiterIds, sessionId, now = Date.now()) {
+  if (manifest.phase !== 'working') return false
+  if (!waiterIds.has(sessionId)) return false
+  const started = Date.parse(manifest.workStartedAt)
+  return Number.isFinite(started) && now - started >= STALLED_WAIT_MS
+}
+
 export function isSessionConnected(
   dataDir,
   sessionId,
@@ -216,16 +224,15 @@ export function listStoredSessionIds(dataDir) {
   return [...ids]
 }
 
-export function listOpenSessionIds(dataDir) {
+export function listOpenSessionIds(dataDir, waiterIds = waiterSessionIds()) {
   const root = diffSessionsRoot(dataDir)
   if (!fs.existsSync(root)) return []
-  const waiters = waiterSessionIds()
   const sessions = []
   for (const entry of fs.readdirSync(root, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue
     try {
       const sessionId = assertSessionId(entry.name)
-      if (!isSessionConnected(dataDir, sessionId, waiters)) continue
+      if (!isSessionConnected(dataDir, sessionId, waiterIds)) continue
       const manifest = readManifest(dataDir, sessionId)
       if (!manifest) continue
       sessions.push({
@@ -246,8 +253,11 @@ export function listOpenSessionIds(dataDir) {
 }
 
 export function listSessionIntents(dataDir, knownFileIds = []) {
-  return listOpenSessionIds(dataDir)
-    .map((sessionId) => sessionIntent(dataDir, sessionId, knownFileIds))
+  const waiters = waiterSessionIds()
+  return listOpenSessionIds(dataDir, waiters)
+    .map((sessionId) =>
+      sessionIntent(dataDir, sessionId, knownFileIds, undefined, waiters),
+    )
     .filter(Boolean)
 }
 
@@ -313,6 +323,7 @@ export function readManifest(dataDir, sessionId) {
     value.pendingInstruction ??= null
     value.workStartedAt ??= null
   }
+  if (typeof value.stepByStep !== 'boolean') value.stepByStep = true
   return value
 }
 
@@ -417,7 +428,13 @@ export function previewPatchChain(patches, knownFileIds = []) {
   }
 }
 
-export function sessionIntent(dataDir, sessionId, knownFileIds = [], selectedDiffId) {
+export function sessionIntent(
+  dataDir,
+  sessionId,
+  knownFileIds = [],
+  selectedDiffId,
+  waiterIds = waiterSessionIds(),
+) {
   const manifest = readManifest(dataDir, sessionId)
   if (!manifest) return null
   const selectedId = selectedDiffId || manifest.activeDiffId
@@ -467,6 +484,7 @@ export function sessionIntent(dataDir, sessionId, knownFileIds = [], selectedDif
     feature: manifest.feature,
     steps: manifest.steps,
     step: activeView ? manifest.currentStep : selected?.step ?? manifest.currentStep,
+    stepByStep: isStepByStep(manifest),
     reason: activeView ? currentPlanStep?.title ?? null : selected?.title ?? null,
     sessionId,
     diffId: selected?.id ?? null,
@@ -485,6 +503,7 @@ export function sessionIntent(dataDir, sessionId, knownFileIds = [], selectedDif
       manifest.phase === 'preparing' ||
       manifest.phase === 'working' ||
       manifest.phase === 'replanning',
+    stalledWait: isStalledWorking(manifest, waiterIds, sessionId),
     creationMode: manifest.phase === 'blueprint' && ownsBlueprintLock,
     canEnterBlueprint,
     blueprintSessionId,
@@ -633,25 +652,47 @@ export function materializeDiff(dataDir, targetRoot, sessionId, diffId) {
   return manifest
 }
 
-function withSessionReplay(dataDir, sessionId, targetRoot, patches, action) {
-  const temporary = fs.mkdtempSync(path.join(os.tmpdir(), 'visual-coder-chain-'))
-  try {
-    fs.cpSync(targetRoot, temporary, { recursive: true })
-    restoreBaseline(dataDir, sessionId, temporary)
-    for (const patchText of patches) applyUnifiedPatch(patchText, temporary)
-    return action(temporary)
-  } finally {
-    fs.rmSync(temporary, { recursive: true, force: true })
+function loadReplayContents(dataDir, sessionId, targetRoot, patches) {
+  const baseline = readBaseline(dataDir, sessionId)
+  const paths = sessionPaths(dataDir, sessionId)
+  const fileIds = new Set(Object.keys(baseline.files))
+  for (const patchText of patches) {
+    for (const entry of parseUnifiedPatch(patchText).entries) {
+      fileIds.add(entry.id)
+    }
   }
+
+  const files = new Map()
+  for (const fileId of fileIds) {
+    const info = baseline.files[fileId]
+    if (info) {
+      if (!info.existed) continue
+      const stored = resolveTargetFile(paths.baselineFiles, fileId).absolute
+      if (fs.existsSync(stored) && fs.statSync(stored).isFile()) {
+        files.set(fileId, fs.readFileSync(stored, 'utf8'))
+      }
+      continue
+    }
+    const { absolute } = resolveTargetFile(targetRoot, fileId)
+    if (fs.existsSync(absolute) && fs.statSync(absolute).isFile()) {
+      files.set(fileId, fs.readFileSync(absolute, 'utf8'))
+    }
+  }
+  return files
 }
 
 export function validateContinuation(dataDir, manifest, targetRoot, patchText) {
   const prior = manifest.diffs
     .filter((entry) => entry.status !== 'rejected')
     .map((entry) => readDiff(dataDir, manifest.sessionId, entry))
-  withSessionReplay(dataDir, manifest.sessionId, targetRoot, [...prior, patchText], () =>
-    undefined,
+  const patches = [...prior, patchText]
+  const files = loadReplayContents(
+    dataDir,
+    manifest.sessionId,
+    targetRoot,
+    patches,
   )
+  for (const next of patches) applyUnifiedPatchToContents(files, next)
 }
 
 export function inspectTargetFile(
@@ -686,6 +727,33 @@ function featureName(value) {
   return trimmed
 }
 
+export function isStepByStep(manifest) {
+  return manifest?.stepByStep !== false
+}
+
+export function autoAdvance(dataDir, sessionId, targetRoot = null) {
+  const manifest = readManifest(dataDir, sessionId)
+  if (!manifest || isStepByStep(manifest)) return manifest
+  if (manifest.phase === 'plan_ready') {
+    return invokeStep(dataDir, sessionId, manifest.currentStep, targetRoot)
+  }
+  if (manifest.phase === 'review') {
+    const active = manifest.diffs.at(-1)
+    if (!active || active.status !== 'pending') return manifest
+    if (active.step >= manifest.steps.length) return manifest
+    return invokeStep(dataDir, sessionId, active.step + 1, targetRoot)
+  }
+  return manifest
+}
+
+export function setStepByStep(dataDir, sessionId, enabled, targetRoot = null) {
+  const manifest = requireManifest(dataDir, sessionId)
+  manifest.stepByStep = Boolean(enabled)
+  writeManifest(dataDir, manifest)
+  if (isStepByStep(manifest)) return manifest
+  return autoAdvance(dataDir, sessionId, targetRoot)
+}
+
 export function startSession(dataDir, input) {
   const sessionId = assertSessionId(input.sessionId)
   clearStoppedMarker(dataDir, sessionId)
@@ -703,6 +771,7 @@ export function startSession(dataDir, input) {
     steps: [],
     status: 'active',
     phase: 'blueprint_ask',
+    stepByStep: true,
     currentStep: 1,
     activeDiffId: null,
     pendingInstruction: null,
@@ -802,6 +871,7 @@ export function reportPlan(dataDir, input) {
       steps: [],
       status: 'active',
       phase: 'preparing',
+      stepByStep: true,
       currentStep: 1,
       activeDiffId: null,
       pendingInstruction: null,
@@ -818,7 +888,7 @@ export function reportPlan(dataDir, input) {
     manifest.workStartedAt = null
     writeManifest(dataDir, manifest)
     focusSession(dataDir, sessionId)
-    return manifest
+    return autoAdvance(dataDir, sessionId)
   }
 
   if (existing.phase !== 'replanning') {
@@ -835,7 +905,7 @@ export function reportPlan(dataDir, input) {
   existing.workStartedAt = null
   writeManifest(dataDir, existing)
   focusSession(dataDir, sessionId)
-  return existing
+  return autoAdvance(dataDir, sessionId)
 }
 
 export function invokeStep(dataDir, sessionId, step, targetRoot = null) {
@@ -939,7 +1009,14 @@ export function appendDiff(dataDir, targetRoot, input) {
   writeManifest(dataDir, manifest)
   materializeDiff(dataDir, targetRoot, sessionId, id)
   focusSession(dataDir, sessionId)
-  return { manifest, entry }
+  const advanced = autoAdvance(dataDir, sessionId, targetRoot)
+  if (!advanced) {
+    throw new Error(`Session ${sessionId} disappeared after publishing a diff`)
+  }
+  return {
+    manifest: advanced,
+    entry: advanced.diffs.find((item) => item.id === id) ?? entry,
+  }
 }
 
 function pendingActive(manifest, diffId) {
@@ -976,13 +1053,12 @@ export function continueDiff(dataDir, targetRoot, sessionId, diffId) {
     writeManifest(dataDir, manifest)
     finalizeFinishedSession(dataDir, sessionId)
     return manifest
-  } else {
-    manifest.currentStep = active.step + 1
-    manifest.phase = 'plan_ready'
-    manifest.workStartedAt = null
   }
+  manifest.currentStep = active.step + 1
+  manifest.phase = 'plan_ready'
+  manifest.workStartedAt = null
   writeManifest(dataDir, manifest)
-  return manifest
+  return autoAdvance(dataDir, sessionId, targetRoot)
 }
 
 export function requestReplan(dataDir, sessionId, diffId, instruction) {