trident-git 0.5.0 → 0.5.1

package/.next/static/chunks/{790-3e8fa6e595d97940.js → 790-8b6ef3e713ecba06.js}

@@ -3,4 +3,4 @@
     linear-gradient(-45deg, rgba(120, 120, 120, 0.16) 25%, transparent 25%),
     linear-gradient(45deg, transparent 75%, rgba(120, 120, 120, 0.16) 75%),
     linear-gradient(-45deg, transparent 75%, rgba(120, 120, 120, 0.16) 75%)
-  `,backgroundSize:"22px 22px",backgroundPosition:"0 0, 0 11px, 11px -11px, -11px 0px"};function d(e,t){let[n,l]=(0,r.useState)(null),s=(0,r.useMemo)(()=>e&&t?`data:${e};base64,${t}`:null,[e,t]),a=(0,r.useMemo)(()=>(function(e){if(!e)return null;let t=e.endsWith("==")?2:+!!e.endsWith("="),n=Math.max(0,Math.floor(3*e.length/4)-t);return n<1024?`${n} B`:n<1048576?`${(n/1024).toFixed(1)} KB`:`${(n/1048576).toFixed(1)} MB`})(t),[t]);(0,r.useEffect)(()=>{if(!s)return;let e=!1,t=new Image;return t.onload=()=>{e||l({src:s,dimensions:{width:t.naturalWidth,height:t.naturalHeight}})},t.onerror=()=>{e||l({src:s,dimensions:null})},t.src=s,()=>{e=!0}},[s]);let i=s&&n?.src===s?n.dimensions:null;return{src:s,metadata:i&&a?`${i.width} x ${i.height} px, ${a}`:a?`-, ${a}`:null}}function c({title:e,filePath:t,imageSrc:n,metadata:s}){return(0,l.jsxs)("section",{className:"border border-base-300 rounded-lg bg-base-200/30 overflow-hidden h-full min-h-0 flex flex-col",children:[(0,l.jsx)("header",{className:"px-3 py-2 border-b border-base-300 text-[10px] uppercase tracking-wider font-bold opacity-70",children:s?`${e} (${s})`:e}),(0,l.jsx)("div",{className:"flex-1 min-h-0 flex items-center justify-center p-3",style:o,children:n?(0,l.jsx)("img",{src:n,alt:`${e} image for ${t}`,className:"max-w-full max-h-full object-contain",draggable:!1}):(0,l.jsx)("span",{className:"text-sm opacity-50",children:"No image"})})]})}function u({filePath:e,imageDiff:t}){let n=d(t?.left?.mimeType,t?.left?.base64),u=d(t?.right?.mimeType,t?.right?.base64),m=!!(n.src&&u.src),[f,h]=(0,r.useState)(()=>{try{let e=localStorage.getItem(a);if("side-by-side"===e||"swipe"===e||"onion-skin"===e)return e}catch(e){console.error("Failed to load image diff mode preference:",e)}return"side-by-side"}),[p,x]=(0,r.useState)(50),[g,b]=(0,r.useState)(50),[N,y]=(0,r.useState)(null),v=(0,r.useRef)(null),j=m||"side-by-side"===f?f:"side-by-side";(0,r.useEffect)(()=>{try{localStorage.setItem(a,f)}catch(e){console.error("Failed to save image diff mode preference:",e)}},[f]);let w=(0,r.useCallback)(e=>{let t=v.current;if(!t)return;let n=t.getBoundingClientRect();n.width<=0||x(100*Math.max(0,Math.min(1,(e-n.left)/n.width)))},[]),k=(0,r.useCallback)(e=>{"swipe"===j&&m&&(e.preventDefault(),e.currentTarget.setPointerCapture(e.pointerId),y(e.pointerId),w(e.clientX))},[j,m,w]),$=(0,r.useCallback)(e=>{"swipe"===j&&N===e.pointerId&&w(e.clientX)},[j,N,w]),D=(0,r.useCallback)(e=>{N===e.pointerId&&(e.currentTarget.hasPointerCapture(e.pointerId)&&e.currentTarget.releasePointerCapture(e.pointerId),y(null))},[N]);return(0,l.jsxs)("div",{className:"h-full min-h-0 p-4 box-border flex flex-col",children:[(0,l.jsx)("div",{className:(0,s.cn)("flex-1 min-h-0","side-by-side"===j?"overflow-auto":"overflow-hidden"),children:"side-by-side"===j?(0,l.jsxs)("div",{className:"min-w-[720px] h-full min-h-0 grid grid-cols-2 gap-4",children:[(0,l.jsx)(c,{title:"Old",filePath:e,imageSrc:n.src,metadata:n.metadata}),(0,l.jsx)(c,{title:"New",filePath:e,imageSrc:u.src,metadata:u.metadata})]}):(0,l.jsxs)("div",{className:"h-full min-h-0 flex flex-col",children:[(0,l.jsxs)("div",{className:"px-1 pb-2 text-sm font-semibold flex items-center justify-between gap-3",children:[(0,l.jsxs)("div",{className:"flex items-center gap-2 min-w-0",children:[(0,l.jsx)("span",{className:"text-error shrink-0",children:"Old"}),(0,l.jsx)("span",{className:"text-[11px] opacity-60 truncate font-mono",children:n.metadata??"No image"})]}),(0,l.jsxs)("div",{className:"flex items-center gap-2 min-w-0 justify-end",children:[(0,l.jsx)("span",{className:"text-[11px] opacity-60 truncate font-mono",children:u.metadata??"No image"}),(0,l.jsx)("span",{className:"text-success shrink-0",children:"New"})]})]}),(0,l.jsxs)("div",{ref:v,className:(0,s.cn)("relative flex-1 min-h-0 rounded-lg border border-base-300 overflow-hidden shadow-sm","swipe"===j&&m?"cursor-ew-resize touch-none":""),style:o,onPointerDown:k,onPointerMove:$,onPointerUp:D,onPointerCancel:D,children:[n.src?(0,l.jsx)("img",{src:n.src,alt:`Old image for ${e}`,className:"absolute inset-0 w-full h-full object-contain pointer-events-none select-none",draggable:!1}):null,"onion-skin"===j?u.src?(0,l.jsx)("img",{src:u.src,alt:`New image for ${e}`,className:"absolute inset-0 w-full h-full object-contain pointer-events-none select-none",style:{opacity:g/100},draggable:!1}):null:u.src?(0,l.jsx)("img",{src:u.src,alt:`New image for ${e}`,className:"absolute inset-0 w-full h-full object-contain pointer-events-none select-none",style:{clipPath:`inset(0 0 0 ${p}%)`},draggable:!1}):null,"swipe"===j&&m?(0,l.jsxs)(l.Fragment,{children:[(0,l.jsx)("div",{className:"absolute top-0 bottom-0 w-[2px] bg-primary/90 pointer-events-none",style:{left:`${p}%`,transform:"translateX(-1px)"}}),(0,l.jsx)("div",{className:"absolute top-1/2 -translate-y-1/2 w-4 h-4 rounded-full border border-primary bg-base-100 pointer-events-none",style:{left:`${p}%`,transform:"translate(-50%, -50%)"}})]}):null,n.src||u.src?null:(0,l.jsx)("div",{className:"absolute inset-0 flex items-center justify-center text-sm opacity-50",children:"No image data available"})]})]})}),"onion-skin"===j&&m?(0,l.jsxs)("div",{className:"mt-3 flex items-center justify-center gap-3 shrink-0",children:[(0,l.jsx)("span",{className:"text-sm font-semibold text-error",children:"Old"}),(0,l.jsx)("input",{type:"range",min:0,max:100,value:g,onChange:e=>b(Number(e.target.value)),className:"range range-primary range-sm w-[320px] max-w-[65vw]","aria-label":"Onion skin blend slider"}),(0,l.jsx)("span",{className:"text-sm font-semibold text-success",children:"New"})]}):null,(0,l.jsx)("div",{className:"mt-3 flex items-center justify-center gap-2 shrink-0",children:i.map(e=>{let t="side-by-side"!==e.value&&!m;return(0,l.jsx)("button",{type:"button",onClick:()=>h(e.value),disabled:t,className:(0,s.cn)("px-4 py-1.5 text-sm rounded-lg transition-colors font-semibold",j===e.value?"bg-base-300 text-base-content":"text-base-content/60 hover:text-base-content hover:bg-base-200",t?"opacity-40 cursor-not-allowed hover:bg-transparent":""),children:e.label},e.value)})}),m?null:(0,l.jsx)("p",{className:"text-center text-[11px] opacity-60 mt-2",children:"Swipe and Onion Skin modes require both old and new image versions."})]})}},6162:(e,t,n)=>{n.d(t,{O:()=>f});var l=n(5155),s=n(8599),r=n(1425),a=n(4786);n(9413);var i=n(2115);let o=[];function d(e){return e.left?.type===a.sY.REMOVED&&e.right?.type===a.sY.ADDED}function c(e){return"string"==typeof e&&e.length>0?e:" "}function u(e){let t=e.type===a.sY.ADDED,n=e.type===a.sY.REMOVED;return(0,l.jsxs)("tr",{className:"line",children:[(0,l.jsx)("td",{className:(0,s.cn)("gutter",{"empty-gutter":null===e.leftLineNumber,"diff-added":t,"diff-removed":n}),children:(0,l.jsx)("pre",{className:"line-number",children:e.leftLineNumber??""})}),(0,l.jsx)("td",{className:(0,s.cn)("gutter",{"empty-gutter":null===e.rightLineNumber,"diff-added":t,"diff-removed":n}),children:(0,l.jsx)("pre",{className:"line-number",children:e.rightLineNumber??""})}),(0,l.jsx)("td",{className:(0,s.cn)("marker",{"diff-added":t,"diff-removed":n}),children:(0,l.jsx)("pre",{children:t?"+":n?"-":""})}),(0,l.jsx)("td",{className:(0,s.cn)("content",{"diff-added":t,"diff-removed":n}),children:(0,l.jsx)("pre",{className:"content-text",children:e.value})})]},e.key)}function m({oldValue:e,newValue:t,useDarkTheme:n=!1,linesOffset:r=0,showDiffOnly:m=!0,extraLinesSurroundingDiff:f=3}){let[h,p]=(0,i.useState)({signature:"",blocks:[]}),x=(0,i.useMemo)(()=>`${r}:${+!!m}:${f}:${e}\0${t}`,[e,t,r,m,f]),g=(0,i.useMemo)(()=>h.signature===x?h.blocks:o,[h,x]),{lineInformation:b,diffLines:N}=(0,i.useMemo)(()=>(0,a.sO)(e,t,!0,void 0,r),[e,t,r]),y=(0,i.useMemo)(()=>{if(0===b.length)return[];if(!m||0===N.length)return b.map((e,t)=>({type:"line",line:e,sourceIndex:t}));let e=Math.max(0,f),t=Array.from({length:b.length},()=>!1);N.forEach(n=>{let l=Math.max(0,n-e),s=Math.min(b.length-1,n+e);for(let e=l;e<=s;e+=1)t[e]=!0});for(let e=0;e<t.length;e+=1){if(t[e])continue;let n=e;for(;e<t.length&&!t[e];)e+=1;if(g.includes(n))for(let l=n;l<e;l+=1)t[l]=!0;e-=1}let n=[];for(let e=0;e<t.length;e+=1){if(t[e]){n.push({type:"line",line:b[e],sourceIndex:e});continue}let l=e;for(;e<t.length&&!t[e];)e+=1;n.push({type:"fold",foldStartIndex:l,totalLines:e-l}),e-=1}return n},[b,N,m,f,g]),v=(0,i.useMemo)(()=>{let e=[];for(let t=0;t<y.length;t+=1){let n=y[t];if("fold"===n.type){e.push((0,l.jsxs)("tr",{className:"code-fold",children:[(0,l.jsx)("td",{className:"code-fold-gutter"}),(0,l.jsx)("td",{className:"code-fold-gutter"}),(0,l.jsx)("td",{}),(0,l.jsx)("td",{children:(0,l.jsx)("button",{type:"button",className:"cursor-pointer underline",onClick:()=>{p(e=>{let t=e.signature===x?e.blocks:[];return t.includes(n.foldStartIndex)?e.signature===x?e:{signature:x,blocks:t}:{signature:x,blocks:[...t,n.foldStartIndex]}})},children:(0,l.jsxs)("pre",{className:"code-fold-content",children:["Expand ",n.totalLines," lines ..."]})})})]},`fold-${n.foldStartIndex}`));continue}if(d(n.line)){let n=[],l=[],s=t;for(;s<y.length;){let e=y[s];if("line"!==e.type||!d(e.line))break;n.push({key:`line-${e.sourceIndex}-paired-removed`,type:a.sY.REMOVED,leftLineNumber:e.line.left?.lineNumber??null,rightLineNumber:null,value:c(e.line.left?.value)}),l.push({key:`line-${e.sourceIndex}-paired-added`,type:a.sY.ADDED,leftLineNumber:null,rightLineNumber:e.line.right?.lineNumber??null,value:c(e.line.right?.value)}),s+=1}n.forEach(t=>{e.push(u(t))}),l.forEach(t=>{e.push(u(t))}),t=s-1;continue}e.push(u(function(e,t){let n=e.left??{},l=e.right??{};return n.type===a.sY.REMOVED?{key:`line-${t}-removed`,type:a.sY.REMOVED,leftLineNumber:n.lineNumber??null,rightLineNumber:null,value:c(n.value)}:l.type===a.sY.ADDED?{key:`line-${t}-added`,type:a.sY.ADDED,leftLineNumber:null,rightLineNumber:l.lineNumber??null,value:c(l.value)}:{key:`line-${t}-default`,type:a.sY.DEFAULT,leftLineNumber:n.lineNumber??null,rightLineNumber:l.lineNumber??null,value:c(n.value??l.value)}}(n.line,n.sourceIndex)))}return e},[y,x]);return(0,l.jsx)("table",{className:(0,s.cn)("diff-container",n?"dark-theme":"light-theme"),children:(0,l.jsx)("tbody",{children:v})})}function f({oldValue:e,newValue:t,splitView:n,useDarkTheme:s=!1,linesOffset:a=0,showDiffOnly:i=!0,extraLinesSurroundingDiff:o=3}){return n?(0,l.jsx)(r.Ay,{oldValue:e,newValue:t,splitView:!0,useDarkTheme:s,disableWordDiff:!0}):(0,l.jsx)(m,{oldValue:e,newValue:t,useDarkTheme:s,linesOffset:a,showDiffOnly:i,extraLinesSurroundingDiff:o})}},6534:(e,t,n)=>{n.d(t,{J:()=>a});var l=n(2115),s=n(696),r=n(8599);function a(e,t){let n=(0,s.GK)(e);(0,l.useEffect)(()=>{let l=e?n?(0,r.iu)(n):(0,r.kj)(e):"Workspace";document.title=`${l} | ${t}`},[e,n,t])}}}]);
+  `,backgroundSize:"22px 22px",backgroundPosition:"0 0, 0 11px, 11px -11px, -11px 0px"};function d(e,t){let[n,l]=(0,r.useState)(null),s=(0,r.useMemo)(()=>e&&t?`data:${e};base64,${t}`:null,[e,t]),a=(0,r.useMemo)(()=>(function(e){if(!e)return null;let t=e.endsWith("==")?2:+!!e.endsWith("="),n=Math.max(0,Math.floor(3*e.length/4)-t);return n<1024?`${n} B`:n<1048576?`${(n/1024).toFixed(1)} KB`:`${(n/1048576).toFixed(1)} MB`})(t),[t]);(0,r.useEffect)(()=>{if(!s)return;let e=!1,t=new Image;return t.onload=()=>{e||l({src:s,dimensions:{width:t.naturalWidth,height:t.naturalHeight}})},t.onerror=()=>{e||l({src:s,dimensions:null})},t.src=s,()=>{e=!0}},[s]);let i=s&&n?.src===s?n.dimensions:null;return{src:s,metadata:i&&a?`${i.width} x ${i.height} px, ${a}`:a?`-, ${a}`:null}}function c({title:e,filePath:t,imageSrc:n,metadata:s}){return(0,l.jsxs)("section",{className:"border border-base-300 rounded-lg bg-base-200/30 overflow-hidden h-full min-h-0 flex flex-col",children:[(0,l.jsx)("header",{className:"px-3 py-2 border-b border-base-300 text-[10px] uppercase tracking-wider font-bold opacity-70",children:s?`${e} (${s})`:e}),(0,l.jsx)("div",{className:"flex-1 min-h-0 flex items-center justify-center p-3",style:o,children:n?(0,l.jsx)("img",{src:n,alt:`${e} image for ${t}`,className:"max-w-full max-h-full object-contain",draggable:!1}):(0,l.jsx)("span",{className:"text-sm opacity-50",children:"No image"})})]})}function u({filePath:e,imageDiff:t}){let n=d(t?.left?.mimeType,t?.left?.base64),u=d(t?.right?.mimeType,t?.right?.base64),m=!!(n.src&&u.src),[f,h]=(0,r.useState)(()=>{try{let e=localStorage.getItem(a);if("side-by-side"===e||"swipe"===e||"onion-skin"===e)return e}catch(e){console.error("Failed to load image diff mode preference:",e)}return"side-by-side"}),[p,x]=(0,r.useState)(50),[g,b]=(0,r.useState)(50),[N,y]=(0,r.useState)(null),v=(0,r.useRef)(null),j=m||"side-by-side"===f?f:"side-by-side";(0,r.useEffect)(()=>{try{localStorage.setItem(a,f)}catch(e){console.error("Failed to save image diff mode preference:",e)}},[f]);let w=(0,r.useCallback)(e=>{let t=v.current;if(!t)return;let n=t.getBoundingClientRect();n.width<=0||x(100*Math.max(0,Math.min(1,(e-n.left)/n.width)))},[]),k=(0,r.useCallback)(e=>{"swipe"===j&&m&&(e.preventDefault(),e.currentTarget.setPointerCapture(e.pointerId),y(e.pointerId),w(e.clientX))},[j,m,w]),$=(0,r.useCallback)(e=>{"swipe"===j&&N===e.pointerId&&w(e.clientX)},[j,N,w]),D=(0,r.useCallback)(e=>{N===e.pointerId&&(e.currentTarget.hasPointerCapture(e.pointerId)&&e.currentTarget.releasePointerCapture(e.pointerId),y(null))},[N]);return(0,l.jsxs)("div",{className:"h-full min-h-0 p-4 box-border flex flex-col",children:[(0,l.jsx)("div",{className:(0,s.cn)("flex-1 min-h-0","side-by-side"===j?"overflow-auto":"overflow-hidden"),children:"side-by-side"===j?(0,l.jsxs)("div",{className:"min-w-[720px] h-full min-h-0 grid grid-cols-2 gap-4",children:[(0,l.jsx)(c,{title:"Old",filePath:e,imageSrc:n.src,metadata:n.metadata}),(0,l.jsx)(c,{title:"New",filePath:e,imageSrc:u.src,metadata:u.metadata})]}):(0,l.jsxs)("div",{className:"h-full min-h-0 flex flex-col",children:[(0,l.jsxs)("div",{className:"px-1 pb-2 text-sm font-semibold flex items-center justify-between gap-3",children:[(0,l.jsxs)("div",{className:"flex items-center gap-2 min-w-0",children:[(0,l.jsx)("span",{className:"text-error shrink-0",children:"Old"}),(0,l.jsx)("span",{className:"text-[11px] opacity-60 truncate font-mono",children:n.metadata??"No image"})]}),(0,l.jsxs)("div",{className:"flex items-center gap-2 min-w-0 justify-end",children:[(0,l.jsx)("span",{className:"text-[11px] opacity-60 truncate font-mono",children:u.metadata??"No image"}),(0,l.jsx)("span",{className:"text-success shrink-0",children:"New"})]})]}),(0,l.jsxs)("div",{ref:v,className:(0,s.cn)("relative flex-1 min-h-0 rounded-lg border border-base-300 overflow-hidden shadow-sm","swipe"===j&&m?"cursor-ew-resize touch-none":""),style:o,onPointerDown:k,onPointerMove:$,onPointerUp:D,onPointerCancel:D,children:[n.src?(0,l.jsx)("img",{src:n.src,alt:`Old image for ${e}`,className:"absolute inset-0 w-full h-full object-contain pointer-events-none select-none",draggable:!1}):null,"onion-skin"===j?u.src?(0,l.jsx)("img",{src:u.src,alt:`New image for ${e}`,className:"absolute inset-0 w-full h-full object-contain pointer-events-none select-none",style:{opacity:g/100},draggable:!1}):null:u.src?(0,l.jsx)("img",{src:u.src,alt:`New image for ${e}`,className:"absolute inset-0 w-full h-full object-contain pointer-events-none select-none",style:{clipPath:`inset(0 0 0 ${p}%)`},draggable:!1}):null,"swipe"===j&&m?(0,l.jsxs)(l.Fragment,{children:[(0,l.jsx)("div",{className:"absolute top-0 bottom-0 w-[2px] bg-primary/90 pointer-events-none",style:{left:`${p}%`,transform:"translateX(-1px)"}}),(0,l.jsx)("div",{className:"absolute top-1/2 -translate-y-1/2 w-4 h-4 rounded-full border border-primary bg-base-100 pointer-events-none",style:{left:`${p}%`,transform:"translate(-50%, -50%)"}})]}):null,n.src||u.src?null:(0,l.jsx)("div",{className:"absolute inset-0 flex items-center justify-center text-sm opacity-50",children:"No image data available"})]})]})}),"onion-skin"===j&&m?(0,l.jsxs)("div",{className:"mt-3 flex items-center justify-center gap-3 shrink-0",children:[(0,l.jsx)("span",{className:"text-sm font-semibold text-error",children:"Old"}),(0,l.jsx)("input",{type:"range",min:0,max:100,value:g,onChange:e=>b(Number(e.target.value)),className:"range range-primary range-sm w-[320px] max-w-[65vw]","aria-label":"Onion skin blend slider"}),(0,l.jsx)("span",{className:"text-sm font-semibold text-success",children:"New"})]}):null,(0,l.jsx)("div",{className:"mt-3 flex items-center justify-center gap-2 shrink-0",children:i.map(e=>{let t="side-by-side"!==e.value&&!m;return(0,l.jsx)("button",{type:"button",onClick:()=>h(e.value),disabled:t,className:(0,s.cn)("px-4 py-1.5 text-sm rounded-lg transition-colors font-semibold",j===e.value?"bg-base-300 text-base-content":"text-base-content/60 hover:text-base-content hover:bg-base-200",t?"opacity-40 cursor-not-allowed hover:bg-transparent":""),children:e.label},e.value)})}),m?null:(0,l.jsx)("p",{className:"text-center text-[11px] opacity-60 mt-2",children:"Swipe and Onion Skin modes require both old and new image versions."})]})}},6162:(e,t,n)=>{n.d(t,{O:()=>f});var l=n(5155),s=n(8599),r=n(1425),a=n(4786);n(9413);var i=n(2115);let o=[];function d(e){return e.left?.type===a.sY.REMOVED&&e.right?.type===a.sY.ADDED}function c(e){return"string"==typeof e&&e.length>0?e:" "}function u(e){let t=e.type===a.sY.ADDED,n=e.type===a.sY.REMOVED;return(0,l.jsxs)("tr",{className:"line",children:[(0,l.jsx)("td",{className:(0,s.cn)("gutter",{"empty-gutter":null===e.leftLineNumber,"diff-added":t,"diff-removed":n}),children:(0,l.jsx)("pre",{className:"line-number",children:e.leftLineNumber??""})}),(0,l.jsx)("td",{className:(0,s.cn)("gutter",{"empty-gutter":null===e.rightLineNumber,"diff-added":t,"diff-removed":n}),children:(0,l.jsx)("pre",{className:"line-number",children:e.rightLineNumber??""})}),(0,l.jsx)("td",{className:(0,s.cn)("marker",{"diff-added":t,"diff-removed":n}),children:(0,l.jsx)("pre",{children:t?"+":n?"-":""})}),(0,l.jsx)("td",{className:(0,s.cn)("content",{"diff-added":t,"diff-removed":n}),children:(0,l.jsx)("pre",{className:"content-text",children:e.value})})]},e.key)}function m({oldValue:e,newValue:t,useDarkTheme:n=!1,linesOffset:r=0,showDiffOnly:m=!0,extraLinesSurroundingDiff:f=3}){let[h,p]=(0,i.useState)({signature:"",blocks:[]}),x=(0,i.useMemo)(()=>`${r}:${+!!m}:${f}:${e}\0${t}`,[e,t,r,m,f]),g=(0,i.useMemo)(()=>h.signature===x?h.blocks:o,[h,x]),{lineInformation:b}=(0,i.useMemo)(()=>(0,a.sO)(e,t,!0,void 0,r),[e,t,r]),N=(0,i.useMemo)(()=>{let e=[];return b.forEach((t,n)=>{(t.left?.type!==a.sY.DEFAULT||t.right?.type!==a.sY.DEFAULT)&&e.push(n)}),e},[b]),y=(0,i.useMemo)(()=>{if(0===b.length)return[];if(!m||0===N.length)return b.map((e,t)=>({type:"line",line:e,sourceIndex:t}));let e=Math.max(0,f),t=Array.from({length:b.length},()=>!1);N.forEach(n=>{let l=Math.max(0,n-e),s=Math.min(b.length-1,n+e);for(let e=l;e<=s;e+=1)t[e]=!0});for(let e=0;e<t.length;e+=1){if(t[e])continue;let n=e;for(;e<t.length&&!t[e];)e+=1;if(g.includes(n))for(let l=n;l<e;l+=1)t[l]=!0;e-=1}let n=[];for(let e=0;e<t.length;e+=1){if(t[e]){n.push({type:"line",line:b[e],sourceIndex:e});continue}let l=e;for(;e<t.length&&!t[e];)e+=1;n.push({type:"fold",foldStartIndex:l,totalLines:e-l}),e-=1}return n},[b,N,m,f,g]),v=(0,i.useMemo)(()=>{let e=[];for(let t=0;t<y.length;t+=1){let n=y[t];if("fold"===n.type){e.push((0,l.jsxs)("tr",{className:"code-fold",children:[(0,l.jsx)("td",{className:"code-fold-gutter"}),(0,l.jsx)("td",{className:"code-fold-gutter"}),(0,l.jsx)("td",{}),(0,l.jsx)("td",{children:(0,l.jsx)("button",{type:"button",className:"cursor-pointer underline",onClick:()=>{p(e=>{let t=e.signature===x?e.blocks:[];return t.includes(n.foldStartIndex)?e.signature===x?e:{signature:x,blocks:t}:{signature:x,blocks:[...t,n.foldStartIndex]}})},children:(0,l.jsxs)("pre",{className:"code-fold-content",children:["Expand ",n.totalLines," lines ..."]})})})]},`fold-${n.foldStartIndex}`));continue}if(d(n.line)){let n=[],l=[],s=t;for(;s<y.length;){let e=y[s];if("line"!==e.type||!d(e.line))break;n.push({key:`line-${e.sourceIndex}-paired-removed`,type:a.sY.REMOVED,leftLineNumber:e.line.left?.lineNumber??null,rightLineNumber:null,value:c(e.line.left?.value)}),l.push({key:`line-${e.sourceIndex}-paired-added`,type:a.sY.ADDED,leftLineNumber:null,rightLineNumber:e.line.right?.lineNumber??null,value:c(e.line.right?.value)}),s+=1}n.forEach(t=>{e.push(u(t))}),l.forEach(t=>{e.push(u(t))}),t=s-1;continue}e.push(u(function(e,t){let n=e.left??{},l=e.right??{};return n.type===a.sY.REMOVED?{key:`line-${t}-removed`,type:a.sY.REMOVED,leftLineNumber:n.lineNumber??null,rightLineNumber:null,value:c(n.value)}:l.type===a.sY.ADDED?{key:`line-${t}-added`,type:a.sY.ADDED,leftLineNumber:null,rightLineNumber:l.lineNumber??null,value:c(l.value)}:{key:`line-${t}-default`,type:a.sY.DEFAULT,leftLineNumber:n.lineNumber??null,rightLineNumber:l.lineNumber??null,value:c(n.value??l.value)}}(n.line,n.sourceIndex)))}return e},[y,x]);return(0,l.jsx)("table",{className:(0,s.cn)("diff-container",n?"dark-theme":"light-theme"),children:(0,l.jsx)("tbody",{children:v})})}function f({oldValue:e,newValue:t,splitView:n,useDarkTheme:s=!1,linesOffset:a=0,showDiffOnly:i=!0,extraLinesSurroundingDiff:o=3}){return n?(0,l.jsx)(r.Ay,{oldValue:e,newValue:t,splitView:!0,useDarkTheme:s,disableWordDiff:!0}):(0,l.jsx)(m,{oldValue:e,newValue:t,useDarkTheme:s,linesOffset:a,showDiffOnly:i,extraLinesSurroundingDiff:o})}},6534:(e,t,n)=>{n.d(t,{J:()=>a});var l=n(2115),s=n(696),r=n(8599);function a(e,t){let n=(0,s.GK)(e);(0,l.useEffect)(()=>{let l=e?n?(0,r.iu)(n):(0,r.kj)(e):"Workspace";document.title=`${l} | ${t}`},[e,n,t])}}}]);

package/.next/static/chunks/app/workspace/conflicts/{page-4e3388cbfeb080ce.js → page-18af9ad0cb7d82fc.js}

@@ -1 +1 @@
-(self.webpackChunk_N_E=self.webpackChunk_N_E||[]).push([[612],{3280:(e,s,t)=>{"use strict";t.r(s),t.d(s,{default:()=>f});var n=t(5155),l=t(3321),a=t(2115),r=t(6534),i=t(696),c=t(8599),d=t(6695),o=t(6162),u=t(460);function x(e){return"merge"===e?"Merge":"rebase"===e?"Rebase":"Conflict"}function m({filePath:e,versions:s,isBinary:t,onResolve:l,busy:r}){let[i,c]=(0,a.useState)(s.current||s.ours||s.theirs||""),{resolvedTheme:d}=(0,u.D)();return t?(0,n.jsxs)("div",{className:"h-full p-6 flex flex-col gap-4",children:[(0,n.jsx)("h2",{className:"text-lg font-bold",children:"Binary Conflict"}),(0,n.jsx)("p",{className:"text-sm opacity-70",children:"This conflicted file looks binary. Use one side to resolve it."}),(0,n.jsxs)("div",{className:"flex items-center gap-2",children:[(0,n.jsx)("button",{className:"btn btn-sm",onClick:()=>l("ours",{stage:!0}),disabled:r,children:"Use Ours"}),(0,n.jsx)("button",{className:"btn btn-sm",onClick:()=>l("theirs",{stage:!0}),disabled:r,children:"Use Theirs"})]})]}):(0,n.jsxs)("div",{className:"h-full flex flex-col overflow-hidden",children:[(0,n.jsxs)("div",{className:"px-4 py-3 border-b border-base-300 bg-base-100 flex items-center justify-between gap-3",children:[(0,n.jsxs)("div",{className:"min-w-0",children:[(0,n.jsx)("div",{className:"text-xs uppercase tracking-wider opacity-60",children:"Resolving"}),(0,n.jsx)("div",{className:"font-mono text-xs truncate",title:e,children:e})]}),(0,n.jsxs)("div",{className:"flex items-center gap-2",children:[(0,n.jsx)("button",{className:"btn btn-xs",onClick:()=>c(s.ours),disabled:r,children:"Copy Ours"}),(0,n.jsx)("button",{className:"btn btn-xs",onClick:()=>c(s.theirs),disabled:r,children:"Copy Theirs"}),(0,n.jsx)("button",{className:"btn btn-xs btn-outline",onClick:()=>void l("manual",{content:i,stage:!1}),disabled:r,children:"Save"}),(0,n.jsx)("button",{className:"btn btn-xs btn-primary",onClick:()=>void l("manual",{content:i,stage:!0}),disabled:r,children:"Save + Stage"})]})]}),(0,n.jsxs)("div",{className:"flex-1 min-h-0 border-b border-base-300 flex flex-col",children:[(0,n.jsxs)("div",{className:"grid grid-cols-2 gap-0 border-b border-base-300",children:[(0,n.jsx)("div",{className:"px-3 py-2 text-xs font-bold uppercase tracking-wider bg-base-200/60 border-r border-base-300",children:"Ours"}),(0,n.jsx)("div",{className:"px-3 py-2 text-xs font-bold uppercase tracking-wider bg-base-200/60",children:"Theirs"})]}),(0,n.jsx)("div",{className:"flex-1 min-h-0 overflow-auto diff-viewer-wrapper",children:(0,n.jsx)(o.O,{oldValue:s.ours,newValue:s.theirs,splitView:!0,useDarkTheme:"dark"===d,showDiffOnly:!1})})]}),(0,n.jsxs)("div",{className:"flex-[1.2] min-h-0 flex flex-col",children:[(0,n.jsx)("div",{className:"px-3 py-2 text-xs font-bold uppercase tracking-wider bg-base-200/60 border-b border-base-300",children:"Resolved (Editable)"}),(0,n.jsx)("textarea",{value:i,onChange:e=>c(e.target.value),className:"textarea textarea-ghost h-full w-full rounded-none resize-none font-mono text-xs leading-5",spellCheck:!1})]}),(0,n.jsxs)("div",{className:"px-4 py-2 border-t border-base-300 bg-base-100 flex items-center justify-end gap-2",children:[(0,n.jsx)("button",{className:"btn btn-sm",onClick:()=>void l("ours",{stage:!0}),disabled:r,children:"Use Ours + Stage"}),(0,n.jsx)("button",{className:"btn btn-sm",onClick:()=>void l("theirs",{stage:!0}),disabled:r,children:"Use Theirs + Stage"})]})]})}function b({repoPath:e}){let s=(0,l.useRouter)(),t=(0,l.useSearchParams)(),{data:r,isLoading:o,isError:u,error:b,refetch:h}=(0,i.en)(e),{data:f,isLoading:p,isError:g,error:N,refetch:j}=(0,i.F7)(e),{mutateAsync:v,isPending:y}=(0,i.a3)(),[k,w]=(0,a.useState)(null),C=r?.conflicted??[],D=new Set(C),E=(r?.files??[]).filter(e=>!D.has(e.path)&&" "===e.index&&" "!==e.working_dir).map(e=>e.path),$=(r?.files??[]).filter(e=>!D.has(e.path)&&" "!==e.index).map(e=>e.path),S=k&&C.includes(k)?k:C[0]??null,{data:L,isLoading:O,isError:R,error:A,refetch:M}=(0,i.b5)(e,S),V=f?.operation??null,T=(0,a.useCallback)((e="")=>{let s=new URLSearchParams(t.toString()).toString();return s?`/workspace${e}?${s}`:`/workspace${e}`},[t]),Y=(0,a.useCallback)(async()=>{await Promise.all([h(),j(),M()])},[j,h,M]),U=async(s,t,n={})=>{await v({repoPath:e,action:"resolve-conflict-file",data:{path:s,strategy:t,content:n.content,stage:n.stage??!0}}),await Y(),(0,d.oR)({type:"success",title:"Conflict Updated",description:"manual"===t?!1===n.stage?"Saved manual resolution.":"Saved and staged manual resolution.":`Applied ${t} version${!1===n.stage?"":" and staged it"}.`})},P=async s=>{await v({repoPath:e,action:"stage",data:{files:[s]}}),await Y()},I=async()=>{let t="rebase"===V?"abort-rebase":"merge"===V?"abort-merge":null;t&&(await v({repoPath:e,action:t}),(0,d.oR)({type:"info",title:`${x(V)} Aborted`,description:`The ${x(V).toLowerCase()} operation was aborted.`}),s.push(T()))},_=async()=>{let t="rebase"===V?"continue-rebase":"merge"===V?"continue-merge":null;t&&(await v({repoPath:e,action:t}),(0,d.oR)({type:"success",title:`${x(V)} Completed`,description:`${x(V)} continued successfully.`}),s.push(T()))};if(o||p)return(0,n.jsx)("div",{className:"flex items-center justify-center h-64",children:(0,n.jsx)("span",{className:"loading loading-spinner text-base-content/50"})});if(u||g)return(0,n.jsxs)("div",{className:"flex items-center justify-center h-64 flex-col gap-4",children:[(0,n.jsx)("p",{className:"text-error font-bold",children:"Error Loading Conflicts"}),(0,n.jsx)("p",{className:"text-sm opacity-70",children:b?.message||N?.message||"An unknown error occurred"}),(0,n.jsxs)("button",{onClick:()=>void Y(),className:"btn btn-outline btn-sm",disabled:y,children:[(0,n.jsx)("i",{className:"iconoir-refresh-circle text-[16px] mr-1","aria-hidden":"true"}),"Try Again"]})]});let F=!!V,B=C.length>0,J=!!f?.canContinue&&F,W=!!S&&(0,c.kO)(S,L?.ours,L?.theirs||L?.current);return(0,n.jsxs)("div",{className:"flex h-full overflow-hidden",children:[(0,n.jsxs)("div",{className:"w-80 border-r border-base-300 flex flex-col bg-base-200/30",children:[(0,n.jsxs)("div",{className:"h-[57px] px-4 border-b border-base-300 flex items-center justify-between bg-base-100",children:[(0,n.jsx)("h1",{className:"font-bold text-lg",children:"Conflicts"}),(0,n.jsx)("button",{className:"btn btn-ghost btn-sm btn-square",onClick:()=>void Y(),disabled:y,title:"Refresh",children:(0,n.jsx)("i",{className:"iconoir-refresh-circle text-[16px]","aria-hidden":"true"})})]}),(0,n.jsxs)("div",{className:"p-4 border-b border-base-300 space-y-2",children:[(0,n.jsx)("div",{className:"text-xs opacity-70",children:"Operation"}),(0,n.jsxs)("div",{className:"flex items-center justify-between",children:[(0,n.jsx)("span",{className:(0,c.cn)("badge",F?"badge-warning":"badge-ghost"),children:F?x(V):"None"}),(0,n.jsx)("span",{className:(0,c.cn)("badge",B?"badge-error":"badge-success"),children:B?`${C.length} unresolved`:"No unresolved"})]})]}),(0,n.jsxs)("div",{className:"flex-1 overflow-y-auto p-2",children:[(0,n.jsx)("div",{className:"px-2 py-2 text-xs font-bold uppercase tracking-wider opacity-70",children:"Unresolved Files"}),(0,n.jsxs)("div",{className:"space-y-0.5",children:[0===C.length&&(0,n.jsx)("p",{className:"px-2 py-2 text-xs opacity-50 italic",children:"No unresolved conflicts."}),C.map(e=>(0,n.jsxs)("div",{className:(0,c.cn)("rounded-md border border-transparent",S===e&&"bg-base-300 border-base-300"),children:[(0,n.jsxs)("button",{className:(0,c.cn)("w-full text-left flex items-center gap-2 px-2 py-2 rounded-md text-sm hover:bg-base-300 transition-colors",S===e&&"text-primary font-medium"),onClick:()=>w(e),title:e,children:[(0,n.jsx)("i",{className:"iconoir-warning-triangle text-[14px] text-error shrink-0","aria-hidden":"true"}),(0,n.jsx)("span",{className:"truncate font-mono text-xs",children:e})]}),(0,n.jsxs)("div",{className:"px-2 pb-2 flex items-center gap-1",children:[(0,n.jsx)("button",{className:"btn btn-xs",onClick:()=>void U(e,"ours",{stage:!0}),disabled:y,children:"Ours"}),(0,n.jsx)("button",{className:"btn btn-xs",onClick:()=>void U(e,"theirs",{stage:!0}),disabled:y,children:"Theirs"})]})]},e))]}),E.length>0&&(0,n.jsxs)(n.Fragment,{children:[(0,n.jsx)("div",{className:"h-px bg-base-300 mx-2 my-3"}),(0,n.jsx)("div",{className:"px-2 py-2 text-xs font-bold uppercase tracking-wider opacity-70",children:"Ready to Stage"}),(0,n.jsx)("div",{className:"space-y-1",children:E.map(e=>(0,n.jsxs)("div",{className:"flex items-center gap-2 px-2 py-1.5 rounded-md bg-base-100 border border-base-300",children:[(0,n.jsx)("span",{className:"truncate font-mono text-xs flex-1",title:e,children:e}),(0,n.jsx)("button",{className:"btn btn-xs btn-success",onClick:()=>void P(e),disabled:y,title:"Stage as resolved",children:"Stage"})]},e))})]}),$.length>0&&(0,n.jsxs)(n.Fragment,{children:[(0,n.jsx)("div",{className:"h-px bg-base-300 mx-2 my-3"}),(0,n.jsx)("div",{className:"px-2 py-2 text-xs font-bold uppercase tracking-wider opacity-70",children:"Staged Resolutions"}),(0,n.jsx)("div",{className:"space-y-1",children:$.map(e=>(0,n.jsx)("div",{className:"px-2 py-1.5 rounded-md bg-success/10 border border-success/20",children:(0,n.jsx)("span",{className:"truncate font-mono text-xs",title:e,children:e})},e))})]})]}),(0,n.jsx)("div",{className:"border-t border-base-300 p-3 space-y-2",children:(0,n.jsxs)("div",{className:"grid grid-cols-2 gap-2",children:[(0,n.jsx)("button",{className:"btn btn-primary btn-sm",onClick:()=>void _(),disabled:!J||y,children:"Continue"}),(0,n.jsx)("button",{className:"btn btn-error btn-outline btn-sm",onClick:()=>void I(),disabled:!F||y,children:"Abort"})]})})]}),(0,n.jsx)("div",{className:"flex-1 flex flex-col bg-base-100 overflow-hidden",children:S?O?(0,n.jsx)("div",{className:"flex-1 flex items-center justify-center",children:(0,n.jsx)("span",{className:"loading loading-spinner"})}):R||!L?(0,n.jsxs)("div",{className:"flex-1 flex items-center justify-center flex-col gap-3",children:[(0,n.jsx)("p",{className:"text-error font-bold",children:"Failed to load file versions"}),(0,n.jsx)("p",{className:"text-xs opacity-70",children:A?.message||"Unknown error"}),(0,n.jsx)("button",{className:"btn btn-sm btn-outline",onClick:()=>void M(),children:"Retry"})]}):(0,n.jsx)(m,{filePath:S,versions:L,isBinary:W,onResolve:(e,s)=>U(S,e,s),busy:y},`${S}:${L.ours.length}:${L.theirs.length}:${L.current.length}`):(0,n.jsx)("div",{className:"flex-1 flex items-center justify-center opacity-60",children:(0,n.jsxs)("div",{className:"text-center",children:[(0,n.jsx)("div",{className:"p-8 rounded-full bg-base-200 mb-4 text-4xl mx-auto w-fit",children:(0,n.jsx)("i",{className:"iconoir-warning-triangle text-[32px]","aria-hidden":"true"})}),(0,n.jsx)("p",{className:"text-sm font-bold",children:"Select a conflicted file to resolve"}),(0,n.jsx)("p",{className:"text-xs opacity-70 mt-2",children:"Pick ours/theirs or edit manually."})]})})})]})}function h(){let e=(0,l.useSearchParams)().get("path");return((0,r.J)(e,"Conflicts"),e)?(0,n.jsx)(b,{repoPath:e}):(0,n.jsx)("div",{className:"p-8",children:"No repository path specified."})}function f(){return(0,n.jsx)(a.Suspense,{fallback:(0,n.jsx)("div",{className:"flex items-center justify-center h-full",children:(0,n.jsx)("span",{className:"loading loading-spinner"})}),children:(0,n.jsx)(h,{})})}},6162:(e,s,t)=>{"use strict";t.d(s,{O:()=>m});var n=t(5155),l=t(8599),a=t(1425),r=t(4786);t(9413);var i=t(2115);let c=[];function d(e){return e.left?.type===r.sY.REMOVED&&e.right?.type===r.sY.ADDED}function o(e){return"string"==typeof e&&e.length>0?e:" "}function u(e){let s=e.type===r.sY.ADDED,t=e.type===r.sY.REMOVED;return(0,n.jsxs)("tr",{className:"line",children:[(0,n.jsx)("td",{className:(0,l.cn)("gutter",{"empty-gutter":null===e.leftLineNumber,"diff-added":s,"diff-removed":t}),children:(0,n.jsx)("pre",{className:"line-number",children:e.leftLineNumber??""})}),(0,n.jsx)("td",{className:(0,l.cn)("gutter",{"empty-gutter":null===e.rightLineNumber,"diff-added":s,"diff-removed":t}),children:(0,n.jsx)("pre",{className:"line-number",children:e.rightLineNumber??""})}),(0,n.jsx)("td",{className:(0,l.cn)("marker",{"diff-added":s,"diff-removed":t}),children:(0,n.jsx)("pre",{children:s?"+":t?"-":""})}),(0,n.jsx)("td",{className:(0,l.cn)("content",{"diff-added":s,"diff-removed":t}),children:(0,n.jsx)("pre",{className:"content-text",children:e.value})})]},e.key)}function x({oldValue:e,newValue:s,useDarkTheme:t=!1,linesOffset:a=0,showDiffOnly:x=!0,extraLinesSurroundingDiff:m=3}){let[b,h]=(0,i.useState)({signature:"",blocks:[]}),f=(0,i.useMemo)(()=>`${a}:${+!!x}:${m}:${e}\0${s}`,[e,s,a,x,m]),p=(0,i.useMemo)(()=>b.signature===f?b.blocks:c,[b,f]),{lineInformation:g,diffLines:N}=(0,i.useMemo)(()=>(0,r.sO)(e,s,!0,void 0,a),[e,s,a]),j=(0,i.useMemo)(()=>{if(0===g.length)return[];if(!x||0===N.length)return g.map((e,s)=>({type:"line",line:e,sourceIndex:s}));let e=Math.max(0,m),s=Array.from({length:g.length},()=>!1);N.forEach(t=>{let n=Math.max(0,t-e),l=Math.min(g.length-1,t+e);for(let e=n;e<=l;e+=1)s[e]=!0});for(let e=0;e<s.length;e+=1){if(s[e])continue;let t=e;for(;e<s.length&&!s[e];)e+=1;if(p.includes(t))for(let n=t;n<e;n+=1)s[n]=!0;e-=1}let t=[];for(let e=0;e<s.length;e+=1){if(s[e]){t.push({type:"line",line:g[e],sourceIndex:e});continue}let n=e;for(;e<s.length&&!s[e];)e+=1;t.push({type:"fold",foldStartIndex:n,totalLines:e-n}),e-=1}return t},[g,N,x,m,p]),v=(0,i.useMemo)(()=>{let e=[];for(let s=0;s<j.length;s+=1){let t=j[s];if("fold"===t.type){e.push((0,n.jsxs)("tr",{className:"code-fold",children:[(0,n.jsx)("td",{className:"code-fold-gutter"}),(0,n.jsx)("td",{className:"code-fold-gutter"}),(0,n.jsx)("td",{}),(0,n.jsx)("td",{children:(0,n.jsx)("button",{type:"button",className:"cursor-pointer underline",onClick:()=>{h(e=>{let s=e.signature===f?e.blocks:[];return s.includes(t.foldStartIndex)?e.signature===f?e:{signature:f,blocks:s}:{signature:f,blocks:[...s,t.foldStartIndex]}})},children:(0,n.jsxs)("pre",{className:"code-fold-content",children:["Expand ",t.totalLines," lines ..."]})})})]},`fold-${t.foldStartIndex}`));continue}if(d(t.line)){let t=[],n=[],l=s;for(;l<j.length;){let e=j[l];if("line"!==e.type||!d(e.line))break;t.push({key:`line-${e.sourceIndex}-paired-removed`,type:r.sY.REMOVED,leftLineNumber:e.line.left?.lineNumber??null,rightLineNumber:null,value:o(e.line.left?.value)}),n.push({key:`line-${e.sourceIndex}-paired-added`,type:r.sY.ADDED,leftLineNumber:null,rightLineNumber:e.line.right?.lineNumber??null,value:o(e.line.right?.value)}),l+=1}t.forEach(s=>{e.push(u(s))}),n.forEach(s=>{e.push(u(s))}),s=l-1;continue}e.push(u(function(e,s){let t=e.left??{},n=e.right??{};return t.type===r.sY.REMOVED?{key:`line-${s}-removed`,type:r.sY.REMOVED,leftLineNumber:t.lineNumber??null,rightLineNumber:null,value:o(t.value)}:n.type===r.sY.ADDED?{key:`line-${s}-added`,type:r.sY.ADDED,leftLineNumber:null,rightLineNumber:n.lineNumber??null,value:o(n.value)}:{key:`line-${s}-default`,type:r.sY.DEFAULT,leftLineNumber:t.lineNumber??null,rightLineNumber:n.lineNumber??null,value:o(t.value??n.value)}}(t.line,t.sourceIndex)))}return e},[j,f]);return(0,n.jsx)("table",{className:(0,l.cn)("diff-container",t?"dark-theme":"light-theme"),children:(0,n.jsx)("tbody",{children:v})})}function m({oldValue:e,newValue:s,splitView:t,useDarkTheme:l=!1,linesOffset:r=0,showDiffOnly:i=!0,extraLinesSurroundingDiff:c=3}){return t?(0,n.jsx)(a.Ay,{oldValue:e,newValue:s,splitView:!0,useDarkTheme:l,disableWordDiff:!0}):(0,n.jsx)(x,{oldValue:e,newValue:s,useDarkTheme:l,linesOffset:r,showDiffOnly:i,extraLinesSurroundingDiff:c})}},6534:(e,s,t)=>{"use strict";t.d(s,{J:()=>r});var n=t(2115),l=t(696),a=t(8599);function r(e,s){let t=(0,l.GK)(e);(0,n.useEffect)(()=>{let n=e?t?(0,a.iu)(t):(0,a.kj)(e):"Workspace";document.title=`${n} | ${s}`},[e,t,s])}},7621:(e,s,t)=>{Promise.resolve().then(t.bind(t,3280))}},e=>{e.O(0,[508,176,785,841,26,441,794,358],()=>e(e.s=7621)),_N_E=e.O()}]);
+(self.webpackChunk_N_E=self.webpackChunk_N_E||[]).push([[612],{3280:(e,s,t)=>{"use strict";t.r(s),t.d(s,{default:()=>f});var n=t(5155),l=t(3321),a=t(2115),r=t(6534),i=t(696),c=t(8599),d=t(6695),o=t(6162),u=t(460);function x(e){return"merge"===e?"Merge":"rebase"===e?"Rebase":"Conflict"}function m({filePath:e,versions:s,isBinary:t,onResolve:l,busy:r}){let[i,c]=(0,a.useState)(s.current||s.ours||s.theirs||""),{resolvedTheme:d}=(0,u.D)();return t?(0,n.jsxs)("div",{className:"h-full p-6 flex flex-col gap-4",children:[(0,n.jsx)("h2",{className:"text-lg font-bold",children:"Binary Conflict"}),(0,n.jsx)("p",{className:"text-sm opacity-70",children:"This conflicted file looks binary. Use one side to resolve it."}),(0,n.jsxs)("div",{className:"flex items-center gap-2",children:[(0,n.jsx)("button",{className:"btn btn-sm",onClick:()=>l("ours",{stage:!0}),disabled:r,children:"Use Ours"}),(0,n.jsx)("button",{className:"btn btn-sm",onClick:()=>l("theirs",{stage:!0}),disabled:r,children:"Use Theirs"})]})]}):(0,n.jsxs)("div",{className:"h-full flex flex-col overflow-hidden",children:[(0,n.jsxs)("div",{className:"px-4 py-3 border-b border-base-300 bg-base-100 flex items-center justify-between gap-3",children:[(0,n.jsxs)("div",{className:"min-w-0",children:[(0,n.jsx)("div",{className:"text-xs uppercase tracking-wider opacity-60",children:"Resolving"}),(0,n.jsx)("div",{className:"font-mono text-xs truncate",title:e,children:e})]}),(0,n.jsxs)("div",{className:"flex items-center gap-2",children:[(0,n.jsx)("button",{className:"btn btn-xs",onClick:()=>c(s.ours),disabled:r,children:"Copy Ours"}),(0,n.jsx)("button",{className:"btn btn-xs",onClick:()=>c(s.theirs),disabled:r,children:"Copy Theirs"}),(0,n.jsx)("button",{className:"btn btn-xs btn-outline",onClick:()=>void l("manual",{content:i,stage:!1}),disabled:r,children:"Save"}),(0,n.jsx)("button",{className:"btn btn-xs btn-primary",onClick:()=>void l("manual",{content:i,stage:!0}),disabled:r,children:"Save + Stage"})]})]}),(0,n.jsxs)("div",{className:"flex-1 min-h-0 border-b border-base-300 flex flex-col",children:[(0,n.jsxs)("div",{className:"grid grid-cols-2 gap-0 border-b border-base-300",children:[(0,n.jsx)("div",{className:"px-3 py-2 text-xs font-bold uppercase tracking-wider bg-base-200/60 border-r border-base-300",children:"Ours"}),(0,n.jsx)("div",{className:"px-3 py-2 text-xs font-bold uppercase tracking-wider bg-base-200/60",children:"Theirs"})]}),(0,n.jsx)("div",{className:"flex-1 min-h-0 overflow-auto diff-viewer-wrapper",children:(0,n.jsx)(o.O,{oldValue:s.ours,newValue:s.theirs,splitView:!0,useDarkTheme:"dark"===d,showDiffOnly:!1})})]}),(0,n.jsxs)("div",{className:"flex-[1.2] min-h-0 flex flex-col",children:[(0,n.jsx)("div",{className:"px-3 py-2 text-xs font-bold uppercase tracking-wider bg-base-200/60 border-b border-base-300",children:"Resolved (Editable)"}),(0,n.jsx)("textarea",{value:i,onChange:e=>c(e.target.value),className:"textarea textarea-ghost h-full w-full rounded-none resize-none font-mono text-xs leading-5",spellCheck:!1})]}),(0,n.jsxs)("div",{className:"px-4 py-2 border-t border-base-300 bg-base-100 flex items-center justify-end gap-2",children:[(0,n.jsx)("button",{className:"btn btn-sm",onClick:()=>void l("ours",{stage:!0}),disabled:r,children:"Use Ours + Stage"}),(0,n.jsx)("button",{className:"btn btn-sm",onClick:()=>void l("theirs",{stage:!0}),disabled:r,children:"Use Theirs + Stage"})]})]})}function b({repoPath:e}){let s=(0,l.useRouter)(),t=(0,l.useSearchParams)(),{data:r,isLoading:o,isError:u,error:b,refetch:h}=(0,i.en)(e),{data:f,isLoading:p,isError:g,error:N,refetch:j}=(0,i.F7)(e),{mutateAsync:v,isPending:y}=(0,i.a3)(),[k,w]=(0,a.useState)(null),C=r?.conflicted??[],E=new Set(C),D=(r?.files??[]).filter(e=>!E.has(e.path)&&" "===e.index&&" "!==e.working_dir).map(e=>e.path),$=(r?.files??[]).filter(e=>!E.has(e.path)&&" "!==e.index).map(e=>e.path),L=k&&C.includes(k)?k:C[0]??null,{data:S,isLoading:O,isError:R,error:A,refetch:M}=(0,i.b5)(e,L),T=f?.operation??null,V=(0,a.useCallback)((e="")=>{let s=new URLSearchParams(t.toString()).toString();return s?`/workspace${e}?${s}`:`/workspace${e}`},[t]),Y=(0,a.useCallback)(async()=>{await Promise.all([h(),j(),M()])},[j,h,M]),U=async(s,t,n={})=>{await v({repoPath:e,action:"resolve-conflict-file",data:{path:s,strategy:t,content:n.content,stage:n.stage??!0}}),await Y(),(0,d.oR)({type:"success",title:"Conflict Updated",description:"manual"===t?!1===n.stage?"Saved manual resolution.":"Saved and staged manual resolution.":`Applied ${t} version${!1===n.stage?"":" and staged it"}.`})},P=async s=>{await v({repoPath:e,action:"stage",data:{files:[s]}}),await Y()},F=async()=>{let t="rebase"===T?"abort-rebase":"merge"===T?"abort-merge":null;t&&(await v({repoPath:e,action:t}),(0,d.oR)({type:"info",title:`${x(T)} Aborted`,description:`The ${x(T).toLowerCase()} operation was aborted.`}),s.push(V()))},I=async()=>{let t="rebase"===T?"continue-rebase":"merge"===T?"continue-merge":null;t&&(await v({repoPath:e,action:t}),(0,d.oR)({type:"success",title:`${x(T)} Completed`,description:`${x(T)} continued successfully.`}),s.push(V()))};if(o||p)return(0,n.jsx)("div",{className:"flex items-center justify-center h-64",children:(0,n.jsx)("span",{className:"loading loading-spinner text-base-content/50"})});if(u||g)return(0,n.jsxs)("div",{className:"flex items-center justify-center h-64 flex-col gap-4",children:[(0,n.jsx)("p",{className:"text-error font-bold",children:"Error Loading Conflicts"}),(0,n.jsx)("p",{className:"text-sm opacity-70",children:b?.message||N?.message||"An unknown error occurred"}),(0,n.jsxs)("button",{onClick:()=>void Y(),className:"btn btn-outline btn-sm",disabled:y,children:[(0,n.jsx)("i",{className:"iconoir-refresh-circle text-[16px] mr-1","aria-hidden":"true"}),"Try Again"]})]});let _=!!T,B=C.length>0,J=!!f?.canContinue&&_,W=!!L&&(0,c.kO)(L,S?.ours,S?.theirs||S?.current);return(0,n.jsxs)("div",{className:"flex h-full overflow-hidden",children:[(0,n.jsxs)("div",{className:"w-80 border-r border-base-300 flex flex-col bg-base-200/30",children:[(0,n.jsxs)("div",{className:"h-[57px] px-4 border-b border-base-300 flex items-center justify-between bg-base-100",children:[(0,n.jsx)("h1",{className:"font-bold text-lg",children:"Conflicts"}),(0,n.jsx)("button",{className:"btn btn-ghost btn-sm btn-square",onClick:()=>void Y(),disabled:y,title:"Refresh",children:(0,n.jsx)("i",{className:"iconoir-refresh-circle text-[16px]","aria-hidden":"true"})})]}),(0,n.jsxs)("div",{className:"p-4 border-b border-base-300 space-y-2",children:[(0,n.jsx)("div",{className:"text-xs opacity-70",children:"Operation"}),(0,n.jsxs)("div",{className:"flex items-center justify-between",children:[(0,n.jsx)("span",{className:(0,c.cn)("badge",_?"badge-warning":"badge-ghost"),children:_?x(T):"None"}),(0,n.jsx)("span",{className:(0,c.cn)("badge",B?"badge-error":"badge-success"),children:B?`${C.length} unresolved`:"No unresolved"})]})]}),(0,n.jsxs)("div",{className:"flex-1 overflow-y-auto p-2",children:[(0,n.jsx)("div",{className:"px-2 py-2 text-xs font-bold uppercase tracking-wider opacity-70",children:"Unresolved Files"}),(0,n.jsxs)("div",{className:"space-y-0.5",children:[0===C.length&&(0,n.jsx)("p",{className:"px-2 py-2 text-xs opacity-50 italic",children:"No unresolved conflicts."}),C.map(e=>(0,n.jsxs)("div",{className:(0,c.cn)("rounded-md border border-transparent",L===e&&"bg-base-300 border-base-300"),children:[(0,n.jsxs)("button",{className:(0,c.cn)("w-full text-left flex items-center gap-2 px-2 py-2 rounded-md text-sm hover:bg-base-300 transition-colors",L===e&&"text-primary font-medium"),onClick:()=>w(e),title:e,children:[(0,n.jsx)("i",{className:"iconoir-warning-triangle text-[14px] text-error shrink-0","aria-hidden":"true"}),(0,n.jsx)("span",{className:"truncate font-mono text-xs",children:e})]}),(0,n.jsxs)("div",{className:"px-2 pb-2 flex items-center gap-1",children:[(0,n.jsx)("button",{className:"btn btn-xs",onClick:()=>void U(e,"ours",{stage:!0}),disabled:y,children:"Ours"}),(0,n.jsx)("button",{className:"btn btn-xs",onClick:()=>void U(e,"theirs",{stage:!0}),disabled:y,children:"Theirs"})]})]},e))]}),D.length>0&&(0,n.jsxs)(n.Fragment,{children:[(0,n.jsx)("div",{className:"h-px bg-base-300 mx-2 my-3"}),(0,n.jsx)("div",{className:"px-2 py-2 text-xs font-bold uppercase tracking-wider opacity-70",children:"Ready to Stage"}),(0,n.jsx)("div",{className:"space-y-1",children:D.map(e=>(0,n.jsxs)("div",{className:"flex items-center gap-2 px-2 py-1.5 rounded-md bg-base-100 border border-base-300",children:[(0,n.jsx)("span",{className:"truncate font-mono text-xs flex-1",title:e,children:e}),(0,n.jsx)("button",{className:"btn btn-xs btn-success",onClick:()=>void P(e),disabled:y,title:"Stage as resolved",children:"Stage"})]},e))})]}),$.length>0&&(0,n.jsxs)(n.Fragment,{children:[(0,n.jsx)("div",{className:"h-px bg-base-300 mx-2 my-3"}),(0,n.jsx)("div",{className:"px-2 py-2 text-xs font-bold uppercase tracking-wider opacity-70",children:"Staged Resolutions"}),(0,n.jsx)("div",{className:"space-y-1",children:$.map(e=>(0,n.jsx)("div",{className:"px-2 py-1.5 rounded-md bg-success/10 border border-success/20",children:(0,n.jsx)("span",{className:"truncate font-mono text-xs",title:e,children:e})},e))})]})]}),(0,n.jsx)("div",{className:"border-t border-base-300 p-3 space-y-2",children:(0,n.jsxs)("div",{className:"grid grid-cols-2 gap-2",children:[(0,n.jsx)("button",{className:"btn btn-primary btn-sm",onClick:()=>void I(),disabled:!J||y,children:"Continue"}),(0,n.jsx)("button",{className:"btn btn-error btn-outline btn-sm",onClick:()=>void F(),disabled:!_||y,children:"Abort"})]})})]}),(0,n.jsx)("div",{className:"flex-1 flex flex-col bg-base-100 overflow-hidden",children:L?O?(0,n.jsx)("div",{className:"flex-1 flex items-center justify-center",children:(0,n.jsx)("span",{className:"loading loading-spinner"})}):R||!S?(0,n.jsxs)("div",{className:"flex-1 flex items-center justify-center flex-col gap-3",children:[(0,n.jsx)("p",{className:"text-error font-bold",children:"Failed to load file versions"}),(0,n.jsx)("p",{className:"text-xs opacity-70",children:A?.message||"Unknown error"}),(0,n.jsx)("button",{className:"btn btn-sm btn-outline",onClick:()=>void M(),children:"Retry"})]}):(0,n.jsx)(m,{filePath:L,versions:S,isBinary:W,onResolve:(e,s)=>U(L,e,s),busy:y},`${L}:${S.ours.length}:${S.theirs.length}:${S.current.length}`):(0,n.jsx)("div",{className:"flex-1 flex items-center justify-center opacity-60",children:(0,n.jsxs)("div",{className:"text-center",children:[(0,n.jsx)("div",{className:"p-8 rounded-full bg-base-200 mb-4 text-4xl mx-auto w-fit",children:(0,n.jsx)("i",{className:"iconoir-warning-triangle text-[32px]","aria-hidden":"true"})}),(0,n.jsx)("p",{className:"text-sm font-bold",children:"Select a conflicted file to resolve"}),(0,n.jsx)("p",{className:"text-xs opacity-70 mt-2",children:"Pick ours/theirs or edit manually."})]})})})]})}function h(){let e=(0,l.useSearchParams)().get("path");return((0,r.J)(e,"Conflicts"),e)?(0,n.jsx)(b,{repoPath:e}):(0,n.jsx)("div",{className:"p-8",children:"No repository path specified."})}function f(){return(0,n.jsx)(a.Suspense,{fallback:(0,n.jsx)("div",{className:"flex items-center justify-center h-full",children:(0,n.jsx)("span",{className:"loading loading-spinner"})}),children:(0,n.jsx)(h,{})})}},6162:(e,s,t)=>{"use strict";t.d(s,{O:()=>m});var n=t(5155),l=t(8599),a=t(1425),r=t(4786);t(9413);var i=t(2115);let c=[];function d(e){return e.left?.type===r.sY.REMOVED&&e.right?.type===r.sY.ADDED}function o(e){return"string"==typeof e&&e.length>0?e:" "}function u(e){let s=e.type===r.sY.ADDED,t=e.type===r.sY.REMOVED;return(0,n.jsxs)("tr",{className:"line",children:[(0,n.jsx)("td",{className:(0,l.cn)("gutter",{"empty-gutter":null===e.leftLineNumber,"diff-added":s,"diff-removed":t}),children:(0,n.jsx)("pre",{className:"line-number",children:e.leftLineNumber??""})}),(0,n.jsx)("td",{className:(0,l.cn)("gutter",{"empty-gutter":null===e.rightLineNumber,"diff-added":s,"diff-removed":t}),children:(0,n.jsx)("pre",{className:"line-number",children:e.rightLineNumber??""})}),(0,n.jsx)("td",{className:(0,l.cn)("marker",{"diff-added":s,"diff-removed":t}),children:(0,n.jsx)("pre",{children:s?"+":t?"-":""})}),(0,n.jsx)("td",{className:(0,l.cn)("content",{"diff-added":s,"diff-removed":t}),children:(0,n.jsx)("pre",{className:"content-text",children:e.value})})]},e.key)}function x({oldValue:e,newValue:s,useDarkTheme:t=!1,linesOffset:a=0,showDiffOnly:x=!0,extraLinesSurroundingDiff:m=3}){let[b,h]=(0,i.useState)({signature:"",blocks:[]}),f=(0,i.useMemo)(()=>`${a}:${+!!x}:${m}:${e}\0${s}`,[e,s,a,x,m]),p=(0,i.useMemo)(()=>b.signature===f?b.blocks:c,[b,f]),{lineInformation:g}=(0,i.useMemo)(()=>(0,r.sO)(e,s,!0,void 0,a),[e,s,a]),N=(0,i.useMemo)(()=>{let e=[];return g.forEach((s,t)=>{(s.left?.type!==r.sY.DEFAULT||s.right?.type!==r.sY.DEFAULT)&&e.push(t)}),e},[g]),j=(0,i.useMemo)(()=>{if(0===g.length)return[];if(!x||0===N.length)return g.map((e,s)=>({type:"line",line:e,sourceIndex:s}));let e=Math.max(0,m),s=Array.from({length:g.length},()=>!1);N.forEach(t=>{let n=Math.max(0,t-e),l=Math.min(g.length-1,t+e);for(let e=n;e<=l;e+=1)s[e]=!0});for(let e=0;e<s.length;e+=1){if(s[e])continue;let t=e;for(;e<s.length&&!s[e];)e+=1;if(p.includes(t))for(let n=t;n<e;n+=1)s[n]=!0;e-=1}let t=[];for(let e=0;e<s.length;e+=1){if(s[e]){t.push({type:"line",line:g[e],sourceIndex:e});continue}let n=e;for(;e<s.length&&!s[e];)e+=1;t.push({type:"fold",foldStartIndex:n,totalLines:e-n}),e-=1}return t},[g,N,x,m,p]),v=(0,i.useMemo)(()=>{let e=[];for(let s=0;s<j.length;s+=1){let t=j[s];if("fold"===t.type){e.push((0,n.jsxs)("tr",{className:"code-fold",children:[(0,n.jsx)("td",{className:"code-fold-gutter"}),(0,n.jsx)("td",{className:"code-fold-gutter"}),(0,n.jsx)("td",{}),(0,n.jsx)("td",{children:(0,n.jsx)("button",{type:"button",className:"cursor-pointer underline",onClick:()=>{h(e=>{let s=e.signature===f?e.blocks:[];return s.includes(t.foldStartIndex)?e.signature===f?e:{signature:f,blocks:s}:{signature:f,blocks:[...s,t.foldStartIndex]}})},children:(0,n.jsxs)("pre",{className:"code-fold-content",children:["Expand ",t.totalLines," lines ..."]})})})]},`fold-${t.foldStartIndex}`));continue}if(d(t.line)){let t=[],n=[],l=s;for(;l<j.length;){let e=j[l];if("line"!==e.type||!d(e.line))break;t.push({key:`line-${e.sourceIndex}-paired-removed`,type:r.sY.REMOVED,leftLineNumber:e.line.left?.lineNumber??null,rightLineNumber:null,value:o(e.line.left?.value)}),n.push({key:`line-${e.sourceIndex}-paired-added`,type:r.sY.ADDED,leftLineNumber:null,rightLineNumber:e.line.right?.lineNumber??null,value:o(e.line.right?.value)}),l+=1}t.forEach(s=>{e.push(u(s))}),n.forEach(s=>{e.push(u(s))}),s=l-1;continue}e.push(u(function(e,s){let t=e.left??{},n=e.right??{};return t.type===r.sY.REMOVED?{key:`line-${s}-removed`,type:r.sY.REMOVED,leftLineNumber:t.lineNumber??null,rightLineNumber:null,value:o(t.value)}:n.type===r.sY.ADDED?{key:`line-${s}-added`,type:r.sY.ADDED,leftLineNumber:null,rightLineNumber:n.lineNumber??null,value:o(n.value)}:{key:`line-${s}-default`,type:r.sY.DEFAULT,leftLineNumber:t.lineNumber??null,rightLineNumber:n.lineNumber??null,value:o(t.value??n.value)}}(t.line,t.sourceIndex)))}return e},[j,f]);return(0,n.jsx)("table",{className:(0,l.cn)("diff-container",t?"dark-theme":"light-theme"),children:(0,n.jsx)("tbody",{children:v})})}function m({oldValue:e,newValue:s,splitView:t,useDarkTheme:l=!1,linesOffset:r=0,showDiffOnly:i=!0,extraLinesSurroundingDiff:c=3}){return t?(0,n.jsx)(a.Ay,{oldValue:e,newValue:s,splitView:!0,useDarkTheme:l,disableWordDiff:!0}):(0,n.jsx)(x,{oldValue:e,newValue:s,useDarkTheme:l,linesOffset:r,showDiffOnly:i,extraLinesSurroundingDiff:c})}},6534:(e,s,t)=>{"use strict";t.d(s,{J:()=>r});var n=t(2115),l=t(696),a=t(8599);function r(e,s){let t=(0,l.GK)(e);(0,n.useEffect)(()=>{let n=e?t?(0,a.iu)(t):(0,a.kj)(e):"Workspace";document.title=`${n} | ${s}`},[e,t,s])}},7621:(e,s,t)=>{Promise.resolve().then(t.bind(t,3280))}},e=>{e.O(0,[508,176,785,841,26,441,794,358],()=>e(e.s=7621)),_N_E=e.O()}]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trident-git",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "private": false,
   "description": "A modern, web-based Git client.",
   "bin": {