@oodarun/cli 0.1.2 → 0.1.4

package/dist/cli.js

@@ -763,6 +763,54 @@ function getAccessToken() {
   if (process.env.OODA_ACCESS_TOKEN) return process.env.OODA_ACCESS_TOKEN;
   return readAuthData().accessToken || null;
 }
+function decodeJwtExp(token) {
+  try {
+    const payload = JSON.parse(
+      Buffer.from(token.split(".")[1], "base64url").toString()
+    );
+    return typeof payload.exp === "number" ? payload.exp : null;
+  } catch {
+    return null;
+  }
+}
+var _refreshInFlight = null;
+async function ensureFreshAccessToken() {
+  if (process.env.OODA_ACCESS_TOKEN) return process.env.OODA_ACCESS_TOKEN;
+  const data = readAuthData();
+  if (!data.accessToken || !data.refreshToken) return data.accessToken || null;
+  const exp = decodeJwtExp(data.accessToken);
+  const now = Math.floor(Date.now() / 1e3);
+  if (exp && exp - now > 300) return data.accessToken;
+  if (_refreshInFlight) return _refreshInFlight;
+  _refreshInFlight = refreshAccessToken(data.refreshToken, data.orgId || "").finally(
+    () => {
+      _refreshInFlight = null;
+    }
+  );
+  return _refreshInFlight;
+}
+async function refreshAccessToken(refreshToken, orgId) {
+  try {
+    const doFetch = globalThis.__originalFetch ?? globalThis.fetch;
+    const res = await doFetch(
+      `${ORG_API_BASE}/auth/refresh`,
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ refreshToken })
+      }
+    );
+    if (!res.ok) return null;
+    const body = await res.json();
+    const data = readAuthData();
+    data.accessToken = body.accessToken;
+    data.refreshToken = body.refreshToken;
+    writeAuthData(data);
+    return body.accessToken;
+  } catch {
+    return null;
+  }
+}
 function saveJwtTokens(accessToken, refreshToken, userId, orgId) {
   const data = readAuthData();
   data.accessToken = accessToken;
@@ -1081,13 +1129,14 @@ function patchFetchForOrg(orgId) {
   if (_orgPatchApplied) return;
   _orgPatchApplied = true;
   const originalFetch = globalThis.fetch;
+  globalThis.__originalFetch = originalFetch;
   globalThis.fetch = (async (input, init) => {
     const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
     const method = init?.method ?? (input instanceof Request ? input.method : void 0);
     const rewritten = rewriteOrgUrl(url, orgId, method);
     if (rewritten) {
       const headers = new Headers(init?.headers || {});
-      const jwt = getAccessToken();
+      const jwt = await ensureFreshAccessToken() ?? getAccessToken();
       if (jwt) {
         headers.set("Authorization", `Bearer ${jwt}`);
       }
@@ -1742,27 +1791,29 @@ async function deployToolsViaRest(projectName, token, projectRoot, onProgress) {
   log("Deploying browser overlay tools...");
   const toolsDistDir = getToolsDistDir();
   const toolFiles = ["element-selector.js", "change-applicator.js", "bridge-client.js", "toolbar.js"];
+  const uploads = [];
   for (const file of toolFiles) {
     const localPath = path4.join(toolsDistDir, file);
     try {
       const content = fs4.readFileSync(localPath, "utf-8");
-      await writeFile(`/home/user/.ooda/tools/${file}`, content);
+      uploads.push(writeFile(`/home/user/.ooda/tools/${file}`, content));
     } catch {
       log(`Warning: ${file} not found in dist/tools \u2014 skipping`);
     }
   }
-  await writeFile(`${projectRoot}/ooda-vite-plugin.mjs`, OODA_VITE_PLUGIN);
-  try {
-    await exec(`cd "${projectRoot}" && node -e "require('ws')" 2>/dev/null || npm install --save-dev ws 2>/dev/null`);
-  } catch {
-  }
-  await writeFile("/tmp/ooda-patch-config.mjs", OODA_CONFIG_PATCH_SCRIPT);
-  try {
-    const result = await exec(`node /tmp/ooda-patch-config.mjs "${projectRoot}" 2>&1`);
-    log(`Config patch: ${result.trim()}`);
-  } catch (err) {
-    log(`Config patch failed: ${err instanceof Error ? err.message : String(err)}`);
-  }
+  uploads.push(writeFile(`${projectRoot}/ooda-vite-plugin.mjs`, OODA_VITE_PLUGIN));
+  uploads.push(writeFile("/tmp/ooda-patch-config.mjs", OODA_CONFIG_PATCH_SCRIPT));
+  await Promise.all(uploads);
+  const [, patchResult] = await Promise.all([
+    exec(`cd "${projectRoot}" && node -e "require('ws')" 2>/dev/null || npm install --save-dev ws 2>/dev/null`).catch(() => {
+    }),
+    exec(`node /tmp/ooda-patch-config.mjs "${projectRoot}" 2>&1`).catch((err) => {
+      const msg = err instanceof Error ? err.message : String(err);
+      log(`Config patch failed: ${msg}`);
+      return "";
+    })
+  ]);
+  if (patchResult) log(`Config patch: ${String(patchResult).trim()}`);
 }
 
 // src/tools/installer.ts
@@ -2225,8 +2276,21 @@ async function createOrReuseProject(projectName, token, onProgress) {
   });
   if (res.ok) {
     const data = await res.json();
-    onProgress({ step: "Waiting for sandbox to start...", detail: "~10s" });
-    await new Promise((r) => setTimeout(r, 1e4));
+    onProgress({ step: "Waiting for sandbox to start..." });
+    for (let i = 0; i < 15; i++) {
+      try {
+        const params = new URLSearchParams();
+        params.append("cmd", "echo");
+        params.append("cmd", "ready");
+        const check = await fetch(`${API_BASE}/projects/${projectName}/exec?${params}`, {
+          method: "POST",
+          headers
+        });
+        if (check.ok) break;
+      } catch {
+      }
+      await new Promise((r) => setTimeout(r, 2e3));
+    }
     return data.url;
   }
   if (res.status === 409) {
@@ -5258,7 +5322,7 @@ async function deployFromGitHubFlow(target, apiToken, claudeToken) {
 }
 
 // src/cli/index.ts
-var CLI_VERSION = "0.1.2";
+var CLI_VERSION = "0.1.4";
 function formatMutationError(result) {
   const parts = [];
   if (result.status !== void 0) parts.push(String(result.status));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oodarun/cli",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Launch Claude Code on cloud dev environments",
   "type": "module",
   "license": "UNLICENSED",