@vibe-forge/client 0.11.3 → 1.0.0

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

@@ -12,140 +12,167 @@ 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.repoState?.available !== true) {
+  if (git.workspace == null && git.repoState?.available !== true) {
     return null
   }
 
   return (
     <>
-      <div className='chat-header-git'>
-        <GitOperationsDropdown
-          isBusy={git.isBusy}
-          open={git.operationsMenuOpen}
-          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)
-            )
+      <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
           }}
-        />
-
-        <BranchSwitcherDropdown
-          availableLocalBranches={git.availableLocalBranches}
-          currentBranchLabel={git.currentBranchLabel}
-          isBusy={git.isBusy}
-          isLoading={git.isBranchListLoading}
-          open={git.branchMenuOpen}
-          repoState={git.repoState}
-          branchQuery={git.branchQuery}
-          canCreateBranch={git.canCreateBranch}
-          hasBranchResults={git.hasBranchResults}
-          remoteBranches={git.remoteBranches}
-          onCreateBranch={git.handleCreateBranch}
           onOpenChange={(nextOpen) => {
-            git.setBranchMenuOpen(nextOpen)
+            git.setWorktreeMenuOpen(nextOpen)
             if (nextOpen) {
               git.setOperationsMenuOpen(false)
-              git.setWorktreeMenuOpen(false)
-              git.setShouldLoadBranches(true)
-              return
+              git.setBranchMenuOpen(false)
             }
-            git.setBranchQuery('')
           }}
-          onQueryChange={git.setBranchQuery}
-          onSwitchBranch={git.handleBranchSwitch}
         />
 
-        {git.showWorktreeButton && (
-          <GitWorktreeDropdown
-            open={git.worktreeMenuOpen}
-            worktrees={git.worktrees}
-            onOpenChange={(nextOpen) => {
-              git.setWorktreeMenuOpen(nextOpen)
-              if (nextOpen) {
+        {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.setBranchMenuOpen(false)
-              }
-            }}
-          />
-        )}
+                git.setCommitMessageError('')
+                git.setCommitModalOpen(true)
+              }}
+              onPush={git.handleOpenPushModal}
+              onSync={() => {
+                void git.runMutation(
+                  'sync',
+                  () => syncSessionGitBranch(sessionId),
+                  t('chat.gitSyncSuccess'),
+                  () => git.setOperationsMenuOpen(false)
+                )
+              }}
+            />
 
-        <div className='chat-header-git__separator' />
+            <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>
 
-      <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('')
-          }
-        }}
-      />
+      {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}
-      />
+          <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

@@ -0,0 +1,91 @@
+import './ChatGitControls.scss'
+
+import { useTranslation } from 'react-i18next'
+
+import type { ChatSessionWorkspaceDraft } from '#~/hooks/chat/chat-session-workspace-draft'
+
+import { BranchSwitcherDropdown } from './BranchSwitcherDropdown'
+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)
+                }
+              }}
+            />
+
+            <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/GitOperationsDropdown.tsx

@@ -7,16 +7,20 @@ import type { GitOperationKind } from './git-operation-utils'
 import { getPrimaryGitOperationKind, isGitOperationDisabled } from './git-operation-utils'
 
 export function GitOperationsDropdown({
+  compact = false,
   isBusy,
   open,
+  placement = 'bottomLeft',
   repoState,
   onOpenChange,
   onOpenCommit,
   onPush,
   onSync
 }: {
+  compact?: boolean
   isBusy: boolean
   open: boolean
+  placement?: 'bottomLeft' | 'topLeft'
   repoState: GitRepositoryState
   onOpenChange: (open: boolean) => void
   onOpenCommit: () => void
@@ -59,7 +63,11 @@ export function GitOperationsDropdown({
   const primaryAction = primaryActionKind != null ? actionMap[primaryActionKind] : null
 
   return (
-    <div className={`chat-header-git__split ${open ? 'is-open' : ''}`}>
+    <div
+      className={`chat-header-git__split chat-header-git__split--operations ${open ? 'is-open' : ''} ${
+        compact ? 'is-compact' : ''
+      }`.trim()}
+    >
       <Button
         type='text'
         className='chat-header-git__split-main'
@@ -84,7 +92,7 @@ export function GitOperationsDropdown({
 
       <Dropdown
         open={open}
-        placement='bottomLeft'
+        placement={placement}
         trigger={['click']}
         onOpenChange={onOpenChange}
         dropdownRender={() => (