delimit-cli 4.1.48 → 4.1.50

package/lib/cross-model-hooks.js

@@ -577,14 +577,38 @@ echo ""
     const configJson = JSON.stringify(config, null, 2);
     for (const target of writeTargets) {
         try {
-            // For project settings, merge hooks into existing config
-            if (target !== configPath && fs.existsSync(target)) {
-                const existing = JSON.parse(fs.readFileSync(target, 'utf-8'));
-                existing.hooks = config.hooks;
-                fs.writeFileSync(target, JSON.stringify(existing, null, 2));
-            } else {
+            if (target === configPath) {
+                // Global ~/.claude/settings.json: write the merged config we built
                 fs.writeFileSync(target, configJson);
+                continue;
+            }
+
+            // Project settings (.claude/settings.json in cwd): merge ONLY the
+            // Delimit-added hook entries into existing project hooks. Never
+            // overwrite the project's own hook entries with global ones.
+            // Previous behavior (`existing.hooks = config.hooks`) propagated
+            // every global hook into project files, wiping project-local hooks
+            // and leaking unrelated user customizations across repos.
+            let existing = {};
+            if (fs.existsSync(target)) {
+                try { existing = JSON.parse(fs.readFileSync(target, 'utf-8')); } catch { existing = {}; }
+            }
+            if (!existing.hooks) existing.hooks = {};
+
+            for (const [event, groups] of Object.entries(config.hooks || {})) {
+                if (!Array.isArray(groups)) continue;
+                if (!existing.hooks[event]) existing.hooks[event] = [];
+                for (const group of groups) {
+                    const cmds = (group.hooks || []).map(h => h.command || '');
+                    // Only propagate Delimit-owned hook groups to project files
+                    if (!cmds.some(c => c.includes('delimit'))) continue;
+                    const alreadyHas = existing.hooks[event].some(eg =>
+                        (eg.hooks || []).some(h => cmds.includes(h.command))
+                    );
+                    if (!alreadyHas) existing.hooks[event].push(group);
+                }
             }
+            fs.writeFileSync(target, JSON.stringify(existing, null, 2));
         } catch {}
     }
     return changes;

package/lib/hooks-installer.js

@@ -185,29 +185,37 @@ class DelimitHooksInstaller {
     
     async configureClaudeCode() {
         const claudeConfigPath = path.join(process.env.HOME, '.claude.json');
-        
+
         if (fs.existsSync(claudeConfigPath)) {
             try {
                 const config = JSON.parse(fs.readFileSync(claudeConfigPath, 'utf8'));
-                
-                // Add Delimit governance hooks
+
+                // Preserve any existing hooks the user has set. Only fill in
+                // Delimit MCP hooks if those specific keys are missing —
+                // never overwrite a user-chosen preCommand/postCommand.
                 if (!config.hooks) {
                     config.hooks = {};
                 }
-                
-                config.hooks.preCommand = path.join(this.mcpHooksDir, 'pre-mcp-call');
-                config.hooks.postCommand = path.join(this.mcpHooksDir, 'post-mcp-call');
-                config.hooks.authentication = path.join(this.mcpHooksDir, 'mcp-auth');
-                config.hooks.audit = path.join(this.mcpHooksDir, 'mcp-audit');
-                
-                // Add Delimit governance settings
+                const delimitHooks = {
+                    preCommand: path.join(this.mcpHooksDir, 'pre-mcp-call'),
+                    postCommand: path.join(this.mcpHooksDir, 'post-mcp-call'),
+                    authentication: path.join(this.mcpHooksDir, 'mcp-auth'),
+                    audit: path.join(this.mcpHooksDir, 'mcp-audit'),
+                };
+                for (const [key, value] of Object.entries(delimitHooks)) {
+                    if (!config.hooks[key]) {
+                        config.hooks[key] = value;
+                    }
+                }
+
+                // Add Delimit governance settings (own namespace, safe to set)
                 config.delimitGovernance = {
                     enabled: true,
                     agent: 'http://127.0.0.1:7823',
                     mode: 'auto',
                     hooks: this.mcpHooks.map(h => path.join(this.mcpHooksDir, h))
                 };
-                
+
                 fs.writeFileSync(claudeConfigPath, JSON.stringify(config, null, 2));
                 console.log(chalk.green('  ✓ Claude Code configuration updated'));
             } catch (e) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "delimit-cli",
   "mcpName": "io.github.delimit-ai/delimit-mcp-server",
-  "version": "4.1.48",
+  "version": "4.1.50",
   "description": "Unify Claude Code, Codex, Cursor, and Gemini CLI with persistent context, governance, and multi-model debate.",
   "main": "index.js",
   "files": [
@@ -35,7 +35,7 @@
     "postinstall": "node scripts/postinstall.js",
     "sync-gateway": "bash scripts/sync-gateway.sh",
     "prepublishOnly": "bash scripts/publish-ci-guard.sh && npm run sync-gateway && bash scripts/security-check.sh",
-    "test": "node --test tests/setup-onboarding.test.js tests/setup-matrix.test.js tests/config-export-import.test.js tests/cross-model-hooks.test.js tests/golden-path.test.js tests/v420-features.test.js"
+    "test": "node --test tests/setup-onboarding.test.js tests/setup-matrix.test.js tests/setup-no-clobber.test.js tests/config-export-import.test.js tests/cross-model-hooks.test.js tests/golden-path.test.js tests/v420-features.test.js"
   },
   "keywords": [
     "openapi",

package/gateway/core/generator_drift.py

@@ -1,242 +0,0 @@
-"""Generator drift detection (LED-713).
-
-Detects when a committed generated artifact (e.g. agentspec's
-schemas/v1/agent.schema.json regenerated from a Zod source) has drifted
-from what its generator script would produce today.
-
-Use case: a maintainer changes the source of truth (Zod schema, OpenAPI
-generator, protobuf, etc.) but forgets to regenerate and commit the
-artifact. CI catches the drift before the stale generated file ships.
-
-Generic over generators — caller supplies the regen command and the
-artifact path. Returns a structured drift report that can be merged into
-the standard delimit-action PR comment.
-"""
-
-from __future__ import annotations
-
-import json
-import os
-import shlex
-import shutil
-import subprocess
-import tempfile
-from dataclasses import dataclass, field
-from pathlib import Path
-from typing import Any, Dict, List, Optional
-
-
-@dataclass
-class DriftResult:
-    drifted: bool
-    artifact_path: str
-    regen_command: str
-    changes: List[Any] = field(default_factory=list)  # JSONSchemaChange list when drift detected
-    error: Optional[str] = None
-    runtime_seconds: float = 0.0
-
-    def to_dict(self) -> Dict[str, Any]:
-        return {
-            "drifted": self.drifted,
-            "artifact_path": self.artifact_path,
-            "regen_command": self.regen_command,
-            "change_count": len(self.changes),
-            "changes": [
-                {
-                    "type": c.type.value,
-                    "path": c.path,
-                    "message": c.message,
-                    "is_breaking": c.is_breaking,
-                }
-                for c in self.changes
-            ],
-            "error": self.error,
-            "runtime_seconds": round(self.runtime_seconds, 3),
-        }
-
-
-def detect_drift(
-    repo_root: str,
-    artifact_path: str,
-    regen_command: str,
-    timeout_seconds: int = 60,
-) -> DriftResult:
-    """Check whether the committed artifact matches its generator output.
-
-    Args:
-        repo_root: Absolute path to the repo checkout.
-        artifact_path: Path to the generated artifact, relative to repo_root.
-        regen_command: Shell command that regenerates the artifact in place.
-            Example: "pnpm -r run build" or "node packages/sdk/dist/scripts/export-schema.js"
-        timeout_seconds: Hard timeout for the generator (default 60).
-
-    Returns:
-        DriftResult with drift status, classified changes, and runtime.
-    """
-    import time
-
-    repo_root_p = Path(repo_root).resolve()
-    artifact_p = (repo_root_p / artifact_path).resolve()
-
-    if not artifact_p.exists():
-        return DriftResult(
-            drifted=False,
-            artifact_path=artifact_path,
-            regen_command=regen_command,
-            error=f"Artifact not found: {artifact_path}",
-        )
-
-    # Snapshot the committed artifact before regen
-    try:
-        committed_text = artifact_p.read_text()
-        committed_doc = json.loads(committed_text)
-    except (OSError, json.JSONDecodeError) as e:
-        return DriftResult(
-            drifted=False,
-            artifact_path=artifact_path,
-            regen_command=regen_command,
-            error=f"Failed to read committed artifact: {e}",
-        )
-
-    # Parse the command safely — shell=False to avoid command injection.
-    # Users needing shell features (&&, |, env vars, etc.) should point
-    # generator_command at a script file instead of an inline chain.
-    try:
-        argv = shlex.split(regen_command)
-    except ValueError as e:
-        return DriftResult(
-            drifted=False,
-            artifact_path=artifact_path,
-            regen_command=regen_command,
-            error=f"Could not parse generator_command: {e}",
-        )
-    if not argv:
-        return DriftResult(
-            drifted=False,
-            artifact_path=artifact_path,
-            regen_command=regen_command,
-            error="generator_command is empty",
-        )
-    # Reject obvious shell metacharacters — force users to use a script
-    # file if they need chaining or redirection.
-    SHELL_META = set("&|;><`$")
-    if any(ch in token for token in argv for ch in SHELL_META):
-        return DriftResult(
-            drifted=False,
-            artifact_path=artifact_path,
-            regen_command=regen_command,
-            error="generator_command contains shell metacharacters (&|;><`$). Point it at a script file instead of chaining inline.",
-        )
-
-    # Run the regenerator
-    start = time.time()
-    try:
-        result = subprocess.run(
-            argv,
-            shell=False,
-            cwd=str(repo_root_p),
-            capture_output=True,
-            text=True,
-            timeout=timeout_seconds,
-        )
-    except subprocess.TimeoutExpired:
-        return DriftResult(
-            drifted=False,
-            artifact_path=artifact_path,
-            regen_command=regen_command,
-            error=f"Generator timed out after {timeout_seconds}s",
-            runtime_seconds=time.time() - start,
-        )
-    except FileNotFoundError as e:
-        return DriftResult(
-            drifted=False,
-            artifact_path=artifact_path,
-            regen_command=regen_command,
-            error=f"Generator executable not found: {e}",
-            runtime_seconds=time.time() - start,
-        )
-
-    runtime = time.time() - start
-
-    if result.returncode != 0:
-        return DriftResult(
-            drifted=False,
-            artifact_path=artifact_path,
-            regen_command=regen_command,
-            error=f"Generator exited {result.returncode}: {result.stderr.strip()[:500]}",
-            runtime_seconds=runtime,
-        )
-
-    # Read the regenerated artifact
-    try:
-        regen_text = artifact_p.read_text()
-        regen_doc = json.loads(regen_text)
-    except (OSError, json.JSONDecodeError) as e:
-        # Restore committed version so we don't leave the workspace dirty
-        artifact_p.write_text(committed_text)
-        return DriftResult(
-            drifted=False,
-            artifact_path=artifact_path,
-            regen_command=regen_command,
-            error=f"Failed to read regenerated artifact: {e}",
-            runtime_seconds=runtime,
-        )
-
-    # Restore the committed file before diffing — leave the workspace clean
-    artifact_p.write_text(committed_text)
-
-    # Quick equality check first
-    if committed_doc == regen_doc:
-        return DriftResult(
-            drifted=False,
-            artifact_path=artifact_path,
-            regen_command=regen_command,
-            runtime_seconds=runtime,
-        )
-
-    # Drift detected — classify the changes via the JSON Schema diff engine
-    from .json_schema_diff import JSONSchemaDiffEngine
-
-    engine = JSONSchemaDiffEngine()
-    changes = engine.compare(committed_doc, regen_doc)
-    return DriftResult(
-        drifted=True,
-        artifact_path=artifact_path,
-        regen_command=regen_command,
-        changes=changes,
-        runtime_seconds=runtime,
-    )
-
-
-def format_drift_report(result: DriftResult) -> str:
-    """Render a drift report as a markdown block for PR comments."""
-    if result.error:
-        return (
-            f"### Generator drift check\n\n"
-            f"Artifact: `{result.artifact_path}`  \n"
-            f"Status: error  \n"
-            f"Detail: {result.error}\n"
-        )
-    if not result.drifted:
-        return (
-            f"### Generator drift check\n\n"
-            f"Artifact: `{result.artifact_path}`  \n"
-            f"Status: clean (committed artifact matches generator output)  \n"
-            f"Generator runtime: {result.runtime_seconds:.2f}s\n"
-        )
-    breaking = sum(1 for c in result.changes if c.is_breaking)
-    non_breaking = len(result.changes) - breaking
-    lines = [
-        "### Generator drift check",
-        "",
-        f"Artifact: `{result.artifact_path}`  ",
-        f"Status: drifted ({len(result.changes)} change(s) — {breaking} breaking, {non_breaking} non-breaking)  ",
-        f"Generator runtime: {result.runtime_seconds:.2f}s  ",
-        "",
-        "The committed artifact does not match what the generator produces today. Re-run the generator and commit the result, or revert the source change.",
-        "",
-    ]
-    for c in result.changes:
-        marker = "breaking" if c.is_breaking else "ok"
-        lines.append(f"- [{marker}] {c.type.value} at `{c.path}` — {c.message}")
-    return "\n".join(lines) + "\n"