fix: Phase 2 patches part 2 — F1 (slug truncation), F8 (closed_at), drift wildcard glob (#84)

Second round of patches surfaced by Sentinel CHARTER-02..05 telemetry
(issue #81 update). After fw-4.6.1/cli-3.7.1 fixed F3/F4/F6, executing
four more Charters re-prioritized the remaining frictions: F1 reproduced
4/4× consecutively (was UX polish, now top reproducibility), F8 required
manual workaround on every Charter close (4× consecutive), wildcard glob
in drift script was a new finding from CHARTER-04 that any future bulk
Charter would hit. O1 ("always in scope" rule) validated empirically as
a feature in CHARTER-04 (caught real scope expansion).

F1 (CLI, charter new):
- slugify() now truncates at the last `-` boundary at-or-before the
  50-char limit, never producing mid-word fragments. Conservative —
  when the next char in the original is `-` (or end), the truncated
  view is already at a word boundary and is kept verbatim.
- New --slug flag for explicit override (CHARTER-05 case where a long
  title's meaningful suffix gets dropped). Override is normalized
  through the same slugifier so it cannot smuggle in characters that
  break the filename.

F8 (CLI, charter close):
- charter close now writes `closed_at: <today>` to the frontmatter
  alongside `status: closed` bump. If the Charter already had a
  closed_at (e.g. prior close that was reverted), the value is
  refreshed to today rather than left stale.

Drift wildcard glob (framework, check-charter-drift.sh):
- Bash drift script already supported `prefix...suffix` ellipsis
  wildcards. Now also resolves the more conventional `prefix*suffix`
  glob form: `*` is converted to `.*` for the regex match. Same
  logic in both directions (declared glob suppresses missing-files
  warnings; modified path matching declared glob suppresses
  scope-expansion warnings). CHARTER-04 declared `AILOG-*.md` for a
  bulk set; pre-fix the script extracted the literal and reported
  spurious drift.

O1 documentation (framework, CLI-REFERENCE.md):
- New "Wildcard support" subsection in the drift section documenting
  both ellipsis and glob forms.
- New "Designed: governance paths are always in scope" subsection
  with empirical citation to CHARTER-04 W2 in issue #81. A
  --strict-scope flag remains on the table for cli-3.8.0.

Tests: 11 new (4 unit + 7 integration); 393/393 passing across 16
test groups.

What's NOT in this release: F2/F5/F7 (UX bundle for cli-3.8.0); O3
(design discussion); Phase 3 (separately scoped).

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: montfort

CHANGELOG.md

@@ -7,6 +7,103 @@ and this project uses [independent versioning](README.md#versioning) for Framewo
 
 ---
 
+## Framework 4.6.2 / CLI 3.7.2 — Phase 2 patches part 2 (F1, F8 + wildcard glob from issue #81 update)
+
+Second round of patches surfaced by Sentinel CHARTER-02..05 telemetry
+([issue #81 update](https://github.com/StrangeDaysTech/devtrail/issues/81#issuecomment-update)).
+After fw-4.6.1 / cli-3.7.1 fixed F3 / F4 / F6, executing four more
+Charters in Sentinel re-prioritized the remaining frictions: **F1
+(slug truncation) reproduced 4/4 times consecutively** — was UX
+polish in the original report, now the most consistently reproducing
+friction in the CLI. **F8 (closed_at)** required manual workaround on
+every Charter close (4× consecutive). **Wildcard glob in drift script**
+was a new finding from CHARTER-04 that any future bulk Charter would
+hit. Plus **observation O1** validated empirically as a feature
+(governance paths always-in-scope correctly suppressed governance
+noise without hiding a stray `git add -A` of project files).
+
+**Compatibility.** No breaking changes. New behavior is additive
+(`--slug` flag, automatic `closed_at` writing, glob resolution in drift).
+
+### Fixed (CLI)
+
+- **F1 — `devtrail charter new` mid-word slug truncation.** A title that
+  overflows the 50-char slug limit by 1-2 chars used to produce a partial
+  word fragment (Sentinel CHARTER-04: title ending in `... true` →
+  filename `…-required-t.md`). Two changes:
+  - `slugify` now backs up to the last `-` boundary at-or-before the
+    limit and drops any partial token, never producing a mid-word cut.
+    Conservative: when the next char in the original is a `-` (or
+    end-of-string), the truncated view is already at a complete
+    boundary and is kept verbatim.
+  - New `--slug <value>` flag lets the operator override the
+    title-derived slug entirely (Sentinel CHARTER-05: title with a
+    meaningful `… Plan 04 F3` suffix that otherwise gets lost). The
+    override is normalized through the same slugifier so it cannot
+    smuggle in characters that break the filename.
+
+- **F8 — `devtrail charter close` did not auto-write `closed_at`.** Per
+  Sentinel CHARTER-02..05 telemetry, the field had to be added manually
+  4× consecutively. The CLI now writes `closed_at: <today>` to the
+  frontmatter alongside the `status: closed` bump. If the Charter
+  already had a `closed_at` (e.g., a prior close that was reverted),
+  the value is refreshed to today rather than left stale.
+
+### Fixed (Framework)
+
+- **Drift script wildcard glob resolution.** The bash drift script
+  already supported the historical `prefix...suffix` ellipsis
+  wildcard. Now it also resolves the more conventional
+  `prefix*suffix` glob form: `*` is converted to `.*` for the regex
+  match, and the same logic applies in both directions (declared
+  glob suppresses "declared but not modified" when at least one
+  matching file was modified, and suppresses "modified but not
+  declared" when a modified path matches a declared glob).
+  Sentinel CHARTER-04 declared `AILOG-*.md` for a parameterized bulk
+  set; pre-fix the script extracted the literal string and reported
+  spurious drift.
+
+### Documented (Framework)
+
+- **O1 ("always in scope" rule for governance paths) is a designed
+  feature, not a bug.** Empirically validated in Sentinel CHARTER-04:
+  a stray `git add -A` staged unrelated user-untracked files
+  (`.claude/skills/`, `cmd/sentinel/sentinel`); the rule correctly
+  suppressed governance noise without hiding the genuine project-file
+  expansion. CLI-REFERENCE.md `devtrail charter drift` section now
+  has explicit subsections for "Wildcard support" and "Designed:
+  governance paths are always in scope", with the empirical citation
+  to issue #81 W2. A `--strict-scope` flag that disables the rule
+  remains on the table for cli-3.8.0 if a real adopter reports the
+  asymmetry as friction.
+
+### Tests
+
+- 4 new unit tests for the F1 slug helper (mid-word truncation
+  reproduction, hard-cut fallback for hyphenless slugs, trailing-`-`
+  trim, helper purity).
+- 4 new integration tests for `devtrail charter new` (word-boundary
+  truncation end-to-end, `--slug` override, `--slug` normalized
+  through slugifier, empty `--slug` falls back to title).
+- 2 new integration tests for F8 (`closed_at` auto-write when
+  absent, refresh of stale `closed_at` to today).
+- 1 new integration test for the drift wildcard glob (real git repo,
+  Charter declares `component-*.rs`, all matching modified files
+  satisfy the glob).
+- All 16/16 test groups pass (393 individual tests, 11 new on top of
+  the 382 carried forward from cli-3.7.1).
+
+### What's NOT in this release
+
+- F2 (AILOG context backfill in Origin line) — bundled for cli-3.8.0.
+- F5 (high-risk approve warning + verbose) — bundled for cli-3.8.0.
+- F7 (charter close output differentiation first-run vs revalidation)
+  — bundled for cli-3.8.0.
+- O3 (`INFO: 0 paths suppressed` always-on log) — pending design discussion.
+- Phase 3 (multi-model external audit) — separately scoped.
+
+---
+
 ## Framework 4.6.1 / CLI 3.7.1 — Phase 2 patches (F3, F4, F6 from issue #81)
 
 Empirical validation of fw-4.6.0 / cli-3.7.0 in Sentinel CHARTER-02

README.md

@@ -259,8 +259,8 @@ DevTrail uses independent version tags for each component:
 
 | Component | Tag prefix | Example | Includes |
 |-----------|-----------|---------|----------|
-| Framework | `fw-` | `fw-4.6.1` | Templates (12 types), governance, directives, Charter template + schema |
-| CLI | `cli-` | `cli-3.7.1` | The `devtrail` binary |
+| Framework | `fw-` | `fw-4.6.2` | Templates (12 types), governance, directives, Charter template + schema |
+| CLI | `cli-` | `cli-3.7.2` | The `devtrail` binary |
 
 Check installed versions with `devtrail status` or `devtrail about`.
 
@@ -292,7 +292,7 @@ See [CLI Reference](https://github.com/StrangeDaysTech/devtrail/blob/main/docs/a
 ```bash
 # Download the latest framework release ZIP from GitHub
 # Go to https://github.com/StrangeDaysTech/devtrail/releases
-# and download the latest fw-* release (e.g., fw-4.6.1)
+# and download the latest fw-* release (e.g., fw-4.6.2)
 
 # Extract and copy to your project
 unzip devtrail-fw-*.zip -d your-project/

cli/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "devtrail-cli"
-version = "3.7.1"
+version = "3.7.2"
 edition = "2021"
 description = "CLI for DevTrail — the cognitive discipline your AI-assisted projects need"
 license = "MIT"

cli/Cargo.toml

@@ -489,10 +489,22 @@ fn update_charter_status_to_closed(charter: &Charter) -> Result<()> {
         format!("Failed to read Charter file at {}", charter.path.display())
     })?;
 
-    // Replace the first frontmatter `status:` line.
-    let mut updated = String::with_capacity(raw.len());
+    // F8 (cli-3.7.2): also write closed_at: <today> alongside status: closed.
+    // Per Sentinel CHARTER-02..05 telemetry the field had to be added manually
+    // 4× consecutively. Schema permits arbitrary additional fields; the test
+    // suite for fw-4.6.0 confirmed the validator passes through unknown keys.
+    let today = Local::now().format("%Y-%m-%d").to_string();
+
+    // Walk the frontmatter in a single pass:
+    //   - Replace the first `status:` line with `status: closed`.
+    //   - Replace an existing `closed_at:` line with today's date, if present.
+    //   - If `closed_at:` is absent, queue it for insertion right after the
+    //     replaced `status:` line so it sits in a logical place.
+    let mut updated = String::with_capacity(raw.len() + 32);
     let mut in_frontmatter = false;
-    let mut replaced = false;
+    let mut status_replaced = false;
+    let mut closed_at_replaced = false;
+    let mut closed_at_indent: Option<String> = None;
     let mut delim_count = 0;
     for line in raw.lines() {
         if line.trim() == "---" {
@@ -502,22 +514,53 @@ fn update_charter_status_to_closed(charter: &Charter) -> Result<()> {
             updated.push('\n');
             continue;
         }
-        if in_frontmatter && !replaced && line.trim_start().starts_with("status:") {
+        if in_frontmatter && !status_replaced && line.trim_start().starts_with("status:") {
             let leading_ws: String = line.chars().take_while(|c| c.is_whitespace()).collect();
+            closed_at_indent = Some(leading_ws.clone());
             updated.push_str(&format!("{leading_ws}status: closed\n"));
-            replaced = true;
+            status_replaced = true;
+            continue;
+        }
+        if in_frontmatter && !closed_at_replaced && line.trim_start().starts_with("closed_at:") {
+            let leading_ws: String = line.chars().take_while(|c| c.is_whitespace()).collect();
+            updated.push_str(&format!("{leading_ws}closed_at: {today}\n"));
+            closed_at_replaced = true;
             continue;
         }
         updated.push_str(line);
         updated.push('\n');
     }
-    if !replaced {
+    if !status_replaced {
         bail!(
             "Charter at {} has no `status:` line in frontmatter — cannot bump to closed",
             charter.path.display()
         );
     }
 
+    // If closed_at was absent in the original frontmatter, insert it right
+    // after the replaced status line. We rebuild `updated` rather than tracking
+    // an insertion point above, since insertion at arbitrary line indices is
+    // simpler than splicing an index.
+    let updated = if !closed_at_replaced {
+        let indent = closed_at_indent.unwrap_or_default();
+        let needle = format!("{indent}status: closed\n");
+        let insert = format!("{indent}closed_at: {today}\n");
+        match updated.find(&needle) {
+            Some(pos) => {
+                let after = pos + needle.len();
+                let mut out = String::with_capacity(updated.len() + insert.len());
+                out.push_str(&updated[..after]);
+                out.push_str(&insert);
+                out.push_str(&updated[after..]);
+                out
+            }
+            // Defensive — shouldn't happen since we just wrote it.
+            None => updated,
+        }
+    } else {
+        updated
+    };
+
     // Sync the body status mirror line. Best-effort: if the line is absent or
     // has been edited beyond recognition, we leave it alone — the schema has
     // already authoritatively recorded the status in frontmatter.

cli/src/commands/charter/close.rs

@@ -28,6 +28,7 @@ pub fn run(
     from_ailog: Option<&str>,
     from_spec: Option<&str>,
     title_arg: Option<&str>,
+    slug_arg: Option<&str>,
 ) -> Result<()> {
     // clap enforces mutual exclusion via conflicts_with — keep this assertion
     // as a defense against direct programmatic invocation.
@@ -75,12 +76,20 @@ pub fn run(
     })?;
 
     // Build identifiers.
+    // F1 (cli-3.7.2): `--slug` lets the operator override the title-derived
+    // slug when the auto-derivation drops meaningful suffixes (e.g.
+    // `…-plan-04-f3` → cut to `…-plan` because the limit hit). The override
+    // is normalized through the same slugifier so it cannot smuggle in
+    // characters that break the filename.
     let nn = next_charter_number(project_root);
-    let slug = slugify(&title);
+    let slug = match slug_arg {
+        Some(s) if !s.trim().is_empty() => slugify(s),
+        _ => slugify(&title),
+    };
     if slug.is_empty() {
         bail!(
-            "Title '{}' produces an empty slug — titles must contain at least one alphanumeric character",
-            title
+            "{} produces an empty slug — must contain at least one alphanumeric character",
+            if slug_arg.is_some() { "--slug" } else { "Title" }
         );
     }
     let charter_id = format!("CHARTER-{:02}-{}", nn, slug);
@@ -247,6 +256,13 @@ fn validate_spec_path(project_root: &Path, spec_path: &str) -> Result<()> {
 /// Slugify a title for use in a Charter filename. Mirrors the implementation
 /// in `commands::new::slugify` (kept private there — duplicated here to avoid
 /// touching the existing command in this PR; consolidate to `utils` later).
+///
+/// F1 (cli-3.7.2): truncation now respects word boundaries. The previous
+/// implementation cut at the 50-char limit and only trimmed a trailing `-`,
+/// which produced mid-word slugs like `…-required-t` (truncating "true" to "t"
+/// in Sentinel CHARTER-04). The fix is to back up to the last `-` boundary
+/// at-or-before the limit, never producing a partial word fragment. Operators
+/// who want a fully custom slug pass `--slug` to override this function entirely.
 fn slugify(title: &str) -> String {
     let lower = title.to_lowercase();
     let parts: Vec<&str> = lower
@@ -255,13 +271,42 @@ fn slugify(title: &str) -> String {
         .collect();
     let slug = parts.join("-");
     if slug.chars().count() > 50 {
-        let truncated: String = slug.chars().take(50).collect();
-        truncated.trim_end_matches('-').to_string()
+        truncate_slug_at_word_boundary(&slug, 50)
     } else {
         slug
     }
 }
 
+/// Truncate `slug` at-or-before `max_chars`, never splitting a word.
+///
+/// The function works in two cases:
+/// - If `slug[max_chars]` is `-` or end-of-string, then `slug[..max_chars]`
+///   already ends on a complete word — we keep the full prefix (after
+///   trimming any trailing `-`).
+/// - Otherwise, `slug[..max_chars]` ends mid-word; we back up to the last
+///   `-` boundary inside the truncated view and drop the partial token.
+///
+/// Falls back to a hard cut when the truncated view contains no hyphen at
+/// all (single very long token).
+fn truncate_slug_at_word_boundary(slug: &str, max_chars: usize) -> String {
+    let truncated: String = slug.chars().take(max_chars).collect();
+
+    let next_is_boundary = slug
+        .chars()
+        .nth(max_chars)
+        .map(|c| c == '-')
+        .unwrap_or(true);
+    if next_is_boundary {
+        return truncated.trim_end_matches('-').to_string();
+    }
+
+    let cut = match truncated.rfind('-') {
+        Some(idx) => &truncated[..idx],
+        None => truncated.as_str(),
+    };
+    cut.trim_end_matches('-').to_string()
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -387,6 +432,57 @@ Body content.
         assert!(s.len() <= 50);
     }
 
+    // ── F1 (cli-3.7.2): word-boundary truncation ─────────────────────────
+
+    #[test]
+    fn slugify_truncates_at_word_boundary_not_mid_word() {
+        // CHARTER-04 reproduction case from issue #81: title that overflows
+        // 50 chars by 1-2 chars used to produce a mid-word fragment like
+        // "…required-t" (cutting "true" to "t"). Now the truncation backs up
+        // to the last `-` boundary and drops the partial token entirely.
+        let title = "Approve retroactivo bulk de docs review_required: true";
+        let s = slugify(title);
+        assert!(s.len() <= 50, "slug must fit limit, got {}: {s}", s.len());
+        assert!(
+            !s.ends_with("-t") && !s.ends_with("-tr") && !s.ends_with("-tru"),
+            "slug must not end with a partial word fragment, got: {s}"
+        );
+        // Last completed word should be preserved.
+        assert!(s.ends_with("required"), "got: {s}");
+    }
+
+    #[test]
+    fn slugify_handles_no_hyphen_in_truncated_window() {
+        // Single very long token: no hyphens to back up to. We hard-cut.
+        let title = "supercalifragilisticexpialidocious".repeat(3);
+        let s = slugify(&title);
+        assert!(s.len() <= 50);
+        assert!(!s.contains('-'));
+    }
+
+    #[test]
+    fn slugify_strips_trailing_hyphens_after_word_boundary_cut() {
+        // If the cut lands such that a trailing `-` survives, we trim it.
+        let title = "abc-def-ghi-jkl-mno-pqr-stu-vwx-yz1-2345-6789-extra";
+        let s = slugify(title);
+        assert!(!s.ends_with('-'), "got: {s}");
+    }
+
+    #[test]
+    fn truncate_slug_at_word_boundary_helper_is_pure() {
+        // Direct unit test of the helper: cut at last `-` ≤ max_chars.
+        assert_eq!(
+            truncate_slug_at_word_boundary("foo-bar-baz-qux", 11),
+            "foo-bar-baz"
+        );
+        assert_eq!(
+            truncate_slug_at_word_boundary("foo-bar-baz-qux", 10),
+            "foo-bar"
+        );
+        // No hyphen within window → hard cut.
+        assert_eq!(truncate_slug_at_word_boundary("supercalifragilistic", 10), "supercalif");
+    }
+
     #[test]
     fn next_steps_no_origin_has_4_sequential_numbered_lines() {
         let steps = next_steps(None, None);