Private
Public Access
0
0
Commit Graph

68 Commits

Author SHA1 Message Date
ed ab6b53fa8b feat(qwen): add qwen to PROVIDERS; add 7 Qwen pricing entries to cost_tracker
Side concerns for Phase 2:

1. PROVIDERS: src/models.py:56 now includes 'qwen' alongside the existing
   5 vendors. The other 4 references to PROVIDERS in src/gui_2.py and
   src/app_controller.py import from this centralized list, so this
   one edit propagates everywhere. State task t2.8 was scoped to
   'gui_2.py and app_controller.py' but the actual change is at the
   centralized registry, per the project's single-source-of-truth
   pattern (per src/models.py module docstring and the Phase 5 audit
   script audit_no_models_config_io.py which enforces that PROVIDERS
   lives in models.py).

2. cost_tracker.py: added 7 regex pricing entries for the Qwen models
   shipped in Phase 1's vendor_capabilities.py:
   - qwen-turbo: 0.05 / 0.10
   - qwen-plus: 0.40 / 1.20
   - qwen-max: 2.00 / 6.00
   - qwen-long: 0.07 / 0.28
   - qwen-vl-plus: 0.21 / 0.63
   - qwen-vl-max: 0.50 / 1.50
   - qwen-audio: 0.10 / 0.30
   (all per 1M tokens, USD; matches the structure of existing entries)

   Spot check: estimate_cost('qwen-max', 1000, 500) = 0.005 (= 0.002 + 0.003)

3. SKIPPED t2.7 (credentials template): no credentials_template.toml
   exists in the project. The only credentials file is the active
   credentials.toml which the user maintains directly with their own
   API keys. The plan's assumption of a template file does not match
   the project's actual structure. Documented in the commit log
   rather than modifying the user's actual credentials.toml with a
   placeholder key (which would be inconsistent with the rest of
   that file's pattern of real keys). When the user obtains a
   DashScope API key, they can add a [qwen] section directly.

4. t2.9 (Qwen models in capability registry) was completed in Phase 1's
   initial population of 22 entries (commit 6be04bc). The 8 qwen
   entries (1 wildcard + 7 specific models) are in src/vendor_capabilities.py.

Verification: 30/30 tests pass in batch
(test_qwen_provider, test_minimax_provider, test_ai_client_no_top_level_sdk_imports,
test_vendor_capabilities, test_openai_compatible, test_cost_tracker)
2026-06-11 01:30:38 -04:00
ed 7bcb5a8c07 refactor(config): Route all config I/O through AppController
Eliminates 22 call sites that bypassed the AppController state owner
and read/wrote config.toml directly. AppController is now the single
source of truth for self.config; gui_2.py, commands.py, etc. go
through controller.save_config() / controller.load_config().

Production changes:
- src/models.py: rename load_config -> _load_config_from_disk,
  save_config -> _save_config_to_disk (private I/O primitives)
- src/app_controller.py: add public load_config()/save_config() methods
  that own the state. Update 3 internal call sites and 3 ConductorEngine
  call sites to pass max_workers from self.config
- src/multi_agent_conductor.py: ConductorEngine.__init__ now takes
  max_workers as a parameter (caller responsibility, not I/O primitive)
- src/external_editor.py: get_default_launcher() takes config as a
  parameter; gui_2.py:1311,4776 pass app.config
- src/gui_2.py: 17 sites of models.save_config(X.config) replaced with
  X.save_config() (delegates via __getattr__ to controller)
- src/commands.py: save_all() uses app.save_config()

Test changes (route through controller, not I/O primitive):
- tests/conftest.py: mock_app and app_instance fixtures now patch
  AppController.load_config/save_config instead of models I/O primitives
- 18 other test files: patches renamed from models._save_config_to_disk
  to AppController.save_config (and same for load_config)
- tests/test_app_controller_mcp.py: use SLOP_CONFIG env var instead of
  patching removed CONFIG_PATH module constant
- tests/test_parallel_execution.py: pass max_workers=2 explicitly to
  ConductorEngine (caller no longer reads config)
- tests/test_gui_paths.py: add save_config=MagicMock() to MockApp;
  assert on controller method, not I/O primitive
- tests/test_models_no_top_level_tomli_w.py: still calls private
  _save_config_to_disk directly (the only allowed exception; tests
  the lazy-load behavior of the primitive itself)

New files:
- scripts/audit_no_models_config_io.py: enforces the rule (--strict,
  --json modes; AST-based docstring detection to avoid false positives)
- conductor/code_styleguides/config_state_owner.md: documents the rule

Verification:
- 67 targeted tests pass
- scripts/audit_no_models_config_io.py --strict returns 0

This is the architectural cleanup that surfaced during the
audit_architectural_cheats_20260607 review. Closes the smoke-gun
CONFIG_PATH module constant (already done in 0c7ebf22) AND the
free-function models.load_config/save_config smell.

[conductor(checkpoint): config-iO-refactor-20260607]
2026-06-07 19:54:17 -04:00
ed 0c7ebf2267 fix(models): remove module-level CONFIG_PATH; re-resolve on every call
ROOT CAUSE: src/models.py had `CONFIG_PATH = get_config_path()`
at module level. Every test that imported `src.models` and called
`save_config()` or `load_config()` wrote/read the repo-root
`config.toml` via this cached constant. The path was resolved
once at import time, so the SLOP_CONFIG env var (or test
fixtures) couldn't redirect reads/writes without reimporting the
module.

This silently corrupted the user's config.toml on every test
run. The diff between runs showed: 'config.toml changed in
working copy' — caused by tests, not the user.

FIX: remove the module-level constant; call get_config_path()
on every read/write call. SLOP_CONFIG (and any test-time
set_config_path() helper) now works without reimport.

Also: keep my prior commits to this file (reset_layout command
in src/commands.py; the RUN_MMA_INTEGRATION skipif in
test_mma_step_mode_sim.py) bundled here for a clean atomic
fix-pack since the user just fixed the indentation issue I had.

Verified: src.models imports cleanly; load_config/save_config
work as expected. Tests that import these functions will
use whatever SLOP_CONFIG points to (or the repo-root default).
2026-06-07 17:57:36 -04:00
ed 01ddf9f163 refactor(models): remove top-level pydantic import; lazy pydantic via PEP 562 __getattr__
Sub-track 2A of startup_speedup_20260606: clears 1 of 61 main-thread audit violations (pydantic in src/models.py).

Removed top-level 'from pydantic import BaseModel' (line 50) and the two static class definitions (GenerateRequest, ConfirmRequest). Replaced with PEP 562 module-level __getattr__ that materializes the pydantic classes on first access via pydantic.create_model() + _require_warmed('pydantic').

Pattern matches the lazy-proxy convention from sub-tracks 5A (command_palette), 5B (theme_nerv), 5C (markdown_table), 5D (gui_2 dead imports).

Result:
- pydantic NOT in sys.modules after 'import src.models' (verified via subprocess test)
- GenerateRequest and ConfirmRequest are accessible via 'from src.models import X' (proxy triggers pydantic import + caches class in globals())
- Pydantic validation works: GenerateRequest() raises ValidationError on missing 'prompt'
- Audit script: 60 violations (was 61)
- Existing test_project_switch_persona_preset.py: 8/9 pass; the 1 failure is the pre-existing ui_global_preset_name issue (unrelated)

Files changed:
- src/models.py: removed 1 import, 2 class defs; added 2 factory fns + 1 __getattr__
- tests/test_models_no_top_level_pydantic.py: new (7 tests; all pass)

Per user instruction, all implementation work is performed by the Tier 2 tech lead directly. The 'sub-track 2A' naming follows the sub-track 2 (audit violations) parent in the track plan.
2026-06-07 10:01:40 -04:00
ed ae3b433e5e refactor(models): lazy-load tomli_w (sub-track 2 partial)
Sub-track 2 of startup_speedup_20260606. Removes the top-level
'import tomli_w' from src/models.py and moves it inside save_config().
tomli_w (~30ms cold load) is now loaded only when the user saves
config, not on every src.models import.

This drops the audit violation count from 63 to 62.

Pydantic BaseModel (the other src/models.py violation) is left for
a future sub-track: deferring a class base requires a metaclass or
proxy pattern that's higher risk for the small (~50ms) saving.

3 new tests in tests/test_models_no_top_level_tomli_w.py:
- tomli_w NOT in sys.modules after import src.models
- save_config() still works (because tomli_w loads on-demand)
- save_config() actually triggers the import on first call

17 existing model tests pass (test_persona_models, test_bias_models,
test_context_presets_models, test_per_ticket_model, test_file_item_model).
2026-06-06 21:42:08 -04:00
ed ca254bac41 fix(imports): break models<->dag_engine circular dependency
Track.get_executable_tickets (in models.py) called TrackDAG at
runtime, forcing a top-level import of src.dag_engine into models.py
and creating a 2-cycle that broke whichever module loaded second
(Ticket was not yet defined when models.py loaded first; TrackDAG
was not yet defined when dag_engine.py loaded first).

Fix: hoist the method out of the Track dataclass and into a free
function get_executable_tickets(track) in dag_engine.py. models.py
no longer needs TrackDAG at all, so the cycle is one-directional
(models -> dag_engine) and resolves cleanly in any import order.

Tests updated:
- tests/test_mma_models.py: import get_executable_tickets and call
  it instead of track.get_executable_tickets() (4 call sites)
- tests/test_conductor_engine_v2.py: comment update

Verified both import orders resolve cleanly:
  forward:  import src.models; import src.dag_engine  -> OK
  reverse:  import src.dag_engine; import src.models  -> OK
34 tests pass (test_mma_models, test_dag_engine, test_execution_engine,
test_arch_boundary_phase3, test_track_state_schema).
2026-06-06 13:30:18 -04:00
ed 311fde9a8b fixes 2026-06-06 12:44:07 -04:00
ed 339b062913 more organization 2026-06-06 11:08:07 -04:00
ed 7d555361f9 more organization 2026-06-06 10:24:22 -04:00
ed 873edf42cf began to go through the files and organize imports and gui_2.py's new context defs
still a bunch to sift through after the last ai passes
2026-06-05 21:44:41 -04:00
ed c1487d32bb progress on context composition 2026-05-17 06:55:00 -04:00
ed 8467cdd525 feat(models): Implement ContextPreset and ContextFileEntry 2026-05-16 05:05:22 -04:00
ed b5e512f483 feat(sdm): inject structural dependency mapping tags across codebase
Adds [C: caller] tags to functions/methods and [M: mutation] / [U: usage] tags to class variables based on cross-module call analysis.
2026-05-13 22:35:52 -04:00
ed 5bb3a9026f fix(models): restore original module docstring 2026-05-13 22:31:34 -04:00
ed 0741b5e69f refactor(models): reorganize src/models.py with region blocks and updated tool lists
- Group imports: __future__, stdlib, third-party, local
- Add #region: blocks for Constants, Config Utilities, History Utilities, Pydantic Models, MMA Core, State & Config, Tool Models, UI/Editor, Persona, Workspace, MCP Config
- Update AGENT_TOOL_NAMES with all 46 tools from MCP server
- Update DEFAULT_TOOL_CATEGORIES with 9 categories: General, Surgical, Python, C/C++, Web, Runtime, Analysis, Beads
- Condense module docstring to essentials
- Preserve all [C: ...] caller annotations
2026-05-13 22:30:13 -04:00
ed fa4388bbe0 feat(app-controller): modularize handlers and enforce 1-space indentation 2026-05-13 21:26:29 -04:00
ed cb0fa89730 feat(presets): Implement NamedViewPresets for per-file view settings 2026-05-11 18:31:56 -04:00
ed 976879dce0 feat(models): Extend FileItem.custom_slices with tag and comment fields 2026-05-11 17:15:04 -04:00
ed 78c009fc26 feat(context): Implement ContextPreset and FileViewPreset infrastructure 2026-05-11 13:13:37 -04:00
ed 8addb97018 feat(context): Add view_mode to FileItem model 2026-05-11 10:28:35 -04:00
ed 8715776ee4 less pain 2026-05-10 18:53:35 -04:00
ed fca9392f65 trying ot make files & media less shit 2026-05-10 18:36:01 -04:00
ed 16b99d16a4 feat(context): Interactive Text Slice Highlighting with Fuzzy Anchors 2026-05-10 13:57:01 -04:00
ed b4f8633bd6 feat(context): Interactive AST Tree Masking with per-symbol toggles 2026-05-10 13:28:15 -04:00
ed cba79350de feat(context): Granular AST Control for C/C++ files 2026-05-10 13:05:32 -04:00
ed 8bb9287dfe refactor(ui): cull unused UI helpers and redundant modules 2026-05-10 11:50:00 -04:00
ed 8c06c1767b refactor(sdm): Global pass with refined 'External Only' SDM tags. Pruned redundant internal references and fixed indentation logic in injector. Verified full project compilation. 2026-05-09 15:00:35 -04:00
ed 9f18497786 chore(conductor): Mark track 'Curate Provider Registries' as complete. Includes critical fixes for RecursionError, NoneType Hook API responses, and plurality mismatches. 2026-05-08 22:01:15 -04:00
ed 8fe366e041 fix(external-editor): Fix TextEditorConfig parsing and add error handling
- TextEditorConfig.from_dict no longer requires 'name' field since name comes from dict key
- Added try/except around _render_external_editor_panel to prevent tab bar mismatch
2026-05-07 19:30:45 -04:00
ed 414d2ab561 feat(external-editor): Add TextEditorConfig and ExternalEditorConfig models
- Add TextEditorConfig and ExternalEditorConfig dataclasses to models.py
- Create src/external_editor.py with ExternalEditorLauncher class
- Add tests for configuration and launcher functionality
- Support for config.toml [tools.text_editors] and manual_slop.toml default_editor
2026-05-07 19:07:05 -04:00
ed 98400358af feat(models): implement WorkspaceProfile dataclass 2026-05-05 20:50:47 -04:00
ed b8460107b9 chore(conductor): Expand Tree-Sitter C/C++ track with new phases for tool parity and robust testing 2026-05-05 19:31:25 -04:00
ed 7bed4a8f97 conductor(checkpoint): Final checkpoint for RAG Support track - Phase 4 complete 2026-05-04 22:36:31 -04:00
ed e80cd6bd3f feat(rag): Implement RAG engine, configuration schema, and vector store integration 2026-05-04 05:38:23 -04:00
ed 36645f7f3e feat(aggregation): Implement tier-level aggregation strategy tied to Personas 2026-05-04 05:10:59 -04:00
ed 84b6266610 feat(gui): Implement Session Hub and context injection visibility 2026-03-18 09:04:07 -04:00
ed 791e1b7a81 feat(gui): Add context preset field to persona model and editor UI 2026-03-18 00:20:29 -04:00
ed 5470f2106f fix(gui): fix missing thinking_segments parameter persistence across sessions 2026-03-15 16:11:09 -04:00
ed ea7b3ae3ae test: Add thinking trace parsing tests 2026-03-13 21:53:17 -04:00
ed befb480285 feat(conductor): Archive External MCP, Project-Specific Conductor, and GUI Path Config tracks 2026-03-12 20:10:05 -04:00
ed 1c863f0f0c feat(models): Add MCP configuration models and loading logic 2026-03-12 15:31:10 -04:00
ed 6da3d95c0e refactor(gui): redesign persona editor UI and replace popup modals with standard windows 2026-03-10 23:21:14 -04:00
ed ca8e33837b refactor(gui): streamline preset manager and improve tool bias ui 2026-03-10 22:29:43 -04:00
ed 7ae99f2bc3 feat(personas): Add persona_id support to Ticket/WorkerContext and ConductorEngine 2026-03-10 11:09:11 -04:00
ed 41a40aaa68 phase 2 checkpoint 2026-03-10 10:42:24 -04:00
ed 77a0b385d5 feat(bias): implement data models and storage for tool weighting and bias profiles 2026-03-10 09:27:12 -04:00
ed f213d37287 fix(gui): Ensure all tools are visible in Tool Preset Manager 2026-03-10 01:30:11 -04:00
ed dcc13efaf7 chore(conductor): Mark track 'Saved Tool Presets' as complete 2026-03-10 01:23:57 -04:00
ed e2a403a187 checkpoint(Saved system prompt presets) 2026-03-09 22:27:40 -04:00
ed 80eaf740da spicyv 2026-03-09 00:27:43 -04:00