Commit Graph
24 Commits
Author SHA1 Message Date
ed 69d85c8ebb conductor(plan): mark Phase 6 complete (active-with-follow-up, not archived) 2026-06-11 09:35:12 -04:00
ed 457255bcd4 conductor(plan): mark t5_6 + phase_5 complete; advance to phase 6 2026-06-11 09:15:26 -04:00
ed b75ae57ef2 docs(spec): footnote 8 remaining UX adaptations (2-9) deferred to follow-up
After the end of Phase 5, only adaptation 1 of 9 from spec §6 was
applied (Screenshot button iff vision, render_files_and_media:3030).
The pattern is established; the remaining 8 are mechanical
applications of the same pattern at their respective render sites.
The follow-up track applies the wrapping at:
- tools toggle (tool_calling)
- cache panel (caching)
- stream progress (streaming)
- fetch models button (model_discovery)
- token budget max (context_window)
- cost panel (3 cost_tracking states: estimate / 'Free (local)' / '-')

The _get_active_capabilities() helper (t5.1) is already in place.
2026-06-11 09:13:55 -04:00
ed 15b3b33081 docs(spec): footnote tool-loop lift follow-up in §13.1.B (in case context expires)
As of end of Phase 4, only _send_minimax has a working tool-call loop.
Phase 3 (Grok, Llama) and Phase 2 (Qwen) entry points are single-shot;
they call send_openai_compatible once and return without executing
tool_calls. If the user notices 'tool execution doesn't work for
Qwen/Grok/Llama' after Phase 5 ships, the fix is to lift the tool
loop into a shared run_with_tool_loop() helper that wraps
send_openai_compatible. The 4 existing vendors (_send_anthropic /
_send_gemini / _send_gemini_cli / _send_deepseek) already have the
same inline duplication, so the lift would also help those.

This is a follow-up track, not in scope for qwen_llama_grok_integration_20260606.
2026-06-11 09:04:54 -04:00
ed ccdfaefd52 conductor(plan): mark Phase 4 fully complete (fix phase_4 SHA, t4_4 status, verification flags, minimax_refactor_stats, openai_compatible_models flag) 2026-06-11 08:57:35 -04:00
ed fadb4c329b conductor(plan): mark Phase 4 complete in qwen_llama_grok_integration_20260606 2026-06-11 02:25:36 -04:00
ed 94fe10089e conductor(plan): mark t3.18 + phase_3 complete; advance to phase 4 2026-06-11 02:06:13 -04:00
ed 9be228f620 conductor(plan): fix duplicates in Phase 3 state; advance t3.18 (checkpoint) 2026-06-11 02:05:07 -04:00
ed 07bac1c6a7 conductor(plan): mark t3.3-t3.7 + t3.14-t3.17 complete (t3.4/t3.15 cancelled: no template) 2026-06-11 02:04:09 -04:00
ed 8e3543d875 docs(spec): revise 'best API per vendor' after Grok consultation
Grok's own recommendation (consulted 2026-06-11):

  'xAI (Grok) | xAI official OpenAI-compatible (https://api.x.ai/v1) |
   Fully compatible and clean. Supports Grok-2 + Grok-2-Vision. No
   meaningful unique native surface lost by using the compatible
   endpoint.'

This REVERSES the earlier 'xAI native' correction. The OpenAI-
compatible approach for Grok is the canonical full-featured path;
the implementation in Phase 3 (OpenAI SDK with base_url=https://api.x.ai/v1
+ send_openai_compatible helper) is correct as-is.

Updates to the spec:

1. §3.1.1: replaced the 'use xAI native' decision with the confirmed
   per-vendor table. Qwen=Native, Grok=OpenAI-Compatible (per Grok's
   own confirmation), MiniMax=OpenAI-Compatible, DeepSeek=OpenAI-
   Compatible, Ollama=OpenAI-Compatible-in-v1 (native in v2),
   Meta Llama API=Native (new 4th backend, follow-up), Gemini=Native
   (follow-up), Anthropic=Native (follow-up). Also added Grok's
   recommended v2 matrix field expansion: audio, video, grounding,
   computer_use, local, reasoning/extended_thinking, web_search,
   x_search, code_execution, file_search, mcp_support, structured_output.

2. §4.3: reverted from 'Grok via xAI (Native REST API)' back to
   'Grok via xAI (OpenAI-Compatible) - confirmed 2026-06-11'. The
   implementation does NOT need a native refactor; the OpenAI SDK
   at https://api.x.ai/v1 is the canonical approach. Removed the
   earlier 'caching: true' entry from the registry (since the
   OpenAI-compat shim doesn't expose prompt_cache_key) and the
   'no persistent client' state struct (back to the OpenAI SDK
   pattern).

3. §13.1.B: renamed from 'Native Vendor APIs' to 'Llama Native APIs
   (Ollama native + Meta Llama API)' and removed the Grok native
   refactor item (Grok says OpenAI-compat is fine). Kept the Ollama
   native + Meta Llama API items + matrix expansion. Clarified that
   Grok tests do NOT need rewriting; only Llama tests get 2 more
   (native Ollama, Meta Llama API).

Net effect: the Phase 3 work that just shipped (Grok+Llama Green
using OpenAI-compat shim) is CORRECT as-is. The implementation
matches Grok's actual recommendation. No code rollback needed.
2026-06-11 02:01:08 -04:00
ed 06716252f1 docs(spec): add 'best API per vendor' principle; mark xAI native as target; document follow-ups
Three additions to the spec, per the user's architectural correction
in this session:

1. NEW section 3.1.1: 'Architectural principle: Use the best API per
   vendor' — explains why the OpenAI-compatible shim loses vendor-
   specific features (xAI: prompt_cache_key, reasoning_effort, server-
   side tools, cost_in_usd_ticks; Ollama: think param, images array,
   thinking field, structured outputs) and states the principle:
   'use each vendor's native SDK or REST API when one exists, falling
   back to OpenAI-compatible only when no native option exists.'

   Also notes that the capability matrix IS the aggregate tracker;
   future native features go into the matrix, and the GUI filters
   based on it (no per-vendor UI branches).

2. UPDATED section 4.3 (Grok): 'Grok via xAI (Native REST API)' — was
   'OpenAI-Compatible'. Now specifies two native endpoints
   (/v1/chat/completions and /v1/responses), the native features that
   matter, the updated capability registry (caching=true for Grok
   via prompt_cache_key), and a 'Phase 3 placeholder behavior' note
   that this track's Phase 3 ships the OpenAI-compatible Grok as a
   placeholder. The native refactor is deferred to follow-up B.

3. UPDATED section 13.1: added follow-up track B 'Native Vendor APIs
   (post-OpenAI-compatible-placeholder)' which documents:
   - Grok → xAI native REST
   - Llama (Ollama) → native /api/chat
   - Llama (Meta Llama API) → new 4th backend (deferred pending
     verification of Meta's API spec; llama.developer.meta.com/docs/overview
     returned 400 on fetch this session)
   - Capability matrix expansion (web_search, x_search, code_execution,
     file_search, mcp_support, reasoning_effort, structured_output)
   - Test rewrites (mock requests.post instead of chat.completions.create)

This is a docs-only commit; no code changes. The Phase 3 Green work
continues with the OpenAI-compatible approach as planned in the
existing Red tests (t3.3 Grok + t3.14 Llama), and the follow-up track
B handles the native refactor when prioritized.
2026-06-11 01:49:36 -04:00
ed 891c008f0c conductor(plan): mark t3.1-t3.2 + t3.8-t3.13 complete; advance to t3.3+t3.14 (Green) 2026-06-11 01:42:13 -04:00
ed 4204116c66 conductor(plan): mark t2.11 completed (Phase 2 checkpoint) 2026-06-11 01:36:44 -04:00
ed 4d70dcc7ce conductor(plan): mark t2.11 + phase_2 complete; advance to phase 3 2026-06-11 01:35:22 -04:00
ed 45d316a0bd conductor(plan): mark t2.6-t2.10 complete (t2.7 cancelled: no template); advance to t2.11 2026-06-11 01:34:25 -04:00
ed 3940eb36ac conductor(plan): mark t2.1-t2.5 complete; advance to t2.6 (Green) 2026-06-11 00:53:58 -04:00
ed d5373e8f94 conductor(plan): mark t1.12 + phase_1 complete; advance to phase 2 2026-06-11 00:48:14 -04:00
ed 67782198b6 conductor(plan): mark t1.11 (dashscope dep) complete; advance to t1.12 2026-06-11 00:46:18 -04:00
ed f07e616c38 conductor(plan): mark t1.5-t1.10 complete; advance to t1.11 2026-06-11 00:41:11 -04:00
ed 6f11e7da14 conductor(plan): mark t1.1-t1.4 complete; advance to phase 1 in_progress 2026-06-11 00:31:57 -04:00
conductor-tier2 77ae2ec7a8 conductor(track-update): qwen_llama_grok - spec notes for nagent_review + docs refresh
4 surgical additions to the spec, no task changes:

1. Result return type: Added a coordination note in §3.1 (Data-
   Oriented Design) explaining that the shared send_openai_compatible
   helper should return Result[NormalizedResponse, ErrorInfo] from
   day 1, not NormalizedResponse + ProviderError raise. This is so
   the downstream data_oriented_error_handling_20260606 track is
   a small mechanical pass over new code, not a second migration.
   References nagent_review Pitfall #4 (provider history divergence)
   and the ErrorKind.PROVIDER_HISTORY_DIVERGED_FROM_UI use case.

2. Declarative read, not behavioral dispatch: Added clarification
   to §6 (UX Adaptation) that the capability matrix is a *read* of
   declarative data, not a new dispatch layer. Per nagent_review
   Pitfall #1 (opaque function calling in the Application is the
   correct choice; nagent-style protocol is for Meta-Tooling),
   UI elements are visible/enabled/disabled/hidden but the
   *behavior* they invoke is unchanged. Three concrete examples
   added: screenshot button, cost panel, cache panel.

3. PROVIDERS source of truth: Added a NOTE in §3.2 (Module Layout)
   that src/models.py:79-86 PROVIDERS is the existing single
   source of truth for the (vendor, model) enumeration. The
   capability registry reads from this constant rather than
   introducing a parallel list. Cross-references
   docs/guide_models.md.

4. Docs touchpoint: Expanded Phase 6 (Docs + Archive) in §9 to
   note that docs/guide_ai_client.md needs the new providers +
   the shared helper documented, and that
   docs/guide_context_aggregation.md (added 2026-06-08) is the
   reference for the aggregate.py pipeline that all new providers
   use.

5. See Also cross-references: Added 3 new entries to §13.2:
   - docs/guide_context_aggregation.md (the new pipeline guide)
   - conductor/tracks/nagent_review_20260608/report.md (§1, §5, §15)
   - conductor/tracks/nagent_review_20260608/nagent_takeaways_20260608.md
     (§1, §2, §9)

No plan.md changes. Plan tasks are task-level and will flow from
the spec changes when the track is re-planned.
2026-06-08 20:35:52 -04:00
ed b17cbbdeca conductor(plan): write 6-phase implementation plan for qwen_llama_grok_integration_20260606
~30 tasks across 6 phases, each with explicit Red-Green-Refactor TDD steps:
- Phase 1 (1.1-1.8): Capability matrix framework (src/vendor_capabilities.py)
  + shared OpenAI-compatible helper (src/openai_compatible.py). 13 unit tests.
- Phase 2 (2.1-2.8): Qwen via DashScope native SDK. 5 unit tests.
- Phase 3 (3.1-3.7): Grok (xAI) + Llama (Ollama + OpenRouter + custom URL)
  via shared helper. 8 unit tests.
- Phase 4 (4.1-4.3): MiniMax refactor (_send_minimax from ~250 -> ~50 lines).
  Safety net: existing tests/test_minimax_provider.py.
- Phase 5 (5.1-5.5): 9 capability-driven UX adaptations in src/gui_2.py.
  Manual smoke test for all 3 new vendors.
- Phase 6 (6.1-6.4): Update docs/guide_ai_client.md + guide_models.md.
  Archive the track.

Data-oriented design: shared helper is the algorithm on normalized data;
_send_<vendor>() entry points are thin boundary adapters.

1-space indentation per project style guide. No placeholders. All test
code is concrete. Self-review at end confirms spec coverage (every
section of spec.md mapped to a task).
2026-06-06 15:06:30 -04:00
ed 97daaff29b conductor(spec): Fix Qwen-Audio matrix entry consistency (vision=false, audio deferred)
The capability matrix v1 has no 'audio' field (audio_input is deferred to v2).
Qwen-Audio's vision flag was incorrectly marked true. Changed to false and
clarified that v1 uses Qwen-Audio as text-only; audio attachment UI is
hidden via the absent audio capability check.
2026-06-06 14:58:03 -04:00
ed 7c1d597ef1 conductor(track): Initialize qwen_llama_grok_integration_20260606 spec
Three new vendors + capability matrix framework + MiniMax refactor:

**Capability matrix v1 (7 features):** vision, tool_calling, caching, streaming,
model_discovery, context_window, cost_tracking. Audio and server-side code
execution deferred to a follow-up track.

**Qwen via DashScope native SDK:** Qwen-Turbo, Qwen-Plus, Qwen-Max, Qwen-Long
(1M context), Qwen-VL-Plus/Max (vision), Qwen-Audio. Native API chosen over
OpenAI-compatible mode to unlock Qwen-Audio, Qwen-Long custom chunking, and
Qwen-VL-Max enhanced vision.

**Llama (OpenAI-compatible, multi-backend):** Ollama (local, free), OpenRouter
(cloud aggregator covering Together/Groq/Fireworks), custom URL escape hatch.
Models: Llama 3.1 8B/70B/405B, 3.2 1B/3B, 3.2 11B/90B Vision, 3.3 70B.

**Grok via xAI (OpenAI-compatible):** Grok-2, Grok-2-Vision, Grok-Beta.

**Shared OpenAI-compatible helper** in src/openai_compatible.py processes a
normalized request/response data structure; each _send_<vendor>() is a thin
adapter at the boundary (data-oriented design per Fleury/Acton/Lottes).

**MiniMax refactor:** ~250 lines reduced to ~50 by using the shared helper.
Existing test_minimax_provider.py is the safety net.

**UX adaptation:** 9 UI elements (screenshot, tools toggle, cache panel, stream
progress, fetch models, token budget, cost panel) read from the matrix instead
of hard-coding per-vendor branches.

**Out of scope (deferred):** Anthropic/Gemini/DeepSeek migration to the matrix
(separate track), audio input, server-side code execution, PDF input, batch API,
fine-tuning.

6 phases planned: matrix+helper, Qwen, Grok+Llama, MiniMax refactor, UX
adaptation, docs+archive.
2026-06-06 14:56:00 -04:00