@agi-cli/web-sdk 0.1.148 → 0.1.149

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"GitFileItem.d.ts","sourceRoot":"","sources":["../../../src/components/git/GitFileItem.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAWrD,UAAU,gBAAgB;IACzB,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,qBAAqB,CAAC,EAAE,OAAO,CAAC;CAChC;AAwBD,wBAAgB,WAAW,CAAC,EAC3B,IAAI,EACJ,MAAM,EACN,qBAA6B,GAC7B,EAAE,gBAAgB,2CAwMlB"}
1
+ {"version":3,"file":"GitFileItem.d.ts","sourceRoot":"","sources":["../../../src/components/git/GitFileItem.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAWrD,UAAU,gBAAgB;IACzB,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,qBAAqB,CAAC,EAAE,OAAO,CAAC;CAChC;AAwBD,wBAAgB,WAAW,CAAC,EAC3B,IAAI,EACJ,MAAM,EACN,qBAA6B,GAC7B,EAAE,gBAAgB,2CA+MlB"}
@@ -1,5 +1,5 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
- import { FileIcon, FilePlus, FileX, Check, AlertCircle, RotateCcw, Trash2, } from 'lucide-react';
2
+ import { FileIcon, FilePlus, FileX, Check, AlertCircle, AlertTriangle, RotateCcw, Trash2, } from 'lucide-react';
3
3
  import { useStageFiles, useUnstageFiles, useRestoreFiles, useDeleteFiles, } from '../../hooks/useGit';
4
4
  import { useGitStore } from '../../stores/gitStore';
5
5
  import { useConfirmationStore } from '../../stores/confirmationStore';
@@ -120,6 +120,13 @@ export function GitFileItem({ file, staged, showModifiedIndicator = false, }) {
120
120
  label: 'R',
121
121
  labelColor: 'text-purple-500',
122
122
  };
123
+ case 'conflicted':
124
+ return {
125
+ icon: AlertTriangle,
126
+ color: 'text-red-500',
127
+ label: 'C',
128
+ labelColor: 'text-red-500',
129
+ };
123
130
  default:
124
131
  return {
125
132
  icon: FileIcon,
@@ -1 +1 @@
1
- {"version":3,"file":"GitFileItem.js","sourceRoot":"","sources":["../../../src/components/git/GitFileItem.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GitFileItem.js","sourceRoot":"","sources":["../../../src/components/git/GitFileItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EACN,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,KAAK,EACL,WAAW,EACX,aAAa,EACb,SAAS,EACT,MAAM,GACN,MAAM,cAAc,CAAC;AAEtB,OAAO,EACN,aAAa,EACb,eAAe,EACf,eAAe,EACf,cAAc,GACd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAQjC;;;;;;;;GAQG;AACH,SAAS,iBAAiB,CAAC,IAAY,EAAE,QAAQ,GAAG,CAAC;IACpD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE9B,uCAAuC;IACvC,IAAI,KAAK,CAAC,MAAM,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,kCAAkC;IAClC,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC;IACzC,OAAO,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,EAC3B,IAAI,EACJ,MAAM,EACN,qBAAqB,GAAG,KAAK,GACX;IAClB,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,EAAE,CAAC;IACnC,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,gBAAgB,GAAG,oBAAoB,CAC5C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,gBAAgB,CACjC,CAAC;IACF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEnD,MAAM,iBAAiB,GAAG,KAAK,EAAE,CAAsC,EAAE,EAAE;QAC1E,CAAC,CAAC,eAAe,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;QACjC,YAAY,CAAC,OAAO,CAAC,CAAC;QAEtB,IAAI,CAAC;YACJ,IAAI,OAAO,EAAE,CAAC;gBACb,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACP,MAAM,YAAY,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7C,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,kBAAkB;YAClB,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC;YACvB,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;QACvD,CAAC;IACF,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,KAAK,EAAE,CAAmB,EAAE,EAAE;QACnD,CAAC,CAAC,eAAe,EAAE,CAAC;QACpB,gBAAgB,CAAC;YAChB,KAAK,EAAE,cAAc;YACrB,OAAO,EAAE,WAAW,IAAI,CAAC,IAAI,gDAAgD;YAC7E,YAAY,EAAE,SAAS;YACvB,OAAO,EAAE,aAAa;YACtB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACrB,IAAI,CAAC;oBACJ,MAAM,YAAY,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC7C,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;oBAChD,MAAM,KAAK,CAAC;gBACb,CAAC;YACF,CAAC;SACD,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,KAAK,EAAE,CAAmB,EAAE,EAAE;QAClD,CAAC,CAAC,eAAe,EAAE,CAAC;QACpB,gBAAgB,CAAC;YAChB,KAAK,EAAE,aAAa;YACpB,OAAO,EAAE,UAAU,IAAI,CAAC,IAAI,oDAAoD;YAChF,YAAY,EAAE,QAAQ;YACtB,OAAO,EAAE,aAAa;YACtB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACrB,IAAI,CAAC;oBACJ,MAAM,WAAW,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC5C,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;oBAC/C,MAAM,KAAK,CAAC;gBACb,CAAC;YACF,CAAC;SACD,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,GAAG,EAAE;QACxB,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAC;IAEF,0BAA0B;IAC1B,MAAM,eAAe,GAAG,GAAG,EAAE;QAC5B,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;YACrB,KAAK,OAAO,CAAC;YACb,KAAK,WAAW;gBACf,OAAO;oBACN,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,gBAAgB;oBACvB,KAAK,EAAE,GAAG;oBACV,UAAU,EAAE,gBAAgB;iBAC5B,CAAC;YACH,KAAK,SAAS;gBACb,OAAO;oBACN,IAAI,EAAE,KAAK;oBACX,KAAK,EAAE,cAAc;oBACrB,KAAK,EAAE,GAAG;oBACV,UAAU,EAAE,cAAc;iBAC1B,CAAC;YACH,KAAK,UAAU;gBACd,OAAO;oBACN,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,eAAe;oBACtB,KAAK,EAAE,GAAG;oBACV,UAAU,EAAE,eAAe;iBAC3B,CAAC;YACH,KAAK,SAAS;gBACb,OAAO;oBACN,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,iBAAiB;oBACxB,KAAK,EAAE,GAAG;oBACV,UAAU,EAAE,iBAAiB;iBAC7B,CAAC;YACH,KAAK,YAAY;gBAChB,OAAO;oBACN,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,cAAc;oBACrB,KAAK,EAAE,GAAG;oBACV,UAAU,EAAE,cAAc;iBAC1B,CAAC;YACH;gBACC,OAAO;oBACN,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,uBAAuB;oBAC9B,KAAK,EAAE,GAAG;oBACV,UAAU,EAAE,uBAAuB;iBACnC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IAEzB,yDAAyD;IACzD,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAEpD,OAAO,CACN,kBACC,IAAI,EAAC,QAAQ,EACb,SAAS,EAAC,6GAA6G,EACvH,OAAO,EAAE,WAAW,aAEpB,gBACC,IAAI,EAAC,UAAU,EACf,OAAO,EAAE,SAAS,EAClB,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,EACnC,SAAS,EAAC,+BAA+B,gBAC7B,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,GAC5D,EAEF,eAAK,SAAS,EAAC,wCAAwC,aACtD,KAAC,IAAI,IAAC,SAAS,EAAE,yBAAyB,MAAM,CAAC,KAAK,EAAE,GAAI,EAC5D,cAAK,SAAS,EAAC,gBAAgB,YAC9B,eAAK,SAAS,EAAC,yBAAyB,aACvC,eACC,SAAS,EAAC,4CAA4C,EACtD,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,EAAE,YAErC,WAAW,GACN,EACP,eAAK,SAAS,EAAC,uCAAuC,aACrD,eAAM,SAAS,EAAE,yBAAyB,MAAM,CAAC,UAAU,EAAE,YAC3D,MAAM,CAAC,KAAK,GACP,EACN,qBAAqB,IAAI,CACzB,cAAK,KAAK,EAAC,oCAAoC,YAC9C,KAAC,WAAW,IAAC,SAAS,EAAC,6BAA6B,GAAG,GAClD,CACN,IACI,IACD,GACD,IACD,EAGL,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,CAChE,eAAK,SAAS,EAAC,+CAA+C,aAC5D,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,CACxD,gBAAM,SAAS,EAAC,gBAAgB,kBAAG,IAAI,CAAC,UAAU,IAAQ,CAC1D,EACA,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,CACtD,gBAAM,SAAS,EAAC,cAAc,kBAAG,IAAI,CAAC,SAAS,IAAQ,CACvD,IACI,CACN,CAAC,CAAC,CAAC,IAAI,EAGP,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,IAAI,CAC1C,iBACC,IAAI,EAAC,QAAQ,EACb,OAAO,EAAE,YAAY,EACrB,SAAS,EAAC,0GAA0G,EACpH,KAAK,EAAC,uBAAuB,gBACjB,UAAU,IAAI,CAAC,IAAI,EAAE,YAEjC,KAAC,MAAM,IAAC,SAAS,EAAC,8BAA8B,GAAG,GAC3C,CACT,EAGA,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,IAAI,CACrE,iBACC,IAAI,EAAC,QAAQ,EACb,OAAO,EAAE,aAAa,EACtB,SAAS,EAAC,0GAA0G,EACpH,KAAK,EAAC,gCAAgC,gBAC1B,WAAW,IAAI,CAAC,IAAI,EAAE,YAElC,KAAC,SAAS,IAAC,SAAS,EAAC,8BAA8B,GAAG,GAC9C,CACT,EAGA,MAAM,IAAI,CAAC,qBAAqB,IAAI,CACpC,KAAC,KAAK,IAAC,SAAS,EAAC,2FAA2F,GAAG,CAC/G,IACO,CACT,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"GitFileList.d.ts","sourceRoot":"","sources":["../../../src/components/git/GitFileList.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAQzD,UAAU,gBAAgB;IACzB,MAAM,EAAE,iBAAiB,CAAC;CAC1B;AAED,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,gBAAgB,2CAoLvD"}
1
+ {"version":3,"file":"GitFileList.d.ts","sourceRoot":"","sources":["../../../src/components/git/GitFileList.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAQzD,UAAU,gBAAgB;IACzB,MAAM,EAAE,iBAAiB,CAAC;CAC1B;AAED,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,gBAAgB,2CAqOvD"}
@@ -1,5 +1,5 @@
1
- import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
2
- import { GitCommit, CheckSquare } from 'lucide-react';
1
+ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
+ import { GitCommit, CheckSquare, AlertTriangle } from 'lucide-react';
3
3
  import { Button } from '../ui/Button';
4
4
  import { GitFileItem } from './GitFileItem';
5
5
  import { useGitStore } from '../../stores/gitStore';
@@ -12,12 +12,18 @@ export function GitFileList({ status }) {
12
12
  const unstageFiles = useUnstageFiles();
13
13
  const { currentFocus, gitFileIndex } = useFocusStore();
14
14
  const itemRefs = useRef(new Map());
15
+ const hasConflicts = (status.conflicted?.length ?? 0) > 0;
15
16
  const hasStaged = status.staged.length > 0;
16
17
  const hasUnstaged = status.unstaged.length > 0 || status.untracked.length > 0;
17
18
  const unstagedFiles = [...status.unstaged, ...status.untracked];
18
19
  const hasUnstagedFiles = unstagedFiles.length > 0;
19
20
  const _allFiles = useMemo(() => {
20
- return [...status.staged, ...status.unstaged, ...status.untracked];
21
+ return [
22
+ ...(status.conflicted ?? []),
23
+ ...status.staged,
24
+ ...status.unstaged,
25
+ ...status.untracked,
26
+ ];
21
27
  }, [status]);
22
28
  const unstagedPaths = new Set(status.unstaged.map((f) => f.path));
23
29
  const handleStageAll = () => {
@@ -32,19 +38,19 @@ export function GitFileList({ status }) {
32
38
  unstageFiles.mutate(filesToUnstage);
33
39
  }
34
40
  };
41
+ const conflictedLength = status.conflicted?.length ?? 0;
35
42
  useEffect(() => {
36
43
  if (currentFocus === 'git' && gitFileIndex >= 0) {
37
44
  const element = itemRefs.current.get(gitFileIndex);
38
45
  element?.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
39
- // Auto-show diff for focused file
40
46
  const allFiles = [
47
+ ...(status.conflicted ?? []),
41
48
  ...status.staged,
42
49
  ...status.unstaged,
43
50
  ...status.untracked,
44
51
  ];
45
52
  const focusedFile = allFiles[gitFileIndex];
46
53
  if (focusedFile) {
47
- // Determine if file is staged or unstaged
48
54
  const isStaged = status.staged.includes(focusedFile);
49
55
  openDiff(focusedFile.path, isStaged);
50
56
  }
@@ -52,14 +58,24 @@ export function GitFileList({ status }) {
52
58
  }, [
53
59
  currentFocus,
54
60
  gitFileIndex,
61
+ status.conflicted,
55
62
  status.staged,
56
63
  status.unstaged,
57
64
  status.untracked,
58
65
  openDiff,
59
66
  ]);
60
- return (_jsxs("div", { className: "flex flex-col", children: [hasStaged && (_jsxs("div", { className: "border-b border-border", children: [_jsxs("div", { className: "px-4 py-2 bg-muted/50 flex items-center justify-between", children: [_jsxs("span", { className: "text-xs font-semibold text-foreground uppercase", children: ["Staged Changes (", status.staged.length, ")"] }), _jsx("div", { className: "flex items-center gap-1", children: status.staged.length > 0 && (_jsxs(Button, { variant: "primary", size: "sm", onClick: openCommitModal, className: "h-6 text-xs", children: [_jsx(GitCommit, { className: "w-3 h-3 mr-1" }), "Commit"] })) })] }), _jsx("div", { className: "divide-y divide-border", children: status.staged.map((file, index) => {
67
+ return (_jsxs("div", { className: "flex flex-col", children: [hasConflicts && (_jsxs("div", { className: "border-b border-border", children: [_jsx("div", { className: "px-4 py-2 bg-red-500/10 flex items-center justify-between", children: _jsxs("span", { className: "text-xs font-semibold text-red-500 uppercase flex items-center gap-1.5", children: [_jsx(AlertTriangle, { className: "w-3.5 h-3.5" }), "Conflicts (", conflictedLength, ")"] }) }), _jsx("div", { className: "divide-y divide-border", children: status.conflicted?.map((file, index) => {
61
68
  const globalIndex = index;
62
69
  const isFocused = currentFocus === 'git' && gitFileIndex === globalIndex;
70
+ return (_jsx("div", { ref: (el) => {
71
+ if (el)
72
+ itemRefs.current.set(globalIndex, el);
73
+ else
74
+ itemRefs.current.delete(globalIndex);
75
+ }, className: isFocused ? 'ring-1 ring-inset ring-primary/40' : '', children: _jsx(GitFileItem, { file: file, staged: false }) }, file.path));
76
+ }) })] })), hasStaged && (_jsxs("div", { className: "border-b border-border", children: [_jsxs("div", { className: "px-4 py-2 bg-muted/50 flex items-center justify-between", children: [_jsxs("span", { className: "text-xs font-semibold text-foreground uppercase", children: ["Staged Changes (", status.staged.length, ")"] }), _jsxs("div", { className: "flex items-center gap-1", children: [status.staged.length > 0 && !hasConflicts && (_jsxs(Button, { variant: "primary", size: "sm", onClick: openCommitModal, className: "h-6 text-xs", children: [_jsx(GitCommit, { className: "w-3 h-3 mr-1" }), "Commit"] })), status.staged.length > 0 && hasConflicts && (_jsx("span", { className: "text-xs text-muted-foreground", children: "Resolve conflicts first" }))] })] }), _jsx("div", { className: "divide-y divide-border", children: status.staged.map((file, index) => {
77
+ const globalIndex = conflictedLength + index;
78
+ const isFocused = currentFocus === 'git' && gitFileIndex === globalIndex;
63
79
  return (_jsx("div", { ref: (el) => {
64
80
  if (el)
65
81
  itemRefs.current.set(globalIndex, el);
@@ -67,7 +83,7 @@ export function GitFileList({ status }) {
67
83
  itemRefs.current.delete(globalIndex);
68
84
  }, className: isFocused ? 'ring-1 ring-inset ring-primary/40' : '', children: _jsx(GitFileItem, { file: file, staged: true, showModifiedIndicator: unstagedPaths.has(file.path) }) }, file.path));
69
85
  }) })] })), hasUnstaged && (_jsxs("div", { children: [_jsxs("div", { className: "px-4 py-2 bg-muted/50 flex items-center justify-between", children: [_jsxs("span", { className: "text-xs font-semibold text-foreground uppercase", children: ["Changes (", status.unstaged.length + status.untracked.length, ")"] }), hasUnstagedFiles && (_jsxs(Button, { variant: "ghost", size: "sm", onClick: handleStageAll, title: "Stage all changes", className: "h-6 text-xs", children: [_jsx(CheckSquare, { className: "w-3 h-3 mr-1" }), "Stage All"] }))] }), _jsxs("div", { className: "divide-y divide-border", children: [status.unstaged.map((file, index) => {
70
- const globalIndex = status.staged.length + index;
86
+ const globalIndex = conflictedLength + status.staged.length + index;
71
87
  const isFocused = currentFocus === 'git' && gitFileIndex === globalIndex;
72
88
  return (_jsx("div", { ref: (el) => {
73
89
  if (el)
@@ -76,7 +92,10 @@ export function GitFileList({ status }) {
76
92
  itemRefs.current.delete(globalIndex);
77
93
  }, className: isFocused ? 'ring-1 ring-inset ring-primary/40' : '', children: _jsx(GitFileItem, { file: file, staged: false }) }, file.path));
78
94
  }), status.untracked.map((file, index) => {
79
- const globalIndex = status.staged.length + status.unstaged.length + index;
95
+ const globalIndex = conflictedLength +
96
+ status.staged.length +
97
+ status.unstaged.length +
98
+ index;
80
99
  const isFocused = currentFocus === 'git' && gitFileIndex === globalIndex;
81
100
  return (_jsx("div", { ref: (el) => {
82
101
  if (el)
@@ -84,6 +103,6 @@ export function GitFileList({ status }) {
84
103
  else
85
104
  itemRefs.current.delete(globalIndex);
86
105
  }, className: isFocused ? 'ring-1 ring-inset ring-primary/40' : '', children: _jsx(GitFileItem, { file: file, staged: false }) }, file.path));
87
- })] })] })), !hasStaged && !hasUnstaged && (_jsx("div", { className: "p-4 text-sm text-muted-foreground text-center", children: "No changes" }))] }));
106
+ })] })] })), !hasConflicts && !hasStaged && !hasUnstaged && (_jsx("div", { className: "p-4 text-sm text-muted-foreground text-center", children: "No changes" }))] }));
88
107
  }
89
108
  //# sourceMappingURL=GitFileList.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"GitFileList.js","sourceRoot":"","sources":["../../../src/components/git/GitFileList.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GitFileList.js","sourceRoot":"","sources":["../../../src/components/git/GitFileList.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"GitSidebar.d.ts","sourceRoot":"","sources":["../../../src/components/git/GitSidebar.tsx"],"names":[],"mappings":"AAQA,eAAO,MAAM,UAAU,8CA8JrB,CAAC"}
1
+ {"version":3,"file":"GitSidebar.d.ts","sourceRoot":"","sources":["../../../src/components/git/GitSidebar.tsx"],"names":[],"mappings":"AAQA,eAAO,MAAM,UAAU,8CA+JrB,CAAC"}
@@ -38,6 +38,7 @@ export const GitSidebar = memo(function GitSidebar() {
38
38
  if (!isExpanded)
39
39
  return null;
40
40
  const allFiles = [
41
+ ...(status?.conflicted || []),
41
42
  ...(status?.staged || []),
42
43
  ...(status?.unstaged || []),
43
44
  ...(status?.untracked || []),
@@ -1 +1 @@
1
- {"version":3,"file":"GitSidebar.js","sourceRoot":"","sources":["../../../src/components/git/GitSidebar.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GitSidebar.js","sourceRoot":"","sources":["../../../src/components/git/GitSidebar.tsx"],"names":[],"mappings":"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"}
@@ -106,12 +106,13 @@ export type AllModelsResponse = Record<string, ProviderModels>;
106
106
  export interface GitFileStatus {
107
107
  path: string;
108
108
  absPath: string;
109
- status: 'modified' | 'added' | 'deleted' | 'renamed' | 'untracked';
109
+ status: 'modified' | 'added' | 'deleted' | 'renamed' | 'untracked' | 'conflicted';
110
110
  staged: boolean;
111
111
  insertions?: number;
112
112
  deletions?: number;
113
113
  oldPath?: string;
114
114
  isNew: boolean;
115
+ conflictType?: 'both-modified' | 'deleted-by-us' | 'deleted-by-them' | 'both-added' | 'both-deleted';
115
116
  }
116
117
  export interface GitStatusResponse {
117
118
  branch: string;
@@ -122,7 +123,9 @@ export interface GitStatusResponse {
122
123
  staged: GitFileStatus[];
123
124
  unstaged: GitFileStatus[];
124
125
  untracked: GitFileStatus[];
126
+ conflicted: GitFileStatus[];
125
127
  hasChanges: boolean;
128
+ hasConflicts: boolean;
126
129
  }
127
130
  export interface GitDiffResponse {
128
131
  file: string;
@@ -1 +1 @@
1
- {"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/types/api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/types/api.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agi-cli/web-sdk",
3
- "version": "0.1.148",
3
+ "version": "0.1.149",
4
4
  "description": "Reusable React components, hooks, and utilities for building AGI CLI web interfaces",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
@@ -58,8 +58,8 @@
58
58
  "directory": "packages/web-sdk"
59
59
  },
60
60
  "dependencies": {
61
- "@agi-cli/api": "0.1.148",
62
- "@agi-cli/sdk": "0.1.148",
61
+ "@agi-cli/api": "0.1.149",
62
+ "@agi-cli/sdk": "0.1.149",
63
63
  "@xterm/addon-fit": "^0.10.0",
64
64
  "@xterm/addon-unicode11": "^0.8.0",
65
65
  "@xterm/xterm": "^5.5.0",