@neocompose/cli 0.89.11 → 0.89.12

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.89.12
+
+### Patch Changes
+
+- 6dc08d2: Preserve lexical value bindings and non-null narrowing when capturing variables in delegates, including nested closures and variables named after a class.
+
+  Validate simple member reads in declaration defaults, including missing members, nullable receivers, and inaccessible static members.
+
+  Rename interface members together with their implementations and overrides, preserving unrelated overloads.
+
+  Complete delegate parameters inside tuples and named constructor overloads, and restore member completion in switch guards.
+
+- 444e57d: Keep generated child-override generic bindings in local exports when candidate preparation reuses a mutable source baseline.
+
+  Clone owned tuple elements with fresh identities so modifying a copied child does not change the original.
+
 ## 0.89.11
 
 ### Patch Changes

package/dist/neo-runtime.mjs

@@ -19377,7 +19377,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.89.11",
+      cliVersion: "0.89.12",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -54884,11 +54884,13 @@ function cloneClassValueGraph(receiver, expected, ctx) {
         );
         clonedRecord[key] = clonedChild.id;
       }
-    } else if (Array.isArray(sourceRow.value) && (isMemberEntryCollectionBase(sourceMember) || sourceTypeInfo?.type === 6 /* List */ || sourceTypeInfo?.type === 28 /* Set */)) {
+    } else if (Array.isArray(sourceRow.value) && (isMemberEntryCollectionBase(sourceMember) || isMemberTupleBase(sourceMember) || sourceTypeInfo?.type === 30 /* Tuple */ || sourceTypeInfo?.type === 6 /* List */ || sourceTypeInfo?.type === 28 /* Set */)) {
       const entryMember = isMemberEntryCollectionBase(sourceMember) ? evalMemberById(ctx.vm, sourceMember.entryMemberId) : null;
       const entryTypeInfo = sourceTypeInfo?.type === 6 /* List */ || sourceTypeInfo?.type === 28 /* Set */ ? sourceTypeInfo.entryTypeInfo : void 0;
-      if (entryMember !== null || entryTypeInfo !== void 0) {
-        clone.value = sourceRow.value.map((childId) => {
+      const tuple = isMemberTupleBase(sourceMember) ? sourceMember : null;
+      const tupleType = sourceTypeInfo?.type === 30 /* Tuple */ ? sourceTypeInfo : null;
+      if (entryMember !== null || entryTypeInfo !== void 0 || tuple !== null || tupleType !== null) {
+        clone.value = sourceRow.value.map((childId, index) => {
           if (typeof childId !== "string") return childId;
           const child2 = evalValueById(
             ctx,
@@ -54897,11 +54899,17 @@ function cloneClassValueGraph(receiver, expected, ctx) {
             ctx.__valueOverlay
           );
           if (child2 === null) return childId;
+          const elementMember = tuple === null ? entryMember : evalMemberById(ctx.vm, tuple.elementMemberIds[index]);
+          const elementType = tupleType === null ? entryTypeInfo : tupleType.elements[index]?.typeInfo;
+          if (elementMember === null && elementType === void 0)
+            throw new NSGetterRuntimeError(
+              `Class.Clone tuple element ${index} has no type descriptor.`
+            );
           return cloneRow2(
             child2,
-            entryMember,
+            elementMember,
             child2.containerId === sourceRow.id ? id2 : void 0,
-            entryTypeInfo
+            elementType
           ).id;
         });
         ctx.onUnattributableValueRead?.(containerEntriesRead(sourceRow.id));
@@ -75264,9 +75272,10 @@ var init_strict_resolver = __esm({
         if (outerEntry === null) return null;
         const existing = context.byOuterEntry.get(outerEntry);
         if (existing !== void 0) return existing;
+        const capturedType = context.outerScope.lookupNarrowedType(name, outerEntry) ?? outerEntry.type;
         const parameter4 = variable(
           `__capture_${context.serial}_${context.captures.length}__`,
-          outerEntry.type,
+          capturedType,
           void 0,
           this.project
         );
@@ -75274,7 +75283,7 @@ var init_strict_resolver = __esm({
           ...scopeVariable(
             name,
             parameter4,
-            outerEntry.type,
+            capturedType,
             "local" /* Local */,
             "local" /* Local */,
             outerEntry.writeRoot,
@@ -83014,7 +83023,9 @@ var init_strict_resolver = __esm({
         return literal(symbol.type, null);
       }
       hasValueReceiver(name, scope) {
-        return scope.lookup(name) !== null || this.implicitMember(name) !== null;
+        return scope.lookup(name) !== null || this.delegateCaptureContexts.some(
+          (context) => context.outerScope.lookup(name) !== null
+        ) || this.implicitMember(name) !== null;
       }
       implicitMember(name) {
         if (this.context.implicitMemberAccess !== true) return null;
@@ -99500,7 +99511,8 @@ function validateExpression(expression, expected, scope, environment, uri, range
   const sourceOnly = expected !== void 0 && (isNeoVariantTypeName(expected.name) || expected.name === "NeoAction" || expected.name === "ImageRef");
   let receiver = expression;
   while (receiver.kind === "member") receiver = receiver.receiver;
-  const computed = (environment.checkComputedInitializers || expected?.name === "NeoDelegate") && !sourceOnly && (expression.kind === "member" && (receiver.kind !== "ident" || receiver.typeQualifier !== void 0) || [
+  const executableMember = expression.kind === "member" && (receiver.kind !== "ident" || receiver.typeQualifier !== void 0);
+  const computed = (environment.checkComputedInitializers || expected?.name === "NeoDelegate") && !sourceOnly && (executableMember || expression.kind === "member" && expected?.name !== "NeoDelegate" || [
     "binary",
     "unary",
     "force",
@@ -99549,14 +99561,13 @@ function validateExpression(expression, expected, scope, environment, uri, range
       void 0,
       { allowPendingRegistryEntries: true }
     );
-    scopedResolver.validateInitializerExpression(
-      expression,
-      expected === void 0 ? void 0 : resolveNeoScriptType(
-        semanticAst(expected, expression.pos),
-        context,
-        environment.projectIndex
-      )
+    const storedMember = storedValue && expression.kind === "member" && !executableMember;
+    const expectedType = expected === void 0 || storedMember ? void 0 : resolveNeoScriptType(
+      semanticAst(expected, expression.pos),
+      context,
+      environment.projectIndex
     );
+    scopedResolver.validateInitializerExpression(expression, expectedType);
   } catch (error) {
     if (!(error instanceof CompileError)) throw error;
     pushDiagnostic(
@@ -104061,6 +104072,7 @@ function validateProjectSourceTypes(documents) {
   validateSetSpelling(documents, environment.typeKinds, diagnostics);
   return {
     diagnostics,
+    memberRelations: environment.memberRelations,
     overloadImplementations: overloadImplementations(environment)
   };
 }
@@ -104137,6 +104149,7 @@ function createEnvironment2(documents) {
   }
   return {
     declarations,
+    memberRelations: [],
     classes,
     interfaces,
     memberOwners,
@@ -105317,11 +105330,12 @@ function validateMembers(environment, diagnostics) {
 }
 function validateInterfaceMemberConflicts(ref, environment, diagnostics) {
   const inherited = /* @__PURE__ */ new Map();
+  const substitution = identitySubstitution(ref);
   for (const base of ref.declaration.baseTypes) {
     const target = environment.interfaces.get(base.name);
     if (!target) continue;
     for (const candidate of interfaceMembers(
-      { owner: target, substitution: /* @__PURE__ */ new Map() },
+      interfaceView(base, target, substitution),
       environment
     )) {
       const key = candidate.member.name.toLowerCase();
@@ -105338,6 +105352,10 @@ function validateInterfaceMemberConflicts(ref, environment, diagnostics) {
         "interface-inherited",
         environment
       ) === null) {
+        environment.memberRelations.push([
+          interfaceMemberLocation(prior),
+          interfaceMemberLocation(candidate)
+        ]);
         continue;
       }
       diagnose(
@@ -105359,7 +105377,6 @@ function validateInterfaceMemberConflicts(ref, environment, diagnostics) {
       );
     }
   }
-  const substitution = identitySubstitution(ref);
   for (const member of ref.declaration.members) {
     const prior = inherited.get(member.name.toLowerCase());
     if (!prior) continue;
@@ -105368,12 +105385,18 @@ function validateInterfaceMemberConflicts(ref, environment, diagnostics) {
     }
     const mismatch = memberCompatibility(
       member,
-      /* @__PURE__ */ new Map(),
+      substitution,
       prior,
       "interface-inherited",
       environment
     );
-    if (!mismatch) continue;
+    if (!mismatch) {
+      environment.memberRelations.push([
+        interfaceMemberLocation(prior),
+        { uri: ref.uri, range: member.nameRange }
+      ]);
+      continue;
+    }
     diagnose(
       diagnostics,
       ref.uri,
@@ -105405,7 +105428,13 @@ function validateAbstractInterfaceMembers(ref, environment, diagnostics) {
       "interface-contract",
       environment
     );
-    if (!mismatch) continue;
+    if (!mismatch) {
+      environment.memberRelations.push([
+        interfaceMemberLocation(contract),
+        memberLocation(implementation)
+      ]);
+      continue;
+    }
     diagnose(
       diagnostics,
       ref.uri,
@@ -106447,6 +106476,10 @@ function validateConcreteClass(ref, environment, diagnostics) {
       environment
     ) : null;
     if (implementation && !implementation.member.modifiers.includes("abstract") && !implementation.member.modifiers.includes("static") && mismatch === null) {
+      environment.memberRelations.push([
+        interfaceMemberLocation(required2),
+        memberLocation(implementation)
+      ]);
       continue;
     }
     diagnose(
@@ -107561,6 +107594,7 @@ function analyzeNeoProjectSources(inputs, parsedDocuments = /* @__PURE__ */ new
     compiledBodies: bodyCompilation.bodies,
     bodyContexts: bodyCompilation.contexts,
     overloadImplementations: typeValidation.overloadImplementations,
+    memberRelations: typeValidation.memberRelations,
     diagnostics
   };
 }
@@ -149329,9 +149363,8 @@ function materializeVariantChildOverrideBindingMembers(args) {
         classId
       );
       args.serverMintedBindingMemberIds?.add(member.id);
-      if (isFrozenJsonData(args.document.members))
-        args.document.members = [...args.document.members, member];
-      else args.document.members.push(member);
+      if (minted.size === 0) args.document.members = [...args.document.members];
+      args.document.members.push(member);
       args.prepared.push({
         recordKind: "member",
         recordId: member.id,
@@ -149354,6 +149387,7 @@ function materializeStaticSeedBindingMembers(args) {
   if (ids.size !== bindings.length) {
     throw new Error("Schema commit contains duplicate generic binding seeds.");
   }
+  if (bindings.length > 0) args.document.members = [...args.document.members];
   for (const binding of bindings) {
     const expectedBindingId = worldAnimationChildOverrideBindingMemberId(
       binding.classId
@@ -149378,9 +149412,7 @@ function materializeStaticSeedBindingMembers(args) {
       binding.classId
     );
     args.serverMintedBindingMemberIds?.add(member.id);
-    if (isFrozenJsonData(args.document.members))
-      args.document.members = [...args.document.members, member];
-    else args.document.members.push(member);
+    args.document.members.push(member);
     args.prepared.push({
       recordKind: "member",
       recordId: member.id,
@@ -151663,7 +151695,6 @@ var init_project_version_schema_commit = __esm({
   "../src/database/project-version-schema-commit.ts"() {
     "use strict";
     init_members();
-    init_immutable_json2();
     init_commit_preparation_pass_cache();
     init_compiled_construction_types();
     init_member_kinds();
@@ -189603,7 +189634,7 @@ function scriptFeatureIndex(snapshot) {
     typeAnnotations,
     tokens,
     tokenIndexes,
-    enclosingOpener: enclosingOpenerIndex(tokens),
+    enclosingOpener: receiverEnclosingOpeners(tokens),
     objectInitializers
   };
   SCRIPT_FEATURE_INDEX.set(snapshot, index);
@@ -192574,7 +192605,7 @@ function flowProbe(snapshot) {
   const tokens = scriptFeatureIndex(snapshot).tokens;
   const overloaded = overloadedFunctionNames(snapshot.project);
   if (!tokens.some(
-    (token) => token.text === "is" || token.text === "switch" || overloaded.has(token.text)
+    (token) => token.text === "is" || token.text === "=>" || token.text === "switch" || overloaded.has(token.text)
   ) && !hasGenericCall(snapshot))
     return result;
   const text = snapshot.source.text;
@@ -193921,6 +193952,8 @@ function expressionTokensBefore(tokens, endExclusive) {
       start = name;
       continue;
     }
+    if (depth === 0 && token.text === "when" && start < endExclusive - 1 && ![".", "?.", "!", "[", "<"].includes(tokens[start + 1]?.text ?? "") && followsSwitchPattern(tokens, start))
+      break;
     if (depth === 0 && (token.kind === "punctuation" && [";", "{", "}", ",", ":", "?"].includes(token.text) || // Only `?.` and `!` continue a receiver; every other operator
     // (`+=`, `==`, `<`, …) ends it.
     token.kind === "operator" && token.text !== "?." && token.text !== "!" || token.kind === "keyword" && ["return", "throw", "if", "else"].includes(token.text))) {
@@ -193929,6 +193962,24 @@ function expressionTokensBefore(tokens, endExclusive) {
   }
   return tokens.slice(start + 1, endExclusive);
 }
+function receiverEnclosingOpeners(tokens) {
+  let index = RECEIVER_ENCLOSING_OPENERS.get(tokens);
+  if (!index) {
+    index = enclosingOpenerIndex(tokens);
+    RECEIVER_ENCLOSING_OPENERS.set(tokens, index);
+  }
+  return index;
+}
+function followsSwitchPattern(tokens, index) {
+  const opener = receiverEnclosingOpeners(tokens)[index] ?? -1;
+  if (tokens[opener]?.text !== "{" || tokens[opener - 1]?.text !== "switch")
+    return false;
+  const previous = tokens[index - 1];
+  if (!previous) return false;
+  if (previous.text === "when")
+    return ["{", ","].includes(tokens[index - 2]?.text ?? "");
+  return previous.kind === "identifier" || previous.kind === "integer" || previous.kind === "float" || previous.kind === "type" || previous.kind === "string" || [")", "]", ">", "true", "false", "null"].includes(previous.text);
+}
 function genericCallNameIndex(tokens, close) {
   if (!["(", ".", "{"].includes(tokens[close + 1]?.text ?? "")) return -1;
   let depth = 0;
@@ -194082,7 +194133,7 @@ function isTypeAnnotationReference(snapshot, reference2) {
 function isConstructorTypeReference(snapshot, reference2) {
   return scriptFeatureIndex(snapshot).calls.get(reference2.start)?.kind === "constructor";
 }
-var SCRIPT_FEATURE_INDEX, assumedLambdaInputs, LIST_OPENERS, LIST_CLOSERS, TUPLE_LABEL_DECLARATIONS, NAMED_ARGUMENT_LABELS, NO_EXPECTED_VALUE, CONSTRUCTIONS, ANNOTATION_TYPE_NAMES, FLOW_PROBES, PATTERN_DECLARATIONS, OVERLOADED_FUNCTION_NAMES, GENERIC_CALL_NAMES, LOCAL_SCOPE_INDEX, NAMED_ITEM_INDEX, COLLECTION_FUNCTION_DOCUMENTATION, LOCAL_SYMBOL_CACHE, CALL_COMMIT_CHARACTERS, GENERIC_CALL_COMMIT_CHARACTERS, SETTER_VALUE_ID_SUFFIX, LAMBDA_BODY_INDEX;
+var SCRIPT_FEATURE_INDEX, assumedLambdaInputs, LIST_OPENERS, LIST_CLOSERS, TUPLE_LABEL_DECLARATIONS, NAMED_ARGUMENT_LABELS, NO_EXPECTED_VALUE, CONSTRUCTIONS, ANNOTATION_TYPE_NAMES, FLOW_PROBES, PATTERN_DECLARATIONS, OVERLOADED_FUNCTION_NAMES, GENERIC_CALL_NAMES, LOCAL_SCOPE_INDEX, NAMED_ITEM_INDEX, COLLECTION_FUNCTION_DOCUMENTATION, LOCAL_SYMBOL_CACHE, CALL_COMMIT_CHARACTERS, GENERIC_CALL_COMMIT_CHARACTERS, SETTER_VALUE_ID_SUFFIX, RECEIVER_ENCLOSING_OPENERS, LAMBDA_BODY_INDEX;
 var init_analyzer = __esm({
   "../packages/neoscript-language/src/analyzer.ts"() {
     "use strict";
@@ -194162,6 +194213,7 @@ var init_analyzer = __esm({
     CALL_COMMIT_CHARACTERS = ["("];
     GENERIC_CALL_COMMIT_CHARACTERS = ["<", "("];
     SETTER_VALUE_ID_SUFFIX = ":setter-value";
+    RECEIVER_ENCLOSING_OPENERS = /* @__PURE__ */ new WeakMap();
     LAMBDA_BODY_INDEX = /* @__PURE__ */ new WeakMap();
   }
 });
@@ -199770,19 +199822,22 @@ function projectReferenceFamily(analysis, target, index = buildProjectSymbolInde
   }
   if (target.kind !== "member" || !target.ownerName) return [target];
   const classes = /* @__PURE__ */ new Map();
-  for (const document of analysis.documents.values()) {
+  const declarations = /* @__PURE__ */ new Map();
+  for (const [uri, document] of analysis.documents) {
     for (const declaration of document.declarations) {
-      if (declaration.kind === "class")
-        classes.set(declaration.name, declaration);
+      if (declaration.kind !== "class") continue;
+      classes.set(declaration.name, declaration);
+      for (const member of declaration.members)
+        declarations.set(locationKey3({ uri, range: member.nameRange }), member);
     }
   }
   const joins = (member) => target.callable !== true || member?.kind === "function" && member.modifiers.some((modifier) => DISPATCH_MODIFIERS2.has(modifier));
-  const declared = (symbol) => classes.get(symbol.ownerName ?? "")?.members.find(
-    (member) => member.name === symbol.name && member.nameRange.start.line === symbol.location.range.start.line && member.nameRange.start.character === symbol.location.range.start.character
+  const declared = (symbol) => declarations.get(locationKey3(symbol.location));
+  const members2 = analysis.symbols.filter(
+    (symbol) => symbol.kind === "member" && symbol.name.toLowerCase() === target.name.toLowerCase()
   );
-  if (!joins(declared(target))) return [target];
   const symbols = new Map(
-    named.filter((symbol) => symbol.kind === "member" && joins(declared(symbol))).map((symbol) => [symbol.ownerName, symbol])
+    members2.filter((symbol) => symbol.kind === "member" && joins(declared(symbol))).map((symbol) => [symbol.ownerName, symbol])
   );
   const roots = /* @__PURE__ */ new Map();
   const root = (name) => {
@@ -199790,9 +199845,7 @@ function projectReferenceFamily(analysis, target, index = buildProjectSymbolInde
     roots.set(name, null);
     const declaration = classes.get(name);
     const own = symbols.get(name);
-    const member = declaration?.members.find(
-      (candidate) => candidate.name === target.name && joins(candidate)
-    );
+    const member = own ? declared(own) : void 0;
     if (own && !member?.modifiers.includes("override")) {
       roots.set(name, own);
       return own;
@@ -199802,11 +199855,43 @@ function projectReferenceFamily(analysis, target, index = buildProjectSymbolInde
     roots.set(name, resolved);
     return resolved;
   };
-  const selected = root(target.ownerName);
-  if (!selected) return [target];
-  return [...symbols.values()].filter(
-    (symbol) => symbol.ownerName && root(symbol.ownerName) === selected
+  const byLocation = new Map(
+    members2.map((symbol) => [locationKey3(symbol.location), symbol])
   );
+  const edges = /* @__PURE__ */ new Map();
+  const connect = (a, b) => {
+    const left = locationKey3(a);
+    const right = locationKey3(b);
+    if (!byLocation.has(left) || !byLocation.has(right)) return;
+    const add = (from, to) => {
+      let values = edges.get(from);
+      if (!values) edges.set(from, values = /* @__PURE__ */ new Set());
+      values.add(to);
+    };
+    add(left, right);
+    add(right, left);
+  };
+  for (const symbol of symbols.values()) {
+    const selected = symbol.ownerName ? root(symbol.ownerName) : null;
+    if (selected) connect(symbol.location, selected.location);
+  }
+  for (const [contract, implementation] of analysis.memberRelations)
+    connect(contract, implementation);
+  const visited = /* @__PURE__ */ new Set();
+  const pending = [locationKey3(target.location)];
+  const family = [];
+  while (pending.length > 0) {
+    const key = pending.pop();
+    if (visited.has(key)) continue;
+    visited.add(key);
+    const symbol = byLocation.get(key);
+    if (symbol) family.push(symbol);
+    for (const next of edges.get(key) ?? []) pending.push(next);
+  }
+  return family.length > 0 ? family : [target];
+}
+function locationKey3(location3) {
+  return `${location3.uri}:${location3.range.start.line}:${location3.range.start.character}`;
 }
 var DISPATCH_MODIFIERS2;
 var init_project_source_reference_family = __esm({
@@ -200069,7 +200154,7 @@ function sameLocationInList(target, locations) {
     (location3) => location3.uri === target.uri && location3.range.start.line === target.range.start.line && location3.range.start.character === target.range.start.character
   );
 }
-function locationKey3(location3) {
+function locationKey4(location3) {
   const { start, end } = location3.range;
   return JSON.stringify([
     location3.uri,
@@ -200636,8 +200721,9 @@ var init_service = __esm({
         if (!resolved) return [];
         const declaration = resolved.symbol;
         const family = projectReferenceFamily(analysis, declaration, index);
+        const familyNames = new Set(family.map((member) => member.name));
         const familyLocations = new Set(
-          family.map((member) => locationKey3(member.location))
+          family.map((member) => locationKey4(member.location))
         );
         const familyIds = new Set(
           family.flatMap((member) => member.id === null ? [] : [member.id])
@@ -200652,7 +200738,7 @@ var init_service = __esm({
           for (let tokenIndex = 0; tokenIndex < tokens.length; tokenIndex++) {
             const candidate = tokens[tokenIndex];
             if (!isProjectNameToken(candidate)) continue;
-            const matches = parameterName === null ? candidate.text === token.text : candidate.text === declaration.name || candidate.text.toLowerCase() === parameterName && isNamedArgumentLabel(tokens, tokenIndex);
+            const matches = parameterName === null ? familyNames.has(candidate.text) : candidate.text === declaration.name || candidate.text.toLowerCase() === parameterName && isNamedArgumentLabel(tokens, tokenIndex);
             if (!matches) continue;
             const candidateSymbol = projectSymbolAt(
               analysis,
@@ -200660,11 +200746,11 @@ var init_service = __esm({
               candidate.range.start,
               index
             )?.symbol;
-            if (!candidateSymbol || !familyLocations.has(locationKey3(candidateSymbol.location))) {
+            if (!candidateSymbol || !familyLocations.has(locationKey4(candidateSymbol.location))) {
               continue;
             }
             const location3 = { uri: state.document.uri, range: candidate.range };
-            if (!includeDeclaration && familyLocations.has(locationKey3(location3))) {
+            if (!includeDeclaration && familyLocations.has(locationKey4(location3))) {
               continue;
             }
             locations.push(location3);
@@ -200675,11 +200761,11 @@ var init_service = __esm({
           if (isProjectDocument(state.document, state.context)) continue;
           const snapshot = this.scriptSnapshot(state);
           for (const candidate of snapshot.parsed.references) {
-            if (candidate.name !== declaration.name) continue;
+            if (!familyNames.has(candidate.name)) continue;
             const symbolId = resolveReferenceSymbolId(snapshot, candidate);
             if (symbolId === null) continue;
             const matches = familyIds.has(symbolId) || definition(snapshot, candidate.range.start).some(
-              (location3) => familyLocations.has(locationKey3(location3))
+              (location3) => familyLocations.has(locationKey4(location3))
             );
             if (!matches) continue;
             locations.push({ uri: state.document.uri, range: candidate.range });
@@ -200687,7 +200773,7 @@ var init_service = __esm({
           if (declaration.kind !== "parameter") continue;
           for (const label of namedArgumentLabels(snapshot)) {
             const parameter4 = label.parameter.selectionLocation;
-            if (parameter4 && familyLocations.has(locationKey3(parameter4)))
+            if (parameter4 && familyLocations.has(locationKey4(parameter4)))
               locations.push({ uri: state.document.uri, range: label.range });
           }
         }
@@ -243072,7 +243158,7 @@ var releaseWorkspaceLock = () => void 0;
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.89.11");
+    console.log("0.89.12");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/dist/test-worker.mjs

@@ -41035,11 +41035,13 @@ function cloneClassValueGraph(receiver, expected, ctx) {
         );
         clonedRecord[key] = clonedChild.id;
       }
-    } else if (Array.isArray(sourceRow.value) && (isMemberEntryCollectionBase(sourceMember) || sourceTypeInfo?.type === 6 /* List */ || sourceTypeInfo?.type === 28 /* Set */)) {
+    } else if (Array.isArray(sourceRow.value) && (isMemberEntryCollectionBase(sourceMember) || isMemberTupleBase(sourceMember) || sourceTypeInfo?.type === 30 /* Tuple */ || sourceTypeInfo?.type === 6 /* List */ || sourceTypeInfo?.type === 28 /* Set */)) {
       const entryMember = isMemberEntryCollectionBase(sourceMember) ? evalMemberById(ctx.vm, sourceMember.entryMemberId) : null;
       const entryTypeInfo = sourceTypeInfo?.type === 6 /* List */ || sourceTypeInfo?.type === 28 /* Set */ ? sourceTypeInfo.entryTypeInfo : void 0;
-      if (entryMember !== null || entryTypeInfo !== void 0) {
-        clone.value = sourceRow.value.map((childId) => {
+      const tuple = isMemberTupleBase(sourceMember) ? sourceMember : null;
+      const tupleType = sourceTypeInfo?.type === 30 /* Tuple */ ? sourceTypeInfo : null;
+      if (entryMember !== null || entryTypeInfo !== void 0 || tuple !== null || tupleType !== null) {
+        clone.value = sourceRow.value.map((childId, index) => {
           if (typeof childId !== "string") return childId;
           const child = evalValueById(
             ctx,
@@ -41048,11 +41050,17 @@ function cloneClassValueGraph(receiver, expected, ctx) {
             ctx.__valueOverlay
           );
           if (child === null) return childId;
+          const elementMember = tuple === null ? entryMember : evalMemberById(ctx.vm, tuple.elementMemberIds[index]);
+          const elementType = tupleType === null ? entryTypeInfo : tupleType.elements[index]?.typeInfo;
+          if (elementMember === null && elementType === void 0)
+            throw new NSGetterRuntimeError(
+              `Class.Clone tuple element ${index} has no type descriptor.`
+            );
           return cloneRow2(
             child,
-            entryMember,
+            elementMember,
             child.containerId === sourceRow.id ? id : void 0,
-            entryTypeInfo
+            elementType
           ).id;
         });
         ctx.onUnattributableValueRead?.(containerEntriesRead(sourceRow.id));
@@ -59025,9 +59033,10 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
     if (outerEntry === null) return null;
     const existing = context.byOuterEntry.get(outerEntry);
     if (existing !== void 0) return existing;
+    const capturedType = context.outerScope.lookupNarrowedType(name, outerEntry) ?? outerEntry.type;
     const parameter3 = variable(
       `__capture_${context.serial}_${context.captures.length}__`,
-      outerEntry.type,
+      capturedType,
       void 0,
       this.project
     );
@@ -59035,7 +59044,7 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
       ...scopeVariable(
         name,
         parameter3,
-        outerEntry.type,
+        capturedType,
         "local" /* Local */,
         "local" /* Local */,
         outerEntry.writeRoot,
@@ -66775,7 +66784,9 @@ var StrictNeoScriptResolver = class _StrictNeoScriptResolver {
     return literal(symbol.type, null);
   }
   hasValueReceiver(name, scope) {
-    return scope.lookup(name) !== null || this.implicitMember(name) !== null;
+    return scope.lookup(name) !== null || this.delegateCaptureContexts.some(
+      (context) => context.outerScope.lookup(name) !== null
+    ) || this.implicitMember(name) !== null;
   }
   implicitMember(name) {
     if (this.context.implicitMemberAccess !== true) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.89.11",
+  "version": "0.89.12",
   "description": "Neo Compose native project-source CLI with bidirectional sync.",
   "license": "MIT",
   "type": "module",

package/skills/neocompose-cli/SKILL.md

@@ -9,7 +9,7 @@ description: >-
   `@neocompose/cli` or `node cli/bin/neo.mjs` in the neo-compose repository.
 ---
 
-<!-- reviewed-through-cli: 0.89.11 -->
+<!-- reviewed-through-cli: 0.89.12 -->
 
 # Neo Compose CLI
 

package/skills/neocompose-cli/references/cli-development.md

@@ -143,7 +143,7 @@ The marker near the top of `SKILL.md` must exactly match the package version,
 and this quoted copy is checked too:
 
 ```html
-<!-- reviewed-through-cli: 0.89.11 -->
+<!-- reviewed-through-cli: 0.89.12 -->
 ```
 
 Keep this skill on current behavior. Upgrade steps, rollout prerequisites,

package/skills/neocompose-cli/references/declarations/declarations.md

@@ -43,6 +43,9 @@ Generic bindings and their nested collection descriptors follow the owning
 declaration's identity. Deleting and recreating an idless declaration creates
 fresh bindings; retaining its pulled IDs preserves them.
 
+Editor rename follows an interface member through its compatible implementations
+and overrides. Unrelated members and overloads keep their names.
+
 ## Modifiers
 
 `public`, `protected`, `private`, `static`, `virtual`, `abstract`, `sealed`,

package/skills/neocompose-cli/references/declarations/initializers.md

@@ -36,6 +36,8 @@ indentation, using the project's configured spaces or tabs.
 The editor checks computed defaults with the same expression resolver as push.
 Unknown names, missing members, invalid type arguments, and expression type
 errors appear at the offending initializer expression, including nested defaults.
+This includes simple member reads such as `value.Name`: nullable receivers and
+private or protected access receive the same checks as executable bodies.
 
 A default that isn't a closed literal stores as a computed initializer and
 replays for omitted members in push, web, and SDK. A stored override stays

package/skills/neocompose-cli/references/neoscript/collections.md

@@ -149,3 +149,5 @@ computed properties and callable signatures for cursors; store `List<T>` data
 explicitly. Stored enumerable interface members accept authored class rows.
 Runtime sequences are shown as unenumerated and are not expanded for previews.
 `ToSet()` rejects enumerable/cursor interface elements.
+
+`Clone()` also copies owned class values inside tuples. References inside the copied graph keep their targets.

package/skills/neocompose-cli/references/neoscript/delegates-and-listeners.md

@@ -11,7 +11,12 @@ List<Item> ready = this.Items.Where((item) => item.Count > 0);
 ```
 
 - Lambdas may be returned, stored, or assigned to typed locals. They capture
-  surrounding locals and parameters by value when created.
+  surrounding locals and parameters by value when created. A non-null check
+  on a local remains valid inside its capture, even if the outer local is later
+  reassigned. This does not freeze mutable fields on captured objects.
+  A captured value can share a class name; member access uses the value.
+- Editor completion uses the delegate parameter type inside tuple values and
+  named constructor arguments, including overloaded constructors.
 - `(x) => x * 2` equals `(x) => { return x * 2; }`. In a void delegate the
   expression must call or assign. Parenthesize a dictionary-literal body:
   `() => ({ "a": 1 })`.

package/skills/neocompose-cli/references/world/variants.md

@@ -64,6 +64,10 @@ frame. For editing an existing clip, see [frame overrides](animation.md).
   as instance overrides, and `ToVariant(Base)` removes the applied layer.
 - On an object nested inside another instance's construction, `ToVariant`
   applies in place and records nothing.
+- Child overrides also answer omitted fields on children with their own
+  constructor recipes. The child keeps its identity and unanswered defaults.
+  Later instance writes remain pins until an answering variant transition clears
+  them. Structured partials change only the named components.
 - Selections compare equal when class, variant, and bound lookup row match.
   An unset optional selection differs from `Base`.