9eec79cc0eca06921784e9abf93f721202cab372
1071 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 ed
|
79c25a329f |
fix(layout): pre-run install of bundled INI before HelloImgui's load_user_pref
The previous followup fix ( |
||
|
ed
|
2afb0126a5 |
fix(layout): restore [Docking] structure + per-window DockId references in bundled INI
Tier 2's commit |
||
|
ed
|
e965451842 |
fix(layout): strip stale dockspace IDs from bundled INI; force live-session apply
Bundled layouts/default.ini (relocated from tests/artifacts/ in Phase 1) contained a [Docking] data block with a hardcoded DockSpace ID 0xAFBEEF01 plus per-window DockId references to nodes 0x10 and 0x11. Those IDs were captured at the time the layout was first generated; on any fresh session HelloImgui computes dockspace IDs dynamically (typically a hash of the dockspace name + creation order) so the hardcoded literal is stale by the first render and the orphan docking instructions are silently dropped. Result: window positions stored in the INI render the windows as floating at their absolute Pos coordinates, but the auto-created dockspace captures the full window body, hiding them all. User observed empty dockspace with only the menu ribbon rendering. Two-part fix: 1. layouts/default.ini: remove [Docking] data block and per-window DockId lines. Comment rewritten to explain why the auto-dock strategy is the only session-stable option. Each [Window] entry now has only Pos + Size + Collapsed=0, so HelloImgui's auto-dock layer places the panels as tabs in the central dockspace on first render. 2. _install_default_layout_if_empty: after writing the bundled INI to disk, also call imgui.load_ini_settings_from_memory(src_text) to force the live HelloImgui session to apply the new INI. Without this, the install only takes effect on the NEXT launch (since HelloImgui reads cwd/manualslop_layout.ini BEFORE the post_init callback fires). With it, first-launch panels appear immediately. Tests: - tests/test_default_layout_install.py assertions updated: instead of checking for a per-window DockId line, the install now verifies (a) [Window][Project Settings] entry exists, (b) the INI has at least one [Window] entry, (c) the INI has no [Docking] data block. - New _assert_live_session_apply() on tests 1 and 2 verifies the "(and applied to live session)" log line appears in stderr, confirming imgui.load_ini_settings_from_memory was invoked. 17/17 tests pass (3 install + 2 reset_layout + 8 adjacent gui/commands). |
||
|
ed
|
3b96628877 | chore(commands): remove dead test-fixture path from reset_layout | ||
|
ed
|
3d87f8e7ed |
fix(gui): wire _install_default_layout_if_empty_result into App._post_init
App._post_init now resolves src = paths.get_layouts_dir()/default.ini and dst = Path.cwd()/manualslop_layout.ini, then calls the drain-plane helper before the warmup-complete registration block. Errors drain to self._startup_timeline_errors per the data-oriented convention, so a missing bundled layout (e.g. partial wheel install) does not crash the GUI: panels just stay invisible until the user drops a real INI in. Test fix: test_default_layout_install._GUI_SCRIPT was a relative path, but the subprocess Popen runs with cwd = temp_workspace where sloppy.py does not exist. Switched to an absolute path via _PROJECT_ROOT, the same pattern conftest.py:648 uses for the live_gui fixture. |
||
|
ed
|
35f22e4dd3 |
test(layouts): RED phase tests for default layout install-on-empty-INI behavior
3 tests in tests/test_default_layout_install.py per spec G6/G7 acceptance:
- test_default_layout_installed_when_ini_missing
- test_default_layout_installed_when_ini_empty
- test_default_layout_NOT_installed_when_layout_present
Currently fail as expected (no install helper exists yet). Test 3 passes as
a positive control (custom user INI is preserved when no install logic
runs).
Subprocess spawn pattern: each test creates its own tmp_path workspace,
spawns sloppy.py without --enable-test-hooks (avoids port-8999 conflict
with the live_gui session fixture's subprocess), waits 5s, terminates
via taskkill /F /T, asserts on the saved INI content.
state.toml: phase 1 marked completed; tasks t1_1-t1_10 recorded with
SHA
|
||
|
ed
|
7577d7d28b |
chore(layouts): introduce layouts/ directory + src/layouts.py; relocate default layout asset
TIER-2 READ AGENTS.md, conductor/workflow.md, conductor/edit_workflow.md, conductor/tier2/githooks/forbidden-files.txt, conductor/tracks/tier2_leak_prevention_20260620/spec.md, conductor/code_styleguides/data_oriented_design.md, conductor/code_styleguides/error_handling.md, conductor/code_styleguides/type_aliases.md, conductor/product-guidelines.md, conductor/code_styleguides/python.md, docs/guide_meta_boundary.md before Phase 1 Task 1.10. Phase 1 of default_layout_install_20260629: - tests/artifacts/manualslop_layout_default.ini -> layouts/default.ini (git mv preserves history; same content, new parallel-to-themes home) - src/paths.py: layouts: Path field + SLOP_GLOBAL_LAYOUTS env override + get_layouts_dir() accessor (mirror themes at 60/83/150/210+) - src/layouts.py: new LayoutFile @dataclass(frozen=True, slots=True) + load_layouts_from_dir/file + load_layouts_from_disk consumer (mirror src/theme_models.py + src/theme_2.py; Result drain per error_handling) - tests/conftest.py:709: reads from layouts/default.ini |
||
|
ed
|
1bea0d23bf |
fix(test): correct filename typo manualslop.toml -> manual_slop.toml in project switch
Tier 2's project-switch fix (commit
|
||
|
ed
|
3c7455fdbe |
test(rag): wait for files setter before triggering RAG sync
The set_value('files', ...) call is async (push_event -> pending_gui_tasks
-> render loop). The RAG setters (rag_enabled, rag_source, rag_emb_provider)
are also async and each triggers a RAG sync via submit_io. The syncs and
the files setter are NOT ordered: the sync may fire before the files
setter is processed, in which case the sync sees self.files == [] and
skips the rebuild (RAG sync only triggers the rebuild if both
is_empty() AND self.files are truthy).
Fix: poll get_value('files') until the expected value is reflected,
guaranteeing the files setter is processed before the RAG setters
trigger their syncs. Belt-and-suspenders alongside the project-switch
fix from the previous commit.
The test was passing in
|
||
|
ed
|
455c17ffb2 |
test(rag): switch to workspace project explicitly before configuring RAG
Per Tier 1 addendum 3 (the real defect): tests hotpatch individual state
fields via set_value instead of calling the proper project-switch
flow. The session-scoped subprocess may be on a stale project from a
prior test (e.g. test_context_sim_live switches to
temp_livecontextsim.toml and never switches back). The RAG engine uses
active_project_root (derived from active_project_path) as its base_dir,
NOT ui_files_base_dir. So hotpatching files/rag_enabled via set_value
while active_project_path is stale leaves the RAG engine looking at a
dead dir.
Fix: switch to the workspace project explicitly at the start of the
test (like a user would) using client.push_event('custom_callback',
...) + client.wait_for_project_switch(...). The path must be absolute
because the subprocess's CWD is the workspace, so a relative path
like 'tests/artifacts/.../manualslop.toml' would resolve to the wrong
dir from the subprocess's CWD.
Verified: the switch fires successfully (no WARNING printed). But the
RAG search still returns 0 chunks — the index_file rebuild is not
adding the files. The exact cause is still under investigation.
This is the proper fix per Tier 1 (NOT "delete stale files" which
treats the symptom). The sim tests' teardown() also needs a switch-back
to the workspace project (separate track).
|
||
|
ed
|
ab16f2f278 |
fix(rag): stop live_gui tests from polluting session-scoped subprocess
Per Tier 1 investigation (docs/reports/INVESTIGATION_rag_phase4_final_verify_20260627.md), two live_gui tests were leaking temp/relative paths into the shared subprocess's ui_files_base_dir, which survived across @clean_baseline tests and caused RAGEngine.index_file to silently no-op on a dead base_dir. Three fixes: 1. tests/test_rag_visual_sim.py: stop using tempfile.mkdtemp() (which defaults to C:\Users\Ed\AppData\Local\Temp\tmpXXXX) and instead use tempfile.mkdtemp(dir="tests/artifacts", ...). Also restore files_base_dir and rag_enabled in finally so the next live_gui test in the session doesn't inherit the dead path. 2. tests/test_visual_sim_mma_v2.py: stop changing files_base_dir to 'tests/artifacts/temp_workspace' and stop clicking btn_project_save (which persisted the path to manual_slop.toml). The MMA lifecycle does not depend on a specific files_base_dir. 3. src/app_controller.py _handle_reset_session: defensive fix that resets ui_files_base_dir from the default project's base_dir. This makes reset_session() robust to any future polluter (not just the two known ones). Without this, a test that sets files_base_dir via set_value leaves a dead path in the session-scoped subprocess even after reset_session(). Verified: tests/test_rag_visual_sim.py passes 2/2 after the fix. |
||
|
ed
|
e58d332e31 |
test(rag): update dim mismatch test + stress test for new implementation
- tests/test_rag_engine.py: The dim mismatch test was written for the
old delete_collection implementation. The new implementation uses
shutil.rmtree + new PersistentClient (per commit
|
||
|
ed
|
4d2a6666a4 |
fix(rag): convert RAGChunk to dict in _rag_search_result to match type contract
The RAG engine's search() returns List[RAGChunk] (dataclass instances),
but _rag_search_result's return type is Result[list[Metadata]] (a list
of dicts). The previous code returned the RAGChunks as-is, then the
caller in _handle_request_event did chunk["metadata"] (dict access
on a dataclass) which raised TypeError. The exception was silently
swallowed by the submit_io worker, leaving ai_status stuck at
sending... for the full 50-second test poll before failing.
Two surgical changes:
1. _rag_search_result: convert RAGChunk to dict via to_dict() (with a
hasattr guard for tests that return dicts directly). Matches the
function's documented return type.
2. _handle_request_event: use isinstance guards + dict.get() on the
chunk fields. Defensive against the type mismatch and matches the
dict contract.
The test fix (unique collection name + workspace-targeted cleanup)
is the test-side complement that prevents the dim-mismatch path from
being hit in batched runs.
Verified: 4 consecutive PASS runs of test_rag_phase4_final_verify in
isolation (7-8s each). 25/26 RAG tests pass; the one remaining
failure (test_rag_collection_dim_mismatch_recreates_collection) is a
pre-existing regression from commit
|
||
|
ed
|
d28e373e54 |
fix(mock_concurrent_mma): remove session_id fallback from worker check
Root cause discovered after the user's batched test run revealed the
stress test still failed when run after the execution test. The
gemini_cli_adapter persists session_id across tests (singleton). The
execution test set session_id to 'mock-worker-ticket-A-1' (from the
worker call). When the stress test's epic call ran, it used
--resume with that stale session_id. The mock's worker check had
a session_id fallback:
if 'You are assigned to Ticket' in prompt or session_id.startswith('mock-worker-'):
...worker response...
The fallback incorrectly matched the stress test's epic call
(which used the stale worker session_id), causing the mock to return
a worker response instead of an epic response. The production's
generate_tracks then failed to parse the response, returning 0 tracks.
Fix: remove the session_id.startswith('mock-worker-') fallback. Route
workers based on prompt content only. The session_id is for the
production's session management, not for the mock's routing.
This is a 'fix the test infrastructure' change (the mock is a test
artifact, not production). The production's gemini_cli_adapter could
also be fixed to reset session_id on reset_session(), but that's
out of scope for this track.
Verified: the failing test combination (execution test before
stress test) was reproduced and the fix resolves it. The isolated
stress test still passes (3 consecutive runs).
Note: a separate issue was discovered where self.tracks is being
replaced between track appends (different id(self.tracks) values
in the diagnostic log). This causes the API to read 0 tracks after
the accept. The root cause is unclear from this session's
investigation; it appears to be a production code issue where the
in-memory track state is being overwritten by a disk read from
a different project path. This is documented as a follow-up.
|
||
|
ed
|
fad1755b7d |
fix(mock_concurrent_mma): make epic branch a catch-all for non-empty prompts
The stress test (tests/test_mma_concurrent_tracks_stress_sim.py) uses mma_epic_input='STRESS TEST: TRACK A AND TRACK B', which the mock's epic branch did NOT match (it only matched 'PATH: Epic Initialization'). The stress prompt fell to the Default branch which returns text (not JSON), and the production's orchestrator_pm.generate_tracks failed to parse it, returning 0 tracks. The test polled for proposed_tracks (60s timeout, never broke), clicked accept (no proposed_tracks to process), then asserted tracks >= 2 and found 0. Root cause: the mock's epic branch was a literal-substring check for a single test-specific prompt. It was not robust to other test prompts. Fix: restructure routing so that sprint and worker are checked first (more specific patterns), and ANY non-empty prompt that does not match those patterns is treated as an epic request (returns 2 tracks). Empty prompts fall to the Default branch. Verification: - test_mma_concurrent_tracks_execution: still PASSES (uses 'PATH: Epic Initialization' which matches the new catch-all since it doesn't contain sprint or worker patterns) - test_mma_concurrent_tracks_stress_sim: now PASSES (uses 'STRESS TEST: TRACK A AND TRACK B' which matches the new catch-all) - 3 consecutive PASS runs of both tests (13.94s, 14.81s, 14.13s) This is 'adjust the tests instead' per user directive - the mock is a test artifact, not production. The production's generate_tracks correctly returns [] for unparseable responses; the test mock should be robust enough to return valid JSON for any epic-like prompt. |
||
|
ed
|
913aa48ca9 |
fix(mock_concurrent_mma): route sprints on prompt content not session_id
The prior session_id-based routing (added in
|
||
|
ed
|
635ca5523d |
fix(mma_concurrent_tracks): partial fix for production+mock regression
This test was failing for multiple stacked reasons. Fixed the ones I
could identify but the test still does not pass (the bg_task for the
second track does not run, suggesting a deeper integration issue).
Fixes:
1. src/app_controller.py: _start_track_logic_result and _cb_plan_epic both
mutated the frozen ProjectContext dataclass returned by flat_config()
via flat.setdefault('files', {})['paths'] = .... The flat_config()
return type was changed from dict[str, Any] to a frozen @dataclass
ProjectContext by cruft_elimination Phase 2 (in
|
||
|
ed
|
b1485f759f |
fix(test_gui2_parity): poll for set_value/click to propagate instead of time.sleep
The 'time.sleep + assert' pattern is a guaranteed race condition in batched
runs (per workflow's documented anti-pattern). In the live_gui batched test
suite, _process_pending_gui_tasks is competing for CPU with 16 xdist
workers, so 1.5s is sometimes not enough for a single set_value or click
to propagate through the gui task queue.
Fix: replace time.sleep(1.5) with a 10s poll loop that waits for the
expected state (per the same pattern used in test_gui2_custom_callback_hook_works
which was already fixed in commit
|
||
|
ed
|
a4901fa24a |
fix(post_de_cruft_iter4): fix 3 new failures revealed by full batched run
1. tier-1-unit-core::test_app_controller_warmup_done_ts_none_until_completed
- Race condition: warmup_done_ts was set before the test could read it
(warmup runs in a background thread that can complete in milliseconds).
- Fix: use defer_warmup=True + call start_warmup() explicitly so we can
observe the initial state before warmup begins.
2. tier-1-unit-core::test_fetch_models_aggregates_per_provider_errors
- Race condition: _fetch_models submits do_fetch to the IO pool; the
test asserted _model_fetch_errors synchronously before the worker ran.
- Fix: call wait_io_pool_idle() before asserting the side effect.
- Test passes in isolation but fails when run as part of the full file
(IO pool is hot from prior tests).
3. tier-3-live_gui::test_context_sim_live
- Production bug: _do_generate mutated the frozen ProjectContext dataclass
returned by flat_config (flat['files'] = ...). flat_config was converted
from dict[str, Any] to ProjectContext dataclass by cruft_elimination_20260627
Phase 2 but the consumer code wasn't updated.
- Fix: call flat.to_dict() to get a mutable dict before mutation.
- Same bug existed in /api/project endpoint (returns the ProjectContext
directly; json.dumps fails silently on dataclass), now also calls
to_dict() at the wire boundary.
|
||
|
ed
|
b3aeaa4376 |
fix(post_de_cruft_iter2): fix 3 pre-existing test failures + lazy tomli_w imports
1. tier-1-unit-core::test_audit_script_exits_zero
- audit_main_thread_imports.py failed with 3 heavy top-level imports
- Made tomli_w lazy in src/personas.py, src/tool_presets.py, src/workspace_manager.py
- Made 'from scripts import py_struct_tools' lazy inside src/mcp_client.py:dispatch()
- Audit now exits 0 (28 files in main-thread import graph, no heavy top-level imports)
2. tier-2-mock-app-headless::test_status_endpoint_authorized
- /status endpoint goes through _api_status() which returns controller.ai_status (default 'idle'),
not the literal 'ok' string the test expected
- Updated test to expect 'idle' (the actual ai_status default for a fresh controller)
3. tier-3-live_gui::test_auto_switch_sim
- _capture_workspace_profile() in src/gui_2.py referenced 'WorkspaceProfile' as a bare name,
but the module had only 'from src import workspace_manager' (the module, not the class)
- Added 'from src.workspace_manager import WorkspaceProfile' to fix the NameError
- Profile save/load round-trip now works; auto-switch fires Tier 3 bound profile
Additional test fixes (uncovered by full run):
- tests/test_cruft_removal.py: patch 'src.mcp_client.py_struct_tools' no longer works
(lazy import means the attribute doesn't exist). Patched 'scripts.py_struct_tools.py_remove_def'
and '.py_move_def' directly at the source module.
- tests/test_command_palette_sim.py: 'from src.command_palette' was deleted in
module_taxonomy_refactor; updated to 'from src.commands' (which now hosts _close_palette,
_execute, and Command after the merge).
Production fix:
- src/presets.py:save_preset now raises ValueError when scope='project' but
project_root is None (fail-fast per error_handling.md, prevents silent
write to '.').
Type registry regenerated to reflect new line numbers.
|
||
|
ed
|
c1dfe7b29f |
fix(tests,app_controller): 4 pre-existing test failures
Pre-existing failures unrelated to the de-cruft work; fix tests/production: 1. test_save_preset_project_no_root — production src/presets.py:save_preset now raises ValueError when project_root is None and scope='project' (was trying to write to '.' which the test_sandbox blocks). 2. test_handle_request_event_appends_definitions — production _symbol_resolution_result now normalizes dict file_items to .path access (was assuming FileItem dataclass). 3. test_rejection_prevents_dispatch — test now expects '' (empty string sentinel) for rejected dispatch. Did NOT change production signature to Optional[str] (which is banned per error_handling.md). Production still returns str per its signature; '' is the canonical sentinel for 'no dispatch happened'. 4. test_keyboard_shortcut_check_in_gui_func — test now patches src.gui_2.get_bg (the current function) instead of the deleted src.gui_2.bg_shader module. BackgroundShader class was moved from src/bg_shader.py into src/gui_2.py in module_taxonomy_refactor Phase 1.1. After this commit: - tier-1-unit-comms: 0 failures - tier-1-unit-core: 0 failures (of 1418 tests) - tier-1-unit-mma: 0 failures - tier-1-unit-gui: 0 failures - tier-1-unit-headless: 0 failures - tier-2-mock-app-comms: 0 failures - tier-2-mock-app-core: 0 failures - tier-2-mock-app-gui: 0 failures - tier-2-mock-app-mma: 0 failures Remaining: tier-2-mock-app-headless (3 FastAPI response shape mismatches) and tier-3-live-gui (test_auto_switch_sim). |
||
|
ed
|
b15955c80e |
chore: stage remaining post-de-cruft fixes (src/test artifacts)
Staged-but-not-yet-fixed file artifacts from the post_module_taxonomy_de_cruft followup. These are mostly minor — direct-import migrations that landed in the prior commits were not applied to a few remaining files because the broken-script placement issues were non-trivial. For Tier 1 followup: - src/commands.py — unused 'from src import models' removed by migration - src/mcp_client.py — verified to no longer have the circular self-import - src/models.py — clean 38-line final state (Metadata alias + PROVIDERS lazy __getattr__) - src/multi_agent_conductor.py, src/project_manager.py, src/rag_engine.py — bare 'from src import models' lines replaced with direct imports - 12 test_*.py files — direct imports of moved classes added (FileItem, Ticket, MCPServerConfig, MCPConfiguration, load_mcp_config, RAGConfig, VectorStoreConfig, NamedViewPreset, ContextFileEntry, ContextPreset, Persona, BiasProfile, parse_history_entries) - docs/type_registry/src_mcp_client.md — regenerated via type_registry script No production behavior changes here. These are the residual direct-import migrations the migration script already completed. Some are tracked in the end_of_session report for Tier 1 followup. |
||
|
ed
|
ee763eea98 |
fix(imports): complete migration from 'from src import models' to direct subsystem imports
Replaces the broken-script-generated imports in src/ and tests/ with clean direct imports from the destination modules. Per user directive: 'we should adjust the tests instead' — no legacy __getattr__ shim is re-introduced. Key fixes: - src/mcp_client.py: remove self-import (MCPServerConfig etc. are defined locally; the script's module-top self-import caused the circular ImportError blocking all 11 test tiers) - src/gui_2.py: add missing module-top imports for FileItem, ContextFileEntry, ContextPreset, Tool, Persona, BiasProfile, parse_history_entries; remove broken-script local imports inside function bodies - src/app_controller.py: remove FileItem/FileItems from the type_aliases import block (was shadowing the direct import with the forward-reference TypeAlias string, breaking isinstance() calls); confirm isinstance() now works - src/commands.py: script correctly removed unused 'from src import models' - tests/test_models_no_top_level_tomli_w.py: import save_config_to_disk from src.project (no legacy shim back in models.py) - tests/test_rag_engine_ready_status_bug.py: import RAGConfig and VectorStoreConfig from src.mcp_client - tests/test_gui_2_result.py: patch src.gui_2.Persona/BiasProfile (gui_2 binds at module load; src.personas patch doesn't affect the gui_2 namespace) - tests/test_gui_2_result.py: patch src.gui_2.parse_diff (it lives in gui_2, not patch_modal) - tests/test_generate_type_registry.py: Metadata is now a dataclass in src_type_aliases.md (not a TypeAlias in type_aliases.md); src_models.md is no longer generated (src/models.py has no dataclasses after the de-cruft track) No local imports inside function bodies (per python.md §17.9a). All new imports are at module top with surgical edits. |
||
|
ed
|
9651514c85 |
fix(tests): update consumer sites to import Pydantic proxies from src.api_hooks
Per Tier 1 review of post_module_taxonomy_de_cruft_20260627 (the commit |
||
|
ed
|
9e07fac1db |
refactor(consumers): replace 'models.<moved_class>' with direct imports
Per post_module_taxonomy_de_cruft_20260627 Phase 2 (FR7 continued).
The previous migration commit (
|
||
|
ed
|
91a612887c |
Merge origin/tier2/module_taxonomy_refactor_20260627: bring in v2 SHIPPED work
Per post_module_taxonomy_de_cruft_20260627 Phase 0 prerequisite. Master is at |
||
|
ed
|
8f11340b38 |
refactor(consumers): migrate 85 'from src.models import' sites to direct subsystem imports
Per post_module_taxonomy_de_cruft_20260627 Phase 2 (FR7). Each
'from src.models import X' for a moved class is rewritten to
'from src.<destination> import X':
Ticket, Track, WorkerContext, TrackState, TrackMetadata,
ThinkingSegment, EMPTY_TRACK_STATE -> src.mma
ProjectContext, ProjectMeta, ProjectOutput, ProjectFiles,
ProjectScreenshots, ProjectDiscussion, EMPTY_PROJECT_CONTEXT -> src.project
FileItem, Preset, ContextPreset, ContextFileEntry,
NamedViewPreset -> src.project_files
Tool, ToolPreset -> src.tool_presets
BiasProfile -> src.tool_bias
TextEditorConfig, ExternalEditorConfig,
EMPTY_TEXT_EDITOR_CONFIG -> src.external_editor
Persona -> src.personas
WorkspaceProfile -> src.workspace_manager
MCPServerConfig, MCPConfiguration, VectorStoreConfig,
RAGConfig, load_mcp_config -> src.mcp_client
NOT touched (kept on src.models; Phase 3 or Phase 4 will move them):
GenerateRequest, ConfirmRequest, DEFAULT_TOOL_CATEGORIES, Metadata, PROVIDERS
Migration was performed by the one-time script
scripts/tier2/artifacts/post_module_taxonomy_de_cruft_20260627/migrate_imports.py
which uses a class-to-module map and re.sub() to rewrite each
'from src.models import X' line.
Total: 85 import lines rewritten across 71 files.
Note: this commit depends on the v2 SHIPPED work
(origin/tier2/module_taxonomy_refactor_20260627) being merged into
this branch NEXT. On master (without the v2 SHIPPED commits), the
destination modules do not exist and these imports would fail.
|
||
|
ed
|
779d504c70 |
refactor(mcp_tool_specs): delete redundant AGENT_TOOL_NAMES; use tool_names() at consumer sites
AGENT_TOOL_NAMES was a hardcoded snapshot of mcp_tool_specs.tool_names()
in src/models.py. The pre-existing test
test_tool_names_subset_of_models_agent_tool_names literally asserted
'tool_names() ⊆ AGENT_TOOL_NAMES' (proving the redundancy), and
AGENT_TOOL_NAMES was not maintained in lockstep with the registry
(it would silently drift if a new tool was added).
This commit:
1. Deletes AGENT_TOOL_NAMES from src/models.py (replaced by an
explanatory comment in the Constants section).
2. Updates 3 consumer sites in src/app_controller.py:
- 'for t in models.AGENT_TOOL_NAMES' -> 'for t in mcp_tool_specs.tool_names()'
- (in 2 methods: __init__ + a setter)
3. Updates 2 test sites in tests/test_arch_boundary_phase2.py:
- 'from src.models import AGENT_TOOL_NAMES' -> 'from src import mcp_tool_specs'
- 'AGENT_TOOL_NAMES' references -> 'mcp_tool_specs.tool_names()'
4. Removes the tautology test
test_tool_names_subset_of_models_agent_tool_names from
tests/test_mcp_tool_specs.py (it asserted 'AGENT_TOOL_NAMES
superset of tool_names()' which becomes meaningless after
AGENT_TOOL_NAMES is deleted). Also removes the now-unused
'from src import models' import from that test file.
Verification: VC9
git grep 'AGENT_TOOL_NAMES' -- 'src/*.py' 'tests/*.py' # 0 hits
from src import mcp_tool_specs
mcp_tool_specs.tool_names() # returns the canonical 45 tools
from src.app_controller import AppController # uses the new path
Tests verified (15/16 PASS; 1 pre-existing failure unrelated to this
commit):
tests/test_arch_boundary_phase2.py (6 tests; 1 pre-existing
failure: test_rejection_prevents_dispatch
is a dialog-mock issue that
predates Phase 4)
tests/test_mcp_tool_specs.py (10 tests; the tautology test was removed;
the remaining 10 pass)
|
||
|
ed
|
e430df86f1 |
refactor(project): create src/project.py with ProjectContext + 5 sub + config IO (split from models.py)
Per the 4-criteria decision rule (C1=cross-system, C3=tests, C4=size);
ProjectContext is the typed return of project_manager.flat_config();
the 5 sub-dataclasses model the actual nested dict structure of
flat_config()'s return; load_config_from_disk / save_config_to_disk
are the canonical config I/O primitives (renamed from the private
_load_config_from_disk / _save_config_to_disk).
This commit:
1. Creates src/project.py with ProjectContext + 5 sub (ProjectMeta,
ProjectOutput, ProjectFiles, ProjectScreenshots, ProjectDiscussion)
+ EMPTY_PROJECT_CONTEXT + _clean_nones + load_config_from_disk +
save_config_to_disk + parse_history_entries.
2. Removes the original class + function definitions from src/models.py.
3. Adds backward-compat re-exports in src/models.py (the same pattern
used by Phase 3a mma.py and Phase 3g personas.py).
4. Updates src/app_controller.py to use the new public function names
(load_config_from_disk / save_config_to_disk).
5. Updates tests/test_models_no_top_level_tomli_w.py to use the new
public name (the test still asserts lazy-loading; the lazy load
happens in the new project.py module).
6. Updates scripts/audit_no_models_config_io.py FORBIDDEN_PATTERNS to
reference the new public names (models.load_config_from_disk /
models.save_config_to_disk) + the new src.project path.
Verification: VC6
uv run python -c 'from src.project import ProjectContext, ProjectMeta,
ProjectOutput, ProjectFiles, ProjectScreenshots, ProjectDiscussion,
_clean_nones, load_config_from_disk, save_config_to_disk,
parse_history_entries' # OK
uv run python -c 'from src.models import ProjectContext, ...' # OK
(re-exports work)
Pre-existing test regression (NOT caused by this commit):
tests/test_models_no_top_level_tomli_w.py::test_models_does_not_import_tomli_w_at_module_level
was already failing because the Phase 3g 'from src.personas import Persona'
re-export in src/models.py loads src.personas at module level, which
loads tomli_w. The Phase 5 reduce-models.py pass moves the persona
import into __getattr__ (lazy), which will make this test pass again.
Tests verified: tests/test_project_context_20260627.py (10/10 PASS),
tests/test_project_serialization.py (2/2 PASS), tests/test_thinking_persistence.py
(4/4 PASS), tests/test_presets.py (3/3 PASS), tests/test_persona_models.py
(2/2 PASS), tests/test_ticket_queue.py (PASS), tests/test_dag_engine.py
(PASS), tests/test_orchestration_logic.py (PASS).
|
||
|
ed
|
770c2fdb32 |
feat(audit): add audit_imports.py + warmed-import whitelist for §17.9a
Implements the 7th audit script referenced in python.md §17.8. Scans src/*.py for local imports (§17.9a), _PREFIX aliasing (§17.9b), and repeated .from_dict() in the same expression (§17.9c, info-only). Three changes in this commit: 1. scripts/audit_imports.py: AST-based scanner; exits 1 in --strict on LOCAL_IMPORT or PREFIX_ALIAS. Whitelist-aware via scripts/audit_imports_whitelist.toml (load with --show-whitelist; disable with --no-whitelist). 2. scripts/audit_imports_whitelist.toml: 21 files whitelisted with per-file reason (vendor SDK warmup, hot-reload re-imports, circular-dep avoidance). Suppresses 187 LOCAL_IMPORT sites; 0 strict violations remain. 3. conductor/code_styleguides/python.md: updated §17.8 (4th audit entry) and §17.9a (3 documented exceptions + whitelist mechanism). Tests: tests/test_audit_imports.py (7 tests, all passing). |
||
|
ed
|
d9cd7c557b |
refactor(ai_client,gui_2): merge vendor_state split: VendorMetric -> ai_client, get_vendor_state (renamed _get_vendor_state_metrics) -> gui_2; git rm src/vendor_state.py
Per spec FR2 + Phase 2.2 + architecture feedback (data != view):
- VendorMetric (data) -> src/ai_client.py (alongside VendorCapabilities; all vendor data)
- get_vendor_state -> renamed to _get_vendor_state_metrics in src/gui_2.py
(it's a view-helper that builds the metrics for render_vendor_state's table)
- render_vendor_state in gui_2.py now calls _get_vendor_state_metrics directly
Tests:
- tests/test_vendor_state.py: imports get_vendor_state from src.gui_2, VendorMetric from src.ai_client
|
||
|
ed
|
81d8bce419 |
refactor(ai_client): merge vendor_capabilities into ai_client; git rm src/vendor_capabilities.py
Per spec FR2 + Phase 2.1: VendorCapabilities + register + get_capabilities + list_models_for_vendor + the ~40 vendor registrations move into ai_client.py as a region block. Renamed internal _REGISTRY to _VENDOR_REGISTRY to avoid collision with mcp_tool_specs._REGISTRY. Importers (in src/) updated: - src/ai_client.py: removed top-level import; removed 4 local imports of list_models_for_vendor/get_capabilities (symbol now in module namespace) - src/app_controller.py: 2 sites updated to 'from src.ai_client import get_capabilities' - src/gui_2.py: 1 site updated to 'from src.ai_client import VendorCapabilities, get_capabilities' Tests updated: - 8 test_*.py files: changed 'from src.vendor_capabilities import' to 'from src.ai_client import' - tests/test_vendor_capabilities.py: _clean_registry fixture updated to reference src.ai_client._VENDOR_REGISTRY (was src.vendor_capabilities._REGISTRY) Verification: 157 tests pass across the affected files (vendor_capabilities, ai_client_tool_loop variants, openai_compatible, command_palette, diff_viewer, patch_modal, app_controller_result, app_controller_sigint, handle_reset_session, ai_loop_regressions, grok/llama/minimax provider tests). |
||
|
ed
|
163b12493b |
refactor(gui_2,patch_modal): merge diff_viewer ops into gui_2; data classes (DiffHunk/DiffFile) move to patch_modal.py alongside PendingPatch; git rm src/diff_viewer.py
Per spec FR1 + Phase 1.4 + architecture feedback (data != view): - Data classes DiffHunk, DiffFile -> src/patch_modal.py (alongside PendingPatch; all patch-domain data) - Operations parse_diff/parse_hunk_header/get_line_color/apply_patch_to_file (called by gui_2) -> src/gui_2.py - GUI is a pure view; data lives elsewhere; no new files per AGENTS.md Tests: tests/test_diff_viewer.py imports from src.gui_2 (parse_diff/apply_patch_to_file) and src.patch_modal (DiffFile/DiffHunk). |
||
|
ed
|
3dd153f718 |
refactor(gui_2): merge command_palette; split registry->commands + render->gui_2; git rm src/command_palette.py
Per spec FR1 + Phase 1.3 + architecture feedback: src/command_palette.py
split by responsibility:
- Command/ScoredCommand/CommandRegistry/fuzzy_match/_close_palette/_execute (data/ops)
-> src/commands.py (which already owns _LazyCommandRegistry pattern)
- render_palette_modal (view/ImGui) -> src/gui_2.py
GUI is a pure view; the registry/data classes are ops; commands.py owns
the registry because commands.py is where @registry.register decorators live.
gui_2.render_palette_modal imports Command from commands.py to type its
parameters.
Also fixes Phase 1.1 (bg_shader) per architecture feedback:
BackgroundShader no longer owns 'enabled' state - the GUI is pure view.
State is now owned by AppController.bg_shader_enabled (read on load from
config, written from gui_2 checkbox via app's __setattr__ delegation).
Tests:
- tests/test_command_palette.py: imports from src.commands (was src.command_palette)
- tests/test_commands_no_top_level_command_palette.py: rewritten for the
new architecture (eager registry in commands.py; render in gui_2; no
circular import between commands.py and gui_2)
|
||
|
ed
|
805a06197b |
feat(models,project_manager): add ProjectContext + 5 sub-dataclasses (Phase 2 / VC8)
Phase 2: Fix flat_config to return typed ProjectContext (FR8 / VC8)
Before: def flat_config(...) -> Metadata (returned dict[str, Any])
After: def flat_config(...) -> ProjectContext (typed fat struct)
Delta: -1 anonymous dict return type; +6 new dataclasses
Per SPEC_CORRECTION_phase_2.md, this is Option A (incremental):
- Add 6 sub-dataclasses: ProjectMeta, ProjectOutput, ProjectFiles,
ProjectScreenshots, ProjectDiscussion, ProjectContext
- Each matches the nested dict shape of flat_config()'s actual return
- ProjectContext has dict-compat methods (__getitem__ + get) so
consumers using .get() / [] continue to work unchanged
- ProjectContext.to_dict() returns the legacy dict shape for migration
- EMPTY_PROJECT_CONTEXT sentinel exported
File locations per spec:
- src/models.py: 6 new dataclasses + EMPTY_PROJECT_CONTEXT sentinel
- src/project_manager.py: flat_config body rewritten to construct
ProjectContext from the proj dict (typed return type)
- tests/test_project_context_20260627.py: NEW regression-guard test file
with 10 tests covering: imports, return type, zero defaults, full
input, dict-compat __getitem__/get, to_dict round-trip, sentinel,
output_dir required field, consumer patterns unchanged
Verification:
- audit_weak_types --strict: OK (96 <= 112 baseline; down from 107)
- generate_type_registry: 23 files regenerated
- 10 test_project_context_20260627 tests PASS
- All existing consumer tests pass (test_context_composition_decoupled: 2,
test_orchestrator_pm: 3, test_orchestration_logic: 8,
test_orchestrator_pm_history + test_context_preview_button: 7,
test_project_manager_tracks: 4, test_track_state_persistence: 1)
VC8 (corrected) verification:
- flat_config returns ProjectContext (typed) ✓
- All 6 sub-dataclasses exist + importable ✓
- Dict-compat methods (ctx["key"], ctx.get("key")) work ✓
- output_dir REQUIRED field defaults to "" (empty, but valid) ✓
- Consumer patterns (ctx.get("output", {}).get("namespace", "project"))
work unchanged via dict-compat ✓
Phase 2 IS COMPLETE.
|
||
|
ed
|
3a80b65692 |
refactor(multiple): complete Phase 6 Optional[T] elimination (batches 4 + 5)
Phase 6: Eliminate Optional[T] returns - BATCHES 4 + 5 (FINAL) Before: 11 more Optional[T] returns removed (Phase 6 total: 30 of 30) After: 0 (Phase 6 COMPLETE per VC5) Delta: -11 sites in this commit; cumulative -30/30 sites across all batches Specific changes: - src/diff_viewer.py:27: parse_hunk_header returns (-1, -1, -1, -1) sentinel on parse failure (2x `return None` -> `return (-1, -1, -1, -1)`) - src/external_editor.py:23,84,97: get_editor / _find_vscode_common_paths / auto_detect_vscode all return TextEditorConfig or str with zero-init defaults (no longer Optional) - src/external_editor.py:48: launch_diff_result sentinel check changed from `if not editor:` to `if not editor.name or not editor.path:` - src/file_cache.py:549,608,646,705,799,858: 6 nested walk/deep_search helper functions now return tree_sitter.Node (root) instead of Optional[tree_sitter.Node] (None) - src/models.py:691,728: TextEditorConfig defaults added (name="", path=""); EMPTY_TEXT_EDITOR_CONFIG sentinel; ExternalEditorConfig.get_default returns EMPTY_TEXT_EDITOR_CONFIG when no editors configured - src/file_cache.py:895: get_file_id returns "" (was Optional[str]) Test updates: - tests/test_diff_viewer.py: still passes (parse_hunk_header tested) - tests/test_external_editor.py:78,97: is None -> == "" check (config.get_default, get_editor for unknown name) Verification: - audit_weak_types --strict: OK (107 <= 112 baseline) - py_check_syntax: OK on all changed files - 85+ tests pass (test_file_cache, test_ast_parser, test_external_editor, test_diff_viewer, test_fuzzy_anchor, test_summary_cache, test_paths, test_persona_models, test_patch_modal, test_parallel_execution, test_track_state_persistence, test_session_logger_optimization, + 117 in broader run) VC5 (Zero Optional[T] return types) PASSES: git grep -cE "-> Optional\\[" -- 'src/*.py' returns 0 PHASE 6 IS COMPLETE. REMAINING WORK: - Phase 7: Eliminate Any + dict[str, Any] in internal signatures (59+ sites) - Phase 8: Final re-measure + verification - Phase 9: Boundary layer audit (done) |
||
|
ed
|
ba3eb0c090 |
refactor(multiple): continue Phase 6 Optional[T] elimination (batch 2)
Phase 6: Eliminate Optional[T] returns - BATCH 2 of 7
Before: 7 more Optional[T] returns removed
After: 0 in command_palette.py, diff_viewer.py, fuzzy_anchor.py,
multi_agent_conductor.py, patch_modal.py, app_controller.py
Delta: -7 sites (cumulative: -15 of 30)
Specific changes:
- src/command_palette.py:50: CommandRegistry.get() returns Command (zero-init
sentinel: id="", title="", category="uncategorized", action=lambda: None)
- src/diff_viewer.py:117: get_line_color returns "" when no marker prefix
- src/fuzzy_anchor.py:40: FuzzyAnchor.resolve_slice returns (-1, -1) sentinel
(replaced 3x `return None` with `return (-1, -1)`)
- src/multi_agent_conductor.py:64: WorkerPool.spawn returns threading.Thread()
(empty sentinel, not started) when pool is full
- src/patch_modal.py:33: PatchModalManager.get_pending_patch returns
PendingPatch; class has EMPTY_PATCH sentinel; field type changed from
Optional[PendingPatch] to PendingPatch; 2x `= None` reset replaced with
`= EMPTY_PATCH`
- src/app_controller.py:4414: _confirm_and_run returns "" when not approved
(was Optional[str] returning None)
Test updates:
- tests/test_diff_viewer.py:95: get_line_color(" context") == ""
- tests/test_fuzzy_anchor.py:42,59: assert result == (-1, -1)
- tests/test_parallel_execution.py:31: t3 sentinel is now unstarted thread
(check via not t3.is_alive())
- tests/test_patch_modal.py:9,31,78: get_pending_patch() == "" sentinel check
Verification:
- audit_weak_types --strict: OK (107 <= 112 baseline)
- 22+ tests pass (test_diff_viewer, test_fuzzy_anchor,
test_parallel_execution, test_patch_modal, test_command_palette)
- py_check_syntax: OK on all changed files
REMAINING: ~15 Optional[T] returns in:
- src/external_editor.py (3)
- src/file_cache.py (7)
- src/diff_viewer.py: parse_hunk_header (1)
- src/models.py: ExternalEditorConfig.get_default (1)
- src/project_manager.py: load_track_state (1)
- src/session_logger.py: log_tool_call (1)
- src/app_controller.py: _pending_mma_spawn, _pending_mma_approval (2)
|
||
|
ed
|
c12d5b6d82 |
refactor(models,paths,presets,summary_cache): remove Optional returns (Phase 6 batch 1)
Phase 6: Eliminate Optional[T] returns (FR5) - BATCH 1 of 7
Before: 8 Optional[T] return types across 4 files
After: 0 (replaced with default-zero return values)
Delta: -8 sites
Per conductor/code_styleguides/error_handling.md "Optional[X] ban":
- "Use Result[T] for any function that can fail at runtime."
- "Use nil-sentinel dataclasses for 'no result'."
For accessor-style returns (lookup or zero-default), convert to:
- Optional[str] -> str with default "" (empty string sentinel)
- Optional[float] -> float with default 0.0
- Optional[int] -> int with default 0
- Optional[Path] -> Path with default Path("") or project_root
Specific changes:
- src/models.py:765-789: Persona.provider/model/temperature/top_p/max_output_tokens
(Optional[str]/[float]/[int] -> str/float/int with default zero values)
- src/paths.py:255: _get_project_conductor_dir_from_toml returns project_root
when no [conductor].dir override is configured (was Optional[Path] returning None)
- src/presets.py:21: project_path property returns Path("") when no project_root
(was Optional[Path] returning None)
- src/summary_cache.py:57: get_summary returns "" when hash mismatch (was
Optional[str] returning None)
Test updates:
- tests/test_persona_models.py:64-69: test_persona_defaults now expects
"" / 0.0 instead of None
- tests/test_summary_cache.py:25, 32, 58: get_summary assertions now
expect "" instead of None
Verification:
- audit_weak_types --strict: OK (107 <= 112 baseline)
- 13 tests pass (test_summary_cache, test_paths, test_presets,
test_persona_models)
- py_check_syntax: OK on all changed files
REMAINING: ~22 Optional[T] returns in:
- src/command_palette.py (1)
- src/diff_viewer.py (2)
- src/external_editor.py (3)
- src/file_cache.py (7)
- src/fuzzy_anchor.py (1)
- src/models.py (1)
- src/multi_agent_conductor.py (1)
- src/patch_modal.py (1)
- src/project_manager.py (1)
- src/session_logger.py (1)
- src/app_controller.py (3)
|
||
|
ed
|
6399dcc4ed |
refactor(rag_engine,ai_client): rag_engine.search returns List[RAGChunk] directly
Phase 5: rag_engine.search() return type (FR4 row 7) Before: def search(...) -> List[Dict[str, Any]] at src/rag_engine.py:367 After: def search(...) -> List["RAGChunk"] Delta: -1 wrong type annotation (List[Dict] -> List[RAGChunk]) RAGChunk dataclass extended with `id: str = ""` field to preserve the chroma wire-format identifier. The search() function now constructs RAGChunk instances directly from chromadb query results, normalizing the wire format (metadata.path -> RAGChunk.path; distance -> 1.0 - score) at the boundary. Consumer updates: - src/ai_client.py:3259-3266: chunk["metadata"]["path"] -> chunk.path; chunk["document"] -> chunk.document (direct attribute access) - src/app_controller.py:3506: docstring updated from Result[List[Dict]] to Result[List[RAGChunk]] (no code change; pass-through) Test updates: - tests/test_rag_engine.py:61: results[0]["id"] -> results[0].id (now uses dataclass attribute access) Verification: - audit_weak_types --strict: OK (107 <= 112 baseline) - py_check_syntax: OK on rag_engine.py, ai_client.py, test_rag_engine.py - 21 RAG tests pass (test_rag_engine, test_rag_chunk, test_rag_engine_ready_status_bug, test_rag_integration, test_context_composition_decoupled, test_tiered_aggregation) |
||
|
ed
|
75eb6dbbbb |
refactor(type_aliases): promote Metadata from TypeAlias to typed fat struct
Phase 1: Metadata promotion (FR2 from spec.md) Before: 1 \Metadata: TypeAlias = dict[str, Any]\ site at src/type_aliases.py:6 After: 0 (replaced by \@dataclass(frozen=True, slots=True)\) Delta: -1 site (matches plan) Metadata is now the typed fat struct at the wire boundary: - 36 explicit fields covering TOML/JSON wire keys (paths, project, discussion, role, content, tool_calls, ts, kind, direction, model, source_tier, error, id, description, status, depends_on, manual_block, document, path, score, function, args, script, output, type, description, parameters, auto_start, view_mode, custom_slices, input/output/cache tokens, metadata) - \ rom_dict(raw: dict[str, Any])\ classmethod filters unknown keys - \ o_dict()\ returns plain dict for wire serialization - Dict-compat methods (\__getitem__\, \get\, \__contains__\, \__iter__\, \keys\, \ alues\, \items\) keep existing call sites working during the migration; internal code should switch to direct attribute access on typed dataclasses (FileItem.path, CommsLogEntry.role, etc.) The TypeAlias \Metadata: TypeAlias = dict[str, Any]\ is REMOVED. Test updates: - test_metadata_alias_resolves_to_dict REMOVED (asserts old behavior) - test_metadata_is_now_a_frozen_dataclass ADDED (verifies dataclass) - test_metadata_from_dict_filters_unknown_keys ADDED - test_metadata_to_dict_returns_plain_dict ADDED - test_metadata_dict_compat_getitem_and_get ADDED - test_tool_call_alias_resolves_to_metadata REMOVED (stale; ToolCall is now the openai_schemas dataclass, not dict[str, Any]) - test_tool_call_alias_points_to_openai_schemas ADDED - test_file_items_diff_named_tuple_has_two_fields: simplified (was failing on get_type_hints() forward-ref resolution; not Metadata-related) Verification: - audit_weak_types --strict: OK (107 <= 112 baseline) - generate_type_registry --check: OK (regenerated 23 files) - 133 tests pass (type_aliases, openai_schemas, rag_engine, file_item, all 12 per-aggregate dataclass regression guards) |
||
|
ed
|
0506c5da63 |
refactor(ticket): migrate Ticket consumers to direct field access (Phase 1)
TIER-2 READ AGENTS.md, conductor/workflow.md, conductor/edit_workflow.md,
conductor/tier2/githooks/forbidden-files.txt,
conductor/tracks/tier2_leak_prevention_20260620/spec.md,
conductor/code_styleguides/data_oriented_design.md,
conductor/code_styleguides/error_handling.md,
conductor/code_styleguides/type_aliases.md before Phase 1.
Phase 1 of metadata_promotion_20260624: migrate Ticket consumers from
t.get('key', default) / t['key'] to direct field access (t.id, t.status, etc.).
Changes:
- self.active_tickets: list[Metadata] -> list[models.Ticket]
- _deserialize_active_track_result populates self.active_tickets as Tickets
- _load_active_tickets (beads branch) constructs Ticket instances
- topological_sort signature: list[dict[str, Any]] -> list[Ticket]
- Migrated ~40 consumer sites in src/gui_2.py: _reorder_ticket,
bulk_execute/skip/block, _cb_block_ticket, _cb_unblock_ticket,
_dag_cycle_check_result, ticket queue rendering, DAG panel
- Migrated ~10 consumer sites in src/app_controller.py: _cb_ticket_retry,
_cb_ticket_skip, approve_ticket, mutate_dag, _push_mma_state_update_result,
completed count
- Removed legacy Ticket.get() compat method (Task 1.5)
- Added tests/test_metadata_promotion_phase1.py with 15 regression-guard tests
- Updated existing tests to construct Ticket instances instead of dicts
Verified: 1885 of 1910 unit tests pass (25 pre-existing failures unrelated
to Ticket migration; many are live_gui/sim tests that need a running GUI).
|
||
|
ed
|
bacddc8549 |
feat(type_aliases): add per-aggregate dataclasses for metadata_promotion_20260624
TIER-2 READ AGENTS.md conductor/workflow.md conductor/edit_workflow.md conductor/tier2/githooks/forbidden-files.txt conductor/tracks/tier2_leak_prevention_20260620/spec.md conductor/code_styleguides/data_oriented_design.md conductor/code_styleguides/error_handling.md conductor/code_styleguides/type_aliases.md before Phase 0 Tasks 0.1, 0.2, 0.4. Phase 0 of metadata_promotion_20260624. 11 NEW per-aggregate dataclasses added to src/type_aliases.py (CommsLogEntry, HistoryMessage, FileItem, ToolDefinition, SessionInsights, DiscussionSettings, CustomSlice, MMAUsageStats, ProviderPayload, UIPanelConfig, PathInfo) + RAGChunk added to src/rag_engine.py. Metadata: TypeAlias = dict[str, Any] preserved unchanged as the catch-all for collapsed codepaths. Each dataclass has paired to_dict()/from_dict() methods. 11 regression-guard test files created with 5-7 tests each (~70 tests total). All tests PASS. The existing tests/test_type_aliases.py was updated to reflect the NEW design (CommsLogEntry etc. are now classes, not aliases to Metadata). Conventions: 1-space indentation, CRLF preserved, no comments. |
||
|
ed
|
6ff31af6c5 |
fix(test): update test_token_viz to verify provider_state API (not aliases)
Phase 7 alias removal exposed test_token_viz::test_anthropic_history_lock_accessible
which asserted the old aliases (_anthropic_history, _anthropic_history_lock) exist
on the ai_client module. After Phase 7 those aliases are intentionally gone.
Updated test to:
- Verify the new provider_state.get_history('anthropic') pattern (lock + messages attributes)
- Verify the old aliases are NOT present (positive assertion that migration is complete)
This is the canonical post-migration test pattern.
|
||
|
ed
|
40b2f93278 |
fix(test): update test_ai_loop_regressions_20260614 to patch provider_state.get_history
The Phase 7 alias removal exposed a pre-existing test that patched src.ai_client._minimax_history and src.ai_client._minimax_history_lock. Those aliases no longer exist (deleted in Phase 7). Update the test to patch src.provider_state.get_history with a side_effect that returns a fresh empty ProviderHistory for 'minimax' and passes through other providers. This is the canonical pattern for tests that need to intercept the new provider_state.get_history(...) calls. |
||
|
ed
|
4e94780470 |
test(provider_state): add migration regression-guard suite
TIER-2 READ AGENTS.md conductor/workflow.md conductor/edit_workflow.md conductor/tier2/githooks/forbidden-files.txt conductor/tracks/tier2_leak_prevention_20260620/spec.md conductor/code_styleguides/data_oriented_design.md conductor/code_styleguides/error_handling.md conductor/code_styleguides/type_aliases.md before Phase 0 Task 0.3. Phase 0 of code_path_audit_phase_3_provider_state_20260624. 14 regression-guard tests covering ProviderHistory API: - 6 providers reachable as singletons - append/get_all/clear/replace_all ordering preserved - RLock re-entrancy in with-block (nested function call) - concurrent append thread-safety (2 threads x 100 msgs = 200 unique) - defensive copy semantics of get_all() - __bool__/__len__/__iter__/__getitem__ dunders per provider - clear_all() resets all 6 providers - KeyError on unknown provider All 14 tests PASS on current state (aliases still present; ProviderHistory API reachable). Conventions: 1-space indentation, CRLF, no comments, from __future__ import annotations. |
||
|
ed
|
dc397db7ed |
refactor(src): eliminate 11 T | None legacy wrappers in favor of _result API
TIER-3 READ AGENTS.md + conductor/workflow.md + conductor/code_styleguides/error_handling.md + the 4 source files + 3 test files before this commit. The code_path_audit_phase_2_20260624 track (Tier 2) shipped 11 audit fixes (4 NG1 + 7 NG2) but used a heuristic bypass for 4 of the NG2 wrappers: legacy T | None functions that exist only to maintain test patcher compatibility. Per the review at docs/reports/REVIEW_TIER2_code_path_audit_phase_2_20260624.md Finding 8, this track eliminates the legacy wrappers properly. 11 wrappers eliminated (8 main + 3 _legacy_compat inner): - src/ai_client.py: get_current_tier (1 src + 1 test consumer) - src/ai_client.py: _gemini_tool_declaration + _legacy_compat (2 test consumers) - src/ai_client.py: run_tier4_patch_callback + _legacy_compat (was 0 direct callers but had 2 callback references in app_controller/multi_agent_conductor; callback contract migrated to Callable[[str, str], Result[str]] instead of preserving an Optional[str] adapter) - src/mcp_client.py: _get_symbol_node + _legacy_compat (8 in-file consumers) - src/mcp_client.py: find_in_scope (nested inside _get_symbol_node_result; private impl detail, audit doesn't catch T | None, left as-is) - src/external_editor.py: launch_diff (1 src + 3 test + 1 live_gui test consumer) - src/external_editor.py: launch_editor (no consumers; deleted) - src/session_logger.py: log_tool_output (2 src + 3 test consumers) - src/project_manager.py: parse_ts (no consumers; deleted) For each consumer: replace legacy_fn(args) with legacy_fn_result(args).data. For T | None checks: replace if x is None: with if not result.ok: or if not result.ok or not isinstance(result.data, ...) (depending on pattern). For run_tier4_patch_callback specifically: the wrapper was a callback adapter (not a backward-compat shim) and had 2 callback references as consumers. Rather than keep the adapter (which would re-introduce the Optional[str] return that the strict audit catches), the patch_callback contract was migrated from Callable[[str, str], Optional[str]] to Callable[[str, str], Result[str]] in shell_runner.py + app_controller.py + 9 _send_<vendor>_result signatures in ai_client.py. This propagates the Result[str] through the callback and lets shell_runner unwrap with if r.ok and r.data instead of if patch_text. Verification: - audit_optional_in_3_files --strict: 0 return-type Optional[T] (down from 1) - audit_exception_handling --strict: 0 violations (unchanged) - audit_legacy_wrappers: 0 legacy wrappers (unchanged) - 15 affected test files: 168 tests pass - 8 mcp_client/structural/baseline test files: 55 tests pass - 3 session/gui test files: 7 tests pass - 0 return-type Optional[T] in src/ai_client.py (was 1: run_tier4_patch_callback) |
||
|
ed
|
5ac0618a33 |
refactor(scripts): move 7 code_path_audit files from src/ to scripts/code_path_audit/
The 7 code_path_audit*.py files (2604 lines total) are pure static analysis tools. They do AST traversal of src/, no intrusive profiling, no runtime markers. They were inlaid with src/ but only import: - src.result_types (the Result[T] convention type) - each other (the 6 siblings) After the move: - src/ is now pure application code; line-count audit metrics are clean - scripts/code_path_audit/ is a new namespace-isolated subdir per AGENTS.md 'scripts are namespace-isolated by directory' rule TIER-3 READ AGENTS.md + conductor/workflow.md + conductor/edit_workflow.md + conductor/code_styleguides/code_path_audit.md + the 7 files before this commit. Changes: - 7 files moved: src/code_path_audit*.py -> scripts/code_path_audit/ - 7 files updated: internal imports rom src.code_path_audit_X -> rom code_path_audit_X (siblings in same subdir) - 7 files updated: add sys.path.insert(0, str(Path(__file__).resolve().parents[2] / 'src')) to find src.result_types when run standalone - 5 test files updated: rom src.code_path_audit -> rom code_path_audit + sys.path setup to find the new subdir - 6 throwaway scripts in scripts/tier2/artifacts/ updated: import path + sys.path setup (parents[3] / 'src' + parents[3] / 'scripts' / 'code_path_audit') - 2 styleguide/spec references updated: conductor/code_styleguides/code_path_audit.md + conductor/tracks/code_path_audit_20260607/spec_v2.md - 1 meta-audit docstring updated: scripts/audit_code_path_audit_coverage.py - 1 type registry entry deleted: docs/type_registry/src_code_path_audit.md (the type is no longer in src/) - 1 type registry index updated: docs/type_registry/index.md (22 files, was 23) Verification: - 7/7 audit gates pass --strict (weak_types 102<=112, type_registry 22 files, main_thread_imports OK, no_models_config_io OK, code_path_audit_coverage 0 violations, exception_handling 0 violations, optional_in_3_files 0 violations) - 6/6 test files pass: test_code_path_audit, test_code_path_audit_integration, test_code_path_audit_phase78, test_code_path_audit_phase89, test_code_path_audit_ssdl_behavioral, test_metadata_nil_sentinel - src/ line count: 29997 lines (down from 32621 = -2624 lines) - scripts/code_path_audit/ line count: 2620 lines |
||
|
ed
|
33569e1ce5 |
fix(test): update tier2_pre_commit_hook tests for abort-on-strip behavior
TIER-3 READ AGENTS.md + conductor/code_styleguides/error_handling.md + tests/test_tier2_pre_commit_hook.py + conductor/tier2/githooks/pre-commit before pre-commit-test-fix.
7 tests in tests/test_tier2_pre_commit_hook.py asserted the OLD silent-strip behavior (exit 0). The pre-commit hook was changed in
|
||
|
ed
|
20236546d7 | refactor(schemas): remove NormalizedResponse backward-compat __init__; use canonical API | ||
|
ed
|
ae81095923 | feat(metadata): NIL_METADATA sentinel + migrate _build_files_section_from_items |