thinkpool-pair 0.7.338 → 0.7.339

package/bridge.mjs

@@ -58,6 +58,7 @@ import { startStructuredSession } from './runtime-session.mjs'
 import { fallbackTerminalName } from './terminal-name.mjs'
 import { defaultStructuredMode, normalizeStructuredEffort, shouldDeferStructuredRuntime, structuredModeForSlice, structuredModeLocked, structuredModesForLane, structuredRuntimeForCommand, structuredRuntimeMetadata, structuredRuntimeSupportsMode } from './runtime-registry.mjs'
 import { commandCatalogForRuntime, commandHelpLine, reconcileCommandCatalog } from './command-catalog.mjs'
+import { gitDiffReport } from './git-diff-report.mjs'
 import { probeHermesRuntime } from './hermes-probe.mjs'
 import { hermesRequiredMcpTools, hermesRoleFor } from './hermes-policy.mjs'
 import { canonicalRoomFilePath, waitForNativeImages } from './codex-images.mjs'
@@ -4365,8 +4366,7 @@ channel
     if (/^\/diff\s*$/.test(text)) {
       try {
         const cwd = s.cwd || process.cwd()
-        const summary = execFileSync('git', ['-C', cwd, 'status', '--short'], { encoding: 'utf8', timeout: 3000, stdio: ['ignore', 'pipe', 'ignore'] }).trim()
-        ctlLine(summary ? `Working tree changes\n${summary.slice(0, 1600)}` : 'Working tree clean')
+        ctlLine(gitDiffReport({ cwd }))
       } catch { ctlLine('Working-tree diff unavailable outside a readable Git checkout') }
       return
     }

package/command-catalog.mjs

@@ -19,7 +19,7 @@ export const CODE_ROOM_COMMANDS = Object.freeze([
   command('/status', 'runtime, model, permissions, and busy state', 'control'),
   command('/usage', 'session usage and provider limits', 'control'),
   command('/context', 'current context-window usage', 'control'),
-  command('/diff', 'working-tree change summary', 'control'),
+  command('/diff', 'Git changes and branch status', 'control'),
   command('/compact', 'compact context', 'runtime'),
   command('/clear', 'clear context · confirms', 'clear'),
   command('/model', 'pick model — opens selector', 'model'),

package/git-diff-report.mjs

@@ -0,0 +1,118 @@
+import { execFileSync } from 'node:child_process'
+
+const DEFAULT_MAX_FILES = 24
+const DEFAULT_MAX_COMMITS = 5
+const DEFAULT_MAX_CHARS = 1800
+
+const plural = (count, word) => `${count} ${word}${count === 1 ? '' : 's'}`
+
+function defaultRunGit(args, cwd) {
+  return execFileSync('git', args, {
+    cwd,
+    encoding: 'utf8',
+    timeout: 3000,
+    stdio: ['ignore', 'pipe', 'pipe'],
+  })
+}
+
+function cleanLine(value, max = 240) {
+  return String(value || '')
+    .replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, '')
+    .replace(/\s+/g, ' ')
+    .trim()
+    .slice(0, max)
+}
+
+function gitText(runGit, cwd, args) {
+  return String(runGit(args, cwd) || '').trim()
+}
+
+function tryGit(runGit, cwd, args) {
+  try { return gitText(runGit, cwd, args) } catch { return '' }
+}
+
+function resolveComparisonRef(runGit, cwd) {
+  const remoteHead = tryGit(runGit, cwd, ['symbolic-ref', '--quiet', '--short', 'refs/remotes/origin/HEAD'])
+  if (remoteHead && tryGit(runGit, cwd, ['rev-parse', '--verify', '--quiet', remoteHead])) return remoteHead
+  for (const candidate of ['origin/main', 'origin/master', 'main', 'master']) {
+    if (tryGit(runGit, cwd, ['rev-parse', '--verify', '--quiet', candidate])) return candidate
+  }
+  return ''
+}
+
+function boundedReport(lines, maxChars) {
+  const kept = []
+  let length = 0
+  for (const raw of lines) {
+    const line = cleanLine(raw)
+    if (!line) continue
+    const nextLength = length + (kept.length ? 1 : 0) + line.length
+    if (nextLength > maxChars) {
+      const suffix = '… output shortened'
+      if (length + (kept.length ? 1 : 0) + suffix.length <= maxChars) kept.push(suffix)
+      break
+    }
+    kept.push(line)
+    length = nextLength
+  }
+  return kept.join('\n')
+}
+
+export function gitDiffReport({
+  cwd = process.cwd(),
+  runGit = defaultRunGit,
+  maxFiles = DEFAULT_MAX_FILES,
+  maxCommits = DEFAULT_MAX_COMMITS,
+  maxChars = DEFAULT_MAX_CHARS,
+} = {}) {
+  gitText(runGit, cwd, ['rev-parse', '--show-toplevel'])
+
+  const status = tryGit(runGit, cwd, ['status', '--porcelain=v1', '--untracked-files=normal'])
+  const statusLines = status ? status.split(/\r?\n/).filter(Boolean) : []
+  const branch = tryGit(runGit, cwd, ['symbolic-ref', '--quiet', '--short', 'HEAD']) || 'detached HEAD'
+  const head = tryGit(runGit, cwd, ['rev-parse', '--short=8', 'HEAD']) || 'unknown'
+  const subject = cleanLine(tryGit(runGit, cwd, ['log', '-1', '--pretty=%s']), 160)
+  const comparisonRef = resolveComparisonRef(runGit, cwd)
+  const lines = []
+
+  if (statusLines.length) {
+    lines.push(`${plural(statusLines.length, 'uncommitted file')}`)
+    for (const line of statusLines.slice(0, Math.max(0, maxFiles))) lines.push(line)
+    if (statusLines.length > maxFiles) lines.push(`… ${plural(statusLines.length - maxFiles, 'more file')}`)
+  } else {
+    lines.push('No uncommitted changes')
+  }
+
+  lines.push(`Branch · ${branch} · ${head}`)
+
+  if (!comparisonRef) {
+    if (subject) lines.push(`Latest commit · ${head} — ${subject}`)
+    return boundedReport(lines, maxChars)
+  }
+
+  const counts = tryGit(runGit, cwd, ['rev-list', '--left-right', '--count', `${comparisonRef}...HEAD`])
+    .split(/\s+/)
+    .map((value) => Number(value))
+  const behind = Number.isFinite(counts[0]) ? counts[0] : 0
+  const ahead = Number.isFinite(counts[1]) ? counts[1] : 0
+
+  if (ahead > 0) {
+    lines.push(`${plural(ahead, 'commit')} ahead of ${comparisonRef}${behind ? ` · ${plural(behind, 'commit')} behind` : ''}`)
+    const commitLines = tryGit(runGit, cwd, ['log', `--max-count=${Math.max(0, maxCommits)}`, '--pretty=%h %s', `${comparisonRef}..HEAD`])
+      .split(/\r?\n/)
+      .filter(Boolean)
+    if (commitLines.length) {
+      lines.push(`Commits not in ${comparisonRef}`)
+      lines.push(...commitLines)
+      if (ahead > commitLines.length) lines.push(`… ${plural(ahead - commitLines.length, 'more commit')}`)
+    }
+  } else if (behind > 0) {
+    if (subject) lines.push(`Latest commit · ${head} — ${subject} · already in ${comparisonRef}`)
+    lines.push(`${plural(behind, 'commit')} behind ${comparisonRef}`)
+  } else {
+    if (subject) lines.push(`Latest commit · ${head} — ${subject}`)
+    lines.push(`Up to date with ${comparisonRef}`)
+  }
+
+  return boundedReport(lines, maxChars)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.338",
+  "version": "0.7.339",
   "description": "Connect Claude Code, Codex, or Hermes on your computer to a Thinkpool Code room.",
   "type": "module",
   "bin": {
@@ -47,6 +47,7 @@
     "hermes-delegation-guard.mjs",
     "runtime-registry.mjs",
     "command-catalog.mjs",
+    "git-diff-report.mjs",
     "runtime-session.mjs",
     "turn-stall.mjs",
     "update-gate.mjs",