@oodarun/cli 0.1.3 → 0.1.5

package/dist/cli.js

@@ -1791,27 +1791,25 @@ 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 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
@@ -2274,8 +2272,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) {
@@ -2972,6 +2983,8 @@ async function patchServerConfig(projectName, token, projectRoot, onProgress) {
   console.log("[project-provisioner] Server config patch result:", result.trim());
 }
 async function provisionFromFolder(localPath, projectName, token, onProgress, branchName, gitInfo, claudeToken, claudeEnv, githubToken) {
+  const t0 = Date.now();
+  const progress = (p) => onProgress({ ...p, step: `[+${((Date.now() - t0) / 1e3).toFixed(1)}s] ${p.step}` });
   const projectRoot = `/home/user/${path5.basename(localPath)}`;
   const headers = { Authorization: `Bearer ${token}` };
   async function exec(cmd) {
@@ -2996,20 +3009,20 @@ async function provisionFromFolder(localPath, projectName, token, onProgress, br
   try {
     const project = detectProject(localPath);
     console.log(`[project-provisioner] Detected: framework=${project.framework}, pm=${project.packageManager}, config=${project.configFile}`);
-    const projectUrl = await createOrReuseProject(projectName, token, onProgress);
-    const fileCount = await uploadFolder(localPath, projectRoot, projectName, token, onProgress);
-    onProgress({ step: "Upload complete", detail: `${fileCount} files` });
+    const projectUrl = await createOrReuseProject(projectName, token, progress);
+    const fileCount = await uploadFolder(localPath, projectRoot, projectName, token, progress);
+    progress({ step: "Upload complete", detail: `${fileCount} files` });
     const effectiveClaudeToken = claudeToken || process.env.CLAUDE_CODE_OAUTH_TOKEN;
     if (effectiveClaudeToken) {
-      await setupClaudeAuth(projectName, token, effectiveClaudeToken, onProgress, claudeEnv);
+      await setupClaudeAuth(projectName, token, effectiveClaudeToken, progress, claudeEnv);
     }
-    await deployClaudeConfig(projectName, token, projectRoot, project.framework, onProgress, gitInfo || null, branchName || null);
+    await deployClaudeConfig(projectName, token, projectRoot, project.framework, progress, gitInfo || null, branchName || null);
     await writeRemoteFile("/home/user/.ooda/publish.mjs", PUBLISH_SCRIPT2);
-    await patchServerConfig(projectName, token, projectRoot, onProgress);
-    await installSourcePlugin(projectName, token, projectRoot, project.framework, onProgress);
+    await patchServerConfig(projectName, token, projectRoot, progress);
+    await installSourcePlugin(projectName, token, projectRoot, project.framework, progress);
     try {
       await deployToolsViaRest(projectName, token, projectRoot, (msg) => {
-        onProgress({ step: msg });
+        progress({ step: msg });
       });
     } catch (err) {
       console.warn("[project-provisioner] Tool deployment failed:", err instanceof Error ? err.message : String(err));
@@ -3025,21 +3038,21 @@ async function provisionFromFolder(localPath, projectName, token, onProgress, br
         (t) => t.mcp?.transport === "stdio"
       );
       if (hasInstallableTools) {
-        onProgress({ step: "Installing MCP tools..." });
+        progress({ step: "Installing MCP tools..." });
         await installToolsViaRest(projectName, token, projectRoot, tools, pm, (msg) => {
-          onProgress({ step: msg });
+          progress({ step: msg });
         });
       }
       if (hasMcpTools) {
         const mcpJson = serializeMcpJson(tools);
         await writeRemoteFile(`${projectRoot}/.mcp.json`, mcpJson);
-        onProgress({ step: "Wrote .mcp.json" });
+        progress({ step: "Wrote .mcp.json" });
       }
     } catch (err) {
       console.warn("[project-provisioner] MCP tool setup failed:", err instanceof Error ? err.message : String(err));
     }
     if (branchName && gitInfo?.isGitRepo) {
-      onProgress({ step: "Initializing git on project..." });
+      progress({ step: "Initializing git on project..." });
       const userName = gitInfo.userName || "Ooda User";
       const userEmail = gitInfo.userEmail || "user@ooda.dev";
       const gitInitScript = [
@@ -3061,7 +3074,7 @@ async function provisionFromFolder(localPath, projectName, token, onProgress, br
           console.log(`[project-provisioner] Added remote: ${gitInfo.originUrl}`);
         }
         if (githubToken) {
-          onProgress({ step: "Setting up git credentials..." });
+          progress({ step: "Setting up git credentials..." });
           const homeDir = "/home/user";
           await exec(`git config --global credential.helper store`);
           await writeRemoteFile(
@@ -3075,7 +3088,7 @@ async function provisionFromFolder(localPath, projectName, token, onProgress, br
         console.error("[project-provisioner] Git init failed:", err);
       }
     }
-    onProgress({ step: "Ready for setup", detail: projectUrl });
+    progress({ step: "Ready for setup", detail: projectUrl });
     return {
       success: true,
       projectName,
@@ -3147,6 +3160,8 @@ async function detectProjectRemote(projectName, token, projectRoot) {
   return { framework, packageManager, devCommand, configFile };
 }
 async function provisionFromGitHub(parsed, projectName, token, onProgress, githubToken, claudeToken) {
+  const t0 = Date.now();
+  const progress = (p) => onProgress({ ...p, step: `[+${((Date.now() - t0) / 1e3).toFixed(1)}s] ${p.step}` });
   const headers = { Authorization: `Bearer ${token}` };
   let homeDir = "/home/user";
   async function exec(cmd) {
@@ -3169,8 +3184,8 @@ async function provisionFromGitHub(parsed, projectName, token, onProgress, githu
     });
   }
   try {
-    const projectUrl = await createOrReuseProject(projectName, token, onProgress);
-    onProgress({ step: "Waiting for sandbox to be ready..." });
+    const projectUrl = await createOrReuseProject(projectName, token, progress);
+    progress({ step: "Waiting for sandbox to be ready..." });
     for (let i = 0; i < 15; i++) {
       const check = await exec("test -d /home/user && echo OK || echo NOT_READY");
       const trimmed = check.trim();
@@ -3184,7 +3199,7 @@ async function provisionFromGitHub(parsed, projectName, token, onProgress, githu
     console.log(`[project-provisioner] Sandbox home directory: ${homeDir}`);
     const projectRoot = `${homeDir}/${parsed.repo}`;
     const cloneUrl = buildAuthenticatedCloneUrl(parsed, githubToken);
-    onProgress({ step: "Cloning from GitHub...", detail: `${parsed.owner}/${parsed.repo}` });
+    progress({ step: "Cloning from GitHub...", detail: `${parsed.owner}/${parsed.repo}` });
     const cloneOutput = await exec(
       `cd ${homeDir} && git clone ${cloneUrl} ${parsed.repo} 2>&1`
     );
@@ -3204,7 +3219,7 @@ async function provisionFromGitHub(parsed, projectName, token, onProgress, githu
     const workingBranch = `ooda/${baseBranch}`;
     await exec(`cd ${projectRoot} && git checkout -b ${workingBranch} 2>&1`);
     if (githubToken) {
-      onProgress({ step: "Setting up git credentials..." });
+      progress({ step: "Setting up git credentials..." });
       await exec(`cd ${projectRoot} && git remote set-url origin https://github.com/${parsed.owner}/${parsed.repo}.git`);
       await exec(`git config --global credential.helper store`);
       await writeRemoteFile(
@@ -3214,12 +3229,12 @@ async function provisionFromGitHub(parsed, projectName, token, onProgress, githu
       );
     }
     await exec(`cd ${projectRoot} && git config user.name "ooda" && git config user.email "dev@ooda.run"`);
-    onProgress({ step: "Detecting project..." });
+    progress({ step: "Detecting project..." });
     const project = await detectProjectRemote(projectName, token, projectRoot);
     console.log(`[project-provisioner] Detected: framework=${project.framework}, pm=${project.packageManager}`);
     const effectiveClaudeToken = claudeToken || process.env.CLAUDE_CODE_OAUTH_TOKEN;
     if (effectiveClaudeToken) {
-      await setupClaudeAuth(projectName, token, effectiveClaudeToken, onProgress);
+      await setupClaudeAuth(projectName, token, effectiveClaudeToken, progress);
     }
     const gitInfo = {
       isGitRepo: true,
@@ -3229,7 +3244,7 @@ async function provisionFromGitHub(parsed, projectName, token, onProgress, githu
       userName: "ooda",
       userEmail: "dev@ooda.run"
     };
-    await deployClaudeConfig(projectName, token, projectRoot, project.framework, onProgress, gitInfo, workingBranch);
+    await deployClaudeConfig(projectName, token, projectRoot, project.framework, progress, gitInfo, workingBranch);
     const gitWorkflowPatch = `
 ## Git Workflow
 - This project was cloned from GitHub (${parsed.owner}/${parsed.repo}).
@@ -3251,11 +3266,11 @@ async function provisionFromGitHub(parsed, projectName, token, onProgress, githu
     );
     await writeRemoteFile(`${projectRoot}/CLAUDE.md`, updatedClaudeMd);
     await writeRemoteFile(`${homeDir}/.ooda/publish.mjs`, PUBLISH_SCRIPT2);
-    await patchServerConfig(projectName, token, projectRoot, onProgress);
-    await installSourcePlugin(projectName, token, projectRoot, project.framework, onProgress);
+    await patchServerConfig(projectName, token, projectRoot, progress);
+    await installSourcePlugin(projectName, token, projectRoot, project.framework, progress);
     try {
       await deployToolsViaRest(projectName, token, projectRoot, (msg) => {
-        onProgress({ step: msg });
+        progress({ step: msg });
       });
     } catch (err) {
       console.warn("[project-provisioner] Tool deployment failed:", err instanceof Error ? err.message : String(err));
@@ -3277,21 +3292,21 @@ async function provisionFromGitHub(parsed, projectName, token, onProgress, githu
           (t) => t.mcp?.transport === "stdio"
         );
         if (hasInstallableTools) {
-          onProgress({ step: "Installing MCP tools..." });
+          progress({ step: "Installing MCP tools..." });
           await installToolsViaRest(projectName, token, projectRoot, tools, pm, (msg) => {
-            onProgress({ step: msg });
+            progress({ step: msg });
           });
         }
         if (hasMcpTools) {
           const mcpJson = serializeMcpJson(tools);
           await writeRemoteFile(`${projectRoot}/.mcp.json`, mcpJson);
-          onProgress({ step: "Wrote .mcp.json" });
+          progress({ step: "Wrote .mcp.json" });
         }
       }
     } catch (err) {
       console.warn("[project-provisioner] MCP tool setup failed:", err instanceof Error ? err.message : String(err));
     }
-    onProgress({ step: "Ready for setup", detail: projectUrl });
+    progress({ step: "Ready for setup", detail: projectUrl });
     return {
       success: true,
       projectName,
@@ -3306,6 +3321,8 @@ async function provisionFromGitHub(parsed, projectName, token, onProgress, githu
   }
 }
 async function provisionFromTemplate(projectName, templateId, token, onProgress, claudeToken, claudeEnv) {
+  const t0 = Date.now();
+  const progress = (p) => onProgress({ ...p, step: `[+${((Date.now() - t0) / 1e3).toFixed(1)}s] ${p.step}` });
   const { getProjectTemplateById: getProjectTemplateById2 } = await Promise.resolve().then(() => (init_project_templates(), project_templates_exports));
   const template = getProjectTemplateById2(templateId);
   if (!template) {
@@ -3341,20 +3358,20 @@ async function provisionFromTemplate(projectName, templateId, token, onProgress,
     }
   }
   try {
-    const projectUrl = await createOrReuseProject(projectName, token, onProgress);
-    onProgress({ step: "Uploading template files...", detail: `${template.files.length} files` });
+    const projectUrl = await createOrReuseProject(projectName, token, progress);
+    progress({ step: "Uploading template files...", detail: `${template.files.length} files` });
     for (const file of template.files) {
       await writeFile(`${projectRoot}/${file.path}`, file.content);
     }
     const effectiveClaudeToken = claudeToken || process.env.CLAUDE_CODE_OAUTH_TOKEN;
     if (effectiveClaudeToken) {
-      await setupClaudeAuth(projectName, token, effectiveClaudeToken, onProgress, claudeEnv);
+      await setupClaudeAuth(projectName, token, effectiveClaudeToken, progress, claudeEnv);
     }
-    await deployClaudeConfig(projectName, token, projectRoot, "vite", onProgress);
+    await deployClaudeConfig(projectName, token, projectRoot, "vite", progress);
     await writeFile("/home/user/.ooda/publish.mjs", PUBLISH_SCRIPT2);
     try {
       await deployToolsViaRest(projectName, token, projectRoot, (msg) => {
-        onProgress({ step: msg });
+        progress({ step: msg });
       });
     } catch {
     }
@@ -3368,26 +3385,26 @@ async function provisionFromTemplate(projectName, templateId, token, onProgress,
         (t) => t.mcp?.transport === "stdio"
       );
       if (hasInstallableTools) {
-        onProgress({ step: "Installing MCP tools..." });
+        progress({ step: "Installing MCP tools..." });
         await installToolsViaRest(projectName, token, projectRoot, tools, "npm", (msg) => {
-          onProgress({ step: msg });
+          progress({ step: msg });
         });
       }
       if (hasMcpTools) {
         const mcpJson = serializeMcpJson(tools);
         await writeFile(`${projectRoot}/.mcp.json`, mcpJson);
-        onProgress({ step: "Wrote .mcp.json" });
+        progress({ step: "Wrote .mcp.json" });
       }
     } catch (err) {
       console.warn("[project-provisioner] MCP tool setup failed:", err instanceof Error ? err.message : String(err));
     }
-    onProgress({ step: "Starting dev server..." });
+    progress({ step: "Starting dev server..." });
     await exec("pkill -f vite || true");
     await new Promise((r) => setTimeout(r, 2e3));
     exec(`cd ${projectRoot} && ${template.startCmd}`).catch(() => {
     });
     await new Promise((r) => setTimeout(r, 6e3));
-    onProgress({ step: "Done!", detail: projectUrl });
+    progress({ step: "Done!", detail: projectUrl });
     return {
       success: true,
       projectName,
@@ -4601,6 +4618,8 @@ function getActiveProject() {
   return _activeProject;
 }
 async function connectAndRunClaude(projectName, apiToken, claudeToken, projectUrl, initialPrompt, previewUrl) {
+  const t0 = Date.now();
+  const elapsed = () => `[+${((Date.now() - t0) / 1e3).toFixed(1)}s]`;
   console.log(`
   ${c.cyan}Connecting to ${c.bold}${projectName}${c.reset}${c.cyan}...${c.reset}`);
   const orgClaude = isOrgMode() ? getOrgClaudeConfig() : null;
@@ -4662,7 +4681,7 @@ async function connectAndRunClaude(projectName, apiToken, claudeToken, projectUr
     return;
   }
   const projectRoot = await findProjectRoot(projectName, apiToken);
-  console.log(`  ${c.green}${c.bold}\u2713${c.reset} Connected`);
+  console.log(`  ${c.green}${c.bold}\u2713${c.reset} Connected ${c.gray}${elapsed()}${c.reset}`);
   pushPhase("setup", "Writing config files");
   const devServerStatus = await readDevServerStatus(client);
   if (devServerStatus) {
@@ -4793,7 +4812,7 @@ with open(p, 'w') as f: json.dump(d, f)
     }
   }
   pushPhase("starting", "Launching Claude Code");
-  console.log(`  ${c.gray}Launching claude in ${projectRoot}...${c.reset}
+  console.log(`  ${c.gray}${elapsed()} Launching claude in ${projectRoot}...${c.reset}
 `);
   if (process.stdin.readable) {
     process.stdin.resume();
@@ -5058,8 +5077,8 @@ ${text}`;
 `);
       break;
     }
-    const elapsed = Date.now() - spawnedAt;
-    if (cmdAlive || elapsed >= EARLY_DROP_THRESHOLD_MS) {
+    const elapsed2 = Date.now() - spawnedAt;
+    if (cmdAlive || elapsed2 >= EARLY_DROP_THRESHOLD_MS) {
       break;
     }
     if (attempt < MAX_SPAWN_RETRIES) {
@@ -5307,7 +5326,7 @@ async function deployFromGitHubFlow(target, apiToken, claudeToken) {
 }
 
 // src/cli/index.ts
-var CLI_VERSION = "0.1.3";
+var CLI_VERSION = "0.1.5";
 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.3",
+  "version": "0.1.5",
   "description": "Launch Claude Code on cloud dev environments",
   "type": "module",
   "license": "UNLICENSED",