Re organize backend

Author: AJenbo

docs/todo/refactor.md

@@ -214,122 +214,10 @@ Each item must include:
 
 # Outstanding items
 
-Recommended order: 3 → 4 → 5. Tasks 4 and 5 both churn the whole crate
-(4 renames `Backend` fields, 5 moves the type-engine modules), so they
-go last to avoid re-touching code that 3 moves; do 4 before 5 so 5's
-module moves don't collide with 4's field renames.
-
-All three remaining tasks are pure internal refactors. None gets a
-changelog entry unless the work uncovers and fixes a concrete
-user-visible bug. Run the Rust CI checks (`cargo nextest run`, `cargo
-clippy -- -D warnings`, `cargo clippy --tests -- -D warnings`, `cargo
-fmt`) after each task.
-
-## 3. Move workspace init/indexing out of `server.rs` and `references/mod.rs`
-
-**What to do.** `src/server.rs` (4,007 lines) ends with an
-`impl Backend` block of workspace initialization and indexing
-(~lines 2696–4007, ~1,300 lines) that has nothing to do with LSP
-dispatch, and `src/references/mod.rs` hosts workspace-indexing
-functions that have nothing to do with reference finding. Consolidate
-both into a new `src/indexing/` module (declare `mod indexing;` in
-`lib.rs`). Pure code motion via `impl Backend` blocks in the new
-files; approximate current line numbers given for finding things.
-
-- `indexing/init.rs` — `init_single_project` (~2696),
-  `init_monorepo` (~2933), `init_no_composer` (~3102).
-- `indexing/scan.rs` — `add_vendor_dir` (~3153),
-  `rescan_composer_indexes` (~3374), `scan_autoload_files` (~3469),
-  `scan_phar_archive` (~3686), `build_self_scan_composer` (~3776),
-  `populate_autoload_indices` (~3877).
-- `indexing/preload.rs` — `preload_autoload_files` (~3608) and
-  `preload_autoload_files_with_progress` (~3614) from `server.rs`,
-  plus from `src/references/mod.rs`: `ensure_workspace_indexed`
-  (~125), `ensure_workspace_indexed_for_request` (~137),
-  `ensure_workspace_indexed_with_progress` (~166),
-  `parse_files_parallel_with_progress` (~314), and
-  `parse_paths_parallel_with_progress` (~430).
-- `indexing/watch.rs` — `apply_watched_file_changes` (~3194).
-
-Two more relocations while in there:
-
-- `warm_laravel_completion_cache` (`server.rs` ~2081) belongs in
-  `src/virtual_members/laravel/`.
-- The pull-diagnostics resultId-cache logic embedded in the
-  `diagnostic` (~1589) and `workspace_diagnostic` (~1651) handlers
-  belongs in a new `src/diagnostics/pull.rs`, leaving both handlers
-  as thin delegations like the rest of `server.rs`.
-
-**Constraint.** Several of these functions spawn threads sized with
-`PARSE_WORKER_STACK_SIZE` (see the "Performance Anti-Patterns" §3
-note in `CLAUDE.md`). Move that code verbatim — do not "simplify"
-thread spawning or stack sizing while relocating it.
-
-**Acceptance.** `cargo nextest run` passes with no test edits (except
-import paths); `server.rs` is reduced to protocol handlers and
-dispatch (~1,700 lines); behavior is unchanged.
-
-**Why it matters.** Full background indexing has already shipped on
-top of init logic scattered across `server.rs` and
-`references/mod.rs`; leaving that logic unconsolidated guarantees more
-sprawl as the feature continues to grow.
-
----
-
-## 4. Group `Backend`'s remaining fields into sub-systems
-
-**What to do.** `struct Backend` in `src/lib.rs` (starts at ~line 377)
-still has fields that cluster into implicit sub-systems. The four
-external-tool fields are already grouped (`ExternalToolWorker`); this
-task introduces three more groups. It is a mechanical, crate-wide
-field rename — do it as three separate passes (one per group), running
-`cargo check` between passes, and run it as the **sole active agent**
-(no parallel sub-agents; see "Never run project-wide rewrites in
-parallel" in `CLAUDE.md`).
-
-For each group: define the struct with a `fn new()` used by both
-`Backend` constructors (~lines 1096 and 1206) and include the group in
-the per-request clone (~line 1836); the `Arc`/`Mutex` wrappers move
-into the new struct unchanged (clone semantics of a `Backend` clone
-must not change).
-
-**Group 1 — `DiagnosticState`** (define it in `src/diagnostics/`,
-field name e.g. `diag`): `diag_version`, `diag_notify`,
-`diag_pending_uris`, `diag_last_slow`, `diag_last_fast`,
-`diag_last_full`, `diag_result_ids`, `diag_suppressed`,
-`workspace_diags`, `workspace_diag_pass_started`. Drop the `diag_`
-prefix on the struct's fields (`self.diag_version` →
-`self.diag.version`). Leave `supports_pull_diagnostics` with the other
-client-capability flags.
-
-**Group 2 — `SymbolIndex`** (field name e.g. `symbols`):
-`uri_classes_index`, `fqn_uri_index`, `fqn_origin_index`,
-`fqn_class_index`, `class_not_found_cache`, `gti_index`,
-`method_store`, `global_functions`, `global_defines`,
-`uri_globals_index`, `autoload_function_index`,
-`autoload_function_origin_index`, `autoload_constant_index`,
-`autoload_constant_origin_index`, `autoload_file_paths`. Do **not**
-pull in the per-file parse artifacts (`symbol_maps`, `resolved_names`,
-`file_imports`, `file_namespaces`, `parse_errors`, `parsed_uris`,
-`parse_inflight`, `phar_archives`) or the `stub_*` indexes — they have
-a different lifecycle and are out of scope here.
-
-**Group 3 — `WorkspaceEnv`** (field name e.g. `workspace` — not
-"WorkspaceConfig", to avoid colliding with the existing
-`config: Mutex<config::Config>` field, which becomes a member of this
-group): `workspace_root`, `psr4_mappings`, `vendor_uri_prefixes`,
-`vendor_dir_paths`, `vendor_package_origin_roots`, `php_version`,
-`config`.
-
-**Acceptance.** Pure renames: `cargo nextest run` passes with only
-mechanical field-path updates in tests; no lock types, wrapper types,
-or clone semantics change.
-
-**Why it matters.** Group 1 directly de-risks the scheduled D10 task;
-the rest makes the Backend's state graph legible and shrinks the
-constructors.
-
----
+One task remains. It is a pure internal refactor and gets no changelog
+entry unless the work uncovers and fixes a concrete user-visible bug. Run
+the Rust CI checks (`cargo nextest run`, `cargo clippy -- -D warnings`,
+`cargo clippy --tests -- -D warnings`, `cargo fmt`) after the task.
 
 ## 5. Extract the shared type engine out of `completion/`
 

src/analyse/run.rs

@@ -63,7 +63,7 @@ pub async fn run(options: AnalyseOptions) -> i32 {
     // calls are no-ops.
     let backend = Backend::new_headless();
     *backend.workspace_root().write() = Some(root.to_path_buf());
-    *backend.config.lock() = cfg.clone();
+    *backend.workspace.config.lock() = cfg.clone();
 
     let composer_package = composer::read_composer_package(root);
 
@@ -199,7 +199,7 @@ pub async fn run(options: AnalyseOptions) -> i32 {
     // read lock, then drop the lock before resolving.  Resolution may
     // call find_or_load_class which takes write locks on uri_classes_index.
     let sorted_fqns = {
-        let uri_classes_index = backend.uri_classes_index.read();
+        let uri_classes_index = backend.symbols.uri_classes_index.read();
         crate::toposort::toposort_from_uri_classes_index(&uri_classes_index)
     };
     // Run on a dedicated large-stack thread: `resolve_class_fully_inner`
@@ -661,7 +661,7 @@ pub(crate) fn discover_user_files(
     source_dirs.sort();
     source_dirs.dedup();
 
-    let vendor_dirs: Vec<PathBuf> = backend.vendor_dir_paths.lock().clone();
+    let vendor_dirs: Vec<PathBuf> = backend.workspace.vendor_dir_paths.lock().clone();
 
     // When an explicit path filter points outside all PSR-4 source
     // directories (e.g. into vendor/), walk the filter path directly

src/backend/file_access.rs

@@ -36,7 +36,7 @@ impl Backend {
         // For namespace-qualified names the FQN is the normalized name
         // itself.  For bare names (no backslash) the FQN equals the
         // short name, which is also stored in the index.
-        if let Some(cls) = self.fqn_class_index.read().get(class_name) {
+        if let Some(cls) = self.symbols.fqn_class_index.read().get(class_name) {
             return Some(Arc::clone(cls));
         }
 
@@ -108,7 +108,8 @@ impl Backend {
 
     /// Public helper for tests: get the uri_classes_index entry for a given URI.
     pub fn get_classes_for_uri(&self, uri: &str) -> Option<Vec<ClassInfo>> {
-        self.uri_classes_index
+        self.symbols
+            .uri_classes_index
             .read()
             .get(uri)
             .map(|classes| classes.iter().map(|c| ClassInfo::clone(c)).collect())
@@ -124,6 +125,7 @@ impl Backend {
     /// extracting the entry for a given URI.
     pub(crate) fn file_context(&self, uri: &str) -> FileContext {
         let classes = self
+            .symbols
             .uri_classes_index
             .read()
             .get(uri)
@@ -170,6 +172,7 @@ impl Backend {
     /// namespace block for the cursor position.
     pub(crate) fn file_context_at(&self, uri: &str, byte_offset: u32) -> FileContext {
         let classes = self
+            .symbols
             .uri_classes_index
             .read()
             .get(uri)
@@ -266,7 +269,7 @@ impl Backend {
         // open.  uri_classes_index is redundant with fqn_class_index once indexing is
         // complete — GTD falls back to fqn_uri_index + parse_and_cache_file
         // when the uri_classes_index entry is missing.
-        self.uri_classes_index.write().remove(uri);
+        self.symbols.uri_classes_index.write().remove(uri);
         self.symbol_maps.write().remove(uri);
         self.evict_reference_index_uri(uri);
         self.file_imports.write().remove(uri);

src/code_actions/change_visibility.rs

@@ -253,6 +253,7 @@ impl Backend {
     ) -> Option<u8> {
         // Find the enclosing ClassInfo from the uri_classes_index.
         let local_classes: Vec<Arc<ClassInfo>> = self
+            .symbols
             .uri_classes_index
             .read()
             .get(uri)

src/code_actions/import_class.rs

@@ -51,6 +51,7 @@ impl Backend {
         };
 
         let local_classes: Vec<crate::types::ClassInfo> = self
+            .symbols
             .uri_classes_index
             .read()
             .get(uri)
@@ -336,7 +337,7 @@ impl Backend {
 
         // ── 1. fqn_uri_index ──────────────────────────────────────────────
         {
-            let idx = self.fqn_uri_index.read();
+            let idx = self.symbols.fqn_uri_index.read();
             for fqn in idx.keys() {
                 if short_name(fqn).to_lowercase() == name_lower {
                     candidates.push(fqn.to_owned());
@@ -346,7 +347,7 @@ impl Backend {
 
         // ── 2. Class index ──────────────────────────────────────────────
         {
-            let cmap = self.fqn_uri_index.read();
+            let cmap = self.symbols.fqn_uri_index.read();
             for fqn in cmap.keys() {
                 if short_name(fqn).to_lowercase() == name_lower
                     && !candidates
@@ -360,7 +361,7 @@ impl Backend {
 
         // ── 3. uri_classes_index (already-parsed files) ───────────────────────────
         {
-            let amap = self.uri_classes_index.read();
+            let amap = self.symbols.uri_classes_index.read();
             for classes in amap.values() {
                 for cls in classes {
                     if cls.name.to_lowercase() == name_lower {
@@ -554,6 +555,7 @@ impl Backend {
         };
 
         let local_classes: Vec<crate::types::ClassInfo> = self
+            .symbols
             .uri_classes_index
             .read()
             .get(uri)
@@ -758,6 +760,7 @@ impl Backend {
         };
 
         let local_classes: Vec<crate::types::ClassInfo> = self
+            .symbols
             .uri_classes_index
             .read()
             .get(uri)