stage-tui 1.0.8 → 1.1.0

package/README.md

@@ -44,6 +44,14 @@ stage            # use installed npm package
 stage --dev      # use local checkout at STAGE_DEV_PATH
 ```
 
+AI commit evals:
+
+```bash
+bun run eval:ai
+bun run eval:ai -- --path src/hooks/use-git-tui-keyboard.ts
+bun run eval:ai -- --commit 56d030f072853619483abaf79c57e9104a143d9d
+```
+
 ## Configuration
 
 Config file path:
@@ -84,8 +92,9 @@ provider = "cerebras"                # currently only supported provider
 api_key = ""                         # required when enabled = true
 model = "gpt-oss-120b"
 reasoning_effort = "low"             # "low" | "medium" | "high"
+max_input_tokens = 24000
 max_files = 32
-max_chars_per_file = 4000
+max_tokens_per_file = 4000
 ```
 
 </details>
@@ -101,8 +110,8 @@ max_chars_per_file = 4000
 - `↑ / ↓`: move file selection
 - `r`: refresh
 - `f`: fetch
-- `l`: pull
-- `p`: push
+- `p`: pull
+- `ctrl+p`: push
 - `esc`: close dialog (or exit from main view)
 
 </details>

package/package.json

@@ -1,21 +1,19 @@
 {
   "name": "stage-tui",
-  "version": "1.0.8",
+  "version": "1.1.0",
+  "private": false,
   "description": "Minimalist TUI Git client",
+  "homepage": "https://github.com/jenslys/stage",
+  "bugs": {
+    "url": "https://github.com/jenslys/stage/issues"
+  },
   "author": "jenslys",
   "repository": {
     "type": "git",
     "url": "https://github.com/jenslys/stage.git"
   },
-  "homepage": "https://github.com/jenslys/stage",
-  "bugs": {
-    "url": "https://github.com/jenslys/stage/issues"
-  },
-  "module": "index.ts",
-  "type": "module",
-  "private": false,
-  "publishConfig": {
-    "access": "public"
+  "bin": {
+    "stage": "./bin/stage"
   },
   "files": [
     "bin",
@@ -23,24 +21,34 @@
     "index.ts",
     "README.md"
   ],
-  "bin": {
-    "stage": "./bin/stage"
+  "type": "module",
+  "module": "index.ts",
+  "publishConfig": {
+    "access": "public"
   },
   "scripts": {
-    "stage": "bun run index.ts"
-  },
-  "devDependencies": {
-    "@types/bun": "latest",
-    "@types/react": "^19.2.14"
-  },
-  "peerDependencies": {
-    "typescript": "^5"
+    "stage": "bun run index.ts",
+    "eval:ai": "bun run src/ai-commit-eval.ts",
+    "lint": "oxlint --react-plugin --import-plugin --promise-plugin src index.ts",
+    "lint:fix": "oxlint --react-plugin --import-plugin --promise-plugin --fix src index.ts",
+    "format": "oxfmt --write src index.ts package.json tsconfig.json .oxlintrc.json .oxfmtrc.json",
+    "format:check": "oxfmt --check src index.ts package.json tsconfig.json .oxlintrc.json .oxfmtrc.json"
   },
   "dependencies": {
     "@ai-sdk/cerebras": "^2.0.34",
     "@opentui/core": "^0.1.81",
     "@opentui/react": "^0.1.81",
     "ai": "^6.0.97",
+    "gpt-tokenizer": "^3.4.0",
     "react": "^19.2.4"
+  },
+  "devDependencies": {
+    "@types/bun": "latest",
+    "@types/react": "^19.2.14",
+    "oxfmt": "0.35.0",
+    "oxlint": "1.50.0"
+  },
+  "peerDependencies": {
+    "typescript": "^5"
   }
 }

package/src/ai-commit/context-builder.ts

@@ -0,0 +1,148 @@
+import type { ChangedFile, GitClient } from "../git"
+
+import { buildDiffSectionWithBudget, condenseDiff, truncateToTokenBudget } from "./diff-budget"
+import {
+  aggregateBehaviorCues,
+  analyzeDiff,
+  collectBehaviorCues,
+  formatCueList,
+  type ContextSignals,
+  updatePathCategorySignals,
+  updateStatusSignals,
+} from "./diff-signals"
+import { MAX_RECENT_COMMIT_SUBJECTS } from "./policy"
+import type { TextTokenizer } from "./tokenizer"
+
+type BuildCommitContextParams = {
+  git: GitClient
+  fileByPath: Map<string, ChangedFile>
+  selectedPaths: string[]
+  maxFiles: number
+  maxInputTokens: number
+  maxTokensPerFile: number
+  tokenizer: TextTokenizer
+}
+
+export async function buildCommitContext({
+  git,
+  fileByPath,
+  selectedPaths,
+  maxFiles,
+  maxInputTokens,
+  maxTokensPerFile,
+  tokenizer,
+}: BuildCommitContextParams): Promise<string> {
+  const limitedPaths = selectedPaths.slice(0, maxFiles)
+  const signals: ContextSignals = {
+    touchedFiles: limitedPaths.length,
+    newFiles: 0,
+    modifiedFiles: 0,
+    deletedFiles: 0,
+    renamedFiles: 0,
+    addedLines: 0,
+    removedLines: 0,
+    docsFiles: 0,
+    testFiles: 0,
+    configFiles: 0,
+  }
+
+  const fileSummaries = limitedPaths.map((path) => {
+    const file = fileByPath.get(path)
+    const status = file ? `${file.indexStatus}${file.worktreeStatus}`.trim() || "??" : "??"
+    updateStatusSignals(signals, file)
+    updatePathCategorySignals(signals, path)
+    return { path, status }
+  })
+
+  const snippets = await Promise.all(
+    limitedPaths.map(async (path) => {
+      const diff = await git.diffForFile(path)
+      const diffStats = analyzeDiff(diff)
+      const behaviorCues = collectBehaviorCues(diff)
+      const condensed = condenseDiff(diff)
+      return {
+        path,
+        addedLines: diffStats.addedLines,
+        removedLines: diffStats.removedLines,
+        behaviorCues,
+        condensed,
+      }
+    }),
+  )
+
+  const fileLines = fileSummaries.map((entry) => {
+    const snippet = snippets.find((candidate) => candidate.path === entry.path)
+    const additions = snippet?.addedLines ?? 0
+    const deletions = snippet?.removedLines ?? 0
+    signals.addedLines += additions
+    signals.removedLines += deletions
+    return `- ${entry.status} ${entry.path} (+${additions} -${deletions})`
+  })
+
+  const behaviorCues = aggregateBehaviorCues(snippets.map((snippet) => snippet.behaviorCues))
+  const recentCommitSubjects = await readRecentCommitSubjects(git)
+  const existingSurfaceOnly = signals.newFiles === 0 && signals.renamedFiles === 0
+  const likelyNewSurface = signals.newFiles > 0 || signals.renamedFiles > 0
+
+  const recentCommitsSection =
+    recentCommitSubjects.length > 0
+      ? [
+          "",
+          "Recent commit subjects (style reference only):",
+          ...recentCommitSubjects.map((subject) => `- ${subject}`),
+        ]
+      : []
+
+  const selectedPathsSection =
+    selectedPaths.length > limitedPaths.length
+      ? `- additional_selected_files_not_shown: ${selectedPaths.length - limitedPaths.length}`
+      : "- additional_selected_files_not_shown: 0"
+
+  const preambleLines: string[] = [
+    "Context signals:",
+    `- touched_files: ${signals.touchedFiles}`,
+    `- existing_surface_only: ${existingSurfaceOnly ? "yes" : "no"}`,
+    `- likely_new_surface: ${likelyNewSurface ? "yes" : "no"}`,
+    `- status_counts: new=${signals.newFiles} modified=${signals.modifiedFiles} deleted=${signals.deletedFiles} renamed=${signals.renamedFiles}`,
+    `- diff_line_counts: additions=${signals.addedLines} deletions=${signals.removedLines}`,
+    `- file_categories: docs=${signals.docsFiles} tests=${signals.testFiles} config=${signals.configFiles}`,
+    selectedPathsSection,
+    "- classify by behavior impact first; line counts and file counts are supporting signals",
+    "",
+    "Behavior cues:",
+    `- added_conditions: ${formatCueList(behaviorCues.addedConditions)}`,
+    `- removed_conditions: ${formatCueList(behaviorCues.removedConditions)}`,
+    `- added_guards: ${formatCueList(behaviorCues.addedGuards)}`,
+    `- removed_guards: ${formatCueList(behaviorCues.removedGuards)}`,
+    `- added_calls: ${formatCueList(behaviorCues.addedCalls)}`,
+    `- removed_calls: ${formatCueList(behaviorCues.removedCalls)}`,
+    "",
+    "Changed files:",
+    fileLines.join("\n"),
+    ...recentCommitsSection,
+  ]
+
+  const diffSection = buildDiffSectionWithBudget({
+    snippets: snippets.map((snippet) => ({ path: snippet.path, body: snippet.condensed })),
+    preambleLines,
+    maxInputTokens,
+    maxTokensPerFile,
+    tokenizer,
+  })
+
+  const context = [...preambleLines, "", "Diff highlights:", diffSection].join("\n")
+
+  return truncateToTokenBudget(context, maxInputTokens, tokenizer, "\n...[context truncated]")
+}
+
+async function readRecentCommitSubjects(git: GitClient): Promise<string[]> {
+  try {
+    const entries = await git.listCommits(MAX_RECENT_COMMIT_SUBJECTS)
+    return entries
+      .map((entry) => entry.subject.trim())
+      .filter(Boolean)
+      .slice(0, MAX_RECENT_COMMIT_SUBJECTS)
+  } catch {
+    return []
+  }
+}

package/src/ai-commit/diff-budget.ts

@@ -0,0 +1,173 @@
+import type { TextTokenizer } from "./tokenizer"
+
+export function condenseDiff(diff: string): string {
+  const lines = diff.split("\n")
+  const relevant: string[] = []
+  let changedLines = 0
+  let hunkCount = 0
+  const maxChangedLines = 120
+  const maxHunks = 12
+
+  for (const line of lines) {
+    if (line.startsWith("# ")) {
+      relevant.push(line)
+      continue
+    }
+    if (line.startsWith("@@")) {
+      hunkCount += 1
+      if (hunkCount <= maxHunks) {
+        relevant.push(line)
+      }
+      continue
+    }
+    if (line.startsWith("+++") || line.startsWith("---")) {
+      continue
+    }
+    if (line.startsWith("+") || line.startsWith("-")) {
+      changedLines += 1
+      if (changedLines <= maxChangedLines) {
+        relevant.push(line)
+      }
+    }
+  }
+
+  const body = (relevant.length > 0 ? relevant.join("\n") : diff.trim()).trim()
+  return body || ""
+}
+
+export function buildDiffSectionWithBudget({
+  snippets,
+  preambleLines,
+  maxInputTokens,
+  maxTokensPerFile,
+  tokenizer,
+}: {
+  snippets: Array<{ path: string; body: string }>
+  preambleLines: string[]
+  maxInputTokens: number
+  maxTokensPerFile: number
+  tokenizer: TextTokenizer
+}): string {
+  const fallback = "- no diff snippets were captured"
+  const preamble = [...preambleLines, "", "Diff highlights:"].join("\n")
+  const availableTokens = Math.max(maxInputTokens - tokenizer.encode(preamble).length, 0)
+  if (availableTokens <= 0) {
+    return truncateToTokenBudget(fallback, 1, tokenizer)
+  }
+
+  const prepared = snippets
+    .filter((snippet) => snippet.body)
+    .map((snippet) => {
+      const header = `FILE: ${snippet.path}\n`
+      const body = truncateToTokenBudget(snippet.body, Math.max(maxTokensPerFile, 1), tokenizer)
+      return {
+        header,
+        body,
+        headerTokens: tokenizer.encode(header).length,
+        bodyTokens: tokenizer.encode(body).length,
+      }
+    })
+    .filter((snippet) => snippet.body)
+
+  if (prepared.length === 0) {
+    return truncateToTokenBudget(fallback, availableTokens, tokenizer)
+  }
+
+  const separator = "\n\n"
+  const separatorTokens = tokenizer.encode(separator).length
+  const minBodyTokens = 24
+
+  let includeCount = 0
+  let fixedCost = 0
+  let minimumBodyCost = 0
+
+  for (const snippet of prepared) {
+    const joinCost = includeCount > 0 ? separatorTokens : 0
+    const minBodyCost = Math.min(minBodyTokens, snippet.bodyTokens)
+    const nextCost = fixedCost + minimumBodyCost + joinCost + snippet.headerTokens + minBodyCost
+    if (nextCost > availableTokens) {
+      break
+    }
+    includeCount += 1
+    fixedCost += joinCost + snippet.headerTokens
+    minimumBodyCost += minBodyCost
+  }
+
+  if (includeCount === 0) {
+    const first = prepared[0]
+    if (!first || first.headerTokens >= availableTokens) {
+      return truncateToTokenBudget(fallback, availableTokens, tokenizer)
+    }
+    const bodyBudget = availableTokens - first.headerTokens
+    const body = truncateToTokenBudget(first.body, bodyBudget, tokenizer)
+    const single = `${first.header}${body}`.trimEnd()
+    return single || truncateToTokenBudget(fallback, availableTokens, tokenizer)
+  }
+
+  const included = prepared.slice(0, includeCount)
+  const bodyBudget = Math.max(availableTokens - fixedCost, 0)
+  const allocations = included.map((snippet) => Math.min(minBodyTokens, snippet.bodyTokens))
+  let remainingBodyTokens = Math.max(
+    bodyBudget - allocations.reduce((sum, value) => sum + value, 0),
+    0,
+  )
+
+  while (remainingBodyTokens > 0) {
+    let progressed = false
+    for (let index = 0; index < included.length && remainingBodyTokens > 0; index += 1) {
+      const snippet = included[index]
+      if (!snippet) continue
+      if (allocations[index]! >= snippet.bodyTokens) continue
+      allocations[index] = allocations[index]! + 1
+      remainingBodyTokens -= 1
+      progressed = true
+    }
+
+    if (!progressed) {
+      break
+    }
+  }
+
+  const section = included
+    .map((snippet, index) => {
+      const body = truncateToTokenBudget(snippet.body, allocations[index] ?? 0, tokenizer)
+      return `${snippet.header}${body}`.trimEnd()
+    })
+    .filter(Boolean)
+    .join(separator)
+
+  if (!section) {
+    return truncateToTokenBudget(fallback, availableTokens, tokenizer)
+  }
+
+  return truncateToTokenBudget(section, availableTokens, tokenizer)
+}
+
+export function truncateToTokenBudget(
+  text: string,
+  tokenLimit: number,
+  tokenizer: TextTokenizer,
+  suffix = "\n...[truncated]",
+): string {
+  if (tokenLimit <= 0) {
+    return ""
+  }
+
+  const encoded = tokenizer.encode(text)
+  if (encoded.length <= tokenLimit) {
+    return text
+  }
+
+  const suffixTokens = tokenizer.encode(suffix).length
+  if (tokenLimit <= suffixTokens) {
+    return tokenizer.decode(encoded.slice(0, tokenLimit)).trimEnd()
+  }
+
+  const contentTokenLimit = tokenLimit - suffixTokens
+  const clipped = tokenizer.decode(encoded.slice(0, contentTokenLimit)).trimEnd()
+  if (!clipped) {
+    return tokenizer.decode(encoded.slice(0, tokenLimit)).trimEnd()
+  }
+
+  return `${clipped}${suffix}`
+}

package/src/ai-commit/diff-signals.ts

@@ -0,0 +1,264 @@
+import type { ChangedFile } from "../git"
+
+export type ContextSignals = {
+  touchedFiles: number
+  newFiles: number
+  modifiedFiles: number
+  deletedFiles: number
+  renamedFiles: number
+  addedLines: number
+  removedLines: number
+  docsFiles: number
+  testFiles: number
+  configFiles: number
+}
+
+export type BehaviorCues = {
+  addedConditions: string[]
+  removedConditions: string[]
+  addedGuards: string[]
+  removedGuards: string[]
+  addedCalls: string[]
+  removedCalls: string[]
+}
+
+export function updateStatusSignals(signals: ContextSignals, file: ChangedFile | undefined): void {
+  if (!file) return
+  if (file.untracked) {
+    signals.newFiles += 1
+    return
+  }
+
+  const statuses = [file.indexStatus, file.worktreeStatus]
+  if (statuses.includes("D")) {
+    signals.deletedFiles += 1
+    return
+  }
+  if (statuses.includes("R")) {
+    signals.renamedFiles += 1
+    return
+  }
+  if (statuses.includes("A")) {
+    signals.newFiles += 1
+    return
+  }
+  signals.modifiedFiles += 1
+}
+
+export function updatePathCategorySignals(signals: ContextSignals, path: string): void {
+  const normalized = path.toLowerCase()
+  if (isDocsPath(normalized)) signals.docsFiles += 1
+  if (isTestPath(normalized)) signals.testFiles += 1
+  if (isConfigPath(normalized)) signals.configFiles += 1
+}
+
+export function analyzeDiff(diff: string): { addedLines: number; removedLines: number } {
+  let addedLines = 0
+  let removedLines = 0
+
+  for (const line of diff.split("\n")) {
+    if (line.startsWith("+++") || line.startsWith("---")) continue
+    if (line.startsWith("+")) {
+      addedLines += 1
+      continue
+    }
+    if (line.startsWith("-")) {
+      removedLines += 1
+    }
+  }
+
+  return { addedLines, removedLines }
+}
+
+export function collectBehaviorCues(diff: string): BehaviorCues {
+  const addedConditions = new Set<string>()
+  const removedConditions = new Set<string>()
+  const addedGuards = new Set<string>()
+  const removedGuards = new Set<string>()
+  const addedCalls = new Set<string>()
+  const removedCalls = new Set<string>()
+
+  for (const line of diff.split("\n")) {
+    if (
+      line.startsWith("+++") ||
+      line.startsWith("---") ||
+      line.startsWith("@@") ||
+      line.startsWith("# ")
+    ) {
+      continue
+    }
+
+    const isAdded = line.startsWith("+")
+    const isRemoved = line.startsWith("-")
+    if (!isAdded && !isRemoved) {
+      continue
+    }
+
+    const content = line.slice(1).trim()
+    if (!content) {
+      continue
+    }
+
+    const condition = extractConditionCue(content)
+    if (condition) {
+      if (isAdded) {
+        addedConditions.add(condition)
+      } else {
+        removedConditions.add(condition)
+      }
+    }
+
+    const guard = extractGuardCue(content)
+    if (guard) {
+      if (isAdded) {
+        addedGuards.add(guard)
+      } else {
+        removedGuards.add(guard)
+      }
+    }
+
+    const call = extractCallCue(content)
+    if (call) {
+      if (isAdded) {
+        addedCalls.add(call)
+      } else {
+        removedCalls.add(call)
+      }
+    }
+  }
+
+  return {
+    addedConditions: Array.from(addedConditions),
+    removedConditions: Array.from(removedConditions),
+    addedGuards: Array.from(addedGuards),
+    removedGuards: Array.from(removedGuards),
+    addedCalls: Array.from(addedCalls),
+    removedCalls: Array.from(removedCalls),
+  }
+}
+
+export function aggregateBehaviorCues(cuesList: BehaviorCues[]): BehaviorCues {
+  const addedConditions = new Set<string>()
+  const removedConditions = new Set<string>()
+  const addedGuards = new Set<string>()
+  const removedGuards = new Set<string>()
+  const addedCalls = new Set<string>()
+  const removedCalls = new Set<string>()
+
+  for (const cues of cuesList) {
+    for (const value of cues.addedConditions) {
+      addedConditions.add(value)
+    }
+    for (const value of cues.removedConditions) {
+      removedConditions.add(value)
+    }
+    for (const value of cues.addedGuards) {
+      addedGuards.add(value)
+    }
+    for (const value of cues.removedGuards) {
+      removedGuards.add(value)
+    }
+    for (const value of cues.addedCalls) {
+      addedCalls.add(value)
+    }
+    for (const value of cues.removedCalls) {
+      removedCalls.add(value)
+    }
+  }
+
+  return {
+    addedConditions: Array.from(addedConditions),
+    removedConditions: Array.from(removedConditions),
+    addedGuards: Array.from(addedGuards),
+    removedGuards: Array.from(removedGuards),
+    addedCalls: Array.from(addedCalls),
+    removedCalls: Array.from(removedCalls),
+  }
+}
+
+export function formatCueList(values: string[]): string {
+  if (values.length === 0) {
+    return "none"
+  }
+  return values.slice(0, 6).join(" | ")
+}
+
+function isDocsPath(path: string): boolean {
+  return (
+    path.endsWith(".md") ||
+    path.endsWith(".mdx") ||
+    path.includes("/docs/") ||
+    path.startsWith("docs/")
+  )
+}
+
+function isTestPath(path: string): boolean {
+  return (
+    path.includes("/test/") ||
+    path.includes("/tests/") ||
+    path.includes(".test.") ||
+    path.includes(".spec.")
+  )
+}
+
+function isConfigPath(path: string): boolean {
+  return (
+    path.endsWith(".json") ||
+    path.endsWith(".yaml") ||
+    path.endsWith(".yml") ||
+    path.endsWith(".toml") ||
+    path.endsWith(".ini") ||
+    path.endsWith("lock") ||
+    path.endsWith(".lock")
+  )
+}
+
+function extractConditionCue(line: string): string | null {
+  const inline = line.match(/^if\s*\((.*)\)\s*\{?$/)
+  if (inline) {
+    return normalizeCue(inline[1] ?? "")
+  }
+
+  if (/^.*\?.*:.*/.test(line)) {
+    return normalizeCue("ternary-condition")
+  }
+
+  return null
+}
+
+function extractGuardCue(line: string): string | null {
+  if (line.startsWith("return") || line.startsWith("throw")) {
+    return normalizeCue(line)
+  }
+  if (line.includes(".preventDefault(")) {
+    return "preventDefault()"
+  }
+  if (line.includes(".stopPropagation(")) {
+    return "stopPropagation()"
+  }
+  return null
+}
+
+function extractCallCue(line: string): string | null {
+  const match = line.match(/([A-Za-z_$][A-Za-z0-9_$.]*)\(([^()]*)\)/)
+  if (!match) {
+    return null
+  }
+
+  const callee = (match[1] ?? "").trim()
+  if (!callee) {
+    return null
+  }
+
+  const args = (match[2] ?? "").replace(/\s+/g, " ").trim()
+  const compactArgs = args.length > 40 ? `${args.slice(0, 37).trimEnd()}...` : args
+  return normalizeCue(`${callee}(${compactArgs})`)
+}
+
+function normalizeCue(value: string): string {
+  const compact = value.replace(/\s+/g, " ").trim()
+  if (compact.length <= 72) {
+    return compact
+  }
+  return `${compact.slice(0, 69).trimEnd()}...`
+}