tidy up git actions

apps/server/src/codexAppServerManager.test.ts

@@ -21,10 +21,16 @@ function createSendTurnHarness() {
  };
 
  const requireSession = vi
- .spyOn(manager as unknown as { requireSession: (sessionId: string) => unknown }, "requireSession")
+ .spyOn(
+ manager as unknown as { requireSession: (sessionId: string) => unknown },
+ "requireSession",
+ )
  .mockReturnValue(context);
  const sendRequest = vi
- .spyOn(manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> }, "sendRequest")
+ .spyOn(
+ manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> },
+ "sendRequest",
+ )
  .mockResolvedValue({
  turn: {
  id: "turn_1",
@@ -109,7 +115,8 @@ describe("isRecoverableThreadResumeError", () => {
 
 describe("sendTurn", () => {
  it("sends text and image user input items to turn/start", async () => {
- const { manager, context, requireSession, sendRequest, updateSession } = createSendTurnHarness();
+ const { manager, context, requireSession, sendRequest, updateSession } =
+ createSendTurnHarness();
 
  const result = await manager.sendTurn({
  sessionId: "sess_1",

apps/server/src/codexAppServerManager.ts

@@ -258,8 +258,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  }
 
  const turnInput: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  > = [];
  if (input.input) {
  turnInput.push({
@@ -283,8 +282,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  const turnStartParams: {
  threadId: string;
  input: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  >;
  model?: string;
  effort?: string;

apps/server/src/coreServices.ts

@@ -28,8 +28,5 @@ export interface TextGenerationService {
  generateCommitMessage(
  input: CommitMessageGenerationInput,
  ): Promise<CommitMessageGenerationResult>;
- generatePrContent(
- input: PrContentGenerationInput,
- ): Promise<PrContentGenerationResult>;
+ generatePrContent(input: PrContentGenerationInput): Promise<PrContentGenerationResult>;
 }
-

apps/server/src/git.test.ts

@@ -11,6 +11,7 @@ import {
  createGitWorktree,
  initGitRepo,
  listGitBranches,
+ pullGitBranch,
  removeGitWorktree,
  runTerminalCommand,
 } from "./git";
@@ -569,11 +570,7 @@ describe("git integration", () => {
  expect(context!.stagedSummary.length).toBeGreaterThan(0);
  expect(context!.stagedPatch.length).toBeGreaterThan(0);
 
- const created = await core.commit(
- tmp.path,
- "Add README update",
- "- include updated content",
- );
+ const created = await core.commit(tmp.path, "Add README update", "- include updated content");
  expect(created.commitSha.length).toBeGreaterThan(0);
  expect(await git(tmp.path, "log -1 --pretty=%s")).toBe("Add README update");
  });
@@ -604,6 +601,42 @@ describe("git integration", () => {
  expect(skipped.status).toBe("skipped_up_to_date");
  });
 
+ it("pulls behind branch and then reports up-to-date", async () => {
+ await using remote = await makeTmpDir();
+ await using source = await makeTmpDir();
+ await using clone = await makeTmpDir();
+ await git(remote.path, "init --bare");
+
+ await initRepoWithCommit(source.path);
+ const initialBranch = (await listGitBranches({ cwd: source.path })).branches.find(
+ (branch) => branch.current,
+ )!.name;
+ await git(source.path, `remote add origin ${JSON.stringify(remote.path)}`);
+ await git(source.path, `push -u origin ${initialBranch}`);
+
+ await git(clone.path, `clone ${JSON.stringify(remote.path)} .`);
+ await git(clone.path, "config user.email 'test@test.com'");
+ await git(clone.path, "config user.name 'Test'");
+ await writeFile(path.join(clone.path, "CHANGELOG.md"), "remote change\n");
+ await git(clone.path, "add CHANGELOG.md");
+ await git(clone.path, "commit -m 'remote update'");
+ await git(clone.path, `push origin ${initialBranch}`);
+
+ const core = new GitCoreService();
+ const pulled = await core.pullCurrentBranch(source.path);
+ expect(pulled.status).toBe("pulled");
+ expect((await core.statusDetails(source.path)).behindCount).toBe(0);
+
+ const skipped = await core.pullCurrentBranch(source.path);
+ expect(skipped.status).toBe("skipped_up_to_date");
+ });
+
+ it("top-level pullGitBranch rejects when no upstream exists", async () => {
+ await using tmp = await makeTmpDir();
+ await initRepoWithCommit(tmp.path);
+ await expect(pullGitBranch({ cwd: tmp.path })).rejects.toThrow("no upstream");
+ });
+
  it("lists branches when recency lookup fails", async () => {
  await using tmp = await makeTmpDir();
  await initRepoWithCommit(tmp.path);

apps/server/src/git.ts

@@ -3,6 +3,8 @@ import os from "node:os";
 import path from "node:path";
 
 import {
+ gitPullInputSchema,
+ gitPullResultSchema,
  gitStatusInputSchema,
  gitStatusResultSchema,
  type GitCheckoutInput,
@@ -12,6 +14,8 @@ import {
  type GitInitInput,
  type GitListBranchesInput,
  type GitListBranchesResult,
+ type GitPullInput,
+ type GitPullResult,
  type GitRemoveWorktreeInput,
  type GitStatusInput,
  type GitStatusResult,
@@ -90,6 +94,52 @@ function parseBranchAb(value: string): { ahead: number; behind: number } {
  };
 }
 
+function parseNumstatEntries(
+ stdout: string,
+): Array<{ path: string; insertions: number; deletions: number }> {
+ const entries: Array<{ path: string; insertions: number; deletions: number }> = [];
+ for (const line of stdout.split(/\r?\n/g)) {
+ if (line.trim().length === 0) continue;
+ const [addedRaw, deletedRaw, ...pathParts] = line.split("\t");
+ const rawPath =
+ pathParts.length > 1 ? (pathParts.at(-1) ?? "").trim() : pathParts.join("\t").trim();
+ if (rawPath.length === 0) continue;
+ const added = Number.parseInt(addedRaw ?? "0", 10);
+ const deleted = Number.parseInt(deletedRaw ?? "0", 10);
+ const renameArrowIndex = rawPath.indexOf(" => ");
+ const normalizedPath =
+ renameArrowIndex >= 0 ? rawPath.slice(renameArrowIndex + " => ".length).trim() : rawPath;
+ entries.push({
+ path: normalizedPath.length > 0 ? normalizedPath : rawPath,
+ insertions: Number.isFinite(added) ? added : 0,
+ deletions: Number.isFinite(deleted) ? deleted : 0,
+ });
+ }
+ return entries;
+}
+
+function parsePorcelainPath(line: string): string | null {
+ if (line.startsWith("? ") || line.startsWith("! ")) {
+ const simple = line.slice(2).trim();
+ return simple.length > 0 ? simple : null;
+ }
+
+ if (!(line.startsWith("1 ") || line.startsWith("2 ") || line.startsWith("u "))) {
+ return null;
+ }
+
+ const tabIndex = line.indexOf("\t");
+ if (tabIndex >= 0) {
+ const fromTab = line.slice(tabIndex + 1);
+ const [path] = fromTab.split("\t");
+ return path?.trim().length ? path.trim() : null;
+ }
+
+ const parts = line.trim().split(/\s+/g);
+ const path = parts.at(-1) ?? "";
+ return path.length > 0 ? path : null;
+}
+
 function commandLabel(args: readonly string[]): string {
  return `git ${args.join(" ")}`;
 }
@@ -172,6 +222,7 @@ export class GitCoreService {
  return gitStatusResultSchema.parse({
  branch: details.branch,
  hasWorkingTreeChanges: details.hasWorkingTreeChanges,
+ workingTree: details.workingTree,
  hasUpstream: details.hasUpstream,
  aheadCount: details.aheadCount,
  behindCount: details.behindCount,
@@ -180,15 +231,20 @@ export class GitCoreService {
  }
 
  async statusDetails(cwd: string): Promise<GitStatusDetails> {
- const stdout = await this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]);
+ const [statusStdout, unstagedNumstatStdout, stagedNumstatStdout] = await Promise.all([
+ this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]),
+ this.gitStdout(cwd, ["diff", "--numstat"]),
+ this.gitStdout(cwd, ["diff", "--cached", "--numstat"]),
+ ]);
 
  let branch: string | null = null;
  let upstreamRef: string | null = null;
  let aheadCount = 0;
  let behindCount = 0;
  let hasWorkingTreeChanges = false;
+ const changedFilesWithoutNumstat = new Set<string>();
 
- for (const line of stdout.split(/\r?\n/g)) {
+ for (const line of statusStdout.split(/\r?\n/g)) {
  if (line.startsWith("# branch.head ")) {
  const value = line.slice("# branch.head ".length).trim();
  branch = value.startsWith("(") ? null : value;
@@ -208,13 +264,45 @@ export class GitCoreService {
  }
  if (line.trim().length > 0 && !line.startsWith("#")) {
  hasWorkingTreeChanges = true;
+ const pathValue = parsePorcelainPath(line);
+ if (pathValue) changedFilesWithoutNumstat.add(pathValue);
  }
  }
+ const stagedEntries = parseNumstatEntries(stagedNumstatStdout);
+ const unstagedEntries = parseNumstatEntries(unstagedNumstatStdout);
+ const fileStatMap = new Map<string, { insertions: number; deletions: number }>();
+ for (const entry of [...stagedEntries, ...unstagedEntries]) {
+ const existing = fileStatMap.get(entry.path) ?? { insertions: 0, deletions: 0 };
+ existing.insertions += entry.insertions;
+ existing.deletions += entry.deletions;
+ fileStatMap.set(entry.path, existing);
+ }
+
+ let insertions = 0;
+ let deletions = 0;
+ const files = Array.from(fileStatMap.entries())
+ .map(([path, stat]) => {
+ insertions += stat.insertions;
+ deletions += stat.deletions;
+ return { path, insertions: stat.insertions, deletions: stat.deletions };
+ })
+ .toSorted((a, b) => a.path.localeCompare(b.path));
+
+ for (const filePath of changedFilesWithoutNumstat) {
+ if (fileStatMap.has(filePath)) continue;
+ files.push({ path: filePath, insertions: 0, deletions: 0 });
+ }
+ files.sort((a, b) => a.path.localeCompare(b.path));
 
  return {
  branch,
  upstreamRef,
  hasWorkingTreeChanges,
+ workingTree: {
+ files,
+ insertions,
+ deletions,
+ },
  hasUpstream: upstreamRef !== null,
  aheadCount,
  behindCount,
@@ -224,21 +312,12 @@ export class GitCoreService {
  async prepareCommitContext(cwd: string): Promise<GitPreparedCommitContext | null> {
  await this.git(cwd, ["add", "-A"]);
 
- const stagedSummary = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--name-status",
- ]);
+ const stagedSummary = await this.gitStdout(cwd, ["diff", "--cached", "--name-status"]);
  if (trimStdout(stagedSummary).length === 0) {
  return null;
  }
 
- const stagedPatch = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--patch",
- "--minimal",
- ]);
+ const stagedPatch = await this.gitStdout(cwd, ["diff", "--cached", "--patch", "--minimal"]);
 
  return {
  stagedSummary,
@@ -291,6 +370,29 @@ export class GitCoreService {
  };
  }
 
+ async pullCurrentBranch(cwd: string): Promise<GitPullResult> {
+ const details = await this.statusDetails(cwd);
+ const branch = details.branch;
+ if (!branch) {
+ throw new Error("Cannot pull from detached HEAD.");
+ }
+ if (!details.hasUpstream) {
+ throw new Error("Current branch has no upstream configured. Push with upstream first.");
+ }
+ const beforeSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ await executeGit(cwd, ["pull", "--ff-only"], {
+ timeoutMs: 30_000,
+ fallbackErrorMessage: "git pull failed",
+ });
+ const afterSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ const refreshed = await this.statusDetails(cwd);
+ return gitPullResultSchema.parse({
+ status: beforeSha.length > 0 && beforeSha === afterSha ? "skipped_up_to_date" : "pulled",
+ branch,
+ ...(refreshed.upstreamRef ? { upstreamBranch: refreshed.upstreamRef } : {}),
+ });
+ }
+
  async readRangeContext(cwd: string, baseBranch: string): Promise<GitRangeContext> {
  const range = `${baseBranch}..HEAD`;
  const [commitSummary, diffSummary, diffPatch] = await Promise.all([
@@ -511,6 +613,11 @@ export async function listGitBranches(input: GitListBranchesInput): Promise<GitL
  return defaultGitCoreService.listBranches(input);
 }
 
+export async function pullGitBranch(raw: GitPullInput): Promise<GitPullResult> {
+ const input = gitPullInputSchema.parse(raw);
+ return defaultGitCoreService.pullCurrentBranch(input.cwd);
+}
+
 export async function createGitWorktree(
  input: GitCreateWorktreeInput,
 ): Promise<GitCreateWorktreeResult> {

apps/server/src/gitManager.test.ts

@@ -5,11 +5,7 @@ import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
 
 import { GitManager } from "./gitManager";
-import {
- type ProcessRunOptions,
- type ProcessRunResult,
- runProcess,
-} from "./processRunner";
+import { type ProcessRunOptions, type ProcessRunResult, runProcess } from "./processRunner";
 
 interface FakeGhScenario {
  prListSequence?: string[];
@@ -71,9 +67,7 @@ async function createBareRemote(): Promise<string> {
  return remoteDir;
 }
 
-function createTextGenerator(
- overrides: Partial<FakeGitTextGenerator> = {},
-): FakeGitTextGenerator {
+function createTextGenerator(overrides: Partial<FakeGitTextGenerator> = {}): FakeGitTextGenerator {
  return {
  generateCommitMessage: async () => ({
  subject: "Implement stacked git actions",
@@ -126,8 +120,7 @@ function createRunnerWithFakeGh(scenario: FakeGhScenario = {}): {
  if (args[0] === "pr" && args[1] === "create") {
  return {
  stdout:
- (scenario.createdPrUrl ??
- "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
+ (scenario.createdPrUrl ?? "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
  stderr: "",
  code: 0,
  signal: null,

apps/server/src/codexAppServerManager.test.ts

@@ -21,10 +21,16 @@ function createSendTurnHarness() {
  };
 
  const requireSession = vi
- .spyOn(manager as unknown as { requireSession: (sessionId: string) => unknown }, "requireSession")
+ .spyOn(
+ manager as unknown as { requireSession: (sessionId: string) => unknown },
+ "requireSession",
+ )
  .mockReturnValue(context);
  const sendRequest = vi
- .spyOn(manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> }, "sendRequest")
+ .spyOn(
+ manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> },
+ "sendRequest",
+ )
  .mockResolvedValue({
  turn: {
  id: "turn_1",
@@ -109,7 +115,8 @@ describe("isRecoverableThreadResumeError", () => {
 
 describe("sendTurn", () => {
  it("sends text and image user input items to turn/start", async () => {
- const { manager, context, requireSession, sendRequest, updateSession } = createSendTurnHarness();
+ const { manager, context, requireSession, sendRequest, updateSession } =
+ createSendTurnHarness();
 
  const result = await manager.sendTurn({
  sessionId: "sess_1",

apps/server/src/codexAppServerManager.ts

@@ -258,8 +258,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  }
 
  const turnInput: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  > = [];
  if (input.input) {
  turnInput.push({
@@ -283,8 +282,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  const turnStartParams: {
  threadId: string;
  input: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  >;
  model?: string;
  effort?: string;

apps/server/src/coreServices.ts

@@ -28,8 +28,5 @@ export interface TextGenerationService {
  generateCommitMessage(
  input: CommitMessageGenerationInput,
  ): Promise<CommitMessageGenerationResult>;
- generatePrContent(
- input: PrContentGenerationInput,
- ): Promise<PrContentGenerationResult>;
+ generatePrContent(input: PrContentGenerationInput): Promise<PrContentGenerationResult>;
 }
-

apps/server/src/git.test.ts

@@ -11,6 +11,7 @@ import {
  createGitWorktree,
  initGitRepo,
  listGitBranches,
+ pullGitBranch,
  removeGitWorktree,
  runTerminalCommand,
 } from "./git";
@@ -569,11 +570,7 @@ describe("git integration", () => {
  expect(context!.stagedSummary.length).toBeGreaterThan(0);
  expect(context!.stagedPatch.length).toBeGreaterThan(0);
 
- const created = await core.commit(
- tmp.path,
- "Add README update",
- "- include updated content",
- );
+ const created = await core.commit(tmp.path, "Add README update", "- include updated content");
  expect(created.commitSha.length).toBeGreaterThan(0);
  expect(await git(tmp.path, "log -1 --pretty=%s")).toBe("Add README update");
  });
@@ -604,6 +601,42 @@ describe("git integration", () => {
  expect(skipped.status).toBe("skipped_up_to_date");
  });
 
+ it("pulls behind branch and then reports up-to-date", async () => {
+ await using remote = await makeTmpDir();
+ await using source = await makeTmpDir();
+ await using clone = await makeTmpDir();
+ await git(remote.path, "init --bare");
+
+ await initRepoWithCommit(source.path);
+ const initialBranch = (await listGitBranches({ cwd: source.path })).branches.find(
+ (branch) => branch.current,
+ )!.name;
+ await git(source.path, `remote add origin ${JSON.stringify(remote.path)}`);
+ await git(source.path, `push -u origin ${initialBranch}`);
+
+ await git(clone.path, `clone ${JSON.stringify(remote.path)} .`);
+ await git(clone.path, "config user.email 'test@test.com'");
+ await git(clone.path, "config user.name 'Test'");
+ await writeFile(path.join(clone.path, "CHANGELOG.md"), "remote change\n");
+ await git(clone.path, "add CHANGELOG.md");
+ await git(clone.path, "commit -m 'remote update'");
+ await git(clone.path, `push origin ${initialBranch}`);
+
+ const core = new GitCoreService();
+ const pulled = await core.pullCurrentBranch(source.path);
+ expect(pulled.status).toBe("pulled");
+ expect((await core.statusDetails(source.path)).behindCount).toBe(0);
+
+ const skipped = await core.pullCurrentBranch(source.path);
+ expect(skipped.status).toBe("skipped_up_to_date");
+ });
+
+ it("top-level pullGitBranch rejects when no upstream exists", async () => {
+ await using tmp = await makeTmpDir();
+ await initRepoWithCommit(tmp.path);
+ await expect(pullGitBranch({ cwd: tmp.path })).rejects.toThrow("no upstream");
+ });
+
  it("lists branches when recency lookup fails", async () => {
  await using tmp = await makeTmpDir();
  await initRepoWithCommit(tmp.path);

apps/server/src/git.ts

@@ -3,6 +3,8 @@ import os from "node:os";
 import path from "node:path";
 
 import {
+ gitPullInputSchema,
+ gitPullResultSchema,
  gitStatusInputSchema,
  gitStatusResultSchema,
  type GitCheckoutInput,
@@ -12,6 +14,8 @@ import {
  type GitInitInput,
  type GitListBranchesInput,
  type GitListBranchesResult,
+ type GitPullInput,
+ type GitPullResult,
  type GitRemoveWorktreeInput,
  type GitStatusInput,
  type GitStatusResult,
@@ -90,6 +94,52 @@ function parseBranchAb(value: string): { ahead: number; behind: number } {
  };
 }
 
+function parseNumstatEntries(
+ stdout: string,
+): Array<{ path: string; insertions: number; deletions: number }> {
+ const entries: Array<{ path: string; insertions: number; deletions: number }> = [];
+ for (const line of stdout.split(/\r?\n/g)) {
+ if (line.trim().length === 0) continue;
+ const [addedRaw, deletedRaw, ...pathParts] = line.split("\t");
+ const rawPath =
+ pathParts.length > 1 ? (pathParts.at(-1) ?? "").trim() : pathParts.join("\t").trim();
+ if (rawPath.length === 0) continue;
+ const added = Number.parseInt(addedRaw ?? "0", 10);
+ const deleted = Number.parseInt(deletedRaw ?? "0", 10);
+ const renameArrowIndex = rawPath.indexOf(" => ");
+ const normalizedPath =
+ renameArrowIndex >= 0 ? rawPath.slice(renameArrowIndex + " => ".length).trim() : rawPath;
+ entries.push({
+ path: normalizedPath.length > 0 ? normalizedPath : rawPath,
+ insertions: Number.isFinite(added) ? added : 0,
+ deletions: Number.isFinite(deleted) ? deleted : 0,
+ });
+ }
+ return entries;
+}
+
+function parsePorcelainPath(line: string): string | null {
+ if (line.startsWith("? ") || line.startsWith("! ")) {
+ const simple = line.slice(2).trim();
+ return simple.length > 0 ? simple : null;
+ }
+
+ if (!(line.startsWith("1 ") || line.startsWith("2 ") || line.startsWith("u "))) {
+ return null;
+ }
+
+ const tabIndex = line.indexOf("\t");
+ if (tabIndex >= 0) {
+ const fromTab = line.slice(tabIndex + 1);
+ const [path] = fromTab.split("\t");
+ return path?.trim().length ? path.trim() : null;
+ }
+
+ const parts = line.trim().split(/\s+/g);
+ const path = parts.at(-1) ?? "";
+ return path.length > 0 ? path : null;
+}
+
 function commandLabel(args: readonly string[]): string {
  return `git ${args.join(" ")}`;
 }
@@ -172,6 +222,7 @@ export class GitCoreService {
  return gitStatusResultSchema.parse({
  branch: details.branch,
  hasWorkingTreeChanges: details.hasWorkingTreeChanges,
+ workingTree: details.workingTree,
  hasUpstream: details.hasUpstream,
  aheadCount: details.aheadCount,
  behindCount: details.behindCount,
@@ -180,15 +231,20 @@ export class GitCoreService {
  }
 
  async statusDetails(cwd: string): Promise<GitStatusDetails> {
- const stdout = await this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]);
+ const [statusStdout, unstagedNumstatStdout, stagedNumstatStdout] = await Promise.all([
+ this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]),
+ this.gitStdout(cwd, ["diff", "--numstat"]),
+ this.gitStdout(cwd, ["diff", "--cached", "--numstat"]),
+ ]);
 
  let branch: string | null = null;
  let upstreamRef: string | null = null;
  let aheadCount = 0;
  let behindCount = 0;
  let hasWorkingTreeChanges = false;
+ const changedFilesWithoutNumstat = new Set<string>();
 
- for (const line of stdout.split(/\r?\n/g)) {
+ for (const line of statusStdout.split(/\r?\n/g)) {
  if (line.startsWith("# branch.head ")) {
  const value = line.slice("# branch.head ".length).trim();
  branch = value.startsWith("(") ? null : value;
@@ -208,13 +264,45 @@ export class GitCoreService {
  }
  if (line.trim().length > 0 && !line.startsWith("#")) {
  hasWorkingTreeChanges = true;
+ const pathValue = parsePorcelainPath(line);
+ if (pathValue) changedFilesWithoutNumstat.add(pathValue);
  }
  }
+ const stagedEntries = parseNumstatEntries(stagedNumstatStdout);
+ const unstagedEntries = parseNumstatEntries(unstagedNumstatStdout);
+ const fileStatMap = new Map<string, { insertions: number; deletions: number }>();
+ for (const entry of [...stagedEntries, ...unstagedEntries]) {
+ const existing = fileStatMap.get(entry.path) ?? { insertions: 0, deletions: 0 };
+ existing.insertions += entry.insertions;
+ existing.deletions += entry.deletions;
+ fileStatMap.set(entry.path, existing);
+ }
+
+ let insertions = 0;
+ let deletions = 0;
+ const files = Array.from(fileStatMap.entries())
+ .map(([path, stat]) => {
+ insertions += stat.insertions;
+ deletions += stat.deletions;
+ return { path, insertions: stat.insertions, deletions: stat.deletions };
+ })
+ .toSorted((a, b) => a.path.localeCompare(b.path));
+
+ for (const filePath of changedFilesWithoutNumstat) {
+ if (fileStatMap.has(filePath)) continue;
+ files.push({ path: filePath, insertions: 0, deletions: 0 });
+ }
+ files.sort((a, b) => a.path.localeCompare(b.path));
 
  return {
  branch,
  upstreamRef,
  hasWorkingTreeChanges,
+ workingTree: {
+ files,
+ insertions,
+ deletions,
+ },
  hasUpstream: upstreamRef !== null,
  aheadCount,
  behindCount,
@@ -224,21 +312,12 @@ export class GitCoreService {
  async prepareCommitContext(cwd: string): Promise<GitPreparedCommitContext | null> {
  await this.git(cwd, ["add", "-A"]);
 
- const stagedSummary = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--name-status",
- ]);
+ const stagedSummary = await this.gitStdout(cwd, ["diff", "--cached", "--name-status"]);
  if (trimStdout(stagedSummary).length === 0) {
  return null;
  }
 
- const stagedPatch = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--patch",
- "--minimal",
- ]);
+ const stagedPatch = await this.gitStdout(cwd, ["diff", "--cached", "--patch", "--minimal"]);
 
  return {
  stagedSummary,
@@ -291,6 +370,29 @@ export class GitCoreService {
  };
  }
 
+ async pullCurrentBranch(cwd: string): Promise<GitPullResult> {
+ const details = await this.statusDetails(cwd);
+ const branch = details.branch;
+ if (!branch) {
+ throw new Error("Cannot pull from detached HEAD.");
+ }
+ if (!details.hasUpstream) {
+ throw new Error("Current branch has no upstream configured. Push with upstream first.");
+ }
+ const beforeSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ await executeGit(cwd, ["pull", "--ff-only"], {
+ timeoutMs: 30_000,
+ fallbackErrorMessage: "git pull failed",
+ });
+ const afterSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ const refreshed = await this.statusDetails(cwd);
+ return gitPullResultSchema.parse({
+ status: beforeSha.length > 0 && beforeSha === afterSha ? "skipped_up_to_date" : "pulled",
+ branch,
+ ...(refreshed.upstreamRef ? { upstreamBranch: refreshed.upstreamRef } : {}),
+ });
+ }
+
  async readRangeContext(cwd: string, baseBranch: string): Promise<GitRangeContext> {
  const range = `${baseBranch}..HEAD`;
  const [commitSummary, diffSummary, diffPatch] = await Promise.all([
@@ -511,6 +613,11 @@ export async function listGitBranches(input: GitListBranchesInput): Promise<GitL
  return defaultGitCoreService.listBranches(input);
 }
 
+export async function pullGitBranch(raw: GitPullInput): Promise<GitPullResult> {
+ const input = gitPullInputSchema.parse(raw);
+ return defaultGitCoreService.pullCurrentBranch(input.cwd);
+}
+
 export async function createGitWorktree(
  input: GitCreateWorktreeInput,
 ): Promise<GitCreateWorktreeResult> {

apps/server/src/gitManager.test.ts

@@ -5,11 +5,7 @@ import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
 
 import { GitManager } from "./gitManager";
-import {
- type ProcessRunOptions,
- type ProcessRunResult,
- runProcess,
-} from "./processRunner";
+import { type ProcessRunOptions, type ProcessRunResult, runProcess } from "./processRunner";
 
 interface FakeGhScenario {
  prListSequence?: string[];
@@ -71,9 +67,7 @@ async function createBareRemote(): Promise<string> {
  return remoteDir;
 }
 
-function createTextGenerator(
- overrides: Partial<FakeGitTextGenerator> = {},
-): FakeGitTextGenerator {
+function createTextGenerator(overrides: Partial<FakeGitTextGenerator> = {}): FakeGitTextGenerator {
  return {
  generateCommitMessage: async () => ({
  subject: "Implement stacked git actions",
@@ -126,8 +120,7 @@ function createRunnerWithFakeGh(scenario: FakeGhScenario = {}): {
  if (args[0] === "pr" && args[1] === "create") {
  return {
  stdout:
- (scenario.createdPrUrl ??
- "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
+ (scenario.createdPrUrl ?? "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
  stderr: "",
  code: 0,
  signal: null,

apps/server/src/codexAppServerManager.test.ts

@@ -21,10 +21,16 @@ function createSendTurnHarness() {
  };
 
  const requireSession = vi
- .spyOn(manager as unknown as { requireSession: (sessionId: string) => unknown }, "requireSession")
+ .spyOn(
+ manager as unknown as { requireSession: (sessionId: string) => unknown },
+ "requireSession",
+ )
  .mockReturnValue(context);
  const sendRequest = vi
- .spyOn(manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> }, "sendRequest")
+ .spyOn(
+ manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> },
+ "sendRequest",
+ )
  .mockResolvedValue({
  turn: {
  id: "turn_1",
@@ -109,7 +115,8 @@ describe("isRecoverableThreadResumeError", () => {
 
 describe("sendTurn", () => {
  it("sends text and image user input items to turn/start", async () => {
- const { manager, context, requireSession, sendRequest, updateSession } = createSendTurnHarness();
+ const { manager, context, requireSession, sendRequest, updateSession } =
+ createSendTurnHarness();
 
  const result = await manager.sendTurn({
  sessionId: "sess_1",

apps/server/src/codexAppServerManager.ts

@@ -258,8 +258,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  }
 
  const turnInput: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  > = [];
  if (input.input) {
  turnInput.push({
@@ -283,8 +282,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  const turnStartParams: {
  threadId: string;
  input: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  >;
  model?: string;
  effort?: string;

apps/server/src/coreServices.ts

@@ -28,8 +28,5 @@ export interface TextGenerationService {
  generateCommitMessage(
  input: CommitMessageGenerationInput,
  ): Promise<CommitMessageGenerationResult>;
- generatePrContent(
- input: PrContentGenerationInput,
- ): Promise<PrContentGenerationResult>;
+ generatePrContent(input: PrContentGenerationInput): Promise<PrContentGenerationResult>;
 }
-

apps/server/src/git.test.ts

@@ -11,6 +11,7 @@ import {
  createGitWorktree,
  initGitRepo,
  listGitBranches,
+ pullGitBranch,
  removeGitWorktree,
  runTerminalCommand,
 } from "./git";
@@ -569,11 +570,7 @@ describe("git integration", () => {
  expect(context!.stagedSummary.length).toBeGreaterThan(0);
  expect(context!.stagedPatch.length).toBeGreaterThan(0);
 
- const created = await core.commit(
- tmp.path,
- "Add README update",
- "- include updated content",
- );
+ const created = await core.commit(tmp.path, "Add README update", "- include updated content");
  expect(created.commitSha.length).toBeGreaterThan(0);
  expect(await git(tmp.path, "log -1 --pretty=%s")).toBe("Add README update");
  });
@@ -604,6 +601,42 @@ describe("git integration", () => {
  expect(skipped.status).toBe("skipped_up_to_date");
  });
 
+ it("pulls behind branch and then reports up-to-date", async () => {
+ await using remote = await makeTmpDir();
+ await using source = await makeTmpDir();
+ await using clone = await makeTmpDir();
+ await git(remote.path, "init --bare");
+
+ await initRepoWithCommit(source.path);
+ const initialBranch = (await listGitBranches({ cwd: source.path })).branches.find(
+ (branch) => branch.current,
+ )!.name;
+ await git(source.path, `remote add origin ${JSON.stringify(remote.path)}`);
+ await git(source.path, `push -u origin ${initialBranch}`);
+
+ await git(clone.path, `clone ${JSON.stringify(remote.path)} .`);
+ await git(clone.path, "config user.email 'test@test.com'");
+ await git(clone.path, "config user.name 'Test'");
+ await writeFile(path.join(clone.path, "CHANGELOG.md"), "remote change\n");
+ await git(clone.path, "add CHANGELOG.md");
+ await git(clone.path, "commit -m 'remote update'");
+ await git(clone.path, `push origin ${initialBranch}`);
+
+ const core = new GitCoreService();
+ const pulled = await core.pullCurrentBranch(source.path);
+ expect(pulled.status).toBe("pulled");
+ expect((await core.statusDetails(source.path)).behindCount).toBe(0);
+
+ const skipped = await core.pullCurrentBranch(source.path);
+ expect(skipped.status).toBe("skipped_up_to_date");
+ });
+
+ it("top-level pullGitBranch rejects when no upstream exists", async () => {
+ await using tmp = await makeTmpDir();
+ await initRepoWithCommit(tmp.path);
+ await expect(pullGitBranch({ cwd: tmp.path })).rejects.toThrow("no upstream");
+ });
+
  it("lists branches when recency lookup fails", async () => {
  await using tmp = await makeTmpDir();
  await initRepoWithCommit(tmp.path);

apps/server/src/git.ts

@@ -3,6 +3,8 @@ import os from "node:os";
 import path from "node:path";
 
 import {
+ gitPullInputSchema,
+ gitPullResultSchema,
  gitStatusInputSchema,
  gitStatusResultSchema,
  type GitCheckoutInput,
@@ -12,6 +14,8 @@ import {
  type GitInitInput,
  type GitListBranchesInput,
  type GitListBranchesResult,
+ type GitPullInput,
+ type GitPullResult,
  type GitRemoveWorktreeInput,
  type GitStatusInput,
  type GitStatusResult,
@@ -90,6 +94,52 @@ function parseBranchAb(value: string): { ahead: number; behind: number } {
  };
 }
 
+function parseNumstatEntries(
+ stdout: string,
+): Array<{ path: string; insertions: number; deletions: number }> {
+ const entries: Array<{ path: string; insertions: number; deletions: number }> = [];
+ for (const line of stdout.split(/\r?\n/g)) {
+ if (line.trim().length === 0) continue;
+ const [addedRaw, deletedRaw, ...pathParts] = line.split("\t");
+ const rawPath =
+ pathParts.length > 1 ? (pathParts.at(-1) ?? "").trim() : pathParts.join("\t").trim();
+ if (rawPath.length === 0) continue;
+ const added = Number.parseInt(addedRaw ?? "0", 10);
+ const deleted = Number.parseInt(deletedRaw ?? "0", 10);
+ const renameArrowIndex = rawPath.indexOf(" => ");
+ const normalizedPath =
+ renameArrowIndex >= 0 ? rawPath.slice(renameArrowIndex + " => ".length).trim() : rawPath;
+ entries.push({
+ path: normalizedPath.length > 0 ? normalizedPath : rawPath,
+ insertions: Number.isFinite(added) ? added : 0,
+ deletions: Number.isFinite(deleted) ? deleted : 0,
+ });
+ }
+ return entries;
+}
+
+function parsePorcelainPath(line: string): string | null {
+ if (line.startsWith("? ") || line.startsWith("! ")) {
+ const simple = line.slice(2).trim();
+ return simple.length > 0 ? simple : null;
+ }
+
+ if (!(line.startsWith("1 ") || line.startsWith("2 ") || line.startsWith("u "))) {
+ return null;
+ }
+
+ const tabIndex = line.indexOf("\t");
+ if (tabIndex >= 0) {
+ const fromTab = line.slice(tabIndex + 1);
+ const [path] = fromTab.split("\t");
+ return path?.trim().length ? path.trim() : null;
+ }
+
+ const parts = line.trim().split(/\s+/g);
+ const path = parts.at(-1) ?? "";
+ return path.length > 0 ? path : null;
+}
+
 function commandLabel(args: readonly string[]): string {
  return `git ${args.join(" ")}`;
 }
@@ -172,6 +222,7 @@ export class GitCoreService {
  return gitStatusResultSchema.parse({
  branch: details.branch,
  hasWorkingTreeChanges: details.hasWorkingTreeChanges,
+ workingTree: details.workingTree,
  hasUpstream: details.hasUpstream,
  aheadCount: details.aheadCount,
  behindCount: details.behindCount,
@@ -180,15 +231,20 @@ export class GitCoreService {
  }
 
  async statusDetails(cwd: string): Promise<GitStatusDetails> {
- const stdout = await this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]);
+ const [statusStdout, unstagedNumstatStdout, stagedNumstatStdout] = await Promise.all([
+ this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]),
+ this.gitStdout(cwd, ["diff", "--numstat"]),
+ this.gitStdout(cwd, ["diff", "--cached", "--numstat"]),
+ ]);
 
  let branch: string | null = null;
  let upstreamRef: string | null = null;
  let aheadCount = 0;
  let behindCount = 0;
  let hasWorkingTreeChanges = false;
+ const changedFilesWithoutNumstat = new Set<string>();
 
- for (const line of stdout.split(/\r?\n/g)) {
+ for (const line of statusStdout.split(/\r?\n/g)) {
  if (line.startsWith("# branch.head ")) {
  const value = line.slice("# branch.head ".length).trim();
  branch = value.startsWith("(") ? null : value;
@@ -208,13 +264,45 @@ export class GitCoreService {
  }
  if (line.trim().length > 0 && !line.startsWith("#")) {
  hasWorkingTreeChanges = true;
+ const pathValue = parsePorcelainPath(line);
+ if (pathValue) changedFilesWithoutNumstat.add(pathValue);
  }
  }
+ const stagedEntries = parseNumstatEntries(stagedNumstatStdout);
+ const unstagedEntries = parseNumstatEntries(unstagedNumstatStdout);
+ const fileStatMap = new Map<string, { insertions: number; deletions: number }>();
+ for (const entry of [...stagedEntries, ...unstagedEntries]) {
+ const existing = fileStatMap.get(entry.path) ?? { insertions: 0, deletions: 0 };
+ existing.insertions += entry.insertions;
+ existing.deletions += entry.deletions;
+ fileStatMap.set(entry.path, existing);
+ }
+
+ let insertions = 0;
+ let deletions = 0;
+ const files = Array.from(fileStatMap.entries())
+ .map(([path, stat]) => {
+ insertions += stat.insertions;
+ deletions += stat.deletions;
+ return { path, insertions: stat.insertions, deletions: stat.deletions };
+ })
+ .toSorted((a, b) => a.path.localeCompare(b.path));
+
+ for (const filePath of changedFilesWithoutNumstat) {
+ if (fileStatMap.has(filePath)) continue;
+ files.push({ path: filePath, insertions: 0, deletions: 0 });
+ }
+ files.sort((a, b) => a.path.localeCompare(b.path));
 
  return {
  branch,
  upstreamRef,
  hasWorkingTreeChanges,
+ workingTree: {
+ files,
+ insertions,
+ deletions,
+ },
  hasUpstream: upstreamRef !== null,
  aheadCount,
  behindCount,
@@ -224,21 +312,12 @@ export class GitCoreService {
  async prepareCommitContext(cwd: string): Promise<GitPreparedCommitContext | null> {
  await this.git(cwd, ["add", "-A"]);
 
- const stagedSummary = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--name-status",
- ]);
+ const stagedSummary = await this.gitStdout(cwd, ["diff", "--cached", "--name-status"]);
  if (trimStdout(stagedSummary).length === 0) {
  return null;
  }
 
- const stagedPatch = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--patch",
- "--minimal",
- ]);
+ const stagedPatch = await this.gitStdout(cwd, ["diff", "--cached", "--patch", "--minimal"]);
 
  return {
  stagedSummary,
@@ -291,6 +370,29 @@ export class GitCoreService {
  };
  }
 
+ async pullCurrentBranch(cwd: string): Promise<GitPullResult> {
+ const details = await this.statusDetails(cwd);
+ const branch = details.branch;
+ if (!branch) {
+ throw new Error("Cannot pull from detached HEAD.");
+ }
+ if (!details.hasUpstream) {
+ throw new Error("Current branch has no upstream configured. Push with upstream first.");
+ }
+ const beforeSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ await executeGit(cwd, ["pull", "--ff-only"], {
+ timeoutMs: 30_000,
+ fallbackErrorMessage: "git pull failed",
+ });
+ const afterSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ const refreshed = await this.statusDetails(cwd);
+ return gitPullResultSchema.parse({
+ status: beforeSha.length > 0 && beforeSha === afterSha ? "skipped_up_to_date" : "pulled",
+ branch,
+ ...(refreshed.upstreamRef ? { upstreamBranch: refreshed.upstreamRef } : {}),
+ });
+ }
+
  async readRangeContext(cwd: string, baseBranch: string): Promise<GitRangeContext> {
  const range = `${baseBranch}..HEAD`;
  const [commitSummary, diffSummary, diffPatch] = await Promise.all([
@@ -511,6 +613,11 @@ export async function listGitBranches(input: GitListBranchesInput): Promise<GitL
  return defaultGitCoreService.listBranches(input);
 }
 
+export async function pullGitBranch(raw: GitPullInput): Promise<GitPullResult> {
+ const input = gitPullInputSchema.parse(raw);
+ return defaultGitCoreService.pullCurrentBranch(input.cwd);
+}
+
 export async function createGitWorktree(
  input: GitCreateWorktreeInput,
 ): Promise<GitCreateWorktreeResult> {

apps/server/src/gitManager.test.ts

@@ -5,11 +5,7 @@ import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
 
 import { GitManager } from "./gitManager";
-import {
- type ProcessRunOptions,
- type ProcessRunResult,
- runProcess,
-} from "./processRunner";
+import { type ProcessRunOptions, type ProcessRunResult, runProcess } from "./processRunner";
 
 interface FakeGhScenario {
  prListSequence?: string[];
@@ -71,9 +67,7 @@ async function createBareRemote(): Promise<string> {
  return remoteDir;
 }
 
-function createTextGenerator(
- overrides: Partial<FakeGitTextGenerator> = {},
-): FakeGitTextGenerator {
+function createTextGenerator(overrides: Partial<FakeGitTextGenerator> = {}): FakeGitTextGenerator {
  return {
  generateCommitMessage: async () => ({
  subject: "Implement stacked git actions",
@@ -126,8 +120,7 @@ function createRunnerWithFakeGh(scenario: FakeGhScenario = {}): {
  if (args[0] === "pr" && args[1] === "create") {
  return {
  stdout:
- (scenario.createdPrUrl ??
- "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
+ (scenario.createdPrUrl ?? "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
  stderr: "",
  code: 0,
  signal: null,

apps/server/src/codexAppServerManager.test.ts

@@ -21,10 +21,16 @@ function createSendTurnHarness() {
  };
 
  const requireSession = vi
- .spyOn(manager as unknown as { requireSession: (sessionId: string) => unknown }, "requireSession")
+ .spyOn(
+ manager as unknown as { requireSession: (sessionId: string) => unknown },
+ "requireSession",
+ )
  .mockReturnValue(context);
  const sendRequest = vi
- .spyOn(manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> }, "sendRequest")
+ .spyOn(
+ manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> },
+ "sendRequest",
+ )
  .mockResolvedValue({
  turn: {
  id: "turn_1",
@@ -109,7 +115,8 @@ describe("isRecoverableThreadResumeError", () => {
 
 describe("sendTurn", () => {
  it("sends text and image user input items to turn/start", async () => {
- const { manager, context, requireSession, sendRequest, updateSession } = createSendTurnHarness();
+ const { manager, context, requireSession, sendRequest, updateSession } =
+ createSendTurnHarness();
 
  const result = await manager.sendTurn({
  sessionId: "sess_1",

apps/server/src/codexAppServerManager.ts

@@ -258,8 +258,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  }
 
  const turnInput: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  > = [];
  if (input.input) {
  turnInput.push({
@@ -283,8 +282,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  const turnStartParams: {
  threadId: string;
  input: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  >;
  model?: string;
  effort?: string;

apps/server/src/coreServices.ts

@@ -28,8 +28,5 @@ export interface TextGenerationService {
  generateCommitMessage(
  input: CommitMessageGenerationInput,
  ): Promise<CommitMessageGenerationResult>;
- generatePrContent(
- input: PrContentGenerationInput,
- ): Promise<PrContentGenerationResult>;
+ generatePrContent(input: PrContentGenerationInput): Promise<PrContentGenerationResult>;
 }
-

apps/server/src/git.test.ts

@@ -11,6 +11,7 @@ import {
  createGitWorktree,
  initGitRepo,
  listGitBranches,
+ pullGitBranch,
  removeGitWorktree,
  runTerminalCommand,
 } from "./git";
@@ -569,11 +570,7 @@ describe("git integration", () => {
  expect(context!.stagedSummary.length).toBeGreaterThan(0);
  expect(context!.stagedPatch.length).toBeGreaterThan(0);
 
- const created = await core.commit(
- tmp.path,
- "Add README update",
- "- include updated content",
- );
+ const created = await core.commit(tmp.path, "Add README update", "- include updated content");
  expect(created.commitSha.length).toBeGreaterThan(0);
  expect(await git(tmp.path, "log -1 --pretty=%s")).toBe("Add README update");
  });
@@ -604,6 +601,42 @@ describe("git integration", () => {
  expect(skipped.status).toBe("skipped_up_to_date");
  });
 
+ it("pulls behind branch and then reports up-to-date", async () => {
+ await using remote = await makeTmpDir();
+ await using source = await makeTmpDir();
+ await using clone = await makeTmpDir();
+ await git(remote.path, "init --bare");
+
+ await initRepoWithCommit(source.path);
+ const initialBranch = (await listGitBranches({ cwd: source.path })).branches.find(
+ (branch) => branch.current,
+ )!.name;
+ await git(source.path, `remote add origin ${JSON.stringify(remote.path)}`);
+ await git(source.path, `push -u origin ${initialBranch}`);
+
+ await git(clone.path, `clone ${JSON.stringify(remote.path)} .`);
+ await git(clone.path, "config user.email 'test@test.com'");
+ await git(clone.path, "config user.name 'Test'");
+ await writeFile(path.join(clone.path, "CHANGELOG.md"), "remote change\n");
+ await git(clone.path, "add CHANGELOG.md");
+ await git(clone.path, "commit -m 'remote update'");
+ await git(clone.path, `push origin ${initialBranch}`);
+
+ const core = new GitCoreService();
+ const pulled = await core.pullCurrentBranch(source.path);
+ expect(pulled.status).toBe("pulled");
+ expect((await core.statusDetails(source.path)).behindCount).toBe(0);
+
+ const skipped = await core.pullCurrentBranch(source.path);
+ expect(skipped.status).toBe("skipped_up_to_date");
+ });
+
+ it("top-level pullGitBranch rejects when no upstream exists", async () => {
+ await using tmp = await makeTmpDir();
+ await initRepoWithCommit(tmp.path);
+ await expect(pullGitBranch({ cwd: tmp.path })).rejects.toThrow("no upstream");
+ });
+
  it("lists branches when recency lookup fails", async () => {
  await using tmp = await makeTmpDir();
  await initRepoWithCommit(tmp.path);

apps/server/src/git.ts

@@ -3,6 +3,8 @@ import os from "node:os";
 import path from "node:path";
 
 import {
+ gitPullInputSchema,
+ gitPullResultSchema,
  gitStatusInputSchema,
  gitStatusResultSchema,
  type GitCheckoutInput,
@@ -12,6 +14,8 @@ import {
  type GitInitInput,
  type GitListBranchesInput,
  type GitListBranchesResult,
+ type GitPullInput,
+ type GitPullResult,
  type GitRemoveWorktreeInput,
  type GitStatusInput,
  type GitStatusResult,
@@ -90,6 +94,52 @@ function parseBranchAb(value: string): { ahead: number; behind: number } {
  };
 }
 
+function parseNumstatEntries(
+ stdout: string,
+): Array<{ path: string; insertions: number; deletions: number }> {
+ const entries: Array<{ path: string; insertions: number; deletions: number }> = [];
+ for (const line of stdout.split(/\r?\n/g)) {
+ if (line.trim().length === 0) continue;
+ const [addedRaw, deletedRaw, ...pathParts] = line.split("\t");
+ const rawPath =
+ pathParts.length > 1 ? (pathParts.at(-1) ?? "").trim() : pathParts.join("\t").trim();
+ if (rawPath.length === 0) continue;
+ const added = Number.parseInt(addedRaw ?? "0", 10);
+ const deleted = Number.parseInt(deletedRaw ?? "0", 10);
+ const renameArrowIndex = rawPath.indexOf(" => ");
+ const normalizedPath =
+ renameArrowIndex >= 0 ? rawPath.slice(renameArrowIndex + " => ".length).trim() : rawPath;
+ entries.push({
+ path: normalizedPath.length > 0 ? normalizedPath : rawPath,
+ insertions: Number.isFinite(added) ? added : 0,
+ deletions: Number.isFinite(deleted) ? deleted : 0,
+ });
+ }
+ return entries;
+}
+
+function parsePorcelainPath(line: string): string | null {
+ if (line.startsWith("? ") || line.startsWith("! ")) {
+ const simple = line.slice(2).trim();
+ return simple.length > 0 ? simple : null;
+ }
+
+ if (!(line.startsWith("1 ") || line.startsWith("2 ") || line.startsWith("u "))) {
+ return null;
+ }
+
+ const tabIndex = line.indexOf("\t");
+ if (tabIndex >= 0) {
+ const fromTab = line.slice(tabIndex + 1);
+ const [path] = fromTab.split("\t");
+ return path?.trim().length ? path.trim() : null;
+ }
+
+ const parts = line.trim().split(/\s+/g);
+ const path = parts.at(-1) ?? "";
+ return path.length > 0 ? path : null;
+}
+
 function commandLabel(args: readonly string[]): string {
  return `git ${args.join(" ")}`;
 }
@@ -172,6 +222,7 @@ export class GitCoreService {
  return gitStatusResultSchema.parse({
  branch: details.branch,
  hasWorkingTreeChanges: details.hasWorkingTreeChanges,
+ workingTree: details.workingTree,
  hasUpstream: details.hasUpstream,
  aheadCount: details.aheadCount,
  behindCount: details.behindCount,
@@ -180,15 +231,20 @@ export class GitCoreService {
  }
 
  async statusDetails(cwd: string): Promise<GitStatusDetails> {
- const stdout = await this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]);
+ const [statusStdout, unstagedNumstatStdout, stagedNumstatStdout] = await Promise.all([
+ this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]),
+ this.gitStdout(cwd, ["diff", "--numstat"]),
+ this.gitStdout(cwd, ["diff", "--cached", "--numstat"]),
+ ]);
 
  let branch: string | null = null;
  let upstreamRef: string | null = null;
  let aheadCount = 0;
  let behindCount = 0;
  let hasWorkingTreeChanges = false;
+ const changedFilesWithoutNumstat = new Set<string>();
 
- for (const line of stdout.split(/\r?\n/g)) {
+ for (const line of statusStdout.split(/\r?\n/g)) {
  if (line.startsWith("# branch.head ")) {
  const value = line.slice("# branch.head ".length).trim();
  branch = value.startsWith("(") ? null : value;
@@ -208,13 +264,45 @@ export class GitCoreService {
  }
  if (line.trim().length > 0 && !line.startsWith("#")) {
  hasWorkingTreeChanges = true;
+ const pathValue = parsePorcelainPath(line);
+ if (pathValue) changedFilesWithoutNumstat.add(pathValue);
  }
  }
+ const stagedEntries = parseNumstatEntries(stagedNumstatStdout);
+ const unstagedEntries = parseNumstatEntries(unstagedNumstatStdout);
+ const fileStatMap = new Map<string, { insertions: number; deletions: number }>();
+ for (const entry of [...stagedEntries, ...unstagedEntries]) {
+ const existing = fileStatMap.get(entry.path) ?? { insertions: 0, deletions: 0 };
+ existing.insertions += entry.insertions;
+ existing.deletions += entry.deletions;
+ fileStatMap.set(entry.path, existing);
+ }
+
+ let insertions = 0;
+ let deletions = 0;
+ const files = Array.from(fileStatMap.entries())
+ .map(([path, stat]) => {
+ insertions += stat.insertions;
+ deletions += stat.deletions;
+ return { path, insertions: stat.insertions, deletions: stat.deletions };
+ })
+ .toSorted((a, b) => a.path.localeCompare(b.path));
+
+ for (const filePath of changedFilesWithoutNumstat) {
+ if (fileStatMap.has(filePath)) continue;
+ files.push({ path: filePath, insertions: 0, deletions: 0 });
+ }
+ files.sort((a, b) => a.path.localeCompare(b.path));
 
  return {
  branch,
  upstreamRef,
  hasWorkingTreeChanges,
+ workingTree: {
+ files,
+ insertions,
+ deletions,
+ },
  hasUpstream: upstreamRef !== null,
  aheadCount,
  behindCount,
@@ -224,21 +312,12 @@ export class GitCoreService {
  async prepareCommitContext(cwd: string): Promise<GitPreparedCommitContext | null> {
  await this.git(cwd, ["add", "-A"]);
 
- const stagedSummary = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--name-status",
- ]);
+ const stagedSummary = await this.gitStdout(cwd, ["diff", "--cached", "--name-status"]);
  if (trimStdout(stagedSummary).length === 0) {
  return null;
  }
 
- const stagedPatch = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--patch",
- "--minimal",
- ]);
+ const stagedPatch = await this.gitStdout(cwd, ["diff", "--cached", "--patch", "--minimal"]);
 
  return {
  stagedSummary,
@@ -291,6 +370,29 @@ export class GitCoreService {
  };
  }
 
+ async pullCurrentBranch(cwd: string): Promise<GitPullResult> {
+ const details = await this.statusDetails(cwd);
+ const branch = details.branch;
+ if (!branch) {
+ throw new Error("Cannot pull from detached HEAD.");
+ }
+ if (!details.hasUpstream) {
+ throw new Error("Current branch has no upstream configured. Push with upstream first.");
+ }
+ const beforeSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ await executeGit(cwd, ["pull", "--ff-only"], {
+ timeoutMs: 30_000,
+ fallbackErrorMessage: "git pull failed",
+ });
+ const afterSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ const refreshed = await this.statusDetails(cwd);
+ return gitPullResultSchema.parse({
+ status: beforeSha.length > 0 && beforeSha === afterSha ? "skipped_up_to_date" : "pulled",
+ branch,
+ ...(refreshed.upstreamRef ? { upstreamBranch: refreshed.upstreamRef } : {}),
+ });
+ }
+
  async readRangeContext(cwd: string, baseBranch: string): Promise<GitRangeContext> {
  const range = `${baseBranch}..HEAD`;
  const [commitSummary, diffSummary, diffPatch] = await Promise.all([
@@ -511,6 +613,11 @@ export async function listGitBranches(input: GitListBranchesInput): Promise<GitL
  return defaultGitCoreService.listBranches(input);
 }
 
+export async function pullGitBranch(raw: GitPullInput): Promise<GitPullResult> {
+ const input = gitPullInputSchema.parse(raw);
+ return defaultGitCoreService.pullCurrentBranch(input.cwd);
+}
+
 export async function createGitWorktree(
  input: GitCreateWorktreeInput,
 ): Promise<GitCreateWorktreeResult> {

apps/server/src/gitManager.test.ts

@@ -5,11 +5,7 @@ import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
 
 import { GitManager } from "./gitManager";
-import {
- type ProcessRunOptions,
- type ProcessRunResult,
- runProcess,
-} from "./processRunner";
+import { type ProcessRunOptions, type ProcessRunResult, runProcess } from "./processRunner";
 
 interface FakeGhScenario {
  prListSequence?: string[];
@@ -71,9 +67,7 @@ async function createBareRemote(): Promise<string> {
  return remoteDir;
 }
 
-function createTextGenerator(
- overrides: Partial<FakeGitTextGenerator> = {},
-): FakeGitTextGenerator {
+function createTextGenerator(overrides: Partial<FakeGitTextGenerator> = {}): FakeGitTextGenerator {
  return {
  generateCommitMessage: async () => ({
  subject: "Implement stacked git actions",
@@ -126,8 +120,7 @@ function createRunnerWithFakeGh(scenario: FakeGhScenario = {}): {
  if (args[0] === "pr" && args[1] === "create") {
  return {
  stdout:
- (scenario.createdPrUrl ??
- "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
+ (scenario.createdPrUrl ?? "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
  stderr: "",
  code: 0,
  signal: null,

apps/server/src/codexAppServerManager.test.ts

@@ -21,10 +21,16 @@ function createSendTurnHarness() {
  };
 
  const requireSession = vi
- .spyOn(manager as unknown as { requireSession: (sessionId: string) => unknown }, "requireSession")
+ .spyOn(
+ manager as unknown as { requireSession: (sessionId: string) => unknown },
+ "requireSession",
+ )
  .mockReturnValue(context);
  const sendRequest = vi
- .spyOn(manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> }, "sendRequest")
+ .spyOn(
+ manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> },
+ "sendRequest",
+ )
  .mockResolvedValue({
  turn: {
  id: "turn_1",
@@ -109,7 +115,8 @@ describe("isRecoverableThreadResumeError", () => {
 
 describe("sendTurn", () => {
  it("sends text and image user input items to turn/start", async () => {
- const { manager, context, requireSession, sendRequest, updateSession } = createSendTurnHarness();
+ const { manager, context, requireSession, sendRequest, updateSession } =
+ createSendTurnHarness();
 
  const result = await manager.sendTurn({
  sessionId: "sess_1",

apps/server/src/codexAppServerManager.ts

@@ -258,8 +258,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  }
 
  const turnInput: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  > = [];
  if (input.input) {
  turnInput.push({
@@ -283,8 +282,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  const turnStartParams: {
  threadId: string;
  input: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  >;
  model?: string;
  effort?: string;

apps/server/src/coreServices.ts

@@ -28,8 +28,5 @@ export interface TextGenerationService {
  generateCommitMessage(
  input: CommitMessageGenerationInput,
  ): Promise<CommitMessageGenerationResult>;
- generatePrContent(
- input: PrContentGenerationInput,
- ): Promise<PrContentGenerationResult>;
+ generatePrContent(input: PrContentGenerationInput): Promise<PrContentGenerationResult>;
 }
-

apps/server/src/git.test.ts

@@ -11,6 +11,7 @@ import {
  createGitWorktree,
  initGitRepo,
  listGitBranches,
+ pullGitBranch,
  removeGitWorktree,
  runTerminalCommand,
 } from "./git";
@@ -569,11 +570,7 @@ describe("git integration", () => {
  expect(context!.stagedSummary.length).toBeGreaterThan(0);
  expect(context!.stagedPatch.length).toBeGreaterThan(0);
 
- const created = await core.commit(
- tmp.path,
- "Add README update",
- "- include updated content",
- );
+ const created = await core.commit(tmp.path, "Add README update", "- include updated content");
  expect(created.commitSha.length).toBeGreaterThan(0);
  expect(await git(tmp.path, "log -1 --pretty=%s")).toBe("Add README update");
  });
@@ -604,6 +601,42 @@ describe("git integration", () => {
  expect(skipped.status).toBe("skipped_up_to_date");
  });
 
+ it("pulls behind branch and then reports up-to-date", async () => {
+ await using remote = await makeTmpDir();
+ await using source = await makeTmpDir();
+ await using clone = await makeTmpDir();
+ await git(remote.path, "init --bare");
+
+ await initRepoWithCommit(source.path);
+ const initialBranch = (await listGitBranches({ cwd: source.path })).branches.find(
+ (branch) => branch.current,
+ )!.name;
+ await git(source.path, `remote add origin ${JSON.stringify(remote.path)}`);
+ await git(source.path, `push -u origin ${initialBranch}`);
+
+ await git(clone.path, `clone ${JSON.stringify(remote.path)} .`);
+ await git(clone.path, "config user.email 'test@test.com'");
+ await git(clone.path, "config user.name 'Test'");
+ await writeFile(path.join(clone.path, "CHANGELOG.md"), "remote change\n");
+ await git(clone.path, "add CHANGELOG.md");
+ await git(clone.path, "commit -m 'remote update'");
+ await git(clone.path, `push origin ${initialBranch}`);
+
+ const core = new GitCoreService();
+ const pulled = await core.pullCurrentBranch(source.path);
+ expect(pulled.status).toBe("pulled");
+ expect((await core.statusDetails(source.path)).behindCount).toBe(0);
+
+ const skipped = await core.pullCurrentBranch(source.path);
+ expect(skipped.status).toBe("skipped_up_to_date");
+ });
+
+ it("top-level pullGitBranch rejects when no upstream exists", async () => {
+ await using tmp = await makeTmpDir();
+ await initRepoWithCommit(tmp.path);
+ await expect(pullGitBranch({ cwd: tmp.path })).rejects.toThrow("no upstream");
+ });
+
  it("lists branches when recency lookup fails", async () => {
  await using tmp = await makeTmpDir();
  await initRepoWithCommit(tmp.path);

apps/server/src/git.ts

@@ -3,6 +3,8 @@ import os from "node:os";
 import path from "node:path";
 
 import {
+ gitPullInputSchema,
+ gitPullResultSchema,
  gitStatusInputSchema,
  gitStatusResultSchema,
  type GitCheckoutInput,
@@ -12,6 +14,8 @@ import {
  type GitInitInput,
  type GitListBranchesInput,
  type GitListBranchesResult,
+ type GitPullInput,
+ type GitPullResult,
  type GitRemoveWorktreeInput,
  type GitStatusInput,
  type GitStatusResult,
@@ -90,6 +94,52 @@ function parseBranchAb(value: string): { ahead: number; behind: number } {
  };
 }
 
+function parseNumstatEntries(
+ stdout: string,
+): Array<{ path: string; insertions: number; deletions: number }> {
+ const entries: Array<{ path: string; insertions: number; deletions: number }> = [];
+ for (const line of stdout.split(/\r?\n/g)) {
+ if (line.trim().length === 0) continue;
+ const [addedRaw, deletedRaw, ...pathParts] = line.split("\t");
+ const rawPath =
+ pathParts.length > 1 ? (pathParts.at(-1) ?? "").trim() : pathParts.join("\t").trim();
+ if (rawPath.length === 0) continue;
+ const added = Number.parseInt(addedRaw ?? "0", 10);
+ const deleted = Number.parseInt(deletedRaw ?? "0", 10);
+ const renameArrowIndex = rawPath.indexOf(" => ");
+ const normalizedPath =
+ renameArrowIndex >= 0 ? rawPath.slice(renameArrowIndex + " => ".length).trim() : rawPath;
+ entries.push({
+ path: normalizedPath.length > 0 ? normalizedPath : rawPath,
+ insertions: Number.isFinite(added) ? added : 0,
+ deletions: Number.isFinite(deleted) ? deleted : 0,
+ });
+ }
+ return entries;
+}
+
+function parsePorcelainPath(line: string): string | null {
+ if (line.startsWith("? ") || line.startsWith("! ")) {
+ const simple = line.slice(2).trim();
+ return simple.length > 0 ? simple : null;
+ }
+
+ if (!(line.startsWith("1 ") || line.startsWith("2 ") || line.startsWith("u "))) {
+ return null;
+ }
+
+ const tabIndex = line.indexOf("\t");
+ if (tabIndex >= 0) {
+ const fromTab = line.slice(tabIndex + 1);
+ const [path] = fromTab.split("\t");
+ return path?.trim().length ? path.trim() : null;
+ }
+
+ const parts = line.trim().split(/\s+/g);
+ const path = parts.at(-1) ?? "";
+ return path.length > 0 ? path : null;
+}
+
 function commandLabel(args: readonly string[]): string {
  return `git ${args.join(" ")}`;
 }
@@ -172,6 +222,7 @@ export class GitCoreService {
  return gitStatusResultSchema.parse({
  branch: details.branch,
  hasWorkingTreeChanges: details.hasWorkingTreeChanges,
+ workingTree: details.workingTree,
  hasUpstream: details.hasUpstream,
  aheadCount: details.aheadCount,
  behindCount: details.behindCount,
@@ -180,15 +231,20 @@ export class GitCoreService {
  }
 
  async statusDetails(cwd: string): Promise<GitStatusDetails> {
- const stdout = await this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]);
+ const [statusStdout, unstagedNumstatStdout, stagedNumstatStdout] = await Promise.all([
+ this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]),
+ this.gitStdout(cwd, ["diff", "--numstat"]),
+ this.gitStdout(cwd, ["diff", "--cached", "--numstat"]),
+ ]);
 
  let branch: string | null = null;
  let upstreamRef: string | null = null;
  let aheadCount = 0;
  let behindCount = 0;
  let hasWorkingTreeChanges = false;
+ const changedFilesWithoutNumstat = new Set<string>();
 
- for (const line of stdout.split(/\r?\n/g)) {
+ for (const line of statusStdout.split(/\r?\n/g)) {
  if (line.startsWith("# branch.head ")) {
  const value = line.slice("# branch.head ".length).trim();
  branch = value.startsWith("(") ? null : value;
@@ -208,13 +264,45 @@ export class GitCoreService {
  }
  if (line.trim().length > 0 && !line.startsWith("#")) {
  hasWorkingTreeChanges = true;
+ const pathValue = parsePorcelainPath(line);
+ if (pathValue) changedFilesWithoutNumstat.add(pathValue);
  }
  }
+ const stagedEntries = parseNumstatEntries(stagedNumstatStdout);
+ const unstagedEntries = parseNumstatEntries(unstagedNumstatStdout);
+ const fileStatMap = new Map<string, { insertions: number; deletions: number }>();
+ for (const entry of [...stagedEntries, ...unstagedEntries]) {
+ const existing = fileStatMap.get(entry.path) ?? { insertions: 0, deletions: 0 };
+ existing.insertions += entry.insertions;
+ existing.deletions += entry.deletions;
+ fileStatMap.set(entry.path, existing);
+ }
+
+ let insertions = 0;
+ let deletions = 0;
+ const files = Array.from(fileStatMap.entries())
+ .map(([path, stat]) => {
+ insertions += stat.insertions;
+ deletions += stat.deletions;
+ return { path, insertions: stat.insertions, deletions: stat.deletions };
+ })
+ .toSorted((a, b) => a.path.localeCompare(b.path));
+
+ for (const filePath of changedFilesWithoutNumstat) {
+ if (fileStatMap.has(filePath)) continue;
+ files.push({ path: filePath, insertions: 0, deletions: 0 });
+ }
+ files.sort((a, b) => a.path.localeCompare(b.path));
 
  return {
  branch,
  upstreamRef,
  hasWorkingTreeChanges,
+ workingTree: {
+ files,
+ insertions,
+ deletions,
+ },
  hasUpstream: upstreamRef !== null,
  aheadCount,
  behindCount,
@@ -224,21 +312,12 @@ export class GitCoreService {
  async prepareCommitContext(cwd: string): Promise<GitPreparedCommitContext | null> {
  await this.git(cwd, ["add", "-A"]);
 
- const stagedSummary = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--name-status",
- ]);
+ const stagedSummary = await this.gitStdout(cwd, ["diff", "--cached", "--name-status"]);
  if (trimStdout(stagedSummary).length === 0) {
  return null;
  }
 
- const stagedPatch = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--patch",
- "--minimal",
- ]);
+ const stagedPatch = await this.gitStdout(cwd, ["diff", "--cached", "--patch", "--minimal"]);
 
  return {
  stagedSummary,
@@ -291,6 +370,29 @@ export class GitCoreService {
  };
  }
 
+ async pullCurrentBranch(cwd: string): Promise<GitPullResult> {
+ const details = await this.statusDetails(cwd);
+ const branch = details.branch;
+ if (!branch) {
+ throw new Error("Cannot pull from detached HEAD.");
+ }
+ if (!details.hasUpstream) {
+ throw new Error("Current branch has no upstream configured. Push with upstream first.");
+ }
+ const beforeSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ await executeGit(cwd, ["pull", "--ff-only"], {
+ timeoutMs: 30_000,
+ fallbackErrorMessage: "git pull failed",
+ });
+ const afterSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ const refreshed = await this.statusDetails(cwd);
+ return gitPullResultSchema.parse({
+ status: beforeSha.length > 0 && beforeSha === afterSha ? "skipped_up_to_date" : "pulled",
+ branch,
+ ...(refreshed.upstreamRef ? { upstreamBranch: refreshed.upstreamRef } : {}),
+ });
+ }
+
  async readRangeContext(cwd: string, baseBranch: string): Promise<GitRangeContext> {
  const range = `${baseBranch}..HEAD`;
  const [commitSummary, diffSummary, diffPatch] = await Promise.all([
@@ -511,6 +613,11 @@ export async function listGitBranches(input: GitListBranchesInput): Promise<GitL
  return defaultGitCoreService.listBranches(input);
 }
 
+export async function pullGitBranch(raw: GitPullInput): Promise<GitPullResult> {
+ const input = gitPullInputSchema.parse(raw);
+ return defaultGitCoreService.pullCurrentBranch(input.cwd);
+}
+
 export async function createGitWorktree(
  input: GitCreateWorktreeInput,
 ): Promise<GitCreateWorktreeResult> {

apps/server/src/gitManager.test.ts

@@ -5,11 +5,7 @@ import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
 
 import { GitManager } from "./gitManager";
-import {
- type ProcessRunOptions,
- type ProcessRunResult,
- runProcess,
-} from "./processRunner";
+import { type ProcessRunOptions, type ProcessRunResult, runProcess } from "./processRunner";
 
 interface FakeGhScenario {
  prListSequence?: string[];
@@ -71,9 +67,7 @@ async function createBareRemote(): Promise<string> {
  return remoteDir;
 }
 
-function createTextGenerator(
- overrides: Partial<FakeGitTextGenerator> = {},
-): FakeGitTextGenerator {
+function createTextGenerator(overrides: Partial<FakeGitTextGenerator> = {}): FakeGitTextGenerator {
  return {
  generateCommitMessage: async () => ({
  subject: "Implement stacked git actions",
@@ -126,8 +120,7 @@ function createRunnerWithFakeGh(scenario: FakeGhScenario = {}): {
  if (args[0] === "pr" && args[1] === "create") {
  return {
  stdout:
- (scenario.createdPrUrl ??
- "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
+ (scenario.createdPrUrl ?? "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
  stderr: "",
  code: 0,
  signal: null,

apps/server/src/codexAppServerManager.test.ts

@@ -21,10 +21,16 @@ function createSendTurnHarness() {
  };
 
  const requireSession = vi
- .spyOn(manager as unknown as { requireSession: (sessionId: string) => unknown }, "requireSession")
+ .spyOn(
+ manager as unknown as { requireSession: (sessionId: string) => unknown },
+ "requireSession",
+ )
  .mockReturnValue(context);
  const sendRequest = vi
- .spyOn(manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> }, "sendRequest")
+ .spyOn(
+ manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> },
+ "sendRequest",
+ )
  .mockResolvedValue({
  turn: {
  id: "turn_1",
@@ -109,7 +115,8 @@ describe("isRecoverableThreadResumeError", () => {
 
 describe("sendTurn", () => {
  it("sends text and image user input items to turn/start", async () => {
- const { manager, context, requireSession, sendRequest, updateSession } = createSendTurnHarness();
+ const { manager, context, requireSession, sendRequest, updateSession } =
+ createSendTurnHarness();
 
  const result = await manager.sendTurn({
  sessionId: "sess_1",

apps/server/src/codexAppServerManager.ts

@@ -258,8 +258,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  }
 
  const turnInput: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  > = [];
  if (input.input) {
  turnInput.push({
@@ -283,8 +282,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  const turnStartParams: {
  threadId: string;
  input: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  >;
  model?: string;
  effort?: string;

apps/server/src/coreServices.ts

@@ -28,8 +28,5 @@ export interface TextGenerationService {
  generateCommitMessage(
  input: CommitMessageGenerationInput,
  ): Promise<CommitMessageGenerationResult>;
- generatePrContent(
- input: PrContentGenerationInput,
- ): Promise<PrContentGenerationResult>;
+ generatePrContent(input: PrContentGenerationInput): Promise<PrContentGenerationResult>;
 }
-

apps/server/src/git.test.ts

@@ -11,6 +11,7 @@ import {
  createGitWorktree,
  initGitRepo,
  listGitBranches,
+ pullGitBranch,
  removeGitWorktree,
  runTerminalCommand,
 } from "./git";
@@ -569,11 +570,7 @@ describe("git integration", () => {
  expect(context!.stagedSummary.length).toBeGreaterThan(0);
  expect(context!.stagedPatch.length).toBeGreaterThan(0);
 
- const created = await core.commit(
- tmp.path,
- "Add README update",
- "- include updated content",
- );
+ const created = await core.commit(tmp.path, "Add README update", "- include updated content");
  expect(created.commitSha.length).toBeGreaterThan(0);
  expect(await git(tmp.path, "log -1 --pretty=%s")).toBe("Add README update");
  });
@@ -604,6 +601,42 @@ describe("git integration", () => {
  expect(skipped.status).toBe("skipped_up_to_date");
  });
 
+ it("pulls behind branch and then reports up-to-date", async () => {
+ await using remote = await makeTmpDir();
+ await using source = await makeTmpDir();
+ await using clone = await makeTmpDir();
+ await git(remote.path, "init --bare");
+
+ await initRepoWithCommit(source.path);
+ const initialBranch = (await listGitBranches({ cwd: source.path })).branches.find(
+ (branch) => branch.current,
+ )!.name;
+ await git(source.path, `remote add origin ${JSON.stringify(remote.path)}`);
+ await git(source.path, `push -u origin ${initialBranch}`);
+
+ await git(clone.path, `clone ${JSON.stringify(remote.path)} .`);
+ await git(clone.path, "config user.email 'test@test.com'");
+ await git(clone.path, "config user.name 'Test'");
+ await writeFile(path.join(clone.path, "CHANGELOG.md"), "remote change\n");
+ await git(clone.path, "add CHANGELOG.md");
+ await git(clone.path, "commit -m 'remote update'");
+ await git(clone.path, `push origin ${initialBranch}`);
+
+ const core = new GitCoreService();
+ const pulled = await core.pullCurrentBranch(source.path);
+ expect(pulled.status).toBe("pulled");
+ expect((await core.statusDetails(source.path)).behindCount).toBe(0);
+
+ const skipped = await core.pullCurrentBranch(source.path);
+ expect(skipped.status).toBe("skipped_up_to_date");
+ });
+
+ it("top-level pullGitBranch rejects when no upstream exists", async () => {
+ await using tmp = await makeTmpDir();
+ await initRepoWithCommit(tmp.path);
+ await expect(pullGitBranch({ cwd: tmp.path })).rejects.toThrow("no upstream");
+ });
+
  it("lists branches when recency lookup fails", async () => {
  await using tmp = await makeTmpDir();
  await initRepoWithCommit(tmp.path);

apps/server/src/git.ts

@@ -3,6 +3,8 @@ import os from "node:os";
 import path from "node:path";
 
 import {
+ gitPullInputSchema,
+ gitPullResultSchema,
  gitStatusInputSchema,
  gitStatusResultSchema,
  type GitCheckoutInput,
@@ -12,6 +14,8 @@ import {
  type GitInitInput,
  type GitListBranchesInput,
  type GitListBranchesResult,
+ type GitPullInput,
+ type GitPullResult,
  type GitRemoveWorktreeInput,
  type GitStatusInput,
  type GitStatusResult,
@@ -90,6 +94,52 @@ function parseBranchAb(value: string): { ahead: number; behind: number } {
  };
 }
 
+function parseNumstatEntries(
+ stdout: string,
+): Array<{ path: string; insertions: number; deletions: number }> {
+ const entries: Array<{ path: string; insertions: number; deletions: number }> = [];
+ for (const line of stdout.split(/\r?\n/g)) {
+ if (line.trim().length === 0) continue;
+ const [addedRaw, deletedRaw, ...pathParts] = line.split("\t");
+ const rawPath =
+ pathParts.length > 1 ? (pathParts.at(-1) ?? "").trim() : pathParts.join("\t").trim();
+ if (rawPath.length === 0) continue;
+ const added = Number.parseInt(addedRaw ?? "0", 10);
+ const deleted = Number.parseInt(deletedRaw ?? "0", 10);
+ const renameArrowIndex = rawPath.indexOf(" => ");
+ const normalizedPath =
+ renameArrowIndex >= 0 ? rawPath.slice(renameArrowIndex + " => ".length).trim() : rawPath;
+ entries.push({
+ path: normalizedPath.length > 0 ? normalizedPath : rawPath,
+ insertions: Number.isFinite(added) ? added : 0,
+ deletions: Number.isFinite(deleted) ? deleted : 0,
+ });
+ }
+ return entries;
+}
+
+function parsePorcelainPath(line: string): string | null {
+ if (line.startsWith("? ") || line.startsWith("! ")) {
+ const simple = line.slice(2).trim();
+ return simple.length > 0 ? simple : null;
+ }
+
+ if (!(line.startsWith("1 ") || line.startsWith("2 ") || line.startsWith("u "))) {
+ return null;
+ }
+
+ const tabIndex = line.indexOf("\t");
+ if (tabIndex >= 0) {
+ const fromTab = line.slice(tabIndex + 1);
+ const [path] = fromTab.split("\t");
+ return path?.trim().length ? path.trim() : null;
+ }
+
+ const parts = line.trim().split(/\s+/g);
+ const path = parts.at(-1) ?? "";
+ return path.length > 0 ? path : null;
+}
+
 function commandLabel(args: readonly string[]): string {
  return `git ${args.join(" ")}`;
 }
@@ -172,6 +222,7 @@ export class GitCoreService {
  return gitStatusResultSchema.parse({
  branch: details.branch,
  hasWorkingTreeChanges: details.hasWorkingTreeChanges,
+ workingTree: details.workingTree,
  hasUpstream: details.hasUpstream,
  aheadCount: details.aheadCount,
  behindCount: details.behindCount,
@@ -180,15 +231,20 @@ export class GitCoreService {
  }
 
  async statusDetails(cwd: string): Promise<GitStatusDetails> {
- const stdout = await this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]);
+ const [statusStdout, unstagedNumstatStdout, stagedNumstatStdout] = await Promise.all([
+ this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]),
+ this.gitStdout(cwd, ["diff", "--numstat"]),
+ this.gitStdout(cwd, ["diff", "--cached", "--numstat"]),
+ ]);
 
  let branch: string | null = null;
  let upstreamRef: string | null = null;
  let aheadCount = 0;
  let behindCount = 0;
  let hasWorkingTreeChanges = false;
+ const changedFilesWithoutNumstat = new Set<string>();
 
- for (const line of stdout.split(/\r?\n/g)) {
+ for (const line of statusStdout.split(/\r?\n/g)) {
  if (line.startsWith("# branch.head ")) {
  const value = line.slice("# branch.head ".length).trim();
  branch = value.startsWith("(") ? null : value;
@@ -208,13 +264,45 @@ export class GitCoreService {
  }
  if (line.trim().length > 0 && !line.startsWith("#")) {
  hasWorkingTreeChanges = true;
+ const pathValue = parsePorcelainPath(line);
+ if (pathValue) changedFilesWithoutNumstat.add(pathValue);
  }
  }
+ const stagedEntries = parseNumstatEntries(stagedNumstatStdout);
+ const unstagedEntries = parseNumstatEntries(unstagedNumstatStdout);
+ const fileStatMap = new Map<string, { insertions: number; deletions: number }>();
+ for (const entry of [...stagedEntries, ...unstagedEntries]) {
+ const existing = fileStatMap.get(entry.path) ?? { insertions: 0, deletions: 0 };
+ existing.insertions += entry.insertions;
+ existing.deletions += entry.deletions;
+ fileStatMap.set(entry.path, existing);
+ }
+
+ let insertions = 0;
+ let deletions = 0;
+ const files = Array.from(fileStatMap.entries())
+ .map(([path, stat]) => {
+ insertions += stat.insertions;
+ deletions += stat.deletions;
+ return { path, insertions: stat.insertions, deletions: stat.deletions };
+ })
+ .toSorted((a, b) => a.path.localeCompare(b.path));
+
+ for (const filePath of changedFilesWithoutNumstat) {
+ if (fileStatMap.has(filePath)) continue;
+ files.push({ path: filePath, insertions: 0, deletions: 0 });
+ }
+ files.sort((a, b) => a.path.localeCompare(b.path));
 
  return {
  branch,
  upstreamRef,
  hasWorkingTreeChanges,
+ workingTree: {
+ files,
+ insertions,
+ deletions,
+ },
  hasUpstream: upstreamRef !== null,
  aheadCount,
  behindCount,
@@ -224,21 +312,12 @@ export class GitCoreService {
  async prepareCommitContext(cwd: string): Promise<GitPreparedCommitContext | null> {
  await this.git(cwd, ["add", "-A"]);
 
- const stagedSummary = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--name-status",
- ]);
+ const stagedSummary = await this.gitStdout(cwd, ["diff", "--cached", "--name-status"]);
  if (trimStdout(stagedSummary).length === 0) {
  return null;
  }
 
- const stagedPatch = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--patch",
- "--minimal",
- ]);
+ const stagedPatch = await this.gitStdout(cwd, ["diff", "--cached", "--patch", "--minimal"]);
 
  return {
  stagedSummary,
@@ -291,6 +370,29 @@ export class GitCoreService {
  };
  }
 
+ async pullCurrentBranch(cwd: string): Promise<GitPullResult> {
+ const details = await this.statusDetails(cwd);
+ const branch = details.branch;
+ if (!branch) {
+ throw new Error("Cannot pull from detached HEAD.");
+ }
+ if (!details.hasUpstream) {
+ throw new Error("Current branch has no upstream configured. Push with upstream first.");
+ }
+ const beforeSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ await executeGit(cwd, ["pull", "--ff-only"], {
+ timeoutMs: 30_000,
+ fallbackErrorMessage: "git pull failed",
+ });
+ const afterSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ const refreshed = await this.statusDetails(cwd);
+ return gitPullResultSchema.parse({
+ status: beforeSha.length > 0 && beforeSha === afterSha ? "skipped_up_to_date" : "pulled",
+ branch,
+ ...(refreshed.upstreamRef ? { upstreamBranch: refreshed.upstreamRef } : {}),
+ });
+ }
+
  async readRangeContext(cwd: string, baseBranch: string): Promise<GitRangeContext> {
  const range = `${baseBranch}..HEAD`;
  const [commitSummary, diffSummary, diffPatch] = await Promise.all([
@@ -511,6 +613,11 @@ export async function listGitBranches(input: GitListBranchesInput): Promise<GitL
  return defaultGitCoreService.listBranches(input);
 }
 
+export async function pullGitBranch(raw: GitPullInput): Promise<GitPullResult> {
+ const input = gitPullInputSchema.parse(raw);
+ return defaultGitCoreService.pullCurrentBranch(input.cwd);
+}
+
 export async function createGitWorktree(
  input: GitCreateWorktreeInput,
 ): Promise<GitCreateWorktreeResult> {

apps/server/src/gitManager.test.ts

@@ -5,11 +5,7 @@ import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
 
 import { GitManager } from "./gitManager";
-import {
- type ProcessRunOptions,
- type ProcessRunResult,
- runProcess,
-} from "./processRunner";
+import { type ProcessRunOptions, type ProcessRunResult, runProcess } from "./processRunner";
 
 interface FakeGhScenario {
  prListSequence?: string[];
@@ -71,9 +67,7 @@ async function createBareRemote(): Promise<string> {
  return remoteDir;
 }
 
-function createTextGenerator(
- overrides: Partial<FakeGitTextGenerator> = {},
-): FakeGitTextGenerator {
+function createTextGenerator(overrides: Partial<FakeGitTextGenerator> = {}): FakeGitTextGenerator {
  return {
  generateCommitMessage: async () => ({
  subject: "Implement stacked git actions",
@@ -126,8 +120,7 @@ function createRunnerWithFakeGh(scenario: FakeGhScenario = {}): {
  if (args[0] === "pr" && args[1] === "create") {
  return {
  stdout:
- (scenario.createdPrUrl ??
- "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
+ (scenario.createdPrUrl ?? "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
  stderr: "",
  code: 0,
  signal: null,

apps/server/src/codexAppServerManager.test.ts

@@ -21,10 +21,16 @@ function createSendTurnHarness() {
  };
 
  const requireSession = vi
- .spyOn(manager as unknown as { requireSession: (sessionId: string) => unknown }, "requireSession")
+ .spyOn(
+ manager as unknown as { requireSession: (sessionId: string) => unknown },
+ "requireSession",
+ )
  .mockReturnValue(context);
  const sendRequest = vi
- .spyOn(manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> }, "sendRequest")
+ .spyOn(
+ manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> },
+ "sendRequest",
+ )
  .mockResolvedValue({
  turn: {
  id: "turn_1",
@@ -109,7 +115,8 @@ describe("isRecoverableThreadResumeError", () => {
 
 describe("sendTurn", () => {
  it("sends text and image user input items to turn/start", async () => {
- const { manager, context, requireSession, sendRequest, updateSession } = createSendTurnHarness();
+ const { manager, context, requireSession, sendRequest, updateSession } =
+ createSendTurnHarness();
 
  const result = await manager.sendTurn({
  sessionId: "sess_1",

apps/server/src/codexAppServerManager.ts

@@ -258,8 +258,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  }
 
  const turnInput: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  > = [];
  if (input.input) {
  turnInput.push({
@@ -283,8 +282,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  const turnStartParams: {
  threadId: string;
  input: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  >;
  model?: string;
  effort?: string;

apps/server/src/coreServices.ts

@@ -28,8 +28,5 @@ export interface TextGenerationService {
  generateCommitMessage(
  input: CommitMessageGenerationInput,
  ): Promise<CommitMessageGenerationResult>;
- generatePrContent(
- input: PrContentGenerationInput,
- ): Promise<PrContentGenerationResult>;
+ generatePrContent(input: PrContentGenerationInput): Promise<PrContentGenerationResult>;
 }
-

apps/server/src/git.test.ts

@@ -11,6 +11,7 @@ import {
  createGitWorktree,
  initGitRepo,
  listGitBranches,
+ pullGitBranch,
  removeGitWorktree,
  runTerminalCommand,
 } from "./git";
@@ -569,11 +570,7 @@ describe("git integration", () => {
  expect(context!.stagedSummary.length).toBeGreaterThan(0);
  expect(context!.stagedPatch.length).toBeGreaterThan(0);
 
- const created = await core.commit(
- tmp.path,
- "Add README update",
- "- include updated content",
- );
+ const created = await core.commit(tmp.path, "Add README update", "- include updated content");
  expect(created.commitSha.length).toBeGreaterThan(0);
  expect(await git(tmp.path, "log -1 --pretty=%s")).toBe("Add README update");
  });
@@ -604,6 +601,42 @@ describe("git integration", () => {
  expect(skipped.status).toBe("skipped_up_to_date");
  });
 
+ it("pulls behind branch and then reports up-to-date", async () => {
+ await using remote = await makeTmpDir();
+ await using source = await makeTmpDir();
+ await using clone = await makeTmpDir();
+ await git(remote.path, "init --bare");
+
+ await initRepoWithCommit(source.path);
+ const initialBranch = (await listGitBranches({ cwd: source.path })).branches.find(
+ (branch) => branch.current,
+ )!.name;
+ await git(source.path, `remote add origin ${JSON.stringify(remote.path)}`);
+ await git(source.path, `push -u origin ${initialBranch}`);
+
+ await git(clone.path, `clone ${JSON.stringify(remote.path)} .`);
+ await git(clone.path, "config user.email 'test@test.com'");
+ await git(clone.path, "config user.name 'Test'");
+ await writeFile(path.join(clone.path, "CHANGELOG.md"), "remote change\n");
+ await git(clone.path, "add CHANGELOG.md");
+ await git(clone.path, "commit -m 'remote update'");
+ await git(clone.path, `push origin ${initialBranch}`);
+
+ const core = new GitCoreService();
+ const pulled = await core.pullCurrentBranch(source.path);
+ expect(pulled.status).toBe("pulled");
+ expect((await core.statusDetails(source.path)).behindCount).toBe(0);
+
+ const skipped = await core.pullCurrentBranch(source.path);
+ expect(skipped.status).toBe("skipped_up_to_date");
+ });
+
+ it("top-level pullGitBranch rejects when no upstream exists", async () => {
+ await using tmp = await makeTmpDir();
+ await initRepoWithCommit(tmp.path);
+ await expect(pullGitBranch({ cwd: tmp.path })).rejects.toThrow("no upstream");
+ });
+
  it("lists branches when recency lookup fails", async () => {
  await using tmp = await makeTmpDir();
  await initRepoWithCommit(tmp.path);

apps/server/src/git.ts

@@ -3,6 +3,8 @@ import os from "node:os";
 import path from "node:path";
 
 import {
+ gitPullInputSchema,
+ gitPullResultSchema,
  gitStatusInputSchema,
  gitStatusResultSchema,
  type GitCheckoutInput,
@@ -12,6 +14,8 @@ import {
  type GitInitInput,
  type GitListBranchesInput,
  type GitListBranchesResult,
+ type GitPullInput,
+ type GitPullResult,
  type GitRemoveWorktreeInput,
  type GitStatusInput,
  type GitStatusResult,
@@ -90,6 +94,52 @@ function parseBranchAb(value: string): { ahead: number; behind: number } {
  };
 }
 
+function parseNumstatEntries(
+ stdout: string,
+): Array<{ path: string; insertions: number; deletions: number }> {
+ const entries: Array<{ path: string; insertions: number; deletions: number }> = [];
+ for (const line of stdout.split(/\r?\n/g)) {
+ if (line.trim().length === 0) continue;
+ const [addedRaw, deletedRaw, ...pathParts] = line.split("\t");
+ const rawPath =
+ pathParts.length > 1 ? (pathParts.at(-1) ?? "").trim() : pathParts.join("\t").trim();
+ if (rawPath.length === 0) continue;
+ const added = Number.parseInt(addedRaw ?? "0", 10);
+ const deleted = Number.parseInt(deletedRaw ?? "0", 10);
+ const renameArrowIndex = rawPath.indexOf(" => ");
+ const normalizedPath =
+ renameArrowIndex >= 0 ? rawPath.slice(renameArrowIndex + " => ".length).trim() : rawPath;
+ entries.push({
+ path: normalizedPath.length > 0 ? normalizedPath : rawPath,
+ insertions: Number.isFinite(added) ? added : 0,
+ deletions: Number.isFinite(deleted) ? deleted : 0,
+ });
+ }
+ return entries;
+}
+
+function parsePorcelainPath(line: string): string | null {
+ if (line.startsWith("? ") || line.startsWith("! ")) {
+ const simple = line.slice(2).trim();
+ return simple.length > 0 ? simple : null;
+ }
+
+ if (!(line.startsWith("1 ") || line.startsWith("2 ") || line.startsWith("u "))) {
+ return null;
+ }
+
+ const tabIndex = line.indexOf("\t");
+ if (tabIndex >= 0) {
+ const fromTab = line.slice(tabIndex + 1);
+ const [path] = fromTab.split("\t");
+ return path?.trim().length ? path.trim() : null;
+ }
+
+ const parts = line.trim().split(/\s+/g);
+ const path = parts.at(-1) ?? "";
+ return path.length > 0 ? path : null;
+}
+
 function commandLabel(args: readonly string[]): string {
  return `git ${args.join(" ")}`;
 }
@@ -172,6 +222,7 @@ export class GitCoreService {
  return gitStatusResultSchema.parse({
  branch: details.branch,
  hasWorkingTreeChanges: details.hasWorkingTreeChanges,
+ workingTree: details.workingTree,
  hasUpstream: details.hasUpstream,
  aheadCount: details.aheadCount,
  behindCount: details.behindCount,
@@ -180,15 +231,20 @@ export class GitCoreService {
  }
 
  async statusDetails(cwd: string): Promise<GitStatusDetails> {
- const stdout = await this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]);
+ const [statusStdout, unstagedNumstatStdout, stagedNumstatStdout] = await Promise.all([
+ this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]),
+ this.gitStdout(cwd, ["diff", "--numstat"]),
+ this.gitStdout(cwd, ["diff", "--cached", "--numstat"]),
+ ]);
 
  let branch: string | null = null;
  let upstreamRef: string | null = null;
  let aheadCount = 0;
  let behindCount = 0;
  let hasWorkingTreeChanges = false;
+ const changedFilesWithoutNumstat = new Set<string>();
 
- for (const line of stdout.split(/\r?\n/g)) {
+ for (const line of statusStdout.split(/\r?\n/g)) {
  if (line.startsWith("# branch.head ")) {
  const value = line.slice("# branch.head ".length).trim();
  branch = value.startsWith("(") ? null : value;
@@ -208,13 +264,45 @@ export class GitCoreService {
  }
  if (line.trim().length > 0 && !line.startsWith("#")) {
  hasWorkingTreeChanges = true;
+ const pathValue = parsePorcelainPath(line);
+ if (pathValue) changedFilesWithoutNumstat.add(pathValue);
  }
  }
+ const stagedEntries = parseNumstatEntries(stagedNumstatStdout);
+ const unstagedEntries = parseNumstatEntries(unstagedNumstatStdout);
+ const fileStatMap = new Map<string, { insertions: number; deletions: number }>();
+ for (const entry of [...stagedEntries, ...unstagedEntries]) {
+ const existing = fileStatMap.get(entry.path) ?? { insertions: 0, deletions: 0 };
+ existing.insertions += entry.insertions;
+ existing.deletions += entry.deletions;
+ fileStatMap.set(entry.path, existing);
+ }
+
+ let insertions = 0;
+ let deletions = 0;
+ const files = Array.from(fileStatMap.entries())
+ .map(([path, stat]) => {
+ insertions += stat.insertions;
+ deletions += stat.deletions;
+ return { path, insertions: stat.insertions, deletions: stat.deletions };
+ })
+ .toSorted((a, b) => a.path.localeCompare(b.path));
+
+ for (const filePath of changedFilesWithoutNumstat) {
+ if (fileStatMap.has(filePath)) continue;
+ files.push({ path: filePath, insertions: 0, deletions: 0 });
+ }
+ files.sort((a, b) => a.path.localeCompare(b.path));
 
  return {
  branch,
  upstreamRef,
  hasWorkingTreeChanges,
+ workingTree: {
+ files,
+ insertions,
+ deletions,
+ },
  hasUpstream: upstreamRef !== null,
  aheadCount,
  behindCount,
@@ -224,21 +312,12 @@ export class GitCoreService {
  async prepareCommitContext(cwd: string): Promise<GitPreparedCommitContext | null> {
  await this.git(cwd, ["add", "-A"]);
 
- const stagedSummary = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--name-status",
- ]);
+ const stagedSummary = await this.gitStdout(cwd, ["diff", "--cached", "--name-status"]);
  if (trimStdout(stagedSummary).length === 0) {
  return null;
  }
 
- const stagedPatch = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--patch",
- "--minimal",
- ]);
+ const stagedPatch = await this.gitStdout(cwd, ["diff", "--cached", "--patch", "--minimal"]);
 
  return {
  stagedSummary,
@@ -291,6 +370,29 @@ export class GitCoreService {
  };
  }
 
+ async pullCurrentBranch(cwd: string): Promise<GitPullResult> {
+ const details = await this.statusDetails(cwd);
+ const branch = details.branch;
+ if (!branch) {
+ throw new Error("Cannot pull from detached HEAD.");
+ }
+ if (!details.hasUpstream) {
+ throw new Error("Current branch has no upstream configured. Push with upstream first.");
+ }
+ const beforeSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ await executeGit(cwd, ["pull", "--ff-only"], {
+ timeoutMs: 30_000,
+ fallbackErrorMessage: "git pull failed",
+ });
+ const afterSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ const refreshed = await this.statusDetails(cwd);
+ return gitPullResultSchema.parse({
+ status: beforeSha.length > 0 && beforeSha === afterSha ? "skipped_up_to_date" : "pulled",
+ branch,
+ ...(refreshed.upstreamRef ? { upstreamBranch: refreshed.upstreamRef } : {}),
+ });
+ }
+
  async readRangeContext(cwd: string, baseBranch: string): Promise<GitRangeContext> {
  const range = `${baseBranch}..HEAD`;
  const [commitSummary, diffSummary, diffPatch] = await Promise.all([
@@ -511,6 +613,11 @@ export async function listGitBranches(input: GitListBranchesInput): Promise<GitL
  return defaultGitCoreService.listBranches(input);
 }
 
+export async function pullGitBranch(raw: GitPullInput): Promise<GitPullResult> {
+ const input = gitPullInputSchema.parse(raw);
+ return defaultGitCoreService.pullCurrentBranch(input.cwd);
+}
+
 export async function createGitWorktree(
  input: GitCreateWorktreeInput,
 ): Promise<GitCreateWorktreeResult> {

apps/server/src/gitManager.test.ts

@@ -5,11 +5,7 @@ import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
 
 import { GitManager } from "./gitManager";
-import {
- type ProcessRunOptions,
- type ProcessRunResult,
- runProcess,
-} from "./processRunner";
+import { type ProcessRunOptions, type ProcessRunResult, runProcess } from "./processRunner";
 
 interface FakeGhScenario {
  prListSequence?: string[];
@@ -71,9 +67,7 @@ async function createBareRemote(): Promise<string> {
  return remoteDir;
 }
 
-function createTextGenerator(
- overrides: Partial<FakeGitTextGenerator> = {},
-): FakeGitTextGenerator {
+function createTextGenerator(overrides: Partial<FakeGitTextGenerator> = {}): FakeGitTextGenerator {
  return {
  generateCommitMessage: async () => ({
  subject: "Implement stacked git actions",
@@ -126,8 +120,7 @@ function createRunnerWithFakeGh(scenario: FakeGhScenario = {}): {
  if (args[0] === "pr" && args[1] === "create") {
  return {
  stdout:
- (scenario.createdPrUrl ??
- "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
+ (scenario.createdPrUrl ?? "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
  stderr: "",
  code: 0,
  signal: null,

apps/server/src/codexAppServerManager.test.ts

@@ -21,10 +21,16 @@ function createSendTurnHarness() {
  };
 
  const requireSession = vi
- .spyOn(manager as unknown as { requireSession: (sessionId: string) => unknown }, "requireSession")
+ .spyOn(
+ manager as unknown as { requireSession: (sessionId: string) => unknown },
+ "requireSession",
+ )
  .mockReturnValue(context);
  const sendRequest = vi
- .spyOn(manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> }, "sendRequest")
+ .spyOn(
+ manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> },
+ "sendRequest",
+ )
  .mockResolvedValue({
  turn: {
  id: "turn_1",
@@ -109,7 +115,8 @@ describe("isRecoverableThreadResumeError", () => {
 
 describe("sendTurn", () => {
  it("sends text and image user input items to turn/start", async () => {
- const { manager, context, requireSession, sendRequest, updateSession } = createSendTurnHarness();
+ const { manager, context, requireSession, sendRequest, updateSession } =
+ createSendTurnHarness();
 
  const result = await manager.sendTurn({
  sessionId: "sess_1",

apps/server/src/codexAppServerManager.ts

@@ -258,8 +258,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  }
 
  const turnInput: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  > = [];
  if (input.input) {
  turnInput.push({
@@ -283,8 +282,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
  const turnStartParams: {
  threadId: string;
  input: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
  >;
  model?: string;
  effort?: string;

apps/server/src/coreServices.ts

@@ -28,8 +28,5 @@ export interface TextGenerationService {
  generateCommitMessage(
  input: CommitMessageGenerationInput,
  ): Promise<CommitMessageGenerationResult>;
- generatePrContent(
- input: PrContentGenerationInput,
- ): Promise<PrContentGenerationResult>;
+ generatePrContent(input: PrContentGenerationInput): Promise<PrContentGenerationResult>;
 }
-

apps/server/src/git.test.ts

@@ -11,6 +11,7 @@ import {
  createGitWorktree,
  initGitRepo,
  listGitBranches,
+ pullGitBranch,
  removeGitWorktree,
  runTerminalCommand,
 } from "./git";
@@ -569,11 +570,7 @@ describe("git integration", () => {
  expect(context!.stagedSummary.length).toBeGreaterThan(0);
  expect(context!.stagedPatch.length).toBeGreaterThan(0);
 
- const created = await core.commit(
- tmp.path,
- "Add README update",
- "- include updated content",
- );
+ const created = await core.commit(tmp.path, "Add README update", "- include updated content");
  expect(created.commitSha.length).toBeGreaterThan(0);
  expect(await git(tmp.path, "log -1 --pretty=%s")).toBe("Add README update");
  });
@@ -604,6 +601,42 @@ describe("git integration", () => {
  expect(skipped.status).toBe("skipped_up_to_date");
  });
 
+ it("pulls behind branch and then reports up-to-date", async () => {
+ await using remote = await makeTmpDir();
+ await using source = await makeTmpDir();
+ await using clone = await makeTmpDir();
+ await git(remote.path, "init --bare");
+
+ await initRepoWithCommit(source.path);
+ const initialBranch = (await listGitBranches({ cwd: source.path })).branches.find(
+ (branch) => branch.current,
+ )!.name;
+ await git(source.path, `remote add origin ${JSON.stringify(remote.path)}`);
+ await git(source.path, `push -u origin ${initialBranch}`);
+
+ await git(clone.path, `clone ${JSON.stringify(remote.path)} .`);
+ await git(clone.path, "config user.email 'test@test.com'");
+ await git(clone.path, "config user.name 'Test'");
+ await writeFile(path.join(clone.path, "CHANGELOG.md"), "remote change\n");
+ await git(clone.path, "add CHANGELOG.md");
+ await git(clone.path, "commit -m 'remote update'");
+ await git(clone.path, `push origin ${initialBranch}`);
+
+ const core = new GitCoreService();
+ const pulled = await core.pullCurrentBranch(source.path);
+ expect(pulled.status).toBe("pulled");
+ expect((await core.statusDetails(source.path)).behindCount).toBe(0);
+
+ const skipped = await core.pullCurrentBranch(source.path);
+ expect(skipped.status).toBe("skipped_up_to_date");
+ });
+
+ it("top-level pullGitBranch rejects when no upstream exists", async () => {
+ await using tmp = await makeTmpDir();
+ await initRepoWithCommit(tmp.path);
+ await expect(pullGitBranch({ cwd: tmp.path })).rejects.toThrow("no upstream");
+ });
+
  it("lists branches when recency lookup fails", async () => {
  await using tmp = await makeTmpDir();
  await initRepoWithCommit(tmp.path);

apps/server/src/git.ts

@@ -3,6 +3,8 @@ import os from "node:os";
 import path from "node:path";
 
 import {
+ gitPullInputSchema,
+ gitPullResultSchema,
  gitStatusInputSchema,
  gitStatusResultSchema,
  type GitCheckoutInput,
@@ -12,6 +14,8 @@ import {
  type GitInitInput,
  type GitListBranchesInput,
  type GitListBranchesResult,
+ type GitPullInput,
+ type GitPullResult,
  type GitRemoveWorktreeInput,
  type GitStatusInput,
  type GitStatusResult,
@@ -90,6 +94,52 @@ function parseBranchAb(value: string): { ahead: number; behind: number } {
  };
 }
 
+function parseNumstatEntries(
+ stdout: string,
+): Array<{ path: string; insertions: number; deletions: number }> {
+ const entries: Array<{ path: string; insertions: number; deletions: number }> = [];
+ for (const line of stdout.split(/\r?\n/g)) {
+ if (line.trim().length === 0) continue;
+ const [addedRaw, deletedRaw, ...pathParts] = line.split("\t");
+ const rawPath =
+ pathParts.length > 1 ? (pathParts.at(-1) ?? "").trim() : pathParts.join("\t").trim();
+ if (rawPath.length === 0) continue;
+ const added = Number.parseInt(addedRaw ?? "0", 10);
+ const deleted = Number.parseInt(deletedRaw ?? "0", 10);
+ const renameArrowIndex = rawPath.indexOf(" => ");
+ const normalizedPath =
+ renameArrowIndex >= 0 ? rawPath.slice(renameArrowIndex + " => ".length).trim() : rawPath;
+ entries.push({
+ path: normalizedPath.length > 0 ? normalizedPath : rawPath,
+ insertions: Number.isFinite(added) ? added : 0,
+ deletions: Number.isFinite(deleted) ? deleted : 0,
+ });
+ }
+ return entries;
+}
+
+function parsePorcelainPath(line: string): string | null {
+ if (line.startsWith("? ") || line.startsWith("! ")) {
+ const simple = line.slice(2).trim();
+ return simple.length > 0 ? simple : null;
+ }
+
+ if (!(line.startsWith("1 ") || line.startsWith("2 ") || line.startsWith("u "))) {
+ return null;
+ }
+
+ const tabIndex = line.indexOf("\t");
+ if (tabIndex >= 0) {
+ const fromTab = line.slice(tabIndex + 1);
+ const [path] = fromTab.split("\t");
+ return path?.trim().length ? path.trim() : null;
+ }
+
+ const parts = line.trim().split(/\s+/g);
+ const path = parts.at(-1) ?? "";
+ return path.length > 0 ? path : null;
+}
+
 function commandLabel(args: readonly string[]): string {
  return `git ${args.join(" ")}`;
 }
@@ -172,6 +222,7 @@ export class GitCoreService {
  return gitStatusResultSchema.parse({
  branch: details.branch,
  hasWorkingTreeChanges: details.hasWorkingTreeChanges,
+ workingTree: details.workingTree,
  hasUpstream: details.hasUpstream,
  aheadCount: details.aheadCount,
  behindCount: details.behindCount,
@@ -180,15 +231,20 @@ export class GitCoreService {
  }
 
  async statusDetails(cwd: string): Promise<GitStatusDetails> {
- const stdout = await this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]);
+ const [statusStdout, unstagedNumstatStdout, stagedNumstatStdout] = await Promise.all([
+ this.gitStdout(cwd, ["status", "--porcelain=2", "--branch"]),
+ this.gitStdout(cwd, ["diff", "--numstat"]),
+ this.gitStdout(cwd, ["diff", "--cached", "--numstat"]),
+ ]);
 
  let branch: string | null = null;
  let upstreamRef: string | null = null;
  let aheadCount = 0;
  let behindCount = 0;
  let hasWorkingTreeChanges = false;
+ const changedFilesWithoutNumstat = new Set<string>();
 
- for (const line of stdout.split(/\r?\n/g)) {
+ for (const line of statusStdout.split(/\r?\n/g)) {
  if (line.startsWith("# branch.head ")) {
  const value = line.slice("# branch.head ".length).trim();
  branch = value.startsWith("(") ? null : value;
@@ -208,13 +264,45 @@ export class GitCoreService {
  }
  if (line.trim().length > 0 && !line.startsWith("#")) {
  hasWorkingTreeChanges = true;
+ const pathValue = parsePorcelainPath(line);
+ if (pathValue) changedFilesWithoutNumstat.add(pathValue);
  }
  }
+ const stagedEntries = parseNumstatEntries(stagedNumstatStdout);
+ const unstagedEntries = parseNumstatEntries(unstagedNumstatStdout);
+ const fileStatMap = new Map<string, { insertions: number; deletions: number }>();
+ for (const entry of [...stagedEntries, ...unstagedEntries]) {
+ const existing = fileStatMap.get(entry.path) ?? { insertions: 0, deletions: 0 };
+ existing.insertions += entry.insertions;
+ existing.deletions += entry.deletions;
+ fileStatMap.set(entry.path, existing);
+ }
+
+ let insertions = 0;
+ let deletions = 0;
+ const files = Array.from(fileStatMap.entries())
+ .map(([path, stat]) => {
+ insertions += stat.insertions;
+ deletions += stat.deletions;
+ return { path, insertions: stat.insertions, deletions: stat.deletions };
+ })
+ .toSorted((a, b) => a.path.localeCompare(b.path));
+
+ for (const filePath of changedFilesWithoutNumstat) {
+ if (fileStatMap.has(filePath)) continue;
+ files.push({ path: filePath, insertions: 0, deletions: 0 });
+ }
+ files.sort((a, b) => a.path.localeCompare(b.path));
 
  return {
  branch,
  upstreamRef,
  hasWorkingTreeChanges,
+ workingTree: {
+ files,
+ insertions,
+ deletions,
+ },
  hasUpstream: upstreamRef !== null,
  aheadCount,
  behindCount,
@@ -224,21 +312,12 @@ export class GitCoreService {
  async prepareCommitContext(cwd: string): Promise<GitPreparedCommitContext | null> {
  await this.git(cwd, ["add", "-A"]);
 
- const stagedSummary = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--name-status",
- ]);
+ const stagedSummary = await this.gitStdout(cwd, ["diff", "--cached", "--name-status"]);
  if (trimStdout(stagedSummary).length === 0) {
  return null;
  }
 
- const stagedPatch = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--patch",
- "--minimal",
- ]);
+ const stagedPatch = await this.gitStdout(cwd, ["diff", "--cached", "--patch", "--minimal"]);
 
  return {
  stagedSummary,
@@ -291,6 +370,29 @@ export class GitCoreService {
  };
  }
 
+ async pullCurrentBranch(cwd: string): Promise<GitPullResult> {
+ const details = await this.statusDetails(cwd);
+ const branch = details.branch;
+ if (!branch) {
+ throw new Error("Cannot pull from detached HEAD.");
+ }
+ if (!details.hasUpstream) {
+ throw new Error("Current branch has no upstream configured. Push with upstream first.");
+ }
+ const beforeSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ await executeGit(cwd, ["pull", "--ff-only"], {
+ timeoutMs: 30_000,
+ fallbackErrorMessage: "git pull failed",
+ });
+ const afterSha = trimStdout(await this.gitStdout(cwd, ["rev-parse", "HEAD"], true));
+ const refreshed = await this.statusDetails(cwd);
+ return gitPullResultSchema.parse({
+ status: beforeSha.length > 0 && beforeSha === afterSha ? "skipped_up_to_date" : "pulled",
+ branch,
+ ...(refreshed.upstreamRef ? { upstreamBranch: refreshed.upstreamRef } : {}),
+ });
+ }
+
  async readRangeContext(cwd: string, baseBranch: string): Promise<GitRangeContext> {
  const range = `${baseBranch}..HEAD`;
  const [commitSummary, diffSummary, diffPatch] = await Promise.all([
@@ -511,6 +613,11 @@ export async function listGitBranches(input: GitListBranchesInput): Promise<GitL
  return defaultGitCoreService.listBranches(input);
 }
 
+export async function pullGitBranch(raw: GitPullInput): Promise<GitPullResult> {
+ const input = gitPullInputSchema.parse(raw);
+ return defaultGitCoreService.pullCurrentBranch(input.cwd);
+}
+
 export async function createGitWorktree(
  input: GitCreateWorktreeInput,
 ): Promise<GitCreateWorktreeResult> {

apps/server/src/gitManager.test.ts

@@ -5,11 +5,7 @@ import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
 
 import { GitManager } from "./gitManager";
-import {
- type ProcessRunOptions,
- type ProcessRunResult,
- runProcess,
-} from "./processRunner";
+import { type ProcessRunOptions, type ProcessRunResult, runProcess } from "./processRunner";
 
 interface FakeGhScenario {
  prListSequence?: string[];
@@ -71,9 +67,7 @@ async function createBareRemote(): Promise<string> {
  return remoteDir;
 }
 
-function createTextGenerator(
- overrides: Partial<FakeGitTextGenerator> = {},
-): FakeGitTextGenerator {
+function createTextGenerator(overrides: Partial<FakeGitTextGenerator> = {}): FakeGitTextGenerator {
  return {
  generateCommitMessage: async () => ({
  subject: "Implement stacked git actions",
@@ -126,8 +120,7 @@ function createRunnerWithFakeGh(scenario: FakeGhScenario = {}): {
  if (args[0] === "pr" && args[1] === "create") {
  return {
  stdout:
- (scenario.createdPrUrl ??
- "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
+ (scenario.createdPrUrl ?? "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
  stderr: "",
  code: 0,
  signal: null,