cflx 0.6.11

Conflux – a spec-driven parallel coding orchestrator that runs AI agents on git worktrees
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41

import React from 'react';
import { GitMerge, X } from 'lucide-react';
import { ProposalSession } from '../api/types';

interface ProposalActionsProps {
  session: ProposalSession;
  onMerge: () => void;
  onClose: () => void;
  isLoading?: boolean;
}

export function ProposalActions({ session, onMerge, onClose, isLoading = false }: ProposalActionsProps) {
  const canMerge = session.status === 'active' && !session.is_dirty;
  const isClosed = session.status === 'closed';

  if (isClosed) {
    return null;
  }

  return (
    <div className="flex items-center gap-2">
      <button
        onClick={onMerge}
        disabled={!canMerge || isLoading}
        title={session.is_dirty ? 'Cannot merge: worktree has uncommitted changes' : 'Merge to base branch'}
        className="flex items-center gap-1.5 rounded-md bg-[#22c55e]/10 px-2.5 py-1.5 text-xs font-medium text-[#22c55e] transition-colors hover:bg-[#22c55e]/20 disabled:cursor-not-allowed disabled:opacity-40"
      >
        <GitMerge className="size-3.5" />
        Merge
      </button>
      <button
        onClick={onClose}
        disabled={isLoading}
        className="flex items-center gap-1.5 rounded-md border border-[#27272a] px-2.5 py-1.5 text-xs font-medium text-[#a1a1aa] transition-colors hover:border-[#3f3f46] hover:text-[#fafafa] disabled:opacity-40"
      >
        <X className="size-3.5" />
        Close
      </button>
    </div>
  );
}