codexui-android 0.1.107 → 0.1.109

package/dist/assets/{index.esm-Bh22Jgzp.js → index.esm--s_sgTDk.js}

@@ -1,4 +1,4 @@
-import{t as te,u as ne,v as J,w as h,x as Be,y as Xe,z as qn,g as I,e as Kt,A as $t,B as Gn,m as zn,C as v,E as Kn,G as $n,S as he,H as Bn,F as Qe,I as Ze,L as jn,J as Bt,K as Yn,M as Jn,N as Xn,O as Qn,i as Tt,P as wt,r as yt,Q as Zn}from"./index.esm-aDL62PRZ.js";/**
+import{t as te,u as ne,v as J,w as h,x as Be,y as Xe,z as qn,g as I,e as Kt,A as $t,B as Gn,m as zn,C as v,E as Kn,G as $n,S as he,H as Bn,F as Qe,I as Ze,L as jn,J as Bt,K as Yn,M as Jn,N as Xn,O as Qn,i as Tt,P as wt,r as yt,Q as Zn}from"./index.esm-DvadSfWE.js";/**
  * @license
  * Copyright 2021 Google LLC
  *
@@ -1603,7 +1603,7 @@ import{t as te,u as ne,v as J,w as h,x as Be,y as Xe,z as qn,g as I,e as Kt,A as
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */const $e="webStorageSupport";class Us{constructor(){this.eventManagers={},this.iframes={},this.originValidationPromises={},this._redirectPersistence=Nn,this._completeRedirectFn=Un,this._overrideRedirectResult=is}async _openPopup(e,t,i,r){var o;C((o=this.eventManagers[e._key()])==null?void 0:o.manager,"_initialize() not called before _openPopup()");const s=await Wt(e,t,i,ae(),r);return Cs(e,s,Ue())}async _openRedirect(e,t,i,r){await this._originValidation(e);const s=await Wt(e,t,i,ae(),r);return br(s),new Promise(()=>{})}_initialize(e){const t=e._key();if(this.eventManagers[t]){const{manager:r,promise:s}=this.eventManagers[t];return r?Promise.resolve(r):(C(s,"If manager is not set, promise should be"),s)}const i=this.initAndGetManager(e);return this.eventManagers[t]={promise:i},i.catch(()=>{delete this.eventManagers[t]}),i}async initAndGetManager(e){const t=await As(e),i=new cs(e);return t.register("authEvent",r=>(u(r==null?void 0:r.authEvent,e,"invalid-auth-event"),{status:i.onEvent(r.authEvent)?"ACK":"ERROR"}),gapi.iframes.CROSS_ORIGIN_IFRAMES_FILTER),this.eventManagers[e._key()]={manager:i},this.iframes[e._key()]=t,i}_isIframeWebStorageSupported(e,t){this.iframes[e._key()].send($e,{type:$e},r=>{var o;const s=(o=r==null?void 0:r[0])==null?void 0:o[$e];s!==void 0&&t(!!s),y(e,"internal-error")},gapi.iframes.CROSS_ORIGIN_IFRAMES_FILTER)}_originValidation(e){const t=e._key();return this.originValidationPromises[t]||(this.originValidationPromises[t]=fs(e)),this.originValidationPromises[t]}get _shouldInitProactively(){return dn()||sn()||rt()}}const Vs=Us;class xn{constructor(e){this.factorId=e}_process(e,t,i){switch(t.type){case"enroll":return this._finalizeEnroll(e,t.credential,i);case"signin":return this._finalizeSignIn(e,t.credential);default:return P("unexpected MultiFactorSessionType")}}}class It extends xn{constructor(e){super("phone"),this.credential=e}static _fromCredential(e){return new It(e)}_finalizeEnroll(e,t,i){return yr(e,{idToken:t,displayName:i,phoneVerificationInfo:this.credential._makeVerificationRequest()})}_finalizeSignIn(e,t){return qr(e,{mfaPendingCredential:t,phoneVerificationInfo:this.credential._makeVerificationRequest()})}}class Fs{constructor(){}static assertion(e){return It._fromCredential(e)}}Fs.FACTOR_ID="phone";class xs{static assertionForEnrollment(e,t){return de._fromSecret(e,t)}static assertionForSignIn(e,t){return de._fromEnrollmentId(e,t)}static async generateSecret(e){var r;const t=e;u(typeof((r=t.user)==null?void 0:r.auth)<"u","internal-error");const i=await vr(t.user.auth,{idToken:t.credential,totpEnrollmentInfo:{}});return _t._fromStartTotpMfaEnrollmentResponse(i,t.user.auth)}}xs.FACTOR_ID="totp";class de extends xn{constructor(e,t,i){super("totp"),this.otp=e,this.enrollmentId=t,this.secret=i}static _fromSecret(e,t){return new de(t,void 0,e)}static _fromEnrollmentId(e,t){return new de(t,e)}async _finalizeEnroll(e,t,i){return u(typeof this.secret<"u",e,"argument-error"),Ar(e,{idToken:t,displayName:i,totpVerificationInfo:this.secret._makeTotpVerificationInfo(this.otp)})}async _finalizeSignIn(e,t){u(this.enrollmentId!==void 0&&this.otp!==void 0,e,"argument-error");const i={verificationCode:this.otp};return Gr(e,{mfaPendingCredential:t,mfaEnrollmentId:this.enrollmentId,totpVerificationInfo:i})}}class _t{constructor(e,t,i,r,s,o,a){this.sessionInfo=o,this.auth=a,this.secretKey=e,this.hashingAlgorithm=t,this.codeLength=i,this.codeIntervalSeconds=r,this.enrollmentCompletionDeadline=s}static _fromStartTotpMfaEnrollmentResponse(e,t){return new _t(e.totpSessionInfo.sharedSecretKey,e.totpSessionInfo.hashingAlgorithm,e.totpSessionInfo.verificationCodeLength,e.totpSessionInfo.periodSec,new Date(e.totpSessionInfo.finalizeEnrollmentTime).toUTCString(),e.totpSessionInfo.sessionInfo,t)}_makeTotpVerificationInfo(e){return{sessionInfo:this.sessionInfo,verificationCode:e}}generateQrCodeUrl(e,t){var r;let i=!1;return(Te(e)||Te(t))&&(i=!0),i&&(Te(e)&&(e=((r=this.auth.currentUser)==null?void 0:r.email)||"unknownuser"),Te(t)&&(t=this.auth.name)),`otpauth://totp/${t}:${e}?secret=${this.secretKey}&issuer=${t}&algorithm=${this.hashingAlgorithm}&digits=${this.codeLength}`}}function Te(n){return typeof n>"u"||(n==null?void 0:n.length)===0}var qt="@firebase/auth",Gt="1.13.1";/**
+ */const $e="webStorageSupport";class Us{constructor(){this.eventManagers={},this.iframes={},this.originValidationPromises={},this._redirectPersistence=Nn,this._completeRedirectFn=Un,this._overrideRedirectResult=is}async _openPopup(e,t,i,r){var o;C((o=this.eventManagers[e._key()])==null?void 0:o.manager,"_initialize() not called before _openPopup()");const s=await Wt(e,t,i,ae(),r);return Cs(e,s,Ue())}async _openRedirect(e,t,i,r){await this._originValidation(e);const s=await Wt(e,t,i,ae(),r);return br(s),new Promise(()=>{})}_initialize(e){const t=e._key();if(this.eventManagers[t]){const{manager:r,promise:s}=this.eventManagers[t];return r?Promise.resolve(r):(C(s,"If manager is not set, promise should be"),s)}const i=this.initAndGetManager(e);return this.eventManagers[t]={promise:i},i.catch(()=>{delete this.eventManagers[t]}),i}async initAndGetManager(e){const t=await As(e),i=new cs(e);return t.register("authEvent",r=>(u(r==null?void 0:r.authEvent,e,"invalid-auth-event"),{status:i.onEvent(r.authEvent)?"ACK":"ERROR"}),gapi.iframes.CROSS_ORIGIN_IFRAMES_FILTER),this.eventManagers[e._key()]={manager:i},this.iframes[e._key()]=t,i}_isIframeWebStorageSupported(e,t){this.iframes[e._key()].send($e,{type:$e},r=>{var o;const s=(o=r==null?void 0:r[0])==null?void 0:o[$e];s!==void 0&&t(!!s),y(e,"internal-error")},gapi.iframes.CROSS_ORIGIN_IFRAMES_FILTER)}_originValidation(e){const t=e._key();return this.originValidationPromises[t]||(this.originValidationPromises[t]=fs(e)),this.originValidationPromises[t]}get _shouldInitProactively(){return dn()||sn()||rt()}}const Vs=Us;class xn{constructor(e){this.factorId=e}_process(e,t,i){switch(t.type){case"enroll":return this._finalizeEnroll(e,t.credential,i);case"signin":return this._finalizeSignIn(e,t.credential);default:return P("unexpected MultiFactorSessionType")}}}class It extends xn{constructor(e){super("phone"),this.credential=e}static _fromCredential(e){return new It(e)}_finalizeEnroll(e,t,i){return yr(e,{idToken:t,displayName:i,phoneVerificationInfo:this.credential._makeVerificationRequest()})}_finalizeSignIn(e,t){return qr(e,{mfaPendingCredential:t,phoneVerificationInfo:this.credential._makeVerificationRequest()})}}class Fs{constructor(){}static assertion(e){return It._fromCredential(e)}}Fs.FACTOR_ID="phone";class xs{static assertionForEnrollment(e,t){return de._fromSecret(e,t)}static assertionForSignIn(e,t){return de._fromEnrollmentId(e,t)}static async generateSecret(e){var r;const t=e;u(typeof((r=t.user)==null?void 0:r.auth)<"u","internal-error");const i=await vr(t.user.auth,{idToken:t.credential,totpEnrollmentInfo:{}});return _t._fromStartTotpMfaEnrollmentResponse(i,t.user.auth)}}xs.FACTOR_ID="totp";class de extends xn{constructor(e,t,i){super("totp"),this.otp=e,this.enrollmentId=t,this.secret=i}static _fromSecret(e,t){return new de(t,void 0,e)}static _fromEnrollmentId(e,t){return new de(t,e)}async _finalizeEnroll(e,t,i){return u(typeof this.secret<"u",e,"argument-error"),Ar(e,{idToken:t,displayName:i,totpVerificationInfo:this.secret._makeTotpVerificationInfo(this.otp)})}async _finalizeSignIn(e,t){u(this.enrollmentId!==void 0&&this.otp!==void 0,e,"argument-error");const i={verificationCode:this.otp};return Gr(e,{mfaPendingCredential:t,mfaEnrollmentId:this.enrollmentId,totpVerificationInfo:i})}}class _t{constructor(e,t,i,r,s,o,a){this.sessionInfo=o,this.auth=a,this.secretKey=e,this.hashingAlgorithm=t,this.codeLength=i,this.codeIntervalSeconds=r,this.enrollmentCompletionDeadline=s}static _fromStartTotpMfaEnrollmentResponse(e,t){return new _t(e.totpSessionInfo.sharedSecretKey,e.totpSessionInfo.hashingAlgorithm,e.totpSessionInfo.verificationCodeLength,e.totpSessionInfo.periodSec,new Date(e.totpSessionInfo.finalizeEnrollmentTime).toUTCString(),e.totpSessionInfo.sessionInfo,t)}_makeTotpVerificationInfo(e){return{sessionInfo:this.sessionInfo,verificationCode:e}}generateQrCodeUrl(e,t){var r;let i=!1;return(Te(e)||Te(t))&&(i=!0),i&&(Te(e)&&(e=((r=this.auth.currentUser)==null?void 0:r.email)||"unknownuser"),Te(t)&&(t=this.auth.name)),`otpauth://totp/${t}:${e}?secret=${this.secretKey}&issuer=${t}&algorithm=${this.hashingAlgorithm}&digits=${this.codeLength}`}}function Te(n){return typeof n>"u"||(n==null?void 0:n.length)===0}var qt="@firebase/auth",Gt="1.12.2";/**
  * @license
  * Copyright 2020 Google LLC
  *

package/dist/assets/{index.esm-D7eMWmxV.js → index.esm-D_uN0D-X.js}

@@ -1,4 +1,4 @@
-import{r as e}from"./index.esm-aDL62PRZ.js";import{F as o,S as t,D as n,_,a as v,b as m,c as A,d as g,e as S,f as d,g as b,h as l,i as F,j as c,k as E,l as f,m as C,n as L,o as D,p as N,q as O,s as x}from"./index.esm-aDL62PRZ.js";var s="firebase",a="12.13.0";/**
+import{r as e}from"./index.esm-DvadSfWE.js";import{F as o,S as t,D as n,_,a as v,b as m,c as A,d as g,e as S,f as d,g as b,h as l,i as F,j as c,k as E,l as f,m as C,n as L,o as D,p as N,q as O,s as x}from"./index.esm-DvadSfWE.js";var s="firebase",a="12.11.0";/**
  * @license
  * Copyright 2020 Google LLC
  *

package/dist/assets/{index.esm-aDL62PRZ.js → index.esm-DvadSfWE.js}

@@ -208,7 +208,7 @@ const pe=()=>{};var U={};/**
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */class Xe{constructor(e){this.container=e}getPlatformInfoString(){return this.container.getProviders().map(n=>{if(Qe(n)){const r=n.getImmediate();return`${r.library}/${r.version}`}else return null}).filter(n=>n).join(" ")}}function Qe(t){const e=t.getComponent();return(e==null?void 0:e.type)==="VERSION"}const S="@firebase/app",x="0.14.12";/**
+ */class Xe{constructor(e){this.container=e}getPlatformInfoString(){return this.container.getProviders().map(n=>{if(Qe(n)){const r=n.getImmediate();return`${r.library}/${r.version}`}else return null}).filter(n=>n).join(" ")}}function Qe(t){const e=t.getComponent();return(e==null?void 0:e.type)==="VERSION"}const S="@firebase/app",x="0.14.10";/**
  * @license
  * Copyright 2019 Google LLC
  *
@@ -223,7 +223,7 @@ const pe=()=>{};var U={};/**
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */const d=new Pe("@firebase/app"),Ze="@firebase/app-compat",et="@firebase/analytics-compat",tt="@firebase/analytics",nt="@firebase/app-check-compat",rt="@firebase/app-check",st="@firebase/auth",it="@firebase/auth-compat",ot="@firebase/database",at="@firebase/data-connect",ct="@firebase/database-compat",lt="@firebase/functions",ht="@firebase/functions-compat",ft="@firebase/installations",dt="@firebase/installations-compat",ut="@firebase/messaging",pt="@firebase/messaging-compat",mt="@firebase/performance",gt="@firebase/performance-compat",bt="@firebase/remote-config",yt="@firebase/remote-config-compat",Et="@firebase/storage",vt="@firebase/storage-compat",_t="@firebase/firestore",Ct="@firebase/ai",Dt="@firebase/firestore-compat",wt="firebase",It="12.13.0";/**
+ */const d=new Pe("@firebase/app"),Ze="@firebase/app-compat",et="@firebase/analytics-compat",tt="@firebase/analytics",nt="@firebase/app-check-compat",rt="@firebase/app-check",st="@firebase/auth",it="@firebase/auth-compat",ot="@firebase/database",at="@firebase/data-connect",ct="@firebase/database-compat",lt="@firebase/functions",ht="@firebase/functions-compat",ft="@firebase/installations",dt="@firebase/installations-compat",ut="@firebase/messaging",pt="@firebase/messaging-compat",mt="@firebase/performance",gt="@firebase/performance-compat",bt="@firebase/remote-config",yt="@firebase/remote-config-compat",Et="@firebase/storage",vt="@firebase/storage-compat",_t="@firebase/firestore",Ct="@firebase/ai",Dt="@firebase/firestore-compat",wt="firebase",It="12.11.0";/**
  * @license
  * Copyright 2019 Google LLC
  *

package/dist/index.html

@@ -12,8 +12,8 @@
     <link rel="icon" type="image/png" sizes="192x192" href="/icons/pwa-192x192.png" />
     <link rel="apple-touch-icon" sizes="180x180" href="/icons/apple-touch-icon.png" />
     <title>Codex Web</title>
-    <script type="module" crossorigin src="/assets/index-7uudGTMH.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-D3-QOh5C.css">
+    <script type="module" crossorigin src="/assets/index-ZXDbBStq.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-AFrh-w0S.css">
   </head>
   <body class="bg-slate-950">
     <div id="app"></div>

package/dist-cli/index.js

@@ -2047,6 +2047,9 @@ function deriveSkillPathInfo(skillPath, knownPaths = /* @__PURE__ */ new Set())
 function getSkillsInstallDir() {
   return join4(getCodexHomeDir2(), "skills");
 }
+function getSharedSkillsInstallDir() {
+  return join4(getSkillsInstallDir(), "shared_skills");
+}
 var DEFAULT_COMMAND_TIMEOUT_MS = 12e4;
 var SKILL_SEARCH_METADATA_LIMIT = 20;
 var SKILL_SEARCH_METADATA_CONCURRENCY = 4;
@@ -2421,9 +2424,8 @@ var startupSyncStatus = {
   lastSuccessAtIso: "",
   lastError: ""
 };
-async function scanInstalledSkillsFromDisk() {
+async function scanInstalledSkillsFromDir(skillsDir) {
   const map = /* @__PURE__ */ new Map();
-  const skillsDir = getSkillsInstallDir();
   try {
     const entries = await readdir(skillsDir, { withFileTypes: true });
     for (const entry of entries) {
@@ -2439,6 +2441,9 @@ async function scanInstalledSkillsFromDisk() {
   }
   return map;
 }
+async function scanInstalledSkillsFromDisk() {
+  return await scanInstalledSkillsFromDir(getSkillsInstallDir());
+}
 async function collectInstalledSkillsMap(appServer) {
   const installedMap = await scanInstalledSkillsFromDisk();
   try {
@@ -2700,13 +2705,14 @@ async function writeRemoteSkillsManifest(token, repoOwner, repoName, skills) {
 function toGitHubTokenRemote(repoOwner, repoName, token) {
   return `https://x-access-token:${encodeURIComponent(token)}@github.com/${repoOwner}/${repoName}.git`;
 }
-async function ensureSkillsWorkingTreeRepo(repoUrl, branch) {
-  const localDir = getSkillsInstallDir();
+async function ensureSkillsWorkingTreeRepo(repoUrl, branch, options = {}) {
+  const localDir = options.localDir ?? getSkillsInstallDir();
   await mkdir3(localDir, { recursive: true });
   const gitDir = join4(localDir, ".git");
   let hasGitDir = false;
   try {
-    hasGitDir = (await stat3(gitDir)).isDirectory();
+    const gitDirStat = await lstat(gitDir);
+    hasGitDir = gitDirStat.isDirectory() || gitDirStat.isFile();
   } catch {
     hasGitDir = false;
   }
@@ -2726,6 +2732,14 @@ async function ensureSkillsWorkingTreeRepo(repoUrl, branch) {
       await runCommand2("git", ["remote", "set-url", "origin", repoUrl], { cwd: localDir });
     }
     await runGitFetchWithRefLockRetry(localDir);
+    if (options.overwriteLocalFiles) {
+      await runCommand2("git", ["reset", "--hard"], { cwd: localDir });
+      await runCommand2("git", ["clean", "-fd"], { cwd: localDir });
+      await runCommand2("git", ["checkout", "-B", branch, `origin/${branch}`], { cwd: localDir });
+      await runCommand2("git", ["reset", "--hard", `origin/${branch}`], { cwd: localDir });
+      await runCommand2("git", ["clean", "-fd"], { cwd: localDir });
+      return localDir;
+    }
     try {
       await runCommand2("git", ["merge", "--allow-unrelated-histories", "--no-edit", `origin/${branch}`], { cwd: localDir });
     } catch {
@@ -2734,6 +2748,17 @@ async function ensureSkillsWorkingTreeRepo(repoUrl, branch) {
   }
   await runCommand2("git", ["remote", "set-url", "origin", repoUrl], { cwd: localDir });
   await runGitFetchWithRefLockRetry(localDir);
+  if (options.overwriteLocalFiles) {
+    try {
+      await runCommand2("git", ["reset", "--hard"], { cwd: localDir });
+    } catch {
+    }
+    await runCommand2("git", ["clean", "-fd"], { cwd: localDir });
+    await runCommand2("git", ["checkout", "-B", branch, `origin/${branch}`], { cwd: localDir });
+    await runCommand2("git", ["reset", "--hard", `origin/${branch}`], { cwd: localDir });
+    await runCommand2("git", ["clean", "-fd"], { cwd: localDir });
+    return localDir;
+  }
   const hasLocalChangesBeforeSync = await hasLocalUncommittedChanges(localDir);
   const localMtimesBeforeSync = hasLocalChangesBeforeSync ? await snapshotFileMtimes(localDir) : /* @__PURE__ */ new Map();
   await resolveMergeConflictsByNewerCommit(localDir, branch, localMtimesBeforeSync);
@@ -2994,13 +3019,19 @@ async function syncInstalledSkillsFolderToRepo(token, repoOwner, repoName, _inst
 }
 async function pullInstalledSkillsFolderFromRepo(token, repoOwner, repoName) {
   const remoteUrl = toGitHubTokenRemote(repoOwner, repoName, token);
-  const branch = PRIVATE_SYNC_BRANCH;
-  await ensureSkillsWorkingTreeRepo(remoteUrl, branch);
+  const isUpstream = isUpstreamSkillsRepo(repoOwner, repoName);
+  const branch = isUpstream ? PUBLIC_UPSTREAM_BRANCH_ANDROID : PRIVATE_SYNC_BRANCH;
+  return await ensureSkillsWorkingTreeRepo(remoteUrl, branch, {
+    ...isUpstream ? { localDir: getSharedSkillsInstallDir() } : {},
+    overwriteLocalFiles: isUpstream
+  });
 }
 async function bootstrapSkillsFromUpstreamIntoLocal() {
   const repoUrl = `https://github.com/${SYNC_UPSTREAM_SKILLS_OWNER}/${SYNC_UPSTREAM_SKILLS_REPO}.git`;
-  const branch = getPreferredPublicUpstreamBranch();
-  await ensureSkillsWorkingTreeRepo(repoUrl, branch);
+  return await ensureSkillsWorkingTreeRepo(repoUrl, PUBLIC_UPSTREAM_BRANCH_ANDROID, {
+    localDir: getSharedSkillsInstallDir(),
+    overwriteLocalFiles: true
+  });
 }
 async function collectLocalSyncedSkills(appServer) {
   const state = await readSkillsSyncState();
@@ -3305,12 +3336,31 @@ async function handleSkillsRoutes(req, res, url, context) {
     try {
       const state = await readSkillsSyncState();
       if (!state.githubToken || !state.repoOwner || !state.repoName) {
-        await bootstrapSkillsFromUpstreamIntoLocal();
+        const repoDir = await bootstrapSkillsFromUpstreamIntoLocal();
+        const localSkills2 = await scanInstalledSkillsFromDir(repoDir);
         try {
           await appServer.rpc("skills/list", { forceReload: true });
         } catch {
         }
-        setJson3(res, 200, { ok: true, data: { synced: 0, source: "upstream" } });
+        setJson3(res, 200, { ok: true, data: { synced: localSkills2.size, source: "upstream" } });
+        return true;
+      }
+      if (isUpstreamSkillsRepo(state.repoOwner, state.repoName)) {
+        const repoDir = await pullInstalledSkillsFolderFromRepo(state.githubToken, state.repoOwner, state.repoName);
+        const localSkills2 = await scanInstalledSkillsFromDir(repoDir);
+        const pulledHead2 = await runCommandWithOutput("git", ["rev-parse", "HEAD"], { cwd: repoDir }).catch(() => "");
+        await writeSkillsSyncState({
+          ...state,
+          lastPullCommitSha: pulledHead2.trim(),
+          lastSyncAttemptCount: 1,
+          lastSyncError: "",
+          lastSyncAtIso: (/* @__PURE__ */ new Date()).toISOString()
+        });
+        try {
+          await appServer.rpc("skills/list", { forceReload: true });
+        } catch {
+        }
+        setJson3(res, 200, { ok: true, data: { synced: localSkills2.size, source: "upstream" } });
         return true;
       }
       const remote = await readRemoteSkillsManifest(state.githubToken, state.repoOwner, state.repoName);
@@ -5186,6 +5236,7 @@ function shellQuote(value) {
 var COMPOSIO_CONNECTORS_PAGE_LIMIT_MAX = 1e3;
 var PROVIDER_MODELS_FETCH_TIMEOUT_MS = 5e3;
 var THREAD_RESPONSE_TURN_LIMIT = 10;
+var THREAD_TURN_PAGE_READ_CACHE_TTL_MS = 3e4;
 var THREAD_METHODS_WITH_TURNS = /* @__PURE__ */ new Set(["thread/read", "thread/resume", "thread/fork", "thread/rollback"]);
 var THREAD_SEARCH_FULL_TEXT_THREAD_LIMIT = 100;
 var PROJECTLESS_THREAD_DIRECTORY_MAX_ATTEMPTS = 100;
@@ -5688,11 +5739,13 @@ function trimThreadTurnsInRpcResult(method, result) {
   const thread = asRecord5(record?.thread);
   const turns = Array.isArray(thread?.turns) ? thread.turns : null;
   if (!record || !thread || !turns || turns.length <= THREAD_RESPONSE_TURN_LIMIT) return result;
+  const startTurnIndex = Math.max(0, turns.length - THREAD_RESPONSE_TURN_LIMIT);
   return {
     ...record,
+    threadTurnStartIndex: startTurnIndex,
     thread: {
       ...thread,
-      turns: turns.slice(-THREAD_RESPONSE_TURN_LIMIT)
+      turns: turns.slice(startTurnIndex)
     }
   };
 }
@@ -5760,6 +5813,56 @@ async function createProjectlessThreadDirectory(prompt) {
   }
   throw new Error("Unable to create a unique new chat folder");
 }
+function normalizeGithubCloneUrl(rawUrl) {
+  const trimmedUrl = rawUrl.trim();
+  if (!trimmedUrl) throw new Error("Missing GitHub repository URL");
+  const sshMatch = trimmedUrl.match(/^git@github\.com:([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+?)(?:\.git)?$/u);
+  if (sshMatch) {
+    const repoName2 = sshMatch[2];
+    return { url: `git@github.com:${sshMatch[1]}/${repoName2}.git`, repoName: repoName2 };
+  }
+  let parsed;
+  try {
+    parsed = new URL(trimmedUrl);
+  } catch {
+    throw new Error("Enter a valid GitHub repository URL");
+  }
+  if (parsed.hostname.toLowerCase() !== "github.com") {
+    throw new Error("Only github.com repository URLs are supported");
+  }
+  const segments = parsed.pathname.split("/").filter(Boolean);
+  if (segments.length < 2) {
+    throw new Error("Enter a GitHub repository URL with owner and repository name");
+  }
+  const owner = segments[0];
+  const repoName = segments[1].replace(/\.git$/iu, "");
+  if (!/^[A-Za-z0-9_.-]+$/u.test(owner) || !/^[A-Za-z0-9_.-]+$/u.test(repoName)) {
+    throw new Error("GitHub repository owner or name contains unsupported characters");
+  }
+  return { url: `https://github.com/${owner}/${repoName}.git`, repoName };
+}
+async function cloneGithubRepositoryIntoBase(rawUrl, rawBasePath) {
+  const basePath = rawBasePath.trim();
+  if (!basePath) throw new Error("Missing clone destination folder");
+  const normalizedBasePath = isAbsolute2(basePath) ? basePath : resolve2(basePath);
+  await ensureRealDirectory(normalizedBasePath, "Clone destination folder");
+  const { url, repoName } = normalizeGithubCloneUrl(rawUrl);
+  const targetPath = join6(normalizedBasePath, repoName);
+  try {
+    await stat4(targetPath);
+    throw new Error(`Destination already exists: ${targetPath}`);
+  } catch (error) {
+    if (error?.code !== "ENOENT") throw error;
+  }
+  try {
+    await runCommand3("git", ["clone", url, targetPath], { cwd: normalizedBasePath, timeoutMs: 5 * 6e4 });
+  } catch (error) {
+    await rm4(targetPath, { recursive: true, force: true }).catch(() => void 0);
+    throw error;
+  }
+  await persistWorkspaceRoot(targetPath, "");
+  return targetPath;
+}
 function normalizeHeaderValue(value) {
   if (typeof value === "string") {
     const trimmed = value.trim();
@@ -7169,14 +7272,33 @@ async function runCommand3(command, args, options = {}) {
     });
     let stdout = "";
     let stderr = "";
+    let timedOut = false;
+    let closed = false;
+    const timeout = typeof options.timeoutMs === "number" && Number.isFinite(options.timeoutMs) && options.timeoutMs > 0 ? setTimeout(() => {
+      timedOut = true;
+      proc.kill("SIGTERM");
+      setTimeout(() => {
+        if (!closed) proc.kill("SIGKILL");
+      }, 5e3).unref();
+    }, options.timeoutMs) : null;
+    timeout?.unref();
     proc.stdout.on("data", (chunk) => {
       stdout += chunk.toString();
     });
     proc.stderr.on("data", (chunk) => {
       stderr += chunk.toString();
     });
-    proc.on("error", reject);
+    proc.on("error", (error) => {
+      if (timeout) clearTimeout(timeout);
+      reject(error);
+    });
     proc.on("close", (code) => {
+      closed = true;
+      if (timeout) clearTimeout(timeout);
+      if (timedOut) {
+        reject(new Error(`Command timed out after ${options.timeoutMs}ms (${command} ${args.join(" ")})`));
+        return;
+      }
       if (code === 0) {
         resolve4();
         return;
@@ -8453,6 +8575,8 @@ var AppServerProcess = class {
     this.appServerArgs = buildAppServerArgs();
     this.streamEventsByThreadId = /* @__PURE__ */ new Map();
     this.lastThreadReadSnapshotByThreadId = /* @__PURE__ */ new Map();
+    this.threadTurnPageReadCacheByThreadId = /* @__PURE__ */ new Map();
+    this.threadTurnPageReadPromiseByThreadId = /* @__PURE__ */ new Map();
     this.capturedItemsByThreadId = /* @__PURE__ */ new Map();
     this.liveStateCache = /* @__PURE__ */ new Map();
     this.chatgptAuthRefreshPromise = null;
@@ -8565,7 +8689,10 @@ var AppServerProcess = class {
     this.recordStreamEvent(notification);
     this.captureItemFromNotification(notification);
     const nThreadId = this.extractThreadIdFromParams(notification.params);
-    if (nThreadId) this.invalidateLiveStateCache(nThreadId);
+    if (nThreadId) {
+      this.invalidateLiveStateCache(nThreadId);
+      this.threadTurnPageReadCacheByThreadId.delete(nThreadId);
+    }
     for (const listener of this.notificationListeners) {
       listener(notification);
     }
@@ -8609,10 +8736,33 @@ var AppServerProcess = class {
   }
   storeThreadReadSnapshot(threadId, snapshot) {
     this.lastThreadReadSnapshotByThreadId.set(threadId, snapshot);
+    this.threadTurnPageReadCacheByThreadId.delete(threadId);
   }
   getLastThreadReadSnapshot(threadId) {
     return this.lastThreadReadSnapshotByThreadId.get(threadId) ?? null;
   }
+  async readThreadForTurnPage(threadId) {
+    const now = Date.now();
+    const cached = this.threadTurnPageReadCacheByThreadId.get(threadId);
+    if (cached && cached.expiresAt > now) return cached.result;
+    if (cached) this.threadTurnPageReadCacheByThreadId.delete(threadId);
+    const pending = this.threadTurnPageReadPromiseByThreadId.get(threadId);
+    if (pending) return pending;
+    const promise = this.rpc("thread/read", {
+      threadId,
+      includeTurns: true
+    }).then((result) => {
+      this.threadTurnPageReadCacheByThreadId.set(threadId, {
+        result,
+        expiresAt: Date.now() + THREAD_TURN_PAGE_READ_CACHE_TTL_MS
+      });
+      return result;
+    }).finally(() => {
+      this.threadTurnPageReadPromiseByThreadId.delete(threadId);
+    });
+    this.threadTurnPageReadPromiseByThreadId.set(threadId, promise);
+    return promise;
+  }
   cacheLiveState(threadId, data, turnCount, sessionSize) {
     this.liveStateCache.set(threadId, { data, turnCount, sessionSize });
   }
@@ -9707,6 +9857,61 @@ function createCodexBridgeMiddleware() {
         setJson4(res, 200, { result });
         return;
       }
+      if (req.method === "GET" && url.pathname === "/codex-api/thread-turn-page") {
+        try {
+          const threadId = url.searchParams.get("threadId")?.trim() ?? "";
+          const beforeTurnId = url.searchParams.get("beforeTurnId")?.trim() ?? "";
+          const limitRaw = url.searchParams.get("limit")?.trim() ?? String(THREAD_RESPONSE_TURN_LIMIT);
+          const limit = Math.max(1, Math.min(50, Number.parseInt(limitRaw, 10) || THREAD_RESPONSE_TURN_LIMIT));
+          if (!threadId) {
+            setJson4(res, 400, { error: "Missing threadId" });
+            return;
+          }
+          const threadReadResult = await appServer.readThreadForTurnPage(threadId);
+          const record = asRecord5(threadReadResult);
+          const thread = asRecord5(record?.thread);
+          if (!record || !thread) {
+            setJson4(res, 502, { error: "thread/read returned an invalid thread response" });
+            return;
+          }
+          const turns = Array.isArray(thread.turns) ? thread.turns : [];
+          const beforeIndex = beforeTurnId ? turns.findIndex((turn) => asRecord5(turn)?.id === beforeTurnId) : turns.length;
+          if (beforeTurnId && beforeIndex < 0) {
+            setJson4(res, 200, {
+              result: {
+                ...record,
+                thread: {
+                  ...thread,
+                  turns: []
+                }
+              },
+              startTurnIndex: 0,
+              hasMoreOlder: false
+            });
+            return;
+          }
+          const endIndex = beforeIndex;
+          const startIndex = Math.max(0, endIndex - limit);
+          const pageTurns = turns.slice(startIndex, endIndex);
+          const pagedResult = {
+            ...record,
+            thread: {
+              ...thread,
+              turns: pageTurns
+            }
+          };
+          const sanitized = await sanitizeThreadTurnsInlinePayloads("thread/read", pagedResult);
+          const result = await mergeSessionSkillInputsIntoThreadResult(sanitized);
+          setJson4(res, 200, {
+            result,
+            startTurnIndex: startIndex,
+            hasMoreOlder: startIndex > 0
+          });
+        } catch (error) {
+          setJson4(res, 500, { error: getErrorMessage5(error, "Failed to load earlier thread messages") });
+        }
+        return;
+      }
       if (req.method === "GET" && url.pathname === "/codex-api/thread-file-change-fallback") {
         const threadId = url.searchParams.get("threadId")?.trim() ?? "";
         if (!threadId) {
@@ -10573,6 +10778,18 @@ function createCodexBridgeMiddleware() {
         setJson4(res, 200, { data: { path: normalizedPath } });
         return;
       }
+      if (req.method === "POST" && url.pathname === "/codex-api/github-clone") {
+        const payload = asRecord5(await readJsonBody2(req));
+        const repoUrl = typeof payload?.url === "string" ? payload.url.trim() : "";
+        const basePath = typeof payload?.basePath === "string" ? payload.basePath.trim() : "";
+        try {
+          const clonedPath = await cloneGithubRepositoryIntoBase(repoUrl, basePath);
+          setJson4(res, 200, { data: { path: clonedPath } });
+        } catch (error) {
+          setJson4(res, 400, { error: error instanceof Error ? error.message : "Failed to clone GitHub repository" });
+        }
+        return;
+      }
       if (req.method === "POST" && url.pathname === "/codex-api/projectless-thread-cwd") {
         const payload = asRecord5(await readJsonBody2(req));
         const prompt = typeof payload?.prompt === "string" ? payload.prompt : null;
@@ -12214,7 +12431,6 @@ async function startServer(options) {
   const server = createServer2(app);
   attachWebSocket(server);
   const port = await listenWithFallback(server, requestedPort);
-  process.env.CODEXUI_SERVER_PORT = String(port);
   let tunnelChild = null;
   let tunnelUrl = null;
   if (options.tunnel) {