@searls/turbocommit 0.15.2 → 0.15.3

package/README.md

@@ -25,8 +25,10 @@ turbocommit registers hooks with the harnesses you use:
 
 - **PreToolUse** tentatively claims the paths supplied to editing tools while
   recovery finishes, promotes the claim only when the tool may proceed, and
-  snapshots the repository before shell commands.
-- **PostToolUse** attributes paths that became dirty during a shell command.
+  snapshots the repository before shell commands and MCP tool calls.
+- **PostToolUse** attributes paths that became dirty during a shell command or
+  MCP tool call, so files a tool rewrites without naming them (an Xcode project
+  file, for example) belong to the session that changed them.
   Concurrent commands in one session share ownership. Commands from different
   sessions retain hashed overlap evidence instead of claiming each other's
   paths. Once every involved turn stops and no shell remains active in that

package/lib/install.js

@@ -11,11 +11,11 @@ const HOOK_DEFS = {
     hooks: [{ type: 'command', command: 'turbocommit hook pre-tool-use --harness claude' }]
   },
   PostToolUse: {
-    matcher: 'Bash',
+    matcher: 'Bash|mcp__.*',
     hooks: [{ type: 'command', command: 'turbocommit hook post-tool-use --harness claude' }]
   },
   PostToolUseFailure: {
-    matcher: 'Bash',
+    matcher: 'Bash|mcp__.*',
     hooks: [{ type: 'command', command: 'turbocommit hook post-tool-use --harness claude' }]
   },
   SessionStart: {
@@ -35,7 +35,7 @@ const CODEX_HOOK_DEFS = {
     hooks: [{ type: 'command', command: 'turbocommit hook pre-tool-use --harness codex' }]
   },
   PostToolUse: {
-    matcher: 'Bash',
+    matcher: 'Bash|mcp__.*',
     hooks: [{ type: 'command', command: 'turbocommit hook post-tool-use --harness codex' }]
   },
   SessionStart: {

package/lib/session.js

@@ -328,11 +328,10 @@ function trackingMayDescribeModifications (file) {
   } catch {
     return true
   }
+  const { describesModification } = require('./track')
   return lines.some(line => {
     try {
-      const entry = JSON.parse(line)
-      return entry.tool !== 'Bash' ||
-        (entry.phase === 'post' && Array.isArray(entry.files) && entry.files.length > 0)
+      return describesModification(JSON.parse(line))
     } catch {
       return true
     }

package/lib/track.js

@@ -45,6 +45,8 @@ const FILE_PATH_KEYS = [
   'notebook_path',
   'relative_path',
   'relativePath',
+  'sourcePath',
+  'destinationPath',
   'uri'
 ]
 const FILE_PATH_ARRAY_KEYS = ['file_paths', 'filePaths', 'paths', 'files']
@@ -124,6 +126,15 @@ function extractFilePaths (toolName, toolInput, cwd) {
   })
 }
 
+/**
+ * Bash and MCP tools change paths they never name (a shell script, an Xcode
+ * project file rewritten as a side effect), so both are attributed by
+ * snapshotting the checkout before and after the call.
+ */
+function snapshotsRepository (toolName) {
+  return toolName === 'Bash' || (typeof toolName === 'string' && toolName.startsWith('mcp__'))
+}
+
 /**
  * PreToolUse handler. Persists ownership before waiting for overlap recovery.
  * Returns false when the caller must deny the tool rather than let it run
@@ -158,9 +169,9 @@ function handleTrack (input, root, opts = {}) {
   let pendingSnapshot = false
   let preclaim = null
   try {
-    if (toolName === 'Bash') {
-      entry.command = toolInput.command
-      savePendingBashSnapshot(root, sessionId, toolUseId, cwd)
+    if (snapshotsRepository(toolName)) {
+      if (toolName === 'Bash') entry.command = toolInput.command
+      savePendingBashSnapshot(root, sessionId, toolUseId, cwd, toolName)
       pendingSnapshot = true
       appendTracking(root, sessionId, entry)
     } else {
@@ -210,7 +221,7 @@ function handlePostTrack (input, root) {
 
   const sessionId = hookInput.sessionId || hookInput.session_id
   const toolName = hookInput.toolName || hookInput.tool_name
-  if (!sessionId || toolName !== 'Bash') return
+  if (!sessionId || !snapshotsRepository(toolName)) return
 
   const toolUseId = hookInput.toolUseId || hookInput.tool_use_id
   const release = acquireBashOverlapRecoveryLock(root, 5000)
@@ -239,7 +250,7 @@ function finishBashSnapshot (root, snapshot, { cwd, endedAt }) {
   const candidates = changed.filter(file => !before.has(file) && !claimed.has(file))
   const files = overlapping ? [] : candidates
 
-  const entry = { tool: 'Bash', phase: 'post', t: endedAt, cwd }
+  const entry = { tool: snapshot.toolName || 'Bash', phase: 'post', t: endedAt, cwd }
   if (overlapping) {
     entry.overlapping = true
     entry.overlapEventId = recordBashOverlap(root, snapshot, overlaps, candidates, endedAt)
@@ -268,12 +279,13 @@ function bashSnapshotPath (root, sessionId, toolUseId) {
   return path.join(dir, key + '.json')
 }
 
-function savePendingBashSnapshot (root, sessionId, toolUseId, cwd) {
+function savePendingBashSnapshot (root, sessionId, toolUseId, cwd, toolName = 'Bash') {
   const checkout = canonicalRoot(root)
   writeBashSnapshot(root, sessionId, toolUseId, {
     root: checkout,
     cwd: cwd || checkout,
     sessionId,
+    toolName,
     toolUseId: toolUseId || null,
     createdAt: Date.now(),
     pending: true
@@ -918,12 +930,15 @@ function parseInput (input) {
 /**
  * Check whether a session has tracked any file-modifying tool calls.
  * A Bash pre-hook alone doesn't count because shell commands may be read-only.
- * A Bash post-hook counts only when its snapshot found newly dirty paths.
+ * A snapshot post-hook counts only when it found newly dirty paths.
  */
 function hasTrackedModifications (root, sessionId) {
-  return readTracking(root, sessionId).some(entry =>
-    entry.tool !== 'Bash' || (entry.phase === 'post' && Array.isArray(entry.files) && entry.files.length > 0)
-  )
+  return readTracking(root, sessionId).some(describesModification)
+}
+
+function describesModification (entry) {
+  if (entry.phase === 'post') return Array.isArray(entry.files) && entry.files.length > 0
+  return entry.tool !== 'Bash'
 }
 
 function readTracking (root, sessionId) {
@@ -986,6 +1001,7 @@ module.exports = {
   fingerprintTrackedPath,
   claimedPathsBySessions,
   hasTrackedModifications,
+  describesModification,
   cleanupTracking,
   extractFilePath,
   extractFilePaths,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@searls/turbocommit",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "Auto-commit after every AI coding agent turn",
   "bin": {
     "turbocommit": "./cli.js"