chore: re-merge main, update timestamp — barrel conflicts resolved (PR is superset of main)

github-actions[bot] · Copilot · web-flow · commit 04d8fa707dbc · 2026-04-09T19:48:13.000Z
All merge conflicts were in barrel index files. In each case the PR branch
already contained all of main's additions plus additional feature exports,
so the PR version was kept. This commit updates the merge timestamp to
indicate main has been re-incorporated.

Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/src/index.ts b/src/index.ts
@@ -3,7 +3,7 @@
  *
  * @packageDocumentation
  */
-// merged: 2026-04-09T18:38Z (main merged in, barrel-export conflicts resolved)
+// merged: 2026-04-09T19:37Z (re-merge main into PR branch, barrel-export conflicts resolved by keeping PR superset)
 
 // Core exports will be added here as features are implemented.
 // Each module is imported and re-exported from its feature file in src/.

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* @packageDocumentation`
`5`	`5`	`*/`
`6`		`-// merged: 2026-04-09T18:38Z (main merged in, barrel-export conflicts resolved)`
	`6`	`+// merged: 2026-04-09T19:37Z (re-merge main into PR branch, barrel-export conflicts resolved by keeping PR superset)`
`7`	`7`
`8`	`8`	`// Core exports will be added here as features are implemented.`
`9`	`9`	`// Each module is imported and re-exported from its feature file in src/.`