hivecode-mcp 0.14.1 → 0.14.3

package/lang-js.js

@@ -1,651 +1,695 @@
-// lang-js.js — the JavaScript language provider for ICR.
-//
-// ICR's merge engine (icr.js) is language-agnostic: it merges a list of keyed "units"
-// and asks intent questions ("what names are declared / used / what's a function body").
-// Everything that actually knows about a *language* — how to parse it, what a top-level
-// declaration is, how to find references — lives behind a provider like this one.
-//
-// To add a language (Python, Go, Rust…), write another module exposing the same shape
-// and register it with icr.js's registerLanguage(). This JS provider is just the first
-// plugin; it happens to use `acorn` because acorn is a tiny pure-JS parser. A tree-sitter
-// provider would implement the identical interface over tree-sitter grammars.
-
-import * as acorn from 'acorn'
-
-// Parse permissively: try module syntax, fall back to script (so plain snippets and
-// ESM both work). Throws only when the code genuinely won't parse either way.
-function parseRaw(src) {
-  try { return acorn.parse(src, { ecmaVersion: 'latest', sourceType: 'module' }) }
-  catch { return acorn.parse(src, { ecmaVersion: 'latest', sourceType: 'script' }) }
-}
-
-// Tiny parse cache. One structuralMerge re-parses the SAME three texts (and the merged
-// result) many times across its tiers — gate, units, declaredNames, scope analysis,
-// final validation. Caching by exact text collapses that to one parse per distinct
-// version (a 1MB-file merge dropped ~7.6s → ~3s). Small and bounded: 8 entries, LRU.
-// String comparison is a cheap memcmp; ASTs are treated as immutable by all callers.
-const PARSE_CACHE = new Map() // src -> ast (Map preserves insertion order → LRU)
-function parse(src) {
-  const hit = PARSE_CACHE.get(src)
-  if (hit) { PARSE_CACHE.delete(src); PARSE_CACHE.set(src, hit); return hit } // refresh LRU position
-  const ast = parseRaw(src)
-  PARSE_CACHE.set(src, ast)
-  if (PARSE_CACHE.size > 8) PARSE_CACHE.delete(PARSE_CACHE.keys().next().value)
-  return ast
-}
-
-function parses(src) { try { parse(src); return true } catch { return false } }
-
-// A stable key per top-level node — what lets us recognize "the same declaration"
-// across two edits. Names where we have them; position as a last resort.
-// Dotted source path of a simple expression target (Axios.prototype.request,
-// utils.forEach, this.config) — or null when it isn't a plain dotted path.
-function exprPath(node) {
-  if (!node) return null
-  if (node.type === 'Identifier') return node.name
-  if (node.type === 'ThisExpression') return 'this'
-  if (node.type === 'MemberExpression' && !node.computed) {
-    const o = exprPath(node.object)
-    return o && node.property && node.property.name ? o + '.' + node.property.name : null
-  }
-  return null
-}
-
-// CONTENT-ANCHORED key for a statement, or null for truly anonymous ones.
-// Index keys (stmt:N) are a last resort ONLY: an insertion above an index-keyed
-// statement shifts every index, so unrelated statements pair up as fake
-// same-unit conflicts — and deletions mispair so deleted code can resurrect.
-// (Both failure modes were found by the merge census replaying axios/express
-// history.) Assignments key by their target, calls by callee path plus a
-// leading string literal (`it('name')`, `describe('name')`), directives by text.
-function baseKeyOf(node) {
-  let n = node
-  if (n.type === 'ExportNamedDeclaration' && n.declaration) n = n.declaration
-  if (n.type === 'ExportDefaultDeclaration') return 'export:default'
-  if (n.type === 'FunctionDeclaration' && n.id) return 'fn:' + n.id.name
-  if (n.type === 'ClassDeclaration' && n.id) return 'class:' + n.id.name
-  if (n.type === 'VariableDeclaration' && n.declarations[0] && n.declarations[0].id && n.declarations[0].id.name)
-    return 'var:' + n.declarations[0].id.name
-  // Key imports by their SOURCE MODULE, so two agents adding imports from DIFFERENT
-  // modules never collide, and two touching the SAME module are merged (specifier union).
-  if (n.type === 'ImportDeclaration') return 'import:' + (n.source && n.source.value != null ? n.source.value : '?')
-  // Specifier-only exports (`export { a, b }`, `export { x } from './m'`, `export * from …`)
-  // carry no declaration, so without a stable key they fall to positional stmt:N — and an
-  // edit to the export list then mispairs, DUPLICATES the statement, and knocks the whole
-  // merge to the line tier (which silently skips the intent/dangling checks). A stable key
-  // pairs them so an unedited side is kept and an edited side wins cleanly.
-  if (n.type === 'ExportNamedDeclaration') return n.source && n.source.value != null ? 'export-from:' + n.source.value : 'export-names'
-  if (n.type === 'ExportAllDeclaration') return 'export-all:' + (n.source && n.source.value != null ? n.source.value : '?')
-  if (n.type === 'ExpressionStatement') {
-    const e = n.expression
-    if (e.type === 'Literal' && typeof e.value === 'string') return 'directive:' + e.value // 'use strict'
-    if (e.type === 'AssignmentExpression') { const t = exprPath(e.left); if (t) return 'assign:' + t }
-    if (e.type === 'CallExpression') {
-      const t = exprPath(e.callee)
-      if (t) {
-        const a0 = e.arguments && e.arguments[0]
-        return 'call:' + t + (a0 && a0.type === 'Literal' && typeof a0.value === 'string' ? ':' + a0.value : '')
-      }
-    }
-  }
-  return null
-}
-
-// Key an ordered statement list: content-anchored where possible (duplicates get
-// #1, #2… by occurrence), positional stmt:N only for the anonymous remainder.
-function keyStatements(nodes) {
-  const seen = new Map()
-  return nodes.map((n, i) => {
-    const k = baseKeyOf(n)
-    if (k == null) return 'stmt:' + i
-    const c = seen.get(k) || 0
-    seen.set(k, c + 1)
-    return c ? k + '#' + c : k
-  })
-}
-
-function keyOf(node, i) { const k = baseKeyOf(node); return k == null ? 'stmt:' + i : k }
-
-// Top-level units: ordered { key, text, start, end } for each declaration/statement.
-// start/end are byte offsets in `src` — used by the format-preserving splice so unchanged
-// regions (and the whitespace/comments between units) survive a merge verbatim.
-function units(src) {
-  const ast = parse(src)
-  const keys = keyStatements(ast.body)
-  return ast.body.map((node, i) => ({ key: keys[i], text: src.slice(node.start, node.end), start: node.start, end: node.end }))
-}
-
-// Bare declared name (foo, Bar, VERSION) of a node, or null for anonymous statements.
-function bareName(node) {
-  let n = node
-  if (n.type === 'ExportNamedDeclaration' && n.declaration) n = n.declaration
-  if (n.type === 'FunctionDeclaration' && n.id) return n.id.name
-  if (n.type === 'ClassDeclaration' && n.id) return n.id.name
-  if (n.type === 'VariableDeclaration' && n.declarations[0] && n.declarations[0].id && n.declarations[0].id.name) return n.declarations[0].id.name
-  return null
-}
-
-function declaredNames(src) {
-  const s = new Set()
-  for (const node of parse(src).body) {
-    let n = node
-    if (n.type === 'ExportNamedDeclaration' && n.declaration) n = n.declaration
-    if (n.type === 'VariableDeclaration') {
-      for (const d of n.declarations) bindingNames(d.id, s)
-    } else {
-      const nm = bareName(node); if (nm) s.add(nm)
-    }
-    // Import locals count as declared names too — so if an import is ever dropped and its
-    // binding is still used, the dangling-reference check catches it (safety net for the
-    // import merge). Keeps the never-emit-broken-code guarantee honest for imports.
-    if (node.type === 'ImportDeclaration') for (const sp of node.specifiers) s.add(sp.local.name)
-    if (node.type === 'ExportNamedDeclaration' && !node.declaration && node.specifiers) {
-      for (const sp of node.specifiers) s.add(sp.exported.name || sp.exported.value || sp.local.name)
-    }
-  }
-  return s
-}
-
-// --- import-aware merging -------------------------------------------------------
-// Parse a single import statement into its parts, or null if it isn't one.
-function parseImport(src) {
-  let n
-  try { n = parse(src).body[0] } catch { return null }
-  if (!n || n.type !== 'ImportDeclaration') return null
-  let def = null, ns = null
-  const named = []
-  for (const sp of n.specifiers) {
-    if (sp.type === 'ImportDefaultSpecifier') def = sp.local.name
-    else if (sp.type === 'ImportNamespaceSpecifier') ns = sp.local.name
-    else named.push({ imported: sp.imported.name != null ? sp.imported.name : sp.imported.value, local: sp.local.name })
-  }
-  return { source: n.source.value, def, ns, named }
-}
-function renderImport({ source, def, ns, named }) {
-  const parts = []
-  if (def) parts.push(def)
-  if (ns) parts.push('* as ' + ns)
-  if (named.length) parts.push('{ ' + named.map((s) => s.imported === s.local ? s.local : s.imported + ' as ' + s.local).join(', ') + ' }')
-  if (!parts.length) return "import '" + source + "'"
-  return 'import ' + parts.join(', ') + " from '" + source + "'"
-}
-// Both sides changed an import from the SAME module → union their specifiers into one
-// statement (the common "both agents added an import" case). Returns null — meaning
-// "let the normal conflict path handle it" — for anything we can't safely combine
-// (different modules, clashing defaults/namespaces, namespace-mixed-with-named).
-function mergeUnit(baseText, aText, bText) {
-  const a = parseImport(aText), b = parseImport(bText)
-  if (!a || !b || a.source !== b.source) return null
-  let def
-  if (a.def && b.def) { if (a.def !== b.def) return null; def = a.def } else def = a.def || b.def
-  let ns
-  if (a.ns && b.ns) { if (a.ns !== b.ns) return null; ns = a.ns } else ns = a.ns || b.ns
-  if (ns && (a.named.length || b.named.length)) return null // `* as X` can't share a statement with named imports
-  const seen = new Set(), named = []
-  for (const s of [...a.named, ...b.named]) { const k = s.imported + '|' + s.local; if (!seen.has(k)) { seen.add(k); named.push(s) } }
-  // Canonical specifier order: the union must not depend on which side is `a` — the merge
-  // has to be SYMMETRIC (merge(a,b) === merge(b,a)) or two live peers never settle on one
-  // byte-form. (Found by the property fuzzer: a 1-in-40k NOT-SYMMETRIC violation.)
-  named.sort((x, y) => (x.imported + '|' + x.local).localeCompare(y.imported + '|' + y.local))
-  return renderImport({ source: a.source, def, ns, named })
-}
-
-// The BODY of a top-level declaration, by name, with the name itself excluded — so two
-// declarations that differ only in their name compare equal (that's how we spot a rename).
-function declBody(src, name) {
-  for (const node of parse(src).body) {
-    if (bareName(node) !== name) continue
-    let n = node
-    if (n.type === 'ExportNamedDeclaration' && n.declaration) n = n.declaration
-    if ((n.type === 'FunctionDeclaration' || n.type === 'ClassDeclaration') && n.body)
-      return src.slice(n.body.start, n.body.end)
-    if (n.type === 'VariableDeclaration' && n.declarations[0] && n.declarations[0].init) {
-      const init = n.declarations[0].init
-      return src.slice(init.start, init.end)
-    }
-    return null
-  }
-  return null
-}
-
-// Check if top-level declaration `name` is declared `async`
-function isAsyncDecl(src, name) {
-  try {
-    for (const node of parse(src).body) {
-      if (bareName(node) !== name) continue
-      let n = node
-      if (n.type === 'ExportNamedDeclaration' && n.declaration) n = n.declaration
-      if (n.type === 'ExportDefaultDeclaration' && n.declaration) n = n.declaration
-      if (n.type === 'FunctionDeclaration') return !!n.async
-      if (n.type === 'VariableDeclaration' && n.declarations[0] && n.declarations[0].init) {
-        const init = n.declarations[0].init
-        if (init.type === 'ArrowFunctionExpression' || init.type === 'FunctionExpression') {
-          return !!init.async
-        }
-      }
-    }
-  } catch {}
-  return false
-}
-
-// Upgrade free call sites of `fnName` to `await fnName(...)` if they are inside an async parent
-// and not already awaited.
-function upgradeCallSitesToAwait(src, fnName) {
-  try {
-    const ast = parse(src)
-    const spots = []
-
-    function walkAST(node, parent, isAsyncScope = false) {
-      if (!node || typeof node.type !== 'string') return
-
-      let childAsyncScope = isAsyncScope
-      if (node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression') {
-        childAsyncScope = !!node.async
-      }
-
-      if (node.type === 'CallExpression') {
-        let isTarget = false
-        if (node.callee.type === 'Identifier' && node.callee.name === fnName) isTarget = true
-        if (isTarget && childAsyncScope) {
-          const alreadyAwaited = parent && parent.type === 'AwaitExpression'
-          if (!alreadyAwaited) {
-            spots.push(node.start)
-          }
-        }
-      }
-
-      for (const k of Object.keys(node)) {
-        if (k === 'type' || k === 'start' || k === 'end' || k === 'loc' || k === 'range') continue
-        const v = node[k]
-        if (Array.isArray(v)) {
-          for (const c of v) walkAST(c, node, childAsyncScope)
-        } else if (v && typeof v.type === 'string') {
-          walkAST(v, node, childAsyncScope)
-        }
-      }
-    }
-
-    walkAST(ast, null, false)
-    if (!spots.length) return src
-
-    spots.sort((a, b) => b - a)
-    let out = src
-    for (const pos of spots) {
-      out = out.slice(0, pos) + 'await ' + out.slice(pos)
-    }
-    return out
-  } catch {
-    return src
-  }
-}
-
-// Find callers of `fnName` that are synchronous (cannot be auto-awaited without changing the caller's signature)
-function syncCallSitesOf(src, fnName) {
-  const syncCallers = []
-  try {
-    const ast = parse(src)
-    function walkAST(node, currentFnName = null, isAsyncScope = false) {
-      if (!node || typeof node.type !== 'string') return
-
-      let childAsyncScope = isAsyncScope
-      let fnNameContext = currentFnName
-      if (node.type === 'FunctionDeclaration') {
-        childAsyncScope = !!node.async
-        fnNameContext = node.id ? node.id.name : '<anonymous>'
-      } else if (node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression') {
-        childAsyncScope = !!node.async
-        if (node.id) fnNameContext = node.id.name
-      }
-
-      if (node.type === 'CallExpression') {
-        if (node.callee.type === 'Identifier' && node.callee.name === fnName) {
-          if (!childAsyncScope) {
-            syncCallers.push(fnNameContext || '<top-level>')
-          }
-        }
-      }
-
-      for (const k of Object.keys(node)) {
-        if (k === 'type' || k === 'start' || k === 'end' || k === 'loc' || k === 'range') continue
-        const v = node[k]
-        if (Array.isArray(v)) {
-          for (const c of v) walkAST(c, fnNameContext, childAsyncScope)
-        } else if (v && typeof v.type === 'string') {
-          walkAST(v, fnNameContext, childAsyncScope)
-        }
-      }
-    }
-    walkAST(ast, null, false)
-  } catch {}
-  return syncCallers
-}
-
-// Rewrite every reference to `oldName` as `newName` (skipping property/key positions,
-// which aren't references to the declaration). Edits back-to-front to keep offsets valid.
-function renameRefs(src, oldName, newName) {
-  const spots = []
-  walk(parse(src), (node, parent, key) => {
-    if (node.type !== 'Identifier' || node.name !== oldName) return
-    if (parent && parent.type === 'MemberExpression' && key === 'property' && !parent.computed) return
-    if (parent && (parent.type === 'Property' || parent.type === 'PropertyDefinition') && key === 'key' && !parent.computed) return
-    spots.push([node.start, node.end])
-  })
-  spots.sort((a, b) => b[0] - a[0])
-  let out = src
-  for (const [s, e] of spots) out = out.slice(0, s) + newName + out.slice(e)
-  return out
-}
-
-// Every identifier USED anywhere (skips obj.prop names and non-computed object keys).
-// Approximate — good enough for the intent check; the real version is scope-aware.
-function usedIdentifiers(src) {
-  const used = new Set()
-  walk(parse(src), (node, parent, key) => {
-    if (node.type !== 'Identifier') return
-    if (parent && parent.type === 'MemberExpression' && key === 'property' && !parent.computed) return
-    if (parent && (parent.type === 'Property' || parent.type === 'PropertyDefinition') && key === 'key' && !parent.computed) return
-    used.add(node.name)
-  })
-  return used
-}
-
-function walk(node, visit, parent = null, key = null) {
-  if (!node || typeof node.type !== 'string') return
-  visit(node, parent, key)
-  for (const k of Object.keys(node)) {
-    if (k === 'type' || k === 'start' || k === 'end' || k === 'loc') continue
-    const v = node[k]
-    if (Array.isArray(v)) { for (const c of v) walk(c, visit, node, k) }
-    else if (v && typeof v.type === 'string') walk(v, visit, node, k)
-  }
-}
-
-// --- scope-aware reference analysis ---------------------------------------------
-// The names REFERENCED in `src` that resolve to NOTHING in the file's own scopes —
-// i.e. free/global names, including any use of a top-level declaration. This is the
-// scope-aware upgrade of usedIdentifiers: a use of `x` that resolves to a LOCAL binding
-// (a param, a `const x` in the same function, a catch var, a loop var…) is NOT counted,
-// because it isn't a reference to a top-level declaration. That lets ICR tell a deleted
-// top-level `helper` apart from an unrelated local `helper` that merely shares its name.
-//
-// Honest scope coverage: functions (declaration/expression/arrow), blocks, catch
-// clauses, for/for-in/for-of loop bindings, params with simple destructuring, imports,
-// var-hoisting to the function scope, and let/const/class/function block binding.
-// Approximations (rare, and they only ever make the dangling check MORE cautious):
-// default-value expressions in patterns and `with`/eval are not modeled.
-// Walk the AST and call emit(identifierNode) for every reference that resolves to NO
-// local binding (free / would resolve to module or global scope). Both the dangling-ref
-// check and scope-aware renaming are built on this single traversal.
-function walkFreeRefs(src, emit) { resolveScopes(parse(src), null, emit) }
-
-function referencedFreeNames(src) {
-  const free = new Set()
-  walkFreeRefs(src, (node) => free.add(node.name))
-  return free
-}
-
-// Rename ONLY the free references to oldName (those that resolve to the top-level/global
-// binding) — never a local variable that merely shares the name. Edits back-to-front.
-function renameFreeRefs(src, oldName, newName) {
-  const spots = []
-  walkFreeRefs(src, (node) => { if (node.name === oldName) spots.push([node.start, node.end]) })
-  spots.sort((a, b) => b[0] - a[0])
-  let out = src
-  for (const [s, e] of spots) out = out.slice(0, s) + newName + out.slice(e)
-  return out
-}
-
-const CHILD_SKIP = new Set(['type', 'start', 'end', 'loc', 'range'])
-function eachChild(node, fn) {
-  for (const k of Object.keys(node)) {
-    if (CHILD_SKIP.has(k)) continue
-    const v = node[k]
-    if (Array.isArray(v)) { for (const c of v) if (c && typeof c.type === 'string') fn(c) }
-    else if (v && typeof v.type === 'string') fn(v)
-  }
-}
-
-// Names introduced by a binding target (handles identifiers + simple destructuring).
-function bindingNames(node, out) {
-  if (!node) return
-  switch (node.type) {
-    case 'Identifier': out.add(node.name); break
-    case 'ObjectPattern': for (const p of node.properties) bindingNames(p.type === 'RestElement' ? p.argument : p.value, out); break
-    case 'ArrayPattern': for (const el of node.elements) if (el) bindingNames(el, out); break
-    case 'AssignmentPattern': bindingNames(node.left, out); break
-    case 'RestElement': bindingNames(node.argument, out); break
-  }
-}
-
-// A binding target's NAMES are bindings, but its default values (`a = expr`) and computed
-// destructuring keys (`{ [k]: v }`) are REFERENCES that must be resolved against the scope.
-// Without this, a name used only in a default value would be missed by the dangling check.
-function resolveBindingDefaults(node, scope, emit) {
-  if (!node) return
-  switch (node.type) {
-    case 'AssignmentPattern': resolveBindingDefaults(node.left, scope, emit); resolveScopes(node.right, scope, emit); break
-    case 'ObjectPattern': for (const p of node.properties) {
-      if (p.type === 'RestElement') { resolveBindingDefaults(p.argument, scope, emit); break }
-      if (p.computed) resolveScopes(p.key, scope, emit)
-      resolveBindingDefaults(p.value, scope, emit)
-    } break
-    case 'ArrayPattern': for (const el of node.elements) if (el) resolveBindingDefaults(el, scope, emit); break
-    case 'RestElement': resolveBindingDefaults(node.argument, scope, emit); break
-    // Identifier: a pure binding — nothing to resolve.
-  }
-}
-
-const makeScope = (parent, fnScope) => { const s = { vars: new Set(), parent }; s.fnScope = fnScope || s; return s }
-const resolves = (scope, name) => { for (let s = scope; s; s = s.parent) if (s.vars.has(name)) return true; return false }
-
-// Hoist var declarations + function declarations into the function scope (deep, but not
-// crossing into nested functions, which own their own var scope).
-function hoistFunctionScope(nodes, scope) { for (const n of nodes) collectHoisted(n, scope) }
-function collectHoisted(node, scope) {
-  if (!node || typeof node.type !== 'string') return
-  if (node.type === 'FunctionDeclaration') { if (node.id) scope.fnScope.vars.add(node.id.name); return }
-  if (/Function(Expression)?$|ArrowFunctionExpression/.test(node.type)) return // nested function: stop
-  if (node.type === 'VariableDeclaration' && node.kind === 'var')
-    for (const d of node.declarations) bindingNames(d.id, scope.fnScope.vars)
-  eachChild(node, (c) => collectHoisted(c, scope))
-}
-// Bind let/const/class/function/import names declared directly in a block/program.
-function hoistBlock(nodes, scope) {
-  for (const n of nodes) {
-    if (n.type === 'VariableDeclaration' && (n.kind === 'let' || n.kind === 'const'))
-      for (const d of n.declarations) bindingNames(d.id, scope.vars)
-    else if (n.type === 'ClassDeclaration' && n.id) scope.vars.add(n.id.name)
-    else if (n.type === 'FunctionDeclaration' && n.id) scope.vars.add(n.id.name)
-    else if (n.type === 'ImportDeclaration') for (const sp of n.specifiers) scope.vars.add(sp.local.name)
-  }
-}
-
-function resolveScopes(node, scope, emit) {
-  if (!node || typeof node.type !== 'string') return
-  switch (node.type) {
-    case 'Program': {
-      const s = makeScope(null, null)
-      hoistFunctionScope(node.body, s); hoistBlock(node.body, s)
-      for (const c of node.body) resolveScopes(c, s, emit)
-      return
-    }
-    case 'FunctionDeclaration': case 'FunctionExpression': case 'ArrowFunctionExpression': {
-      const s = makeScope(scope, null)
-      for (const p of node.params) bindingNames(p, s.vars)
-      for (const p of node.params) resolveBindingDefaults(p, s, emit) // default values are references
-      if (node.id && node.type === 'FunctionExpression') s.vars.add(node.id.name) // named fn expr
-      if (node.body.type === 'BlockStatement') {
-        hoistFunctionScope(node.body.body, s); hoistBlock(node.body.body, s)
-        for (const c of node.body.body) resolveScopes(c, s, emit)
-      } else resolveScopes(node.body, s, emit) // arrow with expression body
-      return
-    }
-    case 'BlockStatement': {
-      const s = makeScope(scope, scope.fnScope); hoistBlock(node.body, s)
-      for (const c of node.body) resolveScopes(c, s, emit)
-      return
-    }
-    case 'CatchClause': {
-      const s = makeScope(scope, scope.fnScope)
-      if (node.param) bindingNames(node.param, s.vars)
-      resolveScopes(node.body, s, emit)
-      return
-    }
-    case 'ForStatement': {
-      const s = makeScope(scope, scope.fnScope)
-      if (node.init && node.init.type === 'VariableDeclaration') hoistBlock([node.init], s)
-      for (const k of ['init', 'test', 'update', 'body']) if (node[k]) resolveScopes(node[k], s, emit)
-      return
-    }
-    case 'ForInStatement': case 'ForOfStatement': {
-      const s = makeScope(scope, scope.fnScope)
-      if (node.left.type === 'VariableDeclaration') hoistBlock([node.left], s)
-      else resolveScopes(node.left, s, emit)
-      resolveScopes(node.right, s, emit); resolveScopes(node.body, s, emit)
-      return
-    }
-    case 'VariableDeclarator': { resolveBindingDefaults(node.id, scope, emit); if (node.init) resolveScopes(node.init, scope, emit); return } // id is a binding (defaults are refs)
-    case 'Identifier': { if (!resolves(scope, node.name)) emit(node); return }
-    case 'MemberExpression': { resolveScopes(node.object, scope, emit); if (node.computed) resolveScopes(node.property, scope, emit); return }
-    case 'Property': { if (node.computed) resolveScopes(node.key, scope, emit); resolveScopes(node.value, scope, emit); return }
-    case 'PropertyDefinition': case 'MethodDefinition': { if (node.computed) resolveScopes(node.key, scope, emit); if (node.value) resolveScopes(node.value, scope, emit); return }
-    case 'LabeledStatement': { resolveScopes(node.body, scope, emit); return }
-    case 'BreakStatement': case 'ContinueStatement': return // labels aren't value references
-    case 'ExportSpecifier': { resolveScopes(node.local, scope, emit); return }
-    case 'ImportSpecifier': case 'ImportDefaultSpecifier': case 'ImportNamespaceSpecifier': return // binding positions
-    default: eachChild(node, (c) => resolveScopes(c, scope, emit))
-  }
-}
-
-// A stable key for a class member, so two agents editing DIFFERENT methods of the same
-// class merge, while editing the SAME method conflicts.
-function memberKey(m, i) {
-  const kind = m.type === 'MethodDefinition' ? (m.kind === 'constructor' ? 'ctor' : 'method') : 'field'
-  if (m.key && m.key.type === 'Identifier' && !m.computed)
-    return kind + ':' + (m.static ? 'static.' : '') + m.key.name
-  return 'member:' + i
-}
-
-// For finer-grained merging: split a single declaration into its signature text + keyed
-// inner units, plus how to reassemble them. Handles FUNCTIONS (body statements, keyed
-// like top-level decls) and CLASSES (members, keyed by method/field name). Returns null
-// for anything else (the engine then treats the declaration as indivisible). Tolerates
-// fragments that don't parse standalone (e.g. a bare `return`).
-const MEMBER_WRAP = 'class __ICR__{'
-// A class member (method) doesn't parse standalone — wrap it in a throwaway class so we
-// can recurse INTO a method body that both agents edited. Offsets are mapped back to src.
-function splitMember(src) {
-  let ast
-  try { ast = parse(MEMBER_WRAP + src + '}') } catch { return null }
-  const cls = ast.body[0]
-  if (!cls || cls.type !== 'ClassDeclaration' || !cls.body.body.length) return null
-  const m = cls.body.body[0]
-  if (!m || m.type !== 'MethodDefinition' || !m.value || !m.value.body || m.value.body.type !== 'BlockStatement') return null
-  const off = MEMBER_WRAP.length, body = m.value.body
-  const bo = body.start - off, bc = body.end - 1 - off // brace-open / brace-close in src coords
-  const bs = bo + 1
-  const ks = keyStatements(body.body)
-  const units = body.body.map((s, i) => ({ key: ks[i], text: src.slice(s.start - off, s.end - off), start: (s.start - off) - bs, end: (s.end - off) - bs }))
-  return { sig: src.slice(0, bo), open: '{', close: src.slice(bc), body: src.slice(bs, bc), units, join: '\n  ', spliceable: true }
-}
-
-function splitUnit(src) {
-  let ast
-  try { ast = parse(src) } catch { return splitMember(src) } // maybe a class-member fragment
-  if (!ast || !ast.body) return splitMember(src) // defensive: a null AST must never reach .body
-  let n = ast.body[0]
-  if (!n) return null
-  // Unwrap export wrappers — but ALWAYS slice signatures from 0, not the inner node's
-  // start, or the wrapper text (`export `, `export default `) is silently DROPPED on
-  // reassembly. Found in the wild: ICR merging its own source lost `export function`.
-  if ((n.type === 'ExportNamedDeclaration' || n.type === 'ExportDefaultDeclaration') && n.declaration) n = n.declaration
-  if (n.type === 'FunctionDeclaration' && n.body) {
-    const bs = n.body.start + 1, be = n.body.end - 1 // between the braces
-    const ks = keyStatements(n.body.body)
-    const units = n.body.body.map((s, i) => ({ key: ks[i], text: src.slice(s.start, s.end), start: s.start - bs, end: s.end - bs }))
-    return { sig: src.slice(0, n.body.start), open: '{', close: src.slice(be), body: src.slice(bs, be), units, join: '\n  ', spliceable: true }
-  }
-  if (n.type === 'ClassDeclaration' && n.body) {
-    const bs = n.body.start + 1, be = n.body.end - 1
-    const units = n.body.body.map((m, i) => ({ key: memberKey(m, i), text: src.slice(m.start, m.end), start: m.start - bs, end: m.end - bs }))
-    return { sig: src.slice(0, n.body.start), open: '{', close: src.slice(be), body: src.slice(bs, be), units, join: '\n\n  ', spliceable: true }
-  }
-  // `const x = { ... }` / `const x = () => { ... }` / `const x = function () { ... }`
-  // and the CommonJS twins `module.exports = function () { ... }` / `x.y = { ... }` —
-  // without descending into assignments, two sides editing DIFFERENT lines of one
-  // exported function read as a same-declaration conflict (census overcount on axios).
-  let init = null
-  if (n.type === 'VariableDeclaration' && n.declarations.length === 1 && n.declarations[0].init) init = n.declarations[0].init
-  else if (n.type === 'ExpressionStatement' && n.expression.type === 'AssignmentExpression') init = n.expression.right
-  if (init) {
-    if (init.type === 'ObjectExpression') {
-      const sig = src.slice(0, init.start)
-      const units = init.properties.map((p, i) => ({ key: propKey(p, i), text: src.slice(p.start, p.end) }))
-      return { sig, units, open: '{\n  ', join: ',\n  ', close: '\n}' }
-    }
-    if ((init.type === 'ArrowFunctionExpression' || init.type === 'FunctionExpression') && init.body && init.body.type === 'BlockStatement') {
-      const bs = init.body.start + 1, be = init.body.end - 1
-      const ks = keyStatements(init.body.body)
-      const units = init.body.body.map((s, i) => ({ key: ks[i], text: src.slice(s.start, s.end), start: s.start - bs, end: s.end - bs }))
-      return { sig: src.slice(0, init.body.start), open: '{', close: src.slice(be), body: src.slice(bs, be), units, join: '\n  ', spliceable: true }
-    }
-  }
-  return null
-}
-
-// Stable key for an object-literal property, so two agents adding DIFFERENT keys union.
-function propKey(p, i) {
-  if (p.type === 'SpreadElement') return 'spread:' + i
-  if (p.key && p.key.type === 'Identifier' && !p.computed) return 'prop:' + p.key.name
-  if (p.key && p.key.type === 'Literal') return 'prop:' + String(p.key.value)
-  return 'prop:' + i
-}
-
-// Does `src` parse either as top-level code OR as a class member? (The inner-merge result
-// for a method is a fragment that's only valid inside a class — this lets us validate it.)
-function parsesUnit(src) {
-  if (parses(src)) return true
-  try { parse(MEMBER_WRAP + src + '}'); return true } catch { return false }
-}
-
-// TOKEN STREAM: lex `src` into a flat list of { start, end, k } where k is the token's
-// source text -- the atom the engine's token-level inner merge diffs on. This is what lets
-// ICR merge two edits INSIDE one statement (e.g. `foo(1, 2)` -- one side edits `1`, the
-// other `2`) the way a tree-sitter merge does, instead of conflicting on the whole line.
-// Lexing (not parsing) so it also works on fragments (`return x`, a class-member body).
-// Comments are NOT tokens -- they live in the gaps between tokens and are carried verbatim
-// by the base text, so a comment-only edit is a no-op here (the documented comment limit).
-// Returns null if the fragment can't be lexed -> the engine treats it as a conflict.
-function tokenize(src) {
-  const out = []
-  try {
-    const tz = acorn.tokenizer(src, { ecmaVersion: 'latest' })
-    for (;;) {
-      const t = tz.getToken()
-      if (t.type === acorn.tokTypes.eof) break
-      out.push({ start: t.start, end: t.end, k: src.slice(t.start, t.end) })
-    }
-  } catch { return null }
-  return out
-}
-
-// The provider contract every ICR language module implements.
-export const javascript = {
-  id: 'javascript',
-  exts: ['.js', '.mjs', '.cjs'],
-  parses,
-  units,
-  declaredNames,
-  usedIdentifiers,      // approximate (kept for reference)
-  referencedFreeNames,  // scope-aware — what the engine prefers for the dangling check
-  declBody,
-  isAsyncDecl,
-  upgradeCallSitesToAwait,
-  syncCallSitesOf,
-  renameRefs,           // rewrites every matching identifier (kept for reference)
-  renameFreeRefs,       // scope-aware — only rewrites references that resolve to the binding
-  splitUnit,            // finer granularity: split a function/class/method into keyed inner units
-  parsesUnit,           // validity oracle that also accepts a class-member fragment
-  mergeUnit,            // language-specific same-key merge (import specifier union)
-  tokenize,             // finest granularity: token stream for the token-level inner merge
-}
+// lang-js.js — the JavaScript language provider for ICR.
+//
+// ICR's merge engine (icr.js) is language-agnostic: it merges a list of keyed "units"
+// and asks intent questions ("what names are declared / used / what's a function body").
+// Everything that actually knows about a *language* — how to parse it, what a top-level
+// declaration is, how to find references — lives behind a provider like this one.
+//
+// To add a language (Python, Go, Rust…), write another module exposing the same shape
+// and register it with icr.js's registerLanguage(). This JS provider is just the first
+// plugin; it happens to use `acorn` because acorn is a tiny pure-JS parser. A tree-sitter
+// provider would implement the identical interface over tree-sitter grammars.
+
+import * as acorn from 'acorn'
+
+// Parse permissively: try module syntax, fall back to script (so plain snippets and
+// ESM both work). Throws only when the code genuinely won't parse either way.
+function parseRaw(src) {
+  try { return acorn.parse(src, { ecmaVersion: 'latest', sourceType: 'module' }) }
+  catch { return acorn.parse(src, { ecmaVersion: 'latest', sourceType: 'script' }) }
+}
+
+// Tiny parse cache. One structuralMerge re-parses the SAME three texts (and the merged
+// result) many times across its tiers — gate, units, declaredNames, scope analysis,
+// final validation. Caching by exact text collapses that to one parse per distinct
+// version (a 1MB-file merge dropped ~7.6s → ~3s). Small and bounded: 8 entries, LRU.
+// String comparison is a cheap memcmp; ASTs are treated as immutable by all callers.
+const PARSE_CACHE = new Map() // src -> ast (Map preserves insertion order → LRU)
+function parse(src) {
+  const hit = PARSE_CACHE.get(src)
+  if (hit) { PARSE_CACHE.delete(src); PARSE_CACHE.set(src, hit); return hit } // refresh LRU position
+  const ast = parseRaw(src)
+  PARSE_CACHE.set(src, ast)
+  if (PARSE_CACHE.size > 8) PARSE_CACHE.delete(PARSE_CACHE.keys().next().value)
+  return ast
+}
+
+function parses(src) { try { parse(src); return true } catch { return false } }
+
+// A stable key per top-level node — what lets us recognize "the same declaration"
+// across two edits. Names where we have them; position as a last resort.
+// Dotted source path of a simple expression target (Axios.prototype.request,
+// utils.forEach, this.config) — or null when it isn't a plain dotted path.
+function exprPath(node) {
+  if (!node) return null
+  if (node.type === 'Identifier') return node.name
+  if (node.type === 'ThisExpression') return 'this'
+  if (node.type === 'MemberExpression' && !node.computed) {
+    const o = exprPath(node.object)
+    return o && node.property && node.property.name ? o + '.' + node.property.name : null
+  }
+  return null
+}
+
+// CONTENT-ANCHORED key for a statement, or null for truly anonymous ones.
+// Index keys (stmt:N) are a last resort ONLY: an insertion above an index-keyed
+// statement shifts every index, so unrelated statements pair up as fake
+// same-unit conflicts — and deletions mispair so deleted code can resurrect.
+// (Both failure modes were found by the merge census replaying axios/express
+// history.) Assignments key by their target, calls by callee path plus a
+// leading string literal (`it('name')`, `describe('name')`), directives by text.
+function baseKeyOf(node) {
+  let n = node
+  if (n.type === 'ExportNamedDeclaration' && n.declaration) n = n.declaration
+  if (n.type === 'ExportDefaultDeclaration') return 'export:default'
+  if (n.type === 'FunctionDeclaration' && n.id) return 'fn:' + n.id.name
+  if (n.type === 'ClassDeclaration' && n.id) return 'class:' + n.id.name
+  if (n.type === 'VariableDeclaration' && n.declarations[0] && n.declarations[0].id && n.declarations[0].id.name)
+    return 'var:' + n.declarations[0].id.name
+  // Key imports by their SOURCE MODULE, so two agents adding imports from DIFFERENT
+  // modules never collide, and two touching the SAME module are merged (specifier union).
+  if (n.type === 'ImportDeclaration') return 'import:' + (n.source && n.source.value != null ? n.source.value : '?')
+  // Specifier-only exports (`export { a, b }`, `export { x } from './m'`, `export * from …`)
+  // carry no declaration, so without a stable key they fall to positional stmt:N — and an
+  // edit to the export list then mispairs, DUPLICATES the statement, and knocks the whole
+  // merge to the line tier (which silently skips the intent/dangling checks). A stable key
+  // pairs them so an unedited side is kept and an edited side wins cleanly.
+  if (n.type === 'ExportNamedDeclaration') return n.source && n.source.value != null ? 'export-from:' + n.source.value : 'export-names'
+  if (n.type === 'ExportAllDeclaration') return 'export-all:' + (n.source && n.source.value != null ? n.source.value : '?')
+  if (n.type === 'ExpressionStatement') {
+    const e = n.expression
+    if (e.type === 'Literal' && typeof e.value === 'string') return 'directive:' + e.value // 'use strict'
+    if (e.type === 'AssignmentExpression') { const t = exprPath(e.left); if (t) return 'assign:' + t }
+    if (e.type === 'CallExpression') {
+      const t = exprPath(e.callee)
+      if (t) {
+        const a0 = e.arguments && e.arguments[0]
+        return 'call:' + t + (a0 && a0.type === 'Literal' && typeof a0.value === 'string' ? ':' + a0.value : '')
+      }
+    }
+  }
+  return null
+}
+
+// Key an ordered statement list: content-anchored where possible (duplicates get
+// #1, #2… by occurrence), positional stmt:N only for the anonymous remainder.
+function keyStatements(nodes) {
+  const seen = new Map()
+  return nodes.map((n, i) => {
+    const k = baseKeyOf(n)
+    if (k == null) return 'stmt:' + i
+    const c = seen.get(k) || 0
+    seen.set(k, c + 1)
+    return c ? k + '#' + c : k
+  })
+}
+
+function keyOf(node, i) { const k = baseKeyOf(node); return k == null ? 'stmt:' + i : k }
+
+// Top-level units: ordered { key, text, start, end } for each declaration/statement.
+// start/end are byte offsets in `src` — used by the format-preserving splice so unchanged
+// regions (and the whitespace/comments between units) survive a merge verbatim.
+function units(src) {
+  const ast = parse(src)
+  const keys = keyStatements(ast.body)
+  return ast.body.map((node, i) => ({ key: keys[i], text: src.slice(node.start, node.end), start: node.start, end: node.end }))
+}
+
+// Bare declared name (foo, Bar, VERSION) of a node, or null for anonymous statements.
+function bareName(node) {
+  let n = node
+  if (n.type === 'ExportNamedDeclaration' && n.declaration) n = n.declaration
+  if (n.type === 'FunctionDeclaration' && n.id) return n.id.name
+  if (n.type === 'ClassDeclaration' && n.id) return n.id.name
+  if (n.type === 'VariableDeclaration' && n.declarations[0] && n.declarations[0].id && n.declarations[0].id.name) return n.declarations[0].id.name
+  return null
+}
+
+function declaredNames(src) {
+  const s = new Set()
+  for (const node of parse(src).body) {
+    let n = node
+    if (n.type === 'ExportNamedDeclaration' && n.declaration) n = n.declaration
+    if (n.type === 'VariableDeclaration') {
+      for (const d of n.declarations) bindingNames(d.id, s)
+    } else {
+      const nm = bareName(node); if (nm) s.add(nm)
+    }
+    // Import locals count as declared names too — so if an import is ever dropped and its
+    // binding is still used, the dangling-reference check catches it (safety net for the
+    // import merge). Keeps the never-emit-broken-code guarantee honest for imports.
+    if (node.type === 'ImportDeclaration') for (const sp of node.specifiers) s.add(sp.local.name)
+    if (node.type === 'ExportNamedDeclaration' && !node.declaration && node.specifiers) {
+      for (const sp of node.specifiers) s.add(sp.exported.name || sp.exported.value || sp.local.name)
+    }
+  }
+  return s
+}
+
+// --- import-aware merging -------------------------------------------------------
+// Parse a single import statement into its parts, or null if it isn't one.
+function parseImport(src) {
+  let n
+  try { n = parse(src).body[0] } catch { return null }
+  if (!n || n.type !== 'ImportDeclaration') return null
+  let def = null, ns = null
+  const named = []
+  for (const sp of n.specifiers) {
+    if (sp.type === 'ImportDefaultSpecifier') def = sp.local.name
+    else if (sp.type === 'ImportNamespaceSpecifier') ns = sp.local.name
+    else named.push({ imported: sp.imported.name != null ? sp.imported.name : sp.imported.value, local: sp.local.name })
+  }
+  return { source: n.source.value, def, ns, named }
+}
+function renderImport({ source, def, ns, named }) {
+  const parts = []
+  if (def) parts.push(def)
+  if (ns) parts.push('* as ' + ns)
+  if (named.length) parts.push('{ ' + named.map((s) => s.imported === s.local ? s.local : s.imported + ' as ' + s.local).join(', ') + ' }')
+  if (!parts.length) return "import '" + source + "'"
+  return 'import ' + parts.join(', ') + " from '" + source + "'"
+}
+// Both sides changed an import from the SAME module → union their specifiers into one
+// statement (the common "both agents added an import" case). Returns null — meaning
+// "let the normal conflict path handle it" — for anything we can't safely combine
+// (different modules, clashing defaults/namespaces, namespace-mixed-with-named).
+function mergeUnit(baseText, aText, bText) {
+  const a = parseImport(aText), b = parseImport(bText)
+  if (!a || !b || a.source !== b.source) return null
+  let def
+  if (a.def && b.def) { if (a.def !== b.def) return null; def = a.def } else def = a.def || b.def
+  let ns
+  if (a.ns && b.ns) { if (a.ns !== b.ns) return null; ns = a.ns } else ns = a.ns || b.ns
+  if (ns && (a.named.length || b.named.length)) return null // `* as X` can't share a statement with named imports
+  const seen = new Set(), named = []
+  for (const s of [...a.named, ...b.named]) { const k = s.imported + '|' + s.local; if (!seen.has(k)) { seen.add(k); named.push(s) } }
+  // Canonical specifier order: the union must not depend on which side is `a` — the merge
+  // has to be SYMMETRIC (merge(a,b) === merge(b,a)) or two live peers never settle on one
+  // byte-form. (Found by the property fuzzer: a 1-in-40k NOT-SYMMETRIC violation.)
+  named.sort((x, y) => (x.imported + '|' + x.local).localeCompare(y.imported + '|' + y.local))
+  return renderImport({ source: a.source, def, ns, named })
+}
+
+// The BODY of a top-level declaration, by name, with the name itself excluded — so two
+// declarations that differ only in their name compare equal (that's how we spot a rename).
+function declBody(src, name) {
+  for (const node of parse(src).body) {
+    if (bareName(node) !== name) continue
+    let n = node
+    if (n.type === 'ExportNamedDeclaration' && n.declaration) n = n.declaration
+    if ((n.type === 'FunctionDeclaration' || n.type === 'ClassDeclaration') && n.body)
+      return src.slice(n.body.start, n.body.end)
+    if (n.type === 'VariableDeclaration' && n.declarations[0] && n.declarations[0].init) {
+      const init = n.declarations[0].init
+      return src.slice(init.start, init.end)
+    }
+    return null
+  }
+  return null
+}
+
+// Check if top-level declaration `name` is declared `async`
+function isAsyncDecl(src, name) {
+  try {
+    for (const node of parse(src).body) {
+      if (bareName(node) !== name) continue
+      let n = node
+      if (n.type === 'ExportNamedDeclaration' && n.declaration) n = n.declaration
+      if (n.type === 'ExportDefaultDeclaration' && n.declaration) n = n.declaration
+      if (n.type === 'FunctionDeclaration') return !!n.async
+      if (n.type === 'VariableDeclaration' && n.declarations[0] && n.declarations[0].init) {
+        const init = n.declarations[0].init
+        if (init.type === 'ArrowFunctionExpression' || init.type === 'FunctionExpression') {
+          return !!init.async
+        }
+      }
+    }
+  } catch {}
+  return false
+}
+
+// Upgrade free call sites of `fnName` to `await fnName(...)` if they are inside an async parent
+// and not already awaited.
+//
+// Left alone (0.14.3 P0-5): a call that is already awaited (`await f()`, `await (f())`); a call that
+// IS the value an async function returns (`return f()`, `async () => f()`) -- OUTSIDE a try, where
+// returning the promise resolves to the same value. Inside a try (its block or its catch) `return f()`
+// is NOT the same once f is async: a rejection escapes the catch and a finally runs before f settles,
+// so there it is upgraded, which is what the feature is for (Claude-cloud's review). A call that is an
+// argument of an awaited call (`await g(f())`) is NOT awaited by that await and is upgraded too.
+// Each position is inserted at most once.
+function upgradeCallSitesToAwait(src, fnName) {
+  try {
+    const ast = parse(src)
+    const spots = new Set()
+
+    // awaited: this node IS the operand of an await (through parentheses or an optional chain only).
+    // inTry: this node sits in a try block or catch clause of the current function.
+    function walkAST(node, parent, isAsyncScope = false, awaited = false, inTry = false) {
+      if (!node || typeof node.type !== 'string') return
+
+      let childAsyncScope = isAsyncScope
+      let childInTry = inTry
+      if (node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression') {
+        childAsyncScope = !!node.async
+        childInTry = false // a nested function has its own try scopes
+      }
+      const passAwait = node.type === 'AwaitExpression' ? true
+        : (node.type === 'ParenthesizedExpression' || node.type === 'ChainExpression') ? awaited : false
+
+      if (node.type === 'CallExpression') {
+        let isTarget = false
+        if (node.callee.type === 'Identifier' && node.callee.name === fnName) isTarget = true
+        if (isTarget && childAsyncScope) {
+          const alreadyAwaited = awaited || (parent && parent.type === 'AwaitExpression')
+          const returnedAsIs = !inTry && parent && (parent.type === 'ReturnStatement' ||
+            (parent.type === 'ArrowFunctionExpression' && parent.body === node))
+          if (!alreadyAwaited && !returnedAsIs) spots.add(node.start)
+        }
+      }
+
+      for (const k of Object.keys(node)) {
+        if (k === 'type' || k === 'start' || k === 'end' || k === 'loc' || k === 'range') continue
+        const v = node[k]
+        // A try's block and its catch clause are "in try"; its finally is not (a return there is final).
+        const kInTry = node.type === 'TryStatement' ? (k === 'block' || k === 'handler') || childInTry : childInTry
+        if (Array.isArray(v)) {
+          for (const c of v) walkAST(c, node, childAsyncScope, passAwait, kInTry)
+        } else if (v && typeof v.type === 'string') {
+          walkAST(v, node, childAsyncScope, passAwait, kInTry)
+        }
+      }
+    }
+
+    walkAST(ast, null, false)
+    if (!spots.size) return src
+
+    const order = [...spots].sort((a, b) => b - a)
+    spots.clear()
+    for (const p of order) spots.add(p)
+    let out = src
+    for (const pos of spots) {
+      out = out.slice(0, pos) + 'await ' + out.slice(pos)
+    }
+    return out
+  } catch {
+    return src
+  }
+}
+
+// STACKED AWAITS LEFT BY A CRDT UNION (0.14.3 P0-5-3). Two peers making the same sync -> async
+// change at once each insert `await ` before the same call; the shared text keeps BOTH inserts, so
+// the room reads `await await f()`. No merge can prevent that (each peer's merge is right on its own),
+// so the engine removes it afterwards. Returns the [start, end) spans to delete: for every
+// `await await x`, the OUTER `await` and the whitespace after it, and only when nothing but whitespace
+// separates the two (so `await (await x)`, a comment, or a string is never touched). On the same
+// converged text every peer computes the same spans, so their deletes are of the same characters.
+function stackedAwaits(src) {
+  let ast
+  try { ast = parse(src) } catch { return [] }
+  const spans = []
+  const walk = (node) => {
+    if (!node || typeof node.type !== 'string') return
+    if (node.type === 'AwaitExpression' && node.argument && node.argument.type === 'AwaitExpression' &&
+        /^await\s+$/.test(src.slice(node.start, node.argument.start))) spans.push([node.start, node.argument.start])
+    for (const k of Object.keys(node)) {
+      if (k === 'type' || k === 'start' || k === 'end' || k === 'loc' || k === 'range') continue
+      const v = node[k]
+      if (Array.isArray(v)) { for (const c of v) walk(c) } else if (v && typeof v.type === 'string') walk(v)
+    }
+  }
+  walk(ast)
+  return spans.sort((a, b) => a[0] - b[0])
+}
+
+// Find callers of `fnName` that are synchronous (cannot be auto-awaited without changing the caller's signature)
+function syncCallSitesOf(src, fnName) {
+  const syncCallers = []
+  try {
+    const ast = parse(src)
+    function walkAST(node, currentFnName = null, isAsyncScope = false) {
+      if (!node || typeof node.type !== 'string') return
+
+      let childAsyncScope = isAsyncScope
+      let fnNameContext = currentFnName
+      if (node.type === 'FunctionDeclaration') {
+        childAsyncScope = !!node.async
+        fnNameContext = node.id ? node.id.name : '<anonymous>'
+      } else if (node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression') {
+        childAsyncScope = !!node.async
+        if (node.id) fnNameContext = node.id.name
+      }
+
+      if (node.type === 'CallExpression') {
+        if (node.callee.type === 'Identifier' && node.callee.name === fnName) {
+          if (!childAsyncScope) {
+            syncCallers.push(fnNameContext || '<top-level>')
+          }
+        }
+      }
+
+      for (const k of Object.keys(node)) {
+        if (k === 'type' || k === 'start' || k === 'end' || k === 'loc' || k === 'range') continue
+        const v = node[k]
+        if (Array.isArray(v)) {
+          for (const c of v) walkAST(c, fnNameContext, childAsyncScope)
+        } else if (v && typeof v.type === 'string') {
+          walkAST(v, fnNameContext, childAsyncScope)
+        }
+      }
+    }
+    walkAST(ast, null, false)
+  } catch {}
+  return syncCallers
+}
+
+// Rewrite every reference to `oldName` as `newName` (skipping property/key positions,
+// which aren't references to the declaration). Edits back-to-front to keep offsets valid.
+function renameRefs(src, oldName, newName) {
+  const spots = []
+  walk(parse(src), (node, parent, key) => {
+    if (node.type !== 'Identifier' || node.name !== oldName) return
+    if (parent && parent.type === 'MemberExpression' && key === 'property' && !parent.computed) return
+    if (parent && (parent.type === 'Property' || parent.type === 'PropertyDefinition') && key === 'key' && !parent.computed) return
+    spots.push([node.start, node.end])
+  })
+  spots.sort((a, b) => b[0] - a[0])
+  let out = src
+  for (const [s, e] of spots) out = out.slice(0, s) + newName + out.slice(e)
+  return out
+}
+
+// Every identifier USED anywhere (skips obj.prop names and non-computed object keys).
+// Approximate — good enough for the intent check; the real version is scope-aware.
+function usedIdentifiers(src) {
+  const used = new Set()
+  walk(parse(src), (node, parent, key) => {
+    if (node.type !== 'Identifier') return
+    if (parent && parent.type === 'MemberExpression' && key === 'property' && !parent.computed) return
+    if (parent && (parent.type === 'Property' || parent.type === 'PropertyDefinition') && key === 'key' && !parent.computed) return
+    used.add(node.name)
+  })
+  return used
+}
+
+function walk(node, visit, parent = null, key = null) {
+  if (!node || typeof node.type !== 'string') return
+  visit(node, parent, key)
+  for (const k of Object.keys(node)) {
+    if (k === 'type' || k === 'start' || k === 'end' || k === 'loc') continue
+    const v = node[k]
+    if (Array.isArray(v)) { for (const c of v) walk(c, visit, node, k) }
+    else if (v && typeof v.type === 'string') walk(v, visit, node, k)
+  }
+}
+
+// --- scope-aware reference analysis ---------------------------------------------
+// The names REFERENCED in `src` that resolve to NOTHING in the file's own scopes —
+// i.e. free/global names, including any use of a top-level declaration. This is the
+// scope-aware upgrade of usedIdentifiers: a use of `x` that resolves to a LOCAL binding
+// (a param, a `const x` in the same function, a catch var, a loop var…) is NOT counted,
+// because it isn't a reference to a top-level declaration. That lets ICR tell a deleted
+// top-level `helper` apart from an unrelated local `helper` that merely shares its name.
+//
+// Honest scope coverage: functions (declaration/expression/arrow), blocks, catch
+// clauses, for/for-in/for-of loop bindings, params with simple destructuring, imports,
+// var-hoisting to the function scope, and let/const/class/function block binding.
+// Approximations (rare, and they only ever make the dangling check MORE cautious):
+// default-value expressions in patterns and `with`/eval are not modeled.
+// Walk the AST and call emit(identifierNode) for every reference that resolves to NO
+// local binding (free / would resolve to module or global scope). Both the dangling-ref
+// check and scope-aware renaming are built on this single traversal.
+function walkFreeRefs(src, emit) { resolveScopes(parse(src), null, emit) }
+
+function referencedFreeNames(src) {
+  const free = new Set()
+  walkFreeRefs(src, (node) => free.add(node.name))
+  return free
+}
+
+// Rename ONLY the free references to oldName (those that resolve to the top-level/global
+// binding) — never a local variable that merely shares the name. Edits back-to-front.
+function renameFreeRefs(src, oldName, newName) {
+  const spots = []
+  walkFreeRefs(src, (node) => { if (node.name === oldName) spots.push([node.start, node.end]) })
+  spots.sort((a, b) => b[0] - a[0])
+  let out = src
+  for (const [s, e] of spots) out = out.slice(0, s) + newName + out.slice(e)
+  return out
+}
+
+const CHILD_SKIP = new Set(['type', 'start', 'end', 'loc', 'range'])
+function eachChild(node, fn) {
+  for (const k of Object.keys(node)) {
+    if (CHILD_SKIP.has(k)) continue
+    const v = node[k]
+    if (Array.isArray(v)) { for (const c of v) if (c && typeof c.type === 'string') fn(c) }
+    else if (v && typeof v.type === 'string') fn(v)
+  }
+}
+
+// Names introduced by a binding target (handles identifiers + simple destructuring).
+function bindingNames(node, out) {
+  if (!node) return
+  switch (node.type) {
+    case 'Identifier': out.add(node.name); break
+    case 'ObjectPattern': for (const p of node.properties) bindingNames(p.type === 'RestElement' ? p.argument : p.value, out); break
+    case 'ArrayPattern': for (const el of node.elements) if (el) bindingNames(el, out); break
+    case 'AssignmentPattern': bindingNames(node.left, out); break
+    case 'RestElement': bindingNames(node.argument, out); break
+  }
+}
+
+// A binding target's NAMES are bindings, but its default values (`a = expr`) and computed
+// destructuring keys (`{ [k]: v }`) are REFERENCES that must be resolved against the scope.
+// Without this, a name used only in a default value would be missed by the dangling check.
+function resolveBindingDefaults(node, scope, emit) {
+  if (!node) return
+  switch (node.type) {
+    case 'AssignmentPattern': resolveBindingDefaults(node.left, scope, emit); resolveScopes(node.right, scope, emit); break
+    case 'ObjectPattern': for (const p of node.properties) {
+      if (p.type === 'RestElement') { resolveBindingDefaults(p.argument, scope, emit); break }
+      if (p.computed) resolveScopes(p.key, scope, emit)
+      resolveBindingDefaults(p.value, scope, emit)
+    } break
+    case 'ArrayPattern': for (const el of node.elements) if (el) resolveBindingDefaults(el, scope, emit); break
+    case 'RestElement': resolveBindingDefaults(node.argument, scope, emit); break
+    // Identifier: a pure binding — nothing to resolve.
+  }
+}
+
+const makeScope = (parent, fnScope) => { const s = { vars: new Set(), parent }; s.fnScope = fnScope || s; return s }
+const resolves = (scope, name) => { for (let s = scope; s; s = s.parent) if (s.vars.has(name)) return true; return false }
+
+// Hoist var declarations + function declarations into the function scope (deep, but not
+// crossing into nested functions, which own their own var scope).
+function hoistFunctionScope(nodes, scope) { for (const n of nodes) collectHoisted(n, scope) }
+function collectHoisted(node, scope) {
+  if (!node || typeof node.type !== 'string') return
+  if (node.type === 'FunctionDeclaration') { if (node.id) scope.fnScope.vars.add(node.id.name); return }
+  if (/Function(Expression)?$|ArrowFunctionExpression/.test(node.type)) return // nested function: stop
+  if (node.type === 'VariableDeclaration' && node.kind === 'var')
+    for (const d of node.declarations) bindingNames(d.id, scope.fnScope.vars)
+  eachChild(node, (c) => collectHoisted(c, scope))
+}
+// Bind let/const/class/function/import names declared directly in a block/program.
+function hoistBlock(nodes, scope) {
+  for (const n of nodes) {
+    if (n.type === 'VariableDeclaration' && (n.kind === 'let' || n.kind === 'const'))
+      for (const d of n.declarations) bindingNames(d.id, scope.vars)
+    else if (n.type === 'ClassDeclaration' && n.id) scope.vars.add(n.id.name)
+    else if (n.type === 'FunctionDeclaration' && n.id) scope.vars.add(n.id.name)
+    else if (n.type === 'ImportDeclaration') for (const sp of n.specifiers) scope.vars.add(sp.local.name)
+  }
+}
+
+function resolveScopes(node, scope, emit) {
+  if (!node || typeof node.type !== 'string') return
+  switch (node.type) {
+    case 'Program': {
+      const s = makeScope(null, null)
+      hoistFunctionScope(node.body, s); hoistBlock(node.body, s)
+      for (const c of node.body) resolveScopes(c, s, emit)
+      return
+    }
+    case 'FunctionDeclaration': case 'FunctionExpression': case 'ArrowFunctionExpression': {
+      const s = makeScope(scope, null)
+      for (const p of node.params) bindingNames(p, s.vars)
+      for (const p of node.params) resolveBindingDefaults(p, s, emit) // default values are references
+      if (node.id && node.type === 'FunctionExpression') s.vars.add(node.id.name) // named fn expr
+      if (node.body.type === 'BlockStatement') {
+        hoistFunctionScope(node.body.body, s); hoistBlock(node.body.body, s)
+        for (const c of node.body.body) resolveScopes(c, s, emit)
+      } else resolveScopes(node.body, s, emit) // arrow with expression body
+      return
+    }
+    case 'BlockStatement': {
+      const s = makeScope(scope, scope.fnScope); hoistBlock(node.body, s)
+      for (const c of node.body) resolveScopes(c, s, emit)
+      return
+    }
+    case 'CatchClause': {
+      const s = makeScope(scope, scope.fnScope)
+      if (node.param) bindingNames(node.param, s.vars)
+      resolveScopes(node.body, s, emit)
+      return
+    }
+    case 'ForStatement': {
+      const s = makeScope(scope, scope.fnScope)
+      if (node.init && node.init.type === 'VariableDeclaration') hoistBlock([node.init], s)
+      for (const k of ['init', 'test', 'update', 'body']) if (node[k]) resolveScopes(node[k], s, emit)
+      return
+    }
+    case 'ForInStatement': case 'ForOfStatement': {
+      const s = makeScope(scope, scope.fnScope)
+      if (node.left.type === 'VariableDeclaration') hoistBlock([node.left], s)
+      else resolveScopes(node.left, s, emit)
+      resolveScopes(node.right, s, emit); resolveScopes(node.body, s, emit)
+      return
+    }
+    case 'VariableDeclarator': { resolveBindingDefaults(node.id, scope, emit); if (node.init) resolveScopes(node.init, scope, emit); return } // id is a binding (defaults are refs)
+    case 'Identifier': { if (!resolves(scope, node.name)) emit(node); return }
+    case 'MemberExpression': { resolveScopes(node.object, scope, emit); if (node.computed) resolveScopes(node.property, scope, emit); return }
+    case 'Property': { if (node.computed) resolveScopes(node.key, scope, emit); resolveScopes(node.value, scope, emit); return }
+    case 'PropertyDefinition': case 'MethodDefinition': { if (node.computed) resolveScopes(node.key, scope, emit); if (node.value) resolveScopes(node.value, scope, emit); return }
+    case 'LabeledStatement': { resolveScopes(node.body, scope, emit); return }
+    case 'BreakStatement': case 'ContinueStatement': return // labels aren't value references
+    case 'ExportSpecifier': { resolveScopes(node.local, scope, emit); return }
+    case 'ImportSpecifier': case 'ImportDefaultSpecifier': case 'ImportNamespaceSpecifier': return // binding positions
+    default: eachChild(node, (c) => resolveScopes(c, scope, emit))
+  }
+}
+
+// A stable key for a class member, so two agents editing DIFFERENT methods of the same
+// class merge, while editing the SAME method conflicts.
+function memberKey(m, i) {
+  const kind = m.type === 'MethodDefinition' ? (m.kind === 'constructor' ? 'ctor' : 'method') : 'field'
+  if (m.key && m.key.type === 'Identifier' && !m.computed)
+    return kind + ':' + (m.static ? 'static.' : '') + m.key.name
+  return 'member:' + i
+}
+
+// For finer-grained merging: split a single declaration into its signature text + keyed
+// inner units, plus how to reassemble them. Handles FUNCTIONS (body statements, keyed
+// like top-level decls) and CLASSES (members, keyed by method/field name). Returns null
+// for anything else (the engine then treats the declaration as indivisible). Tolerates
+// fragments that don't parse standalone (e.g. a bare `return`).
+const MEMBER_WRAP = 'class __ICR__{'
+// A class member (method) doesn't parse standalone — wrap it in a throwaway class so we
+// can recurse INTO a method body that both agents edited. Offsets are mapped back to src.
+function splitMember(src) {
+  let ast
+  try { ast = parse(MEMBER_WRAP + src + '}') } catch { return null }
+  const cls = ast.body[0]
+  if (!cls || cls.type !== 'ClassDeclaration' || !cls.body.body.length) return null
+  const m = cls.body.body[0]
+  if (!m || m.type !== 'MethodDefinition' || !m.value || !m.value.body || m.value.body.type !== 'BlockStatement') return null
+  const off = MEMBER_WRAP.length, body = m.value.body
+  const bo = body.start - off, bc = body.end - 1 - off // brace-open / brace-close in src coords
+  const bs = bo + 1
+  const ks = keyStatements(body.body)
+  const units = body.body.map((s, i) => ({ key: ks[i], text: src.slice(s.start - off, s.end - off), start: (s.start - off) - bs, end: (s.end - off) - bs }))
+  return { sig: src.slice(0, bo), open: '{', close: src.slice(bc), body: src.slice(bs, bc), units, join: '\n  ', spliceable: true }
+}
+
+function splitUnit(src) {
+  let ast
+  try { ast = parse(src) } catch { return splitMember(src) } // maybe a class-member fragment
+  if (!ast || !ast.body) return splitMember(src) // defensive: a null AST must never reach .body
+  let n = ast.body[0]
+  if (!n) return null
+  // Unwrap export wrappers — but ALWAYS slice signatures from 0, not the inner node's
+  // start, or the wrapper text (`export `, `export default `) is silently DROPPED on
+  // reassembly. Found in the wild: ICR merging its own source lost `export function`.
+  if ((n.type === 'ExportNamedDeclaration' || n.type === 'ExportDefaultDeclaration') && n.declaration) n = n.declaration
+  if (n.type === 'FunctionDeclaration' && n.body) {
+    const bs = n.body.start + 1, be = n.body.end - 1 // between the braces
+    const ks = keyStatements(n.body.body)
+    const units = n.body.body.map((s, i) => ({ key: ks[i], text: src.slice(s.start, s.end), start: s.start - bs, end: s.end - bs }))
+    return { sig: src.slice(0, n.body.start), open: '{', close: src.slice(be), body: src.slice(bs, be), units, join: '\n  ', spliceable: true }
+  }
+  if (n.type === 'ClassDeclaration' && n.body) {
+    const bs = n.body.start + 1, be = n.body.end - 1
+    const units = n.body.body.map((m, i) => ({ key: memberKey(m, i), text: src.slice(m.start, m.end), start: m.start - bs, end: m.end - bs }))
+    return { sig: src.slice(0, n.body.start), open: '{', close: src.slice(be), body: src.slice(bs, be), units, join: '\n\n  ', spliceable: true }
+  }
+  // `const x = { ... }` / `const x = () => { ... }` / `const x = function () { ... }`
+  // and the CommonJS twins `module.exports = function () { ... }` / `x.y = { ... }` —
+  // without descending into assignments, two sides editing DIFFERENT lines of one
+  // exported function read as a same-declaration conflict (census overcount on axios).
+  let init = null
+  if (n.type === 'VariableDeclaration' && n.declarations.length === 1 && n.declarations[0].init) init = n.declarations[0].init
+  else if (n.type === 'ExpressionStatement' && n.expression.type === 'AssignmentExpression') init = n.expression.right
+  if (init) {
+    if (init.type === 'ObjectExpression') {
+      const sig = src.slice(0, init.start)
+      const units = init.properties.map((p, i) => ({ key: propKey(p, i), text: src.slice(p.start, p.end) }))
+      return { sig, units, open: '{\n  ', join: ',\n  ', close: '\n}' }
+    }
+    if ((init.type === 'ArrowFunctionExpression' || init.type === 'FunctionExpression') && init.body && init.body.type === 'BlockStatement') {
+      const bs = init.body.start + 1, be = init.body.end - 1
+      const ks = keyStatements(init.body.body)
+      const units = init.body.body.map((s, i) => ({ key: ks[i], text: src.slice(s.start, s.end), start: s.start - bs, end: s.end - bs }))
+      return { sig: src.slice(0, init.body.start), open: '{', close: src.slice(be), body: src.slice(bs, be), units, join: '\n  ', spliceable: true }
+    }
+  }
+  return null
+}
+
+// Stable key for an object-literal property, so two agents adding DIFFERENT keys union.
+function propKey(p, i) {
+  if (p.type === 'SpreadElement') return 'spread:' + i
+  if (p.key && p.key.type === 'Identifier' && !p.computed) return 'prop:' + p.key.name
+  if (p.key && p.key.type === 'Literal') return 'prop:' + String(p.key.value)
+  return 'prop:' + i
+}
+
+// Does `src` parse either as top-level code OR as a class member? (The inner-merge result
+// for a method is a fragment that's only valid inside a class — this lets us validate it.)
+function parsesUnit(src) {
+  if (parses(src)) return true
+  try { parse(MEMBER_WRAP + src + '}'); return true } catch { return false }
+}
+
+// TOKEN STREAM: lex `src` into a flat list of { start, end, k } where k is the token's
+// source text -- the atom the engine's token-level inner merge diffs on. This is what lets
+// ICR merge two edits INSIDE one statement (e.g. `foo(1, 2)` -- one side edits `1`, the
+// other `2`) the way a tree-sitter merge does, instead of conflicting on the whole line.
+// Lexing (not parsing) so it also works on fragments (`return x`, a class-member body).
+// Comments are NOT tokens -- they live in the gaps between tokens and are carried verbatim
+// by the base text, so a comment-only edit is a no-op here (the documented comment limit).
+// Returns null if the fragment can't be lexed -> the engine treats it as a conflict.
+function tokenize(src) {
+  const out = []
+  try {
+    const tz = acorn.tokenizer(src, { ecmaVersion: 'latest' })
+    for (;;) {
+      const t = tz.getToken()
+      if (t.type === acorn.tokTypes.eof) break
+      out.push({ start: t.start, end: t.end, k: src.slice(t.start, t.end) })
+    }
+  } catch { return null }
+  return out
+}
+
+// The provider contract every ICR language module implements.
+export const javascript = {
+  id: 'javascript',
+  exts: ['.js', '.mjs', '.cjs'],
+  parses,
+  units,
+  declaredNames,
+  usedIdentifiers,      // approximate (kept for reference)
+  referencedFreeNames,  // scope-aware — what the engine prefers for the dangling check
+  declBody,
+  isAsyncDecl,
+  upgradeCallSitesToAwait,
+  stackedAwaits,        // spans of `await await` a CRDT union left (P0-5-3)
+  syncCallSitesOf,
+  renameRefs,           // rewrites every matching identifier (kept for reference)
+  renameFreeRefs,       // scope-aware — only rewrites references that resolve to the binding
+  splitUnit,            // finer granularity: split a function/class/method into keyed inner units
+  parsesUnit,           // validity oracle that also accepts a class-member fragment
+  mergeUnit,            // language-specific same-key merge (import specifier union)
+  tokenize,             // finest granularity: token stream for the token-level inner merge
+}