steerdev 1.1.25__tar.gz → 1.1.26__tar.gz

{steerdev-1.1.25 → steerdev-1.1.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: steerdev
-Version: 1.1.25
+Version: 1.1.26
 Summary: Backend task runner for steerdev.com - orchestrates CLI coding agents with activity reporting
 Project-URL: Homepage, https://github.com/pentoai/steerdev-agent
 Project-URL: Repository, https://github.com/pentoai/steerdev-agent

{steerdev-1.1.25 → steerdev-1.1.26}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "steerdev"
-version = "1.1.25"
+version = "1.1.26"
 description = "Backend task runner for steerdev.com - orchestrates CLI coding agents with activity reporting"
 readme = "README.md"
 authors = [

{steerdev-1.1.25 → steerdev-1.1.26}/src/steerdev_agent/setup/claude_setup.py

@@ -14,6 +14,43 @@ from loguru import logger
 
 from steerdev_agent.config.platform import PlatformConfig
 
+# Commands owned by steerdev are reconciled to the template; anything else in
+# an existing settings file is treated as user-added and left untouched.
+_STEERDEV_HOOK_PREFIX = "steerdev hooks"
+
+
+def _is_steerdev_hook_entry(entry: dict) -> bool:
+    """Return True if a hook matcher-group entry is steerdev-owned.
+
+    An entry is steerdev-owned when any of its commands invoke
+    `steerdev hooks ...`. Used to reconcile only our own hooks while
+    preserving user-added hooks on the same event.
+    """
+    for hook in entry.get("hooks", []):
+        if isinstance(hook, dict) and str(hook.get("command", "")).strip().startswith(
+            _STEERDEV_HOOK_PREFIX
+        ):
+            return True
+    return False
+
+
+def _merge_steerdev_hooks(existing_hooks: dict, template_hooks: dict) -> None:
+    """Reconcile steerdev-owned hooks into *existing_hooks* in place.
+
+    For each event in the template, drop any existing steerdev-owned entries
+    (so stale/missing definitions are replaced) while keeping user-added
+    entries, then append the template's entries. Events not in the template
+    are left untouched.
+    """
+    for event, template_entries in template_hooks.items():
+        user_entries = [
+            entry
+            for entry in existing_hooks.get(event, [])
+            if isinstance(entry, dict) and not _is_steerdev_hook_entry(entry)
+        ]
+        existing_hooks[event] = user_entries + template_entries
+
+
 # ---------------------------------------------------------------------------
 # CLI dependency checking
 # ---------------------------------------------------------------------------
@@ -319,13 +356,18 @@ class ClaudeSetup:
                 if rule not in existing["permissions"]["allow"]:
                     existing["permissions"]["allow"].append(rule)
 
-            # Merge hooks configuration if include_hooks=True
+            # Reconcile hooks configuration if include_hooks=True.
+            #
+            # The template hooks are steerdev-owned (their commands all start
+            # with `steerdev hooks`). We reconcile them by command identity so
+            # that pre-existing settings files self-heal when new steerdev
+            # hooks are added (e.g. the PostToolUse checkpoint-push hook) or
+            # when an existing steerdev hook's definition changes. Any
+            # user-added hooks on the same event are preserved untouched.
             if include_hooks and "hooks" in new_settings:
                 if "hooks" not in existing:
                     existing["hooks"] = {}
-                for hook_event, hook_configs in new_settings["hooks"].items():
-                    if hook_event not in existing["hooks"]:
-                        existing["hooks"][hook_event] = hook_configs
+                _merge_steerdev_hooks(existing["hooks"], new_settings["hooks"])
 
             settings_path.write_text(json.dumps(existing, indent=2) + "\n")
             logger.info(f"Updated existing settings: {settings_path}")

{steerdev-1.1.25 → steerdev-1.1.26}/src/steerdev_agent/workspace/project_manager.py

@@ -45,6 +45,10 @@ class ProjectManager:
             local_path = self._resolve_path(assignment)
             if local_path and local_path.is_dir():
                 self._path_cache[assignment.project_id] = local_path
+                # Existing checkout: reconcile .claude config so settings files
+                # that predate newer steerdev hooks (e.g. the PostToolUse
+                # checkpoint-push hook) self-heal on every dispatch.
+                self._reconcile_settings(local_path)
                 continue
 
             # Project not found locally — bootstrap it
@@ -55,6 +59,19 @@ class ProjectManager:
             except Exception:
                 logger.exception(f"Failed to setup project {assignment.project_id}")
 
+    def _reconcile_settings(self, project_dir: Path) -> None:
+        """Re-apply steerdev-owned .claude/settings.json hooks for an existing
+        checkout. Idempotent and best-effort: a setup failure must never block
+        an otherwise-usable project.
+        """
+        from steerdev_agent.setup.claude_setup import ClaudeSetup
+
+        try:
+            setup = ClaudeSetup(project_dir, install_target="project")
+            setup.setup_settings(force=False, include_hooks=True)
+        except Exception:
+            logger.exception(f"Failed to reconcile .claude settings for {project_dir}")
+
     async def setup_project(self, assignment: ProjectAssignment) -> Path | None:
         """Bootstrap a project using existing setup primitives.
 

{steerdev-1.1.25 → steerdev-1.1.26}/tests/test_claude_setup.py

@@ -51,6 +51,76 @@ class TestClaudeSetup:
         )  # skill now references merge skills by name
 
 
+class TestSettingsHookReconciliation:
+    """Tests for steerdev-owned hook reconciliation in setup_settings."""
+
+    @staticmethod
+    def _commands(settings: dict, event: str) -> list[str]:
+        commands = []
+        for entry in settings.get("hooks", {}).get(event, []):
+            for hook in entry.get("hooks", []):
+                commands.append(hook.get("command"))
+        return commands
+
+    def test_fresh_create_includes_post_tool_use(self, tmp_path):
+        import json
+
+        setup = ClaudeSetup(project_dir=tmp_path)
+
+        path = setup.setup_settings(force=False, include_hooks=True)
+        settings = json.loads(path.read_text())
+
+        assert "steerdev hooks post-tool-use" in self._commands(settings, "PostToolUse")
+
+    def test_stale_file_self_heals_post_tool_use(self, tmp_path):
+        """A settings file predating the PostToolUse hook gains it on re-run."""
+        import json
+
+        stale = {
+            "permissions": {"allow": ["Bash(git commit:*)"]},
+            "hooks": {
+                "SessionStart": [
+                    {"hooks": [{"type": "command", "command": "steerdev hooks session-start"}]}
+                ]
+            },
+        }
+        claude_dir = tmp_path / ".claude"
+        claude_dir.mkdir(parents=True)
+        (claude_dir / "settings.json").write_text(json.dumps(stale))
+
+        setup = ClaudeSetup(project_dir=tmp_path)
+        path = setup.setup_settings(force=False, include_hooks=True)
+        settings = json.loads(path.read_text())
+
+        assert "steerdev hooks post-tool-use" in self._commands(settings, "PostToolUse")
+        # Pre-existing steerdev hook is reconciled, not duplicated.
+        assert self._commands(settings, "SessionStart").count("steerdev hooks session-start") == 1
+
+    def test_user_added_hooks_preserved(self, tmp_path):
+        import json
+
+        existing = {
+            "hooks": {
+                "PostToolUse": [
+                    {
+                        "matcher": "Write",
+                        "hooks": [{"type": "command", "command": "my-custom-linter"}],
+                    }
+                ]
+            },
+        }
+        claude_dir = tmp_path / ".claude"
+        claude_dir.mkdir(parents=True)
+        (claude_dir / "settings.json").write_text(json.dumps(existing))
+
+        setup = ClaudeSetup(project_dir=tmp_path)
+        path = setup.setup_settings(force=False, include_hooks=True)
+        commands = self._commands(json.loads(path.read_text()), "PostToolUse")
+
+        assert "my-custom-linter" in commands
+        assert "steerdev hooks post-tool-use" in commands
+
+
 class TestCheckCliDependencies:
     """Tests for CLI dependency checking."""