@searls/turbocommit 0.15.1 → 0.15.3

package/README.md

@@ -25,15 +25,19 @@ 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
   checkout, unchanged and otherwise-unclaimed paths are committed separately
   as recovered shell changes. Evidence is scoped to its exact worktree and is
   permanently discarded if file contents or executable modes change, or if an
-  unfinished shell snapshot expires.
+  unfinished shell snapshot expires. Claims from a session whose turn has been
+  idle for over an hour no longer block shell attribution, so a turn that never
+  stopped cannot leave its paths unowned forever.
 - **PostToolUseFailure**, **Stop**, and **SessionEnd** finalize shell snapshots
   whose normal post hook did not arrive. Claude normally finishes within its
   SessionEnd hook. If its internal deadline expires, Turbocommit stores the

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

@@ -8,6 +8,11 @@ const { turbocommitDir } = require('./session')
 const { canonicalRoot, canonicalTrackedPath, changedPathsInRepository, gitCommonDir } = require('./git')
 
 const BASH_SNAPSHOT_TTL_MS = 60 * 60 * 1000
+// A session's tracking file is rewritten on every tool call and deleted when
+// its turn stops. One that has been idle this long belongs to a turn that
+// never stopped, so its claims must not block other sessions from owning
+// paths they change with shell commands.
+const CLAIM_TTL_MS = 60 * 60 * 1000
 
 /**
  * Directory under the git common dir where turbocommit stores tracking state.
@@ -40,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']
@@ -119,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
@@ -153,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 {
@@ -205,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)
@@ -234,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)
@@ -263,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
@@ -431,9 +448,11 @@ function claimedPathsBySessions (root, excludedSessionId) {
   } catch {
     files = []
   }
+  const cutoff = Date.now() - CLAIM_TTL_MS
   for (const file of files) {
     if (file === excludedSessionId + '.jsonl' || !file.endsWith('.jsonl')) continue
     try {
+      if (fs.statSync(path.join(dir, file)).mtimeMs < cutoff) continue
       const entries = fs.readFileSync(path.join(dir, file), 'utf8').trim().split('\n')
       for (const line of entries) {
         const entry = JSON.parse(line)
@@ -452,6 +471,7 @@ function claimedPathsBySessions (root, excludedSessionId) {
   for (const file of claims) {
     if (!file.endsWith('.json')) continue
     try {
+      if (fs.statSync(path.join(claimsDir, file)).mtimeMs < cutoff) continue
       const claim = JSON.parse(fs.readFileSync(path.join(claimsDir, file), 'utf8'))
       if (claim.sessionId === excludedSessionId || !Array.isArray(claim.entry?.files)) continue
       for (const claimed of claim.entry.files) result.add(canonicalTrackedPath(claimed))
@@ -910,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) {
@@ -978,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.1",
+  "version": "0.15.3",
   "description": "Auto-commit after every AI coding agent turn",
   "bin": {
     "turbocommit": "./cli.js"