fusion-cli 1.1.1__tar.gz → 1.2.1__tar.gz

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fusion-cli
-Version: 1.1.1
+Version: 1.2.1
 Summary: The Fusion reference CLI — the notary of the Fusion Convention.
 Author: Bluewaves Boutique
 License-Expression: MIT
@@ -50,7 +50,7 @@ fusion --version
 | `fusion status [path]` | One bucket at a glance |
 | `fusion today` | The composed day, across every bucket in the hub |
 | `fusion agenda` | The wider horizon — dated and active, across the hub |
-| `fusion setup` | Install the skills into every detected agent — the installer's brain. `--remove` undoes it |
+| `fusion setup` | Install the skills to `~/.agents/skills` and serve every detected agent (links only where needed) — the installer's brain. `--remove` undoes it |
 
 Every command takes `--json` (agents parse, never scrape). `log`, `new`,
 and `index` take `--as <actor>`; the pen defaults to `FUSION_ACTOR`, then

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/README.md

@@ -40,7 +40,7 @@ fusion --version
 | `fusion status [path]` | One bucket at a glance |
 | `fusion today` | The composed day, across every bucket in the hub |
 | `fusion agenda` | The wider horizon — dated and active, across the hub |
-| `fusion setup` | Install the skills into every detected agent — the installer's brain. `--remove` undoes it |
+| `fusion setup` | Install the skills to `~/.agents/skills` and serve every detected agent (links only where needed) — the installer's brain. `--remove` undoes it |
 
 Every command takes `--json` (agents parse, never scrape). `log`, `new`,
 and `index` take `--as <actor>`; the pen defaults to `FUSION_ACTOR`, then

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fusion-cli"
-version = "1.1.1"
+version = "1.2.1"
 description = "The Fusion reference CLI — the notary of the Fusion Convention."
 readme = "README.md"
 requires-python = ">=3.11"

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/skills/fusion-analyst/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: fusion-analyst
-description: "The Fusion analyst — deliverables out of the bucket. Four gears: report (multi-section analysis from library + activities — the default), assess (scored assessment with explicit criteria and scale), compare (side-by-side matrix with deltas and red flags), export (CSV/JSON/XLSX data extracts). Everything lands in output/ as a summary-first document, cites every source path in data_sources, and ships signed in the ledger. Use for 'report on', 'analyze and write up', 'brief', 'assess', 'evaluate', 'score', 'compare X and Y', 'export as csv/excel'. For searching without producing a deliverable use fusion-librarian's query; for new documents of record use fusion-librarian's create. Applies only inside a Fusion bucket — a directory tree with BUCKET.md and LEDGER.md at its root; if there is no such bucket in play, this skill does not apply."
+description: "The Fusion analyst — deliverables out of the bucket. Four gears: report (multi-section analysis from library + activities — the default), assess (scored assessment with explicit criteria and scale), compare (side-by-side matrix with deltas and red flags), export (CSV/JSON/XLSX data extracts). Everything lands in output/ as a summary-first document, cites every source path in data_sources, and ships signed in the ledger. Use for 'report on', 'analyze and write up', 'brief', 'assess', 'evaluate', 'score', 'compare X and Y', 'export as csv/excel'. For searching without producing a deliverable use fusion-librarian's query; for new documents of record use fusion-librarian's create. Applies only inside a Fusion bucket — a directory tree with BUCKET.md and LEDGER.md at its root; if there is no such bucket in play, offer to create one with `fusion new` instead of improvising structure."
 license: MIT
 compatibility: "Requires the fusion CLI on PATH; uv for the export script (PEP 723: openpyxl)."
 ---
@@ -13,8 +13,11 @@ document cites the exact paths it was built from, and ships with a
 
 Read `references/fusion-conventions.md` once per session; read
 `BUCKET.md ## Conventions` before acting. No `BUCKET.md` up the tree and
-none named? Stop — this is not a Fusion bucket, and no Fusion skill
-applies (`fusion hub` lists the real ones).
+none named? Then nothing here is a Fusion bucket and no Fusion skill
+applies — but offer the door instead of walking away: `fusion new
+<path>` scaffolds a conformant bucket and registers it in the hub
+(`fusion hub` lists the ones that exist). Buckets are life-domains —
+few and bold — never improvised by hand.
 
 ## Pick the gear
 

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/skills/fusion-analyst/references/fusion-conventions.md

@@ -107,6 +107,11 @@ shell. The ledger verbs (closed set of eleven): `created`, `converted`,
 `shipped`, `reflected`, `noted`. Sign with your agent name (`--as claude`,
 or set `FUSION_ACTOR`).
 
+On a bucket that lives on more than one machine, git's union driver
+(`.gitattributes`, written at bucket birth) merges parallel `LEDGER.md`
+and `MANIFEST.md` appends. After any git merge: `fusion index`, then
+`fusion check`.
+
 ## The CLI crib
 
 | Command | What it does |
@@ -116,6 +121,7 @@ or set `FUSION_ACTOR`).
 | `fusion log <verb> <object>` | append a signed ledger entry |
 | `fusion index` | regenerate INDEX files (logs `indexed` when changed) |
 | `fusion check [path]` | conformance: errors, warnings, honest exit codes |
+| `fusion check --hub` | is every registered bucket where the hub says? |
 | `fusion status [--since …]` | one bucket at a glance |
 | `fusion today` | the composed morning across all hub buckets |
 | `fusion agenda` | dated + active items across buckets |
@@ -127,8 +133,14 @@ green before you call the work done.**
 
 ## When you're blocked
 
+- No bucket in play anywhere: never improvise Fusion structure by hand.
+  Offer `fusion new <path> --kind <kind> --description "…"` — six zones,
+  BUCKET.md, an opened ledger, a merge-safe `.gitattributes`, registered
+  in the hub. Guide the human toward few, bold, life-domain buckets
+  (personal, one per company, a studio).
 - `fusion` not on PATH: stop and tell the human — the install is
-  `uv tool install ./fusion/cli` from a clone of the Fusion repository.
+  `uv tool install fusion-cli` (or, from a clone of the Fusion
+  repository, `uv tool install ./fusion/cli`).
   Never imitate the notary by hand: no register writes while the CLI is
   missing.
 - `fusion check` red and you cannot fix it: stop, show the findings

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/skills/fusion-intake/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: fusion-intake
-description: "The Fusion intake gate — everything that enters a bucket enters through it, losslessly. Classify what landed in inbox/ (new, updated, duplicate, conflicting), preserve the original in sources/ with its sha256 in the MANIFEST, convert to a faithful summary-first document (xlsx, csv, docx, pptx, pdf, html, images, .eml mail, markdown/text exports), propose type and aurora, sign the ledger, clear the inbox. Use when the user says 'process the inbox', 'intake', 'ingest', 'convert this file', or drops files into a Fusion bucket's inbox/. For placement, curation, or restructuring of what is already inside, use fusion-librarian; for deliverables out of the bucket, use fusion-analyst. Applies only inside a Fusion bucket — a directory tree with BUCKET.md and LEDGER.md at its root; if there is no such bucket in play, this skill does not apply."
+description: "The Fusion intake gate — everything that enters a bucket enters through it, losslessly. Classify what landed in inbox/ (new, updated, duplicate, conflicting), preserve the original in sources/ with its sha256 in the MANIFEST, convert to a faithful summary-first document (xlsx, csv, docx, pptx, pdf, html, images, .eml mail, markdown/text exports), propose type and aurora, sign the ledger, clear the inbox. Use when the user says 'process the inbox', 'intake', 'ingest', 'convert this file', or drops files into a Fusion bucket's inbox/. For placement, curation, or restructuring of what is already inside, use fusion-librarian; for deliverables out of the bucket, use fusion-analyst. Applies only inside a Fusion bucket — a directory tree with BUCKET.md and LEDGER.md at its root; if there is no such bucket in play, offer to create one with `fusion new` instead of improvising structure."
 license: MIT
 compatibility: "Requires the fusion CLI on PATH and uv. LibreOffice (soffice on PATH) required for docx/pptx/legacy office/html formats — fails fast when missing, never silently degrades. Script deps via PEP 723 (openpyxl, PyYAML, pymupdf)."
 ---
@@ -14,8 +14,11 @@ that isn't clean and new.
 Read `references/fusion-conventions.md` once per session. Then, before
 touching anything: read the bucket's `BUCKET.md` — `## Conventions` may
 contain filing rules and standing delegations that bind this whole run.
-No `BUCKET.md` up the tree and none named? Stop — this is not a Fusion
-bucket, and no Fusion skill applies (`fusion hub` lists the real ones).
+No `BUCKET.md` up the tree and none named? Then nothing here is a
+Fusion bucket and no Fusion skill applies — but offer the door instead
+of walking away: `fusion new <path>` scaffolds a conformant bucket and
+registers it in the hub (`fusion hub` lists the ones that exist).
+Buckets are life-domains — few and bold — never improvised by hand.
 
 ## The pipeline
 

{fusion_cli-1.1.1/skills/fusion-librarian → fusion_cli-1.2.1/skills/fusion-intake}/references/fusion-conventions.md

@@ -107,6 +107,11 @@ shell. The ledger verbs (closed set of eleven): `created`, `converted`,
 `shipped`, `reflected`, `noted`. Sign with your agent name (`--as claude`,
 or set `FUSION_ACTOR`).
 
+On a bucket that lives on more than one machine, git's union driver
+(`.gitattributes`, written at bucket birth) merges parallel `LEDGER.md`
+and `MANIFEST.md` appends. After any git merge: `fusion index`, then
+`fusion check`.
+
 ## The CLI crib
 
 | Command | What it does |
@@ -116,6 +121,7 @@ or set `FUSION_ACTOR`).
 | `fusion log <verb> <object>` | append a signed ledger entry |
 | `fusion index` | regenerate INDEX files (logs `indexed` when changed) |
 | `fusion check [path]` | conformance: errors, warnings, honest exit codes |
+| `fusion check --hub` | is every registered bucket where the hub says? |
 | `fusion status [--since …]` | one bucket at a glance |
 | `fusion today` | the composed morning across all hub buckets |
 | `fusion agenda` | dated + active items across buckets |
@@ -127,8 +133,14 @@ green before you call the work done.**
 
 ## When you're blocked
 
+- No bucket in play anywhere: never improvise Fusion structure by hand.
+  Offer `fusion new <path> --kind <kind> --description "…"` — six zones,
+  BUCKET.md, an opened ledger, a merge-safe `.gitattributes`, registered
+  in the hub. Guide the human toward few, bold, life-domain buckets
+  (personal, one per company, a studio).
 - `fusion` not on PATH: stop and tell the human — the install is
-  `uv tool install ./fusion/cli` from a clone of the Fusion repository.
+  `uv tool install fusion-cli` (or, from a clone of the Fusion
+  repository, `uv tool install ./fusion/cli`).
   Never imitate the notary by hand: no register writes while the CLI is
   missing.
 - `fusion check` red and you cannot fix it: stop, show the findings

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/skills/fusion-librarian/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: fusion-librarian
-description: "The Fusion librarian — the accountable owner of a bucket's order. One entry, eight gears: query (natural-language search over the bucket — the default), create (a new conformant document), tag (bulk frontmatter metadata), cross-reference (map what relates to what), promote (workbench → a real zone, validated), archive (out of the way, path + aurora agreeing), restructure (reorganize and sign your reasons), reflect (the reflection ritual: introspect the ledger, propose curation, land what was learned). Use for 'find', 'search', 'where is', 'create a document', 'tag', 'what links to', 'promote', 'archive this', 'reorganize', 'restructure', 'run a reflection'. For files arriving from outside use fusion-intake; for activity planning use fusion-planner; for reports and exports use fusion-analyst. Applies only inside a Fusion bucket — a directory tree with BUCKET.md and LEDGER.md at its root; if there is no such bucket in play, this skill does not apply."
+description: "The Fusion librarian — the accountable owner of a bucket's order. One entry, eight gears: query (natural-language search over the bucket — the default), create (a new conformant document), tag (bulk frontmatter metadata), cross-reference (map what relates to what), promote (workbench → a real zone, validated), archive (out of the way, path + aurora agreeing), restructure (reorganize and sign your reasons), reflect (the reflection ritual: introspect the ledger, propose curation, land what was learned). Use for 'find', 'search', 'where is', 'create a document', 'tag', 'what links to', 'promote', 'archive this', 'reorganize', 'restructure', 'run a reflection'. For files arriving from outside use fusion-intake; for activity planning use fusion-planner; for reports and exports use fusion-analyst. Applies only inside a Fusion bucket — a directory tree with BUCKET.md and LEDGER.md at its root; if there is no such bucket in play, offer to create one with `fusion new` instead of improvising structure."
 license: MIT
 compatibility: "Requires the fusion CLI on PATH."
 ---
@@ -14,8 +14,11 @@ ledger with its reasons.
 Read `references/fusion-conventions.md` once per session. Before any gear:
 read the bucket's `BUCKET.md` — `### Rules` bind how this bucket files
 things; `### Delegations` say what you may do without asking. No
-`BUCKET.md` up the tree and none named? Stop — this is not a Fusion
-bucket, and no Fusion skill applies (`fusion hub` lists the real ones).
+`BUCKET.md` up the tree and none named? Then nothing here is a Fusion
+bucket and no Fusion skill applies — but offer the door instead of
+walking away: `fusion new <path>` scaffolds a conformant bucket and
+registers it in the hub (`fusion hub` lists the ones that exist).
+Buckets are life-domains — few and bold — never improvised by hand.
 
 ## Pick the gear
 

{fusion_cli-1.1.1/skills/fusion-planner → fusion_cli-1.2.1/skills/fusion-librarian}/references/fusion-conventions.md

@@ -107,6 +107,11 @@ shell. The ledger verbs (closed set of eleven): `created`, `converted`,
 `shipped`, `reflected`, `noted`. Sign with your agent name (`--as claude`,
 or set `FUSION_ACTOR`).
 
+On a bucket that lives on more than one machine, git's union driver
+(`.gitattributes`, written at bucket birth) merges parallel `LEDGER.md`
+and `MANIFEST.md` appends. After any git merge: `fusion index`, then
+`fusion check`.
+
 ## The CLI crib
 
 | Command | What it does |
@@ -116,6 +121,7 @@ or set `FUSION_ACTOR`).
 | `fusion log <verb> <object>` | append a signed ledger entry |
 | `fusion index` | regenerate INDEX files (logs `indexed` when changed) |
 | `fusion check [path]` | conformance: errors, warnings, honest exit codes |
+| `fusion check --hub` | is every registered bucket where the hub says? |
 | `fusion status [--since …]` | one bucket at a glance |
 | `fusion today` | the composed morning across all hub buckets |
 | `fusion agenda` | dated + active items across buckets |
@@ -127,8 +133,14 @@ green before you call the work done.**
 
 ## When you're blocked
 
+- No bucket in play anywhere: never improvise Fusion structure by hand.
+  Offer `fusion new <path> --kind <kind> --description "…"` — six zones,
+  BUCKET.md, an opened ledger, a merge-safe `.gitattributes`, registered
+  in the hub. Guide the human toward few, bold, life-domain buckets
+  (personal, one per company, a studio).
 - `fusion` not on PATH: stop and tell the human — the install is
-  `uv tool install ./fusion/cli` from a clone of the Fusion repository.
+  `uv tool install fusion-cli` (or, from a clone of the Fusion
+  repository, `uv tool install ./fusion/cli`).
   Never imitate the notary by hand: no register writes while the CLI is
   missing.
 - `fusion check` red and you cannot fix it: stop, show the findings

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/skills/fusion-planner/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: fusion-planner
-description: "The Fusion planner — the horizon keeper. The human drives activities; the planner structures them. Three gears: create-activity (a new activity folder with a stateful plan document — works for plans, campaigns, programs, agendas alike), horizon (review what's live: stalled activities, expiring commitments, what fusion today will show tomorrow), close (finish an activity: status done, archived, out of the way). Use for 'new project/activity/campaign', 'plan this', 'what's on my plate', 'review my activities', 'what's stalled', 'agenda', 'close/finish this activity'. For placing knowledge use fusion-librarian; for deliverables use fusion-analyst. Applies only inside a Fusion bucket — a directory tree with BUCKET.md and LEDGER.md at its root; if there is no such bucket in play, this skill does not apply."
+description: "The Fusion planner — the horizon keeper. The human drives activities; the planner structures them. Three gears: create-activity (a new activity folder with a stateful plan document — works for plans, campaigns, programs, agendas alike), horizon (review what's live: stalled activities, expiring commitments, what fusion today will show tomorrow), close (finish an activity: status done, archived, out of the way). Use for 'new project/activity/campaign', 'plan this', 'what's on my plate', 'review my activities', 'what's stalled', 'agenda', 'close/finish this activity'. For placing knowledge use fusion-librarian; for deliverables use fusion-analyst. Applies only inside a Fusion bucket — a directory tree with BUCKET.md and LEDGER.md at its root; if there is no such bucket in play, offer to create one with `fusion new` instead of improvising structure."
 license: MIT
 compatibility: "Requires the fusion CLI on PATH."
 ---
@@ -13,8 +13,11 @@ composes tomorrow morning is this skill's report card.
 
 Read `references/fusion-conventions.md` once per session; read the
 bucket's `BUCKET.md ## Conventions` before acting. No `BUCKET.md` up the
-tree and none named? Stop — this is not a Fusion bucket, and no Fusion
-skill applies (`fusion hub` lists the real ones).
+tree and none named? Then nothing here is a Fusion bucket and no
+Fusion skill applies — but offer the door instead of walking away:
+`fusion new <path>` scaffolds a conformant bucket and registers it in
+the hub (`fusion hub` lists the ones that exist). Buckets are
+life-domains — few and bold — never improvised by hand.
 
 ## Pick the gear
 

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/skills/fusion-planner/references/create-activity.md

@@ -36,3 +36,24 @@
 4. `fusion log created "activities/<slug>/plan.md" --bucket <root>
    --as <you>` · `fusion index <root>` · `fusion check <root>` green.
    Then show the human what `fusion today` now includes.
+
+## The external project
+
+An activity about building something that is code — an app, a site, a
+tool — keeps the repository OUTSIDE the bucket (Fusion holds knowledge
+and work, never code). Point at it instead:
+
+    ---
+    title: <name>
+    type: plan
+    aurora: focus
+    status: active
+    created: <today>
+    resource: <path or URL of the repository>
+    ---
+
+The repo keeps its own history; the activity keeps what the code cannot
+remember — the plan, the decisions, the progress log, links to the
+bucket documents it draws on. The normative example:
+`examples/crazy-ones/activities/band-site/plan.md` in the Fusion
+repository.

{fusion_cli-1.1.1/skills/fusion-intake → fusion_cli-1.2.1/skills/fusion-planner}/references/fusion-conventions.md

@@ -107,6 +107,11 @@ shell. The ledger verbs (closed set of eleven): `created`, `converted`,
 `shipped`, `reflected`, `noted`. Sign with your agent name (`--as claude`,
 or set `FUSION_ACTOR`).
 
+On a bucket that lives on more than one machine, git's union driver
+(`.gitattributes`, written at bucket birth) merges parallel `LEDGER.md`
+and `MANIFEST.md` appends. After any git merge: `fusion index`, then
+`fusion check`.
+
 ## The CLI crib
 
 | Command | What it does |
@@ -116,6 +121,7 @@ or set `FUSION_ACTOR`).
 | `fusion log <verb> <object>` | append a signed ledger entry |
 | `fusion index` | regenerate INDEX files (logs `indexed` when changed) |
 | `fusion check [path]` | conformance: errors, warnings, honest exit codes |
+| `fusion check --hub` | is every registered bucket where the hub says? |
 | `fusion status [--since …]` | one bucket at a glance |
 | `fusion today` | the composed morning across all hub buckets |
 | `fusion agenda` | dated + active items across buckets |
@@ -127,8 +133,14 @@ green before you call the work done.**
 
 ## When you're blocked
 
+- No bucket in play anywhere: never improvise Fusion structure by hand.
+  Offer `fusion new <path> --kind <kind> --description "…"` — six zones,
+  BUCKET.md, an opened ledger, a merge-safe `.gitattributes`, registered
+  in the hub. Guide the human toward few, bold, life-domain buckets
+  (personal, one per company, a studio).
 - `fusion` not on PATH: stop and tell the human — the install is
-  `uv tool install ./fusion/cli` from a clone of the Fusion repository.
+  `uv tool install fusion-cli` (or, from a clone of the Fusion
+  repository, `uv tool install ./fusion/cli`).
   Never imitate the notary by hand: no register writes while the CLI is
   missing.
 - `fusion check` red and you cannot fix it: stop, show the findings

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/src/fusion/checker.py

@@ -6,7 +6,7 @@ import time
 from dataclasses import dataclass
 from pathlib import Path
 
-from . import indexer, ledger, manifest
+from . import hub, indexer, ledger, manifest
 from .bucket import DOC_ZONES, REQUIRED_BUCKET_FIELDS, ZONES, load, iter_documents
 from .document import AURORAS, FILENAME_RE, MAX_STEM
 
@@ -19,7 +19,7 @@ EXPORT_FILENAME_RE = re.compile(r"^[a-z0-9]+(?:-[a-z0-9]+)*\.[a-z0-9]+$")
 @dataclass
 class Finding:
     level: str  # "error" | "warning"
-    code: str   # E1..E8, W1..W5
+    code: str   # E1..E8, W1..W5 — plus H1..H2 from check_hub (CLI vocabulary, not SPEC)
     path: str   # bucket-relative, "" when bucket-wide
     message: str
 
@@ -246,3 +246,30 @@ def _w5_untouched_activities(root: Path) -> list[Finding]:
             "active activity with no ledger mention across the last "
             "reflection window"))
     return findings
+
+
+def check_hub() -> list[Finding]:
+    """The hub's own audit — dangling entries and name drift.
+
+    H-codes are CLI vocabulary, not SPEC conformance codes: the hub is a
+    per-machine register and consumers must tolerate anything in it. All
+    findings are warnings; a hub audit never fails.
+    """
+    findings: list[Finding] = []
+    for entry in hub.load():
+        root = hub.resolve(entry)
+        if not (root / "BUCKET.md").is_file():
+            findings.append(Finding(
+                "warning", "H1", entry.path,
+                f"'{entry.name}' — no bucket at this path; clone it "
+                f"there, or `fusion hub remove {entry.name}`",
+            ))
+            continue
+        name = load(root).name
+        if name and name != entry.name:
+            findings.append(Finding(
+                "warning", "H2", entry.path,
+                f"hub says '{entry.name}' but BUCKET.md says '{name}' — "
+                "re-register: `fusion hub remove` then `fusion hub add`",
+            ))
+    return findings

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/src/fusion/cli.py

@@ -88,11 +88,20 @@ def cmd_hub(args) -> int:
               f"'{args.name}' retired from the hub. The files live on.")
         return 0
     entries = hub.load()
-    human = "\n".join(
-        f"- **{e.name}** · {e.kind} · {e.path} — {e.description}"
-        for e in entries
-    ) or "the hub is empty — `fusion new` a bucket."
-    _emit([asdict(e) for e in entries], args.json, human)
+    flagged = [
+        (e, not (hub.resolve(e) / "BUCKET.md").is_file()) for e in entries
+    ]
+    lines = []
+    for e, missing in flagged:
+        lines.append(f"- **{e.name}** · {e.kind} · {e.path} — {e.description}")
+        if missing:
+            lines.append(
+                f"  ⚠ no bucket at that path — clone it there, "
+                f"or `fusion hub remove {e.name}`"
+            )
+    human = "\n".join(lines) or "the hub is empty — `fusion new` a bucket."
+    _emit([{**asdict(e), "missing": missing} for e, missing in flagged],
+          args.json, human)
     return 0
 
 
@@ -140,12 +149,36 @@ def cmd_index(args) -> int:
     return 0
 
 
+def _check_hub(args) -> int:
+    findings = checker.check_hub()
+    entries = hub.load()
+    if args.json:
+        _emit({
+            "hub": str(hub.hub_path()),
+            "buckets": len(entries),
+            "ok": not findings,
+            "warnings": [asdict(f) for f in findings],
+        }, True, "")
+    else:
+        for f in findings:
+            print(f"  {f.code} · {f.path} — {f.message}")
+        n, w = len(entries), len(findings)
+        verdict = ("every bucket answers." if not findings
+                   else "some buckets are not where the hub says.")
+        print(f"hub: {n} bucket{'s' if n != 1 else ''} · "
+              f"{w} warning{'s' if w != 1 else ''} — {verdict}")
+    return 0
+
+
 def cmd_check(args) -> int:
+    if getattr(args, "hub", False):
+        return _check_hub(args)
     root = _root_from(args)
     if root is None:
         given = getattr(args, "path", None)
-        return _fail(f"no bucket at: {given}" if given else
-                     "not inside a bucket and no path given", args.json)
+        if given is None:
+            return _check_hub(args)  # outside any bucket: audit the hub
+        return _fail(f"no bucket at: {given}", args.json)
     findings = checker.check(root)
     errors = [f for f in findings if f.level == "error"]
     warnings = [f for f in findings if f.level == "warning"]
@@ -207,6 +240,12 @@ def _render_items(items) -> list[str]:
 
 def cmd_today(args) -> int:
     t = views.today()
+    for m in t["missing"]:
+        print(
+            f"note: hub bucket '{m['name']}' is not at {m['path']} — "
+            f"clone it there, or `fusion hub remove {m['name']}`",
+            file=sys.stderr,
+        )
     lines = [f"Today across {len(t['buckets'])} bucket"
              f"{'s' if len(t['buckets']) != 1 else ''}"]
     for aurora, items in t["groups"].items():
@@ -220,6 +259,12 @@ def cmd_today(args) -> int:
 
 def cmd_agenda(args) -> int:
     a = views.agenda()
+    for m in a["missing"]:
+        print(
+            f"note: hub bucket '{m['name']}' is not at {m['path']} — "
+            f"clone it there, or `fusion hub remove {m['name']}`",
+            file=sys.stderr,
+        )
     lines = []
     if a["dated"]:
         lines.append("dated:")
@@ -336,8 +381,10 @@ def build_parser() -> argparse.ArgumentParser:
     flag_as(p); flag_json(p)
     p.set_defaults(func=cmd_index)
 
-    p = sub.add_parser("check", help="audit a bucket against the convention", description="Audit a bucket against the convention (SPEC §11). Exit 1 on errors; warnings never fail the check.")
+    p = sub.add_parser("check", help="audit a bucket against the convention", description="Audit a bucket against the convention (SPEC §11). Exit 1 on errors; warnings never fail the check. --hub (or running outside any bucket) audits the hub instead: every registered bucket present and answering to its name.")
     p.add_argument("path", nargs="?", help="bucket root (default: walk up from the current directory)")
+    p.add_argument("--hub", action="store_true",
+                   help="audit the hub instead: every entry answers at its path")
     flag_json(p)
     p.set_defaults(func=cmd_check)
 
@@ -357,8 +404,10 @@ def build_parser() -> argparse.ArgumentParser:
 
     p = sub.add_parser("setup", help="install skills into agents; --remove undoes it",
                        description="Install the bundled skills to the canonical "
-                       "skills directory and link them into every detected agent. "
-                       "Idempotent; never destroys what it did not create.")
+                       "skills directory (~/.agents/skills) and make them available "
+                       "to every detected agent — most read that directory "
+                       "natively; agents that do not (Claude Code) get symlinks. "
+                       "--remove undoes exactly what setup can prove it created.")
     p.add_argument("--force", action="store_true",
                    help="replace foreign entries setup would otherwise leave")
     p.add_argument("--remove", action="store_true",

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/src/fusion/scaffold.py

@@ -43,6 +43,14 @@ MANIFEST_HEADER = (
     "|---|---|---|---|---|\n"
 )
 
+GITATTRIBUTES = (
+    "# written by fusion new — multi-machine merges stay safe (SPEC §6)\n"
+    "* text=auto eol=lf\n"
+    "sources/** -text\n"
+    "LEDGER.md merge=union\n"
+    "sources/MANIFEST.md merge=union\n"
+)
+
 
 class ScaffoldError(Exception):
     pass
@@ -85,6 +93,9 @@ def new_bucket(
     (root / "sources" / "MANIFEST.md").write_text(
         MANIFEST_HEADER, encoding="utf-8", newline="\n"
     )
+    (root / ".gitattributes").write_text(
+        GITATTRIBUTES, encoding="utf-8", newline="\n"
+    )
     ledger.append(root, actor, "created", "BUCKET.md", note="bucket born", at=at)
     indexer.write_indexes(root, actor=None)
 

{fusion_cli-1.1.1 → fusion_cli-1.2.1}/src/fusion/setup.py

@@ -99,15 +99,20 @@ def install_canonical(payload: Path, skills_dir: Path,
 # ~/.agents/skills dir, so each fusion-* skill gets a symlink (or copy)
 # in its own skills dir. mode "standard": the agent reads the standard
 # dir — creating links there too would load every skill twice.
+# legacy_subdir: a dir an earlier fusion-cli release linked into before
+# the agent's native standard-dir support was verified; setup sweeps
+# OUR leftovers out of it (attribution-checked, like everything else).
 AGENTS = [
     {"name": "Claude Code", "marker": ".claude",
      "skills_subdir": ".claude/skills", "mode": "link",
      "docs_url": "https://code.claude.com/docs/en/skills"},
     {"name": "Codex", "marker": ".codex",
-     "skills_subdir": ".codex/skills", "mode": "link",
+     "skills_subdir": ".agents/skills", "mode": "standard",
+     "legacy_subdir": ".codex/skills",
      "docs_url": "https://developers.openai.com/codex/skills"},
     {"name": "Pi", "marker": ".pi",
-     "skills_subdir": ".pi/agent/skills", "mode": "link",
+     "skills_subdir": ".agents/skills", "mode": "standard",
+     "legacy_subdir": ".pi/agent/skills",
      "docs_url": "https://pi.dev/docs/latest/skills"},
     {"name": "Cursor", "marker": ".cursor",
      "skills_subdir": ".agents/skills", "mode": "standard",
@@ -128,7 +133,10 @@ def detect_agents(home: Path) -> list[dict]:
     found = []
     for row in AGENTS:
         if (home / row["marker"]).is_dir():
-            found.append({**row, "skills_dir": home / row["skills_subdir"]})
+            entry = {**row, "skills_dir": home / row["skills_subdir"]}
+            if "legacy_subdir" in row:
+                entry["legacy_dir"] = home / row["legacy_subdir"]
+            found.append(entry)
     return found
 
 
@@ -139,11 +147,51 @@ def _points_into(link: Path, canonical: Path) -> bool:
         return False
 
 
+def _sweep_legacy(agent: dict, canonical: Path) -> list[dict]:
+    """Remove OUR leftovers from a dir an earlier release linked into.
+
+    fusion-cli <= 1.2.0 symlinked (or copy-fell-back) into Pi's and
+    Codex's own dirs; both agents read the canonical dir natively, so
+    those entries double-loaded every skill. Attribution-checked:
+    symlinks into the canonical and sentinel-marked copies are ours;
+    anything else is left with a report row. If the legacy dir is
+    itself aliased at the canonical, there is nothing to sweep.
+    """
+    legacy = agent.get("legacy_dir")
+    if legacy is None or not legacy.is_dir():
+        return []
+    if _points_into(legacy, canonical):
+        return []  # the legacy dir IS the canonical through an alias —
+                    # sweeping it would reach canonical entries
+    results = []
+    for entry in sorted(legacy.glob("fusion-*")):
+        row = {"agent": agent["name"], "skill": entry.name}
+        if entry.is_symlink() and _points_into(entry, canonical):
+            entry.unlink()
+            results.append({**row, "action": "unlinked",
+                            "detail": f"{entry} — this agent reads the "
+                                      f"standard dir; the extra link "
+                                      f"double-loaded every skill"})
+        elif (entry.is_dir() and not entry.is_symlink()
+              and (entry / ".fusion-setup").is_file()):
+            shutil.rmtree(entry)
+            results.append({**row, "action": "unlinked",
+                            "detail": f"{entry} — copy from an earlier "
+                                      f"fusion-cli; this agent reads the "
+                                      f"standard dir"})
+        else:
+            results.append({**row, "action": "left",
+                            "detail": f"{entry} is not attributable to "
+                                      f"setup — left in place"})
+    return results
+
+
 def fan_out(canonical: Path, agents: list[dict], force: bool) -> list[dict]:
     results = []
     skills = sorted(canonical.glob("fusion-*"))
     for agent in agents:
         if agent["mode"] == "standard":
+            results.extend(_sweep_legacy(agent, canonical))
             if canonical.resolve() != agent["skills_dir"].resolve():
                 detail = (f"reads ~/.agents/skills — but your skills are "
                           f"at {canonical}, which this agent does not read")
@@ -152,6 +200,13 @@ def fan_out(canonical: Path, agents: list[dict], force: bool) -> list[dict]:
             results.append({"agent": agent["name"], "skill": "*",
                             "action": "standard", "detail": detail})
             continue
+        if _points_into(agent["skills_dir"], canonical):
+            results.append({
+                "agent": agent["name"], "skill": "*", "action": "served",
+                "detail": f"{agent['skills_dir']} resolves into "
+                          f"{canonical} — the canonical install already "
+                          f"serves this agent; nothing to link"})
+            continue
         agent["skills_dir"].mkdir(parents=True, exist_ok=True)
         for skill in skills:
             target = agent["skills_dir"] / skill.name
@@ -170,6 +225,11 @@ def fan_out(canonical: Path, agents: list[dict], force: bool) -> list[dict]:
                 target.unlink()
                 replaced = True
             elif target.is_dir():
+                if target.resolve() == skill.resolve():
+                    results.append({**row, "action": "served",
+                                    "detail": f"{target} already resolves "
+                                              f"to the canonical skill"})
+                    continue
                 if tree_digest(target) == tree_digest(skill):
                     pass          # our current copy, refresh below keeps it current
                 elif (target / ".fusion-setup").is_file():
@@ -211,7 +271,11 @@ def remove_all(canonical: Path, home: Path) -> list[dict]:
     results = []
     for agent in detect_agents(home):
         if agent["mode"] == "standard":
+            results.extend(_sweep_legacy(agent, canonical))
             continue
+        if _points_into(agent["skills_dir"], canonical):
+            continue  # entries here ARE the canonical skills; the
+                      # canonical phase below removes them exactly once
         entries = (sorted(agent["skills_dir"].glob("fusion-*"))
                    if agent["skills_dir"].is_dir() else [])
         for entry in entries: