@vibe-forge/client 3.0.0-alpha.6 → 3.0.0-alpha.7

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

@@ -1,178 +0,0 @@
-import './ChatGitControls.scss'
-
-import { useTranslation } from 'react-i18next'
-
-import { syncSessionGitBranch } from '#~/api'
-
-import { BranchSwitcherDropdown } from './BranchSwitcherDropdown'
-import { GitCommitModal } from './GitCommitModal'
-import { GitOperationsDropdown } from './GitOperationsDropdown'
-import { GitPushModal } from './GitPushModal'
-import { GitWorktreeDropdown } from './GitWorktreeDropdown'
-import { useChatGitControls } from './use-chat-git-controls'
-
-export function ChatGitControls({
-  compact = false,
-  placement = 'bottomLeft',
-  sessionId
-}: {
-  compact?: boolean
-  placement?: 'bottomLeft' | 'topLeft'
-  sessionId: string
-}) {
-  const { t } = useTranslation()
-  const git = useChatGitControls(sessionId)
-
-  if (git.workspace == null && git.repoState?.available !== true) {
-    return null
-  }
-
-  return (
-    <>
-      <div className={`chat-header-git ${compact ? 'chat-header-git--compact' : ''}`.trim()}>
-        <GitWorktreeDropdown
-          compact={compact}
-          open={git.worktreeMenuOpen}
-          placement={placement}
-          workspace={git.workspace}
-          worktrees={git.worktrees}
-          currentBranch={git.repoState?.currentBranch}
-          mode={{
-            type: 'session',
-            isBusy: git.isBusy,
-            canCreateManagedWorktree: git.repoState?.available === true &&
-              git.workspace != null &&
-              git.workspace.kind !== 'managed_worktree' &&
-              (git.workspace.worktreePath == null || git.workspace.worktreePath.trim() === ''),
-            canTransferToLocal: git.workspace?.kind === 'managed_worktree',
-            onCreateManagedWorktree: git.handleCreateManagedWorktree,
-            onTransferToLocal: git.handleTransferWorkspaceToLocal
-          }}
-          onOpenChange={(nextOpen) => {
-            git.setWorktreeMenuOpen(nextOpen)
-            if (nextOpen) {
-              git.setOperationsMenuOpen(false)
-              git.setBranchMenuOpen(false)
-            }
-          }}
-        />
-
-        {git.repoState?.available === true && (
-          <>
-            <GitOperationsDropdown
-              compact={compact}
-              isBusy={git.isBusy}
-              open={git.operationsMenuOpen}
-              placement={placement}
-              repoState={git.repoState}
-              onOpenChange={(nextOpen) => {
-                git.setOperationsMenuOpen(nextOpen)
-                if (nextOpen) {
-                  git.setBranchMenuOpen(false)
-                  git.setWorktreeMenuOpen(false)
-                }
-              }}
-              onOpenCommit={() => {
-                git.setOperationsMenuOpen(false)
-                git.setCommitMessageError('')
-                git.setCommitModalOpen(true)
-              }}
-              onPush={git.handleOpenPushModal}
-              onSync={() => {
-                void git.runMutation(
-                  'sync',
-                  () => syncSessionGitBranch(sessionId),
-                  t('chat.gitSyncSuccess'),
-                  () => git.setOperationsMenuOpen(false)
-                )
-              }}
-            />
-
-            <BranchSwitcherDropdown
-              availableLocalBranches={git.availableLocalBranches}
-              compact={compact}
-              currentBranchLabel={git.currentBranchLabel}
-              isBusy={git.isBusy}
-              isLoading={git.isBranchListLoading}
-              open={git.branchMenuOpen}
-              placement={placement}
-              repoState={git.repoState}
-              branchQuery={git.branchQuery}
-              canCreateBranch={git.canCreateBranch}
-              hasBranchResults={git.hasBranchResults}
-              remoteBranches={git.remoteBranches}
-              onCreateBranch={git.handleCreateBranch}
-              onOpenChange={(nextOpen) => {
-                git.setBranchMenuOpen(nextOpen)
-                if (nextOpen) {
-                  git.setOperationsMenuOpen(false)
-                  git.setWorktreeMenuOpen(false)
-                  git.setShouldLoadBranches(true)
-                  return
-                }
-                git.setBranchQuery('')
-              }}
-              onQueryChange={git.setBranchQuery}
-              onSwitchBranch={git.handleBranchSwitch}
-            />
-          </>
-        )}
-      </div>
-
-      {git.repoState?.available === true && (
-        <>
-          <GitCommitModal
-            canCommitAndPush={git.canCommitAndPush}
-            canSubmit={git.canSubmitCommit}
-            commitAmend={git.commitAmend}
-            commitBlockedMessage={git.commitBlockedMessage}
-            commitForcePush={git.commitForcePush}
-            commitIncludeUnstagedChanges={git.commitIncludeUnstagedChanges}
-            commitMessage={git.commitMessage}
-            commitMessageError={git.commitMessageError}
-            commitNextStep={git.commitNextStep}
-            commitSkipHooks={git.commitSkipHooks}
-            commitSummary={git.commitSummary}
-            currentBranchLabel={git.currentBranchLabel}
-            headCommit={git.repoState.headCommit ?? null}
-            open={git.commitModalOpen}
-            pending={git.pendingAction === 'commit' || git.pendingAction === 'commit-and-push'}
-            onCancel={git.resetCommitState}
-            onCommit={git.handleCommit}
-            onNextStepChange={git.setCommitNextStep}
-            onToggleAmend={(checked) => {
-              git.setCommitAmend(checked)
-              if (git.commitMessageError !== '') {
-                git.setCommitMessageError('')
-              }
-            }}
-            onToggleForcePush={git.setCommitForcePush}
-            onToggleIncludeUnstagedChanges={(checked) => {
-              git.setCommitIncludeUnstagedChanges(checked)
-            }}
-            onToggleSkipHooks={git.setCommitSkipHooks}
-            onMessageChange={(value) => {
-              git.setCommitMessage(value)
-              if (git.commitMessageError !== '') {
-                git.setCommitMessageError('')
-              }
-            }}
-          />
-
-          <GitPushModal
-            blockedMessage={git.pushBlockedMessage}
-            currentBranchLabel={git.currentBranchLabel}
-            forcePush={git.pushForce}
-            hasUpstream={git.repoState.upstream != null && git.repoState.upstream.trim() !== ''}
-            open={git.pushModalOpen}
-            pending={git.pendingAction === 'push'}
-            upstreamLabel={git.repoState.upstream?.trim() || t('chat.gitNoUpstream')}
-            onCancel={git.resetPushState}
-            onPush={git.handlePush}
-            onToggleForcePush={git.setPushForce}
-          />
-        </>
-      )}
-    </>
-  )
-}

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

@@ -1,105 +0,0 @@
-import './ChatGitControls.scss'
-
-import { useTranslation } from 'react-i18next'
-
-import type { ChatSessionWorkspaceDraft } from '#~/hooks/chat/chat-session-workspace-draft'
-
-import { BranchSwitcherDropdown } from './BranchSwitcherDropdown'
-import { DraftWorktreeEnvironmentDropdown } from './DraftWorktreeEnvironmentDropdown'
-import { GitWorktreeDropdown } from './GitWorktreeDropdown'
-import { useChatDraftGitControls } from './use-chat-draft-git-controls'
-
-export function DraftGitControls({
-  compact = false,
-  disabled = false,
-  draft,
-  placement = 'topLeft',
-  onChange
-}: {
-  compact?: boolean
-  disabled?: boolean
-  draft: ChatSessionWorkspaceDraft
-  placement?: 'bottomLeft' | 'topLeft'
-  onChange: (nextDraft: ChatSessionWorkspaceDraft) => void
-}) {
-  const { t } = useTranslation()
-  const git = useChatDraftGitControls({
-    draft,
-    onChange
-  })
-
-  return (
-    <div className={`chat-draft-git ${compact ? 'chat-draft-git--compact' : ''}`.trim()}>
-      {git.repoState.available
-        ? (
-          <div className='chat-header-git chat-draft-git__controls'>
-            <GitWorktreeDropdown
-              compact={compact}
-              currentBranch={git.repoState.currentBranch}
-              open={git.worktreeMenuOpen}
-              placement={placement}
-              mode={{
-                type: 'draft',
-                createWorktree: draft.createWorktree,
-                disabled,
-                onCreateWorktreeChange: git.handleCreateWorktreeChange
-              }}
-              worktrees={git.worktrees}
-              onOpenChange={(nextOpen) => {
-                git.setWorktreeMenuOpen(nextOpen)
-                if (nextOpen) {
-                  git.setBranchMenuOpen(false)
-                }
-              }}
-            />
-
-            <DraftWorktreeEnvironmentDropdown
-              compact={compact}
-              disabled={disabled}
-              placement={placement}
-              value={draft.worktreeEnvironment}
-              onChange={(worktreeEnvironment) => {
-                onChange({
-                  ...draft,
-                  worktreeEnvironment
-                })
-              }}
-            />
-
-            <BranchSwitcherDropdown
-              availableLocalBranches={git.availableLocalBranches}
-              branchQuery={git.branchQuery}
-              compact={compact}
-              canCreateBranch={git.canCreateBranch}
-              currentBranchLabel={git.currentBranchLabel}
-              hasBranchResults={git.hasBranchResults}
-              isBusy={disabled}
-              isLoading={git.isBranchListLoading}
-              open={git.branchMenuOpen}
-              placement={placement}
-              remoteBranches={git.remoteBranches}
-              repoState={git.repoState}
-              onCreateBranch={git.handleCreateBranch}
-              onOpenChange={(nextOpen) => {
-                git.setBranchMenuOpen(nextOpen)
-                if (nextOpen) {
-                  git.setWorktreeMenuOpen(false)
-                  git.setShouldLoadBranches(true)
-                  return
-                }
-                git.setBranchQuery('')
-              }}
-              onQueryChange={git.setBranchQuery}
-              onSwitchBranch={git.handleBranchSwitch}
-            />
-          </div>
-        )
-        : (
-          <div className='chat-draft-git__unavailable'>
-            <span className='material-symbols-rounded'>info</span>
-            <span>{t('chat.sessionWorkspaceDraftGitUnavailable')}</span>
-          </div>
-        )}
-    </div>
-  )
-}

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

@@ -1,115 +0,0 @@
-import { Button, Dropdown, Empty } from 'antd'
-import { useMemo } from 'react'
-import { useTranslation } from 'react-i18next'
-import useSWR from 'swr'
-
-import { listWorktreeEnvironments } from '#~/api'
-import { toDisplayEnvironmentName, toEnvironmentReference } from '#~/components/config/worktree-environment-panel-model'
-
-export function DraftWorktreeEnvironmentDropdown({
-  compact = false,
-  disabled = false,
-  value,
-  placement = 'topLeft',
-  onChange
-}: {
-  compact?: boolean
-  disabled?: boolean
-  value?: string
-  placement?: 'bottomLeft' | 'topLeft'
-  onChange: (value?: string) => void
-}) {
-  const { t } = useTranslation()
-  const { data } = useSWR('worktree-environments', listWorktreeEnvironments, { revalidateOnFocus: false })
-  const environments = data?.environments ?? []
-  const selectedEnvironment = environments.find(environment => (
-    toEnvironmentReference(environment) === value || environment.id === value
-  ))
-  const triggerLabel = selectedEnvironment != null
-    ? toDisplayEnvironmentName(selectedEnvironment.id)
-    : value != null && value !== ''
-    ? toDisplayEnvironmentName(value)
-    : t('chat.sessionWorkspaceEnvironmentDefault')
-  const hasEnvironments = environments.length > 0
-
-  const menuRows = useMemo(() => (
-    <div className='chat-header-git__overlay chat-header-git__overlay--environment'>
-      <button
-        type='button'
-        className={`chat-header-git__menu-row ${value == null || value === '' ? 'is-active' : ''}`}
-        disabled={disabled}
-        onClick={() => onChange(undefined)}
-      >
-        <span className='chat-header-git__menu-row-main'>
-          <span className='chat-header-git__row-icon material-symbols-rounded'>settings_suggest</span>
-          <span className='chat-header-git__menu-row-title'>
-            {t('chat.sessionWorkspaceEnvironmentDefault')}
-          </span>
-        </span>
-      </button>
-
-      {hasEnvironments
-        ? environments.map((environment) => {
-          const environmentReference = toEnvironmentReference(environment)
-          const isActive = environmentReference === value || environment.id === value
-          return (
-            <button
-              type='button'
-              key={`${environment.source}:${environment.id}`}
-              className={`chat-header-git__menu-row ${isActive ? 'is-active' : ''}`}
-              disabled={disabled}
-              title={environment.path}
-              onClick={() => onChange(environmentReference)}
-            >
-              <span className='chat-header-git__menu-row-main'>
-                <span className='chat-header-git__row-icon material-symbols-rounded'>
-                  {environment.isLocal ? 'person' : 'folder'}
-                </span>
-                <span className='chat-header-git__menu-row-title'>
-                  {toDisplayEnvironmentName(environment.id)}
-                </span>
-              </span>
-              <span className='chat-header-git__menu-row-trailing'>
-                <span className='chat-header-git__menu-row-value'>
-                  {environment.isLocal
-                    ? t('chat.sessionWorkspaceEnvironmentLocal')
-                    : t('chat.sessionWorkspaceEnvironmentProject')}
-                </span>
-              </span>
-            </button>
-          )
-        })
-        : (
-          <div className='chat-header-git__empty chat-header-git__empty--environment'>
-            <Empty
-              image={Empty.PRESENTED_IMAGE_SIMPLE}
-              description={t('chat.sessionWorkspaceNoEnvironments')}
-            />
-          </div>
-        )}
-    </div>
-  ), [disabled, environments, hasEnvironments, onChange, t, value])
-
-  return (
-    <Dropdown
-      placement={placement}
-      trigger={['click']}
-      dropdownRender={() => menuRows}
-    >
-      <Button
-        type='text'
-        disabled={disabled}
-        className={`chat-header-git__trigger chat-header-git__trigger--environment ${compact ? 'is-compact' : ''}`
-          .trim()}
-        title={selectedEnvironment?.path ?? triggerLabel}
-        aria-label={t('chat.sessionWorkspaceEnvironment')}
-      >
-        <span className='chat-header-git__trigger-main'>
-          <span className='material-symbols-rounded'>deployed_code</span>
-          <span className='chat-header-git__trigger-label'>{triggerLabel}</span>
-        </span>
-        <span className='chat-header-git__trigger-chevron material-symbols-rounded'>expand_more</span>
-      </Button>
-    </Dropdown>
-  )
-}

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

@@ -1,199 +0,0 @@
-import { Button, Input, Modal } from 'antd'
-import { useTranslation } from 'react-i18next'
-
-import type { GitChangeSummary, GitHeadCommitSummary } from '@vibe-forge/types'
-
-import {
-  GitCommitForcePushOption,
-  GitCommitNextSteps,
-  GitCommitSummaryGrid,
-  GitCommitToggleRow,
-  getGitCommitNextSteps
-} from './GitCommitModalParts'
-import type { GitCommitNextStep } from './git-commit-utils'
-
-export function GitCommitModal({
-  canCommitAndPush,
-  canSubmit,
-  commitAmend,
-  commitBlockedMessage,
-  commitForcePush,
-  commitIncludeUnstagedChanges,
-  commitMessage,
-  commitMessageError,
-  commitNextStep,
-  commitSkipHooks,
-  commitSummary,
-  currentBranchLabel,
-  headCommit,
-  open,
-  pending,
-  onCancel,
-  onCommit,
-  onMessageChange,
-  onNextStepChange,
-  onToggleAmend,
-  onToggleForcePush,
-  onToggleIncludeUnstagedChanges,
-  onToggleSkipHooks
-}: {
-  canCommitAndPush: boolean
-  canSubmit: boolean
-  commitAmend: boolean
-  commitBlockedMessage: string
-  commitForcePush: boolean
-  commitIncludeUnstagedChanges: boolean
-  commitMessage: string
-  commitMessageError: string
-  commitNextStep: GitCommitNextStep
-  commitSkipHooks: boolean
-  commitSummary: GitChangeSummary | null
-  currentBranchLabel: string
-  headCommit: GitHeadCommitSummary | null
-  open: boolean
-  pending: boolean
-  onCancel: () => void
-  onCommit: () => void
-  onMessageChange: (value: string) => void
-  onNextStepChange: (value: GitCommitNextStep) => void
-  onToggleAmend: (checked: boolean) => void
-  onToggleForcePush: (checked: boolean) => void
-  onToggleIncludeUnstagedChanges: (checked: boolean) => void
-  onToggleSkipHooks: (checked: boolean) => void
-}) {
-  const { i18n, t } = useTranslation()
-  const numberFormatter = new Intl.NumberFormat(i18n.language)
-  const nextSteps = getGitCommitNextSteps(t)
-  const changedFilesCount = commitSummary?.changedFiles ?? 0
-  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={592}
-      onCancel={onCancel}
-    >
-      <div className='chat-header-git__commit-sheet'>
-        <div className='chat-header-git__commit-icon'>
-          <span className='material-symbols-rounded'>commit</span>
-        </div>
-        <div className='chat-header-git__commit-title'>
-          {t('chat.gitCommitPanelTitle')}
-        </div>
-        <GitCommitSummaryGrid
-          branchLabel={t('chat.gitCommitPanelBranch')}
-          changedFilesLabel={t('chat.gitChangedFilesCount', {
-            count: changedFilesCount
-          })}
-          changesLabel={t('chat.gitCommitPanelChanges')}
-          currentBranchLabel={currentBranchLabel}
-          formattedAdditions={numberFormatter.format(commitSummary?.additions ?? 0)}
-          formattedDeletions={numberFormatter.format(commitSummary?.deletions ?? 0)}
-          summary={commitSummary}
-        />
-
-        <div className='chat-header-git__commit-toggles'>
-          <GitCommitToggleRow
-            checked={commitIncludeUnstagedChanges}
-            description={commitIncludeUnstagedChanges
-              ? t('chat.gitCommitIncludeUnstagedChangesDescription')
-              : t('chat.gitCommitOnlyStagedChangesDescription')}
-            disabled={pending}
-            title={t('chat.gitCommitIncludeUnstagedChanges')}
-            onChange={onToggleIncludeUnstagedChanges}
-          />
-
-          <GitCommitToggleRow
-            checked={commitSkipHooks}
-            description={t('chat.gitCommitSkipHooksDescription')}
-            disabled={pending}
-            title={t('chat.gitCommitSkipHooks')}
-            onChange={onToggleSkipHooks}
-          />
-
-          <GitCommitToggleRow
-            checked={commitAmend}
-            description={headCommit == null
-              ? t('chat.gitCommitAmendUnavailableDescription')
-              : t('chat.gitCommitAmendDescription', { subject: headCommit.subject })}
-            disabled={pending || headCommit == null}
-            title={t('chat.gitCommitAmend')}
-            onChange={onToggleAmend}
-          />
-        </div>
-
-        <div className='chat-header-git__commit-section-header'>
-          <span>{t('chat.gitCommitMessageLabel')}</span>
-          {commitAmend && (
-            <span className='chat-header-git__overlay-meta'>
-              {t('chat.gitCommitMessageOptional')}
-            </span>
-          )}
-        </div>
-
-        <Input.TextArea
-          autoFocus
-          className='chat-header-git__commit-input'
-          placeholder={commitAmend
-            ? t('chat.gitCommitMessagePlaceholderAmend')
-            : t('chat.gitCommitMessagePlaceholder')}
-          rows={3}
-          status={commitMessageError !== '' ? 'error' : undefined}
-          value={commitMessage}
-          onChange={(event) => onMessageChange(event.target.value)}
-        />
-
-        {commitMessageError !== '' && (
-          <div className='chat-header-git__commit-error'>{commitMessageError}</div>
-        )}
-        {commitMessageError === '' && commitAmend && (
-          <div className='chat-header-git__overlay-meta'>
-            {t('chat.gitCommitMessageAmendHint')}
-          </div>
-        )}
-
-        <div className='chat-header-git__commit-section-header'>
-          <span>{t('chat.gitCommitNextStep')}</span>
-        </div>
-
-        <GitCommitNextSteps
-          canCommitAndPush={canCommitAndPush}
-          pending={pending}
-          selected={commitNextStep}
-          steps={nextSteps}
-          onChange={onNextStepChange}
-        />
-
-        {commitNextStep === 'commit-and-push' && (
-          <GitCommitForcePushOption
-            checked={commitForcePush}
-            pending={pending}
-            onChange={onToggleForcePush}
-          />
-        )}
-
-        {!canSubmit && commitBlockedMessage !== '' && (
-          <div className='chat-header-git__overlay-meta'>
-            {commitBlockedMessage}
-          </div>
-        )}
-
-        <div className='chat-header-git__commit-footer'>
-          <Button
-            className='chat-header-git__commit-submit'
-            disabled={!canSubmit}
-            loading={pending}
-            type='primary'
-            onClick={onCommit}
-          >
-            {t('common.continue')}
-          </Button>
-        </div>
-      </div>
-    </Modal>
-  )
-}