@bleedingdev/modern-js-create 3.4.0-ultramodern.9 → 3.5.0-ultramodern.1

package/dist/types/ultramodern-workspace/types.d.ts

@@ -1,4 +1,5 @@
 import type { ResolvedUltramodernPackageSource, UltramodernPackageSourceStrategy } from '../ultramodern-package-source';
+import type { UltramodernBridgeConfigInput } from './bridge-config';
 export type JsonValue = string | number | boolean | null | JsonValue[] | {
     [key: string]: JsonValue;
 };
@@ -18,11 +19,11 @@ export type WorkspaceApp = {
     port: number;
     mfName: string;
     exposes?: Record<string, string>;
-    effectApi?: WorkspaceEffectApi;
+    api?: WorkspaceApi;
     verticalRefs?: string[];
     ownership: Ownership;
 };
-export type WorkspaceEffectApi = {
+export type WorkspaceApi = {
     stem: string;
     prefix: string;
     consumedBy: string[];
@@ -78,6 +79,7 @@ export type UltramodernWorkspaceOptions = {
     modernVersion: string;
     enableTailwind?: boolean;
     overlays?: UltramodernCodeSmithOverlay[];
+    bridge?: UltramodernBridgeConfigInput;
     packageSource?: {
         strategy?: UltramodernPackageSourceStrategy;
         modernPackageVersion?: string;
@@ -111,7 +113,7 @@ export type UltramodernGeneratedAppDescriptor = {
     port: number;
     moduleFederationName: string;
     exposes?: Record<string, string>;
-    effectApiPrefix?: string;
+    apiPrefix?: string;
 };
 /**
  * Stable public warning shape for non-fatal generator decisions.
@@ -136,7 +138,7 @@ export type UltramodernGenerationResult = {
     rewrittenPaths: string[];
     assignedPorts: Record<string, number>;
     moduleFederationNames: Record<string, string>;
-    effectApiPrefixes: Record<string, string>;
+    apiPrefixes: Record<string, string>;
     generatedContractPath: string;
     warnings: UltramodernGenerationWarning[];
 };
@@ -154,8 +156,8 @@ export type UltramodernCodeSmithOverlayRuntimeConfig = {
     assignedPorts: Record<string, number>;
     moduleFederationName?: string;
     moduleFederationNames: Record<string, string>;
-    effectApiPrefix?: string;
-    effectApiPrefixes: Record<string, string>;
+    apiPrefix?: string;
+    apiPrefixes: Record<string, string>;
     packageSource: ResolvedPackageSource;
     generationResult: UltramodernGenerationResult;
 };
@@ -189,7 +191,7 @@ export type UltramodernVerticalPlan = UltramodernGenerationResult & {
         name: string;
         manifestUrl: string;
     };
-    effectApiPrefix?: string;
+    apiPrefix?: string;
     jsonMutations: UltramodernJsonMutation[];
     shellDependencyChanges: UltramodernShellDependencyChange[];
     generatedContractChanges: UltramodernGeneratedContractChange[];

package/dist/types/ultramodern-workspace/versions.d.ts

@@ -4,6 +4,7 @@
  * checked-in templates under templates/ and template-workspace/.
  */
 export declare const TANSTACK_ROUTER_VERSION = "1.170.16";
+export declare const TANSTACK_ROUTER_CORE_VERSION = "1.171.13";
 export declare const MODULE_FEDERATION_VERSION = "2.6.0";
 export declare const ZEPHYR_RSPACK_PLUGIN_VERSION = "1.1.1";
 export declare const ZEPHYR_AGENT_VERSION = "1.1.1";
@@ -12,6 +13,8 @@ export declare const CLOUDFLARE_COMPATIBILITY_DATE = "2026-06-02";
 export declare const TAILWIND_VERSION = "4.3.1";
 export declare const TAILWIND_POSTCSS_VERSION = "4.3.1";
 export declare const POSTCSS_VERSION = "8.5.15";
+export declare const EFFECT_VERSION = "4.0.0-beta.89";
+export declare const EFFECT_VITEST_VERSION = "4.0.0-beta.89";
 export declare const EFFECT_TSGO_VERSION = "0.14.6";
 export declare const TYPESCRIPT_STABLE_VERSION = "6.0.3";
 export declare const TYPESCRIPT_NATIVE_PREVIEW_VERSION = "7.0.0-dev.20260624.1";
@@ -33,7 +36,10 @@ export declare const RSTACK_AGENT_SKILLS_COMMIT = "61c948b42512e223bad44b83af408
 export declare const MODULE_FEDERATION_AGENT_SKILLS_COMMIT = "07bb5b6c43ad457609e00c081b72d4c42508ec76";
 export declare const ultramodernWorkspaceVersions: {
     tanstackRouter: string;
+    tanstackRouterCore: string;
     moduleFederation: string;
+    effect: string;
+    effectVitest: string;
     tailwind: string;
     tailwindPostcss: string;
 };

package/dist/types/ultramodern-workspace/workspace-scripts.d.ts

@@ -1,11 +1,6 @@
 import type { WorkspaceApp } from './types';
-export declare function createAssertMfTypesScript(remotes?: WorkspaceApp[]): string;
 export declare function createWorkspaceValidationScript(scope: string, enableTailwind: boolean, remotes?: WorkspaceApp[]): string;
 export declare function createWorkspaceI18nBoundaryValidationScript(): string;
-export declare function createPublicSurfaceAssetsScript(): string;
-export declare function createCloudflareProofHelperScript(): string;
-export declare function createCloudflareVersionProofScript(): string;
+export declare function createWorkspaceApiBoundaryValidationScript(): string;
 export declare function createPerformanceReadinessConfigScript(): string;
-export declare function createPerformanceReadinessScript(): string;
-export declare function createUltramodernTypecheckScript(): string;
-export declare function writeGeneratedWorkspaceScripts(targetDir: string, scope: string, enableTailwind: boolean, remotes?: WorkspaceApp[]): void;
+export declare function writeGeneratedWorkspaceScripts(targetDir: string, _scope: string, _enableTailwind: boolean, _remotes?: WorkspaceApp[]): void;

package/dist/types/ultramodern-workspace/write-workspace.d.ts

@@ -1,4 +1,6 @@
-import type { ResolvedPackageSource, UltramodernGenerationResult, UltramodernWorkspaceOptions, WorkspaceApp } from './types';
-export declare function writeApp(targetDir: string, scope: string, app: WorkspaceApp, packageSource: ResolvedPackageSource, enableTailwind: boolean, remotes?: WorkspaceApp[]): void;
+import type { UltramodernBridgeConfig } from './bridge-config';
+import type { JsonValue, ResolvedPackageSource, UltramodernGenerationResult, UltramodernWorkspaceOptions, WorkspaceApp } from './types';
+export declare function writeApp(targetDir: string, scope: string, app: WorkspaceApp, packageSource: ResolvedPackageSource, enableTailwind: boolean, remotes?: WorkspaceApp[], bridge?: UltramodernBridgeConfig): void;
 export declare function writeSharedPackages(targetDir: string, scope: string): void;
+export declare function createCompactUltramodernConfig(scope: string, modernVersion: string, packageSource: ResolvedPackageSource, apps?: WorkspaceApp[], enableTailwind?: boolean, bridge?: UltramodernBridgeConfig): JsonValue;
 export declare function generateUltramodernWorkspace(options: UltramodernWorkspaceOptions): UltramodernGenerationResult;

package/package.json

@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=20"
   },
-  "version": "3.4.0-ultramodern.9",
+  "version": "3.5.0-ultramodern.1",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/esm-node/index.js",
   "bin": {
@@ -75,7 +75,9 @@
   ],
   "dependencies": {
     "@modern-js/codesmith": "2.6.9",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.4.0-ultramodern.9"
+    "oxfmt": "0.55.0",
+    "ultracite": "7.8.3",
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.1"
   },
   "devDependencies": {
     "@rslib/core": "0.23.0",
@@ -97,6 +99,6 @@
     "test": "rm -rf dist && rslib build -c rslibconfig.mts && rstest --passWithNoTests"
   },
   "ultramodern": {
-    "frameworkVersion": "3.4.0-ultramodern.9"
+    "frameworkVersion": "3.5.0-ultramodern.1"
   }
 }

package/template-workspace/{.agents → .codex}/skills-lock.json

@@ -4,9 +4,9 @@
     "repository": "https://github.com/rstackjs/agent-skills",
     "commit": "61c948b42512e223bad44b83af4080eba48b2677",
     "license": "MIT",
-    "licensePath": ".agents/rstackjs-agent-skills-LICENSE"
+    "licensePath": ".codex/rstackjs-agent-skills-LICENSE"
   },
-  "installDir": ".agents/skills",
+  "installDir": ".codex/skills",
   "sources": [
     {
       "id": "rstack-agent-skills",
@@ -14,7 +14,7 @@
       "repository": "https://github.com/rstackjs/agent-skills",
       "commit": "61c948b42512e223bad44b83af4080eba48b2677",
       "license": "MIT",
-      "licensePath": ".agents/rstackjs-agent-skills-LICENSE",
+      "licensePath": ".codex/rstackjs-agent-skills-LICENSE",
       "install": "vendored"
     },
     {
@@ -26,7 +26,7 @@
       "baseline": [
         {
           "name": "mf",
-          "path": ".agents/skills/mf",
+          "path": ".codex/skills/mf",
           "reason": "Module Federation docs, config inspection, type checking, shared dependency checks, and observability troubleshooting"
         }
       ]
@@ -63,42 +63,42 @@
   "baseline": [
     {
       "name": "rsbuild-best-practices",
-      "path": ".agents/skills/rsbuild-best-practices",
+      "path": ".codex/skills/rsbuild-best-practices",
       "reason": "Modern.js application build configuration and Rsbuild troubleshooting"
     },
     {
       "name": "rspack-best-practices",
-      "path": ".agents/skills/rspack-best-practices",
+      "path": ".codex/skills/rspack-best-practices",
       "reason": "Rspack bundling, CSS, asset, profiling, and production behavior"
     },
     {
       "name": "rspack-tracing",
-      "path": ".agents/skills/rspack-tracing",
+      "path": ".codex/skills/rspack-tracing",
       "reason": "Trace-backed Rspack failure and performance debugging"
     },
     {
       "name": "rsdoctor-analysis",
-      "path": ".agents/skills/rsdoctor-analysis",
+      "path": ".codex/skills/rsdoctor-analysis",
       "reason": "Evidence-backed bundle composition, duplication, and retained-module analysis"
     },
     {
       "name": "rslib-best-practices",
-      "path": ".agents/skills/rslib-best-practices",
+      "path": ".codex/skills/rslib-best-practices",
       "reason": "Rslib shared package and design-system library authoring"
     },
     {
       "name": "rslib-modern-package",
-      "path": ".agents/skills/rslib-modern-package",
+      "path": ".codex/skills/rslib-modern-package",
       "reason": "Modern package contracts, exports, declarations, side effects, and release readiness"
     },
     {
       "name": "rstest-best-practices",
-      "path": ".agents/skills/rstest-best-practices",
+      "path": ".codex/skills/rstest-best-practices",
       "reason": "Rstest configuration, test writing, mocking, snapshots, coverage, and CI behavior"
     },
     {
       "name": "mf",
-      "path": ".agents/skills/mf",
+      "path": ".codex/skills/mf",
       "reason": "Module Federation docs, config inspection, type checking, shared dependency checks, and observability troubleshooting"
     }
   ],

package/template-workspace/.github/workflows/ultramodern-workspace-gates.yml.handlebars

@@ -34,6 +34,8 @@ jobs:
             command: pnpm skills:check
           - name: I18n Boundaries
             command: pnpm i18n:boundaries
+          - name: API Boundaries
+            command: pnpm api:check
           - name: Contract
             command: pnpm contract:check
           - name: Build

package/template-workspace/.gitignore.handlebars

@@ -2,4 +2,7 @@ node_modules/
 dist/
 build/
 .modernjs/cache/
+.modern-js/
+**/.modern-js/
 .modernjs/agent-reference-repos-tmp/
+.codex/reports/

package/template-workspace/AGENTS.md.handlebars

@@ -1,7 +1,7 @@
 # UltraModern Agent Contract
 
 This workspace is generated as an agent-ready UltraModern.js SuperApp shell.
-Agents should treat the files under `.agents/skills` as local project
+Codex should treat the files under `.codex/skills` as local project
 instructions, not optional reading.
 
 ## Quality Gates
@@ -19,7 +19,7 @@ baseline; do not reintroduce Corepack or older pnpm aliases.
 - `pnpm check` is a local convenience aggregate for the primitive gates.
 - Generated CI runs primitive gates as separate matrix jobs instead of calling `pnpm check`.
 - Generated Codex stop hooks and subagent-stop hooks run `pnpm format && pnpm lint:fix && pnpm check`.
-- `postinstall` formats the generated tree and installs `lefthook`. It never clones repositories or installs system packages; agent skill repos and reference repos are explicit opt-in steps (`pnpm skills:install`, `pnpm agents:refs:install`). Generated `lefthook.yml` runs separate format and lint-fix commands on pre-commit; pre-push runs read-only primitive gates in parallel.
+- `postinstall` formats the generated tree, installs/updates pinned Codex skills, and installs `lefthook`. It never installs system packages. Clone-backed public skills are attempted by default; offline clone failures are advisory. Reference repos remain an explicit `pnpm agents:refs:install` step. Generated `lefthook.yml` runs separate format and lint-fix commands on pre-commit; pre-push runs read-only primitive gates in parallel.
 
 ## Localized Routes
 
@@ -48,7 +48,13 @@ Use these skills when the task touches the matching subsystem:
 - `rstest-best-practices`: Rstest configuration, test writing, mocking, snapshots, coverage, and CI test behavior.
 - `mf`: Module Federation docs, Modern.js integration, DTS/type checks, shared dependency checks, runtime errors, and observability troubleshooting.
 
-The public `module-federation/agent-skills` repository is installed only when you explicitly run `pnpm skills:install` (or set `ULTRAMODERN_AGENT_SKILLS=1` before `pnpm install`). Postinstall never clones repositories. `pnpm skills:install` remains strict for required public skills. `pnpm skills:check` fails when a vendored skill is missing and warns when clone-installed skills such as `mf` have not been fetched yet.
+Skill bodies are lockfile-pinned in `.codex/skills-lock.json` and installed
+into the repo-owned `.codex/skills` directory by default. The installer updates
+only pinned skill directories and preserves unrelated user skills already
+present under `.codex/skills`. Set `ULTRAMODERN_SKIP_CODEX_SKILLS=1` or
+`ULTRAMODERN_CODEX_SKILLS=0` to opt out during install. `pnpm skills:check` is
+advisory when local skill bodies are missing so offline CI can still run the
+normal gate.
 
 ## Private Skills
 
@@ -58,7 +64,7 @@ ScriptedAlchemy/TechsioCZ skills are private and are cloned only when the curren
 pnpm skills:install
 ```
 
-The installer copies only the pinned private skills from `.agents/skills-lock.json`: `plan-graph`, `dag`, `subagent-graph`, `helm`, and `debugger-mode`.
+The installer copies only the pinned private skills from `.codex/skills-lock.json`: `plan-graph`, `dag`, `subagent-graph`, `helm`, and `debugger-mode`.
 
 ## Agent Reference Repositories
 
@@ -85,4 +91,4 @@ Agents may read files under `repos/` to understand upstream patterns, APIs, and
 
 ## Skill Provenance
 
-The vendored Rstack skills, public Module Federation skill, and private TechsioCZ skill set are pinned in `.agents/skills-lock.json`. Do not update, remove, or replace them casually. If a skill needs updating, update the lock file and run the affected primitive gate plus `pnpm check`.
+The Rstack skills, public Module Federation skill, and private TechsioCZ skill set are pinned in `.codex/skills-lock.json`. Do not update, remove, or replace them casually. If a skill needs updating, update the lock file and run the affected primitive gate plus `pnpm check`.

package/template-workspace/README.md.handlebars

@@ -69,7 +69,7 @@ typecheck, skills, i18n boundary validation, contract validation, and build as
 separate matrix jobs so failures are isolated and parallelizable.
 
 Type checking is TS7-first. `pnpm typecheck` runs
-`scripts/ultramodern-typecheck.mjs` in TS-Go build mode over
+`scripts/ultramodern-typecheck.mts` in TS-Go build mode over
 `tsconfig.json` project references, with native-preview `--checkers` and
 `--builders` enabled by default. `@typescript/native-preview` is the TS7 latest
 dev compiler lane. The classic `typescript` package is pinned to latest TS6
@@ -80,11 +80,14 @@ UltraModern.js source lookup using squashed git subtrees) are an explicit
 opt-in step: run `pnpm agents:refs:install` when you want them. `pnpm install`
 never clones repositories.
 
-Vendored agent skills ship with the scaffold. Clone-installed skills (such as
-the Module Federation `mf` skill) are fetched only when you explicitly run
-`pnpm skills:install`, or when `ULTRAMODERN_AGENT_SKILLS=1` is set during
-`pnpm install`. `pnpm skills:check` warns about missing clone-installed skills
-without failing the gate.
+Codex skill bodies are lockfile-pinned in `.codex/skills-lock.json` and
+repo-owned under `.codex/skills`. `pnpm install` runs the bootstrap by default:
+vendored pinned skills are copied locally, clone-backed public skills are
+fetched when network access is available, and offline clone failures remain
+advisory. Existing unrelated `.codex/skills/*` directories are preserved. Set
+`ULTRAMODERN_SKIP_CODEX_SKILLS=1` or `ULTRAMODERN_CODEX_SKILLS=0` to opt out.
+`pnpm skills:check` is advisory when local skill bodies are missing so offline
+CI can still run the normal gate.
 
 The topology and ownership metadata are generated under `topology/`. The
 workspace also ships `.github/workflows/ultramodern-workspace-gates.yml` and
@@ -93,12 +96,12 @@ actions, frozen installs, StepSecurity audit-mode runner hardening, dependency
 dashboard review, one-day release age, grouped updates, and manual approval for
 major upgrades.
 
-Package source metadata is generated at
-`.modernjs/ultramodern-package-source.json`. The default strategy keeps
-UltraModern.js runtime and tooling packages on `workspace:*` for monorepo
-development. To create a workspace that can install those packages outside the
-monorepo, generate with `--ultramodern-package-source install`; generated shared
-packages still use `workspace:*` because they are part of this workspace.
+Package source provenance is recorded in `.modernjs/ultramodern.json`. The
+default strategy keeps UltraModern.js runtime and tooling packages on
+`workspace:*` for monorepo development. To create a workspace that can install
+those packages outside the monorepo, generate with
+`--ultramodern-package-source install`; generated shared packages still use
+`workspace:*` because they are part of this workspace.
 
 ## Public URL Environment Variables
 
@@ -144,14 +147,53 @@ ULTRAMODERN_PUBLIC_URL_SHELL_SUPER_APP=https://shell-super-app.example.workers.d
 pnpm cloudflare:proof -- --require-public-urls
 ```
 
+## Strict Effect API
+
+Generated HTTP APIs use the direct strict Effect topology only:
+
+- API contracts live at `shared/api.ts`.
+- Runtime entries live at `api/index.ts`.
+- Browser clients live under `src/api/*-client.ts`.
+- `modern.config.ts` uses `bff.runtimeFramework: 'effect'`,
+  `bff.effect.entry: './api/index'`, and
+  `bff.effect.strictEffectApproach: true`.
+
+Do not add `api/effect`, `api/lambda`, `shared/effect`, `src/effect`, Hono
+server imports, raw request handlers, manual `request.json()` parsing, or
+manual `new Response(...)` construction inside generated API modules.
+`pnpm api:check` and Oxlint enforce this. Model requests, responses, and typed
+errors with concrete Effect `Schema` values; generic JSON shortcuts such as
+`Schema.UnknownFromJsonString`, `Schema.Unknown`, and `Schema.Any` are rejected
+in API modules.
+
+Generated pnpm overrides pin the framework-compatible Effect cohort. Keep
+`effect` and `@effect/vitest` aligned with `pnpm-workspace.yaml`; do not add
+new direct package-level Effect versions unless the whole UltraModern cohort is
+upgraded.
+
+For older generated workspaces, run the framework migration command first:
+
+```bash
+pnpm dlx @bleedingdev/modern-js-create@3.5.0-ultramodern.1 ultramodern \
+  migrate-strict-effect --version 3.5.0-ultramodern.1
+pnpm api:check
+pnpm contract:check
+```
+
+The command updates generated package-source metadata, Modern package aliases,
+direct API topology metadata, and the lockfile. Remaining failures are source
+migration work; fix the owning API files instead of adding compatibility shims.
+
 ## Troubleshooting
 
 | Symptom | Current check | Owner |
 | --- | --- | --- |
 | Package cohort mismatch | Regenerate with one package source strategy, run `mise install`, then rerun `pnpm install` from the activated shell. | Generated workspace package source metadata |
+| Effect runtime cohort mismatch | Keep `effect` and `@effect/vitest` on the generated pnpm override versions, then rerun `pnpm install`. | Generated workspace dependency policy |
+| Old nested API path | Run `pnpm api:check`, move code to `api/index.ts`, `shared/api.ts`, and `src/api/*`, then delete `api/effect`, `api/lambda`, `shared/effect`, and `src/effect`. | API owner |
 | Install failure | Check the active Node/pnpm from `mise install`; rerun `pnpm install` after the shell sees the pinned versions. | Toolchain setup |
 | Build failure | Run the matching primitive gate (`pnpm lint`, `pnpm typecheck`, `pnpm i18n:boundaries`, `pnpm contract:check`) before `pnpm build`; fix the owning failure first. | Owning package or generated contract |
-| Missing public URL | Set the env key from `.modernjs/ultramodern-generated-contract.json`, for example `ULTRAMODERN_PUBLIC_URL_SHELL_SUPER_APP`. | Deployment operator |
+| Missing public URL | Set the app public URL env key recorded in `.modernjs/ultramodern.json`, for example `ULTRAMODERN_PUBLIC_URL_SHELL_SUPER_APP`. | Deployment operator |
 | Cloudflare credentials | Confirm Wrangler credentials before `pnpm cloudflare:deploy`; local checks do not prove live Worker access. | Deployment operator |
 | Asset or CSS 404 | Rebuild with `pnpm build` or `pnpm cloudflare:deploy` and inspect emitted Modern/Rspack asset paths instead of hardcoding CSS URLs. | Framework/runtime asset pipeline |
 | Federation manifest failure | Run the shell and vertical build scripts, then check each deployed `/mf-manifest.json` URL used by the shell. | Module Federation owner |

package/template-workspace/oxfmt.config.ts

@@ -5,6 +5,7 @@ export default defineConfig({
   extends: [ultracite],
   ignorePatterns: [
     '.agents',
+    '.codex/skills',
     '.output',
     '**/*.json',
     'dist',

package/template-workspace/oxlint.config.ts

@@ -10,6 +10,7 @@ export default defineConfig({
   extends: [core, react],
   ignorePatterns: [
     '.agents',
+    '.codex/skills',
     '.output',
     'dist',
     'node_modules',

package/template-workspace/patches/@tanstack__router-core@1.171.13.patch

@@ -0,0 +1,51 @@
+diff --git a/dist/cjs/load-matches.cjs b/dist/cjs/load-matches.cjs
+index c09976a80c2c112b7dac6f941e643c81eeaf8d52..ec5156d89e9c5924a9ec0c19aad79711124f9ff4 100644
+--- a/dist/cjs/load-matches.cjs
++++ b/dist/cjs/load-matches.cjs
+@@ -442,0 +443 @@
++					if (!match) return;
+@@ -472,0 +474 @@
++			if (!match) return inner.matches[index];
+@@ -487,0 +490 @@
++	if (!match) return inner.matches[index];
+@@ -503 +506 @@
+-		return inner.router.getMatch(matchId);
++		return inner.router.getMatch(matchId) ?? inner.matches[index];
+diff --git a/dist/esm/load-matches.js b/dist/esm/load-matches.js
+index bcea2e0d88d037a01b93bf36dd6e643f98028e83..57484bf2825dab47030a1d4f905b9fb2e6067310 100644
+--- a/dist/esm/load-matches.js
++++ b/dist/esm/load-matches.js
+@@ -442,0 +443 @@
++					if (!match) return;
+@@ -472,0 +474 @@
++			if (!match) return inner.matches[index];
+@@ -487,0 +490 @@
++	if (!match) return inner.matches[index];
+@@ -503 +506 @@
+-		return inner.router.getMatch(matchId);
++		return inner.router.getMatch(matchId) ?? inner.matches[index];
+diff --git a/src/load-matches.ts b/src/load-matches.ts
+index f901a0c97ddf0618dd83229ac260277b46e2676d..76674e01e89ac2cbaba4d776c2be3bf0e3fdb432 100644
+--- a/src/load-matches.ts
++++ b/src/load-matches.ts
+@@ -838 +838,4 @@
+-          const match = inner.router.getMatch(matchId)!
++          const match = inner.router.getMatch(matchId)
++          if (!match) {
++            return
++          }
+@@ -906 +909,4 @@
+-      const match = inner.router.getMatch(matchId)!
++      const match = inner.router.getMatch(matchId)
++      if (!match) {
++        return inner.matches[index]!
++      }
+@@ -936 +942,4 @@
+-  const match = inner.router.getMatch(matchId)!
++  const match = inner.router.getMatch(matchId)
++  if (!match) {
++    return inner.matches[index]!
++  }
+@@ -955 +964 @@
+-    return inner.router.getMatch(matchId)!
++    return inner.router.getMatch(matchId) ?? inner.matches[index]!

package/template-workspace/pnpm-workspace.yaml.handlebars

@@ -37,10 +37,14 @@ peerDependencyRules:
     '@module-federation/enhanced>typescript': '{{typescriptVersion}}'
     '@module-federation/modern-js-v3>typescript': '{{typescriptVersion}}'
     '@module-federation/rspack>typescript': '{{typescriptVersion}}'
+    '@effect/vitest>effect': '{{effectVersion}}'
     'i18next>typescript': '{{typescriptVersion}}'
 
 overrides:
   '@tanstack/react-router': {{tanstackRouterVersion}}
+  '@tanstack/router-core': {{tanstackRouterCoreVersion}}
+  '@effect/vitest': {{effectVitestVersion}}
+  effect: {{effectVersion}}
   node-fetch: '{{nodeFetchVersion}}'
 
 allowBuilds:
@@ -51,3 +55,6 @@ allowBuilds:
   msgpackr-extract: true
   sharp: true
   workerd: true
+
+patchedDependencies:
+  '@tanstack/router-core@{{tanstackRouterCoreVersion}}': patches/@tanstack__router-core@{{tanstackRouterCoreVersion}}.patch