dotagents-cli 0.6.0__tar.gz → 0.6.1__tar.gz

{dotagents_cli-0.6.0 → dotagents_cli-0.6.1}/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.6.1] - 2026-09-27
+
+### Fixed
+
+- Re-running `init` after an upgrade from 0.5.x replaces the `CwdChanged` hooks
+  and Codex's `PreToolUse` hook that release wrote, instead of adding the new
+  ones beside them (every `cd` ran both, and the old one still wrote the
+  unquoted project path). A hook an earlier release wrote is recognised by its
+  label and a command that runs dotagents, reads `AGENTS.md` or
+  `AGENTS_PROJECT_ROOT`, or runs one of dotagents' hook scripts.
+
 ## [0.6.0] - 2026-09-25
 
 ### Added
@@ -1280,7 +1291,8 @@ Patch release: the PATH/POSIX-conversion fix above (the only change since 0.3.0)
   affected module sources (`dotagents.cli`, `duho.presets`) to extracted temp files
   before dispatch; a no-op for a plain install.
 
-[Unreleased]: https://github.com/jose-pr/dotagents/compare/v0.6.0...HEAD
+[Unreleased]: https://github.com/jose-pr/dotagents/compare/v0.6.1...HEAD
+[0.6.1]: https://github.com/jose-pr/dotagents/compare/v0.6.0...v0.6.1
 [0.6.0]: https://github.com/jose-pr/dotagents/compare/v0.5.1...v0.6.0
 [0.5.1]: https://github.com/jose-pr/dotagents/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/jose-pr/dotagents/compare/v0.4.0...v0.5.0

{dotagents_cli-0.6.0 → dotagents_cli-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: dotagents-cli
-Version: 0.6.0
+Version: 0.6.1
 Summary: The dotagents CLI: install and manage a portable ~/.agents config for AI coding agents
 Project-URL: Homepage, https://github.com/jose-pr/dotagents/
 Project-URL: Repository, https://github.com/jose-pr/dotagents

{dotagents_cli-0.6.0 → dotagents_cli-0.6.1}/src/dotagents/__init__.py

@@ -1,3 +1,3 @@
 """dotagents: installable CLI for the dotagents agent-config payload."""
 
-__version__ = "0.6.0"
+__version__ = "0.6.1"

{dotagents_cli-0.6.0 → dotagents_cli-0.6.1}/src/dotagents/_hooks.py

@@ -25,6 +25,7 @@ the ``.pyz``.
 from __future__ import annotations
 
 import json
+import re
 from pathlib import Path
 from typing import Any, Optional
 
@@ -32,9 +33,19 @@ from typing import Any, Optional
 #: Our hooks' statusMessage is `STATUS_PREFIX + label`, so a foreign hook that
 #: happens to use the same generic label ("Loading agent context") is never
 #: taken for ours. The bare label an earlier release wrote is still ours when
-#: the hook's command runs dotagents, so those hooks converge to the new one.
+#: the hook's command is recognisably dotagents' (:data:`_LEGACY_COMMAND`), so
+#: those hooks converge to the new one instead of running beside it.
 STATUS_PREFIX = "dotagents: "
 
+#: What every command an earlier release wrote contains: `dotagents` itself
+#: (SessionStart, the PowerShell loader), the project pin or `AGENTS.md`
+#: (CwdChanged, which never names dotagents), or one of the deployed hook
+#: scripts (Codex, Antigravity: `python3 ".../pretooluse_codex_env.py"`).
+_LEGACY_COMMAND = re.compile(
+    r"dotagents|AGENTS_PROJECT_ROOT|AGENTS\.md"
+    r"|(?:sessionstart_codex_context|pretooluse_codex_env|preinvocation_antigravity_context)\.py"
+)
+
 #: The hook keys dotagents manages; any other key a user added (a `timeout`,
 #: say) survives a refresh.
 _MANAGED_KEYS = frozenset({"type", "command", "shell", "commandWindows", "statusMessage"})
@@ -56,7 +67,7 @@ def _labelled_ours(hook: Any, status_message: "Optional[str]") -> bool:
     status = hook.get("statusMessage")
     if status == labels[0]:
         return True
-    return status == labels[1] and "dotagents" in str(hook.get("command", ""))
+    return status == labels[1] and bool(_LEGACY_COMMAND.search(str(hook.get("command", ""))))
 
 
 def build_hook_entry(

{dotagents_cli-0.6.0 → dotagents_cli-0.6.1}/tests/test_hooks.py

@@ -191,3 +191,38 @@ def test_status_match_does_not_touch_a_foreign_hook():
     commands = [h["command"] for e in merged for h in e["hooks"]]
     assert "mine" in commands
     assert CMD in commands
+
+
+# The exact commands 0.5.x wrote. CwdChanged never named dotagents, and the
+# Codex loader names only its script, so recognising a legacy hook by
+# "dotagents" in its command left them in place beside the new ones.
+_CWD_051 = (
+    'if [ -n "$CLAUDE_ENV_FILE" ] && [ -d .agents ]; then printf "export '
+    "AGENTS_PROJECT_ROOT='%s'\\n\" \"$(pwd -W 2>/dev/null || pwd)\" >> \"$CLAUDE_ENV_FILE\"; "
+    'fi; [ -f AGENTS.md ] && cat AGENTS.md || true'
+)
+_CWD_051_PS = (
+    "if (-not (Get-Command bash -ErrorAction SilentlyContinue)) { if (Test-Path AGENTS.md) "
+    "{ Get-Content AGENTS.md -Raw } }"
+)
+_CODEX_051 = 'python3 "/home/u/.codex/hooks/pretooluse_codex_env.py"'
+
+
+@pytest.mark.parametrize("old, label", [
+    (_CWD_051, "Checking for AGENTS.md"),
+    (_CWD_051_PS, "Checking for AGENTS.md (PowerShell)"),
+    (_CODEX_051, "Loading agent env"),
+])
+def test_every_hook_an_earlier_release_wrote_converges(old, label):
+    legacy = {"hooks": [{"type": "command", "command": old, "statusMessage": label}]}
+    merged, changed = _hooks.merge_hook([legacy], "NEW", status_message=label)
+    assert changed and len(merged) == 1, merged
+    assert merged[0]["hooks"][0]["command"] == "NEW"
+    assert merged[0]["hooks"][0]["statusMessage"] == "dotagents: " + label
+
+
+def test_a_foreign_hook_with_our_bare_label_and_unrelated_command_stays():
+    foreign = {"hooks": [{"type": "command", "command": "notify-send hi",
+                          "statusMessage": "Checking for AGENTS.md"}]}
+    merged, _ = _hooks.merge_hook([foreign], "NEW", status_message="Checking for AGENTS.md")
+    assert merged[0] == foreign and len(merged) == 2