trident-git 0.5.0 → 0.9.0

package/.next/server/app/workspace/changes.segments/_head.segment.rsc

@@ -3,4 +3,4 @@
 3:I[484,[],"MetadataBoundary"]
 4:"$Sreact.suspense"
 5:I[6869,[],"IconMark"]
-0:{"buildId":"VVpGnBxPAXMCVjOD1KoU3","rsc":["$","$1","h",{"children":[null,["$","$L2",null,{"children":[["$","meta","0",{"charSet":"utf-8"}],["$","meta","1",{"name":"viewport","content":"width=device-width, initial-scale=1"}]]}],["$","div",null,{"hidden":true,"children":["$","$L3",null,{"children":["$","$4",null,{"name":"Next.Metadata","children":[["$","title","0",{"children":"Trident"}],["$","meta","1",{"name":"description","content":"Git repository management tool"}],["$","link","2",{"rel":"icon","href":"/icon.png?91e8b75214a43d69","type":"image/png","sizes":"256x256"}],["$","$L5","3",{}]]}]}]}],["$","meta",null,{"name":"next-size-adjust","content":""}]]}],"loading":null,"isPartial":false}
+0:{"buildId":"DX0NFQf0fq5wYBl_EgDbX","rsc":["$","$1","h",{"children":[null,["$","$L2",null,{"children":[["$","meta","0",{"charSet":"utf-8"}],["$","meta","1",{"name":"viewport","content":"width=device-width, initial-scale=1"}]]}],["$","div",null,{"hidden":true,"children":["$","$L3",null,{"children":["$","$4",null,{"name":"Next.Metadata","children":[["$","title","0",{"children":"Trident"}],["$","meta","1",{"name":"description","content":"Git repository management tool"}],["$","link","2",{"rel":"icon","href":"/icon.png?91e8b75214a43d69","type":"image/png","sizes":"256x256"}],["$","$L5","3",{}]]}]}]}],["$","meta",null,{"name":"next-size-adjust","content":""}]]}],"loading":null,"isPartial":false}

package/.next/server/app/workspace/changes.segments/_index.segment.rsc

@@ -1,8 +1,8 @@
 1:"$Sreact.fragment"
-2:I[2246,["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","200","static/chunks/200-3664e65687e716a2.js","26","static/chunks/26-a76b3447d31c0f53.js","558","static/chunks/app/layout-dda593914e513c38.js"],"Providers"]
+2:I[2246,["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","200","static/chunks/200-3664e65687e716a2.js","26","static/chunks/26-a76b3447d31c0f53.js","558","static/chunks/app/layout-3a89133183963c99.js"],"Providers"]
 3:I[7121,[],""]
 4:I[4581,[],""]
 :HL["/_next/static/css/de70bee13400563f.css","style"]
-:HL["/_next/static/css/c4d257db89c36a31.css","style"]
+:HL["/_next/static/css/34464e853551fd25.css","style"]
 :HL["https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css","style"]
-0:{"buildId":"VVpGnBxPAXMCVjOD1KoU3","rsc":["$","$1","c",{"children":[[["$","link","0",{"rel":"stylesheet","href":"/_next/static/css/de70bee13400563f.css","precedence":"next"}],["$","link","1",{"rel":"stylesheet","href":"/_next/static/css/c4d257db89c36a31.css","precedence":"next"}]],["$","html",null,{"lang":"en","suppressHydrationWarning":true,"children":[["$","head",null,{"children":["$","link",null,{"rel":"stylesheet","href":"https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css"}]}],["$","body",null,{"className":"__variable_188709 __variable_9a8899 antialiased","children":["$","$L2",null,{"children":["$","$L3",null,{"parallelRouterKey":"children","template":["$","$L4",null,{}],"notFound":[[["$","title",null,{"children":"404: This page could not be found."}],["$","div",null,{"style":{"fontFamily":"system-ui,\"Segoe UI\",Roboto,Helvetica,Arial,sans-serif,\"Apple Color Emoji\",\"Segoe UI Emoji\"","height":"100vh","textAlign":"center","display":"flex","flexDirection":"column","alignItems":"center","justifyContent":"center"},"children":["$","div",null,{"children":[["$","style",null,{"dangerouslySetInnerHTML":{"__html":"body{color:#000;background:#fff;margin:0}.next-error-h1{border-right:1px solid rgba(0,0,0,.3)}@media (prefers-color-scheme:dark){body{color:#fff;background:#000}.next-error-h1{border-right:1px solid rgba(255,255,255,.3)}}"}}],["$","h1",null,{"className":"next-error-h1","style":{"display":"inline-block","margin":"0 20px 0 0","padding":"0 23px 0 0","fontSize":24,"fontWeight":500,"verticalAlign":"top","lineHeight":"49px"},"children":404}],["$","div",null,{"style":{"display":"inline-block"},"children":["$","h2",null,{"style":{"fontSize":14,"fontWeight":400,"lineHeight":"49px","margin":0},"children":"This page could not be found."}]}]]}]}]],[]]}]}]}]]}]]}],"loading":null,"isPartial":false}
+0:{"buildId":"DX0NFQf0fq5wYBl_EgDbX","rsc":["$","$1","c",{"children":[[["$","link","0",{"rel":"stylesheet","href":"/_next/static/css/de70bee13400563f.css","precedence":"next"}],["$","link","1",{"rel":"stylesheet","href":"/_next/static/css/34464e853551fd25.css","precedence":"next"}]],["$","html",null,{"lang":"en","suppressHydrationWarning":true,"children":[["$","head",null,{"children":["$","link",null,{"rel":"stylesheet","href":"https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css"}]}],["$","body",null,{"className":"__variable_188709 __variable_9a8899 antialiased","children":["$","$L2",null,{"children":["$","$L3",null,{"parallelRouterKey":"children","template":["$","$L4",null,{}],"notFound":[[["$","title",null,{"children":"404: This page could not be found."}],["$","div",null,{"style":{"fontFamily":"system-ui,\"Segoe UI\",Roboto,Helvetica,Arial,sans-serif,\"Apple Color Emoji\",\"Segoe UI Emoji\"","height":"100vh","textAlign":"center","display":"flex","flexDirection":"column","alignItems":"center","justifyContent":"center"},"children":["$","div",null,{"children":[["$","style",null,{"dangerouslySetInnerHTML":{"__html":"body{color:#000;background:#fff;margin:0}.next-error-h1{border-right:1px solid rgba(0,0,0,.3)}@media (prefers-color-scheme:dark){body{color:#fff;background:#000}.next-error-h1{border-right:1px solid rgba(255,255,255,.3)}}"}}],["$","h1",null,{"className":"next-error-h1","style":{"display":"inline-block","margin":"0 20px 0 0","padding":"0 23px 0 0","fontSize":24,"fontWeight":500,"verticalAlign":"top","lineHeight":"49px"},"children":404}],["$","div",null,{"style":{"display":"inline-block"},"children":["$","h2",null,{"style":{"fontSize":14,"fontWeight":400,"lineHeight":"49px","margin":0},"children":"This page could not be found."}]}]]}]}]],[]]}]}]}]]}]]}],"loading":null,"isPartial":false}

package/.next/server/app/workspace/changes.segments/_tree.segment.rsc

@@ -1,7 +1,7 @@
 :HL["/_next/static/media/4cf2300e9c8272f7-s.p.woff2","font",{"crossOrigin":"","type":"font/woff2"}]
 :HL["/_next/static/media/93f479601ee12b01-s.p.woff2","font",{"crossOrigin":"","type":"font/woff2"}]
 :HL["/_next/static/css/de70bee13400563f.css","style"]
-:HL["/_next/static/css/c4d257db89c36a31.css","style"]
+:HL["/_next/static/css/34464e853551fd25.css","style"]
 :HL["/_next/static/css/36968b90b2339533.css","style"]
 :HL["https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css","style"]
-0:{"buildId":"VVpGnBxPAXMCVjOD1KoU3","tree":{"name":"","paramType":null,"paramKey":"","hasRuntimePrefetch":false,"slots":{"children":{"name":"workspace","paramType":null,"paramKey":"workspace","hasRuntimePrefetch":false,"slots":{"children":{"name":"changes","paramType":null,"paramKey":"changes","hasRuntimePrefetch":false,"slots":{"children":{"name":"__PAGE__","paramType":null,"paramKey":"__PAGE__","hasRuntimePrefetch":false,"slots":null,"isRootLayout":false}},"isRootLayout":false}},"isRootLayout":false}},"isRootLayout":true},"staleTime":300}
+0:{"buildId":"DX0NFQf0fq5wYBl_EgDbX","tree":{"name":"","paramType":null,"paramKey":"","hasRuntimePrefetch":false,"slots":{"children":{"name":"workspace","paramType":null,"paramKey":"workspace","hasRuntimePrefetch":false,"slots":{"children":{"name":"changes","paramType":null,"paramKey":"changes","hasRuntimePrefetch":false,"slots":{"children":{"name":"__PAGE__","paramType":null,"paramKey":"__PAGE__","hasRuntimePrefetch":false,"slots":null,"isRootLayout":false}},"isRootLayout":false}},"isRootLayout":false}},"isRootLayout":true},"staleTime":300}

package/.next/server/app/workspace/changes.segments/workspace/changes/__PAGE__.segment.rsc

@@ -1,10 +1,10 @@
 1:"$Sreact.fragment"
 2:I[1304,[],"ClientPageRoot"]
-3:I[1984,["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","841","static/chunks/841-4d865378216d36eb.js","26","static/chunks/26-a76b3447d31c0f53.js","790","static/chunks/790-3e8fa6e595d97940.js","306","static/chunks/app/workspace/changes/page-332cb9b7837d465b.js"],"default"]
+3:I[1984,["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","841","static/chunks/841-4d865378216d36eb.js","26","static/chunks/26-a76b3447d31c0f53.js","790","static/chunks/790-8b6ef3e713ecba06.js","306","static/chunks/app/workspace/changes/page-9cc0418e85135e2c.js"],"default"]
 6:I[484,[],"OutletBoundary"]
 7:"$Sreact.suspense"
 :HL["/_next/static/css/36968b90b2339533.css","style"]
-0:{"buildId":"VVpGnBxPAXMCVjOD1KoU3","rsc":["$","$1","c",{"children":[["$","$L2",null,{"Component":"$3","serverProvidedParams":{"searchParams":{},"params":{},"promises":["$@4","$@5"]}}],[["$","link","0",{"rel":"stylesheet","href":"/_next/static/css/36968b90b2339533.css","precedence":"next"}]],["$","$L6",null,{"children":["$","$7",null,{"name":"Next.MetadataOutlet","children":"$@8"}]}]]}],"loading":null,"isPartial":false}
+0:{"buildId":"DX0NFQf0fq5wYBl_EgDbX","rsc":["$","$1","c",{"children":[["$","$L2",null,{"Component":"$3","serverProvidedParams":{"searchParams":{},"params":{},"promises":["$@4","$@5"]}}],[["$","link","0",{"rel":"stylesheet","href":"/_next/static/css/36968b90b2339533.css","precedence":"next"}]],["$","$L6",null,{"children":["$","$7",null,{"name":"Next.MetadataOutlet","children":"$@8"}]}]]}],"loading":null,"isPartial":false}
 4:{}
 5:"$0:rsc:props:children:0:props:serverProvidedParams:params"
 8:null

package/.next/server/app/workspace/changes.segments/workspace/changes.segment.rsc

@@ -1,4 +1,4 @@
 1:"$Sreact.fragment"
 2:I[7121,[],""]
 3:I[4581,[],""]
-0:{"buildId":"VVpGnBxPAXMCVjOD1KoU3","rsc":["$","$1","c",{"children":[null,["$","$L2",null,{"parallelRouterKey":"children","template":["$","$L3",null,{}]}]]}],"loading":null,"isPartial":false}
+0:{"buildId":"DX0NFQf0fq5wYBl_EgDbX","rsc":["$","$1","c",{"children":[null,["$","$L2",null,{"parallelRouterKey":"children","template":["$","$L3",null,{}]}]]}],"loading":null,"isPartial":false}

package/.next/server/app/workspace/changes.segments/workspace.segment.rsc

@@ -1,7 +1,7 @@
 1:"$Sreact.fragment"
 2:"$Sreact.suspense"
-3:I[9128,["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","807","static/chunks/app/workspace/layout-586ee7be4f6abf20.js"],"WorkspaceRepoOpenTracker"]
-4:I[7185,["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","807","static/chunks/app/workspace/layout-586ee7be4f6abf20.js"],"Sidebar"]
+3:I[9128,["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","807","static/chunks/app/workspace/layout-75d987f016bdfce7.js"],"WorkspaceRepoOpenTracker"]
+4:I[7185,["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","807","static/chunks/app/workspace/layout-75d987f016bdfce7.js"],"Sidebar"]
 5:I[7121,[],""]
 6:I[4581,[],""]
-0:{"buildId":"VVpGnBxPAXMCVjOD1KoU3","rsc":["$","$1","c",{"children":[null,["$","div",null,{"className":"flex min-h-screen max-h-screen bg-base-100","children":[["$","$2",null,{"fallback":null,"children":["$","$L3",null,{}]}],["$","$2",null,{"fallback":["$","div",null,{"className":"w-64 border-r border-base-300 min-h-screen bg-base-200/30 flex items-center justify-center","children":["$","span",null,{"className":"loading loading-spinner"}]}],"children":["$","$L4",null,{"initialCollapsed":false}]}],["$","main",null,{"className":"flex-1 overflow-auto","children":["$","$L5",null,{"parallelRouterKey":"children","template":["$","$L6",null,{}]}]}]]}]]}],"loading":null,"isPartial":false}
+0:{"buildId":"DX0NFQf0fq5wYBl_EgDbX","rsc":["$","$1","c",{"children":[null,["$","div",null,{"className":"flex min-h-screen max-h-screen bg-base-100","children":[["$","$2",null,{"fallback":null,"children":["$","$L3",null,{}]}],["$","$2",null,{"fallback":["$","div",null,{"className":"w-64 border-r border-base-300 min-h-screen bg-base-200/30 flex items-center justify-center","children":["$","span",null,{"className":"loading loading-spinner"}]}],"children":["$","$L4",null,{"initialCollapsed":false}]}],["$","main",null,{"className":"flex-1 overflow-auto","children":["$","$L5",null,{"parallelRouterKey":"children","template":["$","$L6",null,{}]}]}]]}]]}],"loading":null,"isPartial":false}

package/.next/server/app/workspace/conflicts/page.js

@@ -1,2 +1,2 @@
-(()=>{var a={};a.id=612,a.ids=[612],a.modules={261:a=>{"use strict";a.exports=require("next/dist/shared/lib/router/utils/app-paths")},722:a=>{"use strict";a.exports=require("next/dist/shared/lib/invariant-error")},846:a=>{"use strict";a.exports=require("next/dist/compiled/next-server/app-page.runtime.prod.js")},1025:a=>{"use strict";a.exports=require("next/dist/server/app-render/dynamic-access-async-storage.external.js")},1431:(a,b,c)=>{"use strict";c.r(b),c.d(b,{GlobalError:()=>D.a,__next_app__:()=>L,handler:()=>N,routeModule:()=>M});var d=c(7553),e=c(4006),f=c(7798),g=c(4775),h=c(9373),i=c(3461),j=c(1020),k=c(6349),l=c(4365),m=c(6023),n=c(3747),o=c(4235),p=c(3938),q=c(261),r=c(6758),s=c(7243),t=c(6713),u=c(7527),v=c(2820),w=c(8216),x=c(7929),y=c(9551),z=c(9125),A=c(6439),B=c(7068),C=c(5547),D=c.n(C),E=c(1287),F=c(1494),G=c(722),H=c(753),I=c(3954),J={};for(let a in E)0>["default","GlobalError","__next_app__","routeModule","handler"].indexOf(a)&&(J[a]=()=>E[a]);c.d(b,J);let K={children:["",{children:["workspace",{children:["conflicts",{children:["__PAGE__",{},{page:[()=>Promise.resolve().then(c.bind(c,6608)),"/Users/tangqh/Downloads/projects/trident/src/app/workspace/conflicts/page.tsx"]}]},{}]},{layout:[()=>Promise.resolve().then(c.bind(c,4763)),"/Users/tangqh/Downloads/projects/trident/src/app/workspace/layout.tsx"],metadata:{icon:[async a=>(await Promise.resolve().then(c.bind(c,8162))).default(a)],apple:[],openGraph:[],twitter:[],manifest:void 0}}]},{layout:[()=>Promise.resolve().then(c.bind(c,6537)),"/Users/tangqh/Downloads/projects/trident/src/app/layout.tsx"],"global-error":[()=>Promise.resolve().then(c.t.bind(c,5547,23)),"next/dist/client/components/builtin/global-error.js"],"not-found":[()=>Promise.resolve().then(c.t.bind(c,5091,23)),"next/dist/client/components/builtin/not-found.js"],forbidden:[()=>Promise.resolve().then(c.t.bind(c,5270,23)),"next/dist/client/components/builtin/forbidden.js"],unauthorized:[()=>Promise.resolve().then(c.t.bind(c,8193,23)),"next/dist/client/components/builtin/unauthorized.js"],metadata:{icon:[async a=>(await Promise.resolve().then(c.bind(c,8162))).default(a)],apple:[],openGraph:[],twitter:[],manifest:void 0}}]}.children,L={require:c,loadChunk:()=>Promise.resolve()},M=new d.AppPageRouteModule({definition:{kind:e.RouteKind.APP_PAGE,page:"/workspace/conflicts/page",pathname:"/workspace/conflicts",bundlePath:"",filename:"",appPaths:[]},userland:{loaderTree:K},distDir:".next",relativeProjectDir:""});async function N(a,b,d){var C;M.isDev&&(0,h.addRequestMeta)(a,"devRequestTimingInternalsEnd",process.hrtime.bigint());let J=!!(0,h.getRequestMeta)(a,"minimalMode"),O="/workspace/conflicts/page";"/index"===O&&(O="/");let P=await M.prepare(a,b,{srcPage:O,multiZoneDraftMode:!1});if(!P)return b.statusCode=400,b.end("Bad Request"),null==d.waitUntil||d.waitUntil.call(d,Promise.resolve()),null;let{buildId:Q,query:R,params:S,pageIsDynamic:T,buildManifest:U,nextFontManifest:V,reactLoadableManifest:W,serverActionsManifest:X,clientReferenceManifest:Y,subresourceIntegrityManifest:Z,prerenderManifest:$,isDraftMode:_,resolvedPathname:aa,revalidateOnlyGenerated:ab,routerServerContext:ac,nextConfig:ad,parsedUrl:ae,interceptionRoutePatterns:af,deploymentId:ag}=P,ah=(0,q.normalizeAppPath)(O),{isOnDemandRevalidate:ai}=P,aj=ad.experimental.ppr&&!ad.cacheComponents&&(0,I.isInterceptionRouteAppPath)(aa)?null:M.match(aa,$),ak=!!$.routes[aa],al=a.headers["user-agent"]||"",am=(0,t.getBotType)(al),an=(0,p.isHtmlBotRequest)(a),ao=(0,h.getRequestMeta)(a,"isPrefetchRSCRequest")??"1"===a.headers[s.NEXT_ROUTER_PREFETCH_HEADER],ap=(0,h.getRequestMeta)(a,"isRSCRequest")??!!a.headers[s.RSC_HEADER],aq=(0,r.getIsPossibleServerAction)(a),ar=(0,m.checkIsAppPPREnabled)(ad.experimental.ppr);if(!(0,h.getRequestMeta)(a,"postponed")&&ar&&"1"===a.headers[x.NEXT_RESUME_HEADER]&&"POST"===a.method){let b=[];for await(let c of a)b.push(c);let c=Buffer.concat(b).toString("utf8");(0,h.addRequestMeta)(a,"postponed",c)}let as=ar&&(null==(C=$.routes[ah]??$.dynamicRoutes[ah])?void 0:C.renderingMode)==="PARTIALLY_STATIC",at=!1,au=!1,av=as?(0,h.getRequestMeta)(a,"postponed"):void 0,aw=as&&ap&&!ao;J&&(aw=aw&&!!av);let ax=(0,h.getRequestMeta)(a,"segmentPrefetchRSCRequest"),ay=(!an||!as)&&(!al||(0,p.shouldServeStreamingMetadata)(al,ad.htmlLimitedBots)),az=!!((aj||ak||$.routes[ah])&&!(an&&as)),aA=as&&!0===ad.cacheComponents,aB=!0===M.isDev||!az||"string"==typeof av||(aA&&(0,h.getRequestMeta)(a,"onCacheEntryV2")?aw&&!J:aw),aC=an&&as,aD=null;_||!az||aB||aq||av||aw||(aD=aa);let aE=aD;!aE&&M.isDev&&(aE=aa),M.isDev||_||!az||!ap||aw||(0,k.d)(a.headers);let aF={...E,tree:K,GlobalError:D(),handler:N,routeModule:M,__next_app__:L};X&&Y&&(0,o.setManifestsSingleton)({page:O,clientReferenceManifest:Y,serverActionsManifest:X});let aG=a.method||"GET",aH=(0,g.getTracer)(),aI=aH.getActiveScopeSpan(),aJ=async()=>((null==ac?void 0:ac.render404)?await ac.render404(a,b,ae,!1):b.end("This page could not be found"),null);try{let f=M.getVaryHeader(aa,af);b.setHeader("Vary",f);let k=async(c,d)=>{let e=new l.NodeNextRequest(a),f=new l.NodeNextResponse(b);return M.render(e,f,d).finally(()=>{if(!c)return;c.setAttributes({"http.status_code":b.statusCode,"next.rsc":!1});let a=aH.getRootSpanAttributes();if(!a)return;if(a.get("next.span_type")!==i.BaseServerSpan.handleRequest)return void console.warn(`Unexpected root span type '${a.get("next.span_type")}'. Please report this Next.js issue https://github.com/vercel/next.js`);let d=a.get("next.route");if(d){let a=`${aG} ${d}`;c.setAttributes({"next.route":d,"http.route":d,"next.span_name":a}),c.updateName(a)}else c.updateName(`${aG} ${O}`)})},m=(0,h.getRequestMeta)(a,"incrementalCache"),o=async({span:e,postponed:f,fallbackRouteParams:g,forceStaticRender:i})=>{let l={query:R,params:S,page:ah,sharedContext:{buildId:Q},serverComponentsHmrCache:(0,h.getRequestMeta)(a,"serverComponentsHmrCache"),fallbackRouteParams:g,renderOpts:{App:()=>null,Document:()=>null,pageConfig:{},ComponentMod:aF,Component:(0,j.T)(aF),params:S,routeModule:M,page:O,postponed:f,shouldWaitOnAllReady:aC,serveStreamingMetadata:ay,supportsDynamicResponse:"string"==typeof f||aB,buildManifest:U,nextFontManifest:V,reactLoadableManifest:W,subresourceIntegrityManifest:Z,setCacheStatus:null==ac?void 0:ac.setCacheStatus,setIsrStatus:null==ac?void 0:ac.setIsrStatus,setReactDebugChannel:null==ac?void 0:ac.setReactDebugChannel,sendErrorsToBrowser:null==ac?void 0:ac.sendErrorsToBrowser,dir:c(3873).join(process.cwd(),M.relativeProjectDir),isDraftMode:_,botType:am,isOnDemandRevalidate:ai,isPossibleServerAction:aq,assetPrefix:ad.assetPrefix,nextConfigOutput:ad.output,crossOrigin:ad.crossOrigin,trailingSlash:ad.trailingSlash,images:ad.images,previewProps:$.preview,deploymentId:ag,enableTainting:ad.experimental.taint,htmlLimitedBots:ad.htmlLimitedBots,reactMaxHeadersLength:ad.reactMaxHeadersLength,multiZoneDraftMode:!1,incrementalCache:m,cacheLifeProfiles:ad.cacheLife,basePath:ad.basePath,serverActions:ad.experimental.serverActions,...at||au?{nextExport:!0,supportsDynamicResponse:!1,isStaticGeneration:!0,isDebugDynamicAccesses:at}:{},cacheComponents:!!ad.cacheComponents,experimental:{isRoutePPREnabled:as,expireTime:ad.expireTime,staleTimes:ad.experimental.staleTimes,dynamicOnHover:!!ad.experimental.dynamicOnHover,inlineCss:!!ad.experimental.inlineCss,authInterrupts:!!ad.experimental.authInterrupts,clientTraceMetadata:ad.experimental.clientTraceMetadata||[],clientParamParsingOrigins:ad.experimental.clientParamParsingOrigins,maxPostponedStateSizeBytes:(0,B.parseMaxPostponedStateSize)(ad.experimental.maxPostponedStateSize)},waitUntil:d.waitUntil,onClose:a=>{b.on("close",a)},onAfterTaskError:()=>{},onInstrumentationRequestError:(b,c,d,e)=>M.onRequestError(a,b,d,e,ac),err:(0,h.getRequestMeta)(a,"invokeError"),dev:M.isDev}};at&&(l.renderOpts.nextExport=!0,l.renderOpts.supportsDynamicResponse=!1,l.renderOpts.isDebugDynamicAccesses=at),i&&(l.renderOpts.supportsDynamicResponse=!1);let n=await k(e,l),{metadata:o}=n,{cacheControl:p,headers:q={},fetchTags:r,fetchMetrics:s}=o;if(r&&(q[x.NEXT_CACHE_TAGS_HEADER]=r),a.fetchMetrics=s,az&&(null==p?void 0:p.revalidate)===0&&!M.isDev&&!as){let a=o.staticBailoutInfo,b=Object.defineProperty(Error(`Page changed from static to dynamic at runtime ${aa}${(null==a?void 0:a.description)?`, reason: ${a.description}`:""}
-see more here https://nextjs.org/docs/messages/app-static-to-dynamic-error`),"__NEXT_ERROR_CODE",{value:"E132",enumerable:!1,configurable:!0});if(null==a?void 0:a.stack){let c=a.stack;b.stack=b.message+c.substring(c.indexOf("\n"))}throw b}return{value:{kind:u.CachedRouteKind.APP_PAGE,html:n,headers:q,rscData:o.flightData,postponed:o.postponed,status:o.statusCode,segmentData:o.segmentData},cacheControl:p}},p=async({hasResolved:c,previousCacheEntry:f,isRevalidating:g,span:i,forceStaticRender:j=!1})=>{let k,l=!1===M.isDev,q=c||b.writableEnded;if(ai&&ab&&!f&&!J)return(null==ac?void 0:ac.render404)?await ac.render404(a,b):(b.statusCode=404,b.end("This page could not be found")),null;if(aj&&(k=(0,v.parseFallbackField)(aj.fallback)),k===v.FallbackMode.PRERENDER&&(0,t.isBot)(al)&&(!as||an)&&(k=v.FallbackMode.BLOCKING_STATIC_RENDER),(null==f?void 0:f.isStale)===-1&&(ai=!0),ai&&(k!==v.FallbackMode.NOT_FOUND||f)&&(k=v.FallbackMode.BLOCKING_STATIC_RENDER),!J&&k!==v.FallbackMode.BLOCKING_STATIC_RENDER&&aE&&!q&&!_&&T&&(l||!ak)){if((l||aj)&&k===v.FallbackMode.NOT_FOUND){if(ad.experimental.adapterPath)return await aJ();throw new A.NoFallbackError}if(as&&(ad.cacheComponents?!aw:!ap)){let b=l&&"string"==typeof(null==aj?void 0:aj.fallback)?aj.fallback:ah,c=l&&(null==aj?void 0:aj.fallbackRouteParams)?(0,n.createOpaqueFallbackRouteParams)(aj.fallbackRouteParams):au?(0,n.getFallbackRouteParams)(ah,M):null,f=await M.handleResponse({cacheKey:b,req:a,nextConfig:ad,routeKind:e.RouteKind.APP_PAGE,isFallback:!0,prerenderManifest:$,isRoutePPREnabled:as,responseGenerator:async()=>o({span:i,postponed:void 0,fallbackRouteParams:c,forceStaticRender:!1}),waitUntil:d.waitUntil,isMinimalMode:J});if(null===f)return null;if(f)return delete f.cacheControl,f}}let r=ai||g||!av?void 0:av;if(aA&&!J&&m&&aw&&!j){let b=await m.get(aa,{kind:u.IncrementalCacheKind.APP_PAGE,isRoutePPREnabled:!0,isFallback:!1});b&&b.value&&b.value.kind===u.CachedRouteKind.APP_PAGE&&(r=b.value.postponed,b&&(-1===b.isStale||!0===b.isStale)&&(0,H.scheduleOnNextTick)(async()=>{let b=M.getResponseCache(a);try{await b.revalidate(aa,m,as,!1,a=>p({...a,forceStaticRender:!0}),null,c,d.waitUntil)}catch(a){console.error("Error revalidating the page in the background",a)}}))}if(at&&void 0!==r)return{cacheControl:{revalidate:1,expire:void 0},value:{kind:u.CachedRouteKind.PAGES,html:w.default.EMPTY,pageData:{},headers:void 0,status:void 0}};let s=l&&(null==aj?void 0:aj.fallbackRouteParams)&&(0,h.getRequestMeta)(a,"renderFallbackShell")?(0,n.createOpaqueFallbackRouteParams)(aj.fallbackRouteParams):au?(0,n.getFallbackRouteParams)(ah,M):null;return o({span:i,postponed:r,fallbackRouteParams:s,forceStaticRender:j})},q=async c=>{var f,g,i,j,k;let l,m=await M.handleResponse({cacheKey:aD,responseGenerator:a=>p({span:c,...a}),routeKind:e.RouteKind.APP_PAGE,isOnDemandRevalidate:ai,isRoutePPREnabled:as,req:a,nextConfig:ad,prerenderManifest:$,waitUntil:d.waitUntil,isMinimalMode:J});if(_&&b.setHeader("Cache-Control","private, no-cache, no-store, max-age=0, must-revalidate"),M.isDev&&b.setHeader("Cache-Control","no-store, must-revalidate"),!m){if(aD)throw Object.defineProperty(Error("invariant: cache entry required but not generated"),"__NEXT_ERROR_CODE",{value:"E62",enumerable:!1,configurable:!0});return null}if((null==(f=m.value)?void 0:f.kind)!==u.CachedRouteKind.APP_PAGE)throw Object.defineProperty(Error(`Invariant app-page handler received invalid cache entry ${null==(i=m.value)?void 0:i.kind}`),"__NEXT_ERROR_CODE",{value:"E707",enumerable:!1,configurable:!0});let n="string"==typeof m.value.postponed;az&&!aw&&(!n||ao)&&(J||b.setHeader("x-nextjs-cache",ai?"REVALIDATED":m.isMiss?"MISS":m.isStale?"STALE":"HIT"),b.setHeader(s.NEXT_IS_PRERENDER_HEADER,"1"));let{value:q}=m;if(av)l={revalidate:0,expire:void 0};else if(aw)l={revalidate:0,expire:void 0};else if(!M.isDev)if(_)l={revalidate:0,expire:void 0};else if(az){if(m.cacheControl)if("number"==typeof m.cacheControl.revalidate){if(m.cacheControl.revalidate<1)throw Object.defineProperty(Error(`Invalid revalidate configuration provided: ${m.cacheControl.revalidate} < 1`),"__NEXT_ERROR_CODE",{value:"E22",enumerable:!1,configurable:!0});l={revalidate:m.cacheControl.revalidate,expire:(null==(j=m.cacheControl)?void 0:j.expire)??ad.expireTime}}else l={revalidate:x.CACHE_ONE_YEAR,expire:void 0}}else b.getHeader("Cache-Control")||(l={revalidate:0,expire:void 0});if(m.cacheControl=l,"string"==typeof ax&&(null==q?void 0:q.kind)===u.CachedRouteKind.APP_PAGE&&q.segmentData){b.setHeader(s.NEXT_DID_POSTPONE_HEADER,"2");let c=null==(k=q.headers)?void 0:k[x.NEXT_CACHE_TAGS_HEADER];J&&az&&c&&"string"==typeof c&&b.setHeader(x.NEXT_CACHE_TAGS_HEADER,c);let d=q.segmentData.get(ax);return void 0!==d?(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:w.default.fromStatic(d,s.RSC_CONTENT_TYPE_HEADER),cacheControl:m.cacheControl}):(b.statusCode=204,(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:w.default.EMPTY,cacheControl:m.cacheControl}))}let r=aA?(0,h.getRequestMeta)(a,"onCacheEntryV2")??(0,h.getRequestMeta)(a,"onCacheEntry"):(0,h.getRequestMeta)(a,"onCacheEntry");if(r&&await r(m,{url:(0,h.getRequestMeta)(a,"initURL")??a.url}))return null;if(q.headers){let a={...q.headers};for(let[c,d]of(J&&az||delete a[x.NEXT_CACHE_TAGS_HEADER],Object.entries(a)))if(void 0!==d)if(Array.isArray(d))for(let a of d)b.appendHeader(c,a);else"number"==typeof d&&(d=d.toString()),b.appendHeader(c,d)}let t=null==(g=q.headers)?void 0:g[x.NEXT_CACHE_TAGS_HEADER];if(J&&az&&t&&"string"==typeof t&&b.setHeader(x.NEXT_CACHE_TAGS_HEADER,t),!q.status||ap&&as||(b.statusCode=q.status),!J&&q.status&&F.RedirectStatusCode[q.status]&&ap&&(b.statusCode=200),n&&!aw&&b.setHeader(s.NEXT_DID_POSTPONE_HEADER,"1"),ap&&!_){if(void 0===q.rscData){if(q.html.contentType!==s.RSC_CONTENT_TYPE_HEADER)if(ad.cacheComponents)return b.statusCode=404,(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:w.default.EMPTY,cacheControl:m.cacheControl});else throw Object.defineProperty(new G.InvariantError(`Expected RSC response, got ${q.html.contentType}`),"__NEXT_ERROR_CODE",{value:"E789",enumerable:!1,configurable:!0});return(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:q.html,cacheControl:m.cacheControl})}return(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:w.default.fromStatic(q.rscData,s.RSC_CONTENT_TYPE_HEADER),cacheControl:m.cacheControl})}let v=q.html;if(!n||J||ap)return(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:v,cacheControl:m.cacheControl});if(at)return v.push(new ReadableStream({start(a){a.enqueue(y.ENCODED_TAGS.CLOSED.BODY_AND_HTML),a.close()}})),(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:v,cacheControl:{revalidate:0,expire:void 0}});let A=new TransformStream;return v.push(A.readable),o({span:c,postponed:q.postponed,fallbackRouteParams:null,forceStaticRender:!1}).then(async a=>{var b,c;if(!a)throw Object.defineProperty(Error("Invariant: expected a result to be returned"),"__NEXT_ERROR_CODE",{value:"E463",enumerable:!1,configurable:!0});if((null==(b=a.value)?void 0:b.kind)!==u.CachedRouteKind.APP_PAGE)throw Object.defineProperty(Error(`Invariant: expected a page response, got ${null==(c=a.value)?void 0:c.kind}`),"__NEXT_ERROR_CODE",{value:"E305",enumerable:!1,configurable:!0});await a.value.html.pipeTo(A.writable)}).catch(a=>{A.writable.abort(a).catch(a=>{console.error("couldn't abort transformer",a)})}),(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:v,cacheControl:{revalidate:0,expire:void 0}})};if(!aI)return await aH.withPropagatedContext(a.headers,()=>aH.trace(i.BaseServerSpan.handleRequest,{spanName:`${aG} ${O}`,kind:g.SpanKind.SERVER,attributes:{"http.method":aG,"http.target":a.url}},q));await q(aI)}catch(b){throw b instanceof A.NoFallbackError||await M.onRequestError(a,b,{routerKind:"App Router",routePath:O,routeType:"render",revalidateReason:(0,f.c)({isStaticGeneration:az,isOnDemandRevalidate:ai})},!1,ac),b}}},1820:a=>{"use strict";a.exports=require("os")},2379:(a,b,c)=>{Promise.resolve().then(c.bind(c,6812))},3033:a=>{"use strict";a.exports=require("next/dist/server/app-render/work-unit-async-storage.external.js")},3295:a=>{"use strict";a.exports=require("next/dist/server/app-render/after-task-async-storage.external.js")},3873:a=>{"use strict";a.exports=require("path")},3954:a=>{"use strict";a.exports=require("next/dist/shared/lib/router/utils/interception-routes")},5427:(a,b,c)=>{Promise.resolve().then(c.bind(c,6608))},6439:a=>{"use strict";a.exports=require("next/dist/shared/lib/no-fallback-error.external")},6608:(a,b,c)=>{"use strict";c.r(b),c.d(b,{default:()=>d});let d=(0,c(7943).registerClientReference)(function(){throw Error("Attempted to call the default export of \"/Users/tangqh/Downloads/projects/trident/src/app/workspace/conflicts/page.tsx\" from the server, but it's on the client. It's not possible to invoke a client function from the server, it can only be rendered as a Component or passed to props of a Client Component.")},"/Users/tangqh/Downloads/projects/trident/src/app/workspace/conflicts/page.tsx","default")},6713:a=>{"use strict";a.exports=require("next/dist/shared/lib/router/utils/is-bot")},6812:(a,b,c)=>{"use strict";c.r(b),c.d(b,{default:()=>q});var d=c(8249),e=c(9099),f=c(7484),g=c(7536),h=c(4626),i=c(4490),j=c(3381),k=c(7532),l=c(8696);function m(a){return"merge"===a?"Merge":"rebase"===a?"Rebase":"Conflict"}function n({filePath:a,versions:b,isBinary:c,onResolve:e,busy:g}){let[h,i]=(0,f.useState)(b.current||b.ours||b.theirs||""),{resolvedTheme:j}=(0,l.D)();return c?(0,d.jsxs)("div",{className:"h-full p-6 flex flex-col gap-4",children:[(0,d.jsx)("h2",{className:"text-lg font-bold",children:"Binary Conflict"}),(0,d.jsx)("p",{className:"text-sm opacity-70",children:"This conflicted file looks binary. Use one side to resolve it."}),(0,d.jsxs)("div",{className:"flex items-center gap-2",children:[(0,d.jsx)("button",{className:"btn btn-sm",onClick:()=>e("ours",{stage:!0}),disabled:g,children:"Use Ours"}),(0,d.jsx)("button",{className:"btn btn-sm",onClick:()=>e("theirs",{stage:!0}),disabled:g,children:"Use Theirs"})]})]}):(0,d.jsxs)("div",{className:"h-full flex flex-col overflow-hidden",children:[(0,d.jsxs)("div",{className:"px-4 py-3 border-b border-base-300 bg-base-100 flex items-center justify-between gap-3",children:[(0,d.jsxs)("div",{className:"min-w-0",children:[(0,d.jsx)("div",{className:"text-xs uppercase tracking-wider opacity-60",children:"Resolving"}),(0,d.jsx)("div",{className:"font-mono text-xs truncate",title:a,children:a})]}),(0,d.jsxs)("div",{className:"flex items-center gap-2",children:[(0,d.jsx)("button",{className:"btn btn-xs",onClick:()=>i(b.ours),disabled:g,children:"Copy Ours"}),(0,d.jsx)("button",{className:"btn btn-xs",onClick:()=>i(b.theirs),disabled:g,children:"Copy Theirs"}),(0,d.jsx)("button",{className:"btn btn-xs btn-outline",onClick:()=>void e("manual",{content:h,stage:!1}),disabled:g,children:"Save"}),(0,d.jsx)("button",{className:"btn btn-xs btn-primary",onClick:()=>void e("manual",{content:h,stage:!0}),disabled:g,children:"Save + Stage"})]})]}),(0,d.jsxs)("div",{className:"flex-1 min-h-0 border-b border-base-300 flex flex-col",children:[(0,d.jsxs)("div",{className:"grid grid-cols-2 gap-0 border-b border-base-300",children:[(0,d.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,d.jsx)("div",{className:"px-3 py-2 text-xs font-bold uppercase tracking-wider bg-base-200/60",children:"Theirs"})]}),(0,d.jsx)("div",{className:"flex-1 min-h-0 overflow-auto diff-viewer-wrapper",children:(0,d.jsx)(k.O,{oldValue:b.ours,newValue:b.theirs,splitView:!0,useDarkTheme:"dark"===j,showDiffOnly:!1})})]}),(0,d.jsxs)("div",{className:"flex-[1.2] min-h-0 flex flex-col",children:[(0,d.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,d.jsx)("textarea",{value:h,onChange:a=>i(a.target.value),className:"textarea textarea-ghost h-full w-full rounded-none resize-none font-mono text-xs leading-5",spellCheck:!1})]}),(0,d.jsxs)("div",{className:"px-4 py-2 border-t border-base-300 bg-base-100 flex items-center justify-end gap-2",children:[(0,d.jsx)("button",{className:"btn btn-sm",onClick:()=>void e("ours",{stage:!0}),disabled:g,children:"Use Ours + Stage"}),(0,d.jsx)("button",{className:"btn btn-sm",onClick:()=>void e("theirs",{stage:!0}),disabled:g,children:"Use Theirs + Stage"})]})]})}function o({repoPath:a}){let b=(0,e.useRouter)(),c=(0,e.useSearchParams)(),{data:g,isLoading:k,isError:l,error:o,refetch:p}=(0,h.en)(a),{data:q,isLoading:r,isError:s,error:t,refetch:u}=(0,h.F7)(a),{mutateAsync:v,isPending:w}=(0,h.a3)(),[x,y]=(0,f.useState)(null),z=g?.conflicted??[],A=new Set(z),B=(g?.files??[]).filter(a=>!A.has(a.path)&&" "===a.index&&" "!==a.working_dir).map(a=>a.path),C=(g?.files??[]).filter(a=>!A.has(a.path)&&" "!==a.index).map(a=>a.path),D=x&&z.includes(x)?x:z[0]??null,{data:E,isLoading:F,isError:G,error:H,refetch:I}=(0,h.b5)(a,D),J=q?.operation??null,K=(0,f.useCallback)((a="")=>{let b=new URLSearchParams(c.toString()).toString();return b?`/workspace${a}?${b}`:`/workspace${a}`},[c]),L=(0,f.useCallback)(async()=>{await Promise.all([p(),u(),I()])},[u,p,I]),M=async(b,c,d={})=>{await v({repoPath:a,action:"resolve-conflict-file",data:{path:b,strategy:c,content:d.content,stage:d.stage??!0}}),await L(),(0,j.oR)({type:"success",title:"Conflict Updated",description:"manual"===c?!1===d.stage?"Saved manual resolution.":"Saved and staged manual resolution.":`Applied ${c} version${!1===d.stage?"":" and staged it"}.`})},N=async b=>{await v({repoPath:a,action:"stage",data:{files:[b]}}),await L()},O=async()=>{let c="rebase"===J?"abort-rebase":"merge"===J?"abort-merge":null;c&&(await v({repoPath:a,action:c}),(0,j.oR)({type:"info",title:`${m(J)} Aborted`,description:`The ${m(J).toLowerCase()} operation was aborted.`}),b.push(K()))},P=async()=>{let c="rebase"===J?"continue-rebase":"merge"===J?"continue-merge":null;c&&(await v({repoPath:a,action:c}),(0,j.oR)({type:"success",title:`${m(J)} Completed`,description:`${m(J)} continued successfully.`}),b.push(K()))};if(k||r)return(0,d.jsx)("div",{className:"flex items-center justify-center h-64",children:(0,d.jsx)("span",{className:"loading loading-spinner text-base-content/50"})});if(l||s)return(0,d.jsxs)("div",{className:"flex items-center justify-center h-64 flex-col gap-4",children:[(0,d.jsx)("p",{className:"text-error font-bold",children:"Error Loading Conflicts"}),(0,d.jsx)("p",{className:"text-sm opacity-70",children:o?.message||t?.message||"An unknown error occurred"}),(0,d.jsxs)("button",{onClick:()=>void L(),className:"btn btn-outline btn-sm",disabled:w,children:[(0,d.jsx)("i",{className:"iconoir-refresh-circle text-[16px] mr-1","aria-hidden":"true"}),"Try Again"]})]});let Q=!!J,R=z.length>0,S=!!q?.canContinue&&Q,T=!!D&&(0,i.kO)(D,E?.ours,E?.theirs||E?.current);return(0,d.jsxs)("div",{className:"flex h-full overflow-hidden",children:[(0,d.jsxs)("div",{className:"w-80 border-r border-base-300 flex flex-col bg-base-200/30",children:[(0,d.jsxs)("div",{className:"h-[57px] px-4 border-b border-base-300 flex items-center justify-between bg-base-100",children:[(0,d.jsx)("h1",{className:"font-bold text-lg",children:"Conflicts"}),(0,d.jsx)("button",{className:"btn btn-ghost btn-sm btn-square",onClick:()=>void L(),disabled:w,title:"Refresh",children:(0,d.jsx)("i",{className:"iconoir-refresh-circle text-[16px]","aria-hidden":"true"})})]}),(0,d.jsxs)("div",{className:"p-4 border-b border-base-300 space-y-2",children:[(0,d.jsx)("div",{className:"text-xs opacity-70",children:"Operation"}),(0,d.jsxs)("div",{className:"flex items-center justify-between",children:[(0,d.jsx)("span",{className:(0,i.cn)("badge",Q?"badge-warning":"badge-ghost"),children:Q?m(J):"None"}),(0,d.jsx)("span",{className:(0,i.cn)("badge",R?"badge-error":"badge-success"),children:R?`${z.length} unresolved`:"No unresolved"})]})]}),(0,d.jsxs)("div",{className:"flex-1 overflow-y-auto p-2",children:[(0,d.jsx)("div",{className:"px-2 py-2 text-xs font-bold uppercase tracking-wider opacity-70",children:"Unresolved Files"}),(0,d.jsxs)("div",{className:"space-y-0.5",children:[0===z.length&&(0,d.jsx)("p",{className:"px-2 py-2 text-xs opacity-50 italic",children:"No unresolved conflicts."}),z.map(a=>(0,d.jsxs)("div",{className:(0,i.cn)("rounded-md border border-transparent",D===a&&"bg-base-300 border-base-300"),children:[(0,d.jsxs)("button",{className:(0,i.cn)("w-full text-left flex items-center gap-2 px-2 py-2 rounded-md text-sm hover:bg-base-300 transition-colors",D===a&&"text-primary font-medium"),onClick:()=>y(a),title:a,children:[(0,d.jsx)("i",{className:"iconoir-warning-triangle text-[14px] text-error shrink-0","aria-hidden":"true"}),(0,d.jsx)("span",{className:"truncate font-mono text-xs",children:a})]}),(0,d.jsxs)("div",{className:"px-2 pb-2 flex items-center gap-1",children:[(0,d.jsx)("button",{className:"btn btn-xs",onClick:()=>void M(a,"ours",{stage:!0}),disabled:w,children:"Ours"}),(0,d.jsx)("button",{className:"btn btn-xs",onClick:()=>void M(a,"theirs",{stage:!0}),disabled:w,children:"Theirs"})]})]},a))]}),B.length>0&&(0,d.jsxs)(d.Fragment,{children:[(0,d.jsx)("div",{className:"h-px bg-base-300 mx-2 my-3"}),(0,d.jsx)("div",{className:"px-2 py-2 text-xs font-bold uppercase tracking-wider opacity-70",children:"Ready to Stage"}),(0,d.jsx)("div",{className:"space-y-1",children:B.map(a=>(0,d.jsxs)("div",{className:"flex items-center gap-2 px-2 py-1.5 rounded-md bg-base-100 border border-base-300",children:[(0,d.jsx)("span",{className:"truncate font-mono text-xs flex-1",title:a,children:a}),(0,d.jsx)("button",{className:"btn btn-xs btn-success",onClick:()=>void N(a),disabled:w,title:"Stage as resolved",children:"Stage"})]},a))})]}),C.length>0&&(0,d.jsxs)(d.Fragment,{children:[(0,d.jsx)("div",{className:"h-px bg-base-300 mx-2 my-3"}),(0,d.jsx)("div",{className:"px-2 py-2 text-xs font-bold uppercase tracking-wider opacity-70",children:"Staged Resolutions"}),(0,d.jsx)("div",{className:"space-y-1",children:C.map(a=>(0,d.jsx)("div",{className:"px-2 py-1.5 rounded-md bg-success/10 border border-success/20",children:(0,d.jsx)("span",{className:"truncate font-mono text-xs",title:a,children:a})},a))})]})]}),(0,d.jsx)("div",{className:"border-t border-base-300 p-3 space-y-2",children:(0,d.jsxs)("div",{className:"grid grid-cols-2 gap-2",children:[(0,d.jsx)("button",{className:"btn btn-primary btn-sm",onClick:()=>void P(),disabled:!S||w,children:"Continue"}),(0,d.jsx)("button",{className:"btn btn-error btn-outline btn-sm",onClick:()=>void O(),disabled:!Q||w,children:"Abort"})]})})]}),(0,d.jsx)("div",{className:"flex-1 flex flex-col bg-base-100 overflow-hidden",children:D?F?(0,d.jsx)("div",{className:"flex-1 flex items-center justify-center",children:(0,d.jsx)("span",{className:"loading loading-spinner"})}):G||!E?(0,d.jsxs)("div",{className:"flex-1 flex items-center justify-center flex-col gap-3",children:[(0,d.jsx)("p",{className:"text-error font-bold",children:"Failed to load file versions"}),(0,d.jsx)("p",{className:"text-xs opacity-70",children:H?.message||"Unknown error"}),(0,d.jsx)("button",{className:"btn btn-sm btn-outline",onClick:()=>void I(),children:"Retry"})]}):(0,d.jsx)(n,{filePath:D,versions:E,isBinary:T,onResolve:(a,b)=>M(D,a,b),busy:w},`${D}:${E.ours.length}:${E.theirs.length}:${E.current.length}`):(0,d.jsx)("div",{className:"flex-1 flex items-center justify-center opacity-60",children:(0,d.jsxs)("div",{className:"text-center",children:[(0,d.jsx)("div",{className:"p-8 rounded-full bg-base-200 mb-4 text-4xl mx-auto w-fit",children:(0,d.jsx)("i",{className:"iconoir-warning-triangle text-[32px]","aria-hidden":"true"})}),(0,d.jsx)("p",{className:"text-sm font-bold",children:"Select a conflicted file to resolve"}),(0,d.jsx)("p",{className:"text-xs opacity-70 mt-2",children:"Pick ours/theirs or edit manually."})]})})})]})}function p(){let a=(0,e.useSearchParams)().get("path");return((0,g.J)(a,"Conflicts"),a)?(0,d.jsx)(o,{repoPath:a}):(0,d.jsx)("div",{className:"p-8",children:"No repository path specified."})}function q(){return(0,d.jsx)(f.Suspense,{fallback:(0,d.jsx)("div",{className:"flex items-center justify-center h-full",children:(0,d.jsx)("span",{className:"loading loading-spinner"})}),children:(0,d.jsx)(p,{})})}},7068:a=>{"use strict";a.exports=require("next/dist/shared/lib/size-limit")},7532:(a,b,c)=>{"use strict";c.d(b,{O:()=>n});var d=c(8249),e=c(4490),f=c(339),g=c(8856);c(3609);var h=c(7484);let i=[];function j(a){return a.left?.type===g.sY.REMOVED&&a.right?.type===g.sY.ADDED}function k(a){return"string"==typeof a&&a.length>0?a:" "}function l(a){let b=a.type===g.sY.ADDED,c=a.type===g.sY.REMOVED;return(0,d.jsxs)("tr",{className:"line",children:[(0,d.jsx)("td",{className:(0,e.cn)("gutter",{"empty-gutter":null===a.leftLineNumber,"diff-added":b,"diff-removed":c}),children:(0,d.jsx)("pre",{className:"line-number",children:a.leftLineNumber??""})}),(0,d.jsx)("td",{className:(0,e.cn)("gutter",{"empty-gutter":null===a.rightLineNumber,"diff-added":b,"diff-removed":c}),children:(0,d.jsx)("pre",{className:"line-number",children:a.rightLineNumber??""})}),(0,d.jsx)("td",{className:(0,e.cn)("marker",{"diff-added":b,"diff-removed":c}),children:(0,d.jsx)("pre",{children:b?"+":c?"-":""})}),(0,d.jsx)("td",{className:(0,e.cn)("content",{"diff-added":b,"diff-removed":c}),children:(0,d.jsx)("pre",{className:"content-text",children:a.value})})]},a.key)}function m({oldValue:a,newValue:b,useDarkTheme:c=!1,linesOffset:f=0,showDiffOnly:m=!0,extraLinesSurroundingDiff:n=3}){let[o,p]=(0,h.useState)({signature:"",blocks:[]}),q=(0,h.useMemo)(()=>`${f}:${+!!m}:${n}:${a}\0${b}`,[a,b,f,m,n]),r=(0,h.useMemo)(()=>o.signature===q?o.blocks:i,[o,q]),{lineInformation:s,diffLines:t}=(0,h.useMemo)(()=>(0,g.sO)(a,b,!0,void 0,f),[a,b,f]),u=(0,h.useMemo)(()=>{if(0===s.length)return[];if(!m||0===t.length)return s.map((a,b)=>({type:"line",line:a,sourceIndex:b}));let a=Math.max(0,n),b=Array.from({length:s.length},()=>!1);t.forEach(c=>{let d=Math.max(0,c-a),e=Math.min(s.length-1,c+a);for(let a=d;a<=e;a+=1)b[a]=!0});for(let a=0;a<b.length;a+=1){if(b[a])continue;let c=a;for(;a<b.length&&!b[a];)a+=1;if(r.includes(c))for(let d=c;d<a;d+=1)b[d]=!0;a-=1}let c=[];for(let a=0;a<b.length;a+=1){if(b[a]){c.push({type:"line",line:s[a],sourceIndex:a});continue}let d=a;for(;a<b.length&&!b[a];)a+=1;c.push({type:"fold",foldStartIndex:d,totalLines:a-d}),a-=1}return c},[s,t,m,n,r]),v=(0,h.useMemo)(()=>{let a=[];for(let b=0;b<u.length;b+=1){let c=u[b];if("fold"===c.type){a.push((0,d.jsxs)("tr",{className:"code-fold",children:[(0,d.jsx)("td",{className:"code-fold-gutter"}),(0,d.jsx)("td",{className:"code-fold-gutter"}),(0,d.jsx)("td",{}),(0,d.jsx)("td",{children:(0,d.jsx)("button",{type:"button",className:"cursor-pointer underline",onClick:()=>{p(a=>{let b=a.signature===q?a.blocks:[];return b.includes(c.foldStartIndex)?a.signature===q?a:{signature:q,blocks:b}:{signature:q,blocks:[...b,c.foldStartIndex]}})},children:(0,d.jsxs)("pre",{className:"code-fold-content",children:["Expand ",c.totalLines," lines ..."]})})})]},`fold-${c.foldStartIndex}`));continue}if(j(c.line)){let c=[],d=[],e=b;for(;e<u.length;){let a=u[e];if("line"!==a.type||!j(a.line))break;c.push({key:`line-${a.sourceIndex}-paired-removed`,type:g.sY.REMOVED,leftLineNumber:a.line.left?.lineNumber??null,rightLineNumber:null,value:k(a.line.left?.value)}),d.push({key:`line-${a.sourceIndex}-paired-added`,type:g.sY.ADDED,leftLineNumber:null,rightLineNumber:a.line.right?.lineNumber??null,value:k(a.line.right?.value)}),e+=1}c.forEach(b=>{a.push(l(b))}),d.forEach(b=>{a.push(l(b))}),b=e-1;continue}a.push(l(function(a,b){let c=a.left??{},d=a.right??{};return c.type===g.sY.REMOVED?{key:`line-${b}-removed`,type:g.sY.REMOVED,leftLineNumber:c.lineNumber??null,rightLineNumber:null,value:k(c.value)}:d.type===g.sY.ADDED?{key:`line-${b}-added`,type:g.sY.ADDED,leftLineNumber:null,rightLineNumber:d.lineNumber??null,value:k(d.value)}:{key:`line-${b}-default`,type:g.sY.DEFAULT,leftLineNumber:c.lineNumber??null,rightLineNumber:d.lineNumber??null,value:k(c.value??d.value)}}(c.line,c.sourceIndex)))}return a},[u,q]);return(0,d.jsx)("table",{className:(0,e.cn)("diff-container",c?"dark-theme":"light-theme"),children:(0,d.jsx)("tbody",{children:v})})}function n({oldValue:a,newValue:b,splitView:c,useDarkTheme:e=!1,linesOffset:g=0,showDiffOnly:h=!0,extraLinesSurroundingDiff:i=3}){return c?(0,d.jsx)(f.Ay,{oldValue:a,newValue:b,splitView:!0,useDarkTheme:e,disableWordDiff:!0}):(0,d.jsx)(m,{oldValue:a,newValue:b,useDarkTheme:e,linesOffset:g,showDiffOnly:h,extraLinesSurroundingDiff:i})}},8354:a=>{"use strict";a.exports=require("util")},9021:a=>{"use strict";a.exports=require("fs")},9121:a=>{"use strict";a.exports=require("next/dist/server/app-render/action-async-storage.external.js")},9294:a=>{"use strict";a.exports=require("next/dist/server/app-render/work-async-storage.external.js")}};var b=require("../../../webpack-runtime.js");b.C(a);var c=b.X(0,[445,471,392,116,816,946,781,386],()=>b(b.s=1431));module.exports=c})();
+(()=>{var a={};a.id=612,a.ids=[612],a.modules={261:a=>{"use strict";a.exports=require("next/dist/shared/lib/router/utils/app-paths")},722:a=>{"use strict";a.exports=require("next/dist/shared/lib/invariant-error")},846:a=>{"use strict";a.exports=require("next/dist/compiled/next-server/app-page.runtime.prod.js")},1025:a=>{"use strict";a.exports=require("next/dist/server/app-render/dynamic-access-async-storage.external.js")},1559:(a,b,c)=>{Promise.resolve().then(c.bind(c,6812))},1727:(a,b,c)=>{Promise.resolve().then(c.bind(c,6608))},1820:a=>{"use strict";a.exports=require("os")},3033:a=>{"use strict";a.exports=require("next/dist/server/app-render/work-unit-async-storage.external.js")},3295:a=>{"use strict";a.exports=require("next/dist/server/app-render/after-task-async-storage.external.js")},3873:a=>{"use strict";a.exports=require("path")},3954:a=>{"use strict";a.exports=require("next/dist/shared/lib/router/utils/interception-routes")},4185:(a,b,c)=>{"use strict";c.r(b),c.d(b,{GlobalError:()=>D.a,__next_app__:()=>L,handler:()=>N,routeModule:()=>M});var d=c(7553),e=c(4006),f=c(7798),g=c(4775),h=c(9373),i=c(3461),j=c(1020),k=c(6349),l=c(4365),m=c(6023),n=c(3747),o=c(4235),p=c(3938),q=c(261),r=c(6758),s=c(7243),t=c(6713),u=c(7527),v=c(2820),w=c(8216),x=c(7929),y=c(9551),z=c(9125),A=c(6439),B=c(7068),C=c(5547),D=c.n(C),E=c(1287),F=c(1494),G=c(722),H=c(753),I=c(3954),J={};for(let a in E)0>["default","GlobalError","__next_app__","routeModule","handler"].indexOf(a)&&(J[a]=()=>E[a]);c.d(b,J);let K={children:["",{children:["workspace",{children:["conflicts",{children:["__PAGE__",{},{page:[()=>Promise.resolve().then(c.bind(c,6608)),"/home/runner/work/trident/trident/src/app/workspace/conflicts/page.tsx"]}]},{}]},{layout:[()=>Promise.resolve().then(c.bind(c,4763)),"/home/runner/work/trident/trident/src/app/workspace/layout.tsx"],metadata:{icon:[async a=>(await Promise.resolve().then(c.bind(c,8162))).default(a)],apple:[],openGraph:[],twitter:[],manifest:void 0}}]},{layout:[()=>Promise.resolve().then(c.bind(c,6537)),"/home/runner/work/trident/trident/src/app/layout.tsx"],"global-error":[()=>Promise.resolve().then(c.t.bind(c,5547,23)),"next/dist/client/components/builtin/global-error.js"],"not-found":[()=>Promise.resolve().then(c.t.bind(c,5091,23)),"next/dist/client/components/builtin/not-found.js"],forbidden:[()=>Promise.resolve().then(c.t.bind(c,5270,23)),"next/dist/client/components/builtin/forbidden.js"],unauthorized:[()=>Promise.resolve().then(c.t.bind(c,8193,23)),"next/dist/client/components/builtin/unauthorized.js"],metadata:{icon:[async a=>(await Promise.resolve().then(c.bind(c,8162))).default(a)],apple:[],openGraph:[],twitter:[],manifest:void 0}}]}.children,L={require:c,loadChunk:()=>Promise.resolve()},M=new d.AppPageRouteModule({definition:{kind:e.RouteKind.APP_PAGE,page:"/workspace/conflicts/page",pathname:"/workspace/conflicts",bundlePath:"",filename:"",appPaths:[]},userland:{loaderTree:K},distDir:".next",relativeProjectDir:""});async function N(a,b,d){var C;M.isDev&&(0,h.addRequestMeta)(a,"devRequestTimingInternalsEnd",process.hrtime.bigint());let J=!!(0,h.getRequestMeta)(a,"minimalMode"),O="/workspace/conflicts/page";"/index"===O&&(O="/");let P=await M.prepare(a,b,{srcPage:O,multiZoneDraftMode:!1});if(!P)return b.statusCode=400,b.end("Bad Request"),null==d.waitUntil||d.waitUntil.call(d,Promise.resolve()),null;let{buildId:Q,query:R,params:S,pageIsDynamic:T,buildManifest:U,nextFontManifest:V,reactLoadableManifest:W,serverActionsManifest:X,clientReferenceManifest:Y,subresourceIntegrityManifest:Z,prerenderManifest:$,isDraftMode:_,resolvedPathname:aa,revalidateOnlyGenerated:ab,routerServerContext:ac,nextConfig:ad,parsedUrl:ae,interceptionRoutePatterns:af,deploymentId:ag}=P,ah=(0,q.normalizeAppPath)(O),{isOnDemandRevalidate:ai}=P,aj=ad.experimental.ppr&&!ad.cacheComponents&&(0,I.isInterceptionRouteAppPath)(aa)?null:M.match(aa,$),ak=!!$.routes[aa],al=a.headers["user-agent"]||"",am=(0,t.getBotType)(al),an=(0,p.isHtmlBotRequest)(a),ao=(0,h.getRequestMeta)(a,"isPrefetchRSCRequest")??"1"===a.headers[s.NEXT_ROUTER_PREFETCH_HEADER],ap=(0,h.getRequestMeta)(a,"isRSCRequest")??!!a.headers[s.RSC_HEADER],aq=(0,r.getIsPossibleServerAction)(a),ar=(0,m.checkIsAppPPREnabled)(ad.experimental.ppr);if(!(0,h.getRequestMeta)(a,"postponed")&&ar&&"1"===a.headers[x.NEXT_RESUME_HEADER]&&"POST"===a.method){let b=[];for await(let c of a)b.push(c);let c=Buffer.concat(b).toString("utf8");(0,h.addRequestMeta)(a,"postponed",c)}let as=ar&&(null==(C=$.routes[ah]??$.dynamicRoutes[ah])?void 0:C.renderingMode)==="PARTIALLY_STATIC",at=!1,au=!1,av=as?(0,h.getRequestMeta)(a,"postponed"):void 0,aw=as&&ap&&!ao;J&&(aw=aw&&!!av);let ax=(0,h.getRequestMeta)(a,"segmentPrefetchRSCRequest"),ay=(!an||!as)&&(!al||(0,p.shouldServeStreamingMetadata)(al,ad.htmlLimitedBots)),az=!!((aj||ak||$.routes[ah])&&!(an&&as)),aA=as&&!0===ad.cacheComponents,aB=!0===M.isDev||!az||"string"==typeof av||(aA&&(0,h.getRequestMeta)(a,"onCacheEntryV2")?aw&&!J:aw),aC=an&&as,aD=null;_||!az||aB||aq||av||aw||(aD=aa);let aE=aD;!aE&&M.isDev&&(aE=aa),M.isDev||_||!az||!ap||aw||(0,k.d)(a.headers);let aF={...E,tree:K,GlobalError:D(),handler:N,routeModule:M,__next_app__:L};X&&Y&&(0,o.setManifestsSingleton)({page:O,clientReferenceManifest:Y,serverActionsManifest:X});let aG=a.method||"GET",aH=(0,g.getTracer)(),aI=aH.getActiveScopeSpan(),aJ=async()=>((null==ac?void 0:ac.render404)?await ac.render404(a,b,ae,!1):b.end("This page could not be found"),null);try{let f=M.getVaryHeader(aa,af);b.setHeader("Vary",f);let k=async(c,d)=>{let e=new l.NodeNextRequest(a),f=new l.NodeNextResponse(b);return M.render(e,f,d).finally(()=>{if(!c)return;c.setAttributes({"http.status_code":b.statusCode,"next.rsc":!1});let a=aH.getRootSpanAttributes();if(!a)return;if(a.get("next.span_type")!==i.BaseServerSpan.handleRequest)return void console.warn(`Unexpected root span type '${a.get("next.span_type")}'. Please report this Next.js issue https://github.com/vercel/next.js`);let d=a.get("next.route");if(d){let a=`${aG} ${d}`;c.setAttributes({"next.route":d,"http.route":d,"next.span_name":a}),c.updateName(a)}else c.updateName(`${aG} ${O}`)})},m=(0,h.getRequestMeta)(a,"incrementalCache"),o=async({span:e,postponed:f,fallbackRouteParams:g,forceStaticRender:i})=>{let l={query:R,params:S,page:ah,sharedContext:{buildId:Q},serverComponentsHmrCache:(0,h.getRequestMeta)(a,"serverComponentsHmrCache"),fallbackRouteParams:g,renderOpts:{App:()=>null,Document:()=>null,pageConfig:{},ComponentMod:aF,Component:(0,j.T)(aF),params:S,routeModule:M,page:O,postponed:f,shouldWaitOnAllReady:aC,serveStreamingMetadata:ay,supportsDynamicResponse:"string"==typeof f||aB,buildManifest:U,nextFontManifest:V,reactLoadableManifest:W,subresourceIntegrityManifest:Z,setCacheStatus:null==ac?void 0:ac.setCacheStatus,setIsrStatus:null==ac?void 0:ac.setIsrStatus,setReactDebugChannel:null==ac?void 0:ac.setReactDebugChannel,sendErrorsToBrowser:null==ac?void 0:ac.sendErrorsToBrowser,dir:c(3873).join(process.cwd(),M.relativeProjectDir),isDraftMode:_,botType:am,isOnDemandRevalidate:ai,isPossibleServerAction:aq,assetPrefix:ad.assetPrefix,nextConfigOutput:ad.output,crossOrigin:ad.crossOrigin,trailingSlash:ad.trailingSlash,images:ad.images,previewProps:$.preview,deploymentId:ag,enableTainting:ad.experimental.taint,htmlLimitedBots:ad.htmlLimitedBots,reactMaxHeadersLength:ad.reactMaxHeadersLength,multiZoneDraftMode:!1,incrementalCache:m,cacheLifeProfiles:ad.cacheLife,basePath:ad.basePath,serverActions:ad.experimental.serverActions,...at||au?{nextExport:!0,supportsDynamicResponse:!1,isStaticGeneration:!0,isDebugDynamicAccesses:at}:{},cacheComponents:!!ad.cacheComponents,experimental:{isRoutePPREnabled:as,expireTime:ad.expireTime,staleTimes:ad.experimental.staleTimes,dynamicOnHover:!!ad.experimental.dynamicOnHover,inlineCss:!!ad.experimental.inlineCss,authInterrupts:!!ad.experimental.authInterrupts,clientTraceMetadata:ad.experimental.clientTraceMetadata||[],clientParamParsingOrigins:ad.experimental.clientParamParsingOrigins,maxPostponedStateSizeBytes:(0,B.parseMaxPostponedStateSize)(ad.experimental.maxPostponedStateSize)},waitUntil:d.waitUntil,onClose:a=>{b.on("close",a)},onAfterTaskError:()=>{},onInstrumentationRequestError:(b,c,d,e)=>M.onRequestError(a,b,d,e,ac),err:(0,h.getRequestMeta)(a,"invokeError"),dev:M.isDev}};at&&(l.renderOpts.nextExport=!0,l.renderOpts.supportsDynamicResponse=!1,l.renderOpts.isDebugDynamicAccesses=at),i&&(l.renderOpts.supportsDynamicResponse=!1);let n=await k(e,l),{metadata:o}=n,{cacheControl:p,headers:q={},fetchTags:r,fetchMetrics:s}=o;if(r&&(q[x.NEXT_CACHE_TAGS_HEADER]=r),a.fetchMetrics=s,az&&(null==p?void 0:p.revalidate)===0&&!M.isDev&&!as){let a=o.staticBailoutInfo,b=Object.defineProperty(Error(`Page changed from static to dynamic at runtime ${aa}${(null==a?void 0:a.description)?`, reason: ${a.description}`:""}
+see more here https://nextjs.org/docs/messages/app-static-to-dynamic-error`),"__NEXT_ERROR_CODE",{value:"E132",enumerable:!1,configurable:!0});if(null==a?void 0:a.stack){let c=a.stack;b.stack=b.message+c.substring(c.indexOf("\n"))}throw b}return{value:{kind:u.CachedRouteKind.APP_PAGE,html:n,headers:q,rscData:o.flightData,postponed:o.postponed,status:o.statusCode,segmentData:o.segmentData},cacheControl:p}},p=async({hasResolved:c,previousCacheEntry:f,isRevalidating:g,span:i,forceStaticRender:j=!1})=>{let k,l=!1===M.isDev,q=c||b.writableEnded;if(ai&&ab&&!f&&!J)return(null==ac?void 0:ac.render404)?await ac.render404(a,b):(b.statusCode=404,b.end("This page could not be found")),null;if(aj&&(k=(0,v.parseFallbackField)(aj.fallback)),k===v.FallbackMode.PRERENDER&&(0,t.isBot)(al)&&(!as||an)&&(k=v.FallbackMode.BLOCKING_STATIC_RENDER),(null==f?void 0:f.isStale)===-1&&(ai=!0),ai&&(k!==v.FallbackMode.NOT_FOUND||f)&&(k=v.FallbackMode.BLOCKING_STATIC_RENDER),!J&&k!==v.FallbackMode.BLOCKING_STATIC_RENDER&&aE&&!q&&!_&&T&&(l||!ak)){if((l||aj)&&k===v.FallbackMode.NOT_FOUND){if(ad.experimental.adapterPath)return await aJ();throw new A.NoFallbackError}if(as&&(ad.cacheComponents?!aw:!ap)){let b=l&&"string"==typeof(null==aj?void 0:aj.fallback)?aj.fallback:ah,c=l&&(null==aj?void 0:aj.fallbackRouteParams)?(0,n.createOpaqueFallbackRouteParams)(aj.fallbackRouteParams):au?(0,n.getFallbackRouteParams)(ah,M):null,f=await M.handleResponse({cacheKey:b,req:a,nextConfig:ad,routeKind:e.RouteKind.APP_PAGE,isFallback:!0,prerenderManifest:$,isRoutePPREnabled:as,responseGenerator:async()=>o({span:i,postponed:void 0,fallbackRouteParams:c,forceStaticRender:!1}),waitUntil:d.waitUntil,isMinimalMode:J});if(null===f)return null;if(f)return delete f.cacheControl,f}}let r=ai||g||!av?void 0:av;if(aA&&!J&&m&&aw&&!j){let b=await m.get(aa,{kind:u.IncrementalCacheKind.APP_PAGE,isRoutePPREnabled:!0,isFallback:!1});b&&b.value&&b.value.kind===u.CachedRouteKind.APP_PAGE&&(r=b.value.postponed,b&&(-1===b.isStale||!0===b.isStale)&&(0,H.scheduleOnNextTick)(async()=>{let b=M.getResponseCache(a);try{await b.revalidate(aa,m,as,!1,a=>p({...a,forceStaticRender:!0}),null,c,d.waitUntil)}catch(a){console.error("Error revalidating the page in the background",a)}}))}if(at&&void 0!==r)return{cacheControl:{revalidate:1,expire:void 0},value:{kind:u.CachedRouteKind.PAGES,html:w.default.EMPTY,pageData:{},headers:void 0,status:void 0}};let s=l&&(null==aj?void 0:aj.fallbackRouteParams)&&(0,h.getRequestMeta)(a,"renderFallbackShell")?(0,n.createOpaqueFallbackRouteParams)(aj.fallbackRouteParams):au?(0,n.getFallbackRouteParams)(ah,M):null;return o({span:i,postponed:r,fallbackRouteParams:s,forceStaticRender:j})},q=async c=>{var f,g,i,j,k;let l,m=await M.handleResponse({cacheKey:aD,responseGenerator:a=>p({span:c,...a}),routeKind:e.RouteKind.APP_PAGE,isOnDemandRevalidate:ai,isRoutePPREnabled:as,req:a,nextConfig:ad,prerenderManifest:$,waitUntil:d.waitUntil,isMinimalMode:J});if(_&&b.setHeader("Cache-Control","private, no-cache, no-store, max-age=0, must-revalidate"),M.isDev&&b.setHeader("Cache-Control","no-store, must-revalidate"),!m){if(aD)throw Object.defineProperty(Error("invariant: cache entry required but not generated"),"__NEXT_ERROR_CODE",{value:"E62",enumerable:!1,configurable:!0});return null}if((null==(f=m.value)?void 0:f.kind)!==u.CachedRouteKind.APP_PAGE)throw Object.defineProperty(Error(`Invariant app-page handler received invalid cache entry ${null==(i=m.value)?void 0:i.kind}`),"__NEXT_ERROR_CODE",{value:"E707",enumerable:!1,configurable:!0});let n="string"==typeof m.value.postponed;az&&!aw&&(!n||ao)&&(J||b.setHeader("x-nextjs-cache",ai?"REVALIDATED":m.isMiss?"MISS":m.isStale?"STALE":"HIT"),b.setHeader(s.NEXT_IS_PRERENDER_HEADER,"1"));let{value:q}=m;if(av)l={revalidate:0,expire:void 0};else if(aw)l={revalidate:0,expire:void 0};else if(!M.isDev)if(_)l={revalidate:0,expire:void 0};else if(az){if(m.cacheControl)if("number"==typeof m.cacheControl.revalidate){if(m.cacheControl.revalidate<1)throw Object.defineProperty(Error(`Invalid revalidate configuration provided: ${m.cacheControl.revalidate} < 1`),"__NEXT_ERROR_CODE",{value:"E22",enumerable:!1,configurable:!0});l={revalidate:m.cacheControl.revalidate,expire:(null==(j=m.cacheControl)?void 0:j.expire)??ad.expireTime}}else l={revalidate:x.CACHE_ONE_YEAR,expire:void 0}}else b.getHeader("Cache-Control")||(l={revalidate:0,expire:void 0});if(m.cacheControl=l,"string"==typeof ax&&(null==q?void 0:q.kind)===u.CachedRouteKind.APP_PAGE&&q.segmentData){b.setHeader(s.NEXT_DID_POSTPONE_HEADER,"2");let c=null==(k=q.headers)?void 0:k[x.NEXT_CACHE_TAGS_HEADER];J&&az&&c&&"string"==typeof c&&b.setHeader(x.NEXT_CACHE_TAGS_HEADER,c);let d=q.segmentData.get(ax);return void 0!==d?(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:w.default.fromStatic(d,s.RSC_CONTENT_TYPE_HEADER),cacheControl:m.cacheControl}):(b.statusCode=204,(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:w.default.EMPTY,cacheControl:m.cacheControl}))}let r=aA?(0,h.getRequestMeta)(a,"onCacheEntryV2")??(0,h.getRequestMeta)(a,"onCacheEntry"):(0,h.getRequestMeta)(a,"onCacheEntry");if(r&&await r(m,{url:(0,h.getRequestMeta)(a,"initURL")??a.url}))return null;if(q.headers){let a={...q.headers};for(let[c,d]of(J&&az||delete a[x.NEXT_CACHE_TAGS_HEADER],Object.entries(a)))if(void 0!==d)if(Array.isArray(d))for(let a of d)b.appendHeader(c,a);else"number"==typeof d&&(d=d.toString()),b.appendHeader(c,d)}let t=null==(g=q.headers)?void 0:g[x.NEXT_CACHE_TAGS_HEADER];if(J&&az&&t&&"string"==typeof t&&b.setHeader(x.NEXT_CACHE_TAGS_HEADER,t),!q.status||ap&&as||(b.statusCode=q.status),!J&&q.status&&F.RedirectStatusCode[q.status]&&ap&&(b.statusCode=200),n&&!aw&&b.setHeader(s.NEXT_DID_POSTPONE_HEADER,"1"),ap&&!_){if(void 0===q.rscData){if(q.html.contentType!==s.RSC_CONTENT_TYPE_HEADER)if(ad.cacheComponents)return b.statusCode=404,(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:w.default.EMPTY,cacheControl:m.cacheControl});else throw Object.defineProperty(new G.InvariantError(`Expected RSC response, got ${q.html.contentType}`),"__NEXT_ERROR_CODE",{value:"E789",enumerable:!1,configurable:!0});return(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:q.html,cacheControl:m.cacheControl})}return(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:w.default.fromStatic(q.rscData,s.RSC_CONTENT_TYPE_HEADER),cacheControl:m.cacheControl})}let v=q.html;if(!n||J||ap)return(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:v,cacheControl:m.cacheControl});if(at)return v.push(new ReadableStream({start(a){a.enqueue(y.ENCODED_TAGS.CLOSED.BODY_AND_HTML),a.close()}})),(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:v,cacheControl:{revalidate:0,expire:void 0}});let A=new TransformStream;return v.push(A.readable),o({span:c,postponed:q.postponed,fallbackRouteParams:null,forceStaticRender:!1}).then(async a=>{var b,c;if(!a)throw Object.defineProperty(Error("Invariant: expected a result to be returned"),"__NEXT_ERROR_CODE",{value:"E463",enumerable:!1,configurable:!0});if((null==(b=a.value)?void 0:b.kind)!==u.CachedRouteKind.APP_PAGE)throw Object.defineProperty(Error(`Invariant: expected a page response, got ${null==(c=a.value)?void 0:c.kind}`),"__NEXT_ERROR_CODE",{value:"E305",enumerable:!1,configurable:!0});await a.value.html.pipeTo(A.writable)}).catch(a=>{A.writable.abort(a).catch(a=>{console.error("couldn't abort transformer",a)})}),(0,z.sendRenderResult)({req:a,res:b,generateEtags:ad.generateEtags,poweredByHeader:ad.poweredByHeader,result:v,cacheControl:{revalidate:0,expire:void 0}})};if(!aI)return await aH.withPropagatedContext(a.headers,()=>aH.trace(i.BaseServerSpan.handleRequest,{spanName:`${aG} ${O}`,kind:g.SpanKind.SERVER,attributes:{"http.method":aG,"http.target":a.url}},q));await q(aI)}catch(b){throw b instanceof A.NoFallbackError||await M.onRequestError(a,b,{routerKind:"App Router",routePath:O,routeType:"render",revalidateReason:(0,f.c)({isStaticGeneration:az,isOnDemandRevalidate:ai})},!1,ac),b}}},6439:a=>{"use strict";a.exports=require("next/dist/shared/lib/no-fallback-error.external")},6608:(a,b,c)=>{"use strict";c.r(b),c.d(b,{default:()=>d});let d=(0,c(7943).registerClientReference)(function(){throw Error("Attempted to call the default export of \"/home/runner/work/trident/trident/src/app/workspace/conflicts/page.tsx\" from the server, but it's on the client. It's not possible to invoke a client function from the server, it can only be rendered as a Component or passed to props of a Client Component.")},"/home/runner/work/trident/trident/src/app/workspace/conflicts/page.tsx","default")},6713:a=>{"use strict";a.exports=require("next/dist/shared/lib/router/utils/is-bot")},6812:(a,b,c)=>{"use strict";c.r(b),c.d(b,{default:()=>q});var d=c(8249),e=c(9099),f=c(7484),g=c(7536),h=c(4626),i=c(4490),j=c(3381),k=c(7532),l=c(8696);function m(a){return"merge"===a?"Merge":"rebase"===a?"Rebase":"Conflict"}function n({filePath:a,versions:b,isBinary:c,onResolve:e,busy:g}){let[h,i]=(0,f.useState)(b.current||b.ours||b.theirs||""),{resolvedTheme:j}=(0,l.D)();return c?(0,d.jsxs)("div",{className:"h-full p-6 flex flex-col gap-4",children:[(0,d.jsx)("h2",{className:"text-lg font-bold",children:"Binary Conflict"}),(0,d.jsx)("p",{className:"text-sm opacity-70",children:"This conflicted file looks binary. Use one side to resolve it."}),(0,d.jsxs)("div",{className:"flex items-center gap-2",children:[(0,d.jsx)("button",{className:"btn btn-sm",onClick:()=>e("ours",{stage:!0}),disabled:g,children:"Use Ours"}),(0,d.jsx)("button",{className:"btn btn-sm",onClick:()=>e("theirs",{stage:!0}),disabled:g,children:"Use Theirs"})]})]}):(0,d.jsxs)("div",{className:"h-full flex flex-col overflow-hidden",children:[(0,d.jsxs)("div",{className:"px-4 py-3 border-b border-base-300 bg-base-100 flex items-center justify-between gap-3",children:[(0,d.jsxs)("div",{className:"min-w-0",children:[(0,d.jsx)("div",{className:"text-xs uppercase tracking-wider opacity-60",children:"Resolving"}),(0,d.jsx)("div",{className:"font-mono text-xs truncate",title:a,children:a})]}),(0,d.jsxs)("div",{className:"flex items-center gap-2",children:[(0,d.jsx)("button",{className:"btn btn-xs",onClick:()=>i(b.ours),disabled:g,children:"Copy Ours"}),(0,d.jsx)("button",{className:"btn btn-xs",onClick:()=>i(b.theirs),disabled:g,children:"Copy Theirs"}),(0,d.jsx)("button",{className:"btn btn-xs btn-outline",onClick:()=>void e("manual",{content:h,stage:!1}),disabled:g,children:"Save"}),(0,d.jsx)("button",{className:"btn btn-xs btn-primary",onClick:()=>void e("manual",{content:h,stage:!0}),disabled:g,children:"Save + Stage"})]})]}),(0,d.jsxs)("div",{className:"flex-1 min-h-0 border-b border-base-300 flex flex-col",children:[(0,d.jsxs)("div",{className:"grid grid-cols-2 gap-0 border-b border-base-300",children:[(0,d.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,d.jsx)("div",{className:"px-3 py-2 text-xs font-bold uppercase tracking-wider bg-base-200/60",children:"Theirs"})]}),(0,d.jsx)("div",{className:"flex-1 min-h-0 overflow-auto diff-viewer-wrapper",children:(0,d.jsx)(k.O,{oldValue:b.ours,newValue:b.theirs,splitView:!0,useDarkTheme:"dark"===j,showDiffOnly:!1})})]}),(0,d.jsxs)("div",{className:"flex-[1.2] min-h-0 flex flex-col",children:[(0,d.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,d.jsx)("textarea",{value:h,onChange:a=>i(a.target.value),className:"textarea textarea-ghost h-full w-full rounded-none resize-none font-mono text-xs leading-5",spellCheck:!1})]}),(0,d.jsxs)("div",{className:"px-4 py-2 border-t border-base-300 bg-base-100 flex items-center justify-end gap-2",children:[(0,d.jsx)("button",{className:"btn btn-sm",onClick:()=>void e("ours",{stage:!0}),disabled:g,children:"Use Ours + Stage"}),(0,d.jsx)("button",{className:"btn btn-sm",onClick:()=>void e("theirs",{stage:!0}),disabled:g,children:"Use Theirs + Stage"})]})]})}function o({repoPath:a}){let b=(0,e.useRouter)(),c=(0,e.useSearchParams)(),{data:g,isLoading:k,isError:l,error:o,refetch:p}=(0,h.en)(a),{data:q,isLoading:r,isError:s,error:t,refetch:u}=(0,h.F7)(a),{mutateAsync:v,isPending:w}=(0,h.a3)(),[x,y]=(0,f.useState)(null),z=g?.conflicted??[],A=new Set(z),B=(g?.files??[]).filter(a=>!A.has(a.path)&&" "===a.index&&" "!==a.working_dir).map(a=>a.path),C=(g?.files??[]).filter(a=>!A.has(a.path)&&" "!==a.index).map(a=>a.path),D=x&&z.includes(x)?x:z[0]??null,{data:E,isLoading:F,isError:G,error:H,refetch:I}=(0,h.b5)(a,D),J=q?.operation??null,K=(0,f.useCallback)((a="")=>{let b=new URLSearchParams(c.toString()).toString();return b?`/workspace${a}?${b}`:`/workspace${a}`},[c]),L=(0,f.useCallback)(async()=>{await Promise.all([p(),u(),I()])},[u,p,I]),M=async(b,c,d={})=>{await v({repoPath:a,action:"resolve-conflict-file",data:{path:b,strategy:c,content:d.content,stage:d.stage??!0}}),await L(),(0,j.oR)({type:"success",title:"Conflict Updated",description:"manual"===c?!1===d.stage?"Saved manual resolution.":"Saved and staged manual resolution.":`Applied ${c} version${!1===d.stage?"":" and staged it"}.`})},N=async b=>{await v({repoPath:a,action:"stage",data:{files:[b]}}),await L()},O=async()=>{let c="rebase"===J?"abort-rebase":"merge"===J?"abort-merge":null;c&&(await v({repoPath:a,action:c}),(0,j.oR)({type:"info",title:`${m(J)} Aborted`,description:`The ${m(J).toLowerCase()} operation was aborted.`}),b.push(K()))},P=async()=>{let c="rebase"===J?"continue-rebase":"merge"===J?"continue-merge":null;c&&(await v({repoPath:a,action:c}),(0,j.oR)({type:"success",title:`${m(J)} Completed`,description:`${m(J)} continued successfully.`}),b.push(K()))};if(k||r)return(0,d.jsx)("div",{className:"flex items-center justify-center h-64",children:(0,d.jsx)("span",{className:"loading loading-spinner text-base-content/50"})});if(l||s)return(0,d.jsxs)("div",{className:"flex items-center justify-center h-64 flex-col gap-4",children:[(0,d.jsx)("p",{className:"text-error font-bold",children:"Error Loading Conflicts"}),(0,d.jsx)("p",{className:"text-sm opacity-70",children:o?.message||t?.message||"An unknown error occurred"}),(0,d.jsxs)("button",{onClick:()=>void L(),className:"btn btn-outline btn-sm",disabled:w,children:[(0,d.jsx)("i",{className:"iconoir-refresh-circle text-[16px] mr-1","aria-hidden":"true"}),"Try Again"]})]});let Q=!!J,R=z.length>0,S=!!q?.canContinue&&Q,T=!!D&&(0,i.kO)(D,E?.ours,E?.theirs||E?.current);return(0,d.jsxs)("div",{className:"flex h-full overflow-hidden",children:[(0,d.jsxs)("div",{className:"w-80 border-r border-base-300 flex flex-col bg-base-200/30",children:[(0,d.jsxs)("div",{className:"h-[57px] px-4 border-b border-base-300 flex items-center justify-between bg-base-100",children:[(0,d.jsx)("h1",{className:"font-bold text-lg",children:"Conflicts"}),(0,d.jsx)("button",{className:"btn btn-ghost btn-sm btn-square",onClick:()=>void L(),disabled:w,title:"Refresh",children:(0,d.jsx)("i",{className:"iconoir-refresh-circle text-[16px]","aria-hidden":"true"})})]}),(0,d.jsxs)("div",{className:"p-4 border-b border-base-300 space-y-2",children:[(0,d.jsx)("div",{className:"text-xs opacity-70",children:"Operation"}),(0,d.jsxs)("div",{className:"flex items-center justify-between",children:[(0,d.jsx)("span",{className:(0,i.cn)("badge",Q?"badge-warning":"badge-ghost"),children:Q?m(J):"None"}),(0,d.jsx)("span",{className:(0,i.cn)("badge",R?"badge-error":"badge-success"),children:R?`${z.length} unresolved`:"No unresolved"})]})]}),(0,d.jsxs)("div",{className:"flex-1 overflow-y-auto p-2",children:[(0,d.jsx)("div",{className:"px-2 py-2 text-xs font-bold uppercase tracking-wider opacity-70",children:"Unresolved Files"}),(0,d.jsxs)("div",{className:"space-y-0.5",children:[0===z.length&&(0,d.jsx)("p",{className:"px-2 py-2 text-xs opacity-50 italic",children:"No unresolved conflicts."}),z.map(a=>(0,d.jsxs)("div",{className:(0,i.cn)("rounded-md border border-transparent",D===a&&"bg-base-300 border-base-300"),children:[(0,d.jsxs)("button",{className:(0,i.cn)("w-full text-left flex items-center gap-2 px-2 py-2 rounded-md text-sm hover:bg-base-300 transition-colors",D===a&&"text-primary font-medium"),onClick:()=>y(a),title:a,children:[(0,d.jsx)("i",{className:"iconoir-warning-triangle text-[14px] text-error shrink-0","aria-hidden":"true"}),(0,d.jsx)("span",{className:"truncate font-mono text-xs",children:a})]}),(0,d.jsxs)("div",{className:"px-2 pb-2 flex items-center gap-1",children:[(0,d.jsx)("button",{className:"btn btn-xs",onClick:()=>void M(a,"ours",{stage:!0}),disabled:w,children:"Ours"}),(0,d.jsx)("button",{className:"btn btn-xs",onClick:()=>void M(a,"theirs",{stage:!0}),disabled:w,children:"Theirs"})]})]},a))]}),B.length>0&&(0,d.jsxs)(d.Fragment,{children:[(0,d.jsx)("div",{className:"h-px bg-base-300 mx-2 my-3"}),(0,d.jsx)("div",{className:"px-2 py-2 text-xs font-bold uppercase tracking-wider opacity-70",children:"Ready to Stage"}),(0,d.jsx)("div",{className:"space-y-1",children:B.map(a=>(0,d.jsxs)("div",{className:"flex items-center gap-2 px-2 py-1.5 rounded-md bg-base-100 border border-base-300",children:[(0,d.jsx)("span",{className:"truncate font-mono text-xs flex-1",title:a,children:a}),(0,d.jsx)("button",{className:"btn btn-xs btn-success",onClick:()=>void N(a),disabled:w,title:"Stage as resolved",children:"Stage"})]},a))})]}),C.length>0&&(0,d.jsxs)(d.Fragment,{children:[(0,d.jsx)("div",{className:"h-px bg-base-300 mx-2 my-3"}),(0,d.jsx)("div",{className:"px-2 py-2 text-xs font-bold uppercase tracking-wider opacity-70",children:"Staged Resolutions"}),(0,d.jsx)("div",{className:"space-y-1",children:C.map(a=>(0,d.jsx)("div",{className:"px-2 py-1.5 rounded-md bg-success/10 border border-success/20",children:(0,d.jsx)("span",{className:"truncate font-mono text-xs",title:a,children:a})},a))})]})]}),(0,d.jsx)("div",{className:"border-t border-base-300 p-3 space-y-2",children:(0,d.jsxs)("div",{className:"grid grid-cols-2 gap-2",children:[(0,d.jsx)("button",{className:"btn btn-primary btn-sm",onClick:()=>void P(),disabled:!S||w,children:"Continue"}),(0,d.jsx)("button",{className:"btn btn-error btn-outline btn-sm",onClick:()=>void O(),disabled:!Q||w,children:"Abort"})]})})]}),(0,d.jsx)("div",{className:"flex-1 flex flex-col bg-base-100 overflow-hidden",children:D?F?(0,d.jsx)("div",{className:"flex-1 flex items-center justify-center",children:(0,d.jsx)("span",{className:"loading loading-spinner"})}):G||!E?(0,d.jsxs)("div",{className:"flex-1 flex items-center justify-center flex-col gap-3",children:[(0,d.jsx)("p",{className:"text-error font-bold",children:"Failed to load file versions"}),(0,d.jsx)("p",{className:"text-xs opacity-70",children:H?.message||"Unknown error"}),(0,d.jsx)("button",{className:"btn btn-sm btn-outline",onClick:()=>void I(),children:"Retry"})]}):(0,d.jsx)(n,{filePath:D,versions:E,isBinary:T,onResolve:(a,b)=>M(D,a,b),busy:w},`${D}:${E.ours.length}:${E.theirs.length}:${E.current.length}`):(0,d.jsx)("div",{className:"flex-1 flex items-center justify-center opacity-60",children:(0,d.jsxs)("div",{className:"text-center",children:[(0,d.jsx)("div",{className:"p-8 rounded-full bg-base-200 mb-4 text-4xl mx-auto w-fit",children:(0,d.jsx)("i",{className:"iconoir-warning-triangle text-[32px]","aria-hidden":"true"})}),(0,d.jsx)("p",{className:"text-sm font-bold",children:"Select a conflicted file to resolve"}),(0,d.jsx)("p",{className:"text-xs opacity-70 mt-2",children:"Pick ours/theirs or edit manually."})]})})})]})}function p(){let a=(0,e.useSearchParams)().get("path");return((0,g.J)(a,"Conflicts"),a)?(0,d.jsx)(o,{repoPath:a}):(0,d.jsx)("div",{className:"p-8",children:"No repository path specified."})}function q(){return(0,d.jsx)(f.Suspense,{fallback:(0,d.jsx)("div",{className:"flex items-center justify-center h-full",children:(0,d.jsx)("span",{className:"loading loading-spinner"})}),children:(0,d.jsx)(p,{})})}},7068:a=>{"use strict";a.exports=require("next/dist/shared/lib/size-limit")},7532:(a,b,c)=>{"use strict";c.d(b,{O:()=>n});var d=c(8249),e=c(4490),f=c(339),g=c(8856);c(3609);var h=c(7484);let i=[];function j(a){return a.left?.type===g.sY.REMOVED&&a.right?.type===g.sY.ADDED}function k(a){return"string"==typeof a&&a.length>0?a:" "}function l(a){let b=a.type===g.sY.ADDED,c=a.type===g.sY.REMOVED;return(0,d.jsxs)("tr",{className:"line",children:[(0,d.jsx)("td",{className:(0,e.cn)("gutter",{"empty-gutter":null===a.leftLineNumber,"diff-added":b,"diff-removed":c}),children:(0,d.jsx)("pre",{className:"line-number",children:a.leftLineNumber??""})}),(0,d.jsx)("td",{className:(0,e.cn)("gutter",{"empty-gutter":null===a.rightLineNumber,"diff-added":b,"diff-removed":c}),children:(0,d.jsx)("pre",{className:"line-number",children:a.rightLineNumber??""})}),(0,d.jsx)("td",{className:(0,e.cn)("marker",{"diff-added":b,"diff-removed":c}),children:(0,d.jsx)("pre",{children:b?"+":c?"-":""})}),(0,d.jsx)("td",{className:(0,e.cn)("content",{"diff-added":b,"diff-removed":c}),children:(0,d.jsx)("pre",{className:"content-text",children:a.value})})]},a.key)}function m({oldValue:a,newValue:b,useDarkTheme:c=!1,linesOffset:f=0,showDiffOnly:m=!0,extraLinesSurroundingDiff:n=3}){let[o,p]=(0,h.useState)({signature:"",blocks:[]}),q=(0,h.useMemo)(()=>`${f}:${+!!m}:${n}:${a}\0${b}`,[a,b,f,m,n]),r=(0,h.useMemo)(()=>o.signature===q?o.blocks:i,[o,q]),{lineInformation:s}=(0,h.useMemo)(()=>(0,g.sO)(a,b,!0,void 0,f),[a,b,f]),t=(0,h.useMemo)(()=>{let a=[];return s.forEach((b,c)=>{(b.left?.type!==g.sY.DEFAULT||b.right?.type!==g.sY.DEFAULT)&&a.push(c)}),a},[s]),u=(0,h.useMemo)(()=>{if(0===s.length)return[];if(!m||0===t.length)return s.map((a,b)=>({type:"line",line:a,sourceIndex:b}));let a=Math.max(0,n),b=Array.from({length:s.length},()=>!1);t.forEach(c=>{let d=Math.max(0,c-a),e=Math.min(s.length-1,c+a);for(let a=d;a<=e;a+=1)b[a]=!0});for(let a=0;a<b.length;a+=1){if(b[a])continue;let c=a;for(;a<b.length&&!b[a];)a+=1;if(r.includes(c))for(let d=c;d<a;d+=1)b[d]=!0;a-=1}let c=[];for(let a=0;a<b.length;a+=1){if(b[a]){c.push({type:"line",line:s[a],sourceIndex:a});continue}let d=a;for(;a<b.length&&!b[a];)a+=1;c.push({type:"fold",foldStartIndex:d,totalLines:a-d}),a-=1}return c},[s,t,m,n,r]),v=(0,h.useMemo)(()=>{let a=[];for(let b=0;b<u.length;b+=1){let c=u[b];if("fold"===c.type){a.push((0,d.jsxs)("tr",{className:"code-fold",children:[(0,d.jsx)("td",{className:"code-fold-gutter"}),(0,d.jsx)("td",{className:"code-fold-gutter"}),(0,d.jsx)("td",{}),(0,d.jsx)("td",{children:(0,d.jsx)("button",{type:"button",className:"cursor-pointer underline",onClick:()=>{p(a=>{let b=a.signature===q?a.blocks:[];return b.includes(c.foldStartIndex)?a.signature===q?a:{signature:q,blocks:b}:{signature:q,blocks:[...b,c.foldStartIndex]}})},children:(0,d.jsxs)("pre",{className:"code-fold-content",children:["Expand ",c.totalLines," lines ..."]})})})]},`fold-${c.foldStartIndex}`));continue}if(j(c.line)){let c=[],d=[],e=b;for(;e<u.length;){let a=u[e];if("line"!==a.type||!j(a.line))break;c.push({key:`line-${a.sourceIndex}-paired-removed`,type:g.sY.REMOVED,leftLineNumber:a.line.left?.lineNumber??null,rightLineNumber:null,value:k(a.line.left?.value)}),d.push({key:`line-${a.sourceIndex}-paired-added`,type:g.sY.ADDED,leftLineNumber:null,rightLineNumber:a.line.right?.lineNumber??null,value:k(a.line.right?.value)}),e+=1}c.forEach(b=>{a.push(l(b))}),d.forEach(b=>{a.push(l(b))}),b=e-1;continue}a.push(l(function(a,b){let c=a.left??{},d=a.right??{};return c.type===g.sY.REMOVED?{key:`line-${b}-removed`,type:g.sY.REMOVED,leftLineNumber:c.lineNumber??null,rightLineNumber:null,value:k(c.value)}:d.type===g.sY.ADDED?{key:`line-${b}-added`,type:g.sY.ADDED,leftLineNumber:null,rightLineNumber:d.lineNumber??null,value:k(d.value)}:{key:`line-${b}-default`,type:g.sY.DEFAULT,leftLineNumber:c.lineNumber??null,rightLineNumber:d.lineNumber??null,value:k(c.value??d.value)}}(c.line,c.sourceIndex)))}return a},[u,q]);return(0,d.jsx)("table",{className:(0,e.cn)("diff-container",c?"dark-theme":"light-theme"),children:(0,d.jsx)("tbody",{children:v})})}function n({oldValue:a,newValue:b,splitView:c,useDarkTheme:e=!1,linesOffset:g=0,showDiffOnly:h=!0,extraLinesSurroundingDiff:i=3}){return c?(0,d.jsx)(f.Ay,{oldValue:a,newValue:b,splitView:!0,useDarkTheme:e,disableWordDiff:!0}):(0,d.jsx)(m,{oldValue:a,newValue:b,useDarkTheme:e,linesOffset:g,showDiffOnly:h,extraLinesSurroundingDiff:i})}},8354:a=>{"use strict";a.exports=require("util")},9021:a=>{"use strict";a.exports=require("fs")},9121:a=>{"use strict";a.exports=require("next/dist/server/app-render/action-async-storage.external.js")},9294:a=>{"use strict";a.exports=require("next/dist/server/app-render/work-async-storage.external.js")}};var b=require("../../../webpack-runtime.js");b.C(a);var c=b.X(0,[445,471,392,116,816,764,781,266],()=>b(b.s=4185));module.exports=c})();

package/.next/server/app/workspace/conflicts/page.js.nft.json

@@ -1 +1 @@
-{"version":1,"files":["../../../../../node_modules/next/dist/client/components/app-router-headers.js","../../../../../node_modules/next/dist/compiled/@opentelemetry/api/index.js","../../../../../node_modules/next/dist/compiled/@opentelemetry/api/package.json","../../../../../node_modules/next/dist/compiled/bytes/index.js","../../../../../node_modules/next/dist/compiled/bytes/package.json","../../../../../node_modules/next/dist/compiled/jsonwebtoken/index.js","../../../../../node_modules/next/dist/compiled/jsonwebtoken/package.json","../../../../../node_modules/next/dist/compiled/next-server/app-page.runtime.prod.js","../../../../../node_modules/next/dist/lib/client-and-server-references.js","../../../../../node_modules/next/dist/lib/constants.js","../../../../../node_modules/next/dist/lib/interop-default.js","../../../../../node_modules/next/dist/lib/is-error.js","../../../../../node_modules/next/dist/lib/semver-noop.js","../../../../../node_modules/next/dist/server/app-render/action-async-storage-instance.js","../../../../../node_modules/next/dist/server/app-render/action-async-storage.external.js","../../../../../node_modules/next/dist/server/app-render/after-task-async-storage-instance.js","../../../../../node_modules/next/dist/server/app-render/after-task-async-storage.external.js","../../../../../node_modules/next/dist/server/app-render/async-local-storage.js","../../../../../node_modules/next/dist/server/app-render/cache-signal.js","../../../../../node_modules/next/dist/server/app-render/console-async-storage-instance.js","../../../../../node_modules/next/dist/server/app-render/console-async-storage.external.js","../../../../../node_modules/next/dist/server/app-render/dynamic-access-async-storage-instance.js","../../../../../node_modules/next/dist/server/app-render/dynamic-access-async-storage.external.js","../../../../../node_modules/next/dist/server/app-render/module-loading/track-module-loading.external.js","../../../../../node_modules/next/dist/server/app-render/module-loading/track-module-loading.instance.js","../../../../../node_modules/next/dist/server/app-render/work-async-storage-instance.js","../../../../../node_modules/next/dist/server/app-render/work-async-storage.external.js","../../../../../node_modules/next/dist/server/app-render/work-unit-async-storage-instance.js","../../../../../node_modules/next/dist/server/app-render/work-unit-async-storage.external.js","../../../../../node_modules/next/dist/server/lib/incremental-cache/memory-cache.external.js","../../../../../node_modules/next/dist/server/lib/incremental-cache/shared-cache-controls.external.js","../../../../../node_modules/next/dist/server/lib/incremental-cache/tags-manifest.external.js","../../../../../node_modules/next/dist/server/lib/lru-cache.js","../../../../../node_modules/next/dist/server/lib/router-utils/instrumentation-globals.external.js","../../../../../node_modules/next/dist/server/lib/router-utils/instrumentation-node-extensions.js","../../../../../node_modules/next/dist/server/lib/trace/constants.js","../../../../../node_modules/next/dist/server/lib/trace/tracer.js","../../../../../node_modules/next/dist/server/load-manifest.external.js","../../../../../node_modules/next/dist/server/node-environment-extensions/fast-set-immediate.external.js","../../../../../node_modules/next/dist/server/response-cache/types.js","../../../../../node_modules/next/dist/server/runtime-reacts.external.js","../../../../../node_modules/next/dist/shared/lib/deep-freeze.js","../../../../../node_modules/next/dist/shared/lib/invariant-error.js","../../../../../node_modules/next/dist/shared/lib/is-plain-object.js","../../../../../node_modules/next/dist/shared/lib/is-thenable.js","../../../../../node_modules/next/dist/shared/lib/no-fallback-error.external.js","../../../../../node_modules/next/dist/shared/lib/page-path/ensure-leading-slash.js","../../../../../node_modules/next/dist/shared/lib/router/utils/app-paths.js","../../../../../node_modules/next/dist/shared/lib/router/utils/html-bots.js","../../../../../node_modules/next/dist/shared/lib/router/utils/interception-routes.js","../../../../../node_modules/next/dist/shared/lib/router/utils/is-bot.js","../../../../../node_modules/next/dist/shared/lib/segment.js","../../../../../node_modules/next/dist/shared/lib/server-reference-info.js","../../../../../node_modules/next/dist/shared/lib/size-limit.js","../../../../../node_modules/next/package.json","../../../../package.json","../../../chunks/116.js","../../../chunks/386.js","../../../chunks/392.js","../../../chunks/445.js","../../../chunks/471.js","../../../chunks/781.js","../../../chunks/816.js","../../../chunks/946.js","../../../webpack-runtime.js","page_client-reference-manifest.js"]}
+{"version":1,"files":["../../../../../node_modules/next/dist/client/components/app-router-headers.js","../../../../../node_modules/next/dist/compiled/@opentelemetry/api/index.js","../../../../../node_modules/next/dist/compiled/@opentelemetry/api/package.json","../../../../../node_modules/next/dist/compiled/bytes/index.js","../../../../../node_modules/next/dist/compiled/bytes/package.json","../../../../../node_modules/next/dist/compiled/jsonwebtoken/index.js","../../../../../node_modules/next/dist/compiled/jsonwebtoken/package.json","../../../../../node_modules/next/dist/compiled/next-server/app-page.runtime.prod.js","../../../../../node_modules/next/dist/lib/client-and-server-references.js","../../../../../node_modules/next/dist/lib/constants.js","../../../../../node_modules/next/dist/lib/interop-default.js","../../../../../node_modules/next/dist/lib/is-error.js","../../../../../node_modules/next/dist/lib/semver-noop.js","../../../../../node_modules/next/dist/server/app-render/action-async-storage-instance.js","../../../../../node_modules/next/dist/server/app-render/action-async-storage.external.js","../../../../../node_modules/next/dist/server/app-render/after-task-async-storage-instance.js","../../../../../node_modules/next/dist/server/app-render/after-task-async-storage.external.js","../../../../../node_modules/next/dist/server/app-render/async-local-storage.js","../../../../../node_modules/next/dist/server/app-render/cache-signal.js","../../../../../node_modules/next/dist/server/app-render/console-async-storage-instance.js","../../../../../node_modules/next/dist/server/app-render/console-async-storage.external.js","../../../../../node_modules/next/dist/server/app-render/dynamic-access-async-storage-instance.js","../../../../../node_modules/next/dist/server/app-render/dynamic-access-async-storage.external.js","../../../../../node_modules/next/dist/server/app-render/module-loading/track-module-loading.external.js","../../../../../node_modules/next/dist/server/app-render/module-loading/track-module-loading.instance.js","../../../../../node_modules/next/dist/server/app-render/work-async-storage-instance.js","../../../../../node_modules/next/dist/server/app-render/work-async-storage.external.js","../../../../../node_modules/next/dist/server/app-render/work-unit-async-storage-instance.js","../../../../../node_modules/next/dist/server/app-render/work-unit-async-storage.external.js","../../../../../node_modules/next/dist/server/lib/incremental-cache/memory-cache.external.js","../../../../../node_modules/next/dist/server/lib/incremental-cache/shared-cache-controls.external.js","../../../../../node_modules/next/dist/server/lib/incremental-cache/tags-manifest.external.js","../../../../../node_modules/next/dist/server/lib/lru-cache.js","../../../../../node_modules/next/dist/server/lib/router-utils/instrumentation-globals.external.js","../../../../../node_modules/next/dist/server/lib/router-utils/instrumentation-node-extensions.js","../../../../../node_modules/next/dist/server/lib/trace/constants.js","../../../../../node_modules/next/dist/server/lib/trace/tracer.js","../../../../../node_modules/next/dist/server/load-manifest.external.js","../../../../../node_modules/next/dist/server/node-environment-extensions/fast-set-immediate.external.js","../../../../../node_modules/next/dist/server/response-cache/types.js","../../../../../node_modules/next/dist/server/runtime-reacts.external.js","../../../../../node_modules/next/dist/shared/lib/deep-freeze.js","../../../../../node_modules/next/dist/shared/lib/invariant-error.js","../../../../../node_modules/next/dist/shared/lib/is-plain-object.js","../../../../../node_modules/next/dist/shared/lib/is-thenable.js","../../../../../node_modules/next/dist/shared/lib/no-fallback-error.external.js","../../../../../node_modules/next/dist/shared/lib/page-path/ensure-leading-slash.js","../../../../../node_modules/next/dist/shared/lib/router/utils/app-paths.js","../../../../../node_modules/next/dist/shared/lib/router/utils/html-bots.js","../../../../../node_modules/next/dist/shared/lib/router/utils/interception-routes.js","../../../../../node_modules/next/dist/shared/lib/router/utils/is-bot.js","../../../../../node_modules/next/dist/shared/lib/segment.js","../../../../../node_modules/next/dist/shared/lib/server-reference-info.js","../../../../../node_modules/next/dist/shared/lib/size-limit.js","../../../../../node_modules/next/package.json","../../../../package.json","../../../chunks/116.js","../../../chunks/266.js","../../../chunks/392.js","../../../chunks/445.js","../../../chunks/471.js","../../../chunks/764.js","../../../chunks/781.js","../../../chunks/816.js","../../../webpack-runtime.js","page_client-reference-manifest.js"]}

package/.next/server/app/workspace/conflicts/page_client-reference-manifest.js

@@ -1 +1 @@
-globalThis.__RSC_MANIFEST=(globalThis.__RSC_MANIFEST||{});globalThis.__RSC_MANIFEST["/workspace/conflicts/page"]={"moduleLoading":{"prefix":"/_next/"},"ssrModuleMapping":{"484":{"*":{"id":"664","name":"*","chunks":[],"async":false}},"1304":{"*":{"id":"440","name":"*","chunks":[],"async":false}},"1984":{"*":{"id":"9311","name":"*","chunks":[],"async":false}},"2246":{"*":{"id":"9633","name":"*","chunks":[],"async":false}},"3280":{"*":{"id":"6812","name":"*","chunks":[],"async":false}},"3411":{"*":{"id":"3517","name":"*","chunks":[],"async":false}},"4581":{"*":{"id":"1335","name":"*","chunks":[],"async":false}},"4740":{"*":{"id":"1351","name":"*","chunks":[],"async":false}},"4777":{"*":{"id":"2265","name":"*","chunks":[],"async":false}},"5170":{"*":{"id":"4072","name":"*","chunks":[],"async":false}},"5432":{"*":{"id":"5544","name":"*","chunks":[],"async":false}},"6147":{"*":{"id":"5633","name":"*","chunks":[],"async":false}},"6869":{"*":{"id":"4661","name":"*","chunks":[],"async":false}},"7121":{"*":{"id":"5421","name":"*","chunks":[],"async":false}},"7123":{"*":{"id":"1921","name":"*","chunks":[],"async":false}},"7185":{"*":{"id":"5229","name":"*","chunks":[],"async":false}},"7443":{"*":{"id":"6363","name":"*","chunks":[],"async":false}},"8437":{"*":{"id":"3836","name":"*","chunks":[],"async":false}},"8616":{"*":{"id":"4342","name":"*","chunks":[],"async":false}},"9128":{"*":{"id":"3246","name":"*","chunks":[],"async":false}},"9176":{"*":{"id":"7174","name":"*","chunks":[],"async":false}}},"edgeSSRModuleMapping":{},"clientModules":{"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/client/components/builtin/global-error.js":{"id":7123,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/esm/client/components/builtin/global-error.js":{"id":7123,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/client/components/client-page.js":{"id":1304,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/esm/client/components/client-page.js":{"id":1304,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/client/components/client-segment.js":{"id":8616,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/esm/client/components/client-segment.js":{"id":8616,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/client/components/http-access-fallback/error-boundary.js":{"id":4777,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/esm/client/components/http-access-fallback/error-boundary.js":{"id":4777,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/client/components/layout-router.js":{"id":7121,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/esm/client/components/layout-router.js":{"id":7121,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/client/components/render-from-template-context.js":{"id":4581,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/esm/client/components/render-from-template-context.js":{"id":4581,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/lib/framework/boundary-components.js":{"id":484,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/esm/lib/framework/boundary-components.js":{"id":484,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/lib/metadata/generate/icon-mark.js":{"id":6869,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/esm/lib/metadata/generate/icon-mark.js":{"id":6869,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/font/google/target.css?{\"path\":\"src/app/layout.tsx\",\"import\":\"Geist\",\"arguments\":[{\"variable\":\"--font-geist-sans\",\"subsets\":[\"latin\"]}],\"variableName\":\"geistSans\"}":{"id":421,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","200","static/chunks/200-3664e65687e716a2.js","26","static/chunks/26-a76b3447d31c0f53.js","558","static/chunks/app/layout-dda593914e513c38.js"],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/font/google/target.css?{\"path\":\"src/app/layout.tsx\",\"import\":\"Geist_Mono\",\"arguments\":[{\"variable\":\"--font-geist-mono\",\"subsets\":[\"latin\"]}],\"variableName\":\"geistMono\"}":{"id":9695,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","200","static/chunks/200-3664e65687e716a2.js","26","static/chunks/26-a76b3447d31c0f53.js","558","static/chunks/app/layout-dda593914e513c38.js"],"async":false},"/Users/tangqh/Downloads/projects/trident/src/app/globals.css":{"id":1743,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","200","static/chunks/200-3664e65687e716a2.js","26","static/chunks/26-a76b3447d31c0f53.js","558","static/chunks/app/layout-dda593914e513c38.js"],"async":false},"/Users/tangqh/Downloads/projects/trident/src/app/providers.tsx":{"id":2246,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","200","static/chunks/200-3664e65687e716a2.js","26","static/chunks/26-a76b3447d31c0f53.js","558","static/chunks/app/layout-dda593914e513c38.js"],"async":false},"/Users/tangqh/Downloads/projects/trident/src/app/credentials/page.tsx":{"id":4740,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/client/image-component.js":{"id":8437,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","437","static/chunks/437-856aae031cb5746d.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","974","static/chunks/app/page-b6a88311748e2958.js"],"async":false},"/Users/tangqh/Downloads/projects/trident/node_modules/next/dist/esm/client/image-component.js":{"id":8437,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","437","static/chunks/437-856aae031cb5746d.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","974","static/chunks/app/page-b6a88311748e2958.js"],"async":false},"/Users/tangqh/Downloads/projects/trident/src/components/repo-list.tsx":{"id":3411,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","437","static/chunks/437-856aae031cb5746d.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","974","static/chunks/app/page-b6a88311748e2958.js"],"async":false},"/Users/tangqh/Downloads/projects/trident/src/components/layout/sidebar.tsx":{"id":7185,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","807","static/chunks/app/workspace/layout-586ee7be4f6abf20.js"],"async":false},"/Users/tangqh/Downloads/projects/trident/src/components/workspace-repo-open-tracker.tsx":{"id":9128,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","807","static/chunks/app/workspace/layout-586ee7be4f6abf20.js"],"async":false},"/Users/tangqh/Downloads/projects/trident/src/app/workspace/changes/page.tsx":{"id":1984,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/src/app/workspace/history/page.tsx":{"id":6147,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/src/app/workspace/conflicts/page.tsx":{"id":3280,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","841","static/chunks/841-4d865378216d36eb.js","26","static/chunks/26-a76b3447d31c0f53.js","612","static/chunks/app/workspace/conflicts/page-4e3388cbfeb080ce.js"],"async":false},"/Users/tangqh/Downloads/projects/trident/src/app/workspace/custom-scripts/page.tsx":{"id":7443,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/src/app/workspace/settings/page.tsx":{"id":5432,"name":"*","chunks":[],"async":false},"/Users/tangqh/Downloads/projects/trident/src/app/workspace/page.tsx":{"id":9176,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","841","static/chunks/841-4d865378216d36eb.js","26","static/chunks/26-a76b3447d31c0f53.js","790","static/chunks/790-3e8fa6e595d97940.js","446","static/chunks/446-c08c83aa2f787ad4.js","364","static/chunks/app/workspace/page-f7b05714b4e0eb2a.js"],"async":false},"/Users/tangqh/Downloads/projects/trident/src/app/workspace/stashes/page.tsx":{"id":5170,"name":"*","chunks":[],"async":false}},"entryCSSFiles":{"/Users/tangqh/Downloads/projects/trident/src/":[],"/Users/tangqh/Downloads/projects/trident/src/app/layout":[{"inlined":false,"path":"static/css/de70bee13400563f.css"},{"inlined":false,"path":"static/css/c4d257db89c36a31.css"}],"/Users/tangqh/Downloads/projects/trident/src/app/page":[],"/Users/tangqh/Downloads/projects/trident/src/app/workspace/layout":[],"/Users/tangqh/Downloads/projects/trident/src/app/workspace/page":[{"inlined":false,"path":"static/css/36968b90b2339533.css"}],"/Users/tangqh/Downloads/projects/trident/src/app/workspace/conflicts/page":[{"inlined":false,"path":"static/css/36968b90b2339533.css"}]},"rscModuleMapping":{"484":{"*":{"id":"8562","name":"*","chunks":[],"async":false}},"1304":{"*":{"id":"5098","name":"*","chunks":[],"async":false}},"1743":{"*":{"id":"1135","name":"*","chunks":[],"async":false}},"1984":{"*":{"id":"1874","name":"*","chunks":[],"async":false}},"2246":{"*":{"id":"4709","name":"*","chunks":[],"async":false}},"3280":{"*":{"id":"6608","name":"*","chunks":[],"async":false}},"3411":{"*":{"id":"7203","name":"*","chunks":[],"async":false}},"4581":{"*":{"id":"6237","name":"*","chunks":[],"async":false}},"4740":{"*":{"id":"7427","name":"*","chunks":[],"async":false}},"4777":{"*":{"id":"3859","name":"*","chunks":[],"async":false}},"5170":{"*":{"id":"394","name":"*","chunks":[],"async":false}},"5432":{"*":{"id":"2554","name":"*","chunks":[],"async":false}},"6147":{"*":{"id":"2299","name":"*","chunks":[],"async":false}},"6869":{"*":{"id":"6675","name":"*","chunks":[],"async":false}},"7121":{"*":{"id":"8099","name":"*","chunks":[],"async":false}},"7123":{"*":{"id":"5547","name":"*","chunks":[],"async":false}},"7185":{"*":{"id":"9671","name":"*","chunks":[],"async":false}},"7443":{"*":{"id":"2913","name":"*","chunks":[],"async":false}},"8437":{"*":{"id":"8637","name":"*","chunks":[],"async":false}},"8616":{"*":{"id":"7644","name":"*","chunks":[],"async":false}},"9128":{"*":{"id":"6920","name":"*","chunks":[],"async":false}},"9176":{"*":{"id":"3280","name":"*","chunks":[],"async":false}}},"edgeRscModuleMapping":{}}
+globalThis.__RSC_MANIFEST=(globalThis.__RSC_MANIFEST||{});globalThis.__RSC_MANIFEST["/workspace/conflicts/page"]={"moduleLoading":{"prefix":"/_next/"},"ssrModuleMapping":{"484":{"*":{"id":"664","name":"*","chunks":[],"async":false}},"1304":{"*":{"id":"440","name":"*","chunks":[],"async":false}},"1984":{"*":{"id":"9311","name":"*","chunks":[],"async":false}},"2246":{"*":{"id":"9633","name":"*","chunks":[],"async":false}},"3280":{"*":{"id":"6812","name":"*","chunks":[],"async":false}},"3411":{"*":{"id":"3517","name":"*","chunks":[],"async":false}},"4581":{"*":{"id":"1335","name":"*","chunks":[],"async":false}},"4740":{"*":{"id":"1351","name":"*","chunks":[],"async":false}},"4777":{"*":{"id":"2265","name":"*","chunks":[],"async":false}},"5170":{"*":{"id":"4072","name":"*","chunks":[],"async":false}},"5432":{"*":{"id":"5544","name":"*","chunks":[],"async":false}},"6147":{"*":{"id":"5633","name":"*","chunks":[],"async":false}},"6869":{"*":{"id":"4661","name":"*","chunks":[],"async":false}},"7121":{"*":{"id":"5421","name":"*","chunks":[],"async":false}},"7123":{"*":{"id":"1921","name":"*","chunks":[],"async":false}},"7185":{"*":{"id":"5229","name":"*","chunks":[],"async":false}},"7443":{"*":{"id":"6363","name":"*","chunks":[],"async":false}},"8437":{"*":{"id":"3836","name":"*","chunks":[],"async":false}},"8616":{"*":{"id":"4342","name":"*","chunks":[],"async":false}},"9128":{"*":{"id":"3246","name":"*","chunks":[],"async":false}},"9176":{"*":{"id":"7174","name":"*","chunks":[],"async":false}}},"edgeSSRModuleMapping":{},"clientModules":{"/home/runner/work/trident/trident/node_modules/next/dist/client/components/builtin/global-error.js":{"id":7123,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/esm/client/components/builtin/global-error.js":{"id":7123,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/client/components/client-page.js":{"id":1304,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/esm/client/components/client-page.js":{"id":1304,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/client/components/client-segment.js":{"id":8616,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/esm/client/components/client-segment.js":{"id":8616,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/client/components/http-access-fallback/error-boundary.js":{"id":4777,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/esm/client/components/http-access-fallback/error-boundary.js":{"id":4777,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/client/components/layout-router.js":{"id":7121,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/esm/client/components/layout-router.js":{"id":7121,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/client/components/render-from-template-context.js":{"id":4581,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/esm/client/components/render-from-template-context.js":{"id":4581,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/lib/framework/boundary-components.js":{"id":484,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/esm/lib/framework/boundary-components.js":{"id":484,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/lib/metadata/generate/icon-mark.js":{"id":6869,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/esm/lib/metadata/generate/icon-mark.js":{"id":6869,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/font/google/target.css?{\"path\":\"src/app/layout.tsx\",\"import\":\"Geist\",\"arguments\":[{\"variable\":\"--font-geist-sans\",\"subsets\":[\"latin\"]}],\"variableName\":\"geistSans\"}":{"id":421,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","200","static/chunks/200-3664e65687e716a2.js","26","static/chunks/26-a76b3447d31c0f53.js","558","static/chunks/app/layout-3a89133183963c99.js"],"async":false},"/home/runner/work/trident/trident/node_modules/next/font/google/target.css?{\"path\":\"src/app/layout.tsx\",\"import\":\"Geist_Mono\",\"arguments\":[{\"variable\":\"--font-geist-mono\",\"subsets\":[\"latin\"]}],\"variableName\":\"geistMono\"}":{"id":9695,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","200","static/chunks/200-3664e65687e716a2.js","26","static/chunks/26-a76b3447d31c0f53.js","558","static/chunks/app/layout-3a89133183963c99.js"],"async":false},"/home/runner/work/trident/trident/src/app/globals.css":{"id":1743,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","200","static/chunks/200-3664e65687e716a2.js","26","static/chunks/26-a76b3447d31c0f53.js","558","static/chunks/app/layout-3a89133183963c99.js"],"async":false},"/home/runner/work/trident/trident/src/app/providers.tsx":{"id":2246,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","200","static/chunks/200-3664e65687e716a2.js","26","static/chunks/26-a76b3447d31c0f53.js","558","static/chunks/app/layout-3a89133183963c99.js"],"async":false},"/home/runner/work/trident/trident/src/app/credentials/page.tsx":{"id":4740,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/client/image-component.js":{"id":8437,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","437","static/chunks/437-856aae031cb5746d.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","974","static/chunks/app/page-ebdbe7959d4d2112.js"],"async":false},"/home/runner/work/trident/trident/node_modules/next/dist/esm/client/image-component.js":{"id":8437,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","437","static/chunks/437-856aae031cb5746d.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","974","static/chunks/app/page-ebdbe7959d4d2112.js"],"async":false},"/home/runner/work/trident/trident/src/components/repo-list.tsx":{"id":3411,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","437","static/chunks/437-856aae031cb5746d.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","974","static/chunks/app/page-ebdbe7959d4d2112.js"],"async":false},"/home/runner/work/trident/trident/src/components/layout/sidebar.tsx":{"id":7185,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","807","static/chunks/app/workspace/layout-75d987f016bdfce7.js"],"async":false},"/home/runner/work/trident/trident/src/components/workspace-repo-open-tracker.tsx":{"id":9128,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","500","static/chunks/500-5d45efbf86b8d36e.js","26","static/chunks/26-a76b3447d31c0f53.js","131","static/chunks/131-4e059eb668f6734a.js","807","static/chunks/app/workspace/layout-75d987f016bdfce7.js"],"async":false},"/home/runner/work/trident/trident/src/app/workspace/changes/page.tsx":{"id":1984,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/src/app/workspace/conflicts/page.tsx":{"id":3280,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","841","static/chunks/841-4d865378216d36eb.js","26","static/chunks/26-a76b3447d31c0f53.js","612","static/chunks/app/workspace/conflicts/page-310cc2e533418cb9.js"],"async":false},"/home/runner/work/trident/trident/src/app/workspace/custom-scripts/page.tsx":{"id":7443,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/src/app/workspace/history/page.tsx":{"id":6147,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/src/app/workspace/settings/page.tsx":{"id":5432,"name":"*","chunks":[],"async":false},"/home/runner/work/trident/trident/src/app/workspace/page.tsx":{"id":9176,"name":"*","chunks":["176","static/chunks/176-b068120641913226.js","785","static/chunks/785-e6d755147ff87934.js","841","static/chunks/841-4d865378216d36eb.js","26","static/chunks/26-a76b3447d31c0f53.js","790","static/chunks/790-8b6ef3e713ecba06.js","446","static/chunks/446-4ead45a8bdded8f1.js","364","static/chunks/app/workspace/page-2533388880ae7887.js"],"async":false},"/home/runner/work/trident/trident/src/app/workspace/stashes/page.tsx":{"id":5170,"name":"*","chunks":[],"async":false}},"entryCSSFiles":{"/home/runner/work/trident/trident/src/":[],"/home/runner/work/trident/trident/src/app/layout":[{"inlined":false,"path":"static/css/de70bee13400563f.css"},{"inlined":false,"path":"static/css/34464e853551fd25.css"}],"/home/runner/work/trident/trident/src/app/page":[],"/home/runner/work/trident/trident/src/app/workspace/layout":[],"/home/runner/work/trident/trident/src/app/workspace/page":[{"inlined":false,"path":"static/css/36968b90b2339533.css"}],"/home/runner/work/trident/trident/src/app/workspace/conflicts/page":[{"inlined":false,"path":"static/css/36968b90b2339533.css"}]},"rscModuleMapping":{"484":{"*":{"id":"8562","name":"*","chunks":[],"async":false}},"1304":{"*":{"id":"5098","name":"*","chunks":[],"async":false}},"1743":{"*":{"id":"1135","name":"*","chunks":[],"async":false}},"1984":{"*":{"id":"1874","name":"*","chunks":[],"async":false}},"2246":{"*":{"id":"4709","name":"*","chunks":[],"async":false}},"3280":{"*":{"id":"6608","name":"*","chunks":[],"async":false}},"3411":{"*":{"id":"7203","name":"*","chunks":[],"async":false}},"4581":{"*":{"id":"6237","name":"*","chunks":[],"async":false}},"4740":{"*":{"id":"7427","name":"*","chunks":[],"async":false}},"4777":{"*":{"id":"3859","name":"*","chunks":[],"async":false}},"5170":{"*":{"id":"394","name":"*","chunks":[],"async":false}},"5432":{"*":{"id":"2554","name":"*","chunks":[],"async":false}},"6147":{"*":{"id":"2299","name":"*","chunks":[],"async":false}},"6869":{"*":{"id":"6675","name":"*","chunks":[],"async":false}},"7121":{"*":{"id":"8099","name":"*","chunks":[],"async":false}},"7123":{"*":{"id":"5547","name":"*","chunks":[],"async":false}},"7185":{"*":{"id":"9671","name":"*","chunks":[],"async":false}},"7443":{"*":{"id":"2913","name":"*","chunks":[],"async":false}},"8437":{"*":{"id":"8637","name":"*","chunks":[],"async":false}},"8616":{"*":{"id":"7644","name":"*","chunks":[],"async":false}},"9128":{"*":{"id":"6920","name":"*","chunks":[],"async":false}},"9176":{"*":{"id":"3280","name":"*","chunks":[],"async":false}}},"edgeRscModuleMapping":{}}

package/.next/server/app/workspace/conflicts.html

@@ -1 +1 @@
-<!DOCTYPE html><!--VVpGnBxPAXMCVjOD1KoU3--><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="preload" href="/_next/static/media/4cf2300e9c8272f7-s.p.woff2" as="font" crossorigin="" type="font/woff2"/><link rel="preload" href="/_next/static/media/93f479601ee12b01-s.p.woff2" as="font" crossorigin="" type="font/woff2"/><link rel="stylesheet" href="/_next/static/css/de70bee13400563f.css" data-precedence="next"/><link rel="stylesheet" href="/_next/static/css/c4d257db89c36a31.css" data-precedence="next"/><link rel="stylesheet" href="/_next/static/css/36968b90b2339533.css" data-precedence="next"/><link rel="preload" as="script" fetchPriority="low" href="/_next/static/chunks/webpack-7dec27dc3bfe207a.js"/><script src="/_next/static/chunks/4bd1b696-096d35a2bd1da3af.js" async=""></script><script src="/_next/static/chunks/794-37dad9bbc14b04b8.js" async=""></script><script src="/_next/static/chunks/main-app-9697367bdd1cd307.js" async=""></script><script src="/_next/static/chunks/176-b068120641913226.js" async=""></script><script src="/_next/static/chunks/785-e6d755147ff87934.js" async=""></script><script src="/_next/static/chunks/200-3664e65687e716a2.js" async=""></script><script src="/_next/static/chunks/26-a76b3447d31c0f53.js" async=""></script><script src="/_next/static/chunks/app/layout-dda593914e513c38.js" async=""></script><script src="/_next/static/chunks/500-5d45efbf86b8d36e.js" async=""></script><script src="/_next/static/chunks/131-4e059eb668f6734a.js" async=""></script><script src="/_next/static/chunks/app/workspace/layout-586ee7be4f6abf20.js" async=""></script><script src="/_next/static/chunks/841-4d865378216d36eb.js" async=""></script><script src="/_next/static/chunks/app/workspace/conflicts/page-4e3388cbfeb080ce.js" async=""></script><link rel="preload" href="https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css" as="style"/><meta name="next-size-adjust" content=""/><title>Trident</title><meta name="description" content="Git repository management tool"/><link rel="icon" href="/icon.png?91e8b75214a43d69" type="image/png" sizes="256x256"/><link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css"/><script src="/_next/static/chunks/polyfills-42372ed130431b0a.js" noModule=""></script></head><body class="__variable_188709 __variable_9a8899 antialiased"><div hidden=""><!--$--><!--/$--></div><script>((a,b,c,d,e,f,g,h)=>{let i=document.documentElement,j=["light","dark"];function k(b){var c;(Array.isArray(a)?a:[a]).forEach(a=>{let c="class"===a,d=c&&f?e.map(a=>f[a]||a):e;c?(i.classList.remove(...d),i.classList.add(f&&f[b]?f[b]:b)):i.setAttribute(a,b)}),c=b,h&&j.includes(c)&&(i.style.colorScheme=c)}if(d)k(d);else try{let a=localStorage.getItem(b)||c,d=g&&"system"===a?window.matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light":a;k(d)}catch(a){}})("data-theme","theme","system",null,["light","dark"],null,true,true)</script><div class="flex min-h-screen max-h-screen bg-base-100"><!--$!--><template data-dgst="BAILOUT_TO_CLIENT_SIDE_RENDERING"></template><!--/$--><!--$!--><template data-dgst="BAILOUT_TO_CLIENT_SIDE_RENDERING"></template><div class="w-64 border-r border-base-300 min-h-screen bg-base-200/30 flex items-center justify-center"><span class="loading loading-spinner"></span></div><!--/$--><main class="flex-1 overflow-auto"><!--$!--><template data-dgst="BAILOUT_TO_CLIENT_SIDE_RENDERING"></template><div class="flex items-center justify-center h-full"><span class="loading loading-spinner"></span></div><!--/$--><!--$--><!--/$--></main></div><script src="/_next/static/chunks/webpack-7dec27dc3bfe207a.js" id="_R_" async=""></script><script>(self.__next_f=self.__next_f||[]).push([0])</script><script>self.__next_f.push([1,"1:\"$Sreact.fragment\"\n2:I[2246,[\"176\",\"static/chunks/176-b068120641913226.js\",\"785\",\"static/chunks/785-e6d755147ff87934.js\",\"200\",\"static/chunks/200-3664e65687e716a2.js\",\"26\",\"static/chunks/26-a76b3447d31c0f53.js\",\"558\",\"static/chunks/app/layout-dda593914e513c38.js\"],\"Providers\"]\n3:I[7121,[],\"\"]\n4:I[4581,[],\"\"]\n5:\"$Sreact.suspense\"\n6:I[9128,[\"176\",\"static/chunks/176-b068120641913226.js\",\"785\",\"static/chunks/785-e6d755147ff87934.js\",\"500\",\"static/chunks/500-5d45efbf86b8d36e.js\",\"26\",\"static/chunks/26-a76b3447d31c0f53.js\",\"131\",\"static/chunks/131-4e059eb668f6734a.js\",\"807\",\"static/chunks/app/workspace/layout-586ee7be4f6abf20.js\"],\"WorkspaceRepoOpenTracker\"]\n7:I[7185,[\"176\",\"static/chunks/176-b068120641913226.js\",\"785\",\"static/chunks/785-e6d755147ff87934.js\",\"500\",\"static/chunks/500-5d45efbf86b8d36e.js\",\"26\",\"static/chunks/26-a76b3447d31c0f53.js\",\"131\",\"static/chunks/131-4e059eb668f6734a.js\",\"807\",\"static/chunks/app/workspace/layout-586ee7be4f6abf20.js\"],\"Sidebar\"]\n8:I[1304,[],\"ClientPageRoot\"]\n9:I[3280,[\"176\",\"static/chunks/176-b068120641913226.js\",\"785\",\"static/chunks/785-e6d755147ff87934.js\",\"841\",\"static/chunks/841-4d865378216d36eb.js\",\"26\",\"static/chunks/26-a76b3447d31c0f53.js\",\"612\",\"static/chunks/app/workspace/conflicts/page-4e3388cbfeb080ce.js\"],\"default\"]\nc:I[484,[],\"OutletBoundary\"]\ne:I[484,[],\"ViewportBoundary\"]\n10:I[484,[],\"MetadataBoundary\"]\n12:I[7123,[],\"\"]\n:HL[\"/_next/static/media/4cf2300e9c8272f7-s.p.woff2\",\"font\",{\"crossOrigin\":\"\",\"type\":\"font/woff2\"}]\n:HL[\"/_next/static/media/93f479601ee12b01-s.p.woff2\",\"font\",{\"crossOrigin\":\"\",\"type\":\"font/woff2\"}]\n:HL[\"/_next/static/css/de70bee13400563f.css\",\"style\"]\n:HL[\"/_next/static/css/c4d257db89c36a31.css\",\"style\"]\n:HL[\"/_next/static/css/36968b90b2339533.css\",\"style\"]\n:HL[\"https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css\",\"style\"]\n"])</script><script>self.__next_f.push([1,"0:{\"P\":null,\"b\":\"VVpGnBxPAXMCVjOD1KoU3\",\"c\":[\"\",\"workspace\",\"conflicts\"],\"q\":\"\",\"i\":false,\"f\":[[[\"\",{\"children\":[\"workspace\",{\"children\":[\"conflicts\",{\"children\":[\"__PAGE__\",{}]}]}]},\"$undefined\",\"$undefined\",true],[[\"$\",\"$1\",\"c\",{\"children\":[[[\"$\",\"link\",\"0\",{\"rel\":\"stylesheet\",\"href\":\"/_next/static/css/de70bee13400563f.css\",\"precedence\":\"next\",\"crossOrigin\":\"$undefined\",\"nonce\":\"$undefined\"}],[\"$\",\"link\",\"1\",{\"rel\":\"stylesheet\",\"href\":\"/_next/static/css/c4d257db89c36a31.css\",\"precedence\":\"next\",\"crossOrigin\":\"$undefined\",\"nonce\":\"$undefined\"}]],[\"$\",\"html\",null,{\"lang\":\"en\",\"suppressHydrationWarning\":true,\"children\":[[\"$\",\"head\",null,{\"children\":[\"$\",\"link\",null,{\"rel\":\"stylesheet\",\"href\":\"https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css\"}]}],[\"$\",\"body\",null,{\"className\":\"__variable_188709 __variable_9a8899 antialiased\",\"children\":[\"$\",\"$L2\",null,{\"children\":[\"$\",\"$L3\",null,{\"parallelRouterKey\":\"children\",\"error\":\"$undefined\",\"errorStyles\":\"$undefined\",\"errorScripts\":\"$undefined\",\"template\":[\"$\",\"$L4\",null,{}],\"templateStyles\":\"$undefined\",\"templateScripts\":\"$undefined\",\"notFound\":[[[\"$\",\"title\",null,{\"children\":\"404: This page could not be found.\"}],[\"$\",\"div\",null,{\"style\":{\"fontFamily\":\"system-ui,\\\"Segoe UI\\\",Roboto,Helvetica,Arial,sans-serif,\\\"Apple Color Emoji\\\",\\\"Segoe UI Emoji\\\"\",\"height\":\"100vh\",\"textAlign\":\"center\",\"display\":\"flex\",\"flexDirection\":\"column\",\"alignItems\":\"center\",\"justifyContent\":\"center\"},\"children\":[\"$\",\"div\",null,{\"children\":[[\"$\",\"style\",null,{\"dangerouslySetInnerHTML\":{\"__html\":\"body{color:#000;background:#fff;margin:0}.next-error-h1{border-right:1px solid rgba(0,0,0,.3)}@media (prefers-color-scheme:dark){body{color:#fff;background:#000}.next-error-h1{border-right:1px solid rgba(255,255,255,.3)}}\"}}],[\"$\",\"h1\",null,{\"className\":\"next-error-h1\",\"style\":{\"display\":\"inline-block\",\"margin\":\"0 20px 0 0\",\"padding\":\"0 23px 0 0\",\"fontSize\":24,\"fontWeight\":500,\"verticalAlign\":\"top\",\"lineHeight\":\"49px\"},\"children\":404}],[\"$\",\"div\",null,{\"style\":{\"display\":\"inline-block\"},\"children\":[\"$\",\"h2\",null,{\"style\":{\"fontSize\":14,\"fontWeight\":400,\"lineHeight\":\"49px\",\"margin\":0},\"children\":\"This page could not be found.\"}]}]]}]}]],[]],\"forbidden\":\"$undefined\",\"unauthorized\":\"$undefined\"}]}]}]]}]]}],{\"children\":[[\"$\",\"$1\",\"c\",{\"children\":[null,[\"$\",\"div\",null,{\"className\":\"flex min-h-screen max-h-screen bg-base-100\",\"children\":[[\"$\",\"$5\",null,{\"fallback\":null,\"children\":[\"$\",\"$L6\",null,{}]}],[\"$\",\"$5\",null,{\"fallback\":[\"$\",\"div\",null,{\"className\":\"w-64 border-r border-base-300 min-h-screen bg-base-200/30 flex items-center justify-center\",\"children\":[\"$\",\"span\",null,{\"className\":\"loading loading-spinner\"}]}],\"children\":[\"$\",\"$L7\",null,{\"initialCollapsed\":false}]}],[\"$\",\"main\",null,{\"className\":\"flex-1 overflow-auto\",\"children\":[\"$\",\"$L3\",null,{\"parallelRouterKey\":\"children\",\"error\":\"$undefined\",\"errorStyles\":\"$undefined\",\"errorScripts\":\"$undefined\",\"template\":[\"$\",\"$L4\",null,{}],\"templateStyles\":\"$undefined\",\"templateScripts\":\"$undefined\",\"notFound\":\"$undefined\",\"forbidden\":\"$undefined\",\"unauthorized\":\"$undefined\"}]}]]}]]}],{\"children\":[[\"$\",\"$1\",\"c\",{\"children\":[null,[\"$\",\"$L3\",null,{\"parallelRouterKey\":\"children\",\"error\":\"$undefined\",\"errorStyles\":\"$undefined\",\"errorScripts\":\"$undefined\",\"template\":[\"$\",\"$L4\",null,{}],\"templateStyles\":\"$undefined\",\"templateScripts\":\"$undefined\",\"notFound\":\"$undefined\",\"forbidden\":\"$undefined\",\"unauthorized\":\"$undefined\"}]]}],{\"children\":[[\"$\",\"$1\",\"c\",{\"children\":[[\"$\",\"$L8\",null,{\"Component\":\"$9\",\"serverProvidedParams\":{\"searchParams\":{},\"params\":{},\"promises\":[\"$@a\",\"$@b\"]}}],[[\"$\",\"link\",\"0\",{\"rel\":\"stylesheet\",\"href\":\"/_next/static/css/36968b90b2339533.css\",\"precedence\":\"next\",\"crossOrigin\":\"$undefined\",\"nonce\":\"$undefined\"}]],[\"$\",\"$Lc\",null,{\"children\":[\"$\",\"$5\",null,{\"name\":\"Next.MetadataOutlet\",\"children\":\"$@d\"}]}]]}],{},null,false,false]},null,false,false]},null,false,false]},null,false,false],[\"$\",\"$1\",\"h\",{\"children\":[null,[\"$\",\"$Le\",null,{\"children\":\"$Lf\"}],[\"$\",\"div\",null,{\"hidden\":true,\"children\":[\"$\",\"$L10\",null,{\"children\":[\"$\",\"$5\",null,{\"name\":\"Next.Metadata\",\"children\":\"$L11\"}]}]}],[\"$\",\"meta\",null,{\"name\":\"next-size-adjust\",\"content\":\"\"}]]}],false]],\"m\":\"$undefined\",\"G\":[\"$12\",[]],\"S\":true}\n"])</script><script>self.__next_f.push([1,"a:{}\nb:\"$0:f:0:1:1:children:1:children:1:children:0:props:children:0:props:serverProvidedParams:params\"\n"])</script><script>self.__next_f.push([1,"f:[[\"$\",\"meta\",\"0\",{\"charSet\":\"utf-8\"}],[\"$\",\"meta\",\"1\",{\"name\":\"viewport\",\"content\":\"width=device-width, initial-scale=1\"}]]\n"])</script><script>self.__next_f.push([1,"13:I[6869,[],\"IconMark\"]\nd:null\n11:[[\"$\",\"title\",\"0\",{\"children\":\"Trident\"}],[\"$\",\"meta\",\"1\",{\"name\":\"description\",\"content\":\"Git repository management tool\"}],[\"$\",\"link\",\"2\",{\"rel\":\"icon\",\"href\":\"/icon.png?91e8b75214a43d69\",\"type\":\"image/png\",\"sizes\":\"256x256\"}],[\"$\",\"$L13\",\"3\",{}]]\n"])</script></body></html>
+<!DOCTYPE html><!--DX0NFQf0fq5wYBl_EgDbX--><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="preload" href="/_next/static/media/4cf2300e9c8272f7-s.p.woff2" as="font" crossorigin="" type="font/woff2"/><link rel="preload" href="/_next/static/media/93f479601ee12b01-s.p.woff2" as="font" crossorigin="" type="font/woff2"/><link rel="stylesheet" href="/_next/static/css/de70bee13400563f.css" data-precedence="next"/><link rel="stylesheet" href="/_next/static/css/34464e853551fd25.css" data-precedence="next"/><link rel="stylesheet" href="/_next/static/css/36968b90b2339533.css" data-precedence="next"/><link rel="preload" as="script" fetchPriority="low" href="/_next/static/chunks/webpack-7dec27dc3bfe207a.js"/><script src="/_next/static/chunks/4bd1b696-096d35a2bd1da3af.js" async=""></script><script src="/_next/static/chunks/794-37dad9bbc14b04b8.js" async=""></script><script src="/_next/static/chunks/main-app-8bead961b2b5992f.js" async=""></script><script src="/_next/static/chunks/176-b068120641913226.js" async=""></script><script src="/_next/static/chunks/785-e6d755147ff87934.js" async=""></script><script src="/_next/static/chunks/200-3664e65687e716a2.js" async=""></script><script src="/_next/static/chunks/26-a76b3447d31c0f53.js" async=""></script><script src="/_next/static/chunks/app/layout-3a89133183963c99.js" async=""></script><script src="/_next/static/chunks/500-5d45efbf86b8d36e.js" async=""></script><script src="/_next/static/chunks/131-4e059eb668f6734a.js" async=""></script><script src="/_next/static/chunks/app/workspace/layout-75d987f016bdfce7.js" async=""></script><script src="/_next/static/chunks/841-4d865378216d36eb.js" async=""></script><script src="/_next/static/chunks/app/workspace/conflicts/page-310cc2e533418cb9.js" async=""></script><link rel="preload" href="https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css" as="style"/><meta name="next-size-adjust" content=""/><title>Trident</title><meta name="description" content="Git repository management tool"/><link rel="icon" href="/icon.png?91e8b75214a43d69" type="image/png" sizes="256x256"/><link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css"/><script src="/_next/static/chunks/polyfills-42372ed130431b0a.js" noModule=""></script></head><body class="__variable_188709 __variable_9a8899 antialiased"><div hidden=""><!--$--><!--/$--></div><script>((a,b,c,d,e,f,g,h)=>{let i=document.documentElement,j=["light","dark"];function k(b){var c;(Array.isArray(a)?a:[a]).forEach(a=>{let c="class"===a,d=c&&f?e.map(a=>f[a]||a):e;c?(i.classList.remove(...d),i.classList.add(f&&f[b]?f[b]:b)):i.setAttribute(a,b)}),c=b,h&&j.includes(c)&&(i.style.colorScheme=c)}if(d)k(d);else try{let a=localStorage.getItem(b)||c,d=g&&"system"===a?window.matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light":a;k(d)}catch(a){}})("data-theme","theme","system",null,["light","dark"],null,true,true)</script><div class="flex min-h-screen max-h-screen bg-base-100"><!--$!--><template data-dgst="BAILOUT_TO_CLIENT_SIDE_RENDERING"></template><!--/$--><!--$!--><template data-dgst="BAILOUT_TO_CLIENT_SIDE_RENDERING"></template><div class="w-64 border-r border-base-300 min-h-screen bg-base-200/30 flex items-center justify-center"><span class="loading loading-spinner"></span></div><!--/$--><main class="flex-1 overflow-auto"><!--$!--><template data-dgst="BAILOUT_TO_CLIENT_SIDE_RENDERING"></template><div class="flex items-center justify-center h-full"><span class="loading loading-spinner"></span></div><!--/$--><!--$--><!--/$--></main></div><script src="/_next/static/chunks/webpack-7dec27dc3bfe207a.js" id="_R_" async=""></script><script>(self.__next_f=self.__next_f||[]).push([0])</script><script>self.__next_f.push([1,"1:\"$Sreact.fragment\"\n2:I[2246,[\"176\",\"static/chunks/176-b068120641913226.js\",\"785\",\"static/chunks/785-e6d755147ff87934.js\",\"200\",\"static/chunks/200-3664e65687e716a2.js\",\"26\",\"static/chunks/26-a76b3447d31c0f53.js\",\"558\",\"static/chunks/app/layout-3a89133183963c99.js\"],\"Providers\"]\n3:I[7121,[],\"\"]\n4:I[4581,[],\"\"]\n5:\"$Sreact.suspense\"\n6:I[9128,[\"176\",\"static/chunks/176-b068120641913226.js\",\"785\",\"static/chunks/785-e6d755147ff87934.js\",\"500\",\"static/chunks/500-5d45efbf86b8d36e.js\",\"26\",\"static/chunks/26-a76b3447d31c0f53.js\",\"131\",\"static/chunks/131-4e059eb668f6734a.js\",\"807\",\"static/chunks/app/workspace/layout-75d987f016bdfce7.js\"],\"WorkspaceRepoOpenTracker\"]\n7:I[7185,[\"176\",\"static/chunks/176-b068120641913226.js\",\"785\",\"static/chunks/785-e6d755147ff87934.js\",\"500\",\"static/chunks/500-5d45efbf86b8d36e.js\",\"26\",\"static/chunks/26-a76b3447d31c0f53.js\",\"131\",\"static/chunks/131-4e059eb668f6734a.js\",\"807\",\"static/chunks/app/workspace/layout-75d987f016bdfce7.js\"],\"Sidebar\"]\n8:I[1304,[],\"ClientPageRoot\"]\n9:I[3280,[\"176\",\"static/chunks/176-b068120641913226.js\",\"785\",\"static/chunks/785-e6d755147ff87934.js\",\"841\",\"static/chunks/841-4d865378216d36eb.js\",\"26\",\"static/chunks/26-a76b3447d31c0f53.js\",\"612\",\"static/chunks/app/workspace/conflicts/page-310cc2e533418cb9.js\"],\"default\"]\nc:I[484,[],\"OutletBoundary\"]\ne:I[484,[],\"ViewportBoundary\"]\n10:I[484,[],\"MetadataBoundary\"]\n12:I[7123,[],\"\"]\n:HL[\"/_next/static/media/4cf2300e9c8272f7-s.p.woff2\",\"font\",{\"crossOrigin\":\"\",\"type\":\"font/woff2\"}]\n:HL[\"/_next/static/media/93f479601ee12b01-s.p.woff2\",\"font\",{\"crossOrigin\":\"\",\"type\":\"font/woff2\"}]\n:HL[\"/_next/static/css/de70bee13400563f.css\",\"style\"]\n:HL[\"/_next/static/css/34464e853551fd25.css\",\"style\"]\n:HL[\"/_next/static/css/36968b90b2339533.css\",\"style\"]\n:HL[\"https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css\",\"style\"]\n"])</script><script>self.__next_f.push([1,"0:{\"P\":null,\"b\":\"DX0NFQf0fq5wYBl_EgDbX\",\"c\":[\"\",\"workspace\",\"conflicts\"],\"q\":\"\",\"i\":false,\"f\":[[[\"\",{\"children\":[\"workspace\",{\"children\":[\"conflicts\",{\"children\":[\"__PAGE__\",{}]}]}]},\"$undefined\",\"$undefined\",true],[[\"$\",\"$1\",\"c\",{\"children\":[[[\"$\",\"link\",\"0\",{\"rel\":\"stylesheet\",\"href\":\"/_next/static/css/de70bee13400563f.css\",\"precedence\":\"next\",\"crossOrigin\":\"$undefined\",\"nonce\":\"$undefined\"}],[\"$\",\"link\",\"1\",{\"rel\":\"stylesheet\",\"href\":\"/_next/static/css/34464e853551fd25.css\",\"precedence\":\"next\",\"crossOrigin\":\"$undefined\",\"nonce\":\"$undefined\"}]],[\"$\",\"html\",null,{\"lang\":\"en\",\"suppressHydrationWarning\":true,\"children\":[[\"$\",\"head\",null,{\"children\":[\"$\",\"link\",null,{\"rel\":\"stylesheet\",\"href\":\"https://cdn.jsdelivr.net/gh/iconoir-icons/iconoir@main/css/iconoir.css\"}]}],[\"$\",\"body\",null,{\"className\":\"__variable_188709 __variable_9a8899 antialiased\",\"children\":[\"$\",\"$L2\",null,{\"children\":[\"$\",\"$L3\",null,{\"parallelRouterKey\":\"children\",\"error\":\"$undefined\",\"errorStyles\":\"$undefined\",\"errorScripts\":\"$undefined\",\"template\":[\"$\",\"$L4\",null,{}],\"templateStyles\":\"$undefined\",\"templateScripts\":\"$undefined\",\"notFound\":[[[\"$\",\"title\",null,{\"children\":\"404: This page could not be found.\"}],[\"$\",\"div\",null,{\"style\":{\"fontFamily\":\"system-ui,\\\"Segoe UI\\\",Roboto,Helvetica,Arial,sans-serif,\\\"Apple Color Emoji\\\",\\\"Segoe UI Emoji\\\"\",\"height\":\"100vh\",\"textAlign\":\"center\",\"display\":\"flex\",\"flexDirection\":\"column\",\"alignItems\":\"center\",\"justifyContent\":\"center\"},\"children\":[\"$\",\"div\",null,{\"children\":[[\"$\",\"style\",null,{\"dangerouslySetInnerHTML\":{\"__html\":\"body{color:#000;background:#fff;margin:0}.next-error-h1{border-right:1px solid rgba(0,0,0,.3)}@media (prefers-color-scheme:dark){body{color:#fff;background:#000}.next-error-h1{border-right:1px solid rgba(255,255,255,.3)}}\"}}],[\"$\",\"h1\",null,{\"className\":\"next-error-h1\",\"style\":{\"display\":\"inline-block\",\"margin\":\"0 20px 0 0\",\"padding\":\"0 23px 0 0\",\"fontSize\":24,\"fontWeight\":500,\"verticalAlign\":\"top\",\"lineHeight\":\"49px\"},\"children\":404}],[\"$\",\"div\",null,{\"style\":{\"display\":\"inline-block\"},\"children\":[\"$\",\"h2\",null,{\"style\":{\"fontSize\":14,\"fontWeight\":400,\"lineHeight\":\"49px\",\"margin\":0},\"children\":\"This page could not be found.\"}]}]]}]}]],[]],\"forbidden\":\"$undefined\",\"unauthorized\":\"$undefined\"}]}]}]]}]]}],{\"children\":[[\"$\",\"$1\",\"c\",{\"children\":[null,[\"$\",\"div\",null,{\"className\":\"flex min-h-screen max-h-screen bg-base-100\",\"children\":[[\"$\",\"$5\",null,{\"fallback\":null,\"children\":[\"$\",\"$L6\",null,{}]}],[\"$\",\"$5\",null,{\"fallback\":[\"$\",\"div\",null,{\"className\":\"w-64 border-r border-base-300 min-h-screen bg-base-200/30 flex items-center justify-center\",\"children\":[\"$\",\"span\",null,{\"className\":\"loading loading-spinner\"}]}],\"children\":[\"$\",\"$L7\",null,{\"initialCollapsed\":false}]}],[\"$\",\"main\",null,{\"className\":\"flex-1 overflow-auto\",\"children\":[\"$\",\"$L3\",null,{\"parallelRouterKey\":\"children\",\"error\":\"$undefined\",\"errorStyles\":\"$undefined\",\"errorScripts\":\"$undefined\",\"template\":[\"$\",\"$L4\",null,{}],\"templateStyles\":\"$undefined\",\"templateScripts\":\"$undefined\",\"notFound\":\"$undefined\",\"forbidden\":\"$undefined\",\"unauthorized\":\"$undefined\"}]}]]}]]}],{\"children\":[[\"$\",\"$1\",\"c\",{\"children\":[null,[\"$\",\"$L3\",null,{\"parallelRouterKey\":\"children\",\"error\":\"$undefined\",\"errorStyles\":\"$undefined\",\"errorScripts\":\"$undefined\",\"template\":[\"$\",\"$L4\",null,{}],\"templateStyles\":\"$undefined\",\"templateScripts\":\"$undefined\",\"notFound\":\"$undefined\",\"forbidden\":\"$undefined\",\"unauthorized\":\"$undefined\"}]]}],{\"children\":[[\"$\",\"$1\",\"c\",{\"children\":[[\"$\",\"$L8\",null,{\"Component\":\"$9\",\"serverProvidedParams\":{\"searchParams\":{},\"params\":{},\"promises\":[\"$@a\",\"$@b\"]}}],[[\"$\",\"link\",\"0\",{\"rel\":\"stylesheet\",\"href\":\"/_next/static/css/36968b90b2339533.css\",\"precedence\":\"next\",\"crossOrigin\":\"$undefined\",\"nonce\":\"$undefined\"}]],[\"$\",\"$Lc\",null,{\"children\":[\"$\",\"$5\",null,{\"name\":\"Next.MetadataOutlet\",\"children\":\"$@d\"}]}]]}],{},null,false,false]},null,false,false]},null,false,false]},null,false,false],[\"$\",\"$1\",\"h\",{\"children\":[null,[\"$\",\"$Le\",null,{\"children\":\"$Lf\"}],[\"$\",\"div\",null,{\"hidden\":true,\"children\":[\"$\",\"$L10\",null,{\"children\":[\"$\",\"$5\",null,{\"name\":\"Next.Metadata\",\"children\":\"$L11\"}]}]}],[\"$\",\"meta\",null,{\"name\":\"next-size-adjust\",\"content\":\"\"}]]}],false]],\"m\":\"$undefined\",\"G\":[\"$12\",[]],\"S\":true}\n"])</script><script>self.__next_f.push([1,"a:{}\nb:\"$0:f:0:1:1:children:1:children:1:children:0:props:children:0:props:serverProvidedParams:params\"\n"])</script><script>self.__next_f.push([1,"f:[[\"$\",\"meta\",\"0\",{\"charSet\":\"utf-8\"}],[\"$\",\"meta\",\"1\",{\"name\":\"viewport\",\"content\":\"width=device-width, initial-scale=1\"}]]\n"])</script><script>self.__next_f.push([1,"13:I[6869,[],\"IconMark\"]\nd:null\n11:[[\"$\",\"title\",\"0\",{\"children\":\"Trident\"}],[\"$\",\"meta\",\"1\",{\"name\":\"description\",\"content\":\"Git repository management tool\"}],[\"$\",\"link\",\"2\",{\"rel\":\"icon\",\"href\":\"/icon.png?91e8b75214a43d69\",\"type\":\"image/png\",\"sizes\":\"256x256\"}],[\"$\",\"$L13\",\"3\",{}]]\n"])</script></body></html>