Second main -> main-aptos sync (supersedes PR #2696's conflicting
main-head merge). Conflict resolutions:
- repo-manager.ts: INCREMENTAL_SCHEMA_VERSION unified to 16. Both
lineages had independently allocated 12-15 (aptos: Move attributesJson,
Type/EnumVariant persistence; main: Rust range-binding, Java local
types, C#/Kotlin ownership gate, const-arrow twin removal), so any
stamp in that range is cross-lineage ambiguous and fails the reuse gate.
- call-summary-schema-version.test.ts: gate test pins 16; 11-15 all fail.
- types/pipeline.ts, run-analyze.ts: additive union (standaloneIngest +
ingestWarnings from aptos, graphEmitManifest + ftsSkipReason from main).
- parse.ts: main's streamed-emit begin + allPathSet threading woven with
aptos's standalone-ingest file exclusion; allPathSet is rebuilt when
ingested files are filtered so the set stays consistent with allPaths.
- process-processor.ts: main's field-wise relationship scan (#2680)
inside aptos's single-pass buildCallsAdjacency; aptos's explicit
entry-point collection kept; main's separate builders dropped.
- local-backend.ts: aptos Move row interfaces + main staleness helpers.
- run-analyze-fts-repair.test.ts: main's #2658 M1 abort test mock gains
the standaloneIngest field the aptos pipeline contract requires.
Validation: tsc clean; emit-persistence and scope-capture fingerprint
checks pass; targeted unit suites green (the M1 abort test needs
GITNEXUS_ATOMIC_WINDOWS_SWAP=1 locally on Windows; passes under CI's
posix swap). ADAPTIVE_POOL_FLOOR stays 512 MiB.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
