@searls/turbocommit 0.12.0 → 0.13.0

package/lib/session.js

@@ -1,28 +1,36 @@
 const fs = require('fs')
 const path = require('path')
 const { ensureDir } = require('./io')
+const { gitCommonDir } = require('./git')
 
 const BREADCRUMB_THRESHOLD_MS = 2000
 const STALE_TTL_MS = 24 * 60 * 60 * 1000
 
 function turbocommitDir (root) {
-  return path.join(root, '.git', 'turbocommit')
+  if (!root) return null
+  const gitDir = gitCommonDir(root)
+  if (!gitDir) return null
+  return path.join(gitDir, 'turbocommit')
 }
 
 function breadcrumbDir (root) {
-  return path.join(turbocommitDir(root), 'breadcrumbs')
+  const base = turbocommitDir(root)
+  return base && path.join(base, 'breadcrumbs')
 }
 
 function chainDir (root) {
-  return path.join(turbocommitDir(root), 'chains')
+  const base = turbocommitDir(root)
+  return base && path.join(base, 'chains')
 }
 
 function pendingDir (root) {
-  return path.join(turbocommitDir(root), 'pending')
+  const base = turbocommitDir(root)
+  return base && path.join(base, 'pending')
 }
 
 function watermarkDir (root) {
-  return path.join(turbocommitDir(root), 'watermarks')
+  const base = turbocommitDir(root)
+  return base && path.join(base, 'watermarks')
 }
 
 /**
@@ -31,17 +39,14 @@ function watermarkDir (root) {
 function handleSessionEnd (input, root) {
   if (!root) return
 
-  let hookInput
-  try {
-    hookInput = JSON.parse(input)
-  } catch {
-    return
-  }
+  const hookInput = typeof input === 'string' ? parseInput(input) : input
+  if (!hookInput) return
 
-  const sessionId = hookInput.session_id
+  const sessionId = hookInput.sessionId || hookInput.session_id
   if (!sessionId) return
 
   const dir = breadcrumbDir(root)
+  if (!dir) return
   ensureDir(dir)
   const data = { session_id: sessionId, timestamp: Date.now() }
   fs.writeFileSync(path.join(dir, sessionId + '.json'), JSON.stringify(data) + '\n')
@@ -53,21 +58,17 @@ function handleSessionEnd (input, root) {
 function handleSessionStart (input, root) {
   if (!root) return
 
-  let hookInput
-  try {
-    hookInput = JSON.parse(input)
-  } catch {
-    return
-  }
+  const hookInput = typeof input === 'string' ? parseInput(input) : input
+  if (!hookInput) return
 
-  const sessionId = hookInput.session_id
+  const sessionId = hookInput.sessionId || hookInput.session_id
   if (!sessionId) return
 
   const source = hookInput.source
   if (source !== 'clear' && source !== 'resume') return
 
   const dir = breadcrumbDir(root)
-  if (!fs.existsSync(dir)) return
+  if (!dir || !fs.existsSync(dir)) return
 
   // Scan breadcrumbs for closest match
   const now = Date.now()
@@ -108,11 +109,20 @@ function handleSessionStart (input, root) {
 
   // Write chain for this session
   const cDir = chainDir(root)
+  if (!cDir) return
   ensureDir(cDir)
   const chain = { parent: best.session_id, ancestors }
   fs.writeFileSync(path.join(cDir, sessionId + '.json'), JSON.stringify(chain) + '\n')
 }
 
+function parseInput (input) {
+  try {
+    return JSON.parse(input)
+  } catch {
+    return null
+  }
+}
+
 function readChain (root, sessionId) {
   try {
     return JSON.parse(fs.readFileSync(path.join(chainDir(root), sessionId + '.json'), 'utf8'))
@@ -133,21 +143,27 @@ function getAncestors (root, sessionId) {
  * Save formatted transcript to pending directory for later pickup.
  */
 let pendingSeq = 0
-function savePending (root, sessionId, transcript) {
-  const dir = path.join(pendingDir(root), sessionId)
+function savePending (root, sessionId, transcript, opts = {}) {
+  const base = pendingDir(root)
+  if (!base) return
+  const dir = path.join(base, sessionId)
   ensureDir(dir)
   const timestamp = String(Date.now()) + '-' + String(pendingSeq++).padStart(4, '0')
-  fs.writeFileSync(path.join(dir, timestamp + '.txt'), transcript)
+  const source = opts.source ? '.' + String(opts.source).replace(/[^a-z0-9-]/gi, '-') : ''
+  fs.writeFileSync(path.join(dir, timestamp + source + '.txt'), transcript)
 }
 
 /**
  * Collect pending transcripts for a list of session IDs, in order
  * (oldest ancestor first). Returns array of strings.
  */
-function collectPending (root, sessionIds) {
+function collectPending (root, sessionIds, opts = {}) {
   const results = []
+  const base = pendingDir(root)
+  if (!base) return results
+  const sourceSuffix = opts.source ? '.' + opts.source + '.txt' : null
   for (const sid of sessionIds) {
-    const dir = path.join(pendingDir(root), sid)
+    const dir = path.join(base, sid)
     let files
     try {
       files = fs.readdirSync(dir).sort()
@@ -156,6 +172,7 @@ function collectPending (root, sessionIds) {
     }
     for (const file of files) {
       if (!file.endsWith('.txt')) continue
+      if (sourceSuffix && !file.endsWith(sourceSuffix)) continue
       try {
         const content = fs.readFileSync(path.join(dir, file), 'utf8')
         if (content.trim()) results.push(content)
@@ -181,10 +198,14 @@ function readWatermark (root, sessionId) {
 /**
  * Save watermark after a commit: pair count and commit SHA.
  */
-function saveWatermark (root, sessionId, pairs, commit) {
+function saveWatermark (root, sessionId, pairs, commit, meta = {}) {
   const dir = watermarkDir(root)
+  if (!dir) return
   ensureDir(dir)
-  fs.writeFileSync(path.join(dir, sessionId + '.json'), JSON.stringify({ pairs, commit }) + '\n')
+  const data = { pairs }
+  if (commit) data.commit = commit
+  Object.assign(data, meta)
+  fs.writeFileSync(path.join(dir, sessionId + '.json'), JSON.stringify(data) + '\n')
 }
 
 /**
@@ -194,13 +215,13 @@ function saveWatermark (root, sessionId, pairs, commit) {
 function resolveParentCommit (root, sessionId) {
   // Own watermark takes priority (same-session previous commit)
   const own = readWatermark(root, sessionId)
-  if (own) return own.commit
+  if (own && own.commit) return own.commit
 
   // Walk chain ancestors nearest-first
   const ancestors = getAncestors(root, sessionId)
   for (const aid of ancestors) {
     const wm = readWatermark(root, aid)
-    if (wm) return wm.commit
+    if (wm && wm.commit) return wm.commit
   }
   return null
 }
@@ -209,9 +230,11 @@ function resolveParentCommit (root, sessionId) {
  * Delete consumed pending + chain files after commit.
  */
 function cleanupConsumed (root, sessionIds) {
+  const base = pendingDir(root)
+  if (!base) return
   for (const sid of sessionIds) {
     // Remove pending dir
-    const dir = path.join(pendingDir(root), sid)
+    const dir = path.join(base, sid)
     try {
       const files = fs.readdirSync(dir)
       for (const file of files) {
@@ -232,6 +255,7 @@ function cleanupStale (root, maxAgeMs) {
   const ttl = maxAgeMs != null ? maxAgeMs : STALE_TTL_MS
   const now = Date.now()
   const base = turbocommitDir(root)
+  if (!base) return
 
   for (const sub of ['breadcrumbs', 'chains', 'tracking', 'watermarks']) {
     const dir = path.join(base, sub)

package/lib/track.js

@@ -1,16 +1,21 @@
 const fs = require('fs')
 const path = require('path')
 const { ensureDir } = require('./io')
+const { turbocommitDir } = require('./session')
 
 /**
- * Directory under .git where turbocommit stores tracking state.
+ * Directory under the git common dir where turbocommit stores tracking state.
+ * Returns null when the root isn't resolvable to a git repo (including when
+ * run outside a repo, which is not expected during normal operation).
  */
 function trackingDir (root) {
-  return path.join(root, '.git', 'turbocommit', 'tracking')
+  const base = turbocommitDir(root)
+  return base && path.join(base, 'tracking')
 }
 
 function trackingPath (root, sessionId) {
-  return path.join(trackingDir(root), sessionId + '.jsonl')
+  const dir = trackingDir(root)
+  return dir && path.join(dir, sessionId + '.jsonl')
 }
 
 /**
@@ -36,22 +41,17 @@ function extractFilePath (toolInput) {
  * Always exits 0 (never blocks tool execution).
  */
 function handleTrack (input, root) {
-  if (!root) return
+  const hookInput = typeof input === 'string' ? parseInput(input) : input
+  root = root || hookInput?.root
+  if (!root || !hookInput) return
 
-  let hookInput
-  try {
-    hookInput = JSON.parse(input)
-  } catch {
-    return
-  }
-
-  const sessionId = hookInput.session_id
+  const sessionId = hookInput.sessionId || hookInput.session_id
   if (!sessionId) return
 
-  const toolName = hookInput.tool_name
+  const toolName = hookInput.toolName || hookInput.tool_name
   if (!toolName) return
 
-  const toolInput = hookInput.tool_input || {}
+  const toolInput = hookInput.toolInput || hookInput.tool_input || {}
 
   const entry = { tool: toolName, t: Date.now() }
 
@@ -72,10 +72,19 @@ function handleTrack (input, root) {
   if (toolName === 'Bash' && typeof toolInput.command !== 'string') return
 
   const file = trackingPath(root, sessionId)
+  if (!file) return
   ensureDir(path.dirname(file))
   fs.appendFileSync(file, JSON.stringify(entry) + '\n')
 }
 
+function parseInput (input) {
+  try {
+    return JSON.parse(input)
+  } catch {
+    return null
+  }
+}
+
 /**
  * Check whether a session has tracked any file-modifying tool calls.
  * Bash entries alone don't count — Bash is too noisy (ls, git status, etc.)

package/lib/transcript.js

@@ -42,6 +42,58 @@ function parseTranscript (filePath) {
   return state.pairs
 }
 
+function parseCodexTranscript (filePath) {
+  if (!filePath || !fs.existsSync(filePath)) return []
+
+  const lines = fs.readFileSync(filePath, 'utf8').split('\n')
+  const state = { pairs: [], prompt: null, response: '' }
+
+  for (const line of lines) {
+    if (!line.trim()) continue
+    let entry
+    try {
+      entry = JSON.parse(line)
+    } catch {
+      continue
+    }
+
+    const payload = entry.payload
+    if (entry.type !== 'response_item' || payload?.type !== 'message') continue
+
+    if (payload.role === 'user') {
+      const prompt = visibleText(payload.content)
+      if (isCodexSystemStatus(prompt)) continue
+      if (state.prompt !== null) {
+        state.pairs.push({ prompt: state.prompt, response: state.response })
+      }
+      state.prompt = prompt
+      state.response = ''
+    } else if (payload.role === 'assistant' && state.prompt !== null) {
+      state.response += visibleText(payload.content)
+    }
+  }
+
+  if (state.prompt !== null) {
+    state.pairs.push({ prompt: state.prompt, response: state.response })
+  }
+
+  return state.pairs.filter(p => p.prompt)
+}
+
+function visibleText (content) {
+  if (typeof content === 'string') return content
+  if (!Array.isArray(content)) return ''
+  return content
+    .filter(block => block.type === 'input_text' || block.type === 'output_text' || block.type === 'text')
+    .map(block => block.text)
+    .filter(Boolean)
+    .join('')
+}
+
+function isCodexSystemStatus (text) {
+  return text.startsWith('== System Status ==\n') && text.includes('[automatic message added by system]')
+}
+
 /**
  * Format a single prompt/response pair.
  */
@@ -130,4 +182,35 @@ function extractModel (filePath) {
   return null
 }
 
-module.exports = { parseTranscript, formatPair, formatBody, formatTitleTranscript, extractHeadline, fallbackHeadline, extractModel }
+function extractCodexModel (filePath, hookModel) {
+  if (hookModel) return hookModel
+  if (!filePath || !fs.existsSync(filePath)) return null
+
+  const lines = fs.readFileSync(filePath, 'utf8').split('\n')
+  for (const line of lines) {
+    if (!line.trim()) continue
+    let entry
+    try {
+      entry = JSON.parse(line)
+    } catch {
+      continue
+    }
+    if (entry.type === 'session_meta' && entry.payload?.model) return entry.payload.model
+    if (entry.type === 'session_meta' && entry.payload?.model_slug) return entry.payload.model_slug
+  }
+  return null
+}
+
+module.exports = {
+  parseTranscript,
+  parseCodexTranscript,
+  formatPair,
+  formatBody,
+  formatTitleTranscript,
+  extractHeadline,
+  fallbackHeadline,
+  extractModel,
+  extractCodexModel,
+  visibleText,
+  isCodexSystemStatus
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@searls/turbocommit",
-  "version": "0.12.0",
-  "description": "Auto-commit after every Claude Code turn",
+  "version": "0.13.0",
+  "description": "Auto-commit after every AI coding agent turn",
   "bin": {
     "turbocommit": "./cli.js"
   },
@@ -19,6 +19,9 @@
   "keywords": [
     "claude",
     "claude-code",
+    "codex",
+    "openai-codex",
+    "ai-agent",
     "git",
     "auto-commit"
   ],