@searls/turbocommit 0.13.0 → 0.13.2

package/lib/doctor.js

@@ -53,7 +53,10 @@ function doctorLegacy (settingsPath, cwd) {
     const missing = Object.keys(HOOK_DEFS).filter(event =>
       !hasTurbocommit((settings.hooks && settings.hooks[event]) || [])
     )
-    checks.push({ name: 'Hooks installed', status: 'error', message: `Missing hooks: ${missing.join(', ')}. Run: turbocommit uninstall && turbocommit install` })
+    const message = missing.length > 0
+      ? `Missing hooks: ${missing.join(', ')}. Run: turbocommit uninstall && turbocommit install`
+      : 'Outdated hooks (missing the --harness flag); Claude sessions may be misparsed. Run: turbocommit install'
+    checks.push({ name: 'Hooks installed', status: 'error', message })
     return { ok: false, checks }
   }
   checks.push({ name: 'Hooks installed', status: 'ok', message: `All ${Object.keys(HOOK_DEFS).length} hooks installed` })

package/lib/harness.js

@@ -48,8 +48,14 @@ function selectedHarnesses (harness, { create = false } = {}) {
 }
 
 function inferHarness (hookInput, forcedHarness) {
+  // The installed hooks pass an explicit --harness flag, which is the source of
+  // truth. Inference is only a fallback for legacy flagless installs.
+  //
+  // We deliberately do NOT sniff `hook_event_name`: current Claude Code hook
+  // payloads include it too, so treating its presence as a Codex signal
+  // misroutes every Claude session into the Codex transcript parser (which
+  // yields zero pairs and a "(no transcript)" commit body). Default to Claude.
   if (forcedHarness) return forcedHarness
-  if (hookInput && hookInput.hook_event_name) return 'codex'
   return 'claude'
 }
 

package/lib/install.js

@@ -8,34 +8,34 @@ const { selectedHarnesses, claudeHome, codexHome } = require('./harness')
 const HOOK_DEFS = {
   PreToolUse: {
     matcher: 'Write|Edit|MultiEdit|NotebookEdit|Bash|mcp__.*',
-    hooks: [{ type: 'command', command: 'turbocommit hook pre-tool-use' }]
+    hooks: [{ type: 'command', command: 'turbocommit hook pre-tool-use --harness claude' }]
   },
   SessionStart: {
-    hooks: [{ type: 'command', command: 'turbocommit hook session-start' }]
+    hooks: [{ type: 'command', command: 'turbocommit hook session-start --harness claude' }]
   },
   SessionEnd: {
-    hooks: [{ type: 'command', command: 'turbocommit hook session-end' }]
+    hooks: [{ type: 'command', command: 'turbocommit hook session-end --harness claude' }]
   },
   Stop: {
-    hooks: [{ type: 'command', command: 'turbocommit hook stop' }]
+    hooks: [{ type: 'command', command: 'turbocommit hook stop --harness claude' }]
   }
 }
 
 const CODEX_HOOK_DEFS = {
   PreToolUse: {
     matcher: 'Write|Edit|MultiEdit|NotebookEdit|Bash|mcp__.*',
-    hooks: [{ type: 'command', command: 'turbocommit hook pre-tool-use' }]
+    hooks: [{ type: 'command', command: 'turbocommit hook pre-tool-use --harness codex' }]
   },
   SessionStart: {
     matcher: 'resume|clear',
-    hooks: [{ type: 'command', command: 'turbocommit hook session-start' }]
+    hooks: [{ type: 'command', command: 'turbocommit hook session-start --harness codex' }]
   },
   PreCompact: {
     matcher: 'manual|auto',
-    hooks: [{ type: 'command', command: 'turbocommit hook pre-compact' }]
+    hooks: [{ type: 'command', command: 'turbocommit hook pre-compact --harness codex' }]
   },
   Stop: {
-    hooks: [{ type: 'command', command: 'turbocommit hook stop' }]
+    hooks: [{ type: 'command', command: 'turbocommit hook stop --harness codex' }]
   }
 }
 
@@ -55,20 +55,37 @@ function hasTurbocommit (groups) {
   })
 }
 
+/**
+ * Check whether the exact expected command is already installed for an event.
+ * Requiring an exact match (not just any turbocommit hook) means legacy
+ * flagless installs are treated as out-of-date and get rewritten with the
+ * explicit --harness flag on the next install.
+ */
+function hasExactHooks (groups, def) {
+  if (!Array.isArray(groups)) return false
+  const expected = def.hooks.map(h => h.command)
+  return expected.every(cmd =>
+    groups.some(g => {
+      const hooks = g && g.hooks ? g.hooks : []
+      return hooks.some(h => h.command === cmd)
+    })
+  )
+}
+
 /**
  * Check if turbocommit hooks are installed across all expected events.
  */
 function isFullyInstalled (settings) {
   if (!settings || !settings.hooks) return false
-  return Object.keys(HOOK_DEFS).every(event =>
-    hasTurbocommit(settings.hooks[event])
+  return Object.entries(HOOK_DEFS).every(([event, def]) =>
+    hasExactHooks(settings.hooks[event], def)
   )
 }
 
 function isCodexFullyInstalled (hooksConfig) {
   if (!hooksConfig || !hooksConfig.hooks) return false
-  return Object.keys(CODEX_HOOK_DEFS).every(event =>
-    hasTurbocommit(hooksConfig.hooks[event])
+  return Object.entries(CODEX_HOOK_DEFS).every(([event, def]) =>
+    hasExactHooks(hooksConfig.hooks[event], def)
   )
 }
 

package/lib/transcript.js

@@ -61,7 +61,7 @@ function parseCodexTranscript (filePath) {
     if (entry.type !== 'response_item' || payload?.type !== 'message') continue
 
     if (payload.role === 'user') {
-      const prompt = visibleText(payload.content)
+      const prompt = stripCodexInjectedContext(visibleText(payload.content))
       if (isCodexSystemStatus(prompt)) continue
       if (state.prompt !== null) {
         state.pairs.push({ prompt: state.prompt, response: state.response })
@@ -94,6 +94,21 @@ function isCodexSystemStatus (text) {
   return text.startsWith('== System Status ==\n') && text.includes('[automatic message added by system]')
 }
 
+function stripCodexInjectedContext (text) {
+  if (!isCodexInjectedContext(text)) return text
+
+  const end = '</environment_context>'
+  const endIndex = text.indexOf(end)
+  if (endIndex === -1) return text
+  return text.slice(endIndex + end.length).trim()
+}
+
+function isCodexInjectedContext (text) {
+  return text.startsWith('# AGENTS.md instructions for ') &&
+    text.includes('<INSTRUCTIONS>') &&
+    text.includes('<environment_context>')
+}
+
 /**
  * Format a single prompt/response pair.
  */

package/package.json

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