From 040f56316dcb39cad1db63352f76472ae0395903 Mon Sep 17 00:00:00 2001
From: Sam & Hermes <hello@clawdie.si>
Date: Sun, 31 May 2026 16:18:59 +0200
Subject: [PATCH] docs: record d360dde post-merge baseline

Linux + FreeBSD validation green. All 4 PRs merged.
Known caveats: OSA kernel p8 running / p9 pending reboot,
colibri-skills and zot harness are scaffold-only.
---
 .../2026-05-31-colibri-d360dde-baseline.md    | 115 ++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 docs/internal/sessions/2026-05-31-colibri-d360dde-baseline.md

diff --git a/docs/internal/sessions/2026-05-31-colibri-d360dde-baseline.md b/docs/internal/sessions/2026-05-31-colibri-d360dde-baseline.md
new file mode 100644
index 0000000..d221470
--- /dev/null
+++ b/docs/internal/sessions/2026-05-31-colibri-d360dde-baseline.md
@@ -0,0 +1,115 @@
+# Colibri Baseline — main @ d360dde
+
+**Date:** 2026-05-31
+**Commit:** `d360dde` — Merge PR #4 (T1.4 PR2: trimming + auto-escalation)
+**Status:** All 4 merged PRs validated on Linux + FreeBSD
+
+## Merged PRs
+
+| PR | Title | Content | Tests |
+|----|-------|---------|-------|
+| #1 | PromptAssembly + CacheMetrics structs | Structural wrapper, no behavior change | 5 golden |
+| #2 | colibri-skills scaffold | Read-only skill consumer crate, 12 tests | 12 |
+| #3 | zot runtime event normalization | AgentRuntime enum, zot event mapper, 16 tests | 16 |
+| #4 | cost-aware trimming + auto-escalation | trim_to_budget(), EscalationTrigger, auto_escalate() | 11 |
+
+## Validation
+
+### Linux (debby, Debian 13)
+
+```
+rustc: 1.94.0 (via rustup)
+cargo fmt --check                              ✓
+cargo clippy --workspace --all-targets -- -D warnings  ✓
+cargo test --workspace                         ✓
+git diff --check HEAD                          ✓
+```
+
+### FreeBSD (osa, FreeBSD 15.0-RELEASE)
+
+```
+host: osa.smilepowered.org
+rustc: 1.94.0
+cargo: 1.94.0
+freebsd-version -k: 15.0-RELEASE-p9
+freebsd-version -u: 15.0-RELEASE-p9
+uname -r: 15.0-RELEASE-p8 (kernel p9 installed, pending reboot)
+
+cargo fmt --check                              ✓
+cargo clippy --workspace --all-targets -- -D warnings  ✓
+cargo test --workspace                         ✓
+git diff --check HEAD                          ✓
+```
+
+### Test counts
+
+```
+colibri-daemon:    51 unit + 7 glasspane integration + 1 scheduler integration
+colibri-contracts: golden tests
+colibri-glasspane: 33 unit (17 Pi + 16 zot)
+colibri-skills:    12 unit
+colibri-store:     integration
+Workspace total:   all passed, no failures
+```
+
+### Workspace crates (9)
+
+```
+colibri-contracts, colibri-deepseek, colibri-runtime,
+colibri-glasspane, colibri-daemon, colibri-client,
+colibri-glasspane-tui, colibri-store, colibri-skills
+```
+
+## Known caveats
+
+- OSA kernel is p8 running but p9 installed — reboot needed for kernel update.
+  Does not affect Rust validation.
+- `colibri-skills` and `zot-runtime-event-adapter` are scaffold-only (Phase 1).
+  No IO, no SQLite, no daemon integration yet.
+- `PromptAssembly::trim_to_budget()` is implemented but not yet wired into
+  the scheduler or session append path — PR 3 (scheduler injection) pending.
+- `CacheMetrics` struct exists but is not populated by any API call path yet.
+- API token (`FORGEJO_API_TOKEN`) stored in `~/.hermes/.env` with 0600 perms.
+  Enables Hermes to create/merge PRs via Forgejo API without web UI.
+
+## Key files added/changed this session
+
+```
+docs/T1.4-PROMPT-DISCIPLINE-PLAN.md          (new — T1.4 implementation plan)
+docs/COLIBRI-CUTOVER-PLAN.md                 (link to T1.4 plan)
+crates/colibri-daemon/src/session.rs         (PromptAssembly, CacheMetrics,
+                                               trim_to_budget, golden tests)
+crates/colibri-daemon/src/cost.rs            (EscalationTrigger, auto_escalate)
+crates/colibri-glasspane/src/lib.rs          (AgentRuntime, zot_event_type,
+                                               apply_zot_event, 16 tests)
+crates/colibri-skills/                       (new crate — structs, 12 tests)
+doc/COLIBRI-SKILLS-PLAN.md → docs/ moved     (skills plan)
+```
+
+## Next recommended steps
+
+In priority order for USB/ISO target:
+
+1. **Real Pi spawn path proof** — validate that Colibri can spawn a Pi agent
+   and consume its JSONL events on both Linux and FreeBSD.
+
+2. **ISO service hardening** — Colibri as an `rc.d` service on FreeBSD,
+   status visibility, firstboot integration.
+
+3. **T1.4 PR3 — scheduler prompt injection** — wire trim_to_budget() into
+   the scheduler's spawn-agent path, cost-aware prompt assembly.
+
+4. **T1.4 PR4 — startup cache warming** — warm DeepSeek prefix cache on
+   daemon startup, config-gated. Separate from PR3 because of lifecycle/cost
+   concerns.
+
+## Branch hygiene
+
+```
+main:                      d360dde (baseline, all merged)
+t14-pr2-trimming:          merged → can delete
+t14-pr1-clean:             merged → can delete
+docs/t14-prompt-discipline-plan:  merged → can delete
+feat/colibri-skills-scaffold:     merged → can delete
+feat/zot-runtime-event-adapter:   merged → can delete
+```
-- 
2.45.3