Skip to content

Integrate Project model into loader and decompose into composable stages#7023

Open
ryancbahan wants to merge 5 commits intomainfrom
rcb/project-integration
Open

Integrate Project model into loader and decompose into composable stages#7023
ryancbahan wants to merge 5 commits intomainfrom
rcb/project-integration

Conversation

@ryancbahan
Copy link
Contributor

@ryancbahan ryancbahan commented Mar 16, 2026

WHY are these changes introduced?

PR #7022 introduced the Project and ActiveConfig domain models, but nothing consumed them (the loader still ran its own filesystem discovery, constructed AppConfigurationState as an intermediate, and threaded the entire previous AppInterface through reloads). This PR wires the new models into the loading pipeline and uses that as leverage to decompose the monolithic loadApp into composable stages with narrow interfaces.

WHAT is this pull request doing?

Decomposes the loader into three explicit stages:

  • getAppConfigurationContext(dir, configName){project, activeConfig} — discovery only, no parsing or state construction
  • loadAppFromContext({project, activeConfig, specifications, …})AppInterface — validation and assembly, for callers that already hold a Project
  • loadApp({directory, configName, …}) — thin wrapper composing the two above

[Interim state] Replaces previousApp with narrow ReloadState:

Instead of threading the entire AppLinkedInterface through reloads (just to read 2 fields), reloadApp now constructs a ReloadState with only extensionDevUUIDs: Map<string, string> and previousDevURLs. This is a step change away from broad state passing/mutation, but needs more consideration on "permanent home" as we continue to decompose functionality.

Updates all consumers:

  • linkedAppContext uses activeConfig.isLinked and activeConfig.file.content directly instead of going through AppConfigurationState
  • link() returns {remoteApp, configFileName, configuration} — drops state from its return type
  • use() reads activeConfig.file.content instead of calling loadAppConfiguration
  • loadConfigForAppCreation uses activeConfig and project.directory directly

Removes dead code (-400 lines):

AppConfigurationState, AppConfigurationStateBasics, toAppConfigurationState, loadAppConfigurationFromState, loadAppUsingConfigurationState, loadAppConfiguration, getAppConfigurationState, getAppDirectory, loadDotEnv, loadHiddenConfig, findWebConfigPaths, loadWebsForAppCreation, getConfigurationPath (de-exported)

How to test your changes?

npx vitest run packages/app/src/cli/models/app/loader.test.ts
npx vitest run packages/app/src/cli/services/app-context.test.ts
npx vitest run packages/app/src/cli/services/app/config/link.test.ts
npx vitest run packages/app/src/cli/services/app/config/use.test.ts
npx vitest run packages/app/src/cli/services/context.test.ts
npx vitest run packages/app/src/cli/models/project/

Measuring impact

  • n/a

Checklist

  • I've considered possible cross-platform impacts (Mac, Linux, Windows)
  • I've considered possible documentation changes

🤖 Generated with Claude Code

Copy link
Contributor Author

ryancbahan commented Mar 16, 2026

@github-actions
Copy link
Contributor

github-actions bot commented Mar 16, 2026

Coverage report

St.
Category Percentage Covered / Total
🟢 Statements 82.21% 14887/18108
🟡 Branches 74.54% 7356/9869
🟢 Functions 81.38% 3763/4624
🟢 Lines 82.6% 14073/17037

Test suite run success

3902 tests passing in 1500 suites.

Report generated by 🧪jest coverage report action from 5f12f8e

@ryancbahan ryancbahan force-pushed the rcb/project-integration branch 2 times, most recently from d7d2097 to ff9497f Compare March 17, 2026 14:04
@ryancbahan ryancbahan force-pushed the rcb/project-integration branch 3 times, most recently from 288c896 to b17ef80 Compare March 17, 2026 14:44
@ryancbahan ryancbahan marked this pull request as ready for review March 17, 2026 14:58
@ryancbahan ryancbahan requested a review from a team as a code owner March 17, 2026 14:58
@github-actions
Copy link
Contributor

We detected some changes at packages/*/src and there are no updates in the .changeset.
If the changes are user-facing, run pnpm changeset add to track your changes and include them in the next release CHANGELOG.

Caution

DO NOT create changesets for features which you do not wish to be included in the public changelog of the next CLI release.

@ryancbahan ryancbahan force-pushed the rcb/project-integration branch from b17ef80 to 57e86f9 Compare March 17, 2026 15:22
@ryancbahan ryancbahan marked this pull request as draft March 17, 2026 20:12
@ryancbahan ryancbahan changed the title Integrate Project model into loader and app-context Decompose loader into composable stages with narrow interfaces Mar 17, 2026
@ryancbahan ryancbahan changed the title Decompose loader into composable stages with narrow interfaces Integrate Project model into loader and decompose into composable stages Mar 17, 2026
@ryancbahan ryancbahan force-pushed the rcb/project-integration branch from 18f3516 to 839512e Compare March 17, 2026 23:05
@ryancbahan ryancbahan force-pushed the rcb/project-integration branch from 839512e to 87728e2 Compare March 17, 2026 23:18
@github-actions
Copy link
Contributor

Differences in type declarations

We detected differences in the type declarations generated by Typescript for this branch compared to the baseline ('main' branch). Please, review them to ensure they are backward-compatible. Here are some important things to keep in mind:

  • Some seemingly private modules might be re-exported through public modules.
  • If the branch is behind main you might see odd diffs, rebase main into this branch.

New type declarations

We found no new type declarations in this PR

Existing type declarations

packages/cli-kit/dist/public/node/themes/api.d.ts
@@ -5,7 +5,6 @@ export type ThemeParams = Partial<Pick<Theme, 'name' | 'role' | 'processing' | '
 export type AssetParams = Pick<ThemeAsset, 'key'> & Partial<Pick<ThemeAsset, 'value' | 'attachment'>>;
 export declare function fetchTheme(id: number, session: AdminSession): Promise<Theme | undefined>;
 export declare function fetchThemes(session: AdminSession): Promise<Theme[]>;
-export declare function findDevelopmentThemeByName(name: string, session: AdminSession): Promise<Theme | undefined>;
 export declare function themeCreate(params: ThemeParams, session: AdminSession): Promise<Theme | undefined>;
 export declare function fetchThemeAssets(id: number, filenames: Key[], session: AdminSession): Promise<ThemeAsset[]>;
 export declare function deleteThemeAssets(id: number, filenames: Key[], session: AdminSession): Promise<Result[]>;
packages/cli-kit/dist/public/node/themes/theme-manager.d.ts
@@ -8,8 +8,8 @@ export declare abstract class ThemeManager {
     protected abstract removeTheme(): void;
     protected abstract context: string;
     constructor(adminSession: AdminSession);
-    findOrCreate(name?: string, role?: Role): Promise<Theme>;
-    fetch(name?: string, role?: Role): Promise<Theme | undefined>;
+    findOrCreate(): Promise<Theme>;
+    fetch(): Promise<Theme | undefined>;
     generateThemeName(context: string): string;
     create(themeRole?: Role, themeName?: string): Promise<Theme>;
 }
\ No newline at end of file

@ryancbahan ryancbahan marked this pull request as ready for review March 18, 2026 03:00
@ryancbahan ryancbahan changed the base branch from rcb/project-model to graphite-base/7023 March 18, 2026 14:49
@ryancbahan ryancbahan force-pushed the rcb/project-integration branch from 87728e2 to 490c047 Compare March 18, 2026 21:42
@ryancbahan ryancbahan changed the base branch from graphite-base/7023 to main March 18, 2026 21:42
ryancbahan and others added 2 commits March 18, 2026 15:44
Wires the Project domain model into the existing loading pipeline:

- getAppConfigurationState uses Project.load() for filesystem discovery
- getAppConfigurationContext returns project + activeConfig + state
  as independent values (project is never nested inside state)
- AppLoader reads from Project's pre-loaded data: extension files,
  web files, dotenv, hidden config, deps, package manager, workspaces
- No duplicate filesystem scanning — Project discovers once, loader
  reads from it
- AppConfigurationState no longer carries project as a field
- LoadedAppContextOutput exposes project and activeConfig as
  top-level fields for commands
- All extension/web file discovery filtered to active config's
  directories via config-selection functions

Zero behavioral changes. All 3801 existing tests pass.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Replace the monolithic loadApp pipeline with composable stages:
- loadApp is now a thin wrapper: getAppConfigurationContext → loadAppFromContext
- loadAppFromContext takes narrow Project + ActiveConfig directly
- getAppConfigurationContext is discovery-only (no parsing/state construction)
- ReloadState replaces passing entire AppLinkedInterface through reloads
- AppLoader takes reloadState? instead of previousApp?
- link() returns {remoteApp, configFileName, configuration} (no state)
- linkedAppContext uses activeConfig directly, no AppConfigurationState

Remove dead code: AppConfigurationState, toAppConfigurationState,
loadAppConfigurationFromState, loadAppUsingConfigurationState,
loadAppConfiguration, getAppConfigurationState, getAppDirectory,
loadDotEnv, loadHiddenConfig, findWebConfigPaths, loadWebsForAppCreation.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@ryancbahan ryancbahan force-pushed the rcb/project-integration branch from 490c047 to e775694 Compare March 18, 2026 21:44
ryancbahan and others added 3 commits March 18, 2026 16:02
…Path

- Remove orphaned <<<<<<< HEAD marker and dead loadHiddenConfig tests
- Re-add isAppConfigSpecification import (used at line 776)
- Add missing configPath field to loadedConfiguration in loadAppFromContext
- Fix configuration.path references to use configPath (path extracted from config type)
- Fix testApp() call signature in use.test.ts

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…path

Same bug as the other two configuration.path references fixed in
e4487d9 — configuration is Zod-parsed and has no path property.
Without this fix, activeConfigFile always returns undefined, causing
loadWebs() and createExtensionInstances() to load all project files
instead of filtering by the active config.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant