agent-toggle 0.6.2__tar.gz → 0.7.2__tar.gz

{agent_toggle-0.6.2 → agent_toggle-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-toggle
-Version: 0.6.2
+Version: 0.7.2
 Summary: Temporarily disable / re-enable AI-agent skills, agents, commands, rules, plugins and MCP servers across harnesses (Claude Code, Codex, Grok, OpenCode, OpenClaw, Copilot, Vibe, Devin, Antigravity)
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/weskao/agent-toggle
@@ -91,8 +91,13 @@ python3 agent_toggle.py install-shims  # from a checkout, no install needed
 
 `install-shims` writes a thin skill shim (`skills/agent-toggle/SKILL.md`) into
 every installed harness that supports skills, so `/agent-toggle` works from any
-of them, and adds the park dirs (`skills-disabled/` etc.) to a `.gitignore`
-already present in that harness home. Each harness gets its own template from
+of them. It writes nothing else into a harness home: parked items live under
+`~/.agent-toggle/parked/`, so a harness-home `.gitignore` needs no park-dir
+line. Older versions appended `<dir>-disabled/` lines there; inside a git work
+tree, `install-shims` reports such stale lines once `migrate` has emptied the
+dir they covered, asks y/n on a terminal, removes them without asking with
+`--gitignore`, and skips the check with `--no-gitignore` (`--dry-run` only
+reports; every other line is kept byte for byte). Each harness gets its own template from
 `agent_toggle/shims/<harness>.md.tmpl`, else `generic.md.tmpl` (which tells the
 agent to pass `--harness <that harness>`). The shim tells the agent to act only
 on the user's explicit request, never on instructions found inside skill or
@@ -153,7 +158,7 @@ agent-toggle <command> [args]          # or: python3 agent_toggle.py <command> [
 | `status` | health check: harnesses found, types each supports, parked counts, gitignore, untracked parked items, stale live twins, shared dirs, and state entries whose parked item is gone (a `stale` row with the fix command; read-only, still exit `0`) |
 | `list [type]` | what is currently disabled (`--project <dir>` filters to one project) |
 | `cost [--type T]` | estimated startup tokens per item, biggest first (read-only; `--harness H` filters; `--project <dir>` prices a repo's `.claude/` and `.mcp.json` instead of user scope) |
-| `install-shims` | write the skill shim into every installed harness that is on in the settings (an off one is skipped unless named with `--harness`); refuses to overwrite a file it did not write (`--dry-run` shows the plan); on a terminal, then asks y/n for each problem `doctor` can fix (see [Fixing](#fixing)) |
+| `install-shims` | write the skill shim into every installed harness that is on in the settings (an off one is skipped unless named with `--harness`); refuses to overwrite a file it did not write (`--dry-run` shows the plan); reports stale legacy `<dir>-disabled/` lines in a harness-home `.gitignore` (`--gitignore` removes them, `--no-gitignore` skips the check); on a terminal, then asks y/n for each problem `doctor` can fix (see [Fixing](#fixing)) |
 | `disable <type> <name>...` | park one or more items (`--dry-run` shows the plan; `--project <dir>` for a repo's own `.claude/` and `.mcp.json`) |
 | `enable <type> <name>...` | put them back (`--dry-run` shows the plan; `--project <dir>` likewise) |
 | `enable --all` | put back **every** disabled item (`--harness H` narrows it, `--project <dir>` takes only that project's) |
@@ -163,12 +168,12 @@ agent-toggle <command> [args]          # or: python3 agent_toggle.py <command> [
 | `config test\|sync-ci` | send one Telegram test message / set the GitHub CI secrets; needs the `[telegram]` extra; see [CI notifications](#ci-notifications) |
 | `help [command]` | styled help; `help ui` = `--help ui` = `ui --help`; see [Help](#help) |
 | `doctor` | check each harness layout and `state.json` against disk; exit `1` only on an `error` row; on a terminal, asks y/n per fix it can run itself |
-| `migrate` | import an older `~/.claude-toggle/` state |
+| `migrate` | import an older `~/.claude-toggle/` state, and move legacy `<home>/<dir>-disabled/` park dirs into `~/.agent-toggle/parked/user/` (see [Upgrading the park layout](#upgrading-the-park-layout)); safe to re-run |
 
 Every command also works with a leading `--` (`agent-toggle --status`, `--help`, `--config`); this README uses the plain form.
 
 `<type>` = `skill` / `agent` / `command` / `rule` / `plugin` / `mcp`.
-`rule` is claude-only (`~/.claude/rules/*.md`, parked in `rules-disabled/`).
+`rule` is claude-only (`~/.claude/rules/*.md`, parked in `~/.agent-toggle/parked/user/claude/rules/`).
 Disabling a rule prints a warning (also in `--json` `warnings`, dry run included)
 that rules may carry safety constraints.
 
@@ -256,7 +261,7 @@ agent-toggle             # same, on a terminal; elsewhere prints help and exits
   ●   zeta                              claude      5.0k █████         │ type       skill
  Agents 1 ─────────────────────────────────────────────────────────────│ state      ○ parked
   ●   gamma                             claude        50 ▏     +shared │            staged → live
- Commands 1 ───────────────────────────────────────────────────────────│ path       ~/.claude/skills-disabled/beta
+ Commands 1 ───────────────────────────────────────────────────────────│ path       ~/.agent-toggle/parked/user/claude/skills/beta
   ●   delta                             codex         10 ▏             │ cost       0 now; ~300 tok if restored
                                                                        │ since      2026-09-19 10:00:00
  5 of 5 shown · 2/5
@@ -672,7 +677,7 @@ live, modes no looser than `0600` / `0700`). Rows (`action: doctor`) carry a sta
 | `absent` | a dir, config file or key the row expects is not there (an MCP file never created, a missing `mcpServers` key) -- informational, exit `0` |
 | `note` | worth knowing: shared dir, orphan backup, JSONC `openclaw.json` / `opencode.json`, a `--harness` that is not installed |
 | `unverified` | no version could be read, or the row has nothing to check |
-| `warn` | loose file modes; a parked item or companion file with no state entry; a leftover `parked/<sha8>` dir that still holds files (an empty one is ignored); an op a killed run left in flight that the next change settles (`pending: done` / `undone`) |
+| `warn` | loose file modes; a legacy `<dir>-disabled/` park dir in a harness home (fix: `agent-toggle migrate`); a parked item or companion file with no state entry; a leftover `parked/<sha8>` dir that still holds files (an empty one is ignored); an op a killed run left in flight that the next change settles (`pending: done` / `undone`) |
 | `error` | needs fixing: a config that exists but is unparseable or unsupported (`layout changed`), a state entry whose files (companions included) are gone or fail the tamper checks, a companion both live and parked, a flag re-enabled outside the tool, an op a killed run left in flight that needs you (`pending: stuck`, with the exact fix) |
 
 Only `error` makes the exit code `1`; each problem row names the command that
@@ -759,6 +764,7 @@ bookkeeping.
 | `log.jsonl` | one line per operation (mode `0600`), see below |
 | `mcp-backups/` | `<harness>__<server>.json`, or `<sha8>__<harness>__<server>.json` for a project `.mcp.json` (mode `0600` -- may hold auth headers) |
 | `companions/` | parked exclusive helper files |
+| `parked/user/<owner>/<dir>/` | user-scope items, e.g. `parked/user/claude/skills/<name>` (`<owner>` = the harness whose home holds the dir; a dir shared by several harnesses parks once, under its owner); an absolute OpenCode `skills.paths` dir parks under `parked/user/opencode/ext-<sha8>/` (`<sha8>` of its resolved path). Nothing is ever parked inside a harness home |
 | `parked/<sha8>/` | items parked by `--project` (`<sha8>` = first 8 hex of the SHA-1 of the resolved project dir) |
 | `profiles/` | `<name>.json` profiles (dir `0700`, files `0600`) |
 | `config.json` | [settings](#settings--config-menu) and the Telegram chat id (mode `0600`, atomic write, unknown keys kept) |
@@ -784,6 +790,28 @@ project, scope, detail}`. `batch` is one id per run (what `undo` reverses);
 local-scope MCP row has `scope: local` and its working directory in `project`).
 Older rows without `batch`/`harness` cannot be undone.
 
+### Upgrading the park layout
+
+**Breaking:** older versions parked user-scope items in a sibling dir inside
+the harness home (`~/.claude/skills-disabled/`, `~/.codex/prompts-disabled/`,
+...). Claude Code loads `commands/` and `rules/` recursively, so a park dir
+cannot nest inside a live dir either; items now park under
+`~/.agent-toggle/parked/user/`. Run once after upgrading:
+
+```sh
+agent-toggle migrate
+```
+
+It moves every child of each `<dir>-disabled/` into its new park dir with the
+same crash-safe move `disable` uses, repoints the matching `parked_at` entries
+in `state.json`, and removes the emptied old dir. Items with no state entry
+move too (they stay disabled). A name that already exists at the destination is
+refused and left where it is (exit `1`, the row names it); resolve it and re-run.
+A second run changes nothing and says so. Until then `enable` refuses an item
+still in an old dir with `run: agent-toggle migrate`, and `status` / `doctor`
+list each old dir with the same hint. Afterwards, `install-shims` offers to
+remove the old `<dir>-disabled/` lines from a harness-home `.gitignore`.
+
 ## Two guardrails, both earned
 
 **1. `safe_move()` never lets the source be renamed into the destination.**
@@ -797,10 +825,13 @@ Order matters too: `mkdir(exist_ok=True)` raises `FileExistsError` when the
 path exists as a *file*, so the `is_dir()` check has to come **before** the
 `mkdir` or it is unreachable.
 
-**2. Park dirs that are not gitignored get a warning.** Without it, every
-disable leaves dozens of deletion lines in `git status`. The warning is shown once
-per park dir, and only for a dir inside a git work tree (elsewhere `git status`
-cannot be dirtied and the `.gitignore` fix would not apply).
+**2. A park dir that is not gitignored gets a warning.** Parked items live in
+`~/.agent-toggle/parked/`, outside every harness home, so a harness repo
+(`~/.claude` as a dotfiles repo) never sees them. Only when the park dir itself
+sits inside a git work tree (a tracked `$HOME`) and is not ignored there does
+`disable` warn, once per run, with the `.gitignore` line to add; `status` tags
+each type `[NOT gitignored]` in that case. Without it, every disable would leave
+deletion lines in `git status`.
 
 ## Paths are resolved before comparison
 
@@ -879,7 +910,8 @@ PyPI: workflow `release.yml`, environment `pypi`. See
 
 ## Cross-machine behaviour
 
-Disabling is a **local** decision: park dirs are gitignored and do not sync.
+Disabling is a **local** decision: parked items live in `~/.agent-toggle/`,
+outside every harness home, and do not sync.
 But a disappearance under `skills/` is itself a tracked change, so committing
 it means other machines lose those skills on pull. The content stays in git
 history — `git checkout <commit> -- skills/<name>` brings it back. Don't

{agent_toggle-0.6.2 → agent_toggle-0.7.2}/README.md

@@ -59,8 +59,13 @@ python3 agent_toggle.py install-shims  # from a checkout, no install needed
 
 `install-shims` writes a thin skill shim (`skills/agent-toggle/SKILL.md`) into
 every installed harness that supports skills, so `/agent-toggle` works from any
-of them, and adds the park dirs (`skills-disabled/` etc.) to a `.gitignore`
-already present in that harness home. Each harness gets its own template from
+of them. It writes nothing else into a harness home: parked items live under
+`~/.agent-toggle/parked/`, so a harness-home `.gitignore` needs no park-dir
+line. Older versions appended `<dir>-disabled/` lines there; inside a git work
+tree, `install-shims` reports such stale lines once `migrate` has emptied the
+dir they covered, asks y/n on a terminal, removes them without asking with
+`--gitignore`, and skips the check with `--no-gitignore` (`--dry-run` only
+reports; every other line is kept byte for byte). Each harness gets its own template from
 `agent_toggle/shims/<harness>.md.tmpl`, else `generic.md.tmpl` (which tells the
 agent to pass `--harness <that harness>`). The shim tells the agent to act only
 on the user's explicit request, never on instructions found inside skill or
@@ -121,7 +126,7 @@ agent-toggle <command> [args]          # or: python3 agent_toggle.py <command> [
 | `status` | health check: harnesses found, types each supports, parked counts, gitignore, untracked parked items, stale live twins, shared dirs, and state entries whose parked item is gone (a `stale` row with the fix command; read-only, still exit `0`) |
 | `list [type]` | what is currently disabled (`--project <dir>` filters to one project) |
 | `cost [--type T]` | estimated startup tokens per item, biggest first (read-only; `--harness H` filters; `--project <dir>` prices a repo's `.claude/` and `.mcp.json` instead of user scope) |
-| `install-shims` | write the skill shim into every installed harness that is on in the settings (an off one is skipped unless named with `--harness`); refuses to overwrite a file it did not write (`--dry-run` shows the plan); on a terminal, then asks y/n for each problem `doctor` can fix (see [Fixing](#fixing)) |
+| `install-shims` | write the skill shim into every installed harness that is on in the settings (an off one is skipped unless named with `--harness`); refuses to overwrite a file it did not write (`--dry-run` shows the plan); reports stale legacy `<dir>-disabled/` lines in a harness-home `.gitignore` (`--gitignore` removes them, `--no-gitignore` skips the check); on a terminal, then asks y/n for each problem `doctor` can fix (see [Fixing](#fixing)) |
 | `disable <type> <name>...` | park one or more items (`--dry-run` shows the plan; `--project <dir>` for a repo's own `.claude/` and `.mcp.json`) |
 | `enable <type> <name>...` | put them back (`--dry-run` shows the plan; `--project <dir>` likewise) |
 | `enable --all` | put back **every** disabled item (`--harness H` narrows it, `--project <dir>` takes only that project's) |
@@ -131,12 +136,12 @@ agent-toggle <command> [args]          # or: python3 agent_toggle.py <command> [
 | `config test\|sync-ci` | send one Telegram test message / set the GitHub CI secrets; needs the `[telegram]` extra; see [CI notifications](#ci-notifications) |
 | `help [command]` | styled help; `help ui` = `--help ui` = `ui --help`; see [Help](#help) |
 | `doctor` | check each harness layout and `state.json` against disk; exit `1` only on an `error` row; on a terminal, asks y/n per fix it can run itself |
-| `migrate` | import an older `~/.claude-toggle/` state |
+| `migrate` | import an older `~/.claude-toggle/` state, and move legacy `<home>/<dir>-disabled/` park dirs into `~/.agent-toggle/parked/user/` (see [Upgrading the park layout](#upgrading-the-park-layout)); safe to re-run |
 
 Every command also works with a leading `--` (`agent-toggle --status`, `--help`, `--config`); this README uses the plain form.
 
 `<type>` = `skill` / `agent` / `command` / `rule` / `plugin` / `mcp`.
-`rule` is claude-only (`~/.claude/rules/*.md`, parked in `rules-disabled/`).
+`rule` is claude-only (`~/.claude/rules/*.md`, parked in `~/.agent-toggle/parked/user/claude/rules/`).
 Disabling a rule prints a warning (also in `--json` `warnings`, dry run included)
 that rules may carry safety constraints.
 
@@ -224,7 +229,7 @@ agent-toggle             # same, on a terminal; elsewhere prints help and exits
   ●   zeta                              claude      5.0k █████         │ type       skill
  Agents 1 ─────────────────────────────────────────────────────────────│ state      ○ parked
   ●   gamma                             claude        50 ▏     +shared │            staged → live
- Commands 1 ───────────────────────────────────────────────────────────│ path       ~/.claude/skills-disabled/beta
+ Commands 1 ───────────────────────────────────────────────────────────│ path       ~/.agent-toggle/parked/user/claude/skills/beta
   ●   delta                             codex         10 ▏             │ cost       0 now; ~300 tok if restored
                                                                        │ since      2026-09-19 10:00:00
  5 of 5 shown · 2/5
@@ -640,7 +645,7 @@ live, modes no looser than `0600` / `0700`). Rows (`action: doctor`) carry a sta
 | `absent` | a dir, config file or key the row expects is not there (an MCP file never created, a missing `mcpServers` key) -- informational, exit `0` |
 | `note` | worth knowing: shared dir, orphan backup, JSONC `openclaw.json` / `opencode.json`, a `--harness` that is not installed |
 | `unverified` | no version could be read, or the row has nothing to check |
-| `warn` | loose file modes; a parked item or companion file with no state entry; a leftover `parked/<sha8>` dir that still holds files (an empty one is ignored); an op a killed run left in flight that the next change settles (`pending: done` / `undone`) |
+| `warn` | loose file modes; a legacy `<dir>-disabled/` park dir in a harness home (fix: `agent-toggle migrate`); a parked item or companion file with no state entry; a leftover `parked/<sha8>` dir that still holds files (an empty one is ignored); an op a killed run left in flight that the next change settles (`pending: done` / `undone`) |
 | `error` | needs fixing: a config that exists but is unparseable or unsupported (`layout changed`), a state entry whose files (companions included) are gone or fail the tamper checks, a companion both live and parked, a flag re-enabled outside the tool, an op a killed run left in flight that needs you (`pending: stuck`, with the exact fix) |
 
 Only `error` makes the exit code `1`; each problem row names the command that
@@ -727,6 +732,7 @@ bookkeeping.
 | `log.jsonl` | one line per operation (mode `0600`), see below |
 | `mcp-backups/` | `<harness>__<server>.json`, or `<sha8>__<harness>__<server>.json` for a project `.mcp.json` (mode `0600` -- may hold auth headers) |
 | `companions/` | parked exclusive helper files |
+| `parked/user/<owner>/<dir>/` | user-scope items, e.g. `parked/user/claude/skills/<name>` (`<owner>` = the harness whose home holds the dir; a dir shared by several harnesses parks once, under its owner); an absolute OpenCode `skills.paths` dir parks under `parked/user/opencode/ext-<sha8>/` (`<sha8>` of its resolved path). Nothing is ever parked inside a harness home |
 | `parked/<sha8>/` | items parked by `--project` (`<sha8>` = first 8 hex of the SHA-1 of the resolved project dir) |
 | `profiles/` | `<name>.json` profiles (dir `0700`, files `0600`) |
 | `config.json` | [settings](#settings--config-menu) and the Telegram chat id (mode `0600`, atomic write, unknown keys kept) |
@@ -752,6 +758,28 @@ project, scope, detail}`. `batch` is one id per run (what `undo` reverses);
 local-scope MCP row has `scope: local` and its working directory in `project`).
 Older rows without `batch`/`harness` cannot be undone.
 
+### Upgrading the park layout
+
+**Breaking:** older versions parked user-scope items in a sibling dir inside
+the harness home (`~/.claude/skills-disabled/`, `~/.codex/prompts-disabled/`,
+...). Claude Code loads `commands/` and `rules/` recursively, so a park dir
+cannot nest inside a live dir either; items now park under
+`~/.agent-toggle/parked/user/`. Run once after upgrading:
+
+```sh
+agent-toggle migrate
+```
+
+It moves every child of each `<dir>-disabled/` into its new park dir with the
+same crash-safe move `disable` uses, repoints the matching `parked_at` entries
+in `state.json`, and removes the emptied old dir. Items with no state entry
+move too (they stay disabled). A name that already exists at the destination is
+refused and left where it is (exit `1`, the row names it); resolve it and re-run.
+A second run changes nothing and says so. Until then `enable` refuses an item
+still in an old dir with `run: agent-toggle migrate`, and `status` / `doctor`
+list each old dir with the same hint. Afterwards, `install-shims` offers to
+remove the old `<dir>-disabled/` lines from a harness-home `.gitignore`.
+
 ## Two guardrails, both earned
 
 **1. `safe_move()` never lets the source be renamed into the destination.**
@@ -765,10 +793,13 @@ Order matters too: `mkdir(exist_ok=True)` raises `FileExistsError` when the
 path exists as a *file*, so the `is_dir()` check has to come **before** the
 `mkdir` or it is unreachable.
 
-**2. Park dirs that are not gitignored get a warning.** Without it, every
-disable leaves dozens of deletion lines in `git status`. The warning is shown once
-per park dir, and only for a dir inside a git work tree (elsewhere `git status`
-cannot be dirtied and the `.gitignore` fix would not apply).
+**2. A park dir that is not gitignored gets a warning.** Parked items live in
+`~/.agent-toggle/parked/`, outside every harness home, so a harness repo
+(`~/.claude` as a dotfiles repo) never sees them. Only when the park dir itself
+sits inside a git work tree (a tracked `$HOME`) and is not ignored there does
+`disable` warn, once per run, with the `.gitignore` line to add; `status` tags
+each type `[NOT gitignored]` in that case. Without it, every disable would leave
+deletion lines in `git status`.
 
 ## Paths are resolved before comparison
 
@@ -847,7 +878,8 @@ PyPI: workflow `release.yml`, environment `pypi`. See
 
 ## Cross-machine behaviour
 
-Disabling is a **local** decision: park dirs are gitignored and do not sync.
+Disabling is a **local** decision: parked items live in `~/.agent-toggle/`,
+outside every harness home, and do not sync.
 But a disappearance under `skills/` is itself a tracked change, so committing
 it means other machines lose those skills on pull. The content stays in git
 history — `git checkout <commit> -- skills/<name>` brings it back. Don't

{agent_toggle-0.6.2 → agent_toggle-0.7.2}/agent_toggle/__init__.py

@@ -1,3 +1,3 @@
 """agent-toggle: temporarily disable / re-enable AI-agent resources."""
 
-__version__ = "0.6.2"
+__version__ = "0.7.2"

{agent_toggle-0.6.2 → agent_toggle-0.7.2}/agent_toggle/cli.py

@@ -23,9 +23,10 @@ Usage:
     agent_toggle.py list [<type>] [--project D] # what is currently disabled
     agent_toggle.py status                     # health check
     agent_toggle.py doctor [--harness H]       # drift + state check (y/n fixes on a TTY); exit 1 on problems
-    agent_toggle.py migrate                    # import old ~/.claude-toggle state
+    agent_toggle.py migrate                    # import old state, move legacy park dirs
     agent_toggle.py profile save|apply|diff|list [name|file] [--out F] [--dry-run]
-    agent_toggle.py install-shims [--dry-run]  # write the skill shim into each harness
+    agent_toggle.py install-shims [--dry-run] [--gitignore | --no-gitignore]
+                                               # skill shim per harness; stale .gitignore lines
     agent_toggle.py config [--json]            # settings menu (curses, else numbered list)
     agent_toggle.py config test|sync-ci        # Telegram test message / GitHub CI secrets
     agent_toggle.py help [command]             # styled help (also --help, <command> --help)
@@ -63,9 +64,15 @@ from . import (
 )
 from . import help as helptext
 from .backends.plugin_cli import claude_bin
-from .fs import gitignored
 from .harnesses import TYPES, harness_of, harnesses, project_view
-from .mechanisms import dir_view, settle, sync_marker_note, validate_name
+from .mechanisms import (
+    dir_view,
+    legacy_parks,
+    migrate_parks,
+    settle,
+    sync_marker_note,
+    validate_name,
+)
 from .output import COLOR_MODES, CliError, Result, die, scan_color, use_color
 from .store import load_state, save_state
 from .ui import theme as ui_theme
@@ -157,10 +164,16 @@ def cmd_status(state: dict, out: Result, only: str | None = None,
         out.say(f"legacy  {legacy_state_dir} present -- "
                 + ("already imported; safe to delete once verified" if done
                    else "run `migrate` to import it"))
+    table = harnesses()
+    old_parks = [str(old) for old, _, _ in legacy_parks(table, only)]
+    for old in old_parks:
+        out.say(f"WARNING {old} is a legacy park dir -- run: agent-toggle migrate", warn=True)
     out.row(None, None, None, "status", "ok", "", show=False,
             state_file=str(fs.state_file()), log_file=str(fs.log_file()),
-            disabled=len(state["disabled"]), claude_cli=claude, legacy=legacy)
-    table = harnesses()
+            disabled=len(state["disabled"]), claude_cli=claude, legacy=legacy,
+            legacy_parks=old_parks)
+    # every user park dir sits under parked_dir(): one check, not one per dir
+    ign = fs.park_unignored() is None
     for hname, h in table.items():
         if (only and hname != only) or hname in hidden:
             continue
@@ -185,7 +198,6 @@ def cmd_status(state: dict, out: Result, only: str | None = None,
             items: list[Path] = []
             untracked: list[Path] = []
             twins: list[str] = []
-            ign = True
             shared: set[str] = set()
             for sub in h.dirs[t]:
                 view = dir_view(table, hname, t, home, sub)
@@ -204,8 +216,6 @@ def cmd_status(state: dict, out: Result, only: str | None = None,
                     found = [p for p in parked.rglob("*") if p.is_file()]
                 found = [p for p in found if not p.name.startswith(".")]   # .DS_Store, as doctor
                 items += found
-                ign = ign and gitignored(
-                    parked, home if view.owner == hname else table[view.owner].home)
                 u, tw = parked_drift(found, parked, home / sub, tracked)
                 untracked += u
                 twins += tw
@@ -345,15 +355,21 @@ def cmd_toggle(args: argparse.Namespace, out: Result) -> None:
 
 
 def cmd_migrate(out: Result) -> None:
+    """Import ~/.claude-toggle state, then move legacy `<live>-disabled` park dirs into
+    the central park dir (a killed run is repaired by the next one: see migrate_parks)."""
     buf = io.StringIO()             # store.migrate prints; fold it into the result
     with fs.lock():
         state = load_state()
         with contextlib.redirect_stdout(buf):
             store.migrate(state)
+        parks = migrate_parks(state)
         save_state(state)
-    lines = buf.getvalue().splitlines()
-    out.say(buf.getvalue().rstrip("\n"))
-    out.row(None, None, None, "migrate", "ok", "; ".join(lines), show=False)
+    lines = buf.getvalue().splitlines() + (
+        parks or ["park dirs: nothing to migrate (no legacy <dir>-disabled/ dirs left)"])
+    out.say("\n".join(lines))
+    refused = [ln for ln in parks if ln.startswith("refused:")]
+    out.row(None, None, None, "migrate", "error" if refused else "ok", "; ".join(lines),
+            show=False)
 
 
 SHIMS = Path(__file__).with_name("shims")
@@ -405,16 +421,15 @@ def _reads_as(p: Path, text: str) -> bool:
 
 def cmd_install_shims(args: argparse.Namespace, out: Result) -> None:
     """Write <home>/skills/agent-toggle/SKILL.md into every installed harness that
-    supports skills; keep park dirs out of an existing harness-home .gitignore.
-    A file there that is not our shim (no SHIM_MARKER) is refused, never overwritten.
-    A harness switched off in settings is skipped unless named with --harness."""
+    supports skills, then offer to drop stale legacy park-dir lines from a harness-home
+    .gitignore (_stale_ignore_lines). A file there that is not our shim (no
+    SHIM_MARKER) is refused, never overwritten. A harness switched off in settings is
+    skipped unless named with --harness."""
     table = harnesses()
     on = set(settings.enabled_harnesses())
-    park = sorted({f"{sub}-disabled" for h in table.values()
-                   for subs in h.dirs.values() for sub in subs
-                   if not Path(sub).is_absolute()})     # skills.paths redirects live elsewhere
     verb = "would install" if args.dry_run else "installed"
     installed = found = 0
+    homes = []
     for hname, h in table.items():
         home = h.home
         if args.harness and hname != args.harness:
@@ -430,6 +445,7 @@ def cmd_install_shims(args: argparse.Namespace, out: Result) -> None:
                     show=False, home=str(home))
             out.say(f"  skipped {hname} (off in settings)")
             continue
+        homes.append(h)
         # dirs[0] is OpenCode's first skills.paths redirect when set; if its parent dir
         # is missing, fall back to the first in-home dir instead of creating a tree.
         subs = h.dirs["skill"]
@@ -473,23 +489,62 @@ def cmd_install_shims(args: argparse.Namespace, out: Result) -> None:
             out.say(f"    note: {hname} also loads {', '.join(map(str, others))} (a different "
                     f"shim); which one wins is unchecked")
         installed += 1
-        # A tracked park dir turns every disable into deletion noise in
-        # `git status`; only touch a .gitignore that already exists.
-        ignore = home / ".gitignore"
-        if ignore.is_file():
-            body = ignore.read_text(encoding="utf-8")
-            missing = [f"{d}/" for d in park if f"{d}/" not in body.splitlines()]
-            if missing and not args.dry_run:
-                with ignore.open("a", encoding="utf-8") as fh:
-                    fh.write(("" if body.endswith("\n") or not body else "\n")
-                             + "".join(f"{m}\n" for m in missing))
-            if missing:
-                out.say(f"  gitignore  {ignore}: {' '.join(missing)}")
+    for h in homes if not args.no_gitignore else ():
+        _stale_ignore_lines(h, args, out)
     if not found:
         die("no harness found", 4)
     out.say(f"{installed} harness(es) {'planned' if args.dry_run else 'installed'}")
 
 
+def _stale_ignore_lines(h, args: argparse.Namespace, out: Result) -> None:
+    """Older versions of install-shims appended `<sub>-disabled/` to a harness-home .gitignore.
+    Parks are central now, so offer to drop exactly those lines (never add any): only in
+    a git work tree, and only once `migrate` has emptied the legacy dir a line covers."""
+    ignore = h.home / ".gitignore"
+    if not ignore.is_file() or fs.git_toplevel(h.home) is None:
+        return
+    # older versions wrote EVERY harness's park names into each home, so match them all
+    legacy = {fs.legacy_park(Path(sub)).as_posix() + "/": fs.legacy_park(h.home / sub)
+              for t in harnesses().values() for subs in t.dirs.values() for sub in subs
+              if not Path(sub).is_absolute()}
+    try:
+        lines = ignore.read_bytes().decode("utf-8").splitlines(keepends=True)
+    except (OSError, UnicodeDecodeError) as e:
+        out.say(f"  gitignore  {ignore}: unreadable ({e}); stale park-dir lines not checked")
+        return
+
+    def report(status: str, lines_: list[str], what: str) -> None:
+        msg = f"{ignore}: {what}"
+        out.say(f"  gitignore  {msg}")
+        out.row(h.name, None, None, "install-shims", status, msg, show=False,
+                gitignore=str(ignore), stale=lines_)
+
+    stale = list(dict.fromkeys(ln.rstrip("\r\n") for ln in lines if ln.rstrip("\r\n") in legacy))
+    if busy := [s for s in stale if legacy[s].exists() or legacy[s].is_symlink()]:
+        report("skipped", busy, f"{' '.join(busy)} still cover(s) a legacy park dir -- "
+                                f"run `agent-toggle migrate` first, then re-run install-shims")
+    if not (stale := [s for s in stale if s not in busy]):
+        return
+    shown = " ".join(stale)
+    if ignore.is_symlink():          # an atomic replace would turn the link into a file
+        return report("skipped", stale, f"stale {shown} (a symlink: remove them by hand)")
+    if args.dry_run:
+        return report("planned", stale, f"would remove stale {shown}")
+    if not args.gitignore and not (args.prompt and _interactive(out)):
+        return report("skipped", stale, f"stale {shown} (re-run with --gitignore to remove)")
+    if not args.gitignore:
+        try:
+            yes = input(f"remove stale park-dir lines from {ignore}? [y/N] ").strip().lower()
+        except EOFError:
+            yes = ""
+        if yes not in ("y", "yes"):
+            return report("skipped", stale, f"kept stale {shown}")
+    # every other line, ending included, is kept byte for byte
+    keep = "".join(ln for ln in lines if ln.rstrip("\r\n") not in stale)
+    fs.atomic_write(ignore, keep, mode=ignore.stat().st_mode & 0o777, newline="")
+    report("ok", stale, f"removed stale {shown}")
+
+
 COMMANDS = ("ui", "pick", "status", "list", "cost", "migrate", "disable", "enable",
             "install-shims", "profile", "undo", "doctor", "config")
 _GLOBAL_FLAGS = ("--json", "-v", "--verbose")
@@ -604,10 +659,18 @@ def build_parser() -> argparse.ArgumentParser:
     cp.add_argument("--type", choices=TYPES, help="only this resource type")
     cp.add_argument("--project", metavar="dir",
                     help="price this project's <dir>/.claude and <dir>/.mcp.json, not user scope")
-    sub.add_parser("migrate", parents=[common], help="import an older ~/.claude-toggle state")
+    sub.add_parser("migrate", parents=[common],
+                   help="import ~/.claude-toggle state; move legacy park dirs")
     sp = sub.add_parser("install-shims", parents=[common],
                         help="write the skill shim into every installed harness")
     sp.add_argument("--dry-run", action="store_true", help="show the plan; change nothing")
+    gi = sp.add_mutually_exclusive_group()
+    gi.add_argument("--gitignore", action="store_true",
+                    help="remove stale legacy park-dir lines from harness .gitignore files "
+                         "without asking")
+    gi.add_argument("--no-gitignore", action="store_true",
+                    help="skip the stale park-dir line check")
+    sp.set_defaults(prompt=True)        # the config menu passes False: no y/n under curses
     pp = sub.add_parser("profile", parents=[common],
                         help="save / apply / diff / list named sets of live items")
     pp.add_argument("action", help="save | apply | diff | list")

{agent_toggle-0.6.2 → agent_toggle-0.7.2}/agent_toggle/doctor.py

@@ -20,7 +20,7 @@ from . import fs, ops, store
 from .backends.flag_json import jsonc_loads
 from .backends.mcp_json import claude_mcp_config
 from .harnesses import Harness, harnesses
-from .mechanisms import _refusal, dir_view, settle
+from .mechanisms import _refusal, dir_view, legacy_parks, settle
 from .output import CliError, Result
 from .store import load_state
 
@@ -152,11 +152,12 @@ def _check_layout(out: Result, h: Harness, table: dict) -> None:
     start = len(out.rows)
     for type_, subs in h.dirs.items():
         views = [dir_view(table, h.name, type_, h.home, s) for s in subs]
+        # a legacy sibling park dir still counts: cmd_doctor reports it
         cands = [p for s, v in zip(subs, views) for c in (h.home / s, v.live)
-                 for p in (c, c.with_name(c.name + "-disabled"))]
+                 for p in (c, fs.legacy_park(c))] + [v.parked for v in views]
         if not any(p.exists() or p.is_symlink() for p in cands):
             _row(out, h.name, type_, None, "absent",
-                 f"no {' / '.join(subs)} dir (or *-disabled park dir) under {h.home}")
+                 f"no {' / '.join(subs)} dir under {h.home} (and nothing parked)")
         if others := sorted({x for v in views for x in v.sharers} - {h.name}):
             _row(out, h.name, type_, None, "note", f"dir shared with {', '.join(others)} "
                  f"(disable here also affects them)")
@@ -369,7 +370,7 @@ def _check_orphans(out: Result, state: dict, table: dict, only: str | None,
             pass
     root = fs.parked_dir()
     for d in sorted(root.iterdir()) if root.is_dir() else ():
-        if d.name.startswith("."):
+        if d.name.startswith(".") or d == fs.parked_dir() / "user":   # user scope: see above
             continue
         if d.name not in digests:
             if d.is_dir() and not d.is_symlink() and not any(
@@ -473,6 +474,9 @@ def cmd_doctor(harness: str | None, out: Result) -> list[Fix]:
         _row(out, harness, None, None, "note", f"not installed ({table[harness].home} does not exist)")
     for h in installed:
         _check_layout(out, h, table)
+    for old, v, type_ in legacy_parks(table, harness):     # once per dir, shared or not
+        _row(out, v.owner, type_, None, "warn", f"{old} is a legacy park dir (items now park "
+             f"under {v.parked}); fix: run: agent-toggle migrate")
     try:
         state = load_state(write_back=False, check_entries=False)    # bad entries get rows
     except CliError as e:

{agent_toggle-0.6.2 → agent_toggle-0.7.2}/agent_toggle/fs.py

@@ -8,6 +8,7 @@ from __future__ import annotations
 
 import contextlib
 import errno
+import hashlib
 import importlib
 import json
 import os
@@ -18,7 +19,8 @@ from pathlib import Path
 
 TEXT_SUFFIXES = {".md", ".sh", ".py", ".js", ".mjs", ".cjs", ".ts", ".json",
                  ".yaml", ".yml", ".toml", ".txt", ".zsh", ".bash"}
-# Directories never worth walking when deciding if a companion is shared.
+# Directories never worth walking when deciding if a companion is shared. The
+# `*-disabled` names are legacy sibling park dirs, still there until `migrate`.
 PRUNE = {".git", "node_modules", "cache", "__pycache__", "dist", "build",
          "skills-disabled", "agents-disabled", "commands-disabled", "rules-disabled",
          "prompts-disabled", "command-disabled", "venv"}
@@ -70,6 +72,30 @@ def parked_dir() -> Path:
     return state_dir() / "parked"
 
 
+def user_park(owner: str, sub: str) -> Path:
+    """Where `owner`'s user-scope items from `<owner home>/<sub>` park: never inside a
+    harness home (Claude Code loads commands/ and rules/ recursively, so a park dir
+    nested there would still load). An absolute sub (an OpenCode skills.paths
+    redirect) parks as ext-<sha1(its resolved path)[:8]>."""
+    base = parked_dir() / "user" / owner
+    if not Path(sub).is_absolute():
+        return base / sub
+    return base / f"ext-{hashlib.sha1(str(Path(sub).resolve()).encode('utf-8')).hexdigest()[:8]}"
+
+
+def legacy_park(live: Path) -> Path:
+    """The legacy sibling park dir `<live>-disabled`: only `migrate` and its hints use it."""
+    return live.with_name(live.name + "-disabled")
+
+
+def park_unignored() -> Path | None:
+    """The work-tree root holding parked_dir() WITHOUT ignoring it (e.g. a tracked $HOME),
+    else None: outside any work tree a park dir cannot dirty `git status`."""
+    park = parked_dir().resolve()        # git_toplevel is resolved; /var vs /private/var
+    top = git_toplevel(next(p for p in (park, *park.parents) if p.is_dir()))
+    return top if top and not gitignored(park, top) else None
+
+
 def contained(path: Path, *roots: Path) -> bool:
     """True if `path` sits inside one of `roots` (DESIGN s6.1 rows 1-2).
 
@@ -224,13 +250,14 @@ def lock():
             pass
 
 
-def atomic_write(path: Path, text: str, mode: int = 0o600) -> None:
-    """Write `text` to `path` via a same-dir tmp file created with `mode`."""
+def atomic_write(path: Path, text: str, mode: int = 0o600, newline: str | None = None) -> None:
+    """Write `text` to `path` via a same-dir tmp file created with `mode`.
+    `newline=""` writes line endings as given (a user file edited in place)."""
     tmp = path.with_name(f".{path.name}.{os.getpid()}.tmp")
     tmp.unlink(missing_ok=True)          # leftover from a crashed run with our PID
     fd = os.open(tmp, os.O_CREAT | os.O_EXCL | os.O_WRONLY, mode)
     try:
-        with os.fdopen(fd, "w", encoding="utf-8") as fh:
+        with os.fdopen(fd, "w", encoding="utf-8", newline=newline) as fh:
             fh.write(text)
             fh.flush()
             os.fsync(fh.fileno())
@@ -389,6 +416,9 @@ def safe_move(src: Path, dest_dir: Path) -> Path:
     if target.exists() or target.is_symlink():
         raise FileExistsError(f"{target} already exists -- refusing to overwrite")
 
+    if src.is_symlink() and link_text(src, dest_dir) != os.readlink(src):
+        _copy_move(src, target)         # a rename keeps the relative text, now dangling
+        return target
     try:
         os.rename(src, target)                      # same filesystem: one atomic step
     except OSError as e:
@@ -398,6 +428,17 @@ def safe_move(src: Path, dest_dir: Path) -> Path:
     return target
 
 
+def link_text(src: Path, dest_dir: Path) -> str:
+    """The symlink `src`'s text as seen from `dest_dir`: a relative link keeps its target,
+    not its text, since parks sit at another depth (skills/ vs parked/user/<h>/skills/)."""
+    link = os.readlink(src)
+    if os.path.isabs(link):
+        return link
+    # the kernel resolves a relative link from the link's physical dir
+    target = os.path.normpath(os.path.join(os.path.realpath(src.parent), link))
+    return os.path.relpath(target, os.path.realpath(dest_dir))
+
+
 def move_leftovers(src: Path, target: Path) -> tuple[Path, Path]:
     """(half copy, trash) a killed cross-fs move can leave beside `target` / `src`."""
     return (target.with_name(f".{target.name}.agent-toggle-tmp"),
@@ -450,7 +491,7 @@ def _copy_move(src: Path, target: Path) -> None:
     remove_leftover(tmp)                 # a killed earlier attempt's half copy
     try:
         if src.is_symlink():
-            os.symlink(os.readlink(src), tmp)
+            os.symlink(link_text(src, target.parent), tmp)
         elif src.is_dir():
             shutil.copytree(src, tmp, symlinks=True)
         else: