Files
archived-orca/src/shared/rpc-contract/git-params.ts
T
Brennan Benson d857e09615 Git Graph: commit actions (checkout, cherry-pick, revert) (#39069)
Adds commit actions to the Git Graph: check out a commit or branch, cherry-pick, revert, and create a branch from a commit. Conflicts hand off to Source Control with continue and abort. Works on local, WSL and remote hosts.
2026-11-08 03:43:30 -08:00

299 lines
9.7 KiB
TypeScript

import { isGitHistoryRefName } from '../git/history/git-history-revisions'
import { normalizeSourceControlAiActionDefaults } from '../source-control/ai/recipes/source-control-ai-actions'
import { z } from 'zod'
import { OptionalGitAdmissionTier } from './git-admission-tier-params'
import { OptionalTuiAgent } from './worktree-params'
import { CONFLICT_RESOLUTIONS } from '../source-control/listing/source-control-entry-actions'
export const WorktreeSelector = z.object({
worktree: z
.unknown()
.transform((v) => (typeof v === 'string' ? v : ''))
.pipe(z.string().min(1, 'Missing worktree selector'))
})
export const GitStatusParams = WorktreeSelector.extend({
admissionTier: OptionalGitAdmissionTier,
includeIgnored: z.boolean().optional(),
includeLineStats: z.boolean().optional(),
bypassEffectiveUpstreamNegativeCache: z.boolean().optional(),
reuseLineStats: z.boolean().optional(),
// Shape is re-validated host-side before it reaches a git argv.
branchLineTotalMergeBase: z.string().optional()
})
export const GitCheckIgnored = WorktreeSelector.extend({
paths: z.array(z.string().min(1, 'Missing path')).max(2000)
})
export const GitSubmoduleStatus = WorktreeSelector.extend({
submodulePath: z
.unknown()
.transform((v) => (typeof v === 'string' ? v : ''))
.pipe(
z
.string()
.min(1, 'Missing submodule path')
// Why: never let a submodule path be parsed as a git flag (arg injection).
.refine((value) => !value.startsWith('-'), 'Submodule path must not start with -')
),
// The Source Control row selects HEAD→index versus index→worktree gitlink ranges.
area: z.enum(['staged', 'unstaged', 'untracked']).optional()
})
export const GitFilePath = WorktreeSelector.extend({
filePath: z
.unknown()
.transform((v) => (typeof v === 'string' ? v : ''))
.pipe(z.string().min(1, 'Missing file path'))
})
export const GitResolveConflict = GitFilePath.extend({
resolution: z.enum(CONFLICT_RESOLUTIONS)
})
export const GitDiff = GitFilePath.extend({
staged: z.boolean(),
compareAgainstHead: z.boolean().optional(),
oldPath: z.string().optional()
})
export const GitBranchCompare = WorktreeSelector.extend({
admissionTier: OptionalGitAdmissionTier,
baseRef: z
.unknown()
.transform((v) => (typeof v === 'string' ? v : ''))
.pipe(
z
.string()
.min(1, 'Missing base ref')
.refine((value) => !value.startsWith('-'), 'Base ref must not start with -')
)
})
export const FullGitObjectId = z
.string()
.regex(/^(?:[0-9a-fA-F]{40}|[0-9a-fA-F]{64})$/, 'Expected a full git object id')
export const GitCommitCompare = WorktreeSelector.extend({
commitId: z
.unknown()
.transform((v) => (typeof v === 'string' ? v : ''))
.pipe(FullGitObjectId)
})
export const GitSequencer = WorktreeSelector.extend({
operation: z.enum(['cherry-pick', 'revert'])
})
export const GitCreateBranch = WorktreeSelector.extend({
name: z.string().min(1),
startPoint: FullGitObjectId
})
export const GitCommitAction = WorktreeSelector.extend({ commitId: FullGitObjectId })
export const GitHistoryRefName = z
.string()
.refine(isGitHistoryRefName, 'Expected full branch or tag ref names')
export const GitRefs = WorktreeSelector.extend({ query: z.string().max(1000).optional() })
export const GitHistory = WorktreeSelector.extend({
limit: z.number().int().min(1).max(200).optional(),
baseRef: z.string().nullable().optional(),
branchOnly: z.boolean().optional(),
refs: z
.union([z.literal('head'), z.literal('all'), z.array(GitHistoryRefName).max(1000)])
.optional(),
historyToken: z.string().max(100).optional(),
skip: z.number().int().min(0).optional()
})
export const GitBranchDiff = GitFilePath.extend({
compare: z.object({
baseRef: z.string().optional(),
baseOid: FullGitObjectId.optional(),
headOid: FullGitObjectId,
mergeBase: FullGitObjectId
}),
oldPath: z.string().optional()
})
export const GitCommitDiff = GitFilePath.extend({
commitOid: FullGitObjectId,
parentOid: FullGitObjectId.nullable().optional(),
oldPath: z.string().optional()
})
export const GitCommit = WorktreeSelector.extend({
message: z
.unknown()
.transform((v) => (typeof v === 'string' ? v : ''))
.pipe(z.string().min(1, 'Missing commit message'))
})
export const CommitMessageModelCapability = z.object({
id: z.string(),
label: z.string(),
thinkingLevels: z.array(z.object({ id: z.string(), label: z.string() })).optional(),
defaultThinkingLevel: z.string().optional()
})
export const CommitMessageAiSettings = z.object({
enabled: z.boolean(),
agentId: z.string().nullable(),
selectedModelByAgent: z.record(z.string(), z.string()),
selectedModelByAgentByHost: z.record(z.string(), z.record(z.string(), z.string())).optional(),
discoveredModelsByAgent: z.record(z.string(), z.array(CommitMessageModelCapability)).optional(),
discoveredModelsByAgentByHost: z
.record(z.string(), z.record(z.string(), z.array(CommitMessageModelCapability)))
.optional(),
selectedThinkingByModel: z.record(z.string(), z.string()),
customPrompt: z.string(),
customAgentCommand: z.string()
})
export const SourceControlAiSettings = CommitMessageAiSettings.omit({ customPrompt: true }).extend({
actions: z.unknown().optional().transform(normalizeSourceControlAiActionDefaults),
instructionsByOperation: z.record(z.string(), z.string()).optional(),
modelOverridesByOperation: z
.record(
z.string(),
z.object({
selectedModelByAgent: z.record(z.string(), z.string()).optional(),
selectedModelByAgentByHost: z
.record(z.string(), z.record(z.string(), z.string()))
.optional(),
selectedThinkingByModel: z.record(z.string(), z.string()).optional()
})
)
.optional(),
prCreationDefaults: z
.object({
draft: z.boolean().optional(),
useTemplate: z.boolean().optional(),
generateDetailsOnOpen: z.boolean().optional(),
openAfterCreate: z.boolean().optional()
})
.optional(),
launchActionDefaults: z.unknown().optional().transform(normalizeSourceControlAiActionDefaults)
})
export const ResolvedSourceControlAiGenerationParams = z.object({
agentId: z.string(),
model: z.string(),
thinkingLevel: z.string().optional(),
customPrompt: z.string().optional(),
commandInputTemplate: z.string().optional(),
agentArgs: z.string().optional(),
customAgentCommand: z.string().optional(),
agentCommandOverride: z.string().optional()
})
export const GitGenerateCommitMessage = WorktreeSelector.extend({
commitMessageAi: CommitMessageAiSettings.optional(),
sourceControlAi: SourceControlAiSettings.optional(),
sourceControlAiResolvedParams: ResolvedSourceControlAiGenerationParams.optional(),
agentCmdOverrides: z.record(z.string(), z.string()).optional(),
defaultTuiAgent: OptionalTuiAgent.nullable(),
commitMessageDiscoveryHostKey: z.string().optional()
})
export const GitDiscoverCommitMessageModels = WorktreeSelector.extend({
agentId: z.string().min(1, 'Missing agent id'),
agentCmdOverrides: z.record(z.string(), z.string()).optional()
})
export const GitGeneratePullRequestFields = GitGenerateCommitMessage.extend({
base: z.string().min(1, 'Missing base branch'),
title: z.string(),
body: z.string(),
draft: z.boolean(),
provider: z
.enum(['github', 'gitlab', 'bitbucket', 'azure-devops', 'gitea', 'unsupported'])
.optional(),
useTemplate: z.boolean().optional()
})
export const GitBulkPaths = WorktreeSelector.extend({
filePaths: z.array(z.string().min(1, 'Missing file path'))
})
// Why: optional so older hosts strip it and stage the listed `filePaths` instead.
export const GitBulkStage = GitBulkPaths.extend({
scope: z.enum(['all', 'tracked']).optional()
})
export const GitPushTargetParam = z.object({
remoteName: z.string(),
branchName: z.string(),
remoteUrl: z.string().optional(),
remoteCreated: z.boolean().optional()
})
export const GitPush = WorktreeSelector.extend({
publish: z.boolean().optional(),
forceWithLease: z.boolean().optional(),
pushTarget: GitPushTargetParam.optional()
})
export const GitTargetedRemote = WorktreeSelector.extend({
pushTarget: GitPushTargetParam.optional()
})
export const GitForkSync = WorktreeSelector.extend({
expectedUpstream: z.object({
owner: z.string().trim().min(1),
repo: z.string().trim().min(1)
})
})
export const GitRebaseFromBase = WorktreeSelector.extend({
baseRef: z
.unknown()
.transform((v) => (typeof v === 'string' ? v : ''))
.pipe(
z
.string()
.min(1, 'Missing base ref')
.refine((value) => !value.startsWith('-'), 'Base ref must not start with -')
)
})
export const GitSwitchBranch = WorktreeSelector.extend({
target: z.object({ kind: z.enum(['local', 'remote', 'new']), name: z.string().min(1) })
})
export const GitCheckout = WorktreeSelector.extend({
detached: z.boolean().optional(),
branch: z
.unknown()
.transform((v) => (typeof v === 'string' ? v : ''))
.pipe(
z
.string()
.min(1, 'Missing branch')
// Why: never let a branch arg be parsed as a git flag (arg injection).
.refine((value) => !value.startsWith('-'), 'Branch must not start with -')
)
}).refine(
(params) => !params.detached || FullGitObjectId.safeParse(params.branch).success,
'Expected a full git object id for detached checkout'
)
export const GitRemoteFileUrl = WorktreeSelector.extend({
relativePath: z
.unknown()
.transform((v) => (typeof v === 'string' ? v : ''))
.pipe(z.string().min(1, 'Missing relative path')),
line: z.number().int().min(1),
endLine: z.number().int().min(1).optional()
})
export const GitRemoteCommitUrl = WorktreeSelector.extend({
sha: z
.unknown()
.transform((v) => (typeof v === 'string' ? v : ''))
.pipe(FullGitObjectId)
})