|
16 | 16 | from services.workspace_context import ( |
17 | 17 | WorkspaceContext, |
18 | 18 | enrich_workspace_context_from_global_db, |
| 19 | + resolve_invalid_workspace_aliases_cached, |
19 | 20 | resolve_workspace_context_cached, |
20 | 21 | ) |
21 | 22 | from services.workspace_db import ( |
|
28 | 29 | ) |
29 | 30 | from services.workspace_resolver import ( |
30 | 31 | determine_project_for_conversation, |
31 | | - infer_invalid_workspace_aliases, |
32 | 32 | lookup_workspace_display_name, |
33 | 33 | ) |
34 | 34 | from utils.cli_chat_reader import ( |
@@ -169,6 +169,9 @@ def prepare_workspace_orchestration( |
169 | 169 |
|
170 | 170 | def load_global_db_export_data( |
171 | 171 | orch: WorkspaceOrchestration, |
| 172 | + rules: list[Any], |
| 173 | + *, |
| 174 | + nocache: bool = False, |
172 | 175 | ) -> GlobalDbExportData | None: |
173 | 176 | """Load global DB maps needed for IDE composer export.""" |
174 | 177 | ctx = orch.ctx |
@@ -197,15 +200,13 @@ def load_global_db_export_data( |
197 | 200 | code_block_diff_map = load_code_block_diff_map(global_db) |
198 | 201 | ide_composer_rows = safe_fetchall(global_db, COMPOSER_ROWS_WITH_HEADERS_SQL) |
199 | 202 |
|
200 | | - invalid_workspace_aliases = infer_invalid_workspace_aliases( |
201 | | - composer_rows=ide_composer_rows, |
| 203 | + invalid_workspace_aliases = resolve_invalid_workspace_aliases_cached( |
| 204 | + ctx, |
| 205 | + global_db, |
| 206 | + orch.workspace_path, |
| 207 | + rules, |
| 208 | + nocache=nocache, |
202 | 209 | project_layouts_map=project_layouts_map, |
203 | | - project_name_map=ctx.project_name_to_workspace_id, |
204 | | - workspace_path_map=ctx.workspace_path_to_id, |
205 | | - workspace_entries=orch.workspace_entries, |
206 | | - bubble_map=bubble_map, |
207 | | - composer_id_to_ws=ctx.composer_id_to_workspace_id, |
208 | | - invalid_workspace_ids=ctx.invalid_workspace_ids, |
209 | 210 | ) |
210 | 211 |
|
211 | 212 | return GlobalDbExportData( |
@@ -503,7 +504,9 @@ def collect_export_entries( |
503 | 504 | exported: list[CollectedExportEntry] = [] |
504 | 505 |
|
505 | 506 | if include_composer: |
506 | | - db_data = load_global_db_export_data(orch) |
| 507 | + db_data = load_global_db_export_data( |
| 508 | + orch, exclusion_rules, nocache=effective_nocache, |
| 509 | + ) |
507 | 510 | if db_data is not None: |
508 | 511 | exported.extend( |
509 | 512 | _collect_ide_export_entries( |
|
0 commit comments