Repository navigation
Phase 10 Addendum AD01 / Task AD2: Integrate Advanced Upstream and Resolve Coexistence #202
Description
Planning authority:
- Objective: Merge the amended AD1-locked upstream commit into workbench
phase-10and produce one coherent result that preserves the complete approved upstream range and the already-approved CSAPI contribution. - Acceptance criteria advanced: P10-AD01-A1, P10-AD01-A2, P10-AD01-A3, P10-AD01-B1, P10-AD01-B2, P10-AD01-B3, P10-AD01-B4, P10-AD01-B5.
- Dependencies: AD1 completed without a stop condition.
- Complexity/risk: High; foundational workbench merge and three authored conflict resolutions.
- Locked decisions: Normal
--no-ffmerge; exact AD1 SHA; no whole-fileours/theirs; add onlyhasConnectedSystems?: booleanto upstream's capability interface; preserve dynamic imports and subpath boundary. - Expected work:
- verify the clean workbench state and the AD1 evidence immediately before mutation;
- merge exactly
a623911201218bc1e814a9f83c64f3a027031990; - resolve
app/api.data.jsby combining upstream property/static-method/constructor handling with Phase 10 per-entry-point import mapping and combined TypeDoc modules; - resolve
src/ogc-api/endpoint.tsby combining upstream capability/options types and documentation with the CSAPI getters, facade, errors, and dynamic imports; - resolve
src/ogc-api/info.tsusing upstream'sOgcApiCollectionCapabilitieswhile retaining CSAPI conformance and collection-link detection; - add
hasConnectedSystems?: booleantoOgcApiCollectionCapabilitiesinsrc/ogc-api/model.ts; - inspect the automatic
src/index.tsresult for all reviewed upstream and Phase 10 exports and the absence of CSAPI bulk root exports; - run focused type, endpoint/info test, documentation-generation/build, source-assertion, formatting, and diff checks;
- commit the merge and push
phase-10normally.
- Affected areas: Repository merge result, with authored resolution/adaptation limited to
app/api.data.js,src/ogc-api/endpoint.ts,src/ogc-api/info.ts, andsrc/ogc-api/model.ts; mandatory inspection ofsrc/index.ts. - Explicit exclusions: New API behavior, facade redesign, static CSAPI runtime imports, new exports beyond the one capability field, unrelated changes to the approved upstream range, broad formatting, live testing, delivery changes.
- Automated acceptance gate:
- ancestry check for the locked upstream SHA exits 0;
- no unmerged paths remain and actual conflicts equal the AD1 forecast;
- Node.js 24 typecheck exits 0;
- existing
info.spec.tsandendpoint.spec.tstests pass; npm run docs:apiandnpm run docs:buildexit 0;- source assertions confirm the capability field, dynamic imports, reviewed root exports, and root/subpath boundary;
- explicit formatting and
git diff --checkpass; - workbench Actions succeeds for the pushed merge; and
- the final authored resolution population contains no unexplained path.
- Deliverable: One pushed normal workbench merge commit containing the reviewed coexistence resolutions.
- Closing evidence: Merge SHA, upstream SHA, resolved/companion/inspected paths, focused gate totals and results, Actions URL, deviations or
none.
Activity
Sam-Bolling commentedon Aug 28, 2026
Entry stop condition reached before mutation.
At issue entry, fetch advanced canonical
upstream/mainfrom the AD1-locked00a8931c679fb9c5cd7c5e0f0f04a4b87a307b2dtoa623911201218bc1e814a9f83c64f3a027031990. This differs from #201's locked canonical-upstream disposition, so the approved Guide/Roadmap prohibit beginning the merge without project-owner reassessment.Read-only assessment:
app/index.md,src/index.ts,src/ogc-api/model.ts,src/shared/url-utils.ts, andsrc/stac/model.ts;app/api.data.js,src/ogc-api/endpoint.ts,src/ogc-api/info.ts);src/index.tsstill merges automatically;885056b9f795eda1536814a1afb887eb2c2934c0, equal toorigin/phase-10;Recommended disposition: explicitly advance the AD01 baseline to
a623911201218bc1e814a9f83c64f3a027031990, reopen/update AD1 evidence rather than create another issue or planning trio, then resume this issue after the amended lock is accepted.[-]Phase 10 Addendum AD01 / Task AD2: Integrate PR #171 and Resolve Coexistence[/-][+]Phase 10 Addendum AD01 / Task AD2: Integrate Advanced Upstream and Resolve Coexistence[/+]Sam-Bolling commentedon Aug 28, 2026
AD1 amendment is complete at
28ef8846c87c084a51be13c6e733997855765c06; baselinea623911201218bc1e814a9f83c64f3a027031990is locked, QA passed, and this issue is resuming under its amended description.Sam-Bolling commentedon Aug 28, 2026
Completed and accepted.
Merge commit:
4acedf4cb5a3e38fd3cb45195cbba0ec5fe40406Parents:
28ef8846c87c084a51be13c6e733997855765c06;a623911201218bc1e814a9f83c64f3a027031990.Resolution population:
app/api.data.js: retained upstream property/static-method/no-constructor handling and Phase 10 root/CSAPI module import-path mapping;src/ogc-api/endpoint.ts: retained upstream capability/options types and documentation plus CSAPI getters, facade, errors, and both dynamic imports;src/ogc-api/info.ts: adopted upstreamOgcApiCollectionCapabilitieswhile retaining CSAPI conformance and collection-link detection;src/ogc-api/model.ts: added only the authorizedhasConnectedSystems?: booleancompanion field;src/index.ts: automatic result inspected; all reviewed upstream exports andDateTimeParameterremain, with no bulk CSAPI root export.Gates:
app/api.data.js,src/index.ts,src/ogc-api/endpoint.ts,src/ogc-api/info.ts,src/ogc-api/model.ts);npm ci: PASS; 836 packages; inherited audit/install-script notices recorded, no remediation;core.autocrlf=trueinstead of its LF Git blob;npm run docs:api: PASS; 0 errors / 10 inherited warnings;npm run docs:build: PASS;/csapiimport path: PASS;./csapiexports: PASS;git diff --check: PASS;Final state:
phase-10is clean, synchronized withorigin/phase-10, and contains the amended locked upstream commit.Deviation from locked decision: none. Task AD3 (#203) is dependency-ready.