Files
Codewalkers/apps/server/git/branch-manager.ts
Lukas May 34578d39c6 refactor: Restructure monorepo to apps/server/ and apps/web/ layout
Move src/ → apps/server/ and packages/web/ → apps/web/ to adopt
standard monorepo conventions (apps/ for runnable apps, packages/
for reusable libraries). Update all config files, shared package
imports, test fixtures, and documentation to reflect new paths.

Key fixes:
- Update workspace config to ["apps/*", "packages/*"]
- Update tsconfig.json rootDir/include for apps/server/
- Add apps/web/** to vitest exclude list
- Update drizzle.config.ts schema path
- Fix ensure-schema.ts migration path detection (3 levels up in dev,
  2 levels up in dist)
- Fix tests/integration/cli-server.test.ts import paths
- Update packages/shared imports to apps/server/ paths
- Update all docs/ files with new paths
2026-03-03 11:22:53 +01:00

49 lines
1.6 KiB
TypeScript

/**
* BranchManager Port Interface
*
* Manages branch-level git operations (create, merge, diff, delete)
* across project clones. Works directly on branches without requiring
* a worktree to be checked out.
*/
import type { MergeResult } from './types.js';
export interface BranchManager {
/**
* Ensure a branch exists. Creates it from baseBranch if it doesn't.
* Idempotent — no-op if the branch already exists.
*/
ensureBranch(repoPath: string, branch: string, baseBranch: string): Promise<void>;
/**
* Merge sourceBranch into targetBranch.
* Uses an ephemeral worktree for merge safety.
* Returns conflict info if merge fails.
*/
mergeBranch(repoPath: string, sourceBranch: string, targetBranch: string): Promise<MergeResult>;
/**
* Get the raw unified diff between two branches.
* Uses three-dot diff (baseBranch...headBranch) to show changes
* introduced by headBranch since it diverged from baseBranch.
*/
diffBranches(repoPath: string, baseBranch: string, headBranch: string): Promise<string>;
/**
* Delete a branch. No-op if the branch doesn't exist.
*/
deleteBranch(repoPath: string, branch: string): Promise<void>;
/**
* Check if a branch exists in the repository.
*/
branchExists(repoPath: string, branch: string): Promise<boolean>;
/**
* Check if a branch exists as a remote tracking branch (origin/<branch>).
* Useful for validating branch names against what the remote has,
* since local branches may not include all remote branches.
*/
remoteBranchExists(repoPath: string, branch: string): Promise<boolean>;
}