mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 16:02:32 +00:00
* Create PRs directly from Source Control - Replace the modal flow with an inline PR composer in the sidebar - Keep PR creation state and validation scoped per worktree - Rename the recovery action to clarify it only pushes before creating PRs * Clean up fork PR remotes after worktree deletion - Track Orca-created push target remotes in worktree metadata - Reuse ownership markers when later worktrees share the same fork remote - Fetch only the selected PR base instead of every remote before drafting PRs - Mirror local branch cleanup for SSH worktree deletion * Stabilize pull request creation flow - Keep PR actions and composer fields locked while generation or creation is in flight - Refresh git status, branch comparison, and history after remote actions settle - Disable push-only actions on diverged branches so users sync first * Make PR context generation read-only - Stop rebasing or probing HEAD before collecting PR draft context - Allow git operations on known repo roots without refreshing worktree cache Co-authored-by: Orca <help@stably.ai> * fix: address review findings --------- Co-authored-by: Orca <help@stably.ai>
664 lines
24 KiB
TypeScript
664 lines
24 KiB
TypeScript
/* eslint-disable max-lines -- Why: runtime git dispatch stays in one boundary so local, SSH, and runtime-environment behavior remains comparable. */
|
|
import type {
|
|
GitBranchCompareResult,
|
|
GitCommitCompareResult,
|
|
GitConflictOperation,
|
|
GitDiffResult,
|
|
GitPushTarget,
|
|
GitStatusResult,
|
|
GitUpstreamStatus,
|
|
GitWorktreeInfo,
|
|
GlobalSettings,
|
|
TuiAgent,
|
|
Worktree
|
|
} from '../../shared/types'
|
|
import type { CommitMessageDraftContext } from '../../shared/commit-message-generation'
|
|
import { getCommitMessageModelDiscoveryHostKey } from '../../shared/commit-message-host-key'
|
|
import type { GitHistoryOptions, GitHistoryResult } from '../../shared/git-history'
|
|
import { getRemoteFileUrl } from '../git/repo'
|
|
import {
|
|
bulkDiscardChanges,
|
|
bulkStageFiles,
|
|
bulkUnstageFiles,
|
|
commitChanges,
|
|
detectConflictOperation,
|
|
discardChanges,
|
|
getBranchCompare,
|
|
getBranchDiff,
|
|
getCommitCompare,
|
|
getCommitDiff,
|
|
getDiff,
|
|
getStagedCommitContext,
|
|
getStatus as getGitStatus,
|
|
stageFile,
|
|
unstageFile
|
|
} from '../git/status'
|
|
import { getHistory as getGitHistory } from '../git/history'
|
|
import { getUpstreamStatus } from '../git/upstream'
|
|
import { gitFetch, gitPull, gitPush } from '../git/remote'
|
|
import {
|
|
getSshGitProvider,
|
|
SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE
|
|
} from '../providers/ssh-git-dispatch'
|
|
import { checkIgnoredPaths } from '../git/check-ignored-paths'
|
|
import {
|
|
cancelGenerateCommitMessageLocal,
|
|
cancelGeneratePullRequestFieldsLocal,
|
|
discoverCommitMessageModelsLocal,
|
|
discoverCommitMessageModelsRemote,
|
|
generateCommitMessageFromContext,
|
|
generatePullRequestFieldsFromContext,
|
|
resolveCommitMessageSettings,
|
|
type DiscoverCommitMessageModelsResult,
|
|
type GenerateCommitMessageResult,
|
|
type GeneratePullRequestFieldsResult
|
|
} from '../text-generation/commit-message-text-generation'
|
|
import type { CommitMessageAgentEnvironmentResolvers } from '../text-generation/commit-message-agent-environment'
|
|
import { prepareLocalCommitMessageAgentEnv } from '../text-generation/commit-message-agent-environment'
|
|
import { getPullRequestDraftContext } from '../text-generation/pull-request-context'
|
|
import { normalizeRuntimeRelativePath } from './runtime-relative-paths'
|
|
import { gitExecFileAsync } from '../git/runner'
|
|
|
|
export type ResolvedRuntimeGitWorktree = Worktree & { git: GitWorktreeInfo }
|
|
type RuntimeCommitMessageSettingsOverride = Partial<
|
|
Pick<GlobalSettings, 'commitMessageAi' | 'agentCmdOverrides' | 'enableGitHubAttribution'>
|
|
> & {
|
|
commitMessageDiscoveryHostKey?: string
|
|
}
|
|
|
|
function normalizeRuntimeGitRelativePath(filePath: string): string {
|
|
const relativePath = normalizeRuntimeRelativePath(filePath)
|
|
if (relativePath === '') {
|
|
// Why: git mutation APIs treat an empty pathspec as the worktree root;
|
|
// runtime RPC must never let malformed file paths discard whole worktrees.
|
|
throw new Error('invalid_relative_path')
|
|
}
|
|
return relativePath
|
|
}
|
|
|
|
export type RuntimeGitCommandHost = {
|
|
resolveRuntimeGitTarget(
|
|
selector: string
|
|
): Promise<{ worktree: ResolvedRuntimeGitWorktree; connectionId?: string }>
|
|
getRuntimeSettings(): GlobalSettings
|
|
getCommitMessageAgentEnvironment?(): CommitMessageAgentEnvironmentResolvers | undefined
|
|
}
|
|
|
|
export class RuntimeGitCommands {
|
|
constructor(private readonly host: RuntimeGitCommandHost) {}
|
|
|
|
async getRuntimeGitStatus(
|
|
worktreeSelector: string,
|
|
options?: { includeIgnored?: boolean }
|
|
): Promise<GitStatusResult> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
return options
|
|
? provider.getStatus(target.worktree.path, options)
|
|
: provider.getStatus(target.worktree.path)
|
|
}
|
|
return options
|
|
? getGitStatus(target.worktree.path, options)
|
|
: getGitStatus(target.worktree.path)
|
|
}
|
|
|
|
async checkRuntimeGitIgnoredPaths(
|
|
worktreeSelector: string,
|
|
relativePaths: string[]
|
|
): Promise<string[]> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
return provider.checkIgnoredPaths(target.worktree.path, relativePaths)
|
|
}
|
|
return checkIgnoredPaths(target.worktree.path, relativePaths)
|
|
}
|
|
|
|
async getRuntimeGitHistory(
|
|
worktreeSelector: string,
|
|
options: GitHistoryOptions = {}
|
|
): Promise<GitHistoryResult> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
return provider.getHistory(target.worktree.path, options)
|
|
}
|
|
return getGitHistory(target.worktree.path, options)
|
|
}
|
|
|
|
async getRuntimeGitConflictOperation(worktreeSelector: string): Promise<GitConflictOperation> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
return provider.detectConflictOperation(target.worktree.path)
|
|
}
|
|
return detectConflictOperation(target.worktree.path)
|
|
}
|
|
|
|
async getRuntimeGitDiff(
|
|
worktreeSelector: string,
|
|
filePath: string,
|
|
staged: boolean,
|
|
compareAgainstHead?: boolean
|
|
): Promise<GitDiffResult> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const relativePath = normalizeRuntimeGitRelativePath(filePath)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
return provider.getDiff(target.worktree.path, relativePath, staged, compareAgainstHead)
|
|
}
|
|
return getDiff(target.worktree.path, relativePath, staged, compareAgainstHead)
|
|
}
|
|
|
|
async getRuntimeGitBranchCompare(
|
|
worktreeSelector: string,
|
|
baseRef: string
|
|
): Promise<GitBranchCompareResult> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
return provider.getBranchCompare(target.worktree.path, baseRef)
|
|
}
|
|
return getBranchCompare(target.worktree.path, baseRef)
|
|
}
|
|
|
|
async getRuntimeGitCommitCompare(
|
|
worktreeSelector: string,
|
|
commitId: string
|
|
): Promise<GitCommitCompareResult> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
return provider.getCommitCompare(target.worktree.path, commitId)
|
|
}
|
|
return getCommitCompare(target.worktree.path, commitId)
|
|
}
|
|
|
|
async getRuntimeGitUpstreamStatus(worktreeSelector: string): Promise<GitUpstreamStatus> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
return provider.getUpstreamStatus(target.worktree.path)
|
|
}
|
|
return getUpstreamStatus(target.worktree.path)
|
|
}
|
|
|
|
async fetchRuntimeGit(worktreeSelector: string): Promise<{ ok: true }> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
await provider.fetchRemote(target.worktree.path)
|
|
return { ok: true }
|
|
}
|
|
await gitFetch(target.worktree.path)
|
|
return { ok: true }
|
|
}
|
|
|
|
async pullRuntimeGit(worktreeSelector: string): Promise<{ ok: true }> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
await provider.pullBranch(target.worktree.path)
|
|
return { ok: true }
|
|
}
|
|
await gitPull(target.worktree.path)
|
|
return { ok: true }
|
|
}
|
|
|
|
async pushRuntimeGit(
|
|
worktreeSelector: string,
|
|
publish?: boolean,
|
|
pushTarget?: GitPushTarget,
|
|
forceWithLease?: boolean
|
|
): Promise<{ ok: true }> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
await provider.pushBranch(target.worktree.path, publish === true, pushTarget, {
|
|
forceWithLease: forceWithLease === true
|
|
})
|
|
return { ok: true }
|
|
}
|
|
await gitPush(target.worktree.path, publish === true, pushTarget, {
|
|
forceWithLease: forceWithLease === true
|
|
})
|
|
return { ok: true }
|
|
}
|
|
|
|
async getRuntimeGitBranchDiff(
|
|
worktreeSelector: string,
|
|
compare: { mergeBase: string; headOid: string },
|
|
filePath: string,
|
|
oldPath?: string
|
|
): Promise<GitDiffResult> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const relativePath = normalizeRuntimeGitRelativePath(filePath)
|
|
const oldRelativePath = oldPath ? normalizeRuntimeGitRelativePath(oldPath) : undefined
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
const results = await provider.getBranchDiff(target.worktree.path, compare.mergeBase, {
|
|
includePatch: true,
|
|
filePath: relativePath,
|
|
oldPath: oldRelativePath
|
|
})
|
|
return (
|
|
results[0] ?? {
|
|
kind: 'text',
|
|
originalContent: '',
|
|
modifiedContent: '',
|
|
originalIsBinary: false,
|
|
modifiedIsBinary: false
|
|
}
|
|
)
|
|
}
|
|
return getBranchDiff(target.worktree.path, {
|
|
mergeBase: compare.mergeBase,
|
|
headOid: compare.headOid,
|
|
filePath: relativePath,
|
|
oldPath: oldRelativePath
|
|
})
|
|
}
|
|
|
|
async getRuntimeGitCommitDiff(
|
|
worktreeSelector: string,
|
|
args: { commitOid: string; parentOid?: string | null; filePath: string; oldPath?: string }
|
|
): Promise<GitDiffResult> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const relativePath = normalizeRuntimeRelativePath(args.filePath)
|
|
const oldRelativePath = args.oldPath ? normalizeRuntimeRelativePath(args.oldPath) : undefined
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
return provider.getCommitDiff(target.worktree.path, {
|
|
commitOid: args.commitOid,
|
|
parentOid: args.parentOid,
|
|
filePath: relativePath,
|
|
oldPath: oldRelativePath
|
|
})
|
|
}
|
|
return getCommitDiff(target.worktree.path, {
|
|
commitOid: args.commitOid,
|
|
parentOid: args.parentOid,
|
|
filePath: relativePath,
|
|
oldPath: oldRelativePath
|
|
})
|
|
}
|
|
|
|
async commitRuntimeGit(
|
|
worktreeSelector: string,
|
|
message: string
|
|
): Promise<{ success: boolean; error?: string }> {
|
|
if (message.trim().length === 0) {
|
|
throw new Error('Commit message is required')
|
|
}
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
return provider.commit(target.worktree.path, message)
|
|
}
|
|
return commitChanges(target.worktree.path, message)
|
|
}
|
|
|
|
async generateRuntimeCommitMessage(
|
|
worktreeSelector: string,
|
|
settingsOverride?: RuntimeCommitMessageSettingsOverride
|
|
): Promise<GenerateCommitMessageResult> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const discoveryHostKey =
|
|
settingsOverride?.commitMessageDiscoveryHostKey ??
|
|
getCommitMessageModelDiscoveryHostKey(target.connectionId ?? null)
|
|
const resolvedSettings = resolveCommitMessageSettings(
|
|
{
|
|
...this.host.getRuntimeSettings(),
|
|
...settingsOverride
|
|
},
|
|
discoveryHostKey
|
|
)
|
|
if (!resolvedSettings.ok) {
|
|
return { success: false, error: resolvedSettings.error }
|
|
}
|
|
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
return {
|
|
success: false,
|
|
error: SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE
|
|
}
|
|
}
|
|
let context: CommitMessageDraftContext | null
|
|
try {
|
|
context = await provider.getStagedCommitContext(target.worktree.path)
|
|
} catch (error) {
|
|
console.error('[runtime-git] Failed to read remote staged commit context:', error)
|
|
return { success: false, error: 'Failed to read staged changes.' }
|
|
}
|
|
if (!context) {
|
|
return { success: false, error: 'No staged changes to summarize.' }
|
|
}
|
|
return generateCommitMessageFromContext(context, resolvedSettings.params, {
|
|
kind: 'remote',
|
|
cwd: target.worktree.path,
|
|
execute: (plan, cwd, timeoutMs) => provider.executeCommitMessagePlan(plan, cwd, timeoutMs),
|
|
missingBinaryLocation: 'remote PATH'
|
|
})
|
|
}
|
|
|
|
let context: CommitMessageDraftContext | null
|
|
try {
|
|
context = await getStagedCommitContext(target.worktree.path)
|
|
} catch (error) {
|
|
console.error('[runtime-git] Failed to read staged commit context:', error)
|
|
return { success: false, error: 'Failed to read staged changes.' }
|
|
}
|
|
if (!context) {
|
|
return { success: false, error: 'No staged changes to summarize.' }
|
|
}
|
|
const localEnv = await prepareLocalCommitMessageAgentEnv(
|
|
resolvedSettings.params.agentId,
|
|
this.host.getCommitMessageAgentEnvironment?.()
|
|
)
|
|
if (!localEnv.ok) {
|
|
return { success: false, error: localEnv.error }
|
|
}
|
|
return generateCommitMessageFromContext(context, resolvedSettings.params, {
|
|
kind: 'local',
|
|
cwd: target.worktree.path,
|
|
...(localEnv.env ? { env: localEnv.env } : {})
|
|
})
|
|
}
|
|
|
|
async cancelRuntimeGenerateCommitMessage(worktreeSelector: string): Promise<{ ok: true }> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
await provider?.cancelGenerateCommitMessage(target.worktree.path)
|
|
return { ok: true }
|
|
}
|
|
cancelGenerateCommitMessageLocal(target.worktree.path)
|
|
return { ok: true }
|
|
}
|
|
|
|
async generateRuntimePullRequestFields(
|
|
worktreeSelector: string,
|
|
input: { base: string; title: string; body: string; draft: boolean },
|
|
settingsOverride?: RuntimeCommitMessageSettingsOverride
|
|
): Promise<GeneratePullRequestFieldsResult> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const discoveryHostKey =
|
|
settingsOverride?.commitMessageDiscoveryHostKey ??
|
|
getCommitMessageModelDiscoveryHostKey(target.connectionId ?? null)
|
|
const resolvedSettings = resolveCommitMessageSettings(
|
|
{
|
|
...this.host.getRuntimeSettings(),
|
|
...settingsOverride
|
|
},
|
|
discoveryHostKey
|
|
)
|
|
if (!resolvedSettings.ok) {
|
|
return { success: false, error: resolvedSettings.error }
|
|
}
|
|
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId && !provider) {
|
|
return {
|
|
success: false,
|
|
error: SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE
|
|
}
|
|
}
|
|
let context: Awaited<ReturnType<typeof getPullRequestDraftContext>>
|
|
try {
|
|
context = target.connectionId
|
|
? await getPullRequestDraftContext((argv) => provider!.exec(argv, target.worktree.path), {
|
|
base: input.base,
|
|
currentTitle: input.title,
|
|
currentBody: input.body,
|
|
currentDraft: input.draft
|
|
})
|
|
: await getPullRequestDraftContext(
|
|
(argv, options) => gitExecFileAsync(argv, { cwd: target.worktree.path, ...options }),
|
|
{
|
|
base: input.base,
|
|
currentTitle: input.title,
|
|
currentBody: input.body,
|
|
currentDraft: input.draft
|
|
}
|
|
)
|
|
} catch (error) {
|
|
return {
|
|
success: false,
|
|
error: error instanceof Error ? error.message : 'Failed to prepare branch for PR details.'
|
|
}
|
|
}
|
|
if (!context) {
|
|
return { success: false, error: 'No branch changes to summarize.' }
|
|
}
|
|
|
|
if (target.connectionId) {
|
|
return generatePullRequestFieldsFromContext(context, resolvedSettings.params, {
|
|
kind: 'remote',
|
|
cwd: target.worktree.path,
|
|
execute: (plan, cwd, timeoutMs) => provider!.executeCommitMessagePlan(plan, cwd, timeoutMs),
|
|
missingBinaryLocation: 'remote PATH'
|
|
})
|
|
}
|
|
|
|
const localEnv = await prepareLocalCommitMessageAgentEnv(
|
|
resolvedSettings.params.agentId,
|
|
this.host.getCommitMessageAgentEnvironment?.()
|
|
)
|
|
if (!localEnv.ok) {
|
|
return { success: false, error: localEnv.error }
|
|
}
|
|
return generatePullRequestFieldsFromContext(context, resolvedSettings.params, {
|
|
kind: 'local',
|
|
cwd: target.worktree.path,
|
|
...(localEnv.env ? { env: localEnv.env } : {})
|
|
})
|
|
}
|
|
|
|
async cancelRuntimeGeneratePullRequestFields(worktreeSelector: string): Promise<{ ok: true }> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
await provider?.cancelGenerateCommitMessage(target.worktree.path)
|
|
return { ok: true }
|
|
}
|
|
cancelGeneratePullRequestFieldsLocal(target.worktree.path)
|
|
return { ok: true }
|
|
}
|
|
|
|
async discoverRuntimeCommitMessageModels(
|
|
worktreeSelector: string,
|
|
agentId: string,
|
|
settingsOverride?: Pick<RuntimeCommitMessageSettingsOverride, 'agentCmdOverrides'>
|
|
): Promise<DiscoverCommitMessageModelsResult> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const typedAgentId = agentId as TuiAgent
|
|
const agentCommandOverride =
|
|
settingsOverride?.agentCmdOverrides?.[typedAgentId] ??
|
|
this.host.getRuntimeSettings().agentCmdOverrides?.[typedAgentId]
|
|
if (target.connectionId) {
|
|
const provider = getSshGitProvider(target.connectionId)
|
|
if (!provider) {
|
|
return {
|
|
success: false,
|
|
error: `No git provider for connection "${target.connectionId}"`
|
|
}
|
|
}
|
|
return discoverCommitMessageModelsRemote(
|
|
typedAgentId,
|
|
target.worktree.path,
|
|
(plan, cwd, timeoutMs) => provider.executeCommitMessagePlan(plan, cwd, timeoutMs),
|
|
agentCommandOverride
|
|
)
|
|
}
|
|
const localEnv = await prepareLocalCommitMessageAgentEnv(
|
|
typedAgentId,
|
|
this.host.getCommitMessageAgentEnvironment?.()
|
|
)
|
|
if (!localEnv.ok) {
|
|
return { success: false, error: localEnv.error }
|
|
}
|
|
return discoverCommitMessageModelsLocal(typedAgentId, localEnv.env, agentCommandOverride)
|
|
}
|
|
|
|
async stageRuntimeGitPath(worktreeSelector: string, filePath: string): Promise<{ ok: true }> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const relativePath = normalizeRuntimeGitRelativePath(filePath)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
await provider.stageFile(target.worktree.path, relativePath)
|
|
return { ok: true }
|
|
}
|
|
await stageFile(target.worktree.path, relativePath)
|
|
return { ok: true }
|
|
}
|
|
|
|
async unstageRuntimeGitPath(worktreeSelector: string, filePath: string): Promise<{ ok: true }> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const relativePath = normalizeRuntimeGitRelativePath(filePath)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
await provider.unstageFile(target.worktree.path, relativePath)
|
|
return { ok: true }
|
|
}
|
|
await unstageFile(target.worktree.path, relativePath)
|
|
return { ok: true }
|
|
}
|
|
|
|
async bulkStageRuntimeGitPaths(
|
|
worktreeSelector: string,
|
|
filePaths: string[]
|
|
): Promise<{ ok: true }> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const relativePaths = filePaths.map((path) => normalizeRuntimeGitRelativePath(path))
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
await provider.bulkStageFiles(target.worktree.path, relativePaths)
|
|
return { ok: true }
|
|
}
|
|
await bulkStageFiles(target.worktree.path, relativePaths)
|
|
return { ok: true }
|
|
}
|
|
|
|
async bulkUnstageRuntimeGitPaths(
|
|
worktreeSelector: string,
|
|
filePaths: string[]
|
|
): Promise<{ ok: true }> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const relativePaths = filePaths.map((path) => normalizeRuntimeGitRelativePath(path))
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
await provider.bulkUnstageFiles(target.worktree.path, relativePaths)
|
|
return { ok: true }
|
|
}
|
|
await bulkUnstageFiles(target.worktree.path, relativePaths)
|
|
return { ok: true }
|
|
}
|
|
|
|
async bulkDiscardRuntimeGitPaths(
|
|
worktreeSelector: string,
|
|
filePaths: string[]
|
|
): Promise<{ ok: true }> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const relativePaths = filePaths.map((path) => normalizeRuntimeGitRelativePath(path))
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
await provider.bulkDiscardChanges(target.worktree.path, relativePaths)
|
|
return { ok: true }
|
|
}
|
|
await bulkDiscardChanges(target.worktree.path, relativePaths)
|
|
return { ok: true }
|
|
}
|
|
|
|
async discardRuntimeGitPath(worktreeSelector: string, filePath: string): Promise<{ ok: true }> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const relativePath = normalizeRuntimeGitRelativePath(filePath)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
await provider.discardChanges(target.worktree.path, relativePath)
|
|
return { ok: true }
|
|
}
|
|
await discardChanges(target.worktree.path, relativePath)
|
|
return { ok: true }
|
|
}
|
|
|
|
async getRuntimeGitRemoteFileUrl(
|
|
worktreeSelector: string,
|
|
relativePath: string,
|
|
line: number
|
|
): Promise<string | null> {
|
|
const target = await this.host.resolveRuntimeGitTarget(worktreeSelector)
|
|
const normalizedRelativePath = normalizeRuntimeGitRelativePath(relativePath)
|
|
const provider = target.connectionId ? getSshGitProvider(target.connectionId) : null
|
|
if (target.connectionId) {
|
|
if (!provider) {
|
|
throw new Error(SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE)
|
|
}
|
|
return provider.getRemoteFileUrl(target.worktree.path, normalizedRelativePath, line)
|
|
}
|
|
return getRemoteFileUrl(target.worktree.path, normalizedRelativePath, line)
|
|
}
|
|
}
|