@ikon85/agent-workflow-kit 0.17.0 → 0.18.0

package/.claude/hooks/_hook_utils.py

@@ -21,12 +21,15 @@ Migration notes for hook refactors:
 """
 import re
 import subprocess
+import importlib.util
+import sys
 from datetime import datetime
 from pathlib import Path
 
 # Resolved relative to CWD at call time. Hooks are invoked from repo root
 # (or from a linked worktree root), so this resolves to <root>/.claude/logs.
 LOG_DIR = Path(".claude/logs")
+_WORKTREE_CORE_MODULE = "_agent_workflow_kit_worktree_lifecycle"
 
 
 def rotate_log_if_needed(log_path: Path, max_bytes: int = 100_000, generations: int = 3) -> None:
@@ -182,3 +185,28 @@ def normalize_to_repo_relative(file_path: str, root: str) -> str | None:
         return str(rel)
     except ValueError:
         return None
+
+
+def load_worktree_lifecycle_core():
+    """Load the shipped Worktree Lifecycle core without requiring a Python package."""
+    existing = sys.modules.get(_WORKTREE_CORE_MODULE)
+    if existing is not None:
+        return existing
+    path = Path(__file__).resolve().parents[2] / "scripts" / "worktree-lifecycle" / "core.py"
+    spec = importlib.util.spec_from_file_location(_WORKTREE_CORE_MODULE, path)
+    if spec is None or spec.loader is None:
+        raise ImportError(f"cannot load Worktree Lifecycle core from {path}")
+    module = importlib.util.module_from_spec(spec)
+    sys.modules[_WORKTREE_CORE_MODULE] = module
+    spec.loader.exec_module(module)
+    return module
+
+
+def hook_event_output(event_name: str, context: str) -> dict:
+    """Canonical non-blocking context payload for Claude hook events."""
+    return {
+        "hookSpecificOutput": {
+            "hookEventName": event_name,
+            "additionalContext": context,
+        }
+    }

package/README.md

@@ -332,6 +332,13 @@ still reference. Flags: `--force` (overwrite pre-existing files on `init`),
 
 ## Release notes
 
+### 0.18.0
+
+- added: `scripts/worktree-lifecycle/capabilities.json`
+- added: `scripts/worktree-lifecycle/core.py`
+- added: `scripts/worktree-lifecycle/setup.py`
+- changed: `.claude/hooks/_hook_utils.py`
+
 ### 0.17.0
 
 - added: `src/lib/release-preview.mjs`

package/agent-workflow-kit.package.json

@@ -1,5 +1,5 @@
 {
-  "kitVersion": "0.17.0",
+  "kitVersion": "0.18.0",
   "files": [
     {
       "path": ".agents/skills/ask-matt/SKILL.md",
@@ -850,7 +850,7 @@
     {
       "path": ".claude/hooks/_hook_utils.py",
       "kind": "hook",
-      "sha256": "d16ca26f3057a500cc67242fd67125d1715e7e7fd2984398545f6374fef497bb",
+      "sha256": "4a4b57633578ee8eabdf8ae70437e590e1747d1df5d76c730e2164e23cdfc2ed",
       "mode": 420,
       "origin": "kit"
     },
@@ -2063,6 +2063,27 @@
       "mode": 420,
       "origin": "kit"
     },
+    {
+      "path": "scripts/worktree-lifecycle/capabilities.json",
+      "kind": "doc",
+      "sha256": "3e51acaf2a8ac3ace0a400e23a30732ff0c3e9b4864f763c7abf82019605f309",
+      "mode": 420,
+      "origin": "kit"
+    },
+    {
+      "path": "scripts/worktree-lifecycle/core.py",
+      "kind": "script",
+      "sha256": "eae5c6076611a36a8fa90e3aef3d1c49345110a392a7d7e9d95be8de00f8d9ff",
+      "mode": 420,
+      "origin": "kit"
+    },
+    {
+      "path": "scripts/worktree-lifecycle/setup.py",
+      "kind": "script",
+      "sha256": "c720cbff9123f136a53658671d880b9a73f9da4faa0611e37a2a981fa89cda92",
+      "mode": 493,
+      "origin": "kit"
+    },
     {
       "path": "scripts/wrapup-land.py",
       "kind": "script",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikon85/agent-workflow-kit",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Portable AI-agent workflow skills (plan → execute → land → learn) for Claude Code & Codex — grilling, TDD, diagnosis, two-axis code review, cross-model Codex review, design & domain-modeling, plus a skill router (ask-matt). npx init/update/diff/uninstall.",
   "type": "module",
   "bin": {

package/scripts/worktree-lifecycle/capabilities.json

@@ -0,0 +1,37 @@
+{
+  "version": 1,
+  "capabilities": [
+    {
+      "historicalPath": "scripts/setup-worktree.sh",
+      "primitives": ["profile", "git-facts", "transactional-setup"]
+    },
+    {
+      "historicalPath": ".claude/hooks/branch-context.py",
+      "primitives": ["profile", "git-facts", "hook-event-output"]
+    },
+    {
+      "historicalPath": ".claude/hooks/branch-watch.py",
+      "primitives": ["profile", "git-facts", "hook-event-output"]
+    },
+    {
+      "historicalPath": ".claude/hooks/enforce-worktree.py",
+      "primitives": ["profile", "git-facts", "worktree-decision"]
+    },
+    {
+      "historicalPath": ".claude/hooks/enforce-worktree-cwd.py",
+      "primitives": ["profile", "git-facts", "worktree-decision"]
+    },
+    {
+      "historicalPath": ".claude/hooks/enforce-worktree-discipline.py",
+      "primitives": ["profile", "git-facts", "worktree-decision"]
+    },
+    {
+      "historicalPath": ".claude/hooks/slice-handoff-hint.py",
+      "primitives": ["profile", "git-facts", "hook-event-output"]
+    },
+    {
+      "historicalPath": "scripts/cleanup-worktrees.sh",
+      "primitives": ["profile", "git-facts", "cleanup-safety"]
+    }
+  ]
+}

package/scripts/worktree-lifecycle/core.py

@@ -0,0 +1,106 @@
+"""Consumer-neutral worktree lifecycle profile and git facts."""
+
+from __future__ import annotations
+
+import json
+import re
+import subprocess
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any
+
+
+class LifecycleError(RuntimeError):
+    """A safe, user-visible lifecycle refusal."""
+
+
+@dataclass(frozen=True)
+class WorktreeProfile:
+    root: str
+    branch_template: str
+    path_template: str
+    main_branches: tuple[str, ...]
+    protected_branches: tuple[str, ...]
+    setup_steps: tuple[dict[str, Any], ...]
+    branch_regex: str
+
+    def branch_name(self, issue: str, slug: str, branch_type: str) -> str:
+        return _render(self.branch_template, issue, slug, branch_type)
+
+    def relative_path(self, issue: str, slug: str, branch_type: str) -> Path:
+        name = _render(self.path_template, issue, slug, branch_type)
+        return Path(self.root) / name
+
+    def issue_from_branch(self, branch: str) -> str | None:
+        match = re.match(self.branch_regex, branch)
+        return match.groupdict().get("issue") if match else None
+
+
+def _render(template: str, issue: str, slug: str, branch_type: str) -> str:
+    values = {"issue": issue, "slug": slug, "type": branch_type}
+    try:
+        return template.format(**values)
+    except (KeyError, ValueError) as error:
+        raise LifecycleError(f"invalid worktree template: {error}") from error
+
+
+def load_profile(path: Path) -> WorktreeProfile:
+    try:
+        document = json.loads(path.read_text(encoding="utf-8"))
+        raw = document["worktreeLifecycle"]
+    except (OSError, json.JSONDecodeError, KeyError, TypeError) as error:
+        raise LifecycleError(f"cannot load worktree lifecycle profile: {error}") from error
+    if raw.get("enabled") is not True:
+        raise LifecycleError("worktree lifecycle is not enabled")
+    main = tuple(raw.get("mainBranches") or ("main", "master"))
+    return WorktreeProfile(
+        root=raw.get("worktreeRoot", ".worktrees"),
+        branch_template=raw.get("branchTemplate", "{type}/{issue}-{slug}"),
+        path_template=raw.get("pathTemplate", "{type}-{issue}-{slug}"),
+        main_branches=main,
+        protected_branches=tuple(raw.get("protectedBranches") or main),
+        setup_steps=tuple(raw.get("setupSteps") or ()),
+        branch_regex=raw.get(
+            "branchRegex",
+            r"^(?:feat|fix|chore|docs)/(?P<issue>\d+)-",
+        ),
+    )
+
+
+def run(
+    command: list[str],
+    *,
+    cwd: Path,
+    check: bool = True,
+) -> subprocess.CompletedProcess[str]:
+    result = subprocess.run(command, cwd=cwd, capture_output=True, text=True)
+    if check and result.returncode != 0:
+        detail = (result.stderr or result.stdout).strip()
+        raise LifecycleError(f"{' '.join(command)} failed: {detail}")
+    return result
+
+
+def main_worktree(cwd: Path) -> Path:
+    output = run(["git", "worktree", "list", "--porcelain"], cwd=cwd).stdout
+    first = next((line for line in output.splitlines() if line.startswith("worktree ")), "")
+    if not first:
+        raise LifecycleError("not inside a git worktree")
+    return Path(first.split(" ", 1)[1]).resolve()
+
+
+def registered_worktrees(cwd: Path) -> set[Path]:
+    output = run(["git", "worktree", "list", "--porcelain"], cwd=cwd).stdout
+    return {
+        Path(line.split(" ", 1)[1]).resolve()
+        for line in output.splitlines()
+        if line.startswith("worktree ")
+    }
+
+
+def local_branch_exists(cwd: Path, branch: str) -> bool:
+    result = run(
+        ["git", "show-ref", "--verify", "--quiet", f"refs/heads/{branch}"],
+        cwd=cwd,
+        check=False,
+    )
+    return result.returncode == 0

package/scripts/worktree-lifecycle/setup.py

@@ -0,0 +1,137 @@
+#!/usr/bin/env python3
+"""Create a configured, rollback-safe consumer worktree."""
+
+from __future__ import annotations
+
+import argparse
+import shutil
+import sys
+import zlib
+from pathlib import Path
+
+from core import (
+    LifecycleError,
+    load_profile,
+    local_branch_exists,
+    main_worktree,
+    registered_worktrees,
+    run,
+)
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--profile", default="docs/agents/workflow-capabilities.json")
+    parser.add_argument("--base", default="origin/main")
+    parser.add_argument("issue")
+    parser.add_argument("slug")
+    parser.add_argument("branch_type", nargs="?", default="feat")
+    return parser.parse_args()
+
+
+def port_slot(step: dict, issue: str, branch: str) -> int:
+    modulo = int(step.get("slotModulo", 900))
+    offset = int(step.get("slotOffset", 1))
+    seed = int(issue) if issue.isdigit() else zlib.crc32(branch.encode("utf-8"))
+    return seed % modulo + offset
+
+
+def write_ports(step: dict, *, worktree: Path, issue: str, branch: str) -> None:
+    slot = port_slot(step, issue, branch)
+    stride = int(step.get("stride", 10))
+    outputs = step.get("outputs") or {}
+    if not outputs:
+        raise LifecycleError("ports step requires outputs")
+    unsafe = {int(port) for port in step.get("unsafePorts", ())}
+    modulo = int(step.get("slotModulo", 900))
+    for _ in range(modulo):
+        ports = [int(base) + slot * stride for base in outputs.values()]
+        if not unsafe.intersection(ports):
+            break
+        slot = slot % modulo + 1
+    else:
+        raise LifecycleError("port profile has no safe allocation")
+    lines = [f"{name}={int(base) + slot * stride}" for name, base in outputs.items()]
+    (worktree / ".dev-ports").write_text("\n".join(lines) + "\n", encoding="utf-8")
+
+
+def execute_step(
+    step: dict,
+    *,
+    main: Path,
+    worktree: Path,
+    issue: str,
+    branch: str,
+) -> None:
+    kind = step.get("kind")
+    if kind == "copy":
+        source = main / step["source"]
+        target = worktree / step.get("target", step["source"])
+        if not source.exists() and step.get("optional"):
+            return
+        target.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy2(source, target)
+        return
+    if kind == "command":
+        command = step.get("command")
+        if not isinstance(command, list) or not all(isinstance(part, str) for part in command):
+            raise LifecycleError("setup command must be a JSON string array")
+        run(command, cwd=worktree)
+        return
+    if kind == "ports":
+        write_ports(step, worktree=worktree, issue=issue, branch=branch)
+        return
+    raise LifecycleError(f"unsupported setup step kind: {kind!r}")
+
+
+def remove_failed_worktree(main: Path, target: Path, branch: str, created_branch: bool) -> None:
+    run(["git", "worktree", "remove", "--force", str(target)], cwd=main, check=False)
+    if created_branch:
+        run(["git", "branch", "-d", branch], cwd=main, check=False)
+
+
+def create(args: argparse.Namespace) -> Path:
+    cwd = Path.cwd()
+    main = main_worktree(cwd)
+    profile_path = Path(args.profile)
+    if not profile_path.is_absolute():
+        profile_path = main / profile_path
+    profile = load_profile(profile_path)
+    branch = profile.branch_name(args.issue, args.slug, args.branch_type)
+    target = (main / profile.relative_path(args.issue, args.slug, args.branch_type)).resolve()
+
+    if target in registered_worktrees(main):
+        print(f"Worktree already exists: {target} ({branch})")
+        return target
+
+    branch_existed = local_branch_exists(main, branch)
+    command = ["git", "worktree", "add", str(target)]
+    command += [branch] if branch_existed else ["-b", branch, args.base]
+    run(command, cwd=main)
+    try:
+        for step in profile.setup_steps:
+            execute_step(
+                step,
+                main=main,
+                worktree=target,
+                issue=args.issue,
+                branch=branch,
+            )
+    except Exception:
+        remove_failed_worktree(main, target, branch, not branch_existed)
+        raise
+    print(f"Worktree ready: {target} ({branch})")
+    return target
+
+
+def main() -> int:
+    try:
+        create(parse_args())
+        return 0
+    except LifecycleError as error:
+        print(f"STOP: {error}", file=sys.stderr)
+        return 1
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

package/src/lib/bundle.mjs

@@ -62,6 +62,12 @@ export const HELPER_FILES = [
   { path: 'scripts/census/delta.mjs', kind: 'script', mode: 0o644 },
   { path: 'scripts/census/state.mjs', kind: 'script', mode: 0o644 },
   { path: 'scripts/census/transaction.mjs', kind: 'script', mode: 0o644 },
+  // Profile-driven Worktree Lifecycle foundation. The setup adapter imports
+  // core.py, while capabilities.json keeps the historical 8/8 denominator
+  // explicit until the remaining hook and cleanup adapters are activated.
+  { path: 'scripts/worktree-lifecycle/core.py', kind: 'script', mode: 0o644 },
+  { path: 'scripts/worktree-lifecycle/setup.py', kind: 'script', mode: 0o755 },
+  { path: 'scripts/worktree-lifecycle/capabilities.json', kind: 'doc', mode: 0o644 },
   // Shared hook utility imported by the shipped hooks (drift-guard,
   // sync-board-status). Library (imported, not run) → 0o644. MUST ship or those
   // hooks ImportError on arrival.