StrangeDaysTech
diff --git a/‎cli/src/commands/charter/close.rs‎
Lines changed: 3 additions & 0 deletions b/‎cli/src/commands/charter/close.rs‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎cli/src/commands/charter/new.rs‎
Lines changed: 5 additions & 3 deletions b/‎cli/src/commands/charter/new.rs‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎cli/src/commands/status.rs‎
Lines changed: 105 additions & 1 deletion b/‎cli/src/commands/status.rs‎
Lines changed: 105 additions & 1 deletion
diff --git a/‎cli/tests/charter_close_test.rs‎
Lines changed: 6 additions & 2 deletions b/‎cli/tests/charter_close_test.rs‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎cli/tests/charter_drift_test.rs‎
Lines changed: 5 additions & 2 deletions b/‎cli/tests/charter_drift_test.rs‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎cli/tests/charter_test.rs‎
Lines changed: 8 additions & 4 deletions b/‎cli/tests/charter_test.rs‎
Lines changed: 8 additions & 4 deletions
diff --git a/‎dist/.agent/workflows/straymark-charter-new.md‎
Lines changed: 90 additions & 0 deletions b/‎dist/.agent/workflows/straymark-charter-new.md‎
Lines changed: 90 additions & 0 deletions
diff --git a/‎dist/.agent/workflows/straymark-new.md‎
Lines changed: 3 additions & 0 deletions b/‎dist/.agent/workflows/straymark-new.md‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎dist/.agent/workflows/straymark-status.md‎
Lines changed: 10 additions & 0 deletions b/‎dist/.agent/workflows/straymark-status.md‎
Lines changed: 10 additions & 0 deletions
@@ -162,8 +162,11 @@ fn copy_template_for(
     dest: &Path,
     non_interactive: bool,
 ) -> Result<String> {
+    // Charter templates live under their own subdirectory (`templates/charter/`)
+    // since fw-4.12.0.
     let template_path = straymark_dir
         .join("templates")
+        .join("charter")
         .join("charter-telemetry-template.yaml");
     let template = std::fs::read_to_string(&template_path).with_context(|| {
         format!(
 
@@ -65,8 +65,10 @@ pub fn run(
         validate_spec_path(project_root, spec_path)?;
     }
 
-    // Resolve template (with i18n) and load.
-    let templates_dir = straymark_dir.join("templates");
+    // Resolve template (with i18n) and load. Charter templates live under
+    // their own subdirectory (`templates/charter/`) since fw-4.12.0; the
+    // helper handles i18n fallback within that subdir.
+    let templates_dir = straymark_dir.join("templates").join("charter");
     let template_path = utils::resolve_localized_path(&templates_dir, "charter-template.md", lang);
     let template = std::fs::read_to_string(&template_path).with_context(|| {
         format!(
@@ -505,7 +507,7 @@ mod tests {
     use super::*;
 
     /// Minimal template that covers all substitution points the runner touches.
-    /// Mirrors the structure of dist/.straymark/templates/charter-template.md
+    /// Mirrors the structure of dist/.straymark/templates/charter/charter-template.md
     /// without the full body.
     const TEMPLATE: &str = r#"---
 charter_id: CHARTER-NN
 
@@ -1,7 +1,8 @@
 use anyhow::Result;
 use colored::Colorize;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
+use crate::charter::{self, CharterStatus};
 use crate::config::StrayMarkConfig;
 use crate::manifest::DistManifest;
 use crate::utils::{self, pad_right_visual, visual_width};
@@ -223,6 +224,13 @@ pub fn run(path: &str) -> Result<()> {
     );
     println!();
 
+    // ── Charters ──
+    // Charters are an optional pattern (bounded units of work). Surfaced as a
+    // dedicated block so adopters of `straymark charter new` see them in the
+    // canonical health view; projects without Charters see a one-line hint.
+    let charter_counts = count_charters(&target);
+    print_charters_block(&charter_counts);
+
     // ── Hints ──
     if total_missing > 0 {
         println!(
@@ -313,3 +321,99 @@ fn walk_files(dir: &std::path::Path) -> Vec<PathBuf> {
     }
     files
 }
+
+/// Counts of Charters by lifecycle status. `total` includes parseable charters
+/// only; `unparseable` reports files that look like charters by filename but
+/// failed schema parse, so the user knows to fix them.
+struct CharterCounts {
+    declared: usize,
+    in_progress: usize,
+    closed: usize,
+    unparseable: usize,
+    total: usize,
+}
+
+fn count_charters(project_root: &Path) -> CharterCounts {
+    let (charters, errors) = charter::discover_and_parse(project_root);
+    let mut declared = 0;
+    let mut in_progress = 0;
+    let mut closed = 0;
+    for c in &charters {
+        match c.frontmatter.status {
+            CharterStatus::Declared => declared += 1,
+            CharterStatus::InProgress => in_progress += 1,
+            CharterStatus::Closed => closed += 1,
+        }
+    }
+    CharterCounts {
+        declared,
+        in_progress,
+        closed,
+        unparseable: errors.len(),
+        total: charters.len(),
+    }
+}
+
+fn print_charters_block(c: &CharterCounts) {
+    println!("  {}", "Charters".bold());
+    if c.total == 0 && c.unparseable == 0 {
+        println!(
+            "  {} {}",
+            "·".dimmed(),
+            "No Charters yet — run `straymark charter new` to declare one (see STRAYMARK.md §15).".dimmed(),
+        );
+        println!();
+        return;
+    }
+
+    let rows: Vec<(&str, usize, colored::Color)> = vec![
+        ("declared", c.declared, colored::Color::White),
+        ("in-progress", c.in_progress, colored::Color::Yellow),
+        ("closed", c.closed, colored::Color::Green),
+    ];
+    let label_w = rows
+        .iter()
+        .map(|(l, _, _)| visual_width(l))
+        .max()
+        .unwrap_or(11);
+    let count_w = 5;
+
+    println!();
+    println!(
+        "  {} {} {}",
+        pad_right_visual("Status", label_w).dimmed(),
+        "│".dimmed(),
+        pad_right_visual("Count", count_w).dimmed(),
+    );
+    println!(
+        "  {}",
+        format!("{}─┼─{}", "─".repeat(label_w), "─".repeat(count_w)).dimmed()
+    );
+
+    for (label, count, color) in &rows {
+        let count_str = format!("{count:>count_w$}");
+        let padded = pad_right_visual(label, label_w);
+        if *count > 0 {
+            println!("  {} │ {}", padded, count_str.color(*color).bold());
+        } else {
+            println!("  {} │ {}", padded.dimmed(), count_str.dimmed());
+        }
+    }
+
+    let total_str = format!("{:>count_w$}", c.total);
+    println!(
+        "  {} │ {}",
+        pad_right_visual("TOTAL", label_w).bold(),
+        total_str.cyan().bold(),
+    );
+
+    if c.unparseable > 0 {
+        println!(
+            "  {} {} unparseable Charter file{} — run `straymark charter list` to see the warning detail.",
+            "!".yellow().bold(),
+            c.unparseable,
+            if c.unparseable == 1 { "" } else { "s" },
+        );
+    }
+    println!();
+}
@@ -53,17 +53,21 @@ const TELEMETRY_SCHEMA: &str = include_str!(
 /// after fw-4.6.0 ships.
 fn setup_straymark(dir: &Path) {
     let straymark = dir.join(".straymark");
-    std::fs::create_dir_all(straymark.join("templates")).unwrap();
+    std::fs::create_dir_all(straymark.join("templates").join("charter")).unwrap();
     std::fs::create_dir_all(straymark.join("schemas")).unwrap();
     std::fs::write(straymark.join("config.yml"), "language: en\n").unwrap();
     std::fs::write(
-        straymark.join("templates").join("charter-template.md"),
+        straymark
+            .join("templates")
+            .join("charter")
+            .join("charter-template.md"),
         CHARTER_TEMPLATE,
     )
     .unwrap();
     std::fs::write(
         straymark
             .join("templates")
+            .join("charter")
             .join("charter-telemetry-template.yaml"),
         TELEMETRY_TEMPLATE,
     )
 
@@ -40,12 +40,15 @@ fn bash_available() -> bool {
 
 fn setup_straymark(dir: &Path) {
     let straymark = dir.join(".straymark");
-    std::fs::create_dir_all(straymark.join("templates")).unwrap();
+    std::fs::create_dir_all(straymark.join("templates").join("charter")).unwrap();
     std::fs::create_dir_all(straymark.join("scripts")).unwrap();
     std::fs::create_dir_all(straymark.join("07-ai-audit/agent-logs")).unwrap();
     std::fs::write(straymark.join("config.yml"), "language: en\n").unwrap();
     std::fs::write(
-        straymark.join("templates").join("charter-template.md"),
+        straymark
+            .join("templates")
+            .join("charter")
+            .join("charter-template.md"),
         CHARTER_TEMPLATE,
     )
     .unwrap();
 
@@ -11,7 +11,7 @@ fn setup_straymark_with_charter_template(dir: &std::path::Path) {
     std::fs::write(straymark.join("config.yml"), "language: en\n").unwrap();
 
     // Bundled template. We ship the actual template from
-    // dist/.straymark/templates/charter-template.md in the framework; this test
+    // dist/.straymark/templates/charter/charter-template.md in the framework; this test
     // helper inlines a structurally-equivalent copy so tests don't depend on
     // the dist/ path being available at test runtime.
     let template = r#"---
@@ -76,7 +76,9 @@ When closing this Charter (post-merge):
 
 1. Drift check.
 "#;
-    std::fs::write(straymark.join("templates").join("charter-template.md"), template).unwrap();
+    let charter_templates = straymark.join("templates").join("charter");
+    std::fs::create_dir_all(&charter_templates).unwrap();
+    std::fs::write(charter_templates.join("charter-template.md"), template).unwrap();
 }
 
 #[test]
@@ -316,13 +318,15 @@ fn charter_new_uses_es_template_when_config_says_es() {
     std::fs::write(straymark.join("config.yml"), "language: es\n").unwrap();
 
     // EN template (fallback).
+    let charter_templates = straymark.join("templates").join("charter");
+    std::fs::create_dir_all(charter_templates.join("i18n").join("es")).unwrap();
     std::fs::write(
-        straymark.join("templates").join("charter-template.md"),
+        charter_templates.join("charter-template.md"),
         "---\ncharter_id: CHARTER-NN\nstatus: declared\neffort_estimate: M\ntrigger: \"[x]\"\n---\n\n# Charter: [BRIEF TITLE]\n\nEN body.\n",
     ).unwrap();
     // ES translation.
     std::fs::write(
-        straymark.join("templates").join("i18n").join("es").join("charter-template.md"),
+        charter_templates.join("i18n").join("es").join("charter-template.md"),
         "---\ncharter_id: CHARTER-NN\nstatus: declared\neffort_estimate: M\ntrigger: \"[x]\"\n---\n\n# Charter: [TÍTULO BREVE]\n\nES body.\n",
     ).unwrap();
 
 
@@ -0,0 +1,90 @@
+---
+description: Scaffold a Charter — StrayMark's bounded unit of work that pairs declarative ex-ante scope with telemetry ex-post. Use when starting a multi-session implementation block (>1 day, >5 tasks, multi-phase).
+---
+
+# StrayMark Charter Scaffold Skill
+
+Declare a Charter at the start of a bounded, auditable unit of work — *not* every change. Charters wrap multi-session work that warrants a stable scope contract you can drift-check at close. They are conceptually distinct from the 12+4 governance document types (AILOG, ADR, AIDEC, …): Charters live at `.straymark/charters/NN-slug.md` and use a sequential prefix instead of a date prefix.
+
+> See `STRAYMARK.md §15` and `.straymark/00-governance/SPECKIT-CHARTER-BRIDGE.md` for the lifecycle and the SpecKit ↔ Charter bridge.
+
+## When to use this skill
+
+Trigger on any of:
+
+- Multi-session implementation block (>1 day, >5 tasks across phases).
+- Work that warrants external audit at completion.
+- A SpecKit feature has reached `tasks.md` and the operator wants a stable scope contract before `/speckit-implement`.
+- The user asks to "declare", "open", or "start" a Charter.
+
+If the work is a single-session change → use `straymark-ailog` instead.
+
+## Instructions
+
+### 1. Gather context
+
+```bash
+# Sequential number of the Charter being created
+straymark charter list 2>/dev/null | tail -5 || true
+
+# Surrounding spec / AILOG context — Charters frequently originate from one
+ls specs/*/spec.md 2>/dev/null | head -5
+ls .straymark/07-ai-audit/agent-logs/AILOG-*.md 2>/dev/null | tail -5
+```
+
+### 2. Confirm with user
+
+Surface the required and optional inputs:
+
+- **Required**: title (one line), effort estimate (`XS | S | M | L`).
+- **Optional but encouraged**: one of `--from-ailog AILOG-ID` (post-MVP / maintenance origin) or `--from-spec specs/.../spec.md` (greenfield / SpecKit origin).
+- **Default** effort: M.
+
+### 3. Pick origin and effort
+
+- **Effort heuristic**: XS (≤ half day), S (≤ 1 day), M (1–3 days, default), L (≥ 1 week).
+- **Origin precedence**: a single live AILOG → `--from-ailog`; a SpecKit feature spec → `--from-spec`; otherwise omit (the operator can fill `originating_*` fields manually).
+
+### 4. Run the CLI
+
+The CLI does the scaffolding — slug derivation, sequential numbering, template substitution, write to `.straymark/charters/NN-slug.md`. The skill's job is to drive it with the right flags.
+
+```bash
+# Greenfield, SpecKit-driven
+straymark charter new \
+  --title "Workspace foundation for peek MVP" \
+  --type M \
+  --from-spec specs/001-peek-mvp-foundation/spec.md
+
+# Post-MVP / maintenance, AILOG-driven
+straymark charter new \
+  --title "Per-service anomaly thresholds" \
+  --type S \
+  --from-ailog AILOG-2026-04-28-021
+
+# No explicit origin (operator fills frontmatter manually)
+straymark charter new --title "Refactor signal pipeline" --type M
+```
+
+If the title would derive a poor slug, pass `--slug <slug>` explicitly.
+
+### 5. Hand off to the operator
+
+After the file is created, the CLI's "Next steps" output already lists what to fill. Surface it verbatim, then remind:
+
+> Charter status starts at `declared`. Flip to `in-progress` only when execution actually begins. Run `straymark charter drift CHARTER-NN` before `straymark charter close` to catch declared-but-not-modified files (or modified-but-not-declared ones).
+
+### 6. Report result
+
+```
+StrayMark: Created CHARTER-NN-slug at .straymark/charters/NN-slug.md
+  status: declared
+  effort_estimate: <XS|S|M|L>
+  origin: <ailog | spec | none>
+```
+
+## What this skill does NOT do
+
+- It does not flip status to `in-progress` or `closed`. Lifecycle transitions are operator decisions.
+- It does not run drift or audit. Use `straymark charter drift` and the audit-prompt / audit-execute / audit-review skills for those phases.
+- It does not replace AILOGs. Day-to-day work inside the Charter still produces AILOGs; the Charter aggregates them via `originating_ailogs:`.
@@ -16,6 +16,8 @@ If the user specified a document type (e.g., `/straymark-new ailog`), skip to st
 
 Valid types: `ailog`, `aidec`, `adr`, `eth`, `req`, `tes`, `inc`, `tde`, `sec`, `mcard`, `sbom`, `dpia`
 
+> **Charter is not a `straymark new` type.** Charters are bounded units of work (filename `NN-slug.md`, sequential prefix) and have their own command. If the user asks for a Charter (`/straymark-new charter`, *"create a Charter"*, *"declare a Charter"*), redirect to the `straymark-charter-new` skill.
+
 ### 2. Analyze Context
 
 Gather information about recent changes:
@@ -52,6 +54,7 @@ Based on the analysis, suggest a document type:
 | Bug fixes, hotfixes | INC |
 | `TODO`, `FIXME`, `HACK` comments added | TDE |
 | Requirements or spec files | REQ |
+| Multi-session implementation block (>1 day, >5 tasks, multi-phase) | **Charter** — redirect to `straymark-charter-new` (Charters use `straymark charter new`, not `straymark new`) |
 
 ### 4. Confirm with User
 
 
@@ -37,6 +37,15 @@ Check these directories for each document type:
 | SBOM | `SBOM-` | `.straymark/07-ai-audit/` |
 | DPIA | `DPIA-` | `.straymark/07-ai-audit/ethical-reviews/` |
 
+Also enumerate **Charters** (bounded units of work — distinct from doc types; see STRAYMARK.md §15):
+
+```bash
+# Charters list with status counts (declared / in-progress / closed)
+straymark charter list 2>/dev/null
+```
+
+If the project has no Charters yet but the work clearly fits the trigger (multi-session implementation block, >5 tasks across phases, audit value), surface that as a gap and recommend the `straymark-charter-new` skill.
+
 ### 2. Find Modified Source Files
 
 Identify source files that were modified and might need documentation:
@@ -69,6 +78,7 @@ For each modified source file, check if there's a corresponding StrayMark docume
 - Changes involving personal data processing should have a DPIA
 - Test files should have a TES record
 - Bug fixes or incidents should have an INC record
+- Multi-session implementation blocks (>1 day, >5 tasks, multi-phase) should have an open or closed **Charter** at `.straymark/charters/`
 
 ### 4. Display Results