xtrm-tools 2.1.4 → 2.1.6

package/config/hooks.json

@@ -13,12 +13,12 @@
     ],
     "PreToolUse": [
       {
-        "matcher": "Write|Edit|MultiEdit",
+        "matcher": "Write|Edit|MultiEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
         "script": "main-guard.mjs",
         "timeout": 5000
       },
       {
-        "matcher": "Read|Edit",
+        "matcher": "Read|Edit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
         "script": "serena-workflow-reminder.py"
       },
       {
@@ -27,7 +27,7 @@
         "timeout": 30000
       },
       {
-        "matcher": "Edit|Write",
+        "matcher": "Edit|Write|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
         "script": "type-safety-enforcement.py"
       },
       {
@@ -36,7 +36,7 @@
         "timeout": 8000
       },
       {
-        "matcher": "Edit|Write|MultiEdit|NotebookEdit|mcp__serena__*",
+        "matcher": "Edit|Write|MultiEdit|NotebookEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
         "script": "beads-edit-gate.mjs",
         "timeout": 5000
       },

package/hooks/README.md

@@ -147,7 +147,7 @@ Installed globally to `~/.claude/hooks/` by `xtrm install`. Require Node.js.
 
 **Purpose**: Blocks direct file edits and dangerous git operations on protected branches (`main`/`master`). Enforces the feature-branch → PR workflow.
 
-**Trigger**: PreToolUse (`Edit|Write|MultiEdit|NotebookEdit|Bash`)
+**Trigger**: PreToolUse (`Edit|Write|MultiEdit|NotebookEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol|Bash`)
 
 **Blocks**:
 - Write/Edit/MultiEdit/NotebookEdit on protected branches
@@ -159,7 +159,7 @@ Installed globally to `~/.claude/hooks/` by `xtrm install`. Require Node.js.
 {
   "hooks": {
     "PreToolUse": [{
-      "matcher": "Edit|Write|MultiEdit|NotebookEdit|Bash",
+      "matcher": "Edit|Write|MultiEdit|NotebookEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol|Bash",
       "hooks": [{ "type": "command", "command": "node \"~/.claude/hooks/main-guard.mjs\"", "timeout": 5000 }]
     }]
   }
@@ -182,7 +182,7 @@ Installed globally to `~/.claude/hooks/` by `xtrm install`. Require Node.js.
 
 **Purpose**: Blocks file edits when the current session has not claimed a beads issue via `bd kv`. Prevents free-riding in multi-agent and multi-session scenarios.
 
-**Trigger**: PreToolUse (`Edit|Write|MultiEdit|NotebookEdit|mcp__serena__*`)
+**Trigger**: PreToolUse (`Edit|Write|MultiEdit|NotebookEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol`)
 
 **Behavior**:
 - Session has claim (`bd kv get "claimed:<session_id>"`) → allow

package/hooks/main-guard.mjs

@@ -43,7 +43,16 @@ function deny(reason) {
   process.exit(2);
 }
 
-const WRITE_TOOLS = new Set(['Edit', 'Write', 'MultiEdit', 'NotebookEdit']);
+const WRITE_TOOLS = new Set([
+  'Edit',
+  'Write',
+  'MultiEdit',
+  'NotebookEdit',
+  'mcp__serena__rename_symbol',
+  'mcp__serena__replace_symbol_body',
+  'mcp__serena__insert_after_symbol',
+  'mcp__serena__insert_before_symbol',
+]);
 
 if (WRITE_TOOLS.has(tool)) {
   deny(

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "xtrm-tools",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "Claude Code tools installer (skills, hooks, MCP servers)",
   "license": "MIT",
   "type": "module",
+  "workspaces": [
+    "cli"
+  ],
   "bin": {
     "xtrm": "cli/dist/index.cjs"
   },
@@ -29,10 +32,12 @@
     "url": "https://github.com/Jaggerxtrm/xtrm-tools/issues"
   },
   "scripts": {
-    "build": "npm run build --prefix cli",
+    "build": "npm run build --workspace cli",
+    "typecheck": "npm run typecheck --workspace cli",
     "start": "node cli/dist/index.cjs",
     "lint": "echo 'No linting configured'",
-    "test": "echo 'No tests configured'"
+    "test": "npm test --workspace cli",
+    "prepublishOnly": "npm run build"
   },
   "engines": {
     "node": ">=18.0.0"

package/project-skills/py-quality-gate/.claude/hooks/quality-check.py

@@ -218,9 +218,22 @@ def parse_json_input() -> dict:
         sys.exit(1)
 
 def extract_file_path(input_data: dict) -> str | None:
-    """Extract file path from tool input"""
+    """Extract file path from tool input, including Serena relative_path."""
     tool_input = input_data.get('tool_input', {})
-    return tool_input.get('file_path') or tool_input.get('path')
+    file_path = (
+        tool_input.get('file_path')
+        or tool_input.get('path')
+        or tool_input.get('relative_path')
+    )
+    if not file_path:
+        return None
+
+    # Serena tools pass relative_path relative to the project root.
+    if not os.path.isabs(file_path):
+        project_root = os.environ.get('CLAUDE_PROJECT_DIR') or os.getcwd()
+        return str(Path(project_root) / file_path)
+
+    return file_path
 
 def main():
     """Main entry point"""

package/project-skills/py-quality-gate/.claude/settings.json

@@ -2,7 +2,7 @@
   "hooks": {
     "PostToolUse": [
       {
-        "matcher": "Write|Edit|MultiEdit",
+        "matcher": "Write|Edit|MultiEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
         "hooks": [
           {
             "type": "command",

package/project-skills/service-skills-set/.claude/settings.json

@@ -12,7 +12,7 @@
     ],
         "PreToolUse": [
       {
-        "matcher": "Read|Write|Edit|Glob|Grep|Bash",
+        "matcher": "Read|Write|Edit|Glob|Grep|Bash|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
         "hooks": [
           {
             "type": "command",
@@ -23,7 +23,7 @@
     ],
     "PostToolUse": [
       {
-        "matcher": "Write|Edit",
+        "matcher": "Write|Edit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
         "hooks": [
           {
             "type": "command",

package/project-skills/service-skills-set/install-service-skills.py

@@ -41,12 +41,12 @@ SETTINGS_HOOKS = {
             "command": "python3 \"$CLAUDE_PROJECT_DIR/.claude/skills/using-service-skills/scripts/cataloger.py\""}]}
     ],
     "PreToolUse": [
-        {"matcher": "Read|Write|Edit|Glob|Grep|Bash",
+        {"matcher": "Read|Write|Edit|Glob|Grep|Bash|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
          "hooks": [{"type": "command",
              "command": "python3 \"$CLAUDE_PROJECT_DIR/.claude/skills/using-service-skills/scripts/skill_activator.py\""}]}
     ],
     "PostToolUse": [
-        {"matcher": "Write|Edit",
+        {"matcher": "Write|Edit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
          "hooks": [{"type": "command",
              "command": "python3 \"$CLAUDE_PROJECT_DIR/.claude/skills/updating-service-skills/scripts/drift_detector.py\" check-hook",
              "timeout": 10}]}
@@ -55,6 +55,7 @@ SETTINGS_HOOKS = {
 
 MARKER_DOC       = "# [jaggers] doc-reminder"
 MARKER_STALENESS = "# [jaggers] skill-staleness"
+MARKER_CHAIN     = "# [jaggers] chain-githooks"
 
 
 def get_project_root() -> Path:
@@ -126,25 +127,54 @@ def install_git_hooks(project_root: Path) -> None:
          f"\n{MARKER_STALENESS}\nif command -v python3 &>/dev/null && [ -f \"{staleness_script}\" ]; then\n    python3 \"{staleness_script}\" || true\nfi\n"),
     ]
 
-    changed = False
     for hook_path, marker, snippet in snippets:
         content = hook_path.read_text(encoding="utf-8")
         if marker not in content:
             hook_path.write_text(content + snippet, encoding="utf-8")
             print(f"{GREEN}  ✓{NC} {hook_path.relative_to(project_root)}")
-            changed = True
         else:
             print(f"{YELLOW}  ○{NC} already installed: {hook_path.name}")
 
-    if changed:
-        git_dir = project_root / ".git" / "hooks"
-        git_dir.mkdir(parents=True, exist_ok=True)
-        for src, name in ((pre_commit, "pre-commit"), (pre_push, "pre-push")):
-            if src.exists():
-                dest = git_dir / name
-                shutil.copy2(src, dest)
-                dest.chmod(0o755)
-        print(f"{GREEN}  ✓{NC} activated in .git/hooks/")
+    hooks_path = ""
+    try:
+        r = subprocess.run(
+            ["git", "config", "--get", "core.hooksPath"],
+            cwd=project_root,
+            capture_output=True,
+            text=True,
+            timeout=5,
+            check=False,
+        )
+        if r.returncode == 0:
+            hooks_path = r.stdout.strip()
+    except Exception:
+        hooks_path = ""
+
+    active_hooks_dir = (Path(hooks_path) if Path(hooks_path).is_absolute() else project_root / hooks_path) if hooks_path else (project_root / ".git" / "hooks")
+    activation_targets = {project_root / ".git" / "hooks", active_hooks_dir}
+
+    for hooks_dir in activation_targets:
+        hooks_dir.mkdir(parents=True, exist_ok=True)
+        for name, source_hook in (("pre-commit", pre_commit), ("pre-push", pre_push)):
+            target_hook = hooks_dir / name
+            if not target_hook.exists():
+                target_hook.write_text("#!/usr/bin/env bash\n", encoding="utf-8")
+            target_hook.chmod(0o755)
+
+            if target_hook.resolve() == source_hook.resolve():
+                continue
+
+            chain_snippet = (
+                f"\n{MARKER_CHAIN}\n"
+                f"if [ -x \"{source_hook}\" ]; then\n"
+                f"    \"{source_hook}\" \"$@\"\n"
+                "fi\n"
+            )
+            target_content = target_hook.read_text(encoding="utf-8")
+            if MARKER_CHAIN not in target_content:
+                target_hook.write_text(target_content + chain_snippet, encoding="utf-8")
+
+    print(f"{GREEN}  ✓{NC} activated in .git/hooks/")
 
 
 def main() -> None:

package/project-skills/tdd-guard/.claude/hooks/tdd-guard-pretool-bridge.cjs

@@ -0,0 +1,87 @@
+#!/usr/bin/env node
+const { readFileSync } = require('node:fs');
+const { spawnSync } = require('node:child_process');
+const path = require('node:path');
+
+const CODE_EXTENSIONS = new Set([
+  '.js', '.jsx', '.ts', '.tsx', '.mjs', '.cjs',
+  '.py', '.php', '.go', '.rs', '.java', '.kt', '.kts',
+  '.c', '.cc', '.cpp', '.cxx', '.h', '.hh', '.hpp',
+  '.cs', '.rb', '.swift', '.scala', '.lua', '.sh', '.zsh', '.bash',
+]);
+
+const SERENA_EDIT_TOOLS = new Set([
+  'mcp__serena__rename_symbol',
+  'mcp__serena__replace_symbol_body',
+  'mcp__serena__insert_after_symbol',
+  'mcp__serena__insert_before_symbol',
+]);
+
+function isEditLikeTool(toolName) {
+  if (!toolName) return false;
+  if (toolName === 'Edit' || toolName === 'Write' || toolName === 'MultiEdit' || toolName === 'TodoWrite') {
+    return true;
+  }
+  return SERENA_EDIT_TOOLS.has(toolName);
+}
+
+function pickFilePath(toolInput) {
+  if (!toolInput || typeof toolInput !== 'object') return null;
+
+  const direct = toolInput.file_path || toolInput.filePath || toolInput.path ||
+    toolInput.relative_path || toolInput.relativePath;
+  if (typeof direct === 'string' && direct.trim()) return direct;
+
+  if (Array.isArray(toolInput.edits)) {
+    for (const edit of toolInput.edits) {
+      const p = edit?.file_path || edit?.filePath || edit?.path || edit?.relative_path || edit?.relativePath;
+      if (typeof p === 'string' && p.trim()) return p;
+    }
+  }
+
+  return null;
+}
+
+function isCodeFile(filePath) {
+  if (!filePath) return true; // fail-open when no path is available
+  return CODE_EXTENSIONS.has(path.extname(filePath).toLowerCase());
+}
+
+let payloadText = '';
+try {
+  payloadText = readFileSync(0, 'utf8');
+} catch {
+  process.exit(0);
+}
+
+let payload;
+try {
+  payload = JSON.parse(payloadText);
+} catch {
+  process.exit(0);
+}
+
+const toolName = payload.tool_name || '';
+if (!isEditLikeTool(toolName)) {
+  process.exit(0);
+}
+
+const filePath = pickFilePath(payload.tool_input);
+if (!isCodeFile(filePath)) {
+  process.exit(0);
+}
+
+const result = spawnSync('tdd-guard', {
+  input: payloadText,
+  encoding: 'utf8',
+  stdio: ['pipe', 'pipe', 'pipe'],
+});
+
+if (result.stdout) process.stdout.write(result.stdout);
+if (result.stderr) process.stderr.write(result.stderr);
+
+if (result.error) {
+  process.exit(0);
+}
+
+process.exit(result.status ?? 0);

package/project-skills/tdd-guard/.claude/settings.json

@@ -2,11 +2,11 @@
   "hooks": {
     "PreToolUse": [
       {
-        "matcher": "Write|Edit|MultiEdit|TodoWrite",
+        "matcher": "Write|Edit|MultiEdit|TodoWrite|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
         "hooks": [
           {
             "type": "command",
-            "command": "tdd-guard",
+            "command": "node \"$CLAUDE_PROJECT_DIR/.claude/hooks/tdd-guard-pretool-bridge.cjs\"",
             "timeout": 30
           }
         ]

package/project-skills/tdd-guard/README.md

@@ -276,8 +276,8 @@ Type `/hooks` in Claude Code to open the hooks menu, then configure each hook. U
 **PreToolUse Hook**
 
 1. Select `PreToolUse - Before tool execution`
-2. Choose `+ Add new matcher...` and enter: `Write|Edit|MultiEdit|TodoWrite`
-3. Select `+ Add new hook...` and enter: `tdd-guard`
+2. Choose `+ Add new matcher...` and enter: `Write|Edit|MultiEdit|TodoWrite|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol`
+3. Select `+ Add new hook...` and enter: `node "$CLAUDE_PROJECT_DIR/.claude/hooks/tdd-guard-pretool-bridge.cjs"`
 4. Choose where to save
 
 **UserPromptSubmit Hook**
@@ -305,11 +305,11 @@ If you prefer to edit settings files directly, add all three hooks to your chose
   "hooks": {
     "PreToolUse": [
       {
-        "matcher": "Write|Edit|MultiEdit|TodoWrite",
+        "matcher": "Write|Edit|MultiEdit|TodoWrite|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
         "hooks": [
           {
             "type": "command",
-            "command": "tdd-guard"
+            "command": "node \"$CLAUDE_PROJECT_DIR/.claude/hooks/tdd-guard-pretool-bridge.cjs\""
           }
         ]
       }
@@ -341,6 +341,8 @@ If you prefer to edit settings files directly, add all three hooks to your chose
 
 </details>
 
+**Note**: The pretool bridge skips non-code files (for example `.md`) and forwards code edits to `tdd-guard`, which avoids false positives on documentation-only changes.
+
 ## Additional Configuration
 
 - [Custom instructions](docs/custom-instructions.md) - Customize TDD validation rules

package/project-skills/tdd-guard/docs/linting.md

@@ -42,7 +42,7 @@ The refactoring support helps by:
    1. Type `/hooks` in Claude Code
    2. Select `PostToolUse - After tool execution`
    3. Choose `+ Add new matcher...`
-   4. Enter: `Write|Edit|MultiEdit`
+   4. Enter: `Write|Edit|MultiEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol`
    5. Select `+ Add new hook...`
    6. Enter command: `tdd-guard`
    7. Choose where to save
@@ -56,7 +56,7 @@ The refactoring support helps by:
      "hooks": {
        "PostToolUse": [
          {
-           "matcher": "Write|Edit|MultiEdit",
+           "matcher": "Write|Edit|MultiEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
            "hooks": [
              {
                "type": "command",

package/project-skills/tdd-guard/reporters/jest/src/JestReporter.test-data.ts

@@ -0,0 +1,199 @@
+import type { Test, TestResult, AggregatedResult } from '@jest/reporters'
+import type { Config } from '@jest/types'
+
+// Create a minimal snapshot object that satisfies the type requirements
+const createSnapshot = (): TestResult['snapshot'] =>
+  ({
+    added: 0,
+    didUpdate: false,
+    failure: false,
+    filesAdded: 0,
+    filesRemoved: 0,
+    filesRemovedList: [],
+    filesUnmatched: 0,
+    filesUpdated: 0,
+    matched: 0,
+    total: 0,
+    unchecked: 0,
+    uncheckedKeysByFile: [],
+    unmatched: 0,
+    updated: 0,
+    // Additional properties that might be required by different versions
+    fileDeleted: false,
+    uncheckedKeys: [],
+  }) as TestResult['snapshot']
+
+// Create a minimal snapshot summary for AggregatedResult
+const createSnapshotSummary = (): AggregatedResult['snapshot'] =>
+  ({
+    added: 0,
+    didUpdate: false,
+    failure: false,
+    filesAdded: 0,
+    filesRemoved: 0,
+    filesRemovedList: [],
+    filesUnmatched: 0,
+    filesUpdated: 0,
+    matched: 0,
+    total: 0,
+    unchecked: 0,
+    uncheckedKeysByFile: [],
+    unmatched: 0,
+    updated: 0,
+  }) as AggregatedResult['snapshot']
+
+// Create a minimal Test object
+export function createTest(overrides?: Partial<Test>): Test {
+  // For test purposes, we create minimal mock implementations
+  const mockContext = {
+    config: {} as Config.ProjectConfig,
+    hasteFS: {} as never, // Using never since we don't access these properties
+    moduleMap: {} as never, // Using never since we don't access these properties
+    resolver: {} as never, // Using never since we don't access these properties
+  }
+
+  return {
+    context: mockContext,
+    duration: 100,
+    path: '/test/example.test.ts',
+    ...overrides,
+  } as Test
+}
+
+// Create a minimal TestResult object
+export function createTestResult(overrides?: Partial<TestResult>): TestResult {
+  const base: TestResult = {
+    leaks: false,
+    numFailingTests: 0,
+    numPassingTests: 1,
+    numPendingTests: 0,
+    numTodoTests: 0,
+    openHandles: [],
+    perfStats: {
+      end: 1000,
+      runtime: 100,
+      slow: false,
+      start: 900,
+      loadTestEnvironmentEnd: 950,
+      loadTestEnvironmentStart: 920,
+      setupAfterEnvEnd: 980,
+      setupAfterEnvStart: 960,
+      setupFilesEnd: 940,
+      setupFilesStart: 930,
+    },
+    skipped: false,
+    snapshot: createSnapshot(),
+    testExecError: undefined,
+    testFilePath: '/test/example.test.ts',
+    testResults: [
+      {
+        ancestorTitles: ['Example Suite'],
+        duration: 5,
+        failureDetails: [],
+        failureMessages: [],
+        fullName: 'Example Suite should pass',
+        invocations: 1,
+        location: undefined,
+        numPassingAsserts: 0,
+        retryReasons: [],
+        status: 'passed',
+        title: 'should pass',
+      },
+    ],
+    ...overrides,
+  }
+
+  // If test is failing, update the test results
+  if (overrides?.numFailingTests && overrides.numFailingTests > 0) {
+    base.testResults = [
+      {
+        ancestorTitles: ['Example Suite'],
+        duration: 5,
+        failureDetails: [{}],
+        failureMessages: ['expected 2 to be 3'],
+        fullName: 'Example Suite should fail',
+        invocations: 1,
+        location: undefined,
+        numPassingAsserts: 0,
+        retryReasons: [],
+        status: 'failed',
+        title: 'should fail',
+      },
+    ]
+  }
+
+  return base
+}
+
+// Create a minimal AggregatedResult object
+export function createAggregatedResult(
+  overrides?: Partial<AggregatedResult>
+): AggregatedResult {
+  return {
+    numFailedTestSuites: 0,
+    numFailedTests: 0,
+    numPassedTestSuites: 1,
+    numPassedTests: 1,
+    numPendingTestSuites: 0,
+    numPendingTests: 0,
+    numRuntimeErrorTestSuites: 0,
+    numTodoTests: 0,
+    numTotalTestSuites: 1,
+    numTotalTests: 1,
+    openHandles: [],
+    runExecError: undefined,
+    snapshot: createSnapshotSummary(),
+    startTime: Date.now(),
+    success: true,
+    testResults: [],
+    wasInterrupted: false,
+    ...overrides,
+  }
+}
+
+export function createUnhandledError(
+  overrides: Partial<{ name: string; message: string; stack: string }> = {}
+): AggregatedResult['runExecError'] {
+  return {
+    message: overrides.message ?? 'Cannot find module "./helpers"',
+    stack:
+      overrides.stack ??
+      "Error: Cannot find module './helpers' imported from '/src/example.test.ts'",
+    ...(overrides.name && { name: overrides.name }),
+    // SerializableError might have additional properties but these are the required ones
+  }
+}
+
+// Create a module error (testExecError) for import failures
+export function createModuleError(
+  overrides: Partial<{
+    name: string
+    message: string
+    stack: string
+    type: string
+    code: string
+  }> = {}
+): TestResult['testExecError'] {
+  return {
+    message: overrides.message ?? "Cannot find module './non-existent-module'",
+    stack:
+      overrides.stack ??
+      "Error: Cannot find module './non-existent-module'\n    at Resolver.resolveModule",
+    ...(overrides.name && { name: overrides.name }),
+    ...(overrides.type && { type: overrides.type }),
+    ...(overrides.code && { code: overrides.code }),
+  }
+}
+
+// Create a TestResult with module import error
+export function createTestResultWithModuleError(
+  overrides?: Partial<TestResult>
+): TestResult {
+  return createTestResult({
+    testExecError: createModuleError(),
+    testResults: [], // No test results when module fails to load
+    numFailingTests: 0,
+    numPassingTests: 0,
+    ...overrides,
+  })
+}