@vibe-forge/client 0.11.0 → 0.11.2

package/src/components/chat/git-controls/GitPushModal.tsx

@@ -0,0 +1,106 @@
+import { Button, Modal } from 'antd'
+import { useTranslation } from 'react-i18next'
+
+import { GitCommitToggleRow } from './GitCommitModalParts'
+
+export function GitPushModal({
+  blockedMessage,
+  currentBranchLabel,
+  forcePush,
+  hasUpstream,
+  open,
+  pending,
+  upstreamLabel,
+  onCancel,
+  onPush,
+  onToggleForcePush
+}: {
+  blockedMessage: string
+  currentBranchLabel: string
+  forcePush: boolean
+  hasUpstream: boolean
+  open: boolean
+  pending: boolean
+  upstreamLabel: string
+  onCancel: () => void
+  onPush: () => void
+  onToggleForcePush: (checked: boolean) => void
+}) {
+  const { t } = useTranslation()
+
+  return (
+    <Modal
+      centered
+      className='chat-header-git__commit-modal'
+      closeIcon={<span className='material-symbols-rounded'>close</span>}
+      destroyOnHidden
+      footer={null}
+      open={open}
+      title={null}
+      width={456}
+      onCancel={onCancel}
+    >
+      <div className='chat-header-git__commit-sheet'>
+        <div className='chat-header-git__commit-icon'>
+          <span className='material-symbols-rounded'>upload</span>
+        </div>
+        <div className='chat-header-git__commit-title'>
+          {t('chat.gitPushPanelTitle')}
+        </div>
+
+        <div className='chat-header-git__commit-summary-grid'>
+          <div className='chat-header-git__commit-summary-label'>{t('chat.gitCommitPanelBranch')}</div>
+          <div className='chat-header-git__commit-summary-value chat-header-git__commit-summary-value--branch'>
+            <span className='material-symbols-rounded'>call_split</span>
+            <span>{currentBranchLabel}</span>
+          </div>
+
+          <div className='chat-header-git__commit-summary-label'>{t('chat.gitPushPanelUpstream')}</div>
+          <div className='chat-header-git__commit-summary-value chat-header-git__commit-summary-value--branch'>
+            <span className='material-symbols-rounded'>cloud_upload</span>
+            <span>{upstreamLabel}</span>
+          </div>
+        </div>
+
+        {!hasUpstream && (
+          <div className='chat-header-git__overlay-meta'>
+            {t('chat.gitPushPanelUpstreamHint')}
+          </div>
+        )}
+
+        <div className='chat-header-git__commit-toggles'>
+          <GitCommitToggleRow
+            checked={forcePush}
+            description={t('chat.gitForcePushDescription')}
+            disabled={pending}
+            title={t('chat.gitForcePush')}
+            onChange={onToggleForcePush}
+          />
+        </div>
+
+        {forcePush && (
+          <div className='chat-header-git__overlay-meta'>
+            {t('chat.gitForcePushHint')}
+          </div>
+        )}
+        {blockedMessage !== '' && (
+          <div className='chat-header-git__overlay-meta'>
+            {blockedMessage}
+          </div>
+        )}
+
+        <div className='chat-header-git__commit-footer'>
+          <Button
+            className='chat-header-git__commit-submit'
+            disabled={blockedMessage !== ''}
+            loading={pending}
+            type='primary'
+            onClick={onPush}
+          >
+            {t('common.continue')}
+          </Button>
+        </div>
+      </div>
+    </Modal>
+  )
+}

package/src/components/chat/git-controls/GitWorktreeDropdown.tsx

@@ -0,0 +1,68 @@
+import { Button, Dropdown } from 'antd'
+import { useTranslation } from 'react-i18next'
+
+import type { GitWorktreeSummary } from '@vibe-forge/types'
+
+import { formatGitWorktreePathLabel } from './git-branch-utils'
+
+export function GitWorktreeDropdown({
+  open,
+  worktrees,
+  onOpenChange
+}: {
+  open: boolean
+  worktrees: GitWorktreeSummary[]
+  onOpenChange: (open: boolean) => void
+}) {
+  const { t } = useTranslation()
+
+  return (
+    <Dropdown
+      open={open}
+      placement='bottomLeft'
+      trigger={['click']}
+      onOpenChange={onOpenChange}
+      dropdownRender={() => (
+        <div className='chat-header-git__overlay chat-header-git__overlay--worktrees'>
+          <div className='chat-header-git__worktree-list'>
+            {worktrees.map(worktree => (
+              <div
+                key={worktree.path}
+                className='chat-header-git__worktree-row'
+                title={worktree.path}
+              >
+                <div className='chat-header-git__branch-row-main'>
+                  <span className='chat-header-git__row-icon material-symbols-rounded'>folder_open</span>
+                  <span className='chat-header-git__row-copy'>
+                    <span className='chat-header-git__row-title'>
+                      {formatGitWorktreePathLabel(worktree.path)}
+                    </span>
+                    <span className='chat-header-git__row-subtitle'>
+                      {worktree.branchName?.trim() || t('chat.gitDetachedHead')}
+                    </span>
+                  </span>
+                </div>
+                {worktree.isCurrent && (
+                  <span className='chat-header-git__row-state material-symbols-rounded'>check</span>
+                )}
+              </div>
+            ))}
+          </div>
+        </div>
+      )}
+    >
+      <Button
+        type='text'
+        className={`chat-header-git__trigger ${open ? 'is-open' : ''}`}
+        title={t('chat.gitWorktree')}
+        aria-label={t('chat.gitWorktree')}
+      >
+        <span className='chat-header-git__trigger-main'>
+          <span className='material-symbols-rounded'>account_tree</span>
+          <span className='chat-header-git__trigger-label'>{t('chat.gitWorktree')}</span>
+        </span>
+        <span className='chat-header-git__trigger-chevron material-symbols-rounded'>expand_more</span>
+      </Button>
+    </Dropdown>
+  )
+}

package/src/components/chat/git-controls/git-branch-utils.ts

@@ -0,0 +1,88 @@
+import type { GitBranchSummary } from '@vibe-forge/types'
+
+const normalizeBranchText = (value: string) => value.trim().toLowerCase()
+const normalizeWorktreePath = (value: string) => value.trim().replace(/[/\\]+$/, '').replace(/\\/g, '/')
+
+export const formatGitWorktreePathLabel = (value: string) => {
+  const segments = normalizeWorktreePath(value).split('/').filter(Boolean)
+  if (segments.length >= 2) {
+    return segments.slice(-2).join('/')
+  }
+  return segments[0] ?? value.trim()
+}
+
+export const isGitBranchCheckedOutInOtherWorktree = (
+  branch: GitBranchSummary,
+  currentWorktreePath: string
+) => {
+  if (branch.kind !== 'local' || branch.worktreePath == null || branch.worktreePath.trim() === '') {
+    return false
+  }
+
+  return normalizeWorktreePath(branch.worktreePath) !== normalizeWorktreePath(currentWorktreePath)
+}
+
+export const getGitBranchCheckoutBlockedPath = (
+  branch: GitBranchSummary,
+  branches: GitBranchSummary[],
+  currentWorktreePath: string
+) => {
+  if (branch.kind === 'local') {
+    return isGitBranchCheckedOutInOtherWorktree(branch, currentWorktreePath)
+      ? branch.worktreePath?.trim() ?? null
+      : null
+  }
+
+  const localPeer = branches.find(item => item.kind === 'local' && item.localName === branch.localName)
+  if (localPeer == null) {
+    return null
+  }
+
+  return isGitBranchCheckedOutInOtherWorktree(localPeer, currentWorktreePath)
+    ? localPeer.worktreePath?.trim() ?? null
+    : null
+}
+
+export const getGitBranchViewState = (
+  visibleBranches: GitBranchSummary[],
+  allBranches: GitBranchSummary[],
+  currentWorktreePath: string
+) => {
+  const localBranches = visibleBranches.filter(branch => branch.kind === 'local')
+  const isSwitchableBranch = (branch: GitBranchSummary) =>
+    getGitBranchCheckoutBlockedPath(branch, allBranches, currentWorktreePath) == null
+  const availableLocalBranches = localBranches.filter(isSwitchableBranch)
+  const remoteBranches = visibleBranches.filter(branch => branch.kind === 'remote' && isSwitchableBranch(branch))
+
+  return {
+    availableLocalBranches,
+    hasResults: availableLocalBranches.length > 0 || remoteBranches.length > 0,
+    remoteBranches
+  }
+}
+
+const getBranchSearchTokens = (branch: GitBranchSummary) => {
+  const tokens = [branch.name, branch.localName]
+  if (branch.remoteName != null && branch.remoteName !== '') {
+    tokens.push(branch.remoteName, `${branch.remoteName}/${branch.localName}`)
+  }
+  return tokens.map(token => normalizeBranchText(token))
+}
+
+export const filterGitBranches = (branches: GitBranchSummary[], query: string) => {
+  const normalizedQuery = normalizeBranchText(query)
+  if (normalizedQuery === '') {
+    return branches
+  }
+
+  return branches.filter(branch => getBranchSearchTokens(branch).some(token => token.includes(normalizedQuery)))
+}
+
+export const hasExactGitBranchMatch = (branches: GitBranchSummary[], query: string) => {
+  const normalizedQuery = normalizeBranchText(query)
+  if (normalizedQuery === '') {
+    return false
+  }
+
+  return branches.some(branch => getBranchSearchTokens(branch).includes(normalizedQuery))
+}

package/src/components/chat/git-controls/git-commit-utils.ts

@@ -0,0 +1,79 @@
+import type { GitChangeSummary, GitRepositoryState } from '@vibe-forge/types'
+
+import { isGitOperationDisabled } from './git-operation-utils'
+
+export type GitCommitNextStep = 'commit' | 'commit-and-push'
+export type GitCommitBlockedReason =
+  | 'amend-unavailable'
+  | 'message-required'
+  | 'no-changes'
+  | 'no-staged-changes'
+  | null
+
+const EMPTY_GIT_CHANGE_SUMMARY: GitChangeSummary = {
+  changedFiles: 0,
+  additions: 0,
+  deletions: 0
+}
+
+export const getGitCommitSummary = (
+  repoState: GitRepositoryState,
+  includeUnstagedChanges: boolean
+): GitChangeSummary => {
+  return includeUnstagedChanges
+    ? repoState.workingTreeSummary ?? EMPTY_GIT_CHANGE_SUMMARY
+    : repoState.stagedSummary ?? EMPTY_GIT_CHANGE_SUMMARY
+}
+
+export const getGitCommitBlockedReason = (
+  repoState: GitRepositoryState,
+  options: {
+    includeUnstagedChanges: boolean
+    amend: boolean
+    commitMessage: string
+  }
+): GitCommitBlockedReason => {
+  const hasCommitChanges = options.includeUnstagedChanges
+    ? repoState.hasChanges === true
+    : repoState.hasStagedChanges === true
+  const hasMessage = options.commitMessage.trim() !== ''
+
+  if (options.amend && repoState.headCommit == null) {
+    return 'amend-unavailable'
+  }
+
+  if (options.amend) {
+    return hasCommitChanges || hasMessage
+      ? null
+      : options.includeUnstagedChanges
+      ? 'no-changes'
+      : 'no-staged-changes'
+  }
+
+  if (!hasCommitChanges) {
+    return options.includeUnstagedChanges
+      ? 'no-changes'
+      : 'no-staged-changes'
+  }
+
+  return hasMessage ? null : 'message-required'
+}
+
+export const canSubmitGitCommit = (
+  repoState: GitRepositoryState,
+  options: {
+    includeUnstagedChanges: boolean
+    amend: boolean
+    commitMessage: string
+  }
+) => {
+  return getGitCommitBlockedReason(repoState, options) == null
+}
+
+export const canGitCommitAndPush = (repoState: GitRepositoryState) => {
+  return !isGitOperationDisabled(repoState, 'push')
+}
+
+export const isGitCommitMessageRequired = (amend: boolean) => {
+  return !amend
+}

package/src/components/chat/git-controls/git-mutation-utils.ts

@@ -0,0 +1,69 @@
+import type { GitRepositoryState } from '@vibe-forge/types'
+
+import { pushSessionGitBranch } from '#~/api'
+
+export const runGitControlMutation = async <TAction extends string>(options: {
+  action: TAction
+  notifyError: (error: unknown) => void
+  notifySuccess: (message: string) => void
+  onSuccess?: () => void
+  refreshGitState: (nextRepo?: GitRepositoryState) => Promise<void>
+  setPendingAction: (action: TAction | null) => void
+  successMessage: string
+  task: () => Promise<{ repo: GitRepositoryState }>
+}) => {
+  const {
+    action,
+    notifyError,
+    notifySuccess,
+    onSuccess,
+    refreshGitState,
+    setPendingAction,
+    successMessage,
+    task
+  } = options
+
+  setPendingAction(action)
+  try {
+    const result = await task()
+    await refreshGitState(result.repo)
+    onSuccess?.()
+    notifySuccess(successMessage)
+  } catch (error) {
+    notifyError(error)
+  } finally {
+    setPendingAction(null)
+  }
+}
+
+export const runSessionGitPush = async (options: {
+  blockedMessage: string
+  blockedReason: string | null
+  force: boolean
+  notifyBlocked: (message: string) => void
+  onSuccess?: () => void
+  repoState: GitRepositoryState | undefined
+  runMutation: (
+    action: 'push',
+    task: () => Promise<{ repo: GitRepositoryState }>,
+    successMessage: string,
+    onSuccess?: () => void
+  ) => Promise<void>
+  sessionId: string
+  successMessage: string
+}) => {
+  if (options.repoState?.available !== true) {
+    return
+  }
+  if (options.blockedReason != null) {
+    options.notifyBlocked(options.blockedMessage)
+    return
+  }
+
+  await options.runMutation(
+    'push',
+    () => pushSessionGitBranch(options.sessionId, { force: options.force }),
+    options.successMessage,
+    options.onSuccess
+  )
+}

package/src/components/chat/git-controls/git-operation-utils.ts

@@ -0,0 +1,98 @@
+import type { GitRepositoryState } from '@vibe-forge/types'
+
+export type GitOperationKind = 'commit' | 'push' | 'sync'
+export type GitPushBlockedReason = 'behind-upstream' | 'push-unavailable' | null
+
+const hasUpstream = (repoState: GitRepositoryState) => repoState.upstream != null && repoState.upstream.trim() !== ''
+
+const hasRemote = (repoState: GitRepositoryState) => hasUpstream(repoState) || (repoState.remotes?.length ?? 0) > 0
+
+const hasBranch = (repoState: GitRepositoryState) =>
+  repoState.currentBranch != null && repoState.currentBranch.trim() !== ''
+
+export const isGitOperationDisabled = (
+  repoState: GitRepositoryState,
+  kind: GitOperationKind
+) => {
+  switch (kind) {
+    case 'commit':
+      return repoState.hasChanges !== true
+    case 'push':
+    case 'sync':
+      return !hasBranch(repoState) || !hasRemote(repoState)
+  }
+}
+
+export const getGitPushBlockedReason = (
+  repoState: GitRepositoryState,
+  forcePush: boolean
+): GitPushBlockedReason => {
+  if (isGitOperationDisabled(repoState, 'push')) {
+    return 'push-unavailable'
+  }
+
+  if ((repoState.behind ?? 0) > 0 && !forcePush) {
+    return 'behind-upstream'
+  }
+
+  return null
+}
+
+export const getGitControlState = (
+  repoState: GitRepositoryState | undefined,
+  forcePush: boolean,
+  labels: {
+    detachedHead: string
+    pushNeedsSyncOrForce: string
+    pushUnavailable: string
+  }
+) => {
+  const currentBranchName = repoState?.available === true
+    ? repoState.currentBranch?.trim() ?? ''
+    : ''
+  const currentBranchLabel = currentBranchName !== ''
+    ? currentBranchName
+    : labels.detachedHead
+  const pushBlockedReason = repoState?.available === true
+    ? getGitPushBlockedReason(repoState, forcePush)
+    : 'push-unavailable'
+
+  return {
+    currentBranchLabel,
+    pushBlockedReason,
+    pushBlockedMessage: pushBlockedReason === 'behind-upstream'
+      ? labels.pushNeedsSyncOrForce
+      : pushBlockedReason == null
+      ? ''
+      : labels.pushUnavailable
+  }
+}
+
+export const getPrimaryGitOperationKind = (
+  repoState: GitRepositoryState
+): GitOperationKind | null => {
+  if (repoState.hasChanges === true) {
+    return 'commit'
+  }
+
+  if ((repoState.behind ?? 0) > 0 && !isGitOperationDisabled(repoState, 'sync')) {
+    return 'sync'
+  }
+
+  if (
+    ((repoState.ahead ?? 0) > 0 || !hasUpstream(repoState)) &&
+    !isGitOperationDisabled(repoState, 'push')
+  ) {
+    return 'push'
+  }
+
+  if (!isGitOperationDisabled(repoState, 'sync')) {
+    return 'sync'
+  }
+
+  if (!isGitOperationDisabled(repoState, 'push')) {
+    return 'push'
+  }
+
+  return null
+}

package/src/components/chat/git-controls/git-worktree-utils.ts

@@ -0,0 +1,49 @@
+import type { GitWorktreeSummary } from '@vibe-forge/types'
+
+const sortGitWorktrees = (worktrees: GitWorktreeSummary[]) => {
+  return [...worktrees].sort((left, right) => {
+    if (left.isCurrent !== right.isCurrent) {
+      return left.isCurrent ? -1 : 1
+    }
+
+    return left.path.localeCompare(right.path)
+  })
+}
+
+const getCurrentWorktreeFallback = (repositoryRoot?: string, currentBranch?: string | null): GitWorktreeSummary[] => {
+  const path = repositoryRoot?.trim() ?? ''
+  if (path === '') {
+    return []
+  }
+
+  const branchName = currentBranch?.trim() || null
+  return [{
+    path,
+    branchName,
+    isCurrent: true,
+    isDetached: branchName == null
+  }]
+}
+
+export const getGitWorktreeViewState = (input: {
+  currentBranch?: string | null
+  enabled: boolean
+  repositoryRoot?: string
+  worktrees?: GitWorktreeSummary[]
+}) => {
+  if (!input.enabled) {
+    return {
+      showWorktreeButton: false,
+      worktrees: []
+    }
+  }
+
+  const worktrees = input.worktrees != null && input.worktrees.length > 0
+    ? sortGitWorktrees(input.worktrees)
+    : getCurrentWorktreeFallback(input.repositoryRoot, input.currentBranch)
+
+  return {
+    showWorktreeButton: true,
+    worktrees
+  }
+}