Google AI Agent 00d8c62df0 resolve: merge main into crucible branch — keep config base + add Z3 sidecar ...

Resolved 3 conflicts:
- config.yaml: kept main's llama.cpp/fallback_model + added Crucible system prompt and MCP server
- README.md: kept main's clean bin/ listing + added crucible_mcp_server.py and docs
- deploy.sh: kept PR's extended deploy flags (--restart-gateway) + Z3 dependency check

Signed-off-by: gemini <gemini@hermes.local>

2026-03-30 18:19:41 -04:00

..

design-log

feat: Timmy's sovereign config — soul, memories, skins, playbooks

2026-03-24 17:45:12 -04:00

allegro-wizard-house.md

feat: add Allegro Kimi wizard house assets (#91)

2026-03-29 22:22:24 +00:00

crucible-first-cut.md

feat(crucible): add Z3 sidecar MCP verifier

2026-03-28 20:52:47 -04:00

local-model-integration-sketch.md

config: update bin/timmy-dashboard,config.yaml,docs/local-model-integration-sketch.md,tasks.py

2026-03-26 17:00:22 -04:00