incitaciones 0.6.0 → 0.7.0

package/content/distilled/whisper/SKILL.md

@@ -32,6 +32,17 @@ Manage `~/.whisper/` — a global, tiered knowledge directory that accumulates o
 
 **Worktree slot rule:** `basename $(git rev-parse --git-common-dir 2>/dev/null)` (the `.git` worktree dir name), or `basename $(pwd)` when not in a worktree.
 
+**Canonical repo key rule — derive it, never invent it:**
+
+```bash
+repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||')
+[ -z "$repo_url" ] && repo_url="local/$(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")"
+```
+
+`git@cv:org/repo.git` → `cv/org/repo`; `https://github.com/u/r` → `github.com/u/r`; no remote → `local/<repo-name>`. Colons always become slashes (keeps keys path-safe). The same key must come out of the same repo on every machine.
+
+If a directory keyed some other way already exists for this repo (bare name like `genesis/`, owner-only like `charly-vibes/`, alias host with a colon like `cv:charly-vibes/`), do **not** add a fourth variant — route new knowledge into the canonical key and offer `/w consolidate` to migrate the legacy one.
+
 ## Knowledge Routing
 
 When a session learns something worth keeping, route it by scope:
@@ -47,6 +58,7 @@ When a session learns something worth keeping, route it by scope:
 **Rules:**
 - **No secrets anywhere.** Never write tokens, keys, passwords, or PII into `~/.whisper/`.
 - **Extend, don't duplicate.** Append to or correct an existing note rather than creating a new one that says the same thing.
+- **One repo, one key.** If more than one `repos/` directory belongs to the same repo, write into the canonical key and propose `/w consolidate` — never create a new variant.
 - **Search first.** Before creating a new entry, check if one already exists for the same topic.
 - If `bd` is not available, everything falls back to `~/.whisper/` files — there's no beads-backed alternative.
 
@@ -61,6 +73,7 @@ Determine mode from how the skill is triggered:
 | `/w check` or called by `renew` | **check** |
 | `/w link [<path>]` or "link plan" | **link** |
 | `/w decommission` | **decommission** |
+| `/w consolidate` or "dedupe whisper repos" | **consolidate** |
 
 See each reference file for the full procedure:
 
@@ -69,6 +82,7 @@ See each reference file for the full procedure:
 - `references/status.md`
 - `references/link.md`
 - `references/decommission.md`
+- `references/consolidate.md`
 
 ## Rules
 

package/content/distilled/whisper/references/check.md

@@ -6,7 +6,8 @@ Validate the workspace before starting work. Detects stale branch slots and work
 
 1. Get repo URL and branch slug:
    ```bash
-   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|git@||;s|\.git$||')
+   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||')
+   [ -z "$repo_url" ] && repo_url="local/$(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")"
    branch=$(git rev-parse --abbrev-ref HEAD)
    branch_slug=$(echo "$branch" | sed 's|/|--|g')
    context_path=~/.whisper/repos/"${repo_url}"/branches/"${branch_slug}"/context.md

package/content/distilled/whisper/references/consolidate.md

@@ -0,0 +1,41 @@
+# Consolidate
+
+Merge duplicate `~/.whisper/repos/` directories for the same repo into the single canonical key. One repo, one key.
+
+## Why
+
+Older sessions keyed repos inconsistently — bare repo name (`genesis/`), owner dir (`charly-vibes/`), ssh-alias host with a colon (`cv:charly-vibes/`), full URL in the wrong shape. The same repo's knowledge ends up scattered across several trees, so `check` and `status` miss notes that exist. Consolidation restores the invariant; the canonical key derivation is defined in SKILL.md.
+
+## Steps
+
+1. **Inventory candidates** — non-canonical top-level entries. Canonical = at least 2 slashes and no colon in the first segment; also flag alias-host dirs (`<alias>:<owner>`):
+
+   ```bash
+   for d in ~/.whisper/repos/*/; do echo "${d#$HOME/.whisper/repos/}"; done
+   ```
+   A key is a candidate if it has 0 or 1 slashes, or contains `:`.
+
+2. **Derive the canonical target per candidate** — check the actual repo's remote:
+
+   ```bash
+   cd <repo checkout> && git remote get-url origin | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||'
+   ```
+   If no checkout is reachable for a candidate, leave it in place and report it — never guess the mapping from the name alone.
+
+3. **Produce a migration table and WAIT for approval** — one row per candidate: old key → canonical key, files found, merge conflicts detected. The user must explicitly approve before anything moves. If running non-interactively, output the plan and stop.
+
+4. **Merge per file on approval:**
+   - `env.md` — append the candidate's content under a `## Migrated from <old-key>` heading; merge only verbatim-identical lines.
+   - `branches/<slug>/*` — if the canonical tree has the same slug, append notes with a provenance heading; otherwise `mv` the whole branch slot into `branches/`.
+   - `worktrees/<name>/*` — same rule as branch slots.
+   - Never overwrite an existing file silently. Never delete a file.
+
+5. **Clean up** — remove candidate directories only if they are now empty (`rmdir -p --ignore-fail-on-non-empty`). Anything left behind is reported, not deleted.
+
+6. **Verify** — re-run the candidate scan (step 1): nothing non-canonical remains, or every remaining entry is accounted for with a reason. Run the `check` flow for the current repo and confirm it resolves to the canonical tree.
+
+## Rules
+
+- Provenance headings are mandatory — the user must be able to trace every merged block back to its original location.
+- `git mv` nothing: `~/.whisper/` is not a git repository. Plain `mv`/append only.
+- If two candidates map to the same canonical key (e.g. `charly-vibes/genesis` and `genesis/`), consolidate them sequentially and re-scan between rounds.

package/content/distilled/whisper/references/decommission.md

@@ -8,7 +8,8 @@ Safely wind down a worktree or branch: defer open work under the branch epic, re
 
 2. Get repo URL and branch slug:
    ```bash
-   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|git@||;s|\.git$||')
+   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||')
+   [ -z "$repo_url" ] && repo_url="local/$(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")"
    branch=$(git rev-parse --abbrev-ref HEAD)
    branch_slug=$(echo "$branch" | sed 's|/|--|g')
    branch_dir=~/.whisper/repos/"${repo_url}"/branches/"${branch_slug}"

package/content/distilled/whisper/references/init.md

@@ -20,7 +20,8 @@ Create `~/.whisper/` and the current workspace slot.
 
 3. Compute the repo path and branch slug:
    ```bash
-   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|git@||;s|\.git$||')
+   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||')
+   [ -z "$repo_url" ] && repo_url="local/$(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")"
    branch=$(git rev-parse --abbrev-ref HEAD)
    branch_slug=$(echo "$branch" | sed 's|/|--|g')
    ```

package/content/distilled/whisper/references/link.md

@@ -10,7 +10,8 @@ This mode is self-contained — it does NOT require `create-plan` to have been u
 
 2. Get repo URL and branch slug:
    ```bash
-   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|git@||;s|\.git$||')
+   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||')
+   [ -z "$repo_url" ] && repo_url="local/$(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")"
    branch=$(git rev-parse --abbrev-ref HEAD)
    branch_slug=$(echo "$branch" | sed 's|/|--|g')
    branch_dir=~/.whisper/repos/"${repo_url}"/branches/"${branch_slug}"

package/content/distilled/whisper/references/status.md

@@ -6,7 +6,8 @@ Show the state of the current workspace.
 
 1. Get repo URL and branch slug:
    ```bash
-   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|git@||;s|\.git$||')
+   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||')
+   [ -z "$repo_url" ] && repo_url="local/$(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")"
    branch=$(git rev-parse --abbrev-ref HEAD)
    branch_slug=$(echo "$branch" | sed 's|/|--|g')
    context_path=~/.whisper/repos/"${repo_url}"/branches/"${branch_slug}"/context.md

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incitaciones",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Reusable prompts and skills for CLI LLM tools, with native pi package support.",
   "repository": {
     "type": "git",

package/pi-package/skills/whisper/SKILL.md

@@ -38,6 +38,17 @@ Manage `~/.whisper/` — a global, tiered knowledge directory that accumulates o
 
 **Worktree slot rule:** `basename $(git rev-parse --git-common-dir 2>/dev/null)` (the `.git` worktree dir name), or `basename $(pwd)` when not in a worktree.
 
+**Canonical repo key rule — derive it, never invent it:**
+
+```bash
+repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||')
+[ -z "$repo_url" ] && repo_url="local/$(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")"
+```
+
+`git@cv:org/repo.git` → `cv/org/repo`; `https://github.com/u/r` → `github.com/u/r`; no remote → `local/<repo-name>`. Colons always become slashes (keeps keys path-safe). The same key must come out of the same repo on every machine.
+
+If a directory keyed some other way already exists for this repo (bare name like `genesis/`, owner-only like `charly-vibes/`, alias host with a colon like `cv:charly-vibes/`), do **not** add a fourth variant — route new knowledge into the canonical key and offer `/w consolidate` to migrate the legacy one.
+
 ## Knowledge Routing
 
 When a session learns something worth keeping, route it by scope:
@@ -53,6 +64,7 @@ When a session learns something worth keeping, route it by scope:
 **Rules:**
 - **No secrets anywhere.** Never write tokens, keys, passwords, or PII into `~/.whisper/`.
 - **Extend, don't duplicate.** Append to or correct an existing note rather than creating a new one that says the same thing.
+- **One repo, one key.** If more than one `repos/` directory belongs to the same repo, write into the canonical key and propose `/w consolidate` — never create a new variant.
 - **Search first.** Before creating a new entry, check if one already exists for the same topic.
 - If `bd` is not available, everything falls back to `~/.whisper/` files — there's no beads-backed alternative.
 
@@ -67,6 +79,7 @@ Determine mode from how the skill is triggered:
 | `/w check` or called by `renew` | **check** |
 | `/w link [<path>]` or "link plan" | **link** |
 | `/w decommission` | **decommission** |
+| `/w consolidate` or "dedupe whisper repos" | **consolidate** |
 
 See each reference file for the full procedure:
 
@@ -75,6 +88,7 @@ See each reference file for the full procedure:
 - `references/status.md`
 - `references/link.md`
 - `references/decommission.md`
+- `references/consolidate.md`
 
 ## Rules
 

package/pi-package/skills/whisper/references/check.md

@@ -6,7 +6,8 @@ Validate the workspace before starting work. Detects stale branch slots and work
 
 1. Get repo URL and branch slug:
    ```bash
-   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|git@||;s|\.git$||')
+   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||')
+   [ -z "$repo_url" ] && repo_url="local/$(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")"
    branch=$(git rev-parse --abbrev-ref HEAD)
    branch_slug=$(echo "$branch" | sed 's|/|--|g')
    context_path=~/.whisper/repos/"${repo_url}"/branches/"${branch_slug}"/context.md

package/pi-package/skills/whisper/references/consolidate.md

@@ -0,0 +1,41 @@
+# Consolidate
+
+Merge duplicate `~/.whisper/repos/` directories for the same repo into the single canonical key. One repo, one key.
+
+## Why
+
+Older sessions keyed repos inconsistently — bare repo name (`genesis/`), owner dir (`charly-vibes/`), ssh-alias host with a colon (`cv:charly-vibes/`), full URL in the wrong shape. The same repo's knowledge ends up scattered across several trees, so `check` and `status` miss notes that exist. Consolidation restores the invariant; the canonical key derivation is defined in SKILL.md.
+
+## Steps
+
+1. **Inventory candidates** — non-canonical top-level entries. Canonical = at least 2 slashes and no colon in the first segment; also flag alias-host dirs (`<alias>:<owner>`):
+
+   ```bash
+   for d in ~/.whisper/repos/*/; do echo "${d#$HOME/.whisper/repos/}"; done
+   ```
+   A key is a candidate if it has 0 or 1 slashes, or contains `:`.
+
+2. **Derive the canonical target per candidate** — check the actual repo's remote:
+
+   ```bash
+   cd <repo checkout> && git remote get-url origin | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||'
+   ```
+   If no checkout is reachable for a candidate, leave it in place and report it — never guess the mapping from the name alone.
+
+3. **Produce a migration table and WAIT for approval** — one row per candidate: old key → canonical key, files found, merge conflicts detected. The user must explicitly approve before anything moves. If running non-interactively, output the plan and stop.
+
+4. **Merge per file on approval:**
+   - `env.md` — append the candidate's content under a `## Migrated from <old-key>` heading; merge only verbatim-identical lines.
+   - `branches/<slug>/*` — if the canonical tree has the same slug, append notes with a provenance heading; otherwise `mv` the whole branch slot into `branches/`.
+   - `worktrees/<name>/*` — same rule as branch slots.
+   - Never overwrite an existing file silently. Never delete a file.
+
+5. **Clean up** — remove candidate directories only if they are now empty (`rmdir -p --ignore-fail-on-non-empty`). Anything left behind is reported, not deleted.
+
+6. **Verify** — re-run the candidate scan (step 1): nothing non-canonical remains, or every remaining entry is accounted for with a reason. Run the `check` flow for the current repo and confirm it resolves to the canonical tree.
+
+## Rules
+
+- Provenance headings are mandatory — the user must be able to trace every merged block back to its original location.
+- `git mv` nothing: `~/.whisper/` is not a git repository. Plain `mv`/append only.
+- If two candidates map to the same canonical key (e.g. `charly-vibes/genesis` and `genesis/`), consolidate them sequentially and re-scan between rounds.

package/pi-package/skills/whisper/references/decommission.md

@@ -8,7 +8,8 @@ Safely wind down a worktree or branch: defer open work under the branch epic, re
 
 2. Get repo URL and branch slug:
    ```bash
-   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|git@||;s|\.git$||')
+   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||')
+   [ -z "$repo_url" ] && repo_url="local/$(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")"
    branch=$(git rev-parse --abbrev-ref HEAD)
    branch_slug=$(echo "$branch" | sed 's|/|--|g')
    branch_dir=~/.whisper/repos/"${repo_url}"/branches/"${branch_slug}"

package/pi-package/skills/whisper/references/init.md

@@ -20,7 +20,8 @@ Create `~/.whisper/` and the current workspace slot.
 
 3. Compute the repo path and branch slug:
    ```bash
-   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|git@||;s|\.git$||')
+   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||')
+   [ -z "$repo_url" ] && repo_url="local/$(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")"
    branch=$(git rev-parse --abbrev-ref HEAD)
    branch_slug=$(echo "$branch" | sed 's|/|--|g')
    ```

package/pi-package/skills/whisper/references/link.md

@@ -10,7 +10,8 @@ This mode is self-contained — it does NOT require `create-plan` to have been u
 
 2. Get repo URL and branch slug:
    ```bash
-   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|git@||;s|\.git$||')
+   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||')
+   [ -z "$repo_url" ] && repo_url="local/$(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")"
    branch=$(git rev-parse --abbrev-ref HEAD)
    branch_slug=$(echo "$branch" | sed 's|/|--|g')
    branch_dir=~/.whisper/repos/"${repo_url}"/branches/"${branch_slug}"

package/pi-package/skills/whisper/references/status.md

@@ -6,7 +6,8 @@ Show the state of the current workspace.
 
 1. Get repo URL and branch slug:
    ```bash
-   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|git@||;s|\.git$||')
+   repo_url=$(git remote get-url origin 2>/dev/null | sed 's|https://||;s|http://||;s|ssh://||;s|git@||;s|:|/|g;s|\.git$||')
+   [ -z "$repo_url" ] && repo_url="local/$(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")"
    branch=$(git rev-parse --abbrev-ref HEAD)
    branch_slug=$(echo "$branch" | sed 's|/|--|g')
    context_path=~/.whisper/repos/"${repo_url}"/branches/"${branch_slug}"/context.md