@stylusnexus/work-plan 2026.6.10 → 2026.6.11

package/skills/work-plan/lib/status_table.py

@@ -104,12 +104,102 @@ def update_row_status(body: str, issue_num: int, new_status: str) -> str:
     return "\n".join(lines)
 
 
-def render_issue_row(num: int, title: str, assignee: str, status: str) -> str:
-    """Render a canonical issue-table row: `| #N | title | assignee | status |`.
+def render_issue_row(num: int, title: str, assignee: str, status: str,
+                     milestone: Optional[str] = None) -> str:
+    """Render a canonical issue-table row.
+
+    Single source of truth for the canonical row shape. With `milestone=None`
+    (the default) renders the 4-column form `| #N | title | assignee | status |`
+    used by narrative tables and sync_missing_rows appends. Pass a milestone
+    string (possibly empty) to render the 5-column canonical form
+    `| #N | title | milestone | assignee | status |` used by render_canonical_table
+    (#101). An empty string still renders the column — distinct from None, which
+    drops it."""
+    if milestone is None:
+        return f"| #{num} | {title} | {assignee} | {status} |"
+    return f"| #{num} | {title} | {milestone} | {assignee} | {status} |"
+
+
+def render_canonical_table(issue_nums: list, issues_by_num: dict,
+                           milestone_alignment=None) -> str:
+    """Render the canonical issues block: heading, marker, and ONE table.
+
+    The table carries a `Milestone` column and is ordered active-milestone-first
+    (the shared `milestone_sort_key`): issues whose milestone matches the track's
+    `milestone_alignment` come first, then other milestones grouped by label,
+    then no-milestone issues last; a blank divider row separates each group.
+
+    Deliberately a SINGLE table (not per-milestone sub-tables): it round-trips
+    through refresh-md, which re-derives this whole block on every run, so the
+    rendered order can't decay (#101). The blank divider row has no `#NNNN`
+    ref, so the table parsers skip it.
+
+    Returns the block string (heading + marker + table); callers add the
+    trailing `---` separator via insert_canonical_block."""
+    from lib.github_state import (
+        short_milestone, format_assignees, state_to_status_label,
+    )
+    from lib.export_model import group_issues_by_milestone
+
+    lines = [
+        "## Issues (canonical)",
+        "",
+        f"{CANONICAL_MARKER} — auto-managed by /work-plan refresh-md. Don't edit by hand. -->",
+        "",
+        "| # | Title | Milestone | Assignee | Status |",
+        "|---|---|---|---|---|",
+    ]
+
+    norm = []
+    for num in sorted(issue_nums):
+        gh = issues_by_num.get(num, {})
+        ms = short_milestone(gh.get("milestone")) or None
+        norm.append({"number": num, "milestone": ms, "_gh": gh})
+
+    groups = group_issues_by_milestone(norm, milestone_alignment)
+    for gi, (label, issues) in enumerate(groups):
+        if gi > 0:
+            lines.append("| | | | | |")  # blank divider row between milestone groups
+        for it in issues:
+            gh = it["_gh"]
+            lines.append(render_issue_row(
+                it["number"], gh.get("title", "(not fetched)"),
+                format_assignees(gh), state_to_status_label(gh.get("state")),
+                milestone=it["milestone"] or "",
+            ))
+    lines.append("")
+    return "\n".join(lines)
+
+
+def strip_canonical_block(body: str) -> str:
+    """Remove an existing canonical-table block from the top of the body.
 
-    Single source of truth for the canonical row shape — used by canonicalize
-    (initial table) and by sync_missing_rows (drift-healing appends)."""
-    return f"| #{num} | {title} | {assignee} | {status} |"
+    The block runs from the `## Issues (canonical)` heading (or the marker if
+    the heading is absent) through the next `\\n---\\n` separator. Returns the
+    body unchanged when no marker is present."""
+    if CANONICAL_MARKER not in body:
+        return body
+    heading_idx = body.find("## Issues (canonical)")
+    marker_idx = body.find(CANONICAL_MARKER)
+    start = heading_idx if 0 <= heading_idx < marker_idx else marker_idx
+    sep_idx = body.find("\n---\n", marker_idx)
+    if sep_idx == -1:
+        end = body.find("\n", marker_idx) + 1
+    else:
+        end = sep_idx + len("\n---\n")
+    return body[:start] + body[end:].lstrip("\n")
+
+
+def insert_canonical_block(body: str, table_md: str, replace: bool = False) -> str:
+    """Prepend `table_md` (a render_canonical_table block) at the top of body,
+    followed by a `---` separator. With replace=True, strip any existing
+    canonical block first (so refresh-md re-derive and canonicalize --force
+    produce identical output)."""
+    if replace:
+        body = strip_canonical_block(body)
+    body_stripped = body.lstrip("\n")
+    leading = body[: len(body) - len(body_stripped)]
+    return leading + table_md + "\n---\n\n" + body_stripped
 
 
 def append_rows(body: str, table: dict, row_lines: list[str]) -> str:

package/skills/work-plan/lib/tracks.py

@@ -155,7 +155,9 @@ def discover_archived_tracks(cfg: dict) -> list[Track]:
         for md_path in sorted(notes_root.rglob("*.md")):
             if "archive" not in md_path.parts:
                 continue
-            if md_path.name.startswith((".", "_")):
+            # '-' prefix rejected so a `--repo.md` file can't become a `--repo`
+            # track that the CLI misparses as a flag (#194).
+            if md_path.name.startswith((".", "_", "-")):
                 continue
             private_archived.append(_build_track(md_path, notes_root, cfg))
 
@@ -212,8 +214,9 @@ def _discover_shared_tracks(cfg: dict, include_archive: bool = False,
         if not notes_dir.is_dir():
             continue
         for md_path in sorted(notes_dir.rglob("*.md")):
-            # Skip dotfiles and README
-            if md_path.name.startswith(".") or md_path.name == "README.md":
+            # Skip dotfiles, README, and dash-led names (a `--repo.md` file
+            # would otherwise become a `--repo` track the CLI misparses, #194).
+            if md_path.name.startswith((".", "-")) or md_path.name == "README.md":
                 continue
             in_archive = "archive" in md_path.relative_to(notes_dir).parts
             if archive_only and not in_archive:
@@ -263,7 +266,9 @@ def _walk(notes_root: Path, cfg: dict, include_archive: bool) -> list[Track]:
     for md_path in sorted(notes_root.rglob("*.md")):
         if not include_archive and "archive" in md_path.parts:
             continue
-        if md_path.name.startswith((".", "_")):
+        # '-' prefix rejected so a `--repo.md` file can't become a `--repo`
+        # track that the CLI misparses as a flag (#194).
+        if md_path.name.startswith((".", "_", "-")):
             continue
         out.append(_build_track(md_path, notes_root, cfg))
     return out

package/skills/work-plan/tests/fixtures/notes_root/{critforge → myproject}/archive/shipped/old.md

@@ -3,7 +3,7 @@ track: old
 status: shipped
 launch_priority: P2
 github:
-  repo: stylusnexus/CritForge
+  repo: your-org/myproject
   issues: [50]
 ---
 

package/skills/work-plan/tests/fixtures/notes_root/{critforge → myproject}/example.md

@@ -3,7 +3,7 @@ track: example
 status: active
 launch_priority: P1
 github:
-  repo: stylusnexus/CritForge
+  repo: your-org/myproject
   issues: [100, 200]
 next_up: [100]
 ---

package/skills/work-plan/tests/fixtures/track_with_frontmatter.md

@@ -3,7 +3,7 @@ track: tabletop
 status: active
 launch_priority: P1
 github:
-  repo: stylusnexus/CritForge
+  repo: your-org/myproject
   issues: [4254, 4127]
   branches: []
 next_up: [4254]

package/skills/work-plan/tests/test_config.py

@@ -24,15 +24,15 @@ class LoadConfigTest(unittest.TestCase):
             path = self._write(d, (
                 "notes_root: /tmp/notes\n"
                 "repos:\n"
-                "  critforge:\n"
-                "    github: stylusnexus/CritForge\n"
-                "    local: /Applications/Development/Projects/CritForge\n"
+                "  myproject:\n"
+                "    github: your-org/myproject\n"
+                "    local: /path/to/myproject\n"
             ))
             cfg = load_config(path)
             self.assertEqual(cfg["notes_root"], "/tmp/notes")
-            self.assertEqual(cfg["repos"]["critforge"]["github"], "stylusnexus/CritForge")
-            self.assertEqual(cfg["repos"]["critforge"]["local"],
-                             "/Applications/Development/Projects/CritForge")
+            self.assertEqual(cfg["repos"]["myproject"]["github"], "your-org/myproject")
+            self.assertEqual(cfg["repos"]["myproject"]["local"],
+                             "/path/to/myproject")
 
     def test_load_string_shape_normalizes_to_dict(self):
         # Backward-friendly: bare string is treated as github-only, no local
@@ -40,11 +40,11 @@ class LoadConfigTest(unittest.TestCase):
             path = self._write(d, (
                 "notes_root: /tmp/notes\n"
                 "repos:\n"
-                "  critforge: stylusnexus/CritForge\n"
+                "  myproject: your-org/myproject\n"
             ))
             cfg = load_config(path)
-            self.assertEqual(cfg["repos"]["critforge"]["github"], "stylusnexus/CritForge")
-            self.assertIsNone(cfg["repos"]["critforge"]["local"])
+            self.assertEqual(cfg["repos"]["myproject"]["github"], "your-org/myproject")
+            self.assertIsNone(cfg["repos"]["myproject"]["local"])
 
     def test_missing_file_self_seeds(self):
         # No install hook exists for plugin installs, so a missing config is
@@ -68,16 +68,16 @@ class ResolveTest(unittest.TestCase):
     def setUp(self):
         self.cfg = {
             "repos": {
-                "critforge": {"github": "stylusnexus/CritForge", "local": "/path/to/critforge"},
+                "myproject": {"github": "your-org/myproject", "local": "/path/to/myproject"},
             },
         }
 
     def test_resolve_github(self):
-        self.assertEqual(resolve_github_for_folder("critforge", self.cfg), "stylusnexus/CritForge")
+        self.assertEqual(resolve_github_for_folder("myproject", self.cfg), "your-org/myproject")
         self.assertIsNone(resolve_github_for_folder("unknown", self.cfg))
 
     def test_resolve_local_path(self):
-        self.assertEqual(resolve_local_path_for_folder("critforge", self.cfg), Path("/path/to/critforge"))
+        self.assertEqual(resolve_local_path_for_folder("myproject", self.cfg), Path("/path/to/myproject"))
         self.assertIsNone(resolve_local_path_for_folder("unknown", self.cfg))
 
 

package/skills/work-plan/tests/test_github_state.py

@@ -53,12 +53,12 @@ class FetchIssuesTest(unittest.TestCase):
             stdout='{"number": 4254, "state": "OPEN", "labels": [{"name": "priority/P0"}], "title": "polls"}',
             returncode=0,
         )
-        result = fetch_issues("stylusnexus/CritForge", [4254])
+        result = fetch_issues("your-org/myproject", [4254])
         self.assertEqual(len(result), 1)
         self.assertEqual(result[0]["number"], 4254)
 
     def test_empty_returns_empty(self):
-        self.assertEqual(fetch_issues("stylusnexus/CritForge", []), [])
+        self.assertEqual(fetch_issues("your-org/myproject", []), [])
 
 
 class FetchRecentIssuesTest(unittest.TestCase):
@@ -68,7 +68,7 @@ class FetchRecentIssuesTest(unittest.TestCase):
             stdout='[{"number": 9999, "title": "new", "labels": [], "createdAt": "2026-04-28T10:00:00Z"}]',
             returncode=0,
         )
-        result = fetch_recent_issues("stylusnexus/CritForge", since_iso="2026-04-27")
+        result = fetch_recent_issues("your-org/myproject", since_iso="2026-04-27")
         self.assertEqual(len(result), 1)
         self.assertEqual(result[0]["number"], 9999)
         called_args = mock_run.call_args[0][0]

package/skills/work-plan/tests/test_init_repo.py

@@ -10,6 +10,7 @@ Covers:
 - No input()/prompt_input reached (patch to raise).
 """
 import io
+import json
 import sys
 import unittest
 from contextlib import redirect_stdout
@@ -80,11 +81,13 @@ class InitRepoNonInteractiveTest(unittest.TestCase):
         yq_args = msub.call_args[0][0]  # positional first arg is the argv list
         self.assertEqual(yq_args[0], "yq")
         self.assertEqual(yq_args[1], "-i")
-        # Expression should contain both github and local
+        # Hardened (#196): the repo block travels as an OPAQUE env value via
+        # env(); only the validated key appears in the expression path.
         expr = yq_args[2]
-        self.assertIn("org/myrepo", expr)
-        self.assertIn("/some/path", expr)
-        self.assertIn("mykey", expr)
+        self.assertEqual(expr, ".repos.mykey = env(WP_REPO_BLOCK)")
+        block = json.loads(msub.call_args.kwargs["env"]["WP_REPO_BLOCK"])
+        self.assertEqual(block["github"], "org/myrepo")
+        self.assertEqual(block["local"], "/some/path")
         self.assertIn("✓", out)
 
     # ------------------------------------------------------------------
@@ -100,9 +103,11 @@ class InitRepoNonInteractiveTest(unittest.TestCase):
         self.assertEqual(rc, 0)
         msub.assert_called_once()
         expr = msub.call_args[0][0][2]
-        self.assertIn("org/myrepo", expr)
-        # local should NOT appear in the yq expression
-        self.assertNotIn("local", expr)
+        self.assertEqual(expr, ".repos.mykey = env(WP_REPO_BLOCK)")
+        block = json.loads(msub.call_args.kwargs["env"]["WP_REPO_BLOCK"])
+        self.assertEqual(block["github"], "org/myrepo")
+        # local should NOT appear in the block
+        self.assertNotIn("local", block)
 
     # ------------------------------------------------------------------
     # Missing --github → rc 2, no yq, no prompt

package/skills/work-plan/tests/test_new_track.py

@@ -43,7 +43,7 @@ def _make_cfg(*, repos=None):
     if repos is None:
         repos = {
             "myrepo": {"github": "org/myrepo", "local": None},
-            "critforge": {"github": "stylusnexus/critforge", "local": None},
+            "myproject": {"github": "your-org/myproject", "local": None},
         }
     return {"notes_root": NOTES_ROOT, "repos": repos}
 
@@ -114,18 +114,18 @@ class NewTrackCommandTest(unittest.TestCase):
         self.assertEqual(meta["status"], "active")
 
     def test_config_key_folder_resolves_correctly(self):
-        """Config-key 'critforge' → folder = 'critforge',
-        github.repo = 'stylusnexus/critforge'."""
-        rc, mw, out = _drive(["critforge", "encounter-builder"], vis="PRIVATE")
+        """Config-key 'myproject' → folder = 'myproject',
+        github.repo = 'your-org/myproject'."""
+        rc, mw, out = _drive(["myproject", "encounter-builder"], vis="PRIVATE")
         self.assertEqual(rc, 0)
         mw.assert_called_once()
         meta = mw.call_args[0][1]
-        self.assertEqual(meta["github"]["repo"], "stylusnexus/critforge")
+        self.assertEqual(meta["github"]["repo"], "your-org/myproject")
         # Track name from slug
         self.assertEqual(meta["track"], "encounter-builder")
-        # Path passed to write_file should be under critforge folder
+        # Path passed to write_file should be under myproject folder
         path_arg = mw.call_args[0][0]
-        self.assertIn("critforge", str(path_arg))
+        self.assertIn("myproject", str(path_arg))
 
     # ------------------------------------------------------------------
     # Bare org/repo slug