Files
openchamber/packages/web/server/lib/git/service.js
T
Bohdan TriapitsynandIuliia Ivashko c9e31a0e6c perf: harden sync architecture and modularize runtimes (#803)
* fix: added desktop app background throttling

* perf: add streaming debug metrics panel

- Show streaming performance metrics in the debug panel
- Auto-enable stream profiling while the panel is open
- Add JSON export for sharing UI and VS Code metrics

* perf: batch streaming updates more aggressively

- Buffer message deltas and metadata updates to cut render churn
- Skip no-op part updates before they touch the message store
- Fix the desktop debug panel shortcut binding

* perf: split streaming event handling and coalesce deltas

- Move streaming content events onto a dedicated fast path
- Defer non-critical stream side effects off the hot path
- Merge repeated message delta events before they reach the UI

* perf: isolate streaming rows from chat rerenders

- Memoize chat rows against render-relevant message changes only
- Read live assistant text directly from store to narrow streaming updates
- Split the active streaming entry from the stable message list path

* perf: streamline chat streaming and SSE proxying

- Reduce chat rerenders around the active streaming path
- Simplify server SSE forwarding to avoid duplicate proxy work

* fix: preserve the first streaming text chunk

- Show the initial text chunk immediately before batched deltas arrive
- Bypass batching for the first text or reasoning part update
- Keep later streaming updates buffered for performance

* perf: align streaming/render hot paths with opencode parity

* perf: harden turn/cache stability and stale delta suppression

* fix: stabilize chat rendering and disable timeline interactions

- Disabled timeline dialog access from shortcuts, commands, and chat input
- Reduced chat render churn by simplifying message list and turn staging behavior
- Improved session-switch stability to prevent update-depth crashes

* perf: track static message rerenders during streaming

* perf: reduce sorted-mode activity rerender fanout

* perf: reduce chat rerender fanout and add active-turn metrics

- Reduced sorted-mode rerender coupling by tightening turn context propagation
- Added a metric for static rerenders outside the active turn during streaming
- Exposed new chat render counters in the debug panel for parity tracking

* fix: keep sorted activity mounted while stream grows

* fix: stabilize session and history scroll rendering

* refactor: decouple server routes from index

* refactor: extract fs module from server index

* refactor: move opencode route ownership into module

* refactor: extract notification route registration

* refactor: extract opencode and notification runtimes from index

* refactor: extract settings runtime and complete server modularization pass

* refactor: modularize server config, skills, icons, and tunnel routes

* refactor: extract server modules from monolithic index.js

Split proxy, routes, runtime helpers, and notification emitter
into dedicated modules under packages/web/server/lib/.

* refactor: replace session/message stores with SSE-driven sync layer

Delete ~9200 lines of old architecture (useEventStream, messageStore,
sessionStore, useSessionStore, questionStore, useTodoStore, client SSE).

New sync layer: event pipeline with coalescing + 16ms flush, pure event
reducer, per-directory child stores with LRU eviction, cursor pagination,
optimistic updates, deferred timeline staging, text throttle.

Migrate all UI consumers to sync hooks (useSessionMessages,
useSessionMessageRecords, useSessionStatus, useSessionPermissions, etc).

Strip session-ui-store to UI-only state, delegate SDK ops to
session-actions with abort-if-busy, optimistic store updates, and
response merging for revert/fork/archive/delete.

Add notification-store for SSE-driven session attention tracking,
cross-directory GlobalSessionStatusStore for sidebar indicators,
client-side diff snapshot sanitization to prevent memory bloat,
and revert message filtering via useVisibleSessionMessages.

* feat: notification store, session actions, activity detection

Add notification-store.ts for SSE-driven attention tracking.
Add sanitize.ts to strip diff snapshot memory bloat.
Add session-actions.ts with optimistic revert/fork/archive/delete.
Improve useSessionActivity with incomplete-message fallback.
Delete useServerSessionStatus polling hook.

* fix: add directory param to all SDK calls, fix command/shell/abort routing

All SDK calls in session-actions.ts now pass directory parameter —
required by OpenCode server to scope session operations. Without it,
abort, commands, revert, fork, and other operations returned 500.

Add routeMessage() in session-ui-store for shell mode (session.shell),
slash commands (session.command), and normal prompts. Command lookup
checks both sync child store and useCommandsStore. Handle /compact
locally via session.summarize().

Implement getContextUsage() to restore header context usage display —
reads token counts from last assistant message in sync store.

* refactor: replace custom API proxy with http-proxy-middleware

Remove ~280 lines of custom proxy code: forwardSseRequest,
forwardGenericApiRequest, collectRequestBodyBuffer, header
manipulation, hop-by-hop filtering, SSE block buffering.

Replace with single createProxyMiddleware() call that handles
SSE streaming, large bodies, and timeouts out of the box.
Dynamic router for OpenCode port changes after restarts.
Auth headers injected via proxyReq hook.

Keep: readiness gate, Windows session merge, API prefix detection.

* perf: targeted event draft cloning to fix streaming render cascade

Event handler was eagerly cloning all state slices on every event,
breaking Zustand selector referential equality. During streaming
(~60 events/sec), this caused every subscriber to re-render regardless
of which slice actually changed.

Now only clones fields the specific event type mutates. Also extracts
StatusRowContainer to isolate high-frequency useAssistantStatus
subscription, removes dead messageStreamStatesMap subscription from
ChatContainer, and narrows useAssistantStatus to only track last
assistant message parts.

MessageList renders: 1972 → 296 per streaming session (-85%).

* fix: null safety for sync state slices

Add defensive ?? {} guards on permission, question, session_status,
and message record access. Prevents crashes when child store state
is partially initialized during bootstrap.

* perf: dedup inflight SDK calls, extract concurrency util, delay PR tracking

Extract mapWithConcurrency to shared lib/concurrency.ts. Add in-flight
dedup for loadProviders/loadAgents to prevent concurrent duplicate SDK
calls. Delay initial PR background tracking by 5s to reduce startup
CPU burst.

* fix: header session lookup across all child stores

Session title and context panel click failed when session belonged to
a different directory than the current child store. Fall back to
getAllSyncSessions() to search all initialized stores.

* chore: bump @opencode-ai/sdk to 1.3.5

* docs: add sync event handling guide

* Optimize session prefetch and improve delete/archive UX

- Add settlement delay to session prefetch to avoid race conditions on
  rapid session switches
- Reduce git diff prefetch and session cache limits for better performance
- Implement optimistic UI updates for session delete/archive operations
  with proper rollback on failure
- Wire session prefetch hook into SessionSidebar with sync integration

* Add file content cache and sync optimizations

- Wrap FilesAPI with in-memory LRU cache for file content with dual
  constraints (entry count and byte size)
- Optimize chat timeline scroll restoration using useLayoutEffect
- Preserve React references in message and part arrays to prevent
  unnecessary re-renders when prepending history
- Add session prefetch TTL cache to prevent redundant fetches
- Integrate session prefetch cache clearing with eviction flow

* Improve session sidebar error handling and add diff prefetch filtering

Load active and archived sessions independently using Promise.allSettled
to prevent one failure from blocking the other. Add retry logic to session
API calls and skip large files during diff prefetch to improve performance.

* Replace sendMessage with optimisticSend wrapper

Introduces optimistic UI updates for normal chat messages to provide
instant feedback. Messages appear immediately in the UI while the API
call executes in the background, with automatic rollback on errors.

* perf: split stores, proper optimistic send, fix revert/directory bugs

- split session-ui-store into voice/input/selection/viewport stores
  to reduce subscriber re-evaluation during streaming
- wire optimisticSend through useSync shadow Map infrastructure
  matching OpenCode's pattern (no heuristic part detection)
- port OpenCode Identifier.ascending ID format for correct sorting
- pass messageID to promptAsync to prevent duplicate messages
- fix worktree directory not propagating to session actions
  (dynamic dir() via opencodeClient.getDirectory)
- fix setCurrentSession accepting directoryHint for new sessions
- fix revert not hiding messages (session limit was 5, bumped to match loaded count)
- fix revert optimistic message removal from store
- fix load-more flicker (useLayoutEffect scroll compensation)
- add prefetch TTL cache, file content LRU cache
- add session prefetch for adjacent sessions
- add instant archive/delete (optimistic before SDK call)
- migrate legacy window.__zustand_session_store__ to session-ui-store
- add retry + independent error handling for archived sessions
- add AGENTS.md performance rules

* perf: startup optimization — dedup, caching, light git status, diff rendering gates

- defer diff prefetch to git tab open, reduce concurrency 4→2, skip >500 changed lines
- cap project git checks concurrency (2), directory status probe (3)
- dedup provider/agent loading, github auth, worktree list (in-flight + TTL caches)
- delay PR tracking 5s, cache 403 search failures per-repo
- coalesce settings PUT (200ms debounce), cache settings GET (2s TTL)
- cache canonical directory resolution (60s TTL)
- persist missing directory status to localStorage (10min TTL)
- light/heavy git status: polling skips numstat+line counting+rev-list
- large diff rendering gate (>500 lines → "render anyway" button)
- tokenization degradation for >500KB files in Pierre
- parallelize main.tsx pre-render awaits
- batch sidebar file tree expanded paths restoration (3 at a time)
- remove bare useConfigStore() subscription in AgentsPage
- sync worktree sandboxes to OpenCode SQLite DB
- fix RightSidebarTabs ternary → explicit tab matching
- defensive guards on sync state (session_status, permission, question, message)

* fix: add defensive guards on remaining sync state field accesses

guard session_status, permission, message, todo, part, config with ?? {}
in useDirectorySync selectors, session-cache, and bootstrap

* fix: add missing directory dep to useCallback in use-sync.ts

* fix: preserve diffStats when light-mode polling overwrites status

* perf: optimize startup git status polling and diff rendering

Preserves diff stats when lightweight polling updates repository status
Reduces startup overhead with smarter git polling and store updates
Adds detailed optimization and migration docs for next performance steps

* fix: keep chat diff stats stable during git status updates

Prevents lightweight git polling from dropping diff statistics
Keeps MessageList diff indicators consistent while status refreshes
Improves reliability of git-aware chat rendering

* fix: user animation replay, queued message variant, startup provider loading

- consume animation ID after first play to prevent re-animation
  on neighbor assistant message completion
- capture send config (model/agent/variant) at queue time matching
  OpenCode's FollowupDraft pattern instead of re-resolving at send time
- replace one-shot startup recovery effect with polling interval
  that retries every 2s until providers and agents load
- fix optimistic bridge to avoid re-render loop (stable ref wrappers)

* chore: update tauri to 2.10.3 and all plugins to latest

- tauri 2.9.4 → 2.10.3
- tauri-build 2.5.3 → 2.5.6
- tauri-plugin-dialog 2.4.2 → 2.6.0
- tauri-plugin-log 2.7.1 → 2.8.0
- tauri-plugin-shell 2.3.3 → 2.3.5
- tauri-plugin-updater 2 (floating) → 2.10.0 (pinned)
- @tauri-apps/api ^2.9.0 → ^2.10.1
- wry 0.53.5 → 0.54.4 (transitive)

* refactor: decouple web server index orchestration runtimes

* fix: align VS Code runtime behavior with web and reduce draft view CPU load

- Queue VS Code bridge and SSE startup requests until API readiness to avoid false bootstrap failures
- Make agent manager actions directory-aware and remove real worktrees with safer partial-failure handling
- Replace heavy logo animation path with a lightweight pulse to cut draft-session CPU usage

* fix: restore auto-selected file sending in chat input

- Send server-selected files as proper file URLs in the message payload
- Include server-backed attachments in submit flow instead of dropping them
- Restore queued-message attachments through the refactored input store

* fix: restore session model selection consistently on session switch

- Restore agent, model, and variant from the latest loaded user message for each session
- Wait for session messages before applying restored selections to avoid stale or missing state
- Remove legacy session-choice inference paths that caused overlap and instability

* fix: restore permission replies and auto-accept across sessions

- Scope permission and question replies to the target session directory so answers take effect reliably
- Make permission auto-accept immediately handle pending requests and react to new permission prompts
- Keep parent-session handling working for child-session requests through the shared response path

* feat: add reusable fuzzy branch fuzzy-search helper and dialog integration (#798)

* feat: add reusable fuzzy branch search for worktrees

* chore: drop planning docs from feature branch

* feat: make worktree branch refresh manual

* feat: add configurable session retention action

* refactor: centralize global session state in ui store

* fix: cancel debounced permission push after reply

* docs: clarify global and directory session store architecture

* docs: refine agent development rules and session activity guidance

- Clarify agent code of conduct and durable development patterns
- Add explicit shared-store rerender and live-state guidance
- Narrow session activity fallback to avoid stale working state

* chore: updated .gitignore

---------

Co-authored-by: Iuliia Ivashko <yulia.ivashko@gmail.com>
2026-03-31 18:47:00 +03:00

3152 lines
92 KiB
JavaScript

import simpleGit from 'simple-git';
import fs from 'fs';
import path from 'path';
import os from 'os';
import { execFile } from 'child_process';
import { promisify } from 'util';
const fsp = fs.promises;
const execFileAsync = promisify(execFile);
const gpgconfCandidates = ['gpgconf', '/opt/homebrew/bin/gpgconf', '/usr/local/bin/gpgconf'];
let resolvedGitBinary = null;
const worktreeBootstrapState = new Map();
const WORKTREE_BOOTSTRAP_PENDING = 'pending';
const WORKTREE_BOOTSTRAP_READY = 'ready';
const WORKTREE_BOOTSTRAP_FAILED = 'failed';
const toBootstrapStateKey = (directory) => {
const normalized = normalizeDirectoryPath(directory);
if (!normalized) {
return '';
}
return path.resolve(normalized);
};
const setWorktreeBootstrapState = (directory, status, error = null) => {
const key = toBootstrapStateKey(directory);
if (!key) {
return;
}
worktreeBootstrapState.set(key, {
status,
error: typeof error === 'string' && error.trim().length > 0 ? error.trim() : null,
updatedAt: Date.now(),
});
};
const clearWorktreeBootstrapState = (directory) => {
const key = toBootstrapStateKey(directory);
if (!key) {
return;
}
worktreeBootstrapState.delete(key);
};
const isExecutableFile = (candidate) => {
if (typeof candidate !== 'string' || candidate.trim().length === 0) {
return false;
}
try {
const stat = fs.statSync(candidate);
if (!stat.isFile()) {
return false;
}
if (process.platform === 'win32') {
const ext = path.extname(candidate).toLowerCase();
return ext.length === 0 || ext === '.exe' || ext === '.cmd' || ext === '.bat' || ext === '.com';
}
fs.accessSync(candidate, fs.constants.X_OK);
return true;
} catch {
return false;
}
};
const normalizeGitExecutableCandidate = (candidate) => {
if (typeof candidate !== 'string') {
return null;
}
const trimmed = candidate.trim();
if (!trimmed) {
return null;
}
const ext = path.extname(trimmed).toLowerCase();
if (ext === '.cmd' || ext === '.bat' || ext === '.com') {
const exeCandidate = trimmed.slice(0, -ext.length) + '.exe';
if (isExecutableFile(exeCandidate)) {
return exeCandidate;
}
}
return trimmed;
};
const listPathExecutableCandidates = (binaryName) => {
const currentPath = process.env.PATH || '';
const seen = new Set();
const matches = [];
for (const segment of currentPath.split(path.delimiter)) {
const dir = typeof segment === 'string' ? segment.trim() : '';
if (!dir || seen.has(dir)) {
continue;
}
seen.add(dir);
matches.push(path.join(dir, binaryName));
}
return matches;
};
const listWindowsGitInstallCandidates = () => {
const roots = [
process.env.ProgramFiles,
process.env['ProgramFiles(x86)'],
process.env.LocalAppData,
]
.map((value) => (typeof value === 'string' ? value.trim() : ''))
.filter(Boolean);
const candidates = [];
for (const root of roots) {
candidates.push(path.join(root, 'Git', 'cmd', 'git.exe'));
candidates.push(path.join(root, 'Git', 'bin', 'git.exe'));
candidates.push(path.join(root, 'Git', 'mingw64', 'bin', 'git.exe'));
candidates.push(path.join(root, 'Programs', 'Git', 'cmd', 'git.exe'));
candidates.push(path.join(root, 'Programs', 'Git', 'bin', 'git.exe'));
}
return candidates;
};
const resolveGitBinary = () => {
if (process.platform !== 'win32') {
return 'git';
}
if (resolvedGitBinary) {
return resolvedGitBinary;
}
const explicit = [process.env.GIT_BINARY, process.env.OPENCHAMBER_GIT_BINARY]
.map((value) => (typeof value === 'string' ? value.trim() : ''))
.filter(Boolean);
for (const candidate of explicit) {
if (isExecutableFile(candidate)) {
resolvedGitBinary = candidate;
return resolvedGitBinary;
}
}
const discovered = [
...listPathExecutableCandidates('git.exe'),
...listPathExecutableCandidates('git'),
...listWindowsGitInstallCandidates(),
]
.map(normalizeGitExecutableCandidate)
.filter(Boolean)
.filter((candidate) => isExecutableFile(candidate));
const preferredExe = discovered.find((candidate) => candidate.toLowerCase().endsWith('.exe'));
resolvedGitBinary = preferredExe || discovered[0] || 'git.exe';
return resolvedGitBinary;
};
const getGitBinary = () => resolveGitBinary();
/**
* Escape an SSH key path for use in core.sshCommand.
* Handles Windows/Unix differences and prevents command injection.
*/
function escapeSshKeyPath(sshKeyPath) {
const isWindows = process.platform === 'win32';
// Normalize path first on Windows (convert backslashes to forward slashes)
let normalizedPath = sshKeyPath;
if (isWindows) {
normalizedPath = sshKeyPath.replace(/\\/g, '/');
}
// Validate: reject paths with characters that could enable injection
// Allow only alphanumeric, path separators, dots, dashes, underscores, spaces, and colons (for Windows drives)
// Note: backslash is not in this list since we've already normalized Windows paths
const dangerousChars = /[`$!"';&|<>(){}[\]*?#~]/;
if (dangerousChars.test(normalizedPath)) {
throw new Error(`SSH key path contains invalid characters: ${sshKeyPath}`);
}
if (isWindows) {
// On Windows, Git (via MSYS/MinGW) expects Unix-style paths
// Convert "C:/path" to "/c/path" for MSYS compatibility
let unixPath = normalizedPath;
const driveMatch = unixPath.match(/^([A-Za-z]):\//);
if (driveMatch) {
unixPath = `/${driveMatch[1].toLowerCase()}${unixPath.slice(2)}`;
}
// Use single quotes for the path (prevents shell interpretation)
return `'${unixPath}'`;
} else {
// On Unix, use single quotes and escape any single quotes in the path
// Single quotes prevent all shell interpretation except for single quotes themselves
const escaped = normalizedPath.replace(/'/g, "'\\''");
return `'${escaped}'`;
}
}
/**
* Build the SSH command string for git config
*/
function buildSshCommand(sshKeyPath) {
const escapedPath = escapeSshKeyPath(sshKeyPath);
return `ssh -i ${escapedPath} -o IdentitiesOnly=yes`;
}
const isSocketPath = async (candidate) => {
if (!candidate || typeof candidate !== 'string') {
return false;
}
try {
const stat = await fsp.stat(candidate);
return typeof stat.isSocket === 'function' && stat.isSocket();
} catch {
return false;
}
};
const resolveSshAuthSock = async () => {
const existing = (process.env.SSH_AUTH_SOCK || '').trim();
if (existing) {
return existing;
}
if (process.platform === 'win32') {
return null;
}
const gpgSock = path.join(os.homedir(), '.gnupg', 'S.gpg-agent.ssh');
if (await isSocketPath(gpgSock)) {
return gpgSock;
}
const runGpgconf = async (args) => {
for (const candidate of gpgconfCandidates) {
try {
const { stdout } = await execFileAsync(candidate, args);
return String(stdout || '');
} catch {
continue;
}
}
return '';
};
const candidate = (await runGpgconf(['--list-dirs', 'agent-ssh-socket'])).trim();
if (candidate && await isSocketPath(candidate)) {
return candidate;
}
if (candidate) {
await runGpgconf(['--launch', 'gpg-agent']);
const retried = (await runGpgconf(['--list-dirs', 'agent-ssh-socket'])).trim();
if (retried && await isSocketPath(retried)) {
return retried;
}
}
return null;
};
const buildGitEnv = async () => {
const env = { ...process.env };
if (!env.SSH_AUTH_SOCK || !env.SSH_AUTH_SOCK.trim()) {
const resolved = await resolveSshAuthSock();
if (resolved) {
env.SSH_AUTH_SOCK = resolved;
}
}
return env;
};
const createGit = async (directory) => {
const env = await buildGitEnv();
const spawnOptions = { windowsHide: true };
const binary = getGitBinary();
const hasCustomBinary = typeof binary === 'string' && binary.trim() && binary !== 'git' && binary !== 'git.exe';
const unsafe = hasCustomBinary ? { allowUnsafeCustomBinary: true } : undefined;
if (!directory) {
return simpleGit({ env, spawnOptions, binary, unsafe });
}
return simpleGit({
baseDir: normalizeDirectoryPath(directory),
env,
spawnOptions,
binary,
unsafe,
});
};
const normalizeDirectoryPath = (value) => {
if (typeof value !== 'string') {
return value;
}
const trimmed = value.trim();
if (!trimmed) {
return trimmed;
}
if (trimmed === '~') {
return os.homedir();
}
if (trimmed.startsWith('~/') || trimmed.startsWith('~\\')) {
return path.join(os.homedir(), trimmed.slice(2));
}
return trimmed;
};
const cleanBranchName = (branch) => {
if (!branch) {
return branch;
}
if (branch.startsWith('refs/heads/')) {
return branch.substring('refs/heads/'.length);
}
if (branch.startsWith('heads/')) {
return branch.substring('heads/'.length);
}
if (branch.startsWith('refs/')) {
return branch.substring('refs/'.length);
}
return branch;
};
const OPENCODE_ADJECTIVES = [
'brave',
'calm',
'clever',
'cosmic',
'crisp',
'curious',
'eager',
'gentle',
'glowing',
'happy',
'hidden',
'jolly',
'kind',
'lucky',
'mighty',
'misty',
'neon',
'nimble',
'playful',
'proud',
'quick',
'quiet',
'shiny',
'silent',
'stellar',
'sunny',
'swift',
'tidy',
'witty',
];
const OPENCODE_NOUNS = [
'cabin',
'cactus',
'canyon',
'circuit',
'comet',
'eagle',
'engine',
'falcon',
'forest',
'garden',
'harbor',
'island',
'knight',
'lagoon',
'meadow',
'moon',
'mountain',
'nebula',
'orchid',
'otter',
'panda',
'pixel',
'planet',
'river',
'rocket',
'sailor',
'squid',
'star',
'tiger',
'wizard',
'wolf',
];
const OPENCODE_WORKTREE_ATTEMPTS = 26;
const getOpenCodeDataPath = () => {
const xdgDataHome = process.env.XDG_DATA_HOME || path.join(os.homedir(), '.local', 'share');
return path.join(xdgDataHome, 'opencode');
};
const pickRandom = (values) => values[Math.floor(Math.random() * values.length)];
const generateOpenCodeRandomName = () => `${pickRandom(OPENCODE_ADJECTIVES)}-${pickRandom(OPENCODE_NOUNS)}`;
const slugWorktreeName = (value) => {
return String(value || '')
.trim()
.replace(/^refs\/heads\//, '')
.replace(/^heads\//, '')
.replace(/\s+/g, '-')
.replace(/^\/+|\/+$/g, '')
.split('/').join('-')
.replace(/[^A-Za-z0-9._-]+/g, '-')
.replace(/-+/g, '-')
.replace(/^-+/, '')
.replace(/-+$/, '')
.slice(0, 80);
};
const parseWorktreePorcelain = (raw) => {
const lines = String(raw || '').split('\n').map((line) => line.trim());
const entries = [];
let current = null;
for (const line of lines) {
if (!line) {
if (current?.worktree) {
entries.push(current);
}
current = null;
continue;
}
if (line.startsWith('worktree ')) {
if (current?.worktree) {
entries.push(current);
}
current = { worktree: line.substring('worktree '.length).trim() };
continue;
}
if (!current) {
continue;
}
if (line.startsWith('HEAD ')) {
current.head = line.substring('HEAD '.length).trim();
continue;
}
if (line.startsWith('branch ')) {
const branchRef = line.substring('branch '.length).trim();
current.branchRef = branchRef;
current.branch = cleanBranchName(branchRef);
}
}
if (current?.worktree) {
entries.push(current);
}
return entries;
};
const canonicalPath = async (input) => {
const absolutePath = path.resolve(input);
const realPath = await fsp.realpath(absolutePath).catch(() => absolutePath);
const normalized = path.normalize(realPath);
return process.platform === 'win32' ? normalized.toLowerCase() : normalized;
};
const checkPathExists = async (targetPath) => {
try {
await fsp.stat(targetPath);
return true;
} catch {
return false;
}
};
const normalizeStartRef = (value) => {
const trimmed = String(value || '').trim();
if (!trimmed) {
return 'HEAD';
}
return trimmed;
};
const parseRemoteBranchRef = (value) => {
const trimmed = String(value || '').trim();
if (!trimmed) {
return null;
}
if (trimmed.startsWith('refs/remotes/')) {
const rest = trimmed.substring('refs/remotes/'.length);
const slashIndex = rest.indexOf('/');
if (slashIndex <= 0 || slashIndex === rest.length - 1) {
return null;
}
return {
remote: rest.slice(0, slashIndex),
branch: rest.slice(slashIndex + 1),
remoteRef: rest,
fullRef: `refs/remotes/${rest}`,
};
}
if (trimmed.startsWith('remotes/')) {
return parseRemoteBranchRef(`refs/${trimmed}`);
}
const slashIndex = trimmed.indexOf('/');
if (slashIndex <= 0 || slashIndex === trimmed.length - 1) {
return null;
}
return {
remote: trimmed.slice(0, slashIndex),
branch: trimmed.slice(slashIndex + 1),
remoteRef: trimmed,
fullRef: `refs/remotes/${trimmed}`,
};
};
const resolveRemoteBranchRef = async (primaryWorktree, value) => {
const raw = String(value || '').trim();
const parsed = parseRemoteBranchRef(raw);
if (!parsed) {
return null;
}
if (raw.startsWith('refs/remotes/') || raw.startsWith('remotes/')) {
return parsed;
}
const localRef = `refs/heads/${raw}`;
const localExists = await runGitCommand(primaryWorktree, ['show-ref', '--verify', '--quiet', localRef]);
if (localExists.success) {
return null;
}
return parsed;
};
const normalizeUpstreamTarget = (remote, branch) => {
const remoteName = String(remote || '').trim();
const branchName = String(branch || '').trim();
if (!remoteName || !branchName) {
return null;
}
return {
remote: remoteName,
branch: branchName,
full: `${remoteName}/${branchName}`,
};
};
const parseGitErrorText = (error) => {
const stderr = typeof error?.stderr === 'string' ? error.stderr : '';
const stdout = typeof error?.stdout === 'string' ? error.stdout : '';
const message = typeof error?.message === 'string' ? error.message : '';
return [stderr, stdout, message]
.map((chunk) => String(chunk || '').trim())
.filter(Boolean)
.join('\n')
.trim();
};
const isNotGitRepositoryError = (error) => {
const text = parseGitErrorText(error);
return /not a git repository/i.test(text);
};
const runGitCommand = async (cwd, args) => {
try {
const { stdout, stderr } = await execFileAsync(getGitBinary(), args, {
cwd,
env: await buildGitEnv(),
windowsHide: true,
maxBuffer: 20 * 1024 * 1024,
});
return {
success: true,
exitCode: 0,
stdout: String(stdout || ''),
stderr: String(stderr || ''),
};
} catch (error) {
return {
success: false,
exitCode: typeof error?.code === 'number' ? error.code : 1,
stdout: String(error?.stdout || ''),
stderr: String(error?.stderr || ''),
message: parseGitErrorText(error),
};
}
};
const runGitCommandOrThrow = async (cwd, args, fallbackMessage) => {
const result = await runGitCommand(cwd, args);
if (!result.success) {
throw new Error(result.message || fallbackMessage || 'Git command failed');
}
return result;
};
const ensureOpenCodeProjectId = async (primaryWorktree) => {
const gitDir = path.join(primaryWorktree, '.git');
const idFile = path.join(gitDir, 'opencode');
const existing = await fsp.readFile(idFile, 'utf8').then((value) => value.trim()).catch(() => '');
if (existing) {
return existing;
}
const rootsResult = await runGitCommandOrThrow(
primaryWorktree,
['rev-list', '--max-parents=0', '--all'],
'Failed to resolve repository roots'
);
const roots = rootsResult.stdout
.split('\n')
.map((line) => line.trim())
.filter(Boolean)
.sort((a, b) => a.localeCompare(b));
const projectId = roots[0] || '';
if (!projectId) {
throw new Error('Failed to derive OpenCode project ID');
}
await fsp.mkdir(gitDir, { recursive: true }).catch(() => undefined);
await fsp.writeFile(idFile, projectId, 'utf8').catch(() => undefined);
return projectId;
};
const resolveWorktreeProjectContext = async (directory) => {
const directoryPath = normalizeDirectoryPath(directory);
if (!directoryPath) {
throw new Error('Directory is required');
}
const topResult = await runGitCommandOrThrow(
directoryPath,
['rev-parse', '--show-toplevel'],
'Failed to resolve git top-level directory'
);
const sandbox = path.resolve(directoryPath, topResult.stdout.trim());
const commonResult = await runGitCommandOrThrow(
sandbox,
['rev-parse', '--git-common-dir'],
'Failed to resolve git common directory'
);
const commonDir = path.resolve(sandbox, commonResult.stdout.trim());
const primaryWorktree = path.dirname(commonDir);
const projectID = await ensureOpenCodeProjectId(primaryWorktree);
const worktreeRoot = path.join(getOpenCodeDataPath(), 'worktree', projectID);
return {
projectID,
sandbox,
primaryWorktree,
worktreeRoot,
};
};
const listWorktreeEntries = async (directory) => {
const rawResult = await runGitCommandOrThrow(
directory,
['worktree', 'list', '--porcelain'],
'Failed to list git worktrees'
);
return parseWorktreePorcelain(rawResult.stdout);
};
const resolveWorktreeNameCandidates = (baseName) => {
const normalizedBase = slugWorktreeName(baseName || '');
if (!normalizedBase) {
return Array.from({ length: OPENCODE_WORKTREE_ATTEMPTS }, () => generateOpenCodeRandomName());
}
return Array.from({ length: OPENCODE_WORKTREE_ATTEMPTS }, (_, index) => {
if (index === 0) {
return normalizedBase;
}
return `${normalizedBase}-${generateOpenCodeRandomName()}`;
});
};
const resolveCandidateDirectory = async (worktreeRoot, preferredName, explicitBranchName, primaryWorktree) => {
const candidates = resolveWorktreeNameCandidates(preferredName);
for (const name of candidates) {
const directory = path.join(worktreeRoot, name);
if (await checkPathExists(directory)) {
continue;
}
if (explicitBranchName) {
return { name, directory, branch: explicitBranchName };
}
const branch = `openchamber/${name}`;
const branchRef = `refs/heads/${branch}`;
const branchExists = await runGitCommand(primaryWorktree, ['show-ref', '--verify', '--quiet', branchRef]);
if (branchExists.success) {
continue;
}
return { name, directory, branch };
}
throw new Error('Failed to generate a unique worktree name');
};
const resolveBranchForExistingMode = async (primaryWorktree, existingBranch, preferredBranchName) => {
const requested = String(existingBranch || '').trim();
if (!requested) {
throw new Error('existingBranch is required in existing mode');
}
const normalizedLocal = cleanBranchName(requested);
const localRef = `refs/heads/${normalizedLocal}`;
const localExists = await runGitCommand(primaryWorktree, ['show-ref', '--verify', '--quiet', localRef]);
if (localExists.success) {
return {
localBranch: normalizedLocal,
checkoutRef: normalizedLocal,
createLocalBranch: false,
remoteRef: null,
};
}
const remoteRef = parseRemoteBranchRef(requested);
if (!remoteRef) {
throw new Error(`Branch not found: ${requested}`);
}
const remoteExists = await runGitCommand(primaryWorktree, ['show-ref', '--verify', '--quiet', remoteRef.fullRef]);
if (!remoteExists.success) {
await fetchRemoteBranchRef(primaryWorktree, remoteRef.remote, remoteRef.branch).catch(() => undefined);
const recheck = await runGitCommand(primaryWorktree, ['show-ref', '--verify', '--quiet', remoteRef.fullRef]);
if (!recheck.success) {
throw new Error(`Remote branch not found: ${requested}`);
}
}
const localBranch = cleanBranchName(preferredBranchName || remoteRef.branch || requested);
if (!localBranch) {
throw new Error('Failed to resolve local branch name for existing branch worktree');
}
return {
localBranch,
checkoutRef: remoteRef.remoteRef,
createLocalBranch: true,
remoteRef,
};
};
const findBranchInUse = async (primaryWorktree, localBranchName) => {
if (!localBranchName) {
return null;
}
const entries = await listWorktreeEntries(primaryWorktree);
const targetRef = `refs/heads/${localBranchName}`;
const targetClean = cleanBranchName(targetRef);
return entries.find((entry) => {
const entryRef = String(entry.branchRef || '').trim();
const entryClean = cleanBranchName(entryRef || entry.branch || '');
return entryRef === targetRef || entryClean === targetClean;
}) || null;
};
const runWorktreeStartCommand = async (directory, command) => {
const text = String(command || '').trim();
if (!text) {
return { success: true };
}
if (process.platform === 'win32') {
const result = await execFileAsync('cmd', ['/c', text], {
cwd: directory,
env: await buildGitEnv(),
windowsHide: true,
maxBuffer: 20 * 1024 * 1024,
}).then(({ stdout, stderr }) => ({ success: true, stdout, stderr })).catch((error) => ({
success: false,
stdout: error?.stdout,
stderr: error?.stderr,
message: parseGitErrorText(error),
}));
return result;
}
const result = await execFileAsync('bash', ['-lc', text], {
cwd: directory,
env: await buildGitEnv(),
maxBuffer: 20 * 1024 * 1024,
}).then(({ stdout, stderr }) => ({ success: true, stdout, stderr })).catch((error) => ({
success: false,
stdout: error?.stdout,
stderr: error?.stderr,
message: parseGitErrorText(error),
}));
return result;
};
const loadProjectStartCommand = async (projectID) => {
const storagePath = path.join(getOpenCodeDataPath(), 'storage', 'project', `${projectID}.json`);
try {
const raw = await fsp.readFile(storagePath, 'utf8');
const parsed = JSON.parse(raw);
const start = typeof parsed?.commands?.start === 'string' ? parsed.commands.start.trim() : '';
return start || '';
} catch {
return '';
}
};
const getProjectStoragePath = (projectID) => {
return path.join(getOpenCodeDataPath(), 'storage', 'project', `${projectID}.json`);
};
const syncSandboxesToOpenCodeDb = (projectID, sandboxes) => {
try {
const { Database } = require('bun:sqlite');
const dbPath = path.join(getOpenCodeDataPath(), 'opencode.db');
if (!fs.existsSync(dbPath)) return;
const db = new Database(dbPath);
try {
const row = db.query('SELECT sandboxes FROM project WHERE id = ?').get(projectID);
if (!row) return;
const json = JSON.stringify(sandboxes);
db.query('UPDATE project SET sandboxes = ?, time_updated = ? WHERE id = ?').run(json, Date.now(), projectID);
} finally {
db.close();
}
} catch (error) {
console.warn('Failed to sync sandboxes to OpenCode DB:', error instanceof Error ? error.message : String(error));
}
};
const updateProjectSandboxes = async (projectID, primaryWorktree, updater) => {
const storagePath = getProjectStoragePath(projectID);
await fsp.mkdir(path.dirname(storagePath), { recursive: true });
const now = Date.now();
const base = {
id: projectID,
worktree: primaryWorktree,
vcs: 'git',
sandboxes: [],
time: {
created: now,
updated: now,
},
};
const parsed = await fsp.readFile(storagePath, 'utf8').then((raw) => JSON.parse(raw)).catch(() => null);
const current = parsed && typeof parsed === 'object' ? { ...base, ...parsed } : base;
current.id = String(current.id || projectID);
current.worktree = String(current.worktree || primaryWorktree);
current.vcs = current.vcs || 'git';
current.sandboxes = Array.isArray(current.sandboxes)
? current.sandboxes.map((entry) => String(entry || '').trim()).filter(Boolean)
: [];
const createdAt = Number(current?.time?.created);
current.time = {
created: Number.isFinite(createdAt) && createdAt > 0 ? createdAt : now,
updated: now,
};
updater(current);
current.sandboxes = [...new Set(
(Array.isArray(current.sandboxes) ? current.sandboxes : [])
.map((entry) => String(entry || '').trim())
.filter(Boolean)
)];
await fsp.writeFile(storagePath, `${JSON.stringify(current, null, 2)}\n`, 'utf8');
// Sync to OpenCode's SQLite database so project.sandboxes is visible via the SDK
syncSandboxesToOpenCodeDb(projectID, current.sandboxes);
};
const syncProjectSandboxAdd = async (projectID, primaryWorktree, sandboxPath) => {
const sandbox = String(sandboxPath || '').trim();
if (!sandbox) {
return;
}
await updateProjectSandboxes(projectID, primaryWorktree, (project) => {
if (!project.sandboxes.includes(sandbox)) {
project.sandboxes.push(sandbox);
}
});
};
const syncProjectSandboxRemove = async (projectID, primaryWorktree, sandboxPath) => {
const sandbox = String(sandboxPath || '').trim();
if (!sandbox) {
return;
}
await updateProjectSandboxes(projectID, primaryWorktree, (project) => {
project.sandboxes = project.sandboxes.filter((entry) => entry !== sandbox);
});
};
const runWorktreeStartScripts = async (directory, projectID, startCommand) => {
const projectStart = await loadProjectStartCommand(projectID);
if (projectStart) {
const projectResult = await runWorktreeStartCommand(directory, projectStart);
if (!projectResult.success) {
console.warn('Worktree project start command failed:', projectResult.message || projectResult.stderr || projectResult.stdout);
return;
}
}
const extraCommand = String(startCommand || '').trim();
if (!extraCommand) {
return;
}
const extraResult = await runWorktreeStartCommand(directory, extraCommand);
if (!extraResult.success) {
console.warn('Worktree start command failed:', extraResult.message || extraResult.stderr || extraResult.stdout);
}
};
const queueWorktreeBootstrap = (args) => {
const {
directory,
projectID,
primaryWorktree,
localBranch,
setUpstream,
upstreamRemote,
upstreamBranch,
ensureRemoteName,
ensureRemoteUrl,
startCommand,
} = args;
setTimeout(() => {
const run = async () => {
await runGitCommandOrThrow(directory, ['reset', '--hard'], 'Failed to populate worktree');
if (setUpstream) {
await applyUpstreamConfiguration({
primaryWorktree,
worktreeDirectory: directory,
localBranch,
setUpstream,
upstreamRemote,
upstreamBranch,
ensureRemoteName,
ensureRemoteUrl,
}).catch((error) => {
console.warn('Worktree upstream configuration failed:', error instanceof Error ? error.message : String(error));
});
}
await runWorktreeStartScripts(directory, projectID, startCommand).catch((error) => {
console.warn('Worktree start script task failed:', error instanceof Error ? error.message : String(error));
});
setWorktreeBootstrapState(directory, WORKTREE_BOOTSTRAP_READY);
};
void run().catch((error) => {
setWorktreeBootstrapState(
directory,
WORKTREE_BOOTSTRAP_FAILED,
error instanceof Error ? error.message : String(error)
);
console.warn('Worktree bootstrap task failed:', error instanceof Error ? error.message : String(error));
});
}, 0);
};
const ensureRemoteWithUrl = async (primaryWorktree, remoteName, remoteUrl) => {
const name = String(remoteName || '').trim();
const url = String(remoteUrl || '').trim();
if (!name || !url) {
return;
}
const getUrl = await runGitCommand(primaryWorktree, ['remote', 'get-url', name]);
if (getUrl.success) {
const currentUrl = String(getUrl.stdout || '').trim();
if (currentUrl !== url) {
await runGitCommandOrThrow(primaryWorktree, ['remote', 'set-url', name, url], 'Failed to update git remote URL');
}
return;
}
await runGitCommandOrThrow(primaryWorktree, ['remote', 'add', name, url], 'Failed to add git remote');
};
const fetchRemoteBranchRef = async (primaryWorktree, remoteName, branchName) => {
const remote = String(remoteName || '').trim();
const branch = String(branchName || '').trim();
if (!remote || !branch) {
return;
}
const refspec = `+refs/heads/${branch}:refs/remotes/${remote}/${branch}`;
await runGitCommandOrThrow(
primaryWorktree,
['fetch', remote, refspec],
`Failed to fetch ${remote}/${branch}`
);
};
const checkRemoteBranchExists = async (primaryWorktree, remoteName, branchName, remoteUrl = '') => {
const remote = String(remoteName || '').trim();
const branch = String(branchName || '').trim();
const url = String(remoteUrl || '').trim();
if (!remote || !branch) {
return { success: false, found: false };
}
const target = url || remote;
const lsRemote = await runGitCommand(
primaryWorktree,
['ls-remote', '--heads', target, `refs/heads/${branch}`]
);
if (!lsRemote.success) {
return { success: false, found: false };
}
return {
success: true,
found: Boolean(String(lsRemote.stdout || '').trim()),
};
};
const setBranchTrackingFallback = async (worktreeDirectory, localBranch, upstream) => {
await runGitCommandOrThrow(
worktreeDirectory,
['config', `branch.${localBranch}.remote`, upstream.remote],
`Failed to set branch.${localBranch}.remote`
);
await runGitCommandOrThrow(
worktreeDirectory,
['config', `branch.${localBranch}.merge`, `refs/heads/${upstream.branch}`],
`Failed to set branch.${localBranch}.merge`
);
};
const applyUpstreamConfiguration = async (args) => {
const {
primaryWorktree,
worktreeDirectory,
localBranch,
setUpstream,
upstreamRemote,
upstreamBranch,
ensureRemoteName,
ensureRemoteUrl,
} = args;
if (!setUpstream) {
return;
}
if (ensureRemoteName && ensureRemoteUrl) {
await ensureRemoteWithUrl(primaryWorktree, ensureRemoteName, ensureRemoteUrl);
}
const upstream = normalizeUpstreamTarget(upstreamRemote, upstreamBranch);
if (!upstream || !localBranch) {
return;
}
let fetched = true;
try {
await fetchRemoteBranchRef(primaryWorktree, upstream.remote, upstream.branch);
} catch {
fetched = false;
}
if (fetched) {
await runGitCommandOrThrow(
worktreeDirectory,
['branch', `--set-upstream-to=${upstream.full}`, localBranch],
`Failed to set upstream to ${upstream.full}`
);
return;
}
await setBranchTrackingFallback(worktreeDirectory, localBranch, upstream);
};
export async function isGitRepository(directory) {
const directoryPath = normalizeDirectoryPath(directory);
if (!directoryPath || !fs.existsSync(directoryPath)) {
return false;
}
const result = await runGitCommand(directoryPath, ['rev-parse', '--git-dir']);
return result.success;
}
export async function getGlobalIdentity() {
const git = await createGit();
try {
const userName = await git.getConfig('user.name', 'global').catch(() => null);
const userEmail = await git.getConfig('user.email', 'global').catch(() => null);
const sshCommand = await git.getConfig('core.sshCommand', 'global').catch(() => null);
return {
userName: userName?.value || null,
userEmail: userEmail?.value || null,
sshCommand: sshCommand?.value || null
};
} catch (error) {
console.error('Failed to get global Git identity:', error);
return {
userName: null,
userEmail: null,
sshCommand: null
};
}
}
export async function getRemoteUrl(directory, remoteName = 'origin') {
const git = await createGit(directory);
try {
const url = await git.remote(['get-url', remoteName]);
return url?.trim() || null;
} catch {
return null;
}
}
export async function getCurrentIdentity(directory) {
const git = await createGit(directory);
try {
const userName = await git.getConfig('user.name', 'local').catch(() =>
git.getConfig('user.name', 'global')
);
const userEmail = await git.getConfig('user.email', 'local').catch(() =>
git.getConfig('user.email', 'global')
);
const sshCommand = await git.getConfig('core.sshCommand', 'local').catch(() =>
git.getConfig('core.sshCommand', 'global')
);
return {
userName: userName?.value || null,
userEmail: userEmail?.value || null,
sshCommand: sshCommand?.value || null
};
} catch (error) {
console.error('Failed to get current Git identity:', error);
return {
userName: null,
userEmail: null,
sshCommand: null
};
}
}
export async function hasLocalIdentity(directory) {
const git = await createGit(directory);
try {
const localName = await git.getConfig('user.name', 'local').catch(() => null);
const localEmail = await git.getConfig('user.email', 'local').catch(() => null);
return Boolean(localName?.value || localEmail?.value);
} catch {
return false;
}
}
export async function setLocalIdentity(directory, profile) {
const git = await createGit(directory);
try {
await git.addConfig('user.name', profile.userName, false, 'local');
await git.addConfig('user.email', profile.userEmail, false, 'local');
const authType = profile.authType || 'ssh';
if (authType === 'ssh' && profile.sshKey) {
await git.addConfig(
'core.sshCommand',
buildSshCommand(profile.sshKey),
false,
'local'
);
await git.raw(['config', '--local', '--unset', 'credential.helper']).catch(() => {});
} else if (authType === 'token' && profile.host) {
await git.addConfig(
'credential.helper',
'store',
false,
'local'
);
await git.raw(['config', '--local', '--unset', 'core.sshCommand']).catch(() => {});
}
return true;
} catch (error) {
console.error('Failed to set Git identity:', error);
throw error;
}
}
export async function getStatus(directory, options = {}) {
const directoryPath = normalizeDirectoryPath(directory);
const git = await createGit(directoryPath);
const lightMode = options.mode === 'light';
try {
// Use -uall to show all untracked files individually, not just directories
const status = await git.status(['-uall']);
// Light mode: skip numstat + new-file line counting for faster response
const [stagedStatsRaw, workingStatsRaw] = lightMode
? ['', '']
: await Promise.all([
git.raw(['diff', '--cached', '--numstat']).catch(() => ''),
git.raw(['diff', '--numstat']).catch(() => ''),
]);
const diffStatsMap = new Map();
const accumulateStats = (raw) => {
if (!raw) return;
raw
.split('\n')
.map((line) => line.trim())
.filter(Boolean)
.forEach((line) => {
const parts = line.split('\t');
if (parts.length < 3) {
return;
}
const [insertionsRaw, deletionsRaw, ...pathParts] = parts;
const path = pathParts.join('\t');
if (!path) {
return;
}
const insertions = insertionsRaw === '-' ? 0 : parseInt(insertionsRaw, 10) || 0;
const deletions = deletionsRaw === '-' ? 0 : parseInt(deletionsRaw, 10) || 0;
const existing = diffStatsMap.get(path) || { insertions: 0, deletions: 0 };
diffStatsMap.set(path, {
insertions: existing.insertions + insertions,
deletions: existing.deletions + deletions,
});
});
};
accumulateStats(stagedStatsRaw);
accumulateStats(workingStatsRaw);
const diffStats = Object.fromEntries(diffStatsMap.entries());
const newFileStats = lightMode ? [] : await Promise.all(
status.files.map(async (file) => {
const working = (file.working_dir || '').trim();
const indexStatus = (file.index || '').trim();
const statusCode = working || indexStatus;
if (statusCode !== '?' && statusCode !== 'A') {
return null;
}
const existing = diffStats[file.path];
if (existing && existing.insertions > 0) {
return null;
}
const absolutePath = path.join(directoryPath, file.path);
try {
const stat = await fsp.stat(absolutePath);
if (!stat.isFile()) {
return null;
}
const buffer = await fsp.readFile(absolutePath);
if (buffer.indexOf(0) !== -1) {
return {
path: file.path,
insertions: existing?.insertions ?? 0,
deletions: existing?.deletions ?? 0,
};
}
const normalized = buffer.toString('utf8').replace(/\r\n/g, '\n');
if (!normalized.length) {
return {
path: file.path,
insertions: 0,
deletions: 0,
};
}
const segments = normalized.split('\n');
if (normalized.endsWith('\n')) {
segments.pop();
}
const lineCount = segments.length;
return {
path: file.path,
insertions: lineCount,
deletions: 0,
};
} catch (error) {
console.warn('Failed to estimate diff stats for new file', file.path, error);
return null;
}
})
);
for (const entry of newFileStats) {
if (!entry) continue;
diffStats[entry.path] = {
insertions: entry.insertions,
deletions: entry.deletions,
};
}
const selectBaseRefForUnpublished = async () => {
const candidates = [];
const originHead = await git
.raw(['symbolic-ref', '-q', 'refs/remotes/origin/HEAD'])
.then((value) => String(value || '').trim())
.catch(() => '');
if (originHead) {
// "refs/remotes/origin/main" -> "origin/main"
candidates.push(originHead.replace(/^refs\/remotes\//, ''));
}
candidates.push('origin/main', 'origin/master', 'main', 'master');
for (const ref of candidates) {
const exists = await git
.raw(['rev-parse', '--verify', ref])
.then((value) => String(value || '').trim())
.catch(() => '');
if (exists) return ref;
}
return null;
};
let tracking = status.tracking || null;
let ahead = status.ahead;
let behind = status.behind;
// When no upstream is configured (common for new worktree branches), Git doesn't report ahead/behind.
// We still want to show the number of unpublished commits to the user.
// Light mode skips this — the basic ahead/behind from git status is sufficient for polling.
if (!lightMode && !tracking && status.current) {
const baseRef = await selectBaseRefForUnpublished();
if (baseRef) {
const countRaw = await git
.raw(['rev-list', '--count', `${baseRef}..HEAD`])
.then((value) => String(value || '').trim())
.catch(() => '');
const count = parseInt(countRaw, 10);
if (Number.isFinite(count)) {
ahead = count;
behind = 0;
}
}
}
// Check for in-progress operations
let mergeInProgress = null;
let rebaseInProgress = null;
try {
// Check MERGE_HEAD for merge in progress
const mergeHeadExists = await git
.raw(['rev-parse', '--verify', '--quiet', 'MERGE_HEAD'])
.then(() => true)
.catch(() => false);
if (mergeHeadExists) {
const mergeHead = await git.raw(['rev-parse', 'MERGE_HEAD']).catch(() => '');
const headSha = mergeHead.trim().slice(0, 7);
// Only set mergeInProgress if we actually have a valid head SHA
if (headSha) {
const mergeMsg = await fsp.readFile(path.join(directoryPath, '.git', 'MERGE_MSG'), 'utf8').catch(() => '');
mergeInProgress = {
head: headSha,
message: mergeMsg.split('\n')[0] || '',
};
}
}
} catch {
// ignore
}
try {
// Check for rebase in progress (.git/rebase-merge or .git/rebase-apply)
const rebaseMergeExists = await fsp.stat(path.join(directoryPath, '.git', 'rebase-merge')).then(() => true).catch(() => false);
const rebaseApplyExists = await fsp.stat(path.join(directoryPath, '.git', 'rebase-apply')).then(() => true).catch(() => false);
if (rebaseMergeExists || rebaseApplyExists) {
const rebaseDir = rebaseMergeExists ? 'rebase-merge' : 'rebase-apply';
const headName = await fsp.readFile(path.join(directoryPath, '.git', rebaseDir, 'head-name'), 'utf8').catch(() => '');
const onto = await fsp.readFile(path.join(directoryPath, '.git', rebaseDir, 'onto'), 'utf8').catch(() => '');
const headNameTrimmed = headName.trim().replace('refs/heads/', '');
const ontoTrimmed = onto.trim().slice(0, 7);
// Only set rebaseInProgress if we have valid data
if (headNameTrimmed || ontoTrimmed) {
rebaseInProgress = {
headName: headNameTrimmed,
onto: ontoTrimmed,
};
}
}
} catch {
// ignore
}
return {
current: status.current,
tracking,
ahead,
behind,
files: status.files.map((f) => ({
path: f.path,
index: f.index,
working_dir: f.working_dir,
})),
isClean: status.isClean(),
diffStats: lightMode ? undefined : diffStats,
mergeInProgress,
rebaseInProgress,
};
} catch (error) {
if (!isNotGitRepositoryError(error)) {
console.error('Failed to get Git status:', error);
}
throw error;
}
}
export async function getDiff(directory, { path, staged = false, contextLines = 3 } = {}) {
const git = await createGit(directory);
try {
const args = ['diff', '--no-color'];
if (typeof contextLines === 'number' && !Number.isNaN(contextLines)) {
args.push(`-U${Math.max(0, contextLines)}`);
}
if (staged) {
args.push('--cached');
}
if (path) {
args.push('--', path);
}
const diff = await git.raw(args);
if (diff && diff.trim().length > 0) {
return diff;
}
if (staged) {
return diff;
}
try {
await git.raw(['ls-files', '--error-unmatch', path]);
return diff;
} catch {
const noIndexArgs = ['diff', '--no-color'];
if (typeof contextLines === 'number' && !Number.isNaN(contextLines)) {
noIndexArgs.push(`-U${Math.max(0, contextLines)}`);
}
noIndexArgs.push('--no-index', '--', '/dev/null', path);
try {
const noIndexDiff = await git.raw(noIndexArgs);
return noIndexDiff;
} catch (noIndexError) {
// git diff --no-index returns exit code 1 when differences exist (not a real error)
if (noIndexError.exitCode === 1 && noIndexError.message) {
return noIndexError.message;
}
throw noIndexError;
}
}
} catch (error) {
console.error('Failed to get Git diff:', error);
throw error;
}
}
export async function getRangeDiff(directory, { base, head, path, contextLines = 3 } = {}) {
const git = await createGit(directory);
const baseRef = typeof base === 'string' ? base.trim() : '';
const headRef = typeof head === 'string' ? head.trim() : '';
if (!baseRef || !headRef) {
throw new Error('base and head are required');
}
// Prefer remote-tracking base ref so merged commits don't reappear
// when local base branch is stale (common when user stays on feature branch).
let resolvedBase = baseRef;
const originCandidate = `refs/remotes/origin/${baseRef}`;
try {
const verified = await git.raw(['rev-parse', '--verify', originCandidate]);
if (verified && verified.trim()) {
resolvedBase = `origin/${baseRef}`;
}
} catch {
// ignore
}
const args = ['diff', '--no-color'];
if (typeof contextLines === 'number' && !Number.isNaN(contextLines)) {
args.push(`-U${Math.max(0, contextLines)}`);
}
args.push(`${resolvedBase}...${headRef}`);
if (path) {
args.push('--', path);
}
const diff = await git.raw(args);
return diff;
}
export async function getRangeFiles(directory, { base, head } = {}) {
const git = await createGit(directory);
const baseRef = typeof base === 'string' ? base.trim() : '';
const headRef = typeof head === 'string' ? head.trim() : '';
if (!baseRef || !headRef) {
throw new Error('base and head are required');
}
let resolvedBase = baseRef;
const originCandidate = `refs/remotes/origin/${baseRef}`;
try {
const verified = await git.raw(['rev-parse', '--verify', originCandidate]);
if (verified && verified.trim()) {
resolvedBase = `origin/${baseRef}`;
}
} catch {
// ignore
}
const raw = await git.raw(['diff', '--name-only', `${resolvedBase}...${headRef}`]);
return String(raw || '')
.split('\n')
.map((l) => l.trim())
.filter(Boolean);
}
const IMAGE_EXTENSIONS = ['png', 'jpg', 'jpeg', 'gif', 'svg', 'webp', 'ico', 'bmp', 'avif'];
const BINARY_SNIFF_BYTES = 8192;
function isImageFile(filePath) {
const ext = filePath.split('.').pop()?.toLowerCase();
return IMAGE_EXTENSIONS.includes(ext || '');
}
function getImageMimeType(filePath) {
const ext = filePath.split('.').pop()?.toLowerCase();
const mimeMap = {
'png': 'image/png',
'jpg': 'image/jpeg',
'jpeg': 'image/jpeg',
'gif': 'image/gif',
'svg': 'image/svg+xml',
'webp': 'image/webp',
'ico': 'image/x-icon',
'bmp': 'image/bmp',
'avif': 'image/avif',
};
return mimeMap[ext] || 'application/octet-stream';
}
const parseIsBinaryFromNumstat = (raw) => {
const text = String(raw || '').trim();
if (!text) {
return false;
}
// Expected format: <added>\t<deleted>\t<path>
const firstLine = text.split('\n').map((line) => line.trim()).find(Boolean) || '';
const [added, deleted] = firstLine.split('\t');
return added === '-' || deleted === '-';
};
const looksBinaryBySniff = async (absolutePath) => {
try {
const handle = await fsp.open(absolutePath, 'r');
try {
const buffer = Buffer.alloc(BINARY_SNIFF_BYTES);
const { bytesRead } = await handle.read(buffer, 0, BINARY_SNIFF_BYTES, 0);
if (bytesRead <= 0) {
return false;
}
return buffer.subarray(0, bytesRead).includes(0);
} finally {
await handle.close();
}
} catch {
return false;
}
};
const isBinaryDiff = async (directoryPath, filePath, staged) => {
// Fast path: ask git for numstat. For binary, it returns "-\t-\t<path>".
const args = ['diff', '--numstat'];
if (staged) {
args.push('--cached');
}
args.push('--', filePath);
const result = await runGitCommand(directoryPath, args);
if (parseIsBinaryFromNumstat(result.stdout)) {
return true;
}
// Fallback for untracked files (diff output is empty): use --no-index against /dev/null
if (!staged) {
const tracked = await runGitCommand(directoryPath, ['ls-files', '--error-unmatch', '--', filePath]).then((r) => r.success);
if (!tracked) {
const noIndex = await runGitCommand(directoryPath, ['diff', '--no-index', '--numstat', '--', '/dev/null', filePath]);
if (parseIsBinaryFromNumstat(noIndex.stdout) || parseIsBinaryFromNumstat(noIndex.stderr) || parseIsBinaryFromNumstat(noIndex.message)) {
return true;
}
const text = `${noIndex.stdout || ''}\n${noIndex.stderr || ''}\n${noIndex.message || ''}`.toLowerCase();
if (text.includes('binary files') || text.includes('git binary patch')) {
return true;
}
}
}
return false;
};
export async function getFileDiff(directory, { path: filePath, staged = false } = {}) {
if (!directory || !filePath) {
throw new Error('directory and path are required for getFileDiff');
}
const directoryPath = normalizeDirectoryPath(directory);
const git = await createGit(directoryPath);
const isImage = isImageFile(filePath);
const mimeType = isImage ? getImageMimeType(filePath) : null;
if (!isImage) {
const absolutePath = path.join(directoryPath, filePath);
const isBinaryBySniff = await looksBinaryBySniff(absolutePath);
const isBinary = isBinaryBySniff || (await isBinaryDiff(directoryPath, filePath, staged));
if (isBinary) {
return {
original: '',
modified: '',
path: filePath,
isBinary: true,
};
}
}
let original = '';
try {
if (isImage) {
// For images, use git show with raw output and convert to base64
try {
const { stdout } = await execFileAsync(getGitBinary(), ['show', `HEAD:${filePath}`], {
cwd: directoryPath,
encoding: 'buffer',
windowsHide: true,
maxBuffer: 50 * 1024 * 1024, // 50MB max
});
if (stdout && stdout.length > 0) {
original = `data:${mimeType};base64,${stdout.toString('base64')}`;
}
} catch {
original = '';
}
} else {
original = await git.show([`HEAD:${filePath}`]);
}
} catch {
original = '';
}
const fullPath = path.join(directoryPath, filePath);
let modified = '';
try {
const stat = await fsp.stat(fullPath);
if (stat.isFile()) {
if (isImage) {
// For images, read as binary and convert to data URL
const buffer = await fsp.readFile(fullPath);
modified = `data:${mimeType};base64,${buffer.toString('base64')}`;
} else {
modified = await fsp.readFile(fullPath, 'utf8');
}
}
} catch (error) {
if (error && typeof error === 'object' && error.code === 'ENOENT') {
modified = '';
} else {
console.error('Failed to read modified file contents for diff:', error);
throw error;
}
}
return {
original,
modified,
path: filePath,
isBinary: false,
};
}
export async function revertFile(directory, filePath) {
const directoryPath = normalizeDirectoryPath(directory);
const git = await createGit(directoryPath);
const repoRoot = path.resolve(directoryPath);
const absoluteTarget = path.resolve(repoRoot, filePath);
if (!absoluteTarget.startsWith(repoRoot + path.sep) && absoluteTarget !== repoRoot) {
throw new Error('Invalid file path');
}
const isTracked = await git
.raw(['ls-files', '--error-unmatch', filePath])
.then(() => true)
.catch(() => false);
if (!isTracked) {
try {
await git.raw(['clean', '-f', '-d', '--', filePath]);
return;
} catch (cleanError) {
try {
await fsp.rm(absoluteTarget, { recursive: true, force: true });
return;
} catch (fsError) {
if (fsError && typeof fsError === 'object' && fsError.code === 'ENOENT') {
return;
}
console.error('Failed to remove untracked file during revert:', fsError);
throw fsError;
}
}
}
try {
await git.raw(['restore', '--staged', filePath]);
} catch (error) {
await git.raw(['reset', 'HEAD', '--', filePath]).catch(() => {});
}
try {
await git.raw(['restore', filePath]);
} catch (error) {
try {
await git.raw(['checkout', '--', filePath]);
} catch (fallbackError) {
console.error('Failed to revert git file:', fallbackError);
throw fallbackError;
}
}
}
export async function collectDiffs(directory, files = []) {
const results = [];
for (const filePath of files) {
try {
const diff = await getDiff(directory, { path: filePath });
if (diff && diff.trim().length > 0) {
results.push({ path: filePath, diff });
}
} catch (error) {
console.error(`Failed to diff ${filePath}:`, error);
}
}
return results;
}
export async function pull(directory, options = {}) {
const git = await createGit(directory);
try {
const result = await git.pull(
options.remote || 'origin',
options.branch,
options.options || {}
);
return {
success: true,
summary: result.summary,
files: result.files,
insertions: result.insertions,
deletions: result.deletions
};
} catch (error) {
console.error('Failed to pull:', error);
throw error;
}
}
export async function push(directory, options = {}) {
const git = await createGit(directory);
const describePushError = (error) => {
const fromNestedGit = error?.git && typeof error.git === 'object'
? [error.git.message, error.git.stderr, error.git.stdout]
: [];
const candidates = [
error?.message,
error?.stderr,
error?.stdout,
...fromNestedGit,
]
.map((value) => String(value || '').trim())
.filter(Boolean);
return candidates[0] || 'Failed to push to remote';
};
const buildUpstreamOptions = (raw) => {
if (Array.isArray(raw)) {
return raw.includes('--set-upstream') ? raw : [...raw, '--set-upstream'];
}
if (raw && typeof raw === 'object') {
return { ...raw, '--set-upstream': null };
}
return ['--set-upstream'];
};
const looksLikeMissingUpstream = (error) => {
const message = String(error?.message || error?.stderr || '').toLowerCase();
return (
message.includes('has no upstream') ||
message.includes('no upstream') ||
message.includes('set-upstream') ||
message.includes('set upstream') ||
(message.includes('upstream') && message.includes('push') && message.includes('-u'))
);
};
const normalizePushResult = (result) => {
return {
success: true,
pushed: result.pushed,
repo: result.repo,
ref: result.ref,
};
};
const remote = String(options.remote || '').trim();
if (!remote && !options.branch) {
try {
await git.push();
return {
success: true,
pushed: [],
repo: directory,
ref: null,
};
} catch (error) {
if (!looksLikeMissingUpstream(error)) {
const message = describePushError(error);
console.error('Failed to push:', error);
throw new Error(message);
}
try {
const status = await git.status();
const branch = status.current;
const remotes = await git.getRemotes(true);
const fallbackRemote = remotes.find((entry) => entry.name === 'origin')?.name || remotes[0]?.name;
if (!branch || !fallbackRemote) {
const message = describePushError(error);
throw new Error(message);
}
const result = await git.push(fallbackRemote, branch, buildUpstreamOptions(options.options));
return normalizePushResult(result);
} catch (fallbackError) {
const message = describePushError(fallbackError);
console.error('Failed to push (including upstream fallback):', fallbackError);
throw new Error(message);
}
}
}
const remoteName = remote || 'origin';
// If caller didn't specify a branch, this is the common "Push"/"Commit & Push" path.
// When there's no upstream yet (typical for freshly-created worktree branches), publish it on first push.
if (!options.branch) {
try {
const status = await git.status();
if (status.current && !status.tracking) {
const result = await git.push(remoteName, status.current, buildUpstreamOptions(options.options));
return normalizePushResult(result);
}
} catch (error) {
// If we can't read status, fall back to the regular push path below.
console.warn('Failed to read git status before push:', error);
}
}
try {
const result = await git.push(remoteName, options.branch, options.options || {});
return normalizePushResult(result);
} catch (error) {
// Last-resort fallback: retry with upstream if the error suggests it's missing.
if (!looksLikeMissingUpstream(error)) {
const message = describePushError(error);
console.error('Failed to push:', error);
throw new Error(message);
}
try {
const status = await git.status();
const branch = options.branch || status.current;
if (!branch) {
console.error('Failed to push: missing branch name for upstream setup:', error);
throw error;
}
const result = await git.push(remoteName, branch, buildUpstreamOptions(options.options));
return normalizePushResult(result);
} catch (fallbackError) {
const message = describePushError(fallbackError);
console.error('Failed to push (including upstream fallback):', fallbackError);
throw new Error(message);
}
}
}
export async function deleteRemoteBranch(directory, options = {}) {
const { branch, remote } = options;
if (!branch) {
throw new Error('branch is required to delete remote branch');
}
const git = await createGit(directory);
const targetBranch = branch.startsWith('refs/heads/')
? branch.substring('refs/heads/'.length)
: branch;
const remoteName = remote || 'origin';
try {
await git.push(remoteName, `:${targetBranch}`);
return { success: true };
} catch (error) {
console.error('Failed to delete remote branch:', error);
throw error;
}
}
export async function fetch(directory, options = {}) {
const git = await createGit(directory);
try {
await git.fetch(
options.remote || 'origin',
options.branch,
options.options || {}
);
return { success: true };
} catch (error) {
console.error('Failed to fetch:', error);
throw error;
}
}
export async function commit(directory, message, options = {}) {
const git = await createGit(directory);
try {
const requestedFiles = Array.isArray(options.files)
? options.files
.map((value) => String(value || '').trim())
.filter(Boolean)
: [];
let filesToCommit = requestedFiles;
if (options.addAll) {
await git.add('.');
} else if (requestedFiles.length > 0) {
const status = await git.status();
const fileStatusByPath = new Map(status.files.map((file) => [file.path, file]));
filesToCommit = requestedFiles.filter((filePath) => fileStatusByPath.has(filePath));
if (filesToCommit.length === 0) {
throw new Error('No selected files are available to commit. Refresh git status and try again.');
}
const filesNeedingAdd = filesToCommit.filter((filePath) => {
const fileStatus = fileStatusByPath.get(filePath);
if (!fileStatus) {
return false;
}
const alreadyFullyStaged = fileStatus.index !== ' ' && fileStatus.working_dir === ' ';
return !alreadyFullyStaged;
});
if (filesNeedingAdd.length > 0) {
await git.add(filesNeedingAdd);
}
}
const commitArgs =
!options.addAll && filesToCommit.length > 0
? filesToCommit
: undefined;
let result;
try {
result = await git.commit(message, commitArgs);
} catch (error) {
const gitErrorText = parseGitErrorText(error);
const isPathspecError = gitErrorText.includes('pathspec') && gitErrorText.includes('did not match any files');
if (!isPathspecError || !commitArgs || commitArgs.length === 0) {
throw error;
}
// Fallback for deleted/stale selections: commit currently staged changes.
result = await git.commit(message);
}
return {
success: true,
commit: result.commit,
branch: result.branch,
summary: result.summary
};
} catch (error) {
console.error('Failed to commit:', error);
throw error;
}
}
export async function getBranches(directory) {
const git = await createGit(directory);
try {
const result = await git.branch();
const allBranches = result.all;
const remoteBranches = allBranches.filter(branch => branch.startsWith('remotes/'));
const activeRemoteBranches = await filterActiveRemoteBranches(git, remoteBranches);
const filteredAll = [
...allBranches.filter(branch => !branch.startsWith('remotes/')),
...activeRemoteBranches
];
return {
all: filteredAll,
current: result.current,
branches: result.branches
};
} catch (error) {
console.error('Failed to get branches:', error);
throw error;
}
}
async function filterActiveRemoteBranches(git, remoteBranches) {
try {
const lsRemoteResult = await git.raw(['ls-remote', '--heads', 'origin']);
const actualRemoteBranches = new Set();
const lines = lsRemoteResult.trim().split('\n');
for (const line of lines) {
if (line.includes('\trefs/heads/')) {
const branchName = line.split('\t')[1].replace('refs/heads/', '');
actualRemoteBranches.add(branchName);
}
}
return remoteBranches.filter(remoteBranch => {
const match = remoteBranch.match(/^remotes\/[^\/]+\/(.+)$/);
if (!match) return false;
const branchName = match[1];
return actualRemoteBranches.has(branchName);
});
} catch (error) {
console.warn('Failed to filter active remote branches, returning all:', error.message);
return remoteBranches;
}
}
export async function createBranch(directory, branchName, options = {}) {
const git = await createGit(directory);
try {
await git.checkoutBranch(branchName, options.startPoint || 'HEAD');
return { success: true, branch: branchName };
} catch (error) {
console.error('Failed to create branch:', error);
throw error;
}
}
export async function checkoutBranch(directory, branchName) {
const git = await createGit(directory);
try {
await git.checkout(branchName);
return { success: true, branch: branchName };
} catch (error) {
console.error('Failed to checkout branch:', error);
throw error;
}
}
export async function getWorktrees(directory) {
const directoryPath = normalizeDirectoryPath(directory);
if (!directoryPath || !fs.existsSync(directoryPath) || !fs.existsSync(path.join(directoryPath, '.git'))) {
return [];
}
try {
const result = await runGitCommandOrThrow(
directoryPath,
['worktree', 'list', '--porcelain'],
'Failed to list git worktrees'
);
return parseWorktreePorcelain(result.stdout).map((entry) => ({
head: entry.head || '',
name: path.basename(entry.worktree || ''),
branch: entry.branch || '',
path: entry.worktree,
}));
} catch (error) {
console.warn('Failed to list worktrees, returning empty list:', error?.message || error);
return [];
}
}
export async function validateWorktreeCreate(directory, input = {}) {
const mode = input?.mode === 'existing' ? 'existing' : 'new';
const errors = [];
try {
const context = await resolveWorktreeProjectContext(directory);
const preferredBranchName = cleanBranchName(String(input?.branchName || '').trim());
const startRef = normalizeStartRef(input?.startRef);
const ensureRemoteName = String(input?.ensureRemoteName || '').trim();
const ensureRemoteUrl = String(input?.ensureRemoteUrl || '').trim();
let localBranch = '';
let inferredUpstream = null;
if (mode === 'existing') {
try {
const requestedExistingBranch = String(input?.existingBranch || '').trim();
const parsedExistingRemote = await resolveRemoteBranchRef(context.primaryWorktree, requestedExistingBranch);
if (parsedExistingRemote && ensureRemoteName && ensureRemoteUrl && ensureRemoteName === parsedExistingRemote.remote) {
const lsRemote = await runGitCommand(
context.primaryWorktree,
['ls-remote', '--heads', ensureRemoteUrl, `refs/heads/${parsedExistingRemote.branch}`]
);
if (!lsRemote.success) {
throw new Error(`Unable to query remote ${ensureRemoteName}`);
}
if (!String(lsRemote.stdout || '').trim()) {
throw new Error(`Remote branch not found: ${parsedExistingRemote.remoteRef}`);
}
localBranch = cleanBranchName(preferredBranchName || parsedExistingRemote.branch);
inferredUpstream = {
remote: parsedExistingRemote.remote,
branch: parsedExistingRemote.branch,
};
} else {
const resolved = await resolveBranchForExistingMode(context.primaryWorktree, requestedExistingBranch, preferredBranchName);
localBranch = resolved.localBranch || '';
if (resolved.remoteRef) {
inferredUpstream = {
remote: resolved.remoteRef.remote,
branch: resolved.remoteRef.branch,
};
}
}
} catch (error) {
errors.push({
code: 'branch_not_found',
message: error instanceof Error ? error.message : 'Existing branch not found',
});
}
} else {
if (preferredBranchName) {
const exists = await runGitCommand(context.primaryWorktree, ['show-ref', '--verify', '--quiet', `refs/heads/${preferredBranchName}`]);
if (exists.success) {
errors.push({
code: 'branch_exists',
message: `Branch already exists: ${preferredBranchName}`,
});
}
localBranch = preferredBranchName;
}
const parsedRemoteRef = await resolveRemoteBranchRef(context.primaryWorktree, startRef);
if (startRef && startRef !== 'HEAD') {
if (parsedRemoteRef && ensureRemoteName && ensureRemoteUrl && ensureRemoteName === parsedRemoteRef.remote) {
const remoteCheck = await checkRemoteBranchExists(
context.primaryWorktree,
parsedRemoteRef.remote,
parsedRemoteRef.branch,
ensureRemoteUrl
);
if (!remoteCheck.success) {
errors.push({
code: 'remote_unreachable',
message: `Unable to query remote ${ensureRemoteName}`,
});
} else if (!remoteCheck.found) {
errors.push({
code: 'start_ref_not_found',
message: `Remote branch not found: ${parsedRemoteRef.remoteRef}`,
});
}
} else if (parsedRemoteRef) {
const remoteCheck = await checkRemoteBranchExists(
context.primaryWorktree,
parsedRemoteRef.remote,
parsedRemoteRef.branch
);
if (!remoteCheck.success) {
errors.push({
code: 'remote_unreachable',
message: `Unable to query remote ${parsedRemoteRef.remote}`,
});
} else if (!remoteCheck.found) {
errors.push({
code: 'start_ref_not_found',
message: `Remote branch not found: ${parsedRemoteRef.remoteRef}`,
});
}
} else {
const startRefExists = await runGitCommand(context.primaryWorktree, ['rev-parse', '--verify', '--quiet', startRef]);
if (!startRefExists.success) {
errors.push({
code: 'start_ref_not_found',
message: `Start ref not found: ${startRef}`,
});
}
}
}
if (parsedRemoteRef) {
inferredUpstream = {
remote: parsedRemoteRef.remote,
branch: parsedRemoteRef.branch,
};
}
}
if (localBranch) {
const inUse = await findBranchInUse(context.primaryWorktree, localBranch);
if (inUse) {
errors.push({
code: 'branch_in_use',
message: `Branch is already checked out in ${inUse.worktree}`,
});
}
}
if ((ensureRemoteName && !ensureRemoteUrl) || (!ensureRemoteName && ensureRemoteUrl)) {
errors.push({
code: 'invalid_remote_config',
message: 'Both ensureRemoteName and ensureRemoteUrl are required together',
});
}
const shouldSetUpstream = Boolean(input?.setUpstream);
if (shouldSetUpstream) {
const upstreamRemote = String(input?.upstreamRemote || inferredUpstream?.remote || '').trim();
const upstreamBranch = String(input?.upstreamBranch || inferredUpstream?.branch || '').trim();
if (!upstreamRemote || !upstreamBranch) {
errors.push({
code: 'upstream_incomplete',
message: 'upstreamRemote and upstreamBranch are required when setUpstream is true',
});
} else {
const remoteExists = await runGitCommand(context.primaryWorktree, ['remote', 'get-url', upstreamRemote]);
if (!remoteExists.success && (!ensureRemoteName || ensureRemoteName !== upstreamRemote)) {
errors.push({
code: 'remote_not_found',
message: `Remote not found: ${upstreamRemote}`,
});
}
}
}
return {
ok: errors.length === 0,
errors,
resolved: {
mode,
localBranch: localBranch || null,
},
};
} catch (error) {
return {
ok: false,
errors: [{
code: 'validation_failed',
message: error instanceof Error ? error.message : 'Failed to validate worktree creation',
}],
};
}
}
export async function previewWorktreeCreate(directory, input = {}) {
const mode = input?.mode === 'existing' ? 'existing' : 'new';
const context = await resolveWorktreeProjectContext(directory);
await fsp.mkdir(context.worktreeRoot, { recursive: true });
const preferredName = String(input?.worktreeName || input?.name || '').trim();
const preferredBranchName = cleanBranchName(String(input?.branchName || '').trim());
const candidate = await resolveCandidateDirectory(
context.worktreeRoot,
preferredName,
mode === 'new' && preferredBranchName ? preferredBranchName : '',
context.primaryWorktree
);
return {
name: candidate.name,
branch: mode === 'new' ? candidate.branch : preferredBranchName,
path: candidate.directory,
};
}
export async function createWorktree(directory, input = {}) {
const mode = input?.mode === 'existing' ? 'existing' : 'new';
const context = await resolveWorktreeProjectContext(directory);
await fsp.mkdir(context.worktreeRoot, { recursive: true });
const preferredName = String(input?.worktreeName || input?.name || '').trim();
const preferredBranchName = cleanBranchName(String(input?.branchName || '').trim());
const startRef = normalizeStartRef(input?.startRef);
const ensureRemoteName = String(input?.ensureRemoteName || '').trim();
const ensureRemoteUrl = String(input?.ensureRemoteUrl || '').trim();
const candidate = await resolveCandidateDirectory(
context.worktreeRoot,
preferredName,
mode === 'new' && preferredBranchName ? preferredBranchName : '',
context.primaryWorktree
);
let localBranch = '';
let inferredUpstream = null;
const worktreeAddArgs = ['worktree', 'add', '--no-checkout'];
if (mode === 'existing') {
const requestedExistingBranch = String(input?.existingBranch || '').trim();
const parsedExistingRemote = await resolveRemoteBranchRef(context.primaryWorktree, requestedExistingBranch);
if (parsedExistingRemote && ensureRemoteName && ensureRemoteUrl && parsedExistingRemote.remote === ensureRemoteName) {
await ensureRemoteWithUrl(context.primaryWorktree, ensureRemoteName, ensureRemoteUrl);
await fetchRemoteBranchRef(context.primaryWorktree, parsedExistingRemote.remote, parsedExistingRemote.branch);
}
const resolved = await resolveBranchForExistingMode(context.primaryWorktree, requestedExistingBranch, preferredBranchName);
localBranch = resolved.localBranch;
const inUse = await findBranchInUse(context.primaryWorktree, localBranch);
if (inUse) {
throw new Error(`Branch is already checked out in ${inUse.worktree}`);
}
if (resolved.createLocalBranch) {
worktreeAddArgs.push('-b', localBranch);
}
worktreeAddArgs.push(candidate.directory, resolved.checkoutRef);
if (resolved.remoteRef) {
inferredUpstream = {
remote: resolved.remoteRef.remote,
branch: resolved.remoteRef.branch,
};
}
} else {
localBranch = candidate.branch;
if (!localBranch) {
throw new Error('Failed to resolve branch name for new worktree');
}
const branchExists = await runGitCommand(context.primaryWorktree, ['show-ref', '--verify', '--quiet', `refs/heads/${localBranch}`]);
if (branchExists.success) {
throw new Error(`Branch already exists: ${localBranch}`);
}
const inUse = await findBranchInUse(context.primaryWorktree, localBranch);
if (inUse) {
throw new Error(`Branch is already checked out in ${inUse.worktree}`);
}
worktreeAddArgs.push('-b', localBranch, candidate.directory);
if (startRef && startRef !== 'HEAD') {
worktreeAddArgs.push(startRef);
}
const parsedRemoteStartRef = await resolveRemoteBranchRef(context.primaryWorktree, startRef);
if (parsedRemoteStartRef) {
inferredUpstream = {
remote: parsedRemoteStartRef.remote,
branch: parsedRemoteStartRef.branch,
};
}
}
if (ensureRemoteName && ensureRemoteUrl) {
await ensureRemoteWithUrl(context.primaryWorktree, ensureRemoteName, ensureRemoteUrl);
}
if (mode === 'new') {
const parsedRemoteStartRef = await resolveRemoteBranchRef(context.primaryWorktree, startRef);
if (parsedRemoteStartRef) {
await fetchRemoteBranchRef(context.primaryWorktree, parsedRemoteStartRef.remote, parsedRemoteStartRef.branch);
}
}
await runGitCommandOrThrow(context.primaryWorktree, worktreeAddArgs, 'Failed to create git worktree');
try {
await syncProjectSandboxAdd(context.projectID, context.primaryWorktree, candidate.directory);
} catch (error) {
console.warn('Failed to sync OpenCode sandbox metadata (add):', error instanceof Error ? error.message : String(error));
}
const shouldSetUpstream = Boolean(input?.setUpstream);
const upstreamRemote = String(input?.upstreamRemote || inferredUpstream?.remote || '').trim();
const upstreamBranch = String(input?.upstreamBranch || inferredUpstream?.branch || '').trim();
setWorktreeBootstrapState(candidate.directory, WORKTREE_BOOTSTRAP_PENDING);
queueWorktreeBootstrap({
directory: candidate.directory,
projectID: context.projectID,
primaryWorktree: context.primaryWorktree,
localBranch,
setUpstream: shouldSetUpstream,
upstreamRemote,
upstreamBranch,
ensureRemoteName,
ensureRemoteUrl,
startCommand: input?.startCommand,
});
const headResult = await runGitCommand(candidate.directory, ['rev-parse', 'HEAD']);
const head = String(headResult.stdout || '').trim();
return {
head,
name: candidate.name,
branch: localBranch,
path: candidate.directory,
};
}
export async function getWorktreeBootstrapStatus(directory) {
const key = toBootstrapStateKey(directory);
if (!key) {
throw new Error('Worktree directory is required');
}
const current = worktreeBootstrapState.get(key);
if (current) {
return current;
}
return {
status: WORKTREE_BOOTSTRAP_READY,
error: null,
updatedAt: Date.now(),
};
}
export async function removeWorktree(directory, input = {}) {
const targetDirectory = normalizeDirectoryPath(input?.directory);
if (!targetDirectory) {
throw new Error('Worktree directory is required');
}
const context = await resolveWorktreeProjectContext(directory);
const deleteLocalBranch = input?.deleteLocalBranch === true;
const targetCanonical = await canonicalPath(targetDirectory);
const primaryCanonical = await canonicalPath(context.primaryWorktree);
if (targetCanonical === primaryCanonical) {
throw new Error('Cannot remove the primary workspace');
}
const entries = await listWorktreeEntries(context.primaryWorktree);
const matchedEntry = await (async () => {
for (const entry of entries) {
if (!entry?.worktree) {
continue;
}
const entryCanonical = await canonicalPath(entry.worktree);
if (entryCanonical === targetCanonical) {
return entry;
}
}
return null;
})();
if (!matchedEntry?.worktree) {
const targetExists = await checkPathExists(targetDirectory);
if (targetExists) {
await fsp.rm(targetDirectory, { recursive: true, force: true });
}
try {
await syncProjectSandboxRemove(context.projectID, context.primaryWorktree, targetDirectory);
} catch (error) {
console.warn('Failed to sync OpenCode sandbox metadata (remove):', error instanceof Error ? error.message : String(error));
}
clearWorktreeBootstrapState(targetDirectory);
return true;
}
await runGitCommandOrThrow(
context.primaryWorktree,
['worktree', 'remove', '--force', matchedEntry.worktree],
'Failed to remove git worktree'
);
if (deleteLocalBranch) {
const branchName = cleanBranchName(String(matchedEntry.branchRef || matchedEntry.branch || '').trim());
if (branchName) {
await runGitCommandOrThrow(
context.primaryWorktree,
['branch', '-D', branchName],
`Failed to delete local branch ${branchName}`
);
}
}
try {
await syncProjectSandboxRemove(context.projectID, context.primaryWorktree, matchedEntry.worktree);
} catch (error) {
console.warn('Failed to sync OpenCode sandbox metadata (remove):', error instanceof Error ? error.message : String(error));
}
clearWorktreeBootstrapState(matchedEntry.worktree);
return true;
}
export async function deleteBranch(directory, branch, options = {}) {
const git = await createGit(directory);
try {
const branchName = branch.startsWith('refs/heads/')
? branch.substring('refs/heads/'.length)
: branch;
const args = ['branch', options.force ? '-D' : '-d', branchName];
await git.raw(args);
return { success: true };
} catch (error) {
console.error('Failed to delete branch:', error);
throw error;
}
}
export async function getLog(directory, options = {}) {
const git = await createGit(directory);
try {
const maxCount = options.maxCount || 50;
const baseLog = await git.log({
maxCount,
from: options.from,
to: options.to,
file: options.file
});
const logArgs = [
'log',
`--max-count=${maxCount}`,
'--date=iso',
'--pretty=format:%H%x1f%an%x1f%ae%x1f%ad%x1f%s%x1e',
'--shortstat'
];
if (options.from && options.to) {
logArgs.push(`${options.from}..${options.to}`);
} else if (options.from) {
logArgs.push(`${options.from}..HEAD`);
} else if (options.to) {
logArgs.push(options.to);
}
if (options.file) {
logArgs.push('--', options.file);
}
const rawLog = await git.raw(logArgs);
const records = rawLog
.split('\x1e')
.map((entry) => entry.trim())
.filter(Boolean);
const statsMap = new Map();
records.forEach((record) => {
const lines = record.split('\n').filter((line) => line.trim().length > 0);
const header = lines.shift() || '';
const [hash] = header.split('\x1f');
if (!hash) {
return;
}
let filesChanged = 0;
let insertions = 0;
let deletions = 0;
lines.forEach((line) => {
const filesMatch = line.match(/(\d+)\s+files?\s+changed/);
const insertMatch = line.match(/(\d+)\s+insertions?\(\+\)/);
const deleteMatch = line.match(/(\d+)\s+deletions?\(-\)/);
if (filesMatch) {
filesChanged = parseInt(filesMatch[1], 10);
}
if (insertMatch) {
insertions = parseInt(insertMatch[1], 10);
}
if (deleteMatch) {
deletions = parseInt(deleteMatch[1], 10);
}
});
statsMap.set(hash, { filesChanged, insertions, deletions });
});
const merged = baseLog.all.map((entry) => {
const stats = statsMap.get(entry.hash) || { filesChanged: 0, insertions: 0, deletions: 0 };
return {
hash: entry.hash,
date: entry.date,
message: entry.message,
refs: entry.refs || '',
body: entry.body || '',
author_name: entry.author_name,
author_email: entry.author_email,
filesChanged: stats.filesChanged,
insertions: stats.insertions,
deletions: stats.deletions
};
});
return {
all: merged,
latest: merged[0] || null,
total: baseLog.total
};
} catch (error) {
console.error('Failed to get log:', error);
throw error;
}
}
export async function isLinkedWorktree(directory) {
const git = await createGit(directory);
try {
const [gitDir, gitCommonDir] = await Promise.all([
git.raw(['rev-parse', '--git-dir']).then((output) => output.trim()),
git.raw(['rev-parse', '--git-common-dir']).then((output) => output.trim())
]);
return gitDir !== gitCommonDir;
} catch (error) {
console.error('Failed to determine worktree type:', error);
return false;
}
}
export async function getCommitFiles(directory, commitHash) {
const git = await createGit(directory);
try {
const numstatRaw = await git.raw([
'show',
'--numstat',
'--format=',
commitHash
]);
const files = [];
const lines = numstatRaw.trim().split('\n').filter(Boolean);
for (const line of lines) {
const parts = line.split('\t');
if (parts.length < 3) continue;
const [insertionsRaw, deletionsRaw, ...pathParts] = parts;
const filePath = pathParts.join('\t');
if (!filePath) continue;
const insertions = insertionsRaw === '-' ? 0 : parseInt(insertionsRaw, 10) || 0;
const deletions = deletionsRaw === '-' ? 0 : parseInt(deletionsRaw, 10) || 0;
const isBinary = insertionsRaw === '-' && deletionsRaw === '-';
let changeType = 'M';
let displayPath = filePath;
if (filePath.includes(' => ')) {
changeType = 'R';
const match = filePath.match(/(?:\{[^}]*\s=>\s[^}]*\}|.*\s=>\s.*)/);
if (match) {
displayPath = filePath;
}
}
files.push({
path: displayPath,
insertions,
deletions,
isBinary,
changeType
});
}
const nameStatusRaw = await git.raw([
'show',
'--name-status',
'--format=',
commitHash
]).catch(() => '');
const statusMap = new Map();
const statusLines = nameStatusRaw.trim().split('\n').filter(Boolean);
for (const line of statusLines) {
const match = line.match(/^([AMDRC])\d*\t(.+)$/);
if (match) {
const [, status, path] = match;
statusMap.set(path, status);
}
}
for (const file of files) {
const basePath = file.path.includes(' => ')
? file.path.split(' => ').pop()?.replace(/[{}]/g, '') || file.path
: file.path;
const status = statusMap.get(basePath) || statusMap.get(file.path);
if (status) {
file.changeType = status;
}
}
return { files };
} catch (error) {
console.error('Failed to get commit files:', error);
throw error;
}
}
export async function renameBranch(directory, oldName, newName) {
const git = await createGit(directory);
try {
const normalizedOldName = cleanBranchName(String(oldName || '').trim());
const normalizedNewName = cleanBranchName(String(newName || '').trim());
const previousRemote = await git
.raw(['config', '--get', `branch.${normalizedOldName}.remote`])
.then((value) => String(value || '').trim())
.catch(() => '');
const previousMerge = await git
.raw(['config', '--get', `branch.${normalizedOldName}.merge`])
.then((value) => String(value || '').trim())
.catch(() => '');
// Use git branch -m command to rename the branch
await git.raw(['branch', '-m', oldName, newName]);
if (previousRemote && previousMerge && normalizedNewName) {
const previousMergeBranch = cleanBranchName(previousMerge);
const nextMergeBranch =
previousMergeBranch === normalizedOldName
? normalizedNewName
: previousMergeBranch;
const upstream = normalizeUpstreamTarget(previousRemote, nextMergeBranch);
if (upstream) {
try {
await runGitCommandOrThrow(
directory,
['branch', `--set-upstream-to=${upstream.full}`, normalizedNewName],
`Failed to set upstream to ${upstream.full}`
);
} catch {
await setBranchTrackingFallback(directory, normalizedNewName, upstream);
}
}
}
return { success: true, branch: newName };
} catch (error) {
console.error('Failed to rename branch:', error);
throw error;
}
}
export async function getRemotes(directory) {
const git = await createGit(directory);
try {
const remotes = await git.getRemotes(true);
return remotes.map((remote) => ({
name: remote.name,
fetchUrl: remote.refs.fetch,
pushUrl: remote.refs.push
}));
} catch (error) {
console.error('Failed to get remotes:', error);
throw error;
}
}
export async function removeRemote(directory, options = {}) {
const remoteName = String(options.remote || '').trim();
if (!remoteName) {
throw new Error('remote is required to remove a remote');
}
if (remoteName === 'origin') {
throw new Error('Cannot remove origin remote');
}
const git = await createGit(directory);
try {
await git.removeRemote(remoteName);
return { success: true };
} catch (error) {
console.error('Failed to remove remote:', error);
throw error;
}
}
export async function rebase(directory, options = {}) {
const git = await createGit(directory);
try {
const { onto } = options;
if (!onto) {
throw new Error('onto parameter is required for rebase');
}
await git.rebase([onto]);
return {
success: true,
conflict: false
};
} catch (error) {
const errorMessage = String(error?.message || error || '').toLowerCase();
const isConflict = errorMessage.includes('conflict') ||
errorMessage.includes('could not apply') ||
errorMessage.includes('merge conflict');
if (isConflict) {
// Get list of conflicted files
const status = await git.status().catch(() => ({ conflicted: [] }));
return {
success: false,
conflict: true,
conflictFiles: status.conflicted || []
};
}
console.error('Failed to rebase:', error);
throw error;
}
}
export async function abortRebase(directory) {
const git = await createGit(directory);
try {
await git.rebase(['--abort']);
return { success: true };
} catch (error) {
console.error('Failed to abort rebase:', error);
throw error;
}
}
export async function merge(directory, options = {}) {
const git = await createGit(directory);
try {
const { branch } = options;
if (!branch) {
throw new Error('branch parameter is required for merge');
}
await git.merge([branch]);
return {
success: true,
conflict: false
};
} catch (error) {
const errorMessage = String(error?.message || error || '').toLowerCase();
const isConflict = errorMessage.includes('conflict') ||
errorMessage.includes('merge conflict') ||
errorMessage.includes('automatic merge failed');
if (isConflict) {
// Get list of conflicted files
const status = await git.status().catch(() => ({ conflicted: [] }));
return {
success: false,
conflict: true,
conflictFiles: status.conflicted || []
};
}
console.error('Failed to merge:', error);
throw error;
}
}
export async function abortMerge(directory) {
const git = await createGit(directory);
try {
await git.merge(['--abort']);
return { success: true };
} catch (error) {
console.error('Failed to abort merge:', error);
throw error;
}
}
export async function continueRebase(directory) {
const directoryPath = normalizeDirectoryPath(directory);
const git = await createGit(directoryPath);
try {
// Set GIT_EDITOR to prevent editor prompts
await git.env('GIT_EDITOR', 'true').rebase(['--continue']);
return { success: true, conflict: false };
} catch (error) {
const errorMessage = String(error?.message || error || '').toLowerCase();
const isConflict = errorMessage.includes('conflict') ||
errorMessage.includes('needs merge') ||
errorMessage.includes('unmerged') ||
errorMessage.includes('fix conflicts');
if (isConflict) {
const status = await git.status().catch(() => ({ conflicted: [] }));
return {
success: false,
conflict: true,
conflictFiles: status.conflicted || []
};
}
// Check for "nothing to commit" which means rebase step is complete
if (errorMessage.includes('nothing to commit') || errorMessage.includes('no changes')) {
// Skip this commit and continue
try {
await git.env('GIT_EDITOR', 'true').rebase(['--skip']);
return { success: true, conflict: false };
} catch {
// If skip also fails, the rebase may be complete
return { success: true, conflict: false };
}
}
console.error('Failed to continue rebase:', error);
throw error;
}
}
export async function continueMerge(directory) {
const directoryPath = normalizeDirectoryPath(directory);
const git = await createGit(directoryPath);
try {
// Check if there are still unmerged files
const status = await git.status();
if (status.conflicted && status.conflicted.length > 0) {
return {
success: false,
conflict: true,
conflictFiles: status.conflicted
};
}
// For merge, we commit after resolving conflicts
// Use --no-edit to use the default merge commit message
await git.env('GIT_EDITOR', 'true').commit([], { '--no-edit': null });
return { success: true, conflict: false };
} catch (error) {
const errorMessage = String(error?.message || error || '').toLowerCase();
const isConflict = errorMessage.includes('conflict') ||
errorMessage.includes('needs merge') ||
errorMessage.includes('unmerged') ||
errorMessage.includes('fix conflicts');
if (isConflict) {
const status = await git.status().catch(() => ({ conflicted: [] }));
return {
success: false,
conflict: true,
conflictFiles: status.conflicted || []
};
}
// "nothing to commit" can happen if all conflicts resolved to one side
if (errorMessage.includes('nothing to commit') || errorMessage.includes('no changes added')) {
// The merge is effectively complete (all changes already committed or no changes needed)
return { success: true, conflict: false };
}
console.error('Failed to continue merge:', error);
throw error;
}
}
export async function getConflictDetails(directory) {
const directoryPath = normalizeDirectoryPath(directory);
const git = await createGit(directoryPath);
try {
// Get git status --porcelain
const statusPorcelain = await git.raw(['status', '--porcelain']).catch(() => '');
// Get unmerged files
const unmergedFilesRaw = await git.raw(['diff', '--name-only', '--diff-filter=U']).catch(() => '');
const unmergedFiles = unmergedFilesRaw
.split('\n')
.map((line) => line.trim())
.filter(Boolean);
// Get current diff
const diff = await git.raw(['diff']).catch(() => '');
// Detect operation type and get head info
let operation = 'merge';
let headInfo = '';
// Check for MERGE_HEAD (merge in progress)
const mergeHeadExists = await git
.raw(['rev-parse', '--verify', '--quiet', 'MERGE_HEAD'])
.then(() => true)
.catch(() => false);
if (mergeHeadExists) {
operation = 'merge';
const mergeHead = await git.raw(['rev-parse', 'MERGE_HEAD']).catch(() => '');
const mergeMsg = await fsp
.readFile(path.join(directoryPath, '.git', 'MERGE_MSG'), 'utf8')
.catch(() => '');
headInfo = `MERGE_HEAD: ${mergeHead.trim()}\n${mergeMsg}`;
} else {
// Check for REBASE_HEAD (rebase in progress)
const rebaseHeadExists = await git
.raw(['rev-parse', '--verify', '--quiet', 'REBASE_HEAD'])
.then(() => true)
.catch(() => false);
if (rebaseHeadExists) {
operation = 'rebase';
const rebaseHead = await git.raw(['rev-parse', 'REBASE_HEAD']).catch(() => '');
headInfo = `REBASE_HEAD: ${rebaseHead.trim()}`;
}
}
return {
statusPorcelain: statusPorcelain.trim(),
unmergedFiles,
diff: diff.trim(),
headInfo: headInfo.trim(),
operation,
};
} catch (error) {
console.error('Failed to get conflict details:', error);
throw error;
}
}
// ============== Stash Operations ==============
export async function stash(directory, options = {}) {
const git = await createGit(directory);
try {
const args = ['stash', 'push'];
// Include untracked files by default
if (options.includeUntracked !== false) {
args.push('--include-untracked');
}
if (options.message) {
args.push('-m', options.message);
}
await git.raw(args);
return { success: true };
} catch (error) {
console.error('Failed to stash:', error);
throw error;
}
}
export async function stashPop(directory) {
const git = await createGit(directory);
try {
await git.raw(['stash', 'pop']);
return { success: true };
} catch (error) {
console.error('Failed to pop stash:', error);
throw error;
}
}