flower-trellis 0.5.2-beta.0 → 0.5.2

package/enhancements/0.6/overrides/patches/scripts/session-context-update-boundary/helpers-selector.py

@@ -0,0 +1,150 @@
+def _read_project_version(repo_root: Path) -> str | None:
+    try:
+        version = (repo_root / DIR_WORKFLOW / ".version").read_text(
+            encoding="utf-8"
+        ).strip()
+    except OSError:
+        return None
+    return version or None
+
+
+def _fetch_trellis_version_output() -> str | None:
+    try:
+        result = subprocess.run(
+            ["trellis", "--version"],
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+            errors="replace",
+            timeout=_UPDATE_CHECK_TIMEOUT_SECONDS,
+        )
+    except (OSError, subprocess.SubprocessError, TimeoutError):
+        return None
+
+    if result.returncode != 0:
+        return None
+    output = f"{result.stdout}\n{result.stderr}".strip()
+    return output or None
+
+
+def _extract_available_update_version(output: str) -> str | None:
+    update_match = re.search(
+        r"Trellis update available:\s*"
+        r"(?P<current>\S+)\s*(?:→|->)\s*(?P<latest>\S+)",
+        output,
+    )
+    if update_match:
+        return update_match.group("latest").strip()
+    candidates = _VERSION_TOKEN_RE.findall(output)
+    return candidates[-1] if candidates else None
+
+
+def _resolve_available_update_version() -> str | None:
+    output = _fetch_trellis_version_output()
+    if not output:
+        return None
+    return _extract_available_update_version(output)
+
+
+def _parse_version(version: str) -> tuple[tuple[int, int, int], tuple[str, ...] | None] | None:
+    match = _VERSION_RE.match(version)
+    if not match:
+        return None
+    major, minor, patch, prerelease = match.groups()
+    numbers = (int(major), int(minor or "0"), int(patch or "0"))
+    prerelease_parts = tuple(prerelease.split(".")) if prerelease else None
+    return numbers, prerelease_parts
+
+
+def _compare_prerelease(
+    left: tuple[str, ...] | None,
+    right: tuple[str, ...] | None,
+) -> int:
+    if left is None and right is None:
+        return 0
+    if left is None:
+        return 1
+    if right is None:
+        return -1
+
+    for left_part, right_part in zip(left, right):
+        if left_part == right_part:
+            continue
+        left_numeric = left_part.isdigit()
+        right_numeric = right_part.isdigit()
+        if left_numeric and right_numeric:
+            left_int = int(left_part)
+            right_int = int(right_part)
+            return (left_int > right_int) - (left_int < right_int)
+        if left_numeric:
+            return -1
+        if right_numeric:
+            return 1
+        return (left_part > right_part) - (left_part < right_part)
+
+    return (len(left) > len(right)) - (len(left) < len(right))
+
+
+def _compare_versions(left: str, right: str) -> int | None:
+    parsed_left = _parse_version(left)
+    parsed_right = _parse_version(right)
+    if parsed_left is None or parsed_right is None:
+        return None
+
+    left_numbers, left_prerelease = parsed_left
+    right_numbers, right_prerelease = parsed_right
+    if left_numbers != right_numbers:
+        return (left_numbers > right_numbers) - (left_numbers < right_numbers)
+    return _compare_prerelease(left_prerelease, right_prerelease)
+
+
+def _update_marker_path(repo_root: Path) -> Path:
+    context_key = resolve_context_key()
+    if not context_key:
+        terminal_key = os.environ.get("TERM_SESSION_ID", "").strip()
+        context_key = terminal_key or f"ppid-{os.getppid()}"
+    safe_key = re.sub(r"[^A-Za-z0-9._-]+", "_", context_key).strip("._-")
+    if not safe_key:
+        safe_key = "session"
+    return (
+        repo_root
+        / DIR_WORKFLOW
+        / ".runtime"
+        / f"update-check-{safe_key[:160]}.marker"
+    )
+
+
+def _mark_update_check_attempted(repo_root: Path) -> bool:
+    marker_path = _update_marker_path(repo_root)
+    if marker_path.exists():
+        return False
+    try:
+        marker_path.parent.mkdir(parents=True, exist_ok=True)
+        marker_path.write_text("checked\n", encoding="utf-8")
+    except OSError:
+        pass
+    return True
+
+
+def _get_update_hint(repo_root: Path) -> str | None:
+    marker_path = _update_marker_path(repo_root)
+    if marker_path.exists():
+        return None
+
+    current_version = _read_project_version(repo_root)
+    if not current_version:
+        return None
+
+    latest_version = _resolve_available_update_version()
+    if not latest_version:
+        return None
+
+    _mark_update_check_attempted(repo_root)
+    comparison = _compare_versions(current_version, latest_version)
+    if comparison is None or comparison >= 0:
+        return None
+
+    return (
+        f"Trellis update available: {current_version} -> {latest_version}, "
+        "run trellis upgrade"
+    )

package/enhancements/0.6/overrides/patches/scripts/session-context-update-boundary/imports-content.py

@@ -0,0 +1,4 @@
+import json
+from pathlib import Path
+
+from .config import get_git_packages

package/enhancements/0.6/overrides/patches/scripts/session-context-update-boundary/imports-selector.py

@@ -0,0 +1,8 @@
+import json
+import os
+import re
+import subprocess
+from pathlib import Path
+
+from .active_task import resolve_context_key
+from .config import get_git_packages

package/enhancements/0.6/overrides/patches/scripts/session-context-update-boundary/output-content.py

@@ -0,0 +1,7 @@
+def output_text(repo_root: Path | None = None) -> None:
+    """Output context in text format.
+
+    Args:
+        repo_root: Repository root path. Defaults to auto-detected.
+    """
+    print(get_context_text(repo_root))

package/enhancements/0.6/overrides/patches/scripts/session-context-update-boundary/output-selector.py

@@ -0,0 +1,13 @@
+def output_text(repo_root: Path | None = None) -> None:
+    """Output context in text format.
+
+    Args:
+        repo_root: Repository root path. Defaults to auto-detected.
+    """
+    if repo_root is None:
+        repo_root = get_repo_root()
+    update_hint = _get_update_hint(repo_root)
+    if update_hint:
+        print(update_hint)
+        print("")
+    print(get_context_text(repo_root))

package/enhancements/0.6/overrides/patches/scripts/session-context-update-boundary/patch.json

@@ -0,0 +1,53 @@
+{
+  "schemaVersion": 2,
+  "id": "session-context-update-boundary",
+  "purpose": "control_plane_integrity",
+  "operations": [
+    {
+      "id": "session-context-update-imports",
+      "operation": "replace",
+      "targets": [{
+        "kind": "file",
+        "path": ".trellis/scripts/common/session_context.py",
+        "missing": "error",
+        "markerStyle": "hash"
+      }],
+      "selector": { "type": "literal", "source": "imports-selector.py" },
+      "content": { "source": "imports-content.py" }
+    },
+    {
+      "id": "session-context-update-constants",
+      "operation": "remove",
+      "targets": [{
+        "kind": "file",
+        "path": ".trellis/scripts/common/session_context.py",
+        "missing": "error",
+        "markerStyle": "hash"
+      }],
+      "selector": { "type": "literal", "source": "constants-selector.py" }
+    },
+    {
+      "id": "session-context-update-helpers",
+      "operation": "remove",
+      "targets": [{
+        "kind": "file",
+        "path": ".trellis/scripts/common/session_context.py",
+        "missing": "error",
+        "markerStyle": "hash"
+      }],
+      "selector": { "type": "literal", "source": "helpers-selector.py" }
+    },
+    {
+      "id": "session-context-update-output",
+      "operation": "replace",
+      "targets": [{
+        "kind": "file",
+        "path": ".trellis/scripts/common/session_context.py",
+        "missing": "error",
+        "markerStyle": "hash"
+      }],
+      "selector": { "type": "literal", "source": "output-selector.py" },
+      "content": { "source": "output-content.py" }
+    }
+  ]
+}

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/bundled-overrides-baseline.md

@@ -0,0 +1,16 @@
+## Overriding a Bundled Skill Locally
+
+There is no formal "project-local skill" mechanism (e.g. `.trellis/skills/`). Bundled skills are platform-rooted, so any override is platform-rooted too.
+
+The supported pattern relies on the existing template-hash diff in `trellis update`:
+
+1. Edit the local file directly. Example: `.claude/skills/trellis-meta/SKILL.md`.
+2. The file's hash now diverges from the entry in `.trellis/.template-hashes.json`.
+3. The next `trellis update` detects the user modification and leaves the file untouched (Trellis never overwrites user-modified files without an explicit `--force`).
+
+Caveats:
+
+- The override only applies to the one platform whose directory you edited. To override the same skill across, for example, Claude Code and Codex, you must edit both `.claude/skills/<name>/` and `.agents/skills/<name>/`.
+- A future `trellis update --force` will overwrite local edits. Keep the override under version control so it can be reapplied if needed.
+- Marketplace skills installed under the same platform skill root with a different folder name (e.g. `.claude/skills/my-custom-meta/`) are untouched by Trellis and are the cleaner option when the goal is to add behavior, not to mutate the bundled skill.
+- Team-private conventions belong in `.trellis/spec/` or in a separate marketplace-style local skill, not in modifications to `trellis-meta` itself. See `customize-local/add-project-local-conventions.md`.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/bundled-overrides-content.md

@@ -0,0 +1,10 @@
+## Overriding a Bundled Skill Locally
+
+First determine whether the deployed bundled skill is only Trellis-managed or also owned by Flower/Skill-Garden.
+
+- In a native Trellis project, template-hash conflict handling still permits a local divergence, with the normal cross-platform and future-update caveats.
+- In a Flower-managed project, do not directly edit a target recorded in `.flower/state.json`. Change the owning Plugin/Patch source and let preflight plus the transaction writer update every existing platform target consistently.
+- In the Flower source checkout, Skill-Garden 0.6 modifications belong under `vendor/skill-garden/.trellis/0.6/overrides/`; run `npm run sync`, refresh/check compiled targets, then apply the Plugin to dogfood targets.
+- For project-private behavior, prefer `.trellis/spec/` or a differently named project-local skill that has no upstream or Plugin ownership claim.
+
+If Skill-Garden is removed and its state ownership is cleanly released, the remaining bundled skill returns to native Trellis update semantics. Do not leave managed prose behind after uninstall or freeze assumptions into this reference.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/customization-principles-baseline.md

@@ -0,0 +1,7 @@
+## AI Customization Principles
+
+1. **Find the local source of truth first**: Do not edit from memory. Read `.trellis/workflow.md`, `.trellis/config.yaml`, the relevant platform directory, and related task files first.
+2. **Edit the user project, not the npm package cache**: Modify generated files inside the project, not `node_modules` or the global npm install directory.
+3. **Keep platform files aligned with `.trellis/`**: If workflow routing changes, also check whether platform skills or commands still describe the same flow.
+4. **Put project-specific rules in `.trellis/spec/` or a local skill**: Do not put team conventions into `trellis-meta`.
+5. **Preserve user changes**: If a file was already modified locally, work from the current content instead of overwriting it with a default template.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/customization-principles-content.md

@@ -0,0 +1,9 @@
+## AI Customization Principles
+
+1. **Inspect behavior and ownership separately**: Read the current `.trellis/` and platform files for runtime truth, then inspect `.flower/` state, template hashes, and managed markers to locate the durable authoring source.
+2. **Choose the owner before the edit**: Project-local content may be edited locally. Trellis templates follow native update rules. Flower/Skill-Garden targets follow Plugin state and Patch ownership.
+3. **Use the 0.6 Patch Engine for managed Trellis files**: Declare exact targets, selector/baseline/content, target policy, and Bundle selection. Do not add a special injector or modify only a deployed copy.
+4. **Keep the lifecycle ordered**: Change `vendor/skill-garden/.trellis/0.6/`, run `npm run sync` to refresh `enhancements/0.6/`, regenerate/check compiled targets, then update dogfood through the Flower Plugin lifecycle.
+5. **Keep shared semantics aligned**: Workflow owner changes may require matching skill, hook, helper, or platform entry updates, but each full procedure stays with its owning capability.
+6. **Keep project-specific rules project-local**: Use `.trellis/spec/` or a separately owned local skill; do not turn public `trellis-meta` into a project notebook.
+7. **Preserve evidence and user content**: Respect Plugin ownership, first-backup/provenance records, template conflicts, and current user modifications. Never use `node_modules` as an authoring target.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/file-boundaries-baseline.md

@@ -0,0 +1,19 @@
+## Local Customization Boundaries
+
+Editable by default:
+
+- `.trellis/workflow.md`
+- `.trellis/config.yaml`
+- `.trellis/spec/**`
+- `.trellis/scripts/**`
+- Platform hooks, settings, agents, skills, commands, prompts, and workflows
+
+Do not edit by default:
+
+- Global npm install directory
+- `node_modules/@mindfoldhq/trellis`
+- Trellis GitHub repository source code
+- Concrete state files under `.trellis/.runtime/**`
+- Hash contents inside `.trellis/.template-hashes.json`
+
+Switch to the Trellis CLI source-code perspective only when the user explicitly wants to contribute upstream.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/file-boundaries-content.md

@@ -0,0 +1,13 @@
+## Local Customization Boundaries
+
+Classify before editing:
+
+| Ownership | Durable edit point |
+| --- | --- |
+| Project-local | The current project file, after reading its call chain and related workflow semantics. |
+| Upstream Trellis template | A local customization or upstream Trellis source, depending on the user's stated goal and template-hash behavior. |
+| Skill-Garden managed | `vendor/skill-garden/.trellis/0.6/` in the Flower source checkout, expressed through Patch/Bundle declarations for existing Trellis targets. |
+| Flower managed | The owning Flower source, Plugin manifest/adapter, or Patch catalog; never only the deployed result. |
+| Shared common | The shared source plus Plugin state ownership rules; preserve content shared by more than one capability. |
+
+Never hand-edit concrete runtime state, `.flower/` lock/state files, template hash contents, global npm caches, or `node_modules` as an implementation shortcut. If the Flower source checkout is not present, use the installed Plugin lifecycle or create separately owned project-local content rather than pretending the managed source exists locally.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/patch.json

@@ -0,0 +1,157 @@
+{
+  "schemaVersion": 2,
+  "id": "trellis-meta-managed-architecture-and-ownership",
+  "purpose": "managed_architecture_ownership",
+  "operations": [
+    {
+      "id": "trellis-meta-managed-system-model",
+      "operation": "replace",
+      "targetPolicy": "each-existing",
+      "targets": [
+        { "kind": "skill", "path": ".agent/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".agents/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".claude/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".codebuddy/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".cursor/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".devin/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".factory/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".github/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".kilocode/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".kiro/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".opencode/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".pi/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".qoder/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".reasonix/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".trae/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" }
+      ],
+      "selector": { "type": "markdown-section", "heading": "## Local System Model" },
+      "baselines": ["system-model-baseline.md"],
+      "content": { "source": "system-model-content.md" }
+    },
+    {
+      "id": "trellis-meta-managed-customization-principles",
+      "operation": "replace",
+      "targetPolicy": "each-existing",
+      "targets": [
+        { "kind": "skill", "path": ".agent/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".agents/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".claude/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".codebuddy/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".cursor/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".devin/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".factory/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".github/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".kilocode/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".kiro/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".opencode/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".pi/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".qoder/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".reasonix/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" },
+        { "kind": "skill", "path": ".trae/skills/trellis-meta/references/local-architecture/overview.md", "missing": "skip" }
+      ],
+      "selector": { "type": "markdown-section", "heading": "## AI Customization Principles" },
+      "baselines": ["customization-principles-baseline.md"],
+      "content": { "source": "customization-principles-content.md" }
+    },
+    {
+      "id": "trellis-meta-managed-template-hashes",
+      "operation": "replace",
+      "targetPolicy": "each-existing",
+      "targets": [
+        { "kind": "skill", "path": ".agent/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".agents/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".claude/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".codebuddy/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".cursor/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".devin/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".factory/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".github/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".kilocode/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".kiro/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".opencode/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".pi/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".qoder/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".reasonix/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".trae/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" }
+      ],
+      "selector": { "type": "markdown-section", "heading": "## Meaning Of Template Hashes" },
+      "baselines": ["template-hashes-baseline.md"],
+      "content": { "source": "template-hashes-content.md" }
+    },
+    {
+      "id": "trellis-meta-managed-file-boundaries",
+      "operation": "replace",
+      "targetPolicy": "each-existing",
+      "targets": [
+        { "kind": "skill", "path": ".agent/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".agents/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".claude/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".codebuddy/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".cursor/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".devin/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".factory/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".github/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".kilocode/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".kiro/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".opencode/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".pi/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".qoder/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".reasonix/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" },
+        { "kind": "skill", "path": ".trae/skills/trellis-meta/references/local-architecture/generated-files.md", "missing": "skip" }
+      ],
+      "selector": { "type": "markdown-section", "heading": "## Local Customization Boundaries" },
+      "baselines": ["file-boundaries-baseline.md"],
+      "content": { "source": "file-boundaries-content.md" }
+    },
+    {
+      "id": "trellis-meta-managed-skill-taxonomy",
+      "operation": "replace",
+      "targetPolicy": "each-existing",
+      "targets": [
+        { "kind": "skill", "path": ".agent/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".agents/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".claude/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".codebuddy/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".cursor/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".devin/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".factory/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".github/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".kilocode/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".kiro/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".opencode/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".pi/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".qoder/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".reasonix/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".trae/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" }
+      ],
+      "selector": { "type": "markdown-section", "heading": "## What Counts As Bundled (vs. Adjacent Concepts)" },
+      "baselines": ["skill-taxonomy-baseline.md"],
+      "content": { "source": "skill-taxonomy-content.md" }
+    },
+    {
+      "id": "trellis-meta-managed-bundled-overrides",
+      "operation": "replace",
+      "targetPolicy": "each-existing",
+      "targets": [
+        { "kind": "skill", "path": ".agent/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".agents/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".claude/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".codebuddy/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".cursor/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".devin/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".factory/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".github/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".kilocode/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".kiro/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".opencode/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".pi/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".qoder/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".reasonix/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" },
+        { "kind": "skill", "path": ".trae/skills/trellis-meta/references/local-architecture/bundled-skills.md", "missing": "skip" }
+      ],
+      "selector": { "type": "markdown-section", "heading": "## Overriding a Bundled Skill Locally" },
+      "baselines": ["bundled-overrides-baseline.md"],
+      "content": { "source": "bundled-overrides-content.md" }
+    }
+  ]
+}

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/skill-taxonomy-baseline.md

@@ -0,0 +1,11 @@
+## What Counts As Bundled (vs. Adjacent Concepts)
+
+| Source path | Type | How it ships |
+| --- | --- | --- |
+| `templates/common/bundled-skills/<name>/` | Bundled skill (multi-file) | Whole directory copied to every platform skill root |
+| `templates/common/skills/<name>.md` | Single-file workflow skill | Wrapped with frontmatter, written as `<root>/<name>/SKILL.md` |
+| `templates/common/commands/<name>.md` | Slash command / prompt | Written to each platform's command directory (`.claude/commands/trellis/`, `.cursor/commands/trellis-*.md`, `.gemini/commands/trellis/*.toml`, etc.) |
+| `templates/<platform>/skills/` | Platform-specific skill | Written only into that platform's directory (e.g. `.codex/skills/`) |
+| User skills under `.claude/skills/<my-skill>/` etc. | Marketplace or user-authored | Not managed by Trellis at all |
+
+The Trellis CLI never touches anything that is not produced by one of its own template loaders. Anything a user drops into a platform skill root by hand is left alone.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/skill-taxonomy-content.md

@@ -0,0 +1,15 @@
+## What Counts As Bundled (vs. Adjacent Concepts)
+
+Directory shape alone does not determine ownership:
+
+| Ownership class | Evidence | Durable source |
+| --- | --- | --- |
+| Upstream bundled | Trellis template hashes and bundled-skill distribution | Trellis bundled template source or an explicitly local supplement |
+| Skill-Garden managed | `flower/skill-garden` lock/state entries or `skill-garden patch` markers | `vendor/skill-garden/.trellis/0.6/` in the Flower source checkout |
+| Flower managed | Flower Plugin state paths/patches and owner IDs | The owning Flower Plugin source, adapter, or `src/patches/` catalog |
+| Shared common | Plugin state entry with shared ownership | The common source retained across dependent capabilities |
+| Project-local | No upstream template or Plugin ownership claim, plus project intent | The project file itself |
+
+For managed 0.6 changes, Patch leaves own `insert`/`replace`/`remove` transformations; selectors and full baselines fail closed on upstream drift; content files own replacement bytes; explicit targets and `each-existing` prevent accidental platform creation; Bundles own full/selected aliases; required preflight prevents partial writes; markers and first backups support migration/recovery; provenance records the selected operations; compatibility and conflict policies audit the final result; canonical compiled targets prove the pinned upstream output. These responsibilities must stay in the shared Patch Engine instead of being reimplemented by a skill-specific injector.
+
+Discover what is active from the local skill roots, `.trellis/workflow.md`, available `overrides/bundles/`, and `.flower/state.json`. Do not infer ownership from a skill name or maintain a fixed Skill-Garden capability list in this document.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/system-model-baseline.md

@@ -0,0 +1,9 @@
+## Local System Model
+
+Trellis provides three layers inside a user project:
+
+1. **Workflow layer**: `.trellis/workflow.md` defines phases, routing, next actions, and prompt blocks.
+2. **Persistence layer**: `.trellis/tasks/`, `.trellis/spec/`, and `.trellis/workspace/` store tasks, specs, and session memory.
+3. **Platform integration layer**: hooks, settings, agents, skills, commands, prompts, and workflows in platform directories connect the Trellis workflow to different AI tools.
+
+All three layers live inside the user project, so an AI can read and modify them directly.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/system-model-content.md

@@ -0,0 +1,13 @@
+## Local System Model
+
+Native Trellis provides three project-local layers:
+
+1. **Workflow layer**: `.trellis/workflow.md` defines current phases, routing, next actions, and prompt blocks.
+2. **Persistence layer**: `.trellis/tasks/`, `.trellis/spec/`, and `.trellis/workspace/` store tasks, specs, and deliberate session records.
+3. **Platform integration layer**: hooks, settings, agents, skills, commands, prompts, workflows, channel runtime files, and memory entry points connect Trellis to AI tools.
+
+Flower adds a conditional management layer when a Plugin is declared and locked:
+
+4. **Plugin management layer**: `.flower/plugins.json` records intent, `.flower/plugin-lock.json` records the resolved immutable graph and granted capabilities, and `.flower/state.json` records owned paths, Patch provenance, and resulting hashes. Planning, preflight, transaction, lock, state, rollback, and uninstall are one lifecycle rather than unrelated local edits.
+
+Without matching Plugin state or managed markers, use the native three-layer model. With `flower/skill-garden` ownership, read deployed files to understand current behavior but make durable 0.6 changes through the owning Skill-Garden source and Patch catalog.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/template-hashes-baseline.md

@@ -0,0 +1,11 @@
+## Meaning Of Template Hashes
+
+`.trellis/.template-hashes.json` records the content hash from the last time Trellis wrote a template file. `trellis update` uses it to distinguish three cases:
+
+| Case | Update behavior |
+| --- | --- |
+| File was not modified by the user | It can be updated automatically. |
+| File was modified by the user | Prompt the user to overwrite, keep, or generate `.new`. |
+| File is no longer a current template | It may be deleted, renamed, or preserved according to migration rules. |
+
+When an AI customizes local Trellis files, it does not need to maintain hashes manually. It is normal for Trellis update to recognize the result as "modified by the user."

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-architecture-and-ownership/template-hashes-content.md

@@ -0,0 +1,11 @@
+## Meaning Of Template Hashes
+
+`.trellis/.template-hashes.json` records native Trellis template hashes and still governs ordinary `trellis update` conflicts:
+
+| Case | Native update behavior |
+| --- | --- |
+| File matches the recorded template hash | Trellis may update it automatically. |
+| File differs from the recorded template hash | Trellis may prompt to overwrite, keep, or generate `.new`. |
+| File is no longer a current template | Trellis migration rules decide whether to delete, rename, or preserve it. |
+
+This file is not the complete ownership model in a Flower-managed project. When `.flower/plugin-lock.json` and `.flower/state.json` claim a target, Plugin ownership, Patch provenance, transaction checks, and managed result hashes also apply. Do not hand-edit either hash store; inspect both before deciding whether a difference is a user customization, a managed overlay, or drift.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-customization-routing/customization-entry-content.md

@@ -0,0 +1 @@
+This directory covers both native local customization and managed overlays. Read generated `.trellis/` and platform files to understand current behavior, but determine ownership before editing: project-local targets may be changed in place, while Flower/Skill-Garden targets must be changed through their owning Plugin or Patch source. Never use the npm cache or `node_modules` as an authoring source.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-customization-routing/customization-entry-selector.md

@@ -0,0 +1 @@
+This directory is for local AI working in a user project where Trellis was installed through npm and `trellis init` has already been run. The AI should modify generated `.trellis/` and platform directories inside the project, not Trellis CLI upstream source code.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-customization-routing/customization-order-baseline.md

@@ -0,0 +1,7 @@
+## General Operation Order
+
+1. **Confirm platform and directories**: inspect which directories exist, such as `.claude/`, `.codex/`, `.cursor/`, `.zcode/`.
+2. **Confirm the current active task**: run `python3 ./.trellis/scripts/task.py current --source`.
+3. **Read the local source of truth**: prefer `.trellis/workflow.md`, `.trellis/config.yaml`, and relevant platform files.
+4. **Modify narrowly**: edit only files related to the user's request.
+5. **Synchronize semantics**: if a shared flow changes, check whether platform entry points also need changes; if a platform entry changes, check whether `.trellis/workflow.md` still agrees.

package/enhancements/0.6/overrides/patches/skills/trellis-meta/managed-customization-routing/customization-order-content.md

@@ -0,0 +1,10 @@
+## General Operation Order
+
+1. **Confirm scope**: inspect enabled platform roots and the current active task.
+2. **Read runtime truth**: read `.trellis/workflow.md`, `.trellis/config.yaml`, and the relevant platform files.
+3. **Resolve ownership**: inspect `.flower/plugins.json`, `.flower/plugin-lock.json`, `.flower/state.json`, `.trellis/.template-hashes.json`, and managed markers.
+4. **Choose one route**:
+   - project-local or native local customization: edit the narrowly scoped local source;
+   - Flower/Skill-Garden managed target: edit the owning Plugin/Patch source, not the deployed result.
+5. **For Skill-Garden 0.6 authoring**: change `vendor/skill-garden/.trellis/0.6/`, run `npm run sync`, regenerate/check compiled targets, then apply the Flower lifecycle to dogfood targets.
+6. **Verify final semantics**: check every existing platform target, conflict assertions, provenance, and idempotency. The final files must agree with `.trellis/workflow.md` and their workflow owner.