From 31a1ff57ada0950761d9b4ce2300d2446c4b4c08 Mon Sep 17 00:00:00 2001 From: Ed_ Date: Thu, 11 Jun 2026 21:09:12 -0400 Subject: [PATCH] conductor(plan): Phase 4 - 7 of 9 tasks complete; t4_3 + t4_7 deferred Phase 4 status: - t4_1: Add 12 v2 fields to VendorCapabilities (commit 0a9e2775) - t4_2: Native Ollama adapter + route localhost (commit 25baa6fe) - t4_3: Meta Llama API adapter (DEFERRED - see docs/reports/meta_llama_api_verification_20260611.md) - t4_4: GUI 'Local Model' badge (commit 49d51604) - t4_5: 12 v2 fields (combined with t4_1) - t4_6: Per-model v2 field population + runtime local override (commit 7d60e8f5) - t3_7 (moved): Cost panel 'Free (local)' (commit 7d60e8f5) - t4_7: UI adaptations for new fields (DEFERRED - design work beyond this track) - t4_8: Checkpoint (this commit) --- .../state.toml | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/conductor/tracks/qwen_llama_grok_followup_20260611/state.toml b/conductor/tracks/qwen_llama_grok_followup_20260611/state.toml index 15c4f7a3..e4a718c6 100644 --- a/conductor/tracks/qwen_llama_grok_followup_20260611/state.toml +++ b/conductor/tracks/qwen_llama_grok_followup_20260611/state.toml @@ -17,7 +17,7 @@ qwen_llama_grok_integration_20260606 = "phase_6_complete" phase_1 = { status = "completed", checkpoint_sha = "ffe22c30", name = "Tool loop lift (run_with_tool_loop helper for 8 vendors)" } phase_2 = { status = "completed", checkpoint_sha = "7b24ee9", name = "PROVIDERS move (out of src/models.py)" } phase_3 = { status = "completed", checkpoint_sha = "43182af", name = "UX adaptations 2-9 (4 of 8 applied; 3 deferred; 1 already done)" } -phase_4 = { status = "pending", checkpoint_sha = "", name = "Local-first + matrix v2 expansion (12 new fields)" } +phase_4 = { status = "in_progress", checkpoint_sha = "", name = "Local-first + matrix v2 expansion (12 new fields)" } phase_5 = { status = "pending", checkpoint_sha = "", name = "Anthropic/Gemini/DeepSeek capability matrix migration" } [tasks] @@ -56,23 +56,15 @@ t3_6 = { status = "completed", commit_sha = "", description = "Adaptation 7: cos t3_8 = { status = "completed", commit_sha = "26becf2b", description = "Adaptation 9: cost panel: '-' for other cost_tracking=false" } t3_9 = { status = "completed", commit_sha = "43182af", description = "Phase 3 checkpoint + git note" } # Phase 4: Local-first + matrix v2 -t4_1 = { status = "pending", commit_sha = "", description = "Add local: bool to VendorCapabilities" } -t4_2 = { status = "pending", commit_sha = "", description = "Native Ollama adapter (in src/ai_client.py as ollama_chat + _send_llama_native; route Ollama backend to it)" } -t4_3 = { status = "pending", commit_sha = "", description = "Meta Llama API adapter (in src/ai_client.py as meta_llama_chat; new 4th Llama backend; DEFER if URL still 400)" } -t4_4 = { status = "pending", commit_sha = "", description = "GUI: 'Local Model' badge" } -t4_5 = { status = "pending", commit_sha = "", description = "Add 12 v2 fields to VendorCapabilities" } -t4_6 = { status = "pending", commit_sha = "", description = "Update all vendor registry entries" } -# t3_7 (MOVED from Phase 3 on 2026-06-11 per user request). -# Originally Phase 3 t3_7 ('cost panel: Free (local) for localhost'). -# Re-classified from cancelled to pending-blocked-on-t4_1. -# Order: must run AFTER t4_1 (caps.local field added) AND t4_6 -# (caps.local populated for llama Ollama wildcard). The cost -# display in src/gui_2.py will check caps.local and show -# 'Free (local)' instead of '\$0.0000' for the Ollama backend. -t3_7 = { status = "pending", commit_sha = "", description = "MOVED FROM PHASE 3: cost panel: 'Free (local)' for localhost. Apply to the per-tier + session-total cost columns in src/gui_2.py. Run AFTER t4_1 (caps.local field) and t4_6 (populated for llama wildcard). blocked_by = t4_1 + t4_6." } -t4_7 = { status = "pending", commit_sha = "", description = "UI adaptations for new fields (reasoning toggle, code execution panel, etc.)" } -t4_8 = { status = "pending", commit_sha = "", description = "Phase 4 checkpoint + git note" } -# Phase 5: Anthropic / Gemini / DeepSeek migration +t4_1 = { status = "completed", commit_sha = "0a9e2775", description = "Add 12 v2 fields to VendorCapabilities (local, reasoning, structured_output, code_execution, web_search, x_search, file_search, mcp_support, audio, video, grounding, computer_use). All default to False." } +t4_2 = { status = "completed", commit_sha = "25baa6fe", description = "Native Ollama adapter (in src/ai_client.py as ollama_chat + _send_llama_native; route Ollama backend to it). Uses /api/chat (NOT /v1/chat/completions) with think/images/thinking fields." } +t4_3 = { status = "deferred", commit_sha = "", description = "Meta Llama API adapter. DEFERRED on 2026-06-11: docs URL is 200 but actual API endpoints are 404/403 (no public surface). See docs/reports/meta_llama_api_verification_20260611.md." } +t4_4 = { status = "completed", commit_sha = "49d51604", description = "GUI: 'Local Model' badge. Renders ' [Local]' next to provider combo in render_provider_panel when caps.local=True. Tooltip shows _llama_base_url when provider is llama." } +t4_5 = { status = "completed", commit_sha = "0a9e2775", description = "Add 12 v2 fields to VendorCapabilities (combined with t4_1 in single atomic commit). All v2 fields added to the dataclass with default False." } +t4_6 = { status = "completed", commit_sha = "7d60e8f5", description = "Update all vendor registry entries. Populated v2 fields per-model: reasoning for minimax-M2.5/M2.7/llama-3.1-405b; web_search + x_search for grok; caching for qwen-long; audio for qwen-audio. Runtime override for 'local' (dataclass.replace on llama+localhost)." } +t3_7 = { status = "completed", commit_sha = "7d60e8f5", description = "MOVED FROM PHASE 3: cost panel: 'Free (local)' for localhost. DONE in commit 7d60e8f5 (alongside t4_6): per-tier + session-total cost columns in src/gui_2.py now render 'Free (local)' when caps.local=True." } +t4_7 = { status = "deferred", commit_sha = "", description = "UI adaptations for new fields (reasoning toggle, code execution panel, etc.). DEFERRED to a separate follow-up track. See state.toml 'deferred_work' section." } +t4_8 = { status = "in_progress", commit_sha = "", description = "Phase 4 checkpoint + git note" } t5_1 = { status = "pending", commit_sha = "", description = "Populate Anthropic matrix entries (caching, extended_thinking, pdf, computer_use)" } t5_2 = { status = "pending", commit_sha = "", description = "Populate Gemini matrix entries (caching, grounding, video, audio)" } t5_3 = { status = "pending", commit_sha = "", description = "Populate DeepSeek matrix entries (reasoning, low_cost)" }