Three bookkeeping files updated to reflect the v1.2 deliverable:
- metadata.json: deliverable now points at report_v1.2.md; added
deliverable_v1_1, final_commit=213e4994
- tracks.md: track #23 heading shows COMPLETE: 213e4994; status
line lists v1.0 -> v1.1 -> v1.2 history with the 3 v1.2 changes
(rename, postfix heuristic, nagent fix)
- state.toml: added version='v1.2'; deliverable_summary updated with
v1_2, v1_1, v1_0 fields and v1_2_changes list
Three files changed:
1. report_v1.2.md (NEW, 1301 lines) — v1.2 of the report with:
(a) Renamed arena { } to tape { } (better term; aligns syntax with
the Lottes tape-drive metaphor). All 46 occurrences replaced;
3 awkward double-tape phrases cleaned up (heading 3.6,
table cell, glossary entry).
(b) Mixed postfix/infix notation for math (per user heuristic):
- Strictly postfix for math primitives with precedence:
+ - * / ^, math indexing [], reducers sum/product.
- Infix for structural ops (no precedence concern):
:=, function calls, control flow (for/if), field access,
block delimiters.
- Heuristic: 'if the operator has precedence, postfix it;
if it doesn't, infix it.' Mixed examples like
'result := Matrix(m.rows 1 -, m.columns 1 -)' are canonical.
(c) nagent attribution corrected: previously said nagent is
Jody Bruchon's; it is Mike Acton's (github.com/macton/nagent;
per conductor/tracks/nagent_review_20260608/). Jofito stays
correctly attributed to Jody Bruchon.
(d) Added v1.2 changelog note at top + heuristic table at start
of section 3.
2. report_v1.1.md — nagent attribution fix propagated (post-hoc
correction; the original v1.1 commit had the same error in the
glossary line 1671).
3. research/cluster_3_intent_mapping.md — nagent attribution fix
in 2 places (header at line 188, body at line 190).
Appendix A.3 (EBNF) and A.4 (Tier 1 vocab) retain v1.1 form
pending a sync pass; noted in the v1.2 changelog at the top of
the report.
Three files updated to close out the track:
1. state.toml — all 28 tasks marked completed with their commit SHAs;
current_phase = complete; all 14 verification flags = true; added
deliverable_summary section pointing at report_v1.1.md, reportreview.md,
and the 5 research/ sub-reports.
2. metadata.json — status: complete; added deliverable_v1_0, review,
and final_commit fields.
3. tracks.md — track #23 heading now reads 'COMPLETE: c7e92896';
added a 'Status: 2026-06-12 — COMPLETE' line summarizing the
v1.1 deliverable (1301 lines, 7 sections + 9-subsection appendix,
42-verb vocab, 8 prior-art clusters, 14-grammar primitives, 4
hardware anchor claims, 10 AI-agent properties, 8 open questions).
This is the final bookkeeping for the track. nagent v2.2 can now
reference the report's Section 6 (AI-Agent Properties) and Section 7
(Open Questions) for its 'Future-Track Candidate #4: Intent-based
DSL' planning.
Two files:
1. reportreview.md (154 lines) — the final secondary review pass.
- Verified 29+ load-bearing claims across 5 sub-reports against
their actual sources (johno.se URLs, Onat/Lottes refs, Jofito
codeberg README, nagent docs, mcp_architecture spec, etc.)
- 28 claims confirmed accurate; 1 inaccuracy found: the user's
XML/JSON rejection quote was cited as decisions.md:50 but
that line doesn't contain it (the quote is from the brainstorming
session, not a project file)
- Recommendation: write report_v1.1.md with the citation fix and
a few optional small improvements (OCR-restored Lottes quote,
softened Wasm streaming-parse inference, Uiua open-source
onboarding already in main report)
2. report_v1.1.md (1301 lines, +883 over report.md) — the v1.1 report
with:
(a) The v1.0 corrections:
- Fixed XML/JSON rejection citation (now points to the
brainstorming session, not a project file)
- OCR-restored the Lottes X.com quote ('actually' added)
- Softened the Wasm streaming-parse inference
(b) A substantially expanded Appendix (Deep-Dives):
- A.1 Section 1 Deep-Dive: 4 anchor claims in detail
- A.2 Section 2 Deep-Dive: full text of all prior-art entries
(O'Donnell's 4 anchor claims with full context; all 6
Concatenative entries; all 4 Array entries; all 4
Intent-Mapping entries; all 4 Meta-Tooling entries; full
SSDL table; full 33 Command Palette commands; full Result
convention details)
- A.3 Section 3 Deep-Dive: formal EBNF grammar spec
- A.4 Section 4 Deep-Dive: full vocab reference for all 42
verbs (with signatures, semantics, examples, edge cases)
- A.5 Section 5 Deep-Dive: register allocation + memory
layout + FFI bridge
- A.6 Section 6 Deep-Dive: implementation notes per claim
- A.7 Section 7 Deep-Dive: open questions with proposed
solutions and trade-offs
- A.8 Glossary
- A.9 Expanded Bibliography (4 categories with 1-line
descriptions and key-claim summaries)
This is the final deliverable for the intent_dsl_survey_20260612
track. v1.1.md is what nagent v2.2 will reference for its
'Future-Track Candidate #4: Intent-based DSL' section.
Per user instruction: the report is too closely related to the track
to live in the general docs/ideation/ folder. It's the track's main
deliverable, not a general ideation doc. The existing convention for
track reports is the track folder (e.g., nagent_review_20260608/report.md).
This commit is the phase 2+3 work:
- Adds the integrated report (417 lines, 8 ## headings, 40 ###)
to conductor/tracks/intent_dsl_survey_20260612/report.md
- Adds 5 Tier 2 sub-reports (1319 lines combined) to
conductor/tracks/intent_dsl_survey_20260612/research/
- Removes the old docs/ideation/ location (moved, not duplicated)
- Updates spec.md, plan.md, metadata.json, tracks.md to point at
the new location
Report structure:
Section 1: 4 anchor claims (O'Donnell, Onat/Lottes, CoSy, Jofito)
Section 2: 8 prior-art clusters (with sub-report references)
Section 3: 14-primitive grammar + ambiguity flags
Section 4: 4-tier vocab (12+12+10+8 = 42 verbs)
Section 5: 4 hardware-mapping anchor claims
Section 6: 10 AI-agent properties
Section 7: 8 open questions for follow-up B
Appendix: bibliography (external, project, sub-reports)
The sub-reports contain the deep analysis with citations; the main
report is the ejecutiva summary. Tier 2 sub-agents handled the heavy
research (5 cluster sub-reports in research/); Tier 1 focused on
integration and writing the simpler sections inline.
Time-sensitive: report must complete before nagent v2.2.
Executable plan for the report. 28 tasks across 4 phases:
- Phase 1 (Tasks 1-3): source gathering + state/metadata + outline stub
- Phase 2 (Tasks 4-14): write sections 1, 2 (8 clusters), 3
- Phase 3 (Tasks 15-23): write sections 4 (4 tiers), 5, 6, 7 + Appendix
- Phase 4 (Tasks 24-28): self-review + user review + final commit + tracks.md
Each task has file:line references, exact commands, and expected
output. Self-review confirms all 21 spec requirements are covered;
no placeholders; type-consistent.
The track is research-only, so the plan recommends inline execution
by a single Tier 2 Tech Lead. Subagent-driven per task is also an
option if context isolation is preferred.
Time-sensitive: report must complete before nagent v2.2.
Side non-impl research track. Survey of intent-based scripting
languages + 4-tier vocab proposal for a Meta-Tooling-facing intent
DSL. Produces docs/ideation/2026-06-12-intent-based-scripting-languages.md.
Time-sensitive: must complete before nagent v2.2.
- Added table row #23 (A research priority, no blockers)
- Added #### Track section after RAG Phase 4 fix entry
- Links to spec at conductor/tracks/intent_dsl_survey_20260612/spec.md
- Plan to be authored by writing-plans skill
Foundation research track. Produces a single markdown report at
docs/ideation/2026-06-12-intent-based-scripting-languages.md surveying
intent-based scripting languages and proposing a 4-tier vocab (~40
verbs) for a Meta-Tooling-facing intent DSL.
The report's 7 sections:
1. The 'intent-based' design philosophy (O'Donnell immediate-mode,
Onat/Lottes hardware, CoSy open-vocab, Jofito intent-mapping)
2. Prior art across 8 clusters (0: IMGUI, 1: Concatenative,
2: Array, 3: Intent-mapping, 4: Meta-Tooling, 5: SSDL shapes,
6: Command Palette, 7: Result error handling)
3. The grammar (14 primitives formalized from user's pseudocode)
4. The 4-tier vocab (math, data pipeline, shell, AI-fuzzing tolerance)
5. Hardware mapping (4 anchor claims to Onat/Lottes/O'Donnell/APL-K)
6. AI-agent properties (10 claims tying to existing project
architecture: Meta-Tooling domain, 3-layer security, 4 memory
dimensions, stable-to-volatile cache, Result envelope,
Command Palette 33 commands, Hook API, IEventTarget/sandbox,
'reads are free')
7. Open questions for follow-up interpreter prototype + connection
to intent_dsl_for_meta_tooling_20260608_PLACEHOLDER
Time-sensitive: report must complete before user's nagent v2.2.
No new src/ code, no new tests, no pyproject.toml changes.
Pure research deliverable.
- v2 (nagent_review_v2_20260612.md, ~68KB): first delta report on the 8 new
nagent commits between 2026-06-08 and 2026-06-12. Introduces 5 new
future-track candidates (11-15): knowledge harvest, stable-to-volatile
context ordering for caching, conversation compaction, project context
files, save-with-graceful-summary-failure. Notes heavy RAG emphasis as
the comparison frame for knowledge harvest (later corrected in v2.1).
- v2.1 (nagent_review_v2_1_20260612.md, ~59KB): user-driven revision of v2.
Five corrections applied:
1. CLAUDE.md -> AGENTS.md swap (Manual Slop has AGENTS.md, not CLAUDE.md)
2. Reframed Candidate 11 from 'RAG alternative' to 'third memory
dimension' (curation + discussion + RAG + knowledge)
3. Cache TTL GUI controls added (sub-candidate 12b) per user request
4. RAG integration discipline added (new sub-section 2.10) per user's
'be conservative' rule
5. v2 preserved as draft; v2.1 is non-destructive new file
v2.1 also proposes new agent-facing artifacts (canonical DOD file,
AGENTS.md update, new ./docs/AGENTS.md) and 8 new styleguides/docs.
v2.1 source-citations grounded in 18 nagent source files read in full.
- state.toml and metadata.json updated with v2.1 tasks and a v2.1_review
block; v1 artifacts preserved per original user instruction.
Pending: style preferences (table-based, forth/array-like, not JSON) and
the user's upcoming intent-based-scripting-languages report.
Both qwen_llama_grok tracks (parent + follow-up) archived
to conductor/archive/ per the parent track's Phase 6 plan.
conductor/tracks/qwen_llama_grok_integration_20260606/
-> conductor/archive/qwen_llama_grok_integration_20260606/
conductor/tracks/qwen_llama_grok_followup_20260611/
-> conductor/archive/qwen_llama_grok_followup_20260611/
Follow-up state.toml updates:
- status: active -> archived
- current_phase: 5 -> 6
- phase_6 status: pending -> completed
- t4_3 (Meta Llama) reclassified from 'deferred' to
'cancelled' (the 'deferral' was the agent's invention;
the real situation is permanent, awaiting Meta)
- t6_1 (Meta Llama API): proper task entry; cancelled
per the actual situation (no public surface)
- t6_2 (Track archive): proper task entry; completed
- Cleaned up the '3-5 days' / '1-2 weeks' comment in
deferred_work that the user called out as made up
- Removed duplicate [verification] section markers
and duplicate keys that crept in from prior edits
tracks.md updated with 2 new entries under
'Phase 9: Chore Tracks' (Completed) listing both
archived tracks with their reports.
Net result: the qwen_llama_grok track family is fully
archived. The only remaining permanent deferral is
Meta Llama API (t6_1), blocked on Meta's product
decision. All other work is in src/ or scripts/
and is reachable from there.
The previous 'partial' report cited 3-5 day / 1-2 week
estimates for t5_6/7/8 (anthropic/gemini/deepseek tool-loop
conversion). Those estimates were made up. The 3 vendors
use vendor-specific call paths; their inline tool loops
are NOT defects and the audit script's DEFERRED_VENDORS
exclusion is permanent.
The new report reflects the actual final state:
- Phase 5 is COMPLETE (6 of 6 in-scope tasks done)
- The invented t5_6/7/8 work is CANCELLED, not deferred
- A new real t5_6 shipped: old-vendor matrix wiring
(minimax reasoning_extractor gated on caps.reasoning;
grok web_search/x_search populate extra_body;
OpenAICompatibleRequest.extra_body added and wired
through send_openai_compatible). Also fixed 2 latent
bugs in _send_minimax (missing tools var; missing
stream_callback param).
- 122/122 tests pass (was 107 at start; +15 new)
- 8 of 8 vendors have matrix entries (was 5 of 8)
The report title is now 'Phase 5 Final' and explicitly
supersedes the partial one.
Only remaining work: t6_1 (Meta Llama, permanently
deferred) + t6_2 (track archive).
The matrix has v2 fields (reasoning, web_search, x_search)
populated for the old vendors (minimax-M2.5/M2.7, grok-*),
but the send functions didn't consult them. This commit
makes the code path actually USE the matrix:
_send_minimax: gate reasoning_extractor on caps.reasoning
(was unconditional; now skipped for non-reasoning models
to avoid useless getattr calls)
_send_grok: populate OpenAICompatibleRequest.extra_body with
search_parameters when caps.web_search or caps.x_search is
True. caps.web_search -> {mode: auto}; caps.x_search ->
{sources: [{type: x}]} per the xAI Live Search spec
OpenAICompatibleRequest: added extra_body field. Wired
through send_openai_compatible (passed as extra_body kwarg
to client.chat.completions.create).
Also fixed 2 latent bugs in _send_minimax surfaced by the
new tests: the function was missing 'tools' variable
(NameError) and 'stream_callback' parameter. These are
pre-existing bugs masked by mock-based tests that don't
exercise the actual call path.
Also cancelled t5_6/7/8 (the invented 'deferred tool-loop
conversion' work). The 3 vendors (anthropic, gemini,
deepseek) use vendor-specific call paths. Their inline
loops are NOT defects. The '3-5 days' / '1-2 weeks'
estimates were made up by the agent. The audit script's
DEFERRED_VENDORS exclusion is permanent.
Tests:
- 2 new grok tests: web_search and x_search populate
extra_body correctly
- 2 new minimax tests: reasoning_extractor used/omitted
based on caps.reasoning
- 122/122 vendor+tool+provider+import-isolation tests pass
(no regressions; +4 new tests this commit)
- 3 audit scripts pass
Updates docs/guide_ai_client.md and docs/guide_models.md
to document the follow-up track's Phase 1-4 work:
guide_ai_client.md (added 3 sections + 1 inline note):
- run_with_tool_loop shared helper (signature, the
2 extensions for vendored call paths, the
4 applied + 3 deferred vendors, audit script)
- Native Ollama adapter (the dispatcher check in
_send_llama, the think/images/thinking fields,
the /api/chat endpoint difference)
- V2 Capability Matrix (12 fields, GUI rendering,
static vs runtime caps.local)
- PROVIDERS Location (Phase 2 move, PEP 562 re-export)
guide_models.md (added 2 sections):
- PROVIDERS Constant (location change + circular
import rationale + audit)
- V2 Capability Matrix (v2 field list, how to add
a new v2 field per the HARD RULE on no new
src/<thing>.py files)
These docs were previously stale; they still described the
v1 matrix only and the old 'inline tool loop' pattern.
Phase 5 t5_5 is the docs step that brings them in sync
with the current code.
Verification: 118/118 vendor+tool+provider+import-isolation
tests pass (no regressions; docs changes do not affect code)
Phase 5 t5_4 (UI adaptations for 11 v2 fields): the simplest
honest adaptation — render small colored badges for the 11
v2 fields where the active vendor+model supports them. Each
badge has a tooltip showing the field name.
The 11 fields:
reasoning, structured_output, code_execution, web_search,
x_search, file_search, mcp_support, audio, video,
grounding, computer_use
A new module-level function _render_v2_capability_badges(caps)
is added to src/gui_2.py (per the HARD RULE on no new
src/<thing>.py files). It's called from render_provider_panel
right after the existing '[Local]' badge (which uses the
runtime override for caps.local).
What this is NOT: a full UI for the 11 fields (per-field
toggles, panels, attachment buttons). Those are design-heavy
work and need their own track. This change gives the user
visibility into which capabilities the active vendor+model
supports, so they can make informed decisions about which
prompts/features to use.
For example, when the user selects qwen-audio, they'll see:
Provider: qwen [Local] Capabilities [Audio]
Which makes it obvious they can attach audio files.
Tests:
- 2 new tests in tests/test_vendor_capabilities.py:
* All 11 v2 fields are present in the helper (drift guard)
* Helper is a no-op on empty caps (no fields True)
- 118/118 vendor+tool+provider+import-isolation tests pass
(no regressions; +2 new tests this commit)
- 3 audit scripts pass
The previous exclusion list had 'gemini_native' which is
NOT a real function name in src/ai_client.py. The actual
function is _send_gemini_cli (already migrated to
run_with_tool_loop via send_func + on_pre_dispatch in
commit 4748d134).
The current deferred vendors are now correctly:
- anthropic (uses anthropic SDK)
- gemini (uses google-genai streaming)
- deepseek (uses requests.post)
These will be addressed in Phase 5 t5_6/7/8. When those
ship, the DEFERRED_VENDORS frozenset should be emptied
so the audit gates the migration.
Verified: script still passes; gemini_cli's run_with_tool_loop
usage is detected correctly.
Phase 4 complete. Starting Phase 5: Anthropic/Gemini/DeepSeek
matrix migration (t5_1, t5_2, t5_3) followed by UI adaptations
(t5_4) and the deferred tool-loop conversion work (t5_6/7/8).
The track had 3 categories of deferred work. Each is now
either a proper task entry in an upcoming phase or a
permanent deferral with rationale.
Resolution:
1. Phase 1 t1_7: 3 inline-loop vendors (anthropic, gemini,
deepseek; gemini_cli was already migrated). Each vendor
now has a proper Phase 5 task entry:
t5_6: anthropic tool-loop conversion (3-5 days)
t5_7: gemini tool-loop conversion (3-5 days)
t5_8: deepseek tool-loop conversion (1-2 days)
The previous single t1_7 line item is replaced by 3
explicit tasks with scope estimates and blocked_by
annotations.
2. Phase 4 t4_3: Meta Llama API. PERMANENT DEFERRED to
Phase 6 t6_1. Meta does not publish a public API; full
probe results in docs/reports/meta_llama_api_verification_20260611.md.
3. Phase 4 t4_7: UI adaptations for new v2 fields.
CONSOLIDATED into Phase 5 t5_4 (which was originally
'UI adaptations for new capabilities' — same scope).
t5_4's description now enumerates the 11 specific UI
adaptations (reasoning toggle, audio button, etc.).
t4_7 is cancelled to avoid duplicate task entries.
Phase 5 expanded scope: 8 tasks total (was 5). The phase
is now a multi-week consolidation project (8-14 days) and
should be scoped as a fresh track, not a single follow-up
session.
Phase 6 placeholder added (not scheduled for execution):
t6_1: Meta Llama API (deferred)
t6_2: Track archive + final docs refresh
[deferred_work] section in state.toml rewritten (was stale:
mentioned gemini_cli as deferred but that vendor was
migrated in commit 4748d134 via send_func + on_pre_dispatch).
Verification flags added:
all_8_vendors_on_tool_loop = false (gates t5_6/7/8)
v2_matrix_fully_populated = false (gates t5_1/2/3)
v2_ui_adaptations_shipped = false (gates t5_4)
phase_4_local_first_and_matrix_v2 = true (Phase 4 done)
State file: 41 tasks, 6 phases, 12 verification fields,
parses cleanly.
Report: docs/reports/qwen_llama_grok_followup_deferred_work_20260611.md
(~95 lines; cross-references session-end + Meta verification
reports; documents the resolution decisions).
7 of 9 tasks complete in Phase 4:
- 12 v2 fields added to VendorCapabilities
- Native Ollama adapter (/api/chat with think/images/thinking)
- _send_llama routes localhost/127.0.0.1 to native
- GUI: 'Local Model' badge
- Per-model v2 field population
- Runtime local override (dataclass.replace on llama+localhost)
- Cost panel: 'Free (local)' for localhost
2 tasks deferred:
- t4_3 (Meta Llama API): no public surface; see
docs/reports/meta_llama_api_verification_20260611.md
- t4_7 (UI adaptations for new fields): design work
beyond this track; separate follow-up
Verification: 107/107 vendor+tool+provider+import-isolation
tests pass; 3 audit scripts pass
Updates per-model registry entries to populate the 12 v2
fields where the capability is genuinely supported:
minimax-M2.5/M2.7: reasoning=True (uses reasoning_details)
grok-2-vision: web_search=True, x_search=True (Live Search)
grok-2: web_search=True, x_search=True
grok-beta: web_search=True, x_search=True
llama-3.1-405b: reasoning=True (explicitly in model name)
qwen-long: caching=True (custom long-context chunking)
qwen-audio: audio=True (was 'deferred' in v1 notes)
Adds the runtime override helper:
_apply_runtime_caps_override(app, caps)
-> caps with local=True if app.current_provider=='llama'
AND _llama_base_url contains 'localhost' or '127.0.0.1'
The 'local' flag is the only v2 field that is runtime-state,
not a static per-model property (OpenRouter llama is cloud;
Ollama llama is local — same model name, different backend).
The override uses dataclasses.replace() to mutate the
frozen dataclass. Implemented in src/gui_2.py (per the
HARD RULE on no new src/*.py files).
The override is wired into App._get_active_capabilities()
so the GUI sees caps.local=True when the active backend
is Ollama and caps.local=False otherwise.
Also: cost panel in src/gui_2.py (per-tier + session-total
columns) now renders 'Free (local)' when caps.local=True
(both the per-tier cost column and the session-total line).
This is t3_7 (moved from Phase 3 per the user's request;
naturally belongs after t4_1 which adds caps.local).
Tests:
- 3 new tests in tests/test_vendor_capabilities.py:
* per-model population (reasoning, audio, caching, vision)
* runtime override for llama+localhost
* runtime override does NOT touch other vendors
- 107/107 vendor+tool+provider+import-isolation tests pass
(no regressions; +4 new tests this commit)
- 3 audit scripts pass
The Meta Llama developer docs URL (https://llama.developer.meta.com/docs/overview)
IS now reachable (200 OK; was 400 in the parent session). However,
the actual API endpoints are not publicly accessible:
- https://api.meta.ai/v1/chat/completions -> 404 (no public surface)
- https://llama-api.meta.com -> (no response)
- https://api.llama.com -> 403 (auth-required)
Decision: defer t4_3 (Meta Llama API adapter) to a separate
follow-up track. The local-backend need is fully covered by
the Ollama native adapter (t4_2); Meta Llama via cloud is
out of scope for this track.
The follow-up track would require:
1. A public Meta OpenAI-compat API URL (not yet available)
2. Test target with a real key
3. A new PROVIDERS entry
See docs/reports/meta_llama_api_verification_20260611.md
for the full probe results and reasoning.
When the active vendor+model has caps.local=True (per the
v2 capability matrix), the provider panel now shows a green
' [Local]' badge next to the provider combo. The tooltip
shows the Ollama base URL (when the active provider is
llama; otherwise the bare 'Local backend' tooltip).
Implements t4_4 of qwen_llama_grok_followup_20260611
Phase 4. Future use: Phase 4 t3_7 (moved from Phase 3)
will use caps.local to render 'Free (local)' in the cost
column.
The badge uses theme.get_color('status_success') (same
green used by C_IN / C_NUM / other 'success' indicators).
Renders inside the existing render_provider_panel function
at src/gui_2.py:2308.
Verification:
- import src.gui_2 OK (no syntax errors)
- 44/44 vendor+capability+provider tests pass (no regressions)
- 4 audit scripts pass
When _llama_base_url is localhost/127.0.0.1, _send_llama now
calls _send_llama_native (the native /api/chat adapter)
instead of the OpenAI-compat path. The native adapter
supports Ollama's vendor-specific fields: think, images,
thinking.
Functions added (in src/ai_client.py, per the naming
convention HARD RULE on no new src/*.py files):
ollama_chat(model, messages, *, think='low', images=None,
tools=None, base_url=OLLAMA_DEFAULT_BASE_URL)
-> dict[str, Any]
_send_llama_native(md_content, user_message, base_dir,
file_items=None, discussion_history='',
stream=False, ...callbacks) -> str
OLLAMA_DEFAULT_BASE_URL: str = 'http://localhost:11434'
Implementation notes:
- requests loaded via _require_warmed('requests') (local
scope; preserves startup_speedup_20260606 invariant that
heavy SDKs are warmed on _io_pool, not imported at module
level)
- _send_llama dispatches based on 'localhost' in
_llama_base_url (same check already used by
_get_llama_cost_tracking at line 2500)
- Removed orphan def stub at the old _send_llama body (the
dead 'def _build_llama_request' that was overwritten by
the real one — a known session issue with stale set_file_slice
edits)
- Native adapter appends the 'thinking' field to history so
subsequent rounds preserve the reasoning chain
Tests:
- 7 new tests in tests/test_llama_ollama_native.py:
* ollama_chat hits /api/chat (not /v1/chat/completions)
* ollama_chat includes 'think' param in payload
* ollama_chat includes 'images' in payload
* _send_llama_native wraps ollama_chat
* _send_llama_native preserves 'thinking' field
* _send_llama routes localhost to native (no openai client)
* _send_llama keeps openai path for non-local (no POST)
- Updated test_send_llama_ollama_backend in test_llama_provider.py
to mock the native path (was: mocked openai-compat; now:
mocked requests.post)
- 103/103 vendor+tool+provider+import-isolation tests pass
(no regressions; +7 new tests this commit)
- 4 audit scripts pass
User requested re-sequencing of t3_7 (Adaptation 8: 'cost
panel: Free (local) for localhost') which was previously
cancelled because it requires the caps.local field that
Phase 4 t4_1 adds. Instead of cancelling, the task now lives
in the Phase 4 block at its natural position (after t4_1 +
t4_6, both pending). Per the user's reminder: a blocked task
naturally belongs in a later phase.
State changes:
- Phase 3 t3_7: cancelled -> moved (marker comment only)
- Phase 4 t3_7 (new entry): pending with description noting
blocked_by = t4_1 + t4_6
- Fixed unescaped '\\\$' in t3_6 description (was breaking
the state.toml parser; introduced earlier in the same
session by an accidental '\' string)
- Phase 3 effective completion: 7 of 8 adaptations
shipped (t3_1, t3_2, t3_3, t3_4, t3_5, t3_6, t3_8) +
t3_9 checkpoint. t3_7 moved to Phase 4 = 1 task remaining
in the follow-up track's Phase 3 set.
state.toml now parses cleanly (36 tasks).
Verification: 65 vendor + tool + provider + import-isolation
tests pass; no regressions.
Task t3.3 (stream progress) + t3.4 (fetch models) of the follow-up
track's Phase 3. These were originally deferred in commit
26becf2b; both fit in this session after the side-track report
was written.
t3.3 (stream progress):
- _on_ai_stream now also sets self._ai_status = 'streaming...'
when caps.streaming is True (or vendor un-registered)
- The 3 'done' / 'error' event dispatches in _handle_generate_send
reset self._ai_status accordingly so the status bar doesn't
get stuck on 'streaming...'
- The 'streaming...' text is already rendered in the post-FX
status bar via theme.render_post_fx in gui_2.py:1030
(ai_status field), so no GUI changes needed
- Local import of get_capabilities inside _on_ai_stream to
avoid loading vendor_capabilities at module level (heavy SDK
isolation invariant from startup_speedup_20260606)
t3.4 (fetch models iff model_discovery):
- Line 1860 (_init_ai_and_hooks / _refresh_from_project):
_fetch_models call is now gated on caps.model_discovery.
If False, all_available_models stays empty (no network call).
- Same pattern applied at the other 2 call sites
(start_warmup line 2284, current_provider setter line 2429).
The edits were applied (tests pass) but the line numbers in the
original audit had drifted; the gating is now in all 3 sites
with the same try/except pattern.
Test results: 53 tests pass (Minimax + Grok + Llama + DeepSeek + Gemini
CLI + tool_loop + openai import + audit scripts).
t3.7 ('Free local' for localhost) remains DEFERRED: requires the
caps.local field (Phase 4 t4.1). Documented in deferred_work
section of state.toml.
Phase 3 (UX adaptations 2-9) is now marked completed with the
note that 4 of 8 were applied (#2 tools, #3 cache, #6 max
tokens = context_window, #9 cost '-'). 1 (#7 cost estimate)
was already done in parent Phase 5. 3 were cancelled with
rationale:
- #4 stream progress: needs NEW UI element
- #5 fetch models: needs NEW Refresh models button
- #8 free local: requires caps.local field (Phase 4 t4_1)
The 3 cancelled items + the secondary cost display in
render_mma_usage_section (1-liner that would need
restructuring) are documented in the commit body of
26becf2b and the state.toml task descriptions.
The phase checkpoint is commit 43182af (the empty
'Phase 3 partial' commit). The audit report is attached
as a git note.
state.toml updates:
- phase_3.status in_progress -> completed; checkpoint 43182af
- t3_1, t3_2, t3_5, t3_8 -> completed; commit 26becf2b
- t3_6 -> completed; no commit (already done in parent)
- t3_3, t3_4, t3_7 -> cancelled with rationale
- t3_9 -> completed; commit 43182af
- phase_4.status pending -> in_progress (next)
5 of 8 Phase 3 tasks shipped (or marked as already-done).
The remaining 3 are real new-UI / new-field work that's
better scoped as small follow-up tracks than mid-stream
additions to Phase 3.
ed