From ac58b19da2512cabad747f3e7e4f1f00685872d6 Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Sat, 16 May 2026 22:27:58 +0000 Subject: [PATCH] config + docs/PHASE6: example block + status -> Implement (Phase 6 commit #6) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit R9-resolved single-owner of the status bump (commit #5 didn't touch PHASE6.md per the review fold-in). config.lua: - Commented-out `project = { auto_tree, tree_depth, tree_max_chars }` block with the same shape as the Phase 1-5 example blocks. - Note that :diff / :tree / :highlight all work without config; the `project` block ONLY controls the startup auto-inject. - Note about :highlight v1 having no config flag (runtime-only), cross-references the in-REPL install hint. docs/PHASE6.md: - Status header bumped: "Plan + review fold-in" -> "Implement" - Lists the 6 implement commits in the header for traceability: c4fc7fd context: compose_project plumbing d1dce83 _scan_project_tree + :tree + auto_tree hook 4d5f93a :diff + _git_clean_cmd (B1 helper) 0d63f01 expand_mentions @.. tiered resolution 11d0e59 tree-sitter highlighter (renderer fence filter + highlighted dispatch + :highlight meta) this config example + status bump Phase 6 implementation is complete. Next inner-loop step is verify (7) — user-driven smoke tests against the live broker on each pillar plus filing of issues for any defects, then memory-update (8). Regression: test_safety 87/87, test_router_model 31/31, repl loads. Co-Authored-By: Claude Opus 4.7 (1M context) --- config.lua | 18 ++++++++++++++++++ docs/PHASE6.md | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 0157cf3..724468b 100644 --- a/config.lua +++ b/config.lua @@ -246,4 +246,22 @@ return { -- 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). + + -- Phase 6 (docs/PHASE6.md): project file-tree context + :diff / + -- :tree / :highlight metas. The :diff and :tree metas work without + -- any config. The `project` block below only controls the + -- AUTO-injection-at-startup behavior; manual `:tree` always works + -- regardless. Uncomment to enable startup auto-inject. + -- + -- project = { + -- auto_tree = true, -- run `:tree` once at startup + -- tree_depth = 3, -- depth filter for the scan (find fallback only; + -- -- git ls-files emits full repo-relative paths) + -- tree_max_chars = 4096, -- truncate the injected block above this + -- }, + -- + -- :highlight has no config flag in v1 — toggled at runtime only. + -- Requires the external `tree-sitter` CLI plus configured parser- + -- directories with cloned + built `tree-sitter-` grammars + -- (see `:highlight on` for the install hints). } diff --git a/docs/PHASE6.md b/docs/PHASE6.md index 2301f46..dc11727 100644 --- a/docs/PHASE6.md +++ b/docs/PHASE6.md @@ -2,7 +2,7 @@ **Project:** aish — AI-augmented conversational shell **Document:** Phase 6 Requirements, Architecture & Design Decisions -**Status:** Plan + review fold-in (tree at `4407029`) +**Status:** Implement (6 commits landed: c4fc7fd, d1dce83, 4d5f93a, 0d63f01, 11d0e59, this) **Date:** 2026-05-16 **Review findings (independent agent, 2026-05-16) — 2 BLOCKERs resolved