d852acadc2
Plumbs the secrets.lua module (commit e4b818b) into the conversation
pipeline. Hook points:
ask_ai — scrub_messages(ctx:to_messages(), mode) before
call_broker; rehydrate streamed deltas via
streaming_rehydrator so the user sees real values
while text_parts accumulates rehydrated chunks
(final_resp is plain — CMD: / DELEGATE: extractors
see plain values)
MCP dispatch — dispatch_tool_call rehydrates the args table before
sess:call_tool so the trusted MCP server receives
real values (the model emitted placeholders because
it saw a scrubbed context)
DELEGATE: & :delegate
— scrub sub_msgs before broker.chat; rehydrate sub_text
before appending to context, so future turns see
real values restored
Phase 5 summarize-on-evict
— scrub sum_msgs before broker.chat; rehydrate the
reply that becomes ctx.summary
:memory summarize
— same scrub + rehydrate pair
Mode resolution per call: model_cfg.redact → config.secrets.default →
"vault+autodetect" if vault loaded, else "off".
ctx storage convention: PLAIN values throughout. The scrub happens at
the egress (broker call) per the active redact mode; ctx.turns never
holds placeholders for content the user typed or executor produced.
The model's own emissions (assistant tool_call arguments) may carry
placeholders because the model saw the scrubbed context — rehydrated
at MCP dispatch and otherwise harmless on re-serialization (idempotent
re-scrubbing).
New meta:
:secrets [status] vault entries, placeholders allocated this
session, active broker mode. Never prints
actual values (vault file is itself a
secret per gotcha 7).
:secrets check <text> dry-run scrub against the active broker's
mode — shows the output transformation.
Documented in config.lua with a commented-out block + per-broker
redact field example.
Deferred to a follow-up issue (clearly scoped):
- safety.lua broker call sites (Norris main loop, is_destructive
LLM second-opinion probe) — same wiring pattern, but they don't
currently see secrets_session; needs threading through helpers.
- @-mention file content is appended PLAIN to ctx and scrubbed at
egress alongside the rest of the user turn (covered by the
ask_ai scrub).
- exec output streamed live to terminal is pre-scrub (user sees
real values in their own shell — by design); the captured-for-
context copy is scrubbed at egress alongside the rest.
This is the "full scope" implementation chosen via AskUserQuestion.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
250 lines
12 KiB
Lua
250 lines
12 KiB
Lua
-- config.lua — model registry, routing rules, user preferences.
|
|
-- Loaded with dofile() at startup; returns a plain Lua table.
|
|
-- See docs/PHASE0.md §10 for resolution order and full schema.
|
|
--
|
|
-- Per issue #12: hossenfelder is the canonical single-URL broker. It does
|
|
-- model-aware routing server-side (local models on boltzmann; cloud routes
|
|
-- through OpenRouter using its own bearer auth — no client-side key here).
|
|
-- Discovery: GET http://hossenfelder.fritz.box:8082/v1/models.
|
|
|
|
local HOSSENFELDER = "http://hossenfelder.fritz.box:8082"
|
|
|
|
return {
|
|
default_model = "fast",
|
|
|
|
models = {
|
|
fast = {
|
|
endpoint = HOSSENFELDER,
|
|
model = "qwen2.5-coder-1.5b-q4_k_m.gguf",
|
|
temperature = 0.2,
|
|
},
|
|
deep = {
|
|
endpoint = HOSSENFELDER,
|
|
-- 2026-05-13: qwen3-30b not loaded on hossenfelder right now;
|
|
-- using deepseek-coder-v2-lite (16B MoE, ~2.4B active) for the
|
|
-- time being. Restore qwen3-30b when the slot is back up.
|
|
model = "deepseek-coder-v2-lite",
|
|
timeout_ms = 300000, -- 5 min; MoE inference is faster than dense 30B
|
|
temperature = 0.1,
|
|
},
|
|
cloud = {
|
|
endpoint = HOSSENFELDER,
|
|
model = "anthropic/claude-haiku-4.5",
|
|
temperature = 0.2,
|
|
},
|
|
},
|
|
|
|
shell = {
|
|
known_commands = {
|
|
"ls", "cat", "cd", "grep", "find", "cp", "mv", "rm",
|
|
"mkdir", "rmdir", "git", "make", "cmake", "gcc", "clang",
|
|
"python3", "luajit", "ssh", "scp", "curl", "wget",
|
|
},
|
|
capture_output = true, -- inject exec output into context
|
|
confirm_cmd = true, -- prompt before executing CMD: suggestions
|
|
|
|
-- Issue #10: prompt template. When set, replaces the default
|
|
-- "[aish:<model>]> " prompt. Variables (substituted via {name}):
|
|
-- {model} {ctx_used} {ctx_max} {turn}
|
|
-- {cwd} {cwd_short} (cwd with $HOME -> ~)
|
|
-- {last_status} (last exec exit code, empty if none yet)
|
|
-- {mode} (norris / plan / normal)
|
|
-- prompt = "[{model} {ctx_used}/{ctx_max}t T{turn} {mode}] {cwd_short} > ",
|
|
},
|
|
|
|
context = {
|
|
max_turns = 40,
|
|
token_budget = 4096,
|
|
},
|
|
|
|
history = {
|
|
dir = (os.getenv("HOME") or ".") .. "/.local/share/aish",
|
|
},
|
|
|
|
-- Issue #3: pre/post CMD hooks. Optional shell scripts triggered around
|
|
-- every CMD: execution. Each hook receives the command on stdin and
|
|
-- AISH_CMD / AISH_TURN / AISH_CWD as env vars. Non-zero exit on pre_cmd
|
|
-- aborts execution; post_cmd's exit code is ignored but its stdout is
|
|
-- logged. Default off (no hooks). Uncomment to enable.
|
|
-- hooks = {
|
|
-- pre_cmd = (os.getenv("HOME") or ".") .. "/.aish/hooks/pre-cmd",
|
|
-- post_cmd = (os.getenv("HOME") or ".") .. "/.aish/hooks/post-cmd",
|
|
-- },
|
|
|
|
-- Issue #13: secret redaction. Vault is a separate file at ~/.aish/
|
|
-- secrets.lua (mode 0600 enforced). When set, outbound broker messages
|
|
-- are scrubbed: vault literals + autodetect heuristics (OpenAI sk-,
|
|
-- OpenRouter sk-or-v1-, GitHub ghp_/gho_/ghs_, AWS AKIA, JWT eyJ...,
|
|
-- SSH/GPG PRIVATE KEY headers) become $AISH_SECRET_NNN placeholders.
|
|
-- The streamed reply is rehydrated before display so the user sees
|
|
-- real values. Per-broker override via models[*].redact:
|
|
-- "off" -- no scrubbing (trusted local)
|
|
-- "vault" -- vault literals only
|
|
-- "vault+autodetect" -- + heuristics (default when vault loaded)
|
|
-- "stealth" -- + heuristics, opaque decoys, no rehydrate
|
|
-- Default per-broker is the global config.secrets.default, falling
|
|
-- back to "vault+autodetect" when vault loaded, else "off".
|
|
-- secrets = {
|
|
-- vault = "~/.aish/secrets.lua",
|
|
-- default = "vault+autodetect", -- applies when models[*].redact is nil
|
|
-- },
|
|
|
|
-- Issue #8: background CMD (CMD&: marker). Requires history.dir set
|
|
-- (logs land at <history.dir>/bg/<id>.log + .status sidecar). The
|
|
-- feature is always-on once history.dir exists — no config flag — but
|
|
-- only fires when the model emits "CMD&: " or the user runs :bg-spawn.
|
|
|
|
-- Issue #9: permission policy DSL for AI-suggested CMD: lines. When set,
|
|
-- supersedes shell.confirm_cmd. Patterns are Lua patterns (NOT regex)
|
|
-- per substrate invariant §3 (no compiled extensions). Priority order:
|
|
-- deny > confirm > allow; first match in the chosen category wins.
|
|
-- Unmatched commands default to "confirm". Probe with :perms check <cmd>.
|
|
-- permissions = {
|
|
-- allow = { "^ls%s", "^cat%s", "^git status", "^git diff" },
|
|
-- confirm = { "^rm%s", "^git push", "^docker%s", "^sudo%s" },
|
|
-- deny = { "^ssh%s+root@", "^curl%s+http[^s]" },
|
|
-- },
|
|
|
|
-- Phase 2 (docs/PHASE2.md): MCP server registry + tool-call policy.
|
|
-- The block is OFF by default — connect-at-startup happens only when
|
|
-- `servers` is non-empty. Uncomment + adjust per your fleet.
|
|
--
|
|
-- mcp = {
|
|
-- servers = {
|
|
-- -- Each entry: alias = { url = "...", auth_token = "..." | auth_env = "..." }
|
|
-- -- auth_token literal > auth_env env-var indirection > nil (no auth).
|
|
-- -- Aliases become the namespace prefix on tool names sent to the model
|
|
-- -- ("<alias>__<tool>" — e.g. "boltzmann__list_dir"). The separator is
|
|
-- -- "__" (two underscores) because Anthropic via Bedrock validates tool
|
|
-- -- names against ^[a-zA-Z0-9_-]{1,128}$ — dots are rejected.
|
|
-- -- Aliases themselves must not contain "__".
|
|
-- boltzmann = {
|
|
-- url = "http://boltzmann.fritz.box:8080/mcp",
|
|
-- auth_env = "BOLTZMANN_MCP_TOKEN",
|
|
-- },
|
|
-- hertz = {
|
|
-- url = "http://hertz.fritz.box:8080/mcp",
|
|
-- auth_env = "HERTZ_MCP_TOKEN",
|
|
-- },
|
|
-- broglie = {
|
|
-- url = "http://broglie.fritz.box:8080/mcp", -- LAN-only, no auth
|
|
-- },
|
|
-- },
|
|
--
|
|
-- -- Per-call confirm gate auto-approve policy.
|
|
-- -- Key forms:
|
|
-- -- "<alias>__<tool>" — auto-approve one specific tool
|
|
-- -- "<alias>__*" — auto-approve every tool on that server
|
|
-- -- Anything not matched falls back to the [y/N] prompt.
|
|
-- auto_approve = {
|
|
-- ["boltzmann__read_file"] = true,
|
|
-- ["boltzmann__list_dir"] = true,
|
|
-- ["boltzmann__search_files"] = true,
|
|
-- ["hertz__*"] = true, -- trust the hub fully
|
|
-- },
|
|
--
|
|
-- -- Tool-call sub-loop budget per ask_ai turn. Hitting the cap surfaces
|
|
-- -- a status and breaks; default 8 if absent.
|
|
-- max_tool_depth = 8,
|
|
-- },
|
|
|
|
-- Phase 3 (docs/PHASE3.md): Chuck Norris autonomous mode + destructive-op
|
|
-- heuristic. The block is OFF by default (sane defaults kick in when
|
|
-- absent); uncomment to tune.
|
|
--
|
|
-- safety = {
|
|
-- -- LLM second-opinion on commands the static patterns don't flag.
|
|
-- -- Default true. Set false for static-only operation (faster, but
|
|
-- -- misses novel destructive patterns the static list doesn't know
|
|
-- -- about — bash -c content, custom destructive idioms, etc.).
|
|
-- llm_second_opinion = true,
|
|
--
|
|
-- -- Which configured model to use for the YES/NO destructive probe.
|
|
-- -- Precedence: this field → models.deep → models[default_model].
|
|
-- -- R-B2: prefer an INDEPENDENT model class from the action-emitting
|
|
-- -- model (avoids self-policing). Recommended values:
|
|
-- -- "cloud" — anthropic/claude-haiku-4.5 via openrouter. Fast and
|
|
-- -- reliable. Costs money per probe (typical Norris
|
|
-- -- session = 16 probes max, often cached).
|
|
-- -- "deep" — local large model (qwen3-30b on this fleet). Free
|
|
-- -- but slow on RK3588 hardware (~1-3s per probe).
|
|
-- -- Falls back here automatically if not set.
|
|
-- -- "fast" — same model as the action-emitter. NOT RECOMMENDED
|
|
-- -- (circular trust); use only when no other option.
|
|
-- llm_model = "cloud",
|
|
--
|
|
-- -- Norris planning-loop budget. Iterations of safety.norris_step.
|
|
-- -- Each iteration is one broker round-trip + dispatch of actions.
|
|
-- -- Default 8. Bump for long-running goals; cap low for testing.
|
|
-- max_norris_steps = 8,
|
|
-- },
|
|
|
|
-- Phase 4 (docs/PHASE4.md): cross-session memory.jsonl + startup
|
|
-- injection + :memory management surface. The block is OFF by
|
|
-- default (no startup injection); uncomment to tune. Note that
|
|
-- :remember / :memory list / :memory forget / :memory summarize
|
|
-- all work without this block — they store to <history.dir>/
|
|
-- memory.jsonl regardless. The block only configures the
|
|
-- injection-into-system-prompt behavior at startup.
|
|
--
|
|
-- memory = {
|
|
-- -- Cap on total characters injected at startup. ~2000 chars ≈
|
|
-- -- 500 tokens. LRU-by-ts selection if your memory.jsonl has
|
|
-- -- more recent items than fit. Older items remain in the
|
|
-- -- file; only injection is bounded. Suppressed entirely in
|
|
-- -- Norris mode (R-C1).
|
|
-- inject_max_chars = 2000,
|
|
--
|
|
-- -- Which configured model to use for :memory summarize.
|
|
-- -- Defaults to the active model when nil. Use "fast" for
|
|
-- -- speed; "deep" or "cloud" for better extraction quality
|
|
-- -- (cloud may have variable cost per session).
|
|
-- summarizer_model = "fast",
|
|
-- },
|
|
|
|
-- Phase 5 (docs/PHASE5.md): multi-model routing + cloud fallback +
|
|
-- summarize-on-evict. OFF by default — auto-routing can spend money
|
|
-- silently on the cloud preset; require explicit opt-in.
|
|
--
|
|
-- routing = {
|
|
-- -- Enable auto-routing per request. When true, router.classify_model
|
|
-- -- inspects each prompt and may switch the model for THAT request
|
|
-- -- only (the :model selection is preserved across requests).
|
|
-- -- Default false. Toggle at runtime with :route on / :route off.
|
|
-- auto = true,
|
|
--
|
|
-- -- Class → model mapping. nil = "keep current" (heuristic fires
|
|
-- -- but no override). Ships with reasoning = nil because mapping
|
|
-- -- "explain ..." prompts to a paid cloud model would spend money
|
|
-- -- silently — opt in by uncommenting the reasoning line below.
|
|
-- classes = {
|
|
-- code = "deep", -- code-like prompts to local deep
|
|
-- -- reasoning = "cloud", -- OPT-IN: "explain"/"why"/"how does" → paid
|
|
-- -- default = nil, -- keep active model
|
|
-- },
|
|
--
|
|
-- -- Single-hop retry on transport failure (HTTP 5xx, 408,
|
|
-- -- 404 model_not_found, DNS, connection refused, timeouts).
|
|
-- -- Retries against fallback_model once. Skipped if any text
|
|
-- -- has already streamed (no partial-output duplication).
|
|
-- -- Toggle at runtime with :fallback on / :fallback off.
|
|
-- fallback = false, -- default off (cost-safety)
|
|
-- fallback_model = "cloud",
|
|
-- },
|
|
|
|
-- ── Phase 5 context summarization on sliding-window eviction.
|
|
-- Set INSIDE the context = { ... } block above to enable:
|
|
-- context = {
|
|
-- max_turns = 40,
|
|
-- token_budget = 4096,
|
|
-- summarize_on_evict = true,
|
|
-- summarizer_model = "fast", -- model name in models{}
|
|
-- max_summary_chars = 2000,
|
|
-- },
|
|
-- When summarize_on_evict is true, evicted turn pairs are fed to
|
|
-- summarizer_model and the result lives on ctx.summary, appended to
|
|
-- the system prompt as [earlier conversation summary]. Suppressed
|
|
-- in Norris mode (R-C4 — planner stays on its goal). If broker
|
|
-- fails, falls back to Phase 0 silent eviction (no crash).
|
|
}
|