diff --git a/README.md b/README.md index 12ddf1d5..962a0062 100644 --- a/README.md +++ b/README.md @@ -230,8 +230,8 @@ with `graff mcp import-session `. | `/strict` | every message is a tool | Providers: Anthropic, OpenAI, DeepSeek, xAI, Z.AI, Kimi, ChatGPT plan, Codex, -Vercel, OpenRouter, MiniMax, Xiaomi, Groq, Cerebras, Mistral, plus one -workspace router in `.graff/.config.router`. `graff models refresh` pulls the +Vercel, OpenRouter, MiniMax, Xiaomi, Groq, Cerebras, Mistral, native Flint, +and one workspace router in `.graff/.config.router`. `graff models refresh` pulls the catalogs. Claude-subscription OAuth is deliberately not supported. Local servers: `omlx` (the oMLX app on `127.0.0.1:8000`), `lmstudio` @@ -239,7 +239,8 @@ Local servers: `omlx` (the oMLX app on `127.0.0.1:8000`), `lmstudio` oMLX requires its API key: `graff key set omlx ` or `OMLX_API_KEY`. `graff models` lists the models oMLX serves, `graff --model omlx` starts on the first one, and `graff --model omlx/` picks one. `/effort` is sent -as `reasoning_effort`. +as `reasoning_effort`. Native Flint is available through the separately installed +local `nanoattention` runtime; see [setup](docs/NANOATTENTION.md). diff --git a/docs/NANOATTENTION.md b/docs/NANOATTENTION.md new file mode 100644 index 00000000..a192e3a7 --- /dev/null +++ b/docs/NANOATTENTION.md @@ -0,0 +1,22 @@ +# Native Flint + +Codegraff can route `nanoattention/flint` as a built-in local provider. The +native Zig/Metal runtime and a compatible Flint checkpoint must already be +installed separately; Codegraff does not download, bundle, or update either. + +Set `NANOATTENTION_API_KEY` to the runtime's local API token (for a tokenless +local runtime, use a non-empty placeholder). The default endpoint is +`http://127.0.0.1:8080/v1/chat/completions`. To use another port, set +`GRAFF_NANOATTENTION_URL` to an HTTP loopback URL ending in +`/v1/chat/completions`; the corresponding `/v1/models` catalog is discovered +on that same host and port. Non-loopback endpoints are rejected. + +Set `GRAFF_CONTEXT` to the runtime's configured context capacity. The default +provider row is 32,768 tokens; an explicit value tells Codegraff how much KV +cache the running local server actually supports. Do not set it higher than the +server's configured capacity. Start with `graff --model nanoattention/flint`. + +This provider uses ordinary OpenAI-compatible chat requests and does not send +reasoning-effort or sampling controls. Missing local credentials fail closed; +there is no cloud fallback. The provider integration supplies routing and +catalog discovery only, not inference itself. diff --git a/docs/adr/0348-native-flint-runtime-is-external.md b/docs/adr/0348-native-flint-runtime-is-external.md new file mode 100644 index 00000000..12736e74 --- /dev/null +++ b/docs/adr/0348-native-flint-runtime-is-external.md @@ -0,0 +1,22 @@ +# 0348. Native Flint runtime remains external + +Status: accepted 2026-11-16 + +## Context + +A locally installed Zig/Metal inference server exposes an OpenAI-compatible API. +Treating it only as a custom router collides with Codegraff's reserved built-in +provider IDs and makes model discovery and context sizing awkward. + +## Decision + +Register a built-in `nanoattention` local provider for Flint, validate endpoint +overrides as loopback-only, and use the same resolved origin for chat and model +catalog requests. The inference runtime and checkpoint remain independently +installed; missing local credentials fail closed. + +## Consequences + +Users get native model routing without global router-file edits or bundled +weights. Runtime installation and configuration remain the user's responsibility, +and the built-in provider does not imply a cloud service or performance guarantee. diff --git a/docs/adr/README.md b/docs/adr/README.md index 797e9c05..d2cefece 100644 --- a/docs/adr/README.md +++ b/docs/adr/README.md @@ -372,6 +372,7 @@ record only when you need the evidence or the edge cases. | [0345](0345-claude-dual-frontier-separate-quota-and-plan-ladders.md) | `anthropic` and `claude-agent` declare a 3-rung ladder with dual frontier (`opus-5-5` normal, `fable-5-2` at `xhigh`/`max`), `billing.quotaPoolFor` marks Fable as a separate plan pool across REPL (`plan*`), ACP (`separateQuota`), and quota recovery (`stepDownSeparateQuotaPool`), `chatgpt-new` mirrors Codex tiers, `xai` stays strictly `grok-4.7` or nothing, `liveLadderModel` adapts to rotated live catalogs, and cross-provider sub routing requires `billing.costFor == .plan`. | | [0346](0346-acp-accounts-plan-windows-and-live-rate-limits.md) | `plan_usage_live` caches live HTTP/WebSocket/`claude-agent` rate limits and drives `isModelBlocked` Fable stepdown; `plan_accounts` and `plan_accounts_probe` collect redacted identity and usage windows across `/usage` and ACP `graff/accounts`, `_codegraff/usage.planWindows` streams active limits, and `initialize` advertises `_meta["codegraff/accounts"]` plus all 7 terminal `authMethods`. | | [0347](0347-same-chat-plan-execute-baton-handoff.md) | Orchestrator Mode (`off` \| `auto` \| `on`, default `auto`) runs Phase 1 read-only planning on the root frontier seat (`exit_plan_mode`) and hands off in-place inside the same KV-cached conversation to a same-provider, same-wire executor 1 rung down (`enter_plan_mode` capped at 2 replans), integrated with `orchestration_policy` `.baton`, `.harness/settings.json`, REPL `/orchestrator`, and ACP `orchestrator` / `graff/models`. | +| [0348](0348-native-flint-runtime-is-external.md) | Native Flint is a built-in local OpenAI-compatible provider, while its runtime and model files remain separately installed; use only validated loopback endpoints and never cloud-fallback. | ## When to write one diff --git a/examples/edge-worker/src/remote.ts b/examples/edge-worker/src/remote.ts index f5964505..d92920b2 100644 --- a/examples/edge-worker/src/remote.ts +++ b/examples/edge-worker/src/remote.ts @@ -11,7 +11,7 @@ export const HARNESS_VERSION = "0.13"; export type ModelName = "MiniMax-M2.5" | "MiniMax-M2.7" | "MiniMax-M3" | "accounts/fireworks/models/deepseek-v4-flash" | "accounts/fireworks/models/deepseek-v4-pro" | "accounts/fireworks/models/glm-5p2" | "accounts/fireworks/models/gpt-oss-120b" | "accounts/fireworks/models/kimi-k2p6" | "accounts/fireworks/models/kimi-k2p7-code" | "accounts/fireworks/models/minimax-m3" | "accounts/fireworks/models/qwen3p7-plus" | "alibaba/qwen3.8-27b" | "anthropic/claude-sonnet-4.6" | "claude-fable-5" | "claude-fable-5-1" | "claude-fable-5-2" | "claude-haiku-5-5" | "claude-opus-4-5" | "claude-opus-4-6" | "claude-opus-4-7" | "claude-opus-4-8" | "claude-opus-4.8" | "claude-opus-5" | "claude-opus-5-5" | "claude-sonnet-4-5" | "claude-sonnet-4-6" | "claude-sonnet-4.6" | "claude-sonnet-5" | "claude-sonnet-5-5" | "deepseek-chat" | "deepseek-reasoner" | "deepseek-v4-flash" | "deepseek-v4-pro" | "flint" | "fugu" | "fugu-ultra" | "fugu-ultra-20260615" | "gemini-3-flash-preview" | "gemini-3.1-flash-lite" | "gemini-3.1-pro-preview" | "gemini-3.5-flash" | "gemini-3.5-flash-lite" | "gemini-3.6-flash" | "gemini-3.7-flash" | "gemini-3.8-flash" | "gemini-4-argon" | "gemma-4-26b-a4b-it" | "gemma-4-31b" | "gemma-4-31b-it" | "glm-4.5" | "glm-4.7" | "glm-5" | "glm-5-turbo" | "glm-5.2" | "glm-5.3" | "glm-5.3-flash" | "glm-5v-turbo" | "gpt-5-codex" | "gpt-5.2" | "gpt-5.3-codex-spark" | "gpt-5.4" | "gpt-5.4-mini" | "gpt-5.4-pro" | "gpt-5.5" | "gpt-5.6" | "gpt-5.6-luna" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-6-astra" | "gpt-6-luna" | "gpt-6-sol" | "gpt-6.1-sol" | "gpt-oss-120b" | "grok-4.3" | "grok-4.6" | "grok-4.7" | "grok-build" | "k3" | "k3-256k" | "k3.1-pro" | "k3.1-pro-highspeed" | "kilo-auto/small" | "kimi-for-coding" | "kimi-for-coding-highspeed" | "kimi-k2.6" | "kimi-k2.7-code" | "kimi-k3" | "kimi-k3.1-pro" | "kimi-k3.1-pro-highspeed" | "kimi-latest" | "lmstudio" | "mimo-v2-flash" | "mimo-v2.5" | "mimo-v2.5-pro" | "mimo-v2.5-pro-ultraspeed" | "mimo-v2.6-flash" | "mimo-v2.6-pro" | "mimo-v2.6-pro-ultraspeed" | "minimax-m3" | "mistral-medium-latest" | "mlx-community/Qwen3.6-27B-OptiQ-4bit" | "muse-spark-1.2" | "muse-spark-1.2-contributor" | "omlx" | "openai/gpt-oss-120b" | (string & {}); export type ToolName = "shell" | "read_file" | "edit_file" | "write_file" | "webfetch" | "skill" | "codedb" | "read_tool_result" | "render_html" | "todo_write" | "todo_read" | "eval" | "note_constraint" | "ask_user" | "attempt_completion" | "load_tool_schemas" | "mcp_search_tools" | "mcp_select_tool" | "clock_sleep" | "subagent" | "workflow" | "agent_output" | "agent_message" | "subagent_resume" | "learn_candidate" | "peer_message" | "workspace" | "yield_turn" | "imagegen" | "lsp" | "rlm"; -export type ProviderId = "anthropic" | "codegraff" | "deepseek" | "openai" | "google" | "minimax" | "xiaomi" | "kilo" | "groq" | "cerebras" | "mistral" | "kimi" | "moonshot" | "xai" | "zai" | "meta" | "vercel" | "openrouter" | "fugu" | "fireworks" | "mlx" | "lmstudio" | "omlx" | "chatgpt-new" | "codex" | "claude-agent"; +export type ProviderId = "anthropic" | "codegraff" | "deepseek" | "openai" | "google" | "minimax" | "xiaomi" | "kilo" | "groq" | "cerebras" | "mistral" | "kimi" | "moonshot" | "xai" | "zai" | "meta" | "vercel" | "openrouter" | "fugu" | "fireworks" | "nanoattention" | "mlx" | "lmstudio" | "omlx" | "chatgpt-new" | "codex" | "claude-agent"; /** Events streamed by the bridge (same `--json` contract as the stdio SDK). * `seq` is a monotonic, gap-free, 1-based per-session id the bridge forwards diff --git a/lean-proofs/Graff/Provider.lean b/lean-proofs/Graff/Provider.lean index 4f7c4cec..47dfb53f 100644 --- a/lean-proofs/Graff/Provider.lean +++ b/lean-proofs/Graff/Provider.lean @@ -1,7 +1,7 @@ /- Provider table kernel. - Twenty-six baked rows. Each row is data: an id plus the axes `Kind`, + Twenty-seven baked rows. Each row is data: an id plus the axes `Kind`, `Auth`, login, catalog, and two bools. The program does not branch per brand. Adding a vendor is one constructor here and one line in `provider.zig`; the Zig fixture test is the ratchet. @@ -74,6 +74,7 @@ def specs : List Row := , { id := "chatgpt-new", kind := .responses, auth := .bearer, login := .chatgptBrowser, catalog := .openai, subLogin := true } , { id := "codex", kind := .responses, auth := .bearer, login := .codexDevice, catalog := .codex, subLogin := true } , { id := "claude-agent", kind := .anthropic, auth := .bearer, login := .claudeCli, subLogin := true, takesEffort := true } + , { id := "nanoattention", kind := .openai, auth := .bearer, catalog := .openai } ] def ids : List String := specs.map (·.id) @@ -92,7 +93,7 @@ def xApiKeyCount : Nat := countWhere (fun r => r.auth == .xApiKey) specs def providerRows : Nat := specs.length -theorem provider_cube : providerRows = 26 := by native_decide +theorem provider_cube : providerRows = 27 := by native_decide theorem responses_vendors : responsesCount = 3 := by native_decide theorem one_x_api_key : xApiKeyCount = 1 := by native_decide diff --git a/sdk/py/harness_sdk.py b/sdk/py/harness_sdk.py index 0324fcc6..609d5801 100644 --- a/sdk/py/harness_sdk.py +++ b/sdk/py/harness_sdk.py @@ -15,7 +15,7 @@ MODELS = ["MiniMax-M2.5", "MiniMax-M2.7", "MiniMax-M3", "accounts/fireworks/models/deepseek-v4-flash", "accounts/fireworks/models/deepseek-v4-pro", "accounts/fireworks/models/glm-5p2", "accounts/fireworks/models/gpt-oss-120b", "accounts/fireworks/models/kimi-k2p6", "accounts/fireworks/models/kimi-k2p7-code", "accounts/fireworks/models/minimax-m3", "accounts/fireworks/models/qwen3p7-plus", "alibaba/qwen3.8-27b", "anthropic/claude-sonnet-4.6", "claude-fable-5", "claude-fable-5-1", "claude-fable-5-2", "claude-haiku-5-5", "claude-opus-4-5", "claude-opus-4-6", "claude-opus-4-7", "claude-opus-4-8", "claude-opus-4.8", "claude-opus-5", "claude-opus-5-5", "claude-sonnet-4-5", "claude-sonnet-4-6", "claude-sonnet-4.6", "claude-sonnet-5", "claude-sonnet-5-5", "deepseek-chat", "deepseek-reasoner", "deepseek-v4-flash", "deepseek-v4-pro", "flint", "fugu", "fugu-ultra", "fugu-ultra-20260615", "gemini-3-flash-preview", "gemini-3.1-flash-lite", "gemini-3.1-pro-preview", "gemini-3.5-flash", "gemini-3.5-flash-lite", "gemini-3.6-flash", "gemini-3.7-flash", "gemini-3.8-flash", "gemini-4-argon", "gemma-4-26b-a4b-it", "gemma-4-31b", "gemma-4-31b-it", "glm-4.5", "glm-4.7", "glm-5", "glm-5-turbo", "glm-5.2", "glm-5.3", "glm-5.3-flash", "glm-5v-turbo", "gpt-5-codex", "gpt-5.2", "gpt-5.3-codex-spark", "gpt-5.4", "gpt-5.4-mini", "gpt-5.4-pro", "gpt-5.5", "gpt-5.6", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra", "gpt-6-astra", "gpt-6-luna", "gpt-6-sol", "gpt-6.1-sol", "gpt-oss-120b", "grok-4.3", "grok-4.6", "grok-4.7", "grok-build", "k3", "k3-256k", "k3.1-pro", "k3.1-pro-highspeed", "kilo-auto/small", "kimi-for-coding", "kimi-for-coding-highspeed", "kimi-k2.6", "kimi-k2.7-code", "kimi-k3", "kimi-k3.1-pro", "kimi-k3.1-pro-highspeed", "kimi-latest", "lmstudio", "mimo-v2-flash", "mimo-v2.5", "mimo-v2.5-pro", "mimo-v2.5-pro-ultraspeed", "mimo-v2.6-flash", "mimo-v2.6-pro", "mimo-v2.6-pro-ultraspeed", "minimax-m3", "mistral-medium-latest", "mlx-community/Qwen3.6-27B-OptiQ-4bit", "muse-spark-1.2", "muse-spark-1.2-contributor", "omlx", "openai/gpt-oss-120b"] TOOLS = ["shell", "read_file", "edit_file", "write_file", "webfetch", "skill", "codedb", "read_tool_result", "render_html", "todo_write", "todo_read", "eval", "note_constraint", "ask_user", "attempt_completion", "load_tool_schemas", "mcp_search_tools", "mcp_select_tool", "clock_sleep", "subagent", "workflow", "agent_output", "agent_message", "subagent_resume", "learn_candidate", "peer_message", "workspace", "yield_turn", "imagegen", "lsp", "rlm"] -PROVIDERS = ["anthropic", "codegraff", "deepseek", "openai", "google", "minimax", "xiaomi", "kilo", "groq", "cerebras", "mistral", "kimi", "moonshot", "xai", "zai", "meta", "vercel", "openrouter", "fugu", "fireworks", "mlx", "lmstudio", "omlx", "chatgpt-new", "codex", "claude-agent"] +PROVIDERS = ["anthropic", "codegraff", "deepseek", "openai", "google", "minimax", "xiaomi", "kilo", "groq", "cerebras", "mistral", "kimi", "moonshot", "xai", "zai", "meta", "vercel", "openrouter", "fugu", "fireworks", "nanoattention", "mlx", "lmstudio", "omlx", "chatgpt-new", "codex", "claude-agent"] class ImageUrlInput(TypedDict): diff --git a/sdk/ts/harness.ts b/sdk/ts/harness.ts index f61eaf29..271c724e 100644 --- a/sdk/ts/harness.ts +++ b/sdk/ts/harness.ts @@ -13,7 +13,7 @@ export const HARNESS_VERSION = "0.13"; export type ModelName = "MiniMax-M2.5" | "MiniMax-M2.7" | "MiniMax-M3" | "accounts/fireworks/models/deepseek-v4-flash" | "accounts/fireworks/models/deepseek-v4-pro" | "accounts/fireworks/models/glm-5p2" | "accounts/fireworks/models/gpt-oss-120b" | "accounts/fireworks/models/kimi-k2p6" | "accounts/fireworks/models/kimi-k2p7-code" | "accounts/fireworks/models/minimax-m3" | "accounts/fireworks/models/qwen3p7-plus" | "alibaba/qwen3.8-27b" | "anthropic/claude-sonnet-4.6" | "claude-fable-5" | "claude-fable-5-1" | "claude-fable-5-2" | "claude-haiku-5-5" | "claude-opus-4-5" | "claude-opus-4-6" | "claude-opus-4-7" | "claude-opus-4-8" | "claude-opus-4.8" | "claude-opus-5" | "claude-opus-5-5" | "claude-sonnet-4-5" | "claude-sonnet-4-6" | "claude-sonnet-4.6" | "claude-sonnet-5" | "claude-sonnet-5-5" | "deepseek-chat" | "deepseek-reasoner" | "deepseek-v4-flash" | "deepseek-v4-pro" | "flint" | "fugu" | "fugu-ultra" | "fugu-ultra-20260615" | "gemini-3-flash-preview" | "gemini-3.1-flash-lite" | "gemini-3.1-pro-preview" | "gemini-3.5-flash" | "gemini-3.5-flash-lite" | "gemini-3.6-flash" | "gemini-3.7-flash" | "gemini-3.8-flash" | "gemini-4-argon" | "gemma-4-26b-a4b-it" | "gemma-4-31b" | "gemma-4-31b-it" | "glm-4.5" | "glm-4.7" | "glm-5" | "glm-5-turbo" | "glm-5.2" | "glm-5.3" | "glm-5.3-flash" | "glm-5v-turbo" | "gpt-5-codex" | "gpt-5.2" | "gpt-5.3-codex-spark" | "gpt-5.4" | "gpt-5.4-mini" | "gpt-5.4-pro" | "gpt-5.5" | "gpt-5.6" | "gpt-5.6-luna" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-6-astra" | "gpt-6-luna" | "gpt-6-sol" | "gpt-6.1-sol" | "gpt-oss-120b" | "grok-4.3" | "grok-4.6" | "grok-4.7" | "grok-build" | "k3" | "k3-256k" | "k3.1-pro" | "k3.1-pro-highspeed" | "kilo-auto/small" | "kimi-for-coding" | "kimi-for-coding-highspeed" | "kimi-k2.6" | "kimi-k2.7-code" | "kimi-k3" | "kimi-k3.1-pro" | "kimi-k3.1-pro-highspeed" | "kimi-latest" | "lmstudio" | "mimo-v2-flash" | "mimo-v2.5" | "mimo-v2.5-pro" | "mimo-v2.5-pro-ultraspeed" | "mimo-v2.6-flash" | "mimo-v2.6-pro" | "mimo-v2.6-pro-ultraspeed" | "minimax-m3" | "mistral-medium-latest" | "mlx-community/Qwen3.6-27B-OptiQ-4bit" | "muse-spark-1.2" | "muse-spark-1.2-contributor" | "omlx" | "openai/gpt-oss-120b" | (string & {}); export type ToolName = "shell" | "read_file" | "edit_file" | "write_file" | "webfetch" | "skill" | "codedb" | "read_tool_result" | "render_html" | "todo_write" | "todo_read" | "eval" | "note_constraint" | "ask_user" | "attempt_completion" | "load_tool_schemas" | "mcp_search_tools" | "mcp_select_tool" | "clock_sleep" | "subagent" | "workflow" | "agent_output" | "agent_message" | "subagent_resume" | "learn_candidate" | "peer_message" | "workspace" | "yield_turn" | "imagegen" | "lsp" | "rlm"; -export type ProviderId = "anthropic" | "codegraff" | "deepseek" | "openai" | "google" | "minimax" | "xiaomi" | "kilo" | "groq" | "cerebras" | "mistral" | "kimi" | "moonshot" | "xai" | "zai" | "meta" | "vercel" | "openrouter" | "fugu" | "fireworks" | "mlx" | "lmstudio" | "omlx" | "chatgpt-new" | "codex" | "claude-agent"; +export type ProviderId = "anthropic" | "codegraff" | "deepseek" | "openai" | "google" | "minimax" | "xiaomi" | "kilo" | "groq" | "cerebras" | "mistral" | "kimi" | "moonshot" | "xai" | "zai" | "meta" | "vercel" | "openrouter" | "fugu" | "fireworks" | "nanoattention" | "mlx" | "lmstudio" | "omlx" | "chatgpt-new" | "codex" | "claude-agent"; /** Events streamed by `harness --json` (one JSON object per stdout line), each * discriminated by `type` — the analogue of codegraff's AgentEvent stream. diff --git a/sdk/ts/remote.ts b/sdk/ts/remote.ts index f5964505..d92920b2 100644 --- a/sdk/ts/remote.ts +++ b/sdk/ts/remote.ts @@ -11,7 +11,7 @@ export const HARNESS_VERSION = "0.13"; export type ModelName = "MiniMax-M2.5" | "MiniMax-M2.7" | "MiniMax-M3" | "accounts/fireworks/models/deepseek-v4-flash" | "accounts/fireworks/models/deepseek-v4-pro" | "accounts/fireworks/models/glm-5p2" | "accounts/fireworks/models/gpt-oss-120b" | "accounts/fireworks/models/kimi-k2p6" | "accounts/fireworks/models/kimi-k2p7-code" | "accounts/fireworks/models/minimax-m3" | "accounts/fireworks/models/qwen3p7-plus" | "alibaba/qwen3.8-27b" | "anthropic/claude-sonnet-4.6" | "claude-fable-5" | "claude-fable-5-1" | "claude-fable-5-2" | "claude-haiku-5-5" | "claude-opus-4-5" | "claude-opus-4-6" | "claude-opus-4-7" | "claude-opus-4-8" | "claude-opus-4.8" | "claude-opus-5" | "claude-opus-5-5" | "claude-sonnet-4-5" | "claude-sonnet-4-6" | "claude-sonnet-4.6" | "claude-sonnet-5" | "claude-sonnet-5-5" | "deepseek-chat" | "deepseek-reasoner" | "deepseek-v4-flash" | "deepseek-v4-pro" | "flint" | "fugu" | "fugu-ultra" | "fugu-ultra-20260615" | "gemini-3-flash-preview" | "gemini-3.1-flash-lite" | "gemini-3.1-pro-preview" | "gemini-3.5-flash" | "gemini-3.5-flash-lite" | "gemini-3.6-flash" | "gemini-3.7-flash" | "gemini-3.8-flash" | "gemini-4-argon" | "gemma-4-26b-a4b-it" | "gemma-4-31b" | "gemma-4-31b-it" | "glm-4.5" | "glm-4.7" | "glm-5" | "glm-5-turbo" | "glm-5.2" | "glm-5.3" | "glm-5.3-flash" | "glm-5v-turbo" | "gpt-5-codex" | "gpt-5.2" | "gpt-5.3-codex-spark" | "gpt-5.4" | "gpt-5.4-mini" | "gpt-5.4-pro" | "gpt-5.5" | "gpt-5.6" | "gpt-5.6-luna" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-6-astra" | "gpt-6-luna" | "gpt-6-sol" | "gpt-6.1-sol" | "gpt-oss-120b" | "grok-4.3" | "grok-4.6" | "grok-4.7" | "grok-build" | "k3" | "k3-256k" | "k3.1-pro" | "k3.1-pro-highspeed" | "kilo-auto/small" | "kimi-for-coding" | "kimi-for-coding-highspeed" | "kimi-k2.6" | "kimi-k2.7-code" | "kimi-k3" | "kimi-k3.1-pro" | "kimi-k3.1-pro-highspeed" | "kimi-latest" | "lmstudio" | "mimo-v2-flash" | "mimo-v2.5" | "mimo-v2.5-pro" | "mimo-v2.5-pro-ultraspeed" | "mimo-v2.6-flash" | "mimo-v2.6-pro" | "mimo-v2.6-pro-ultraspeed" | "minimax-m3" | "mistral-medium-latest" | "mlx-community/Qwen3.6-27B-OptiQ-4bit" | "muse-spark-1.2" | "muse-spark-1.2-contributor" | "omlx" | "openai/gpt-oss-120b" | (string & {}); export type ToolName = "shell" | "read_file" | "edit_file" | "write_file" | "webfetch" | "skill" | "codedb" | "read_tool_result" | "render_html" | "todo_write" | "todo_read" | "eval" | "note_constraint" | "ask_user" | "attempt_completion" | "load_tool_schemas" | "mcp_search_tools" | "mcp_select_tool" | "clock_sleep" | "subagent" | "workflow" | "agent_output" | "agent_message" | "subagent_resume" | "learn_candidate" | "peer_message" | "workspace" | "yield_turn" | "imagegen" | "lsp" | "rlm"; -export type ProviderId = "anthropic" | "codegraff" | "deepseek" | "openai" | "google" | "minimax" | "xiaomi" | "kilo" | "groq" | "cerebras" | "mistral" | "kimi" | "moonshot" | "xai" | "zai" | "meta" | "vercel" | "openrouter" | "fugu" | "fireworks" | "mlx" | "lmstudio" | "omlx" | "chatgpt-new" | "codex" | "claude-agent"; +export type ProviderId = "anthropic" | "codegraff" | "deepseek" | "openai" | "google" | "minimax" | "xiaomi" | "kilo" | "groq" | "cerebras" | "mistral" | "kimi" | "moonshot" | "xai" | "zai" | "meta" | "vercel" | "openrouter" | "fugu" | "fireworks" | "nanoattention" | "mlx" | "lmstudio" | "omlx" | "chatgpt-new" | "codex" | "claude-agent"; /** Events streamed by the bridge (same `--json` contract as the stdio SDK). * `seq` is a monotonic, gap-free, 1-based per-session id the bridge forwards diff --git a/spec/conformance.py b/spec/conformance.py index abf7e3ee..25c613ee 100644 --- a/spec/conformance.py +++ b/spec/conformance.py @@ -315,8 +315,8 @@ def check_provider() -> int: ids = [r["id"] for r in PROVIDER_SPECS] if len(ids) != len(set(ids)): raise Counterexample("provider-unique", None, f"ids={ids}") - if len(PROVIDER_SPECS) != 26: - raise Counterexample("provider-count", None, f"n={len(PROVIDER_SPECS)} want=26") + if len(PROVIDER_SPECS) != 27: + raise Counterexample("provider-count", None, f"n={len(PROVIDER_SPECS)} want=27") responses = [r for r in PROVIDER_SPECS if r["kind"] == "responses"] if [r["id"] for r in responses] != ["openai", "chatgpt-new", "codex"]: raise Counterexample("responses-vendors", None, f"{responses}") diff --git a/spec/kernels/providers.json b/spec/kernels/providers.json index 50972f0f..9f719235 100644 --- a/spec/kernels/providers.json +++ b/spec/kernels/providers.json @@ -235,6 +235,15 @@ "catalog": "baked", "sub_login": true, "takes_effort": true + }, + { + "id": "nanoattention", + "kind": "openai", + "auth": "bearer", + "login": "api_key", + "catalog": "openai", + "sub_login": false, + "takes_effort": false } ] } diff --git a/spec/ref/provider.py b/spec/ref/provider.py index 2a589615..fef89cb7 100644 --- a/spec/ref/provider.py +++ b/spec/ref/provider.py @@ -57,6 +57,7 @@ def row( row("chatgpt-new", "responses", "bearer", login="chatgpt_browser", catalog="openai", sub_login=True), row("codex", "responses", "bearer", login="codex_device", catalog="codex", sub_login=True), row("claude-agent", "anthropic", "bearer", login="claude_cli", sub_login=True, takes_effort=True), + row("nanoattention", "openai", "bearer", catalog="openai"), ] diff --git a/src/main.zig b/src/main.zig index 2aa3cbc3..9d145e20 100644 --- a/src/main.zig +++ b/src/main.zig @@ -278,11 +278,11 @@ pub fn main(init: std.process.Init) !void { learning_privacy.init(flags.learning_privacy_flag, init.environ_map.get("GRAFF_LEARNING_PRIVACY")); var invocation_budget: run_budget_mod.RunBudget = .{ .max_model_calls = max_model_calls, .max_tool_calls = run_budget_mod.cli_max_tool_calls }; boot.mark(init.io, "args"); - // GRAFF_CODEX_URL: codex endpoint override (localhost mocks), set BEFORE runSubcommand (`graff models [refresh]`) and resolveKeys (the - // initial Keys.build). environ_map slices are process-lifetime (resolveKeys stores them into Keys the same way): kept without duping. + // GRAFF_CODEX_URL: set before subcommands and resolveKeys; env slices are process-lifetime. if (init.environ_map.get("GRAFF_CODEX_URL")) |cu| { if (cu.len > 0) provider_mod.g_codex_url_override = cu; } + if (init.environ_map.get("GRAFF_NANOATTENTION_URL")) |url| if (url.len > 0 and !@import("provider_nanoattention.zig").configureUrl(url)) std.process.fatal("GRAFF_NANOATTENTION_URL must be an HTTP loopback /v1/chat/completions URL with an explicit nonzero port", .{}); // --help / --version: handled before any subcommand dispatch, so `harness login --help` prints usage instead of starting an OAuth flow. if (try startup.runSubcommand(io, gpa, arena, init, flags)) return; // Credentials/model (env > on-disk logins > `harness key set` store; then --model or the last-saved model): startup.zig resolveKeys(). @@ -564,6 +564,7 @@ test { // ── Unit tests (`zig build test`): pull in tests from imported modu _ = .{ @import("session_catalog.zig"), @import("session_size_tests.zig"), @import("session_version.zig"), @import("session_version_tests.zig"), @import("session_prompt.zig"), @import("session_discovery.zig"), @import("session_workspaces.zig"), @import("commands_resume.zig"), @import("peer_live.zig"), @import("presence_tests.zig"), @import("presence_ack.zig"), @import("mcp_rpc_tests.zig") }; _ = .{ @import("prompt_astra.zig"), @import("prompt_guidance.zig"), @import("oauth_chatgpt.zig"), @import("chatgpt_reauth.zig"), @import("oauth_anthropic.zig"), @import("anthropic_oauth_wire.zig"), @import("anthropic_login_tests.zig") }; _ = .{ @import("agent_empty_completion.zig"), @import("agent_unfinished_bounce.zig"), @import("agent_length_cutoff.zig"), @import("agent_model_loop.zig"), @import("publication_policy_tests.zig"), @import("jobs_completion_tests.zig"), @import("headless_result.zig"), @import("oneshot.zig"), @import("agent_length.zig"), @import("agent_length_tests.zig") }; + _ = .{ @import("provider_nanoattention.zig"), @import("provider_nanoattention_tests.zig") }; _ = .{ @import("provider_routing_tests.zig"), @import("codegraff_messages_tests.zig"), @import("tool_result_empty_tests.zig"), @import("history_wire.zig"), @import("path_lookup.zig"), @import("agents_prepare.zig"), @import("catalog_price.zig"), @import("readline_paste_number_tests.zig"), @import("test_hooks.zig"), @import("peer_wake_loop.zig") }; _ = .{ @import("list_dir_nearmiss.zig"), @import("tool_preview_tests.zig"), @import("stream_reconnect.zig"), @import("oauth_kimi.zig"), @import("signin_link.zig"), @import("followups.zig") }; _ = .{ @import("repo_map.zig"), @import("cli_text.zig"), @import("boot_prewarm.zig") }; diff --git a/src/pricing_models.zig b/src/pricing_models.zig index 036b089c..a5d46280 100644 --- a/src/pricing_models.zig +++ b/src/pricing_models.zig @@ -10,6 +10,8 @@ pub const rows = [_]ModelInfo{ .{ .provider = "mlx", .name = "mlx-community/Qwen3.6-27B-OptiQ-4bit", .context = 262_144 }, // Recursive Flint INT4 through `rec serve --port 8080`, which serves it as "flint". .{ .provider = "mlx", .name = "flint", .context = 262_144 }, + // Native Flint uses the conservative 32K default; GRAFF_CONTEXT can match the worker cache. + .{ .provider = "nanoattention", .name = "flint", .context = 32_768 }, // LM Studio serves whatever model is loaded; "lmstudio" is a routing alias — // swap for your loaded model id if LM Studio requires an exact match (GET :1234/v1/models). .{ .provider = "lmstudio", .name = "lmstudio", .context = 200_000 }, diff --git a/src/provider.zig b/src/provider.zig index 2e9a8b9a..af154da2 100644 --- a/src/provider.zig +++ b/src/provider.zig @@ -4,6 +4,7 @@ const std = @import("std"); const pricing = @import("pricing.zig"); +const nanoattention = @import("provider_nanoattention.zig"); const contextFor = pricing.contextFor; /// #203: declare the context window (tokens) for an unknown/local model whose real @@ -23,10 +24,10 @@ pub var g_xai_responses: bool = true; pub const xai_responses_url = "https://api.x.ai/v1/responses"; pub const xai_compact_url = "https://api.x.ai/v1/responses/compact"; -/// The context window for a provider+model, honoring g_context_override for an -/// unknown/local model — i.e. only when contextFor returns the conservative default, -/// never overriding a known window (#203). +/// Context override applies to unknown models; native local runtimes may declare +/// their actual configured capacity, while known catalog windows remain authoritative. fn contextWindowFor(provider_id: []const u8, model: []const u8) u64 { + if (std.mem.eql(u8, provider_id, "nanoattention")) return g_context_override orelse contextFor(provider_id, model); // Only an unknown/local model (no catalogued window) takes the override, so a // global GRAFF_CONTEXT can never shrink a known model that happens to be 200k. if (g_context_override) |ov| if (!pricing.isKnownModel(provider_id, model)) return ov; @@ -111,6 +112,8 @@ pub const provider_specs = [_]ProviderSpec{ // appear without a rebuild; the baked pricing.zig rows stay the offline // fallback and supply windows for models the gateway omits. .{ .id = "fireworks", .display_name = "fireworks", .kind = .openai, .auth = .bearer, .url = "https://api.fireworks.ai/inference/v1/chat/completions", .env_key = "FIREWORKS_API_KEY", .default_model = "accounts/fireworks/models/deepseek-v4-pro", .catalog = .openai, .models_url = "https://api.fireworks.ai/v1/accounts/fireworks/models?filter=supports_serverless%3Dtrue&pageSize=200" }, + // Native Flint uses an externally installed local runtime; no cloud fallback. + .{ .id = "nanoattention", .display_name = "Native Flint (nanoattention)", .kind = .openai, .auth = .bearer, .url = nanoattention.default_chat_url, .env_key = "NANOATTENTION_API_KEY", .default_model = "flint", .catalog = .openai, .models_url = nanoattention.default_models_url }, // mlx: a local model served by mlx-lm (`mlx_lm.server`) on Apple Silicon — // OpenAI-compatible, no real key (MLX_API_KEY=local just clears graff's boot gate). .{ .id = "mlx", .display_name = "mlx", .kind = .openai, .auth = .bearer, .url = "http://127.0.0.1:8080/v1/chat/completions", .env_key = "MLX_API_KEY", .default_model = "mlx-community/Qwen3.6-27B-OptiQ-4bit" }, @@ -178,6 +181,7 @@ fn resolvedUrl(spec: ProviderSpec, model: []const u8) []const u8 { if (std.mem.eql(u8, spec.id, "xai")) return g_xai_url_override orelse if (g_xai_responses) xai_responses_url else spec.url; if (std.mem.eql(u8, spec.id, "zai")) return g_zai_url_override orelse spec.url; if (std.mem.eql(u8, spec.id, "vercel")) return g_vercel_url_override orelse spec.url; + if (std.mem.eql(u8, spec.id, "nanoattention")) return nanoattention.chatUrl(spec.url); if (@import("provider_codegraff.zig").usesMessages(spec.id, model)) return @import("provider_codegraff.zig").messages_url; if (@import("provider_codegraff.zig").usesResponses(spec.id, model)) return @import("provider_codegraff.zig").responses_url; return spec.url; diff --git a/src/provider_nanoattention.zig b/src/provider_nanoattention.zig new file mode 100644 index 00000000..6930d1c9 --- /dev/null +++ b/src/provider_nanoattention.zig @@ -0,0 +1,62 @@ +//! Built-in native Flint endpoint validation and URL resolution. +const std = @import("std"); + +pub const default_chat_url = "http://127.0.0.1:8080/v1/chat/completions"; +pub const default_models_url = "http://127.0.0.1:8080/v1/models"; +const chat_suffix = "/v1/chat/completions"; +var models_url_buf: [512]u8 = undefined; +pub var url_override: ?[]const u8 = null; + +pub fn validEndpoint(url: []const u8) bool { + if (url.len == 0 or url.len > 512 or std.mem.indexOfAny(u8, url, "?#\\") != null) return false; + for (url) |c| if (std.ascii.isWhitespace(c) or c < 0x20 or c == 0x7f) return false; + const uri = std.Uri.parse(url) catch return false; + if (!std.ascii.eqlIgnoreCase(uri.scheme, "http") or uri.port == null or uri.port.? == 0) return false; + const host_component = uri.host orelse return false; + const host = switch (host_component) { + .raw => |value| value, + .percent_encoded => |value| value, + }; + if (!(std.ascii.eqlIgnoreCase(host, "localhost") or std.mem.eql(u8, host, "127.0.0.1") or + std.mem.eql(u8, host, "[::1]") or std.mem.eql(u8, host, "::1"))) return false; + const authority_start = (std.mem.indexOf(u8, url, "://") orelse return false) + 3; + const authority_end = std.mem.indexOfScalarPos(u8, url, authority_start, '/') orelse url.len; + if (std.mem.indexOfScalar(u8, url[authority_start..authority_end], '@') != null) return false; + return std.mem.endsWith(u8, url, chat_suffix); +} + +pub fn configureUrl(url: []const u8) bool { + if (!validEndpoint(url)) return false; + url_override = url; + return true; +} + +pub fn chatUrl(default: []const u8) []const u8 { + return url_override orelse default; +} + +pub fn modelsUrl(default: []const u8) []const u8 { + const url = url_override orelse return default; + if (!validEndpoint(url)) return default; + const origin_end = url.len - chat_suffix.len; + return std.fmt.bufPrint(&models_url_buf, "{s}/v1/models", .{url[0..origin_end]}) catch default; +} + +test "native Flint endpoint is loopback-only and has a valid port and chat path" { + try std.testing.expect(validEndpoint("http://127.0.0.1:8080/v1/chat/completions")); + try std.testing.expect(validEndpoint("http://localhost:43123/v1/chat/completions")); + try std.testing.expect(validEndpoint("http://[::1]:43123/v1/chat/completions")); + try std.testing.expect(!validEndpoint("https://127.0.0.1:8080/v1/chat/completions")); + try std.testing.expect(!validEndpoint("http://example.com:8080/v1/chat/completions")); + try std.testing.expect(!validEndpoint("http://127.0.0.1:0/v1/chat/completions")); + try std.testing.expect(!validEndpoint("http://127.0.0.1:8080/v1/models")); + try std.testing.expect(!validEndpoint("http://user@127.0.0.1:8080/v1/chat/completions")); + try std.testing.expect(!validEndpoint("http://127.0.0.1:8080/v1/chat/completions?redirect=https://example.com")); +} + +test "native Flint models URL follows the resolved local endpoint" { + const old = url_override; + defer url_override = old; + url_override = "http://localhost:43123/v1/chat/completions"; + try std.testing.expectEqualStrings("http://localhost:43123/v1/models", modelsUrl(default_models_url)); +} diff --git a/src/provider_nanoattention_tests.zig b/src/provider_nanoattention_tests.zig new file mode 100644 index 00000000..7cb4d7b3 --- /dev/null +++ b/src/provider_nanoattention_tests.zig @@ -0,0 +1,74 @@ +const std = @import("std"); +const provider_mod = @import("provider.zig"); +const pricing = @import("pricing.zig"); +const catalog = @import("router_catalog.zig"); +const native = @import("provider_nanoattention.zig"); +const Agent = @import("agent.zig").Agent; + +test "native Flint routes locally, honors its configured context, and never falls back" { + const old_context = provider_mod.g_context_override; + defer provider_mod.g_context_override = old_context; + const saved_table = pricing.active_model_table; + defer pricing.active_model_table = saved_table; + + const spec = provider_mod.specFor("nanoattention").?; + try std.testing.expectEqualStrings("flint", spec.default_model); + try std.testing.expectEqualStrings("NANOATTENTION_API_KEY", spec.env_key); + try std.testing.expect(!spec.takes_effort); + try std.testing.expectEqualStrings("nanoattention", (try (provider_mod.Keys{ .values = @splat("local") }).providerById("nanoattention", "flint")).id); + try std.testing.expectEqual(@as(u64, 32_768), (try (provider_mod.Keys{ .values = @splat("local") }).providerById("nanoattention", "flint")).context); + + provider_mod.g_context_override = 4096; + try std.testing.expectEqual(@as(u64, 4096), (try (provider_mod.Keys{ .values = @splat("local") }).providerById("nanoattention", "flint")).context); + provider_mod.g_context_override = 65_536; + try std.testing.expectEqual(@as(u64, 65_536), (try (provider_mod.Keys{ .values = @splat("local") }).providerById("nanoattention", "flint")).context); + const no_keys: provider_mod.Keys = .{ .values = @splat(null) }; + try std.testing.expectError(error.MissingKey, no_keys.providerById("nanoattention", "flint")); + try std.testing.expectError(error.MissingKey, no_keys.providerFor("flint")); +} + +test "native Flint chat and catalog routes share a validated loopback override" { + const old = native.url_override; + defer native.url_override = old; + native.url_override = "http://localhost:43123/v1/chat/completions"; + + const spec = provider_mod.specFor("nanoattention").?; + const keys = provider_mod.Keys{ .values = @splat("local") }; + const route = try keys.providerById("nanoattention", "flint"); + try std.testing.expectEqualStrings("http://localhost:43123/v1/chat/completions", route.url); + try std.testing.expectEqualStrings("http://localhost:43123/v1/models", catalog.modelsUrl(spec)); + try std.testing.expect(!native.validEndpoint("http://example.com:43123/v1/chat/completions")); +} + +test "native Flint request uses ordinary greedy-compatible OpenAI fields only" { + var arena_state = std.heap.ArenaAllocator.init(std.testing.allocator); + defer arena_state.deinit(); + const arena = arena_state.allocator(); + const messages = std.json.Array.init(arena); + var agent: Agent = .{ + .gpa = std.testing.allocator, + .arena = arena, + .io = std.testing.io, + .client = undefined, + .provider = .{ + .id = "nanoattention", + .kind = .openai, + .auth = .bearer, + .url = native.default_chat_url, + .api_key = "local", + .model = "flint", + .context = 32_768, + }, + .messages = messages, + .sub = false, + .label = "", + .out = null, + .sys_normal = "system", + }; + const body = try agent.buildBody(null, false, false, false); + defer std.testing.allocator.free(body); + try std.testing.expect(std.mem.indexOf(u8, body, "\"model\":\"flint\"") != null); + try std.testing.expect(std.mem.indexOf(u8, body, "\"reasoning_effort\"") == null); + try std.testing.expect(std.mem.indexOf(u8, body, "\"temperature\"") == null); + try std.testing.expect(std.mem.indexOf(u8, body, "\"top_p\"") == null); +} diff --git a/src/router_catalog.zig b/src/router_catalog.zig index a5545649..d848f913 100644 --- a/src/router_catalog.zig +++ b/src/router_catalog.zig @@ -88,6 +88,7 @@ pub fn dynamic(spec: provider.ProviderSpec) bool { pub fn modelsUrl(spec: provider.ProviderSpec) []const u8 { if (!dynamic(spec)) return ""; + if (std.mem.eql(u8, spec.id, "nanoattention")) return @import("provider_nanoattention.zig").modelsUrl(spec.models_url); // Endpoint overrides keep discovery on the mock's origin, never the live API (#1795). if (std.mem.eql(u8, spec.id, "chatgpt-new")) if (provider.g_chatgpt_url_override) |url| return overrideModelsUrl(url); if (std.mem.eql(u8, spec.id, "vercel")) if (provider.g_vercel_url_override) |url| return overrideModelsUrl(url);