@comergehq/cli 0.1.5 → 0.1.7

package/dist/cli.js

@@ -2,7 +2,7 @@
 
 // src/cli.ts
 import { Command } from "commander";
-import pc9 from "picocolors";
+import pc10 from "picocolors";
 import { createRequire } from "module";
 
 // src/commands/login.ts
@@ -22,7 +22,7 @@ var CliError = class extends Error {
 
 // src/config/config.ts
 import { z } from "zod";
-var API_URL = "http://localhost:8080";
+var API_URL = "https://api.comerge.ai";
 var SUPABASE_URL = "https://xtfxwbckjpfmqubnsusu.supabase.co";
 var SUPABASE_ANON_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Inh0Znh3YmNranBmbXF1Ym5zdXN1Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NjA2MDEyMzAsImV4cCI6MjA3NjE3NzIzMH0.dzWGAWrK4CvrmHVHzf8w7JlUZohdap0ZPnLZnABMV8s";
 function isValidUrl(value) {
@@ -438,9 +438,9 @@ function createApiClient(config, opts) {
   const cfg = config;
   const apiKey = (opts?.apiKey ?? "").trim();
   const CLIENT_KEY_HEADER = "x-comerge-api-key";
-  async function request(path12, init) {
+  async function request(path13, init) {
     const { token, session, fromEnv } = await getAuthToken(cfg);
-    const url = new URL(path12, cfg.apiUrl).toString();
+    const url = new URL(path13, cfg.apiUrl).toString();
     const doFetch = async (bearer) => {
       const res2 = await fetch(url, {
         ...init,
@@ -484,7 +484,13 @@ function createApiClient(config, opts) {
     }),
     getApp: (appId) => request(`/v1/apps/${encodeURIComponent(appId)}`, { method: "GET" }),
     presignImportUpload: (payload) => request("/v1/apps/import/upload/presign", { method: "POST", body: JSON.stringify(payload) }),
-    importFromUpload: (payload) => request("/v1/apps/import/upload", { method: "POST", body: JSON.stringify(payload) })
+    importFromUpload: (payload) => request("/v1/apps/import/upload", { method: "POST", body: JSON.stringify(payload) }),
+    initiateBundle: (appId, payload) => request(`/v1/apps/${encodeURIComponent(appId)}/bundles`, { method: "POST", body: JSON.stringify(payload) }),
+    getBundle: (appId, bundleId) => request(`/v1/apps/${encodeURIComponent(appId)}/bundles/${encodeURIComponent(bundleId)}`, { method: "GET" }),
+    getBundleDownloadUrl: (appId, bundleId, options) => request(
+      `/v1/apps/${encodeURIComponent(appId)}/bundles/${encodeURIComponent(bundleId)}/download?redirect=${options?.redirect ?? false}`,
+      { method: "GET" }
+    )
   };
 }
 
@@ -584,11 +590,11 @@ function registerWhoamiCommand(program) {
 }
 
 // src/commands/init.ts
-import pc8 from "picocolors";
+import pc9 from "picocolors";
 
 // src/services/initLocal.ts
 import os5 from "os";
-import pc7 from "picocolors";
+import pc8 from "picocolors";
 import prompts from "prompts";
 
 // src/services/ensureAuth.ts
@@ -1057,9 +1063,9 @@ async function importLocal(params) {
 }
 
 // src/commands/shellInit.ts
-import path9 from "path";
+import path10 from "path";
 import os3 from "os";
-import pc6 from "picocolors";
+import pc7 from "picocolors";
 import fse4 from "fs-extra";
 
 // src/utils/packageJson.ts
@@ -1148,16 +1154,25 @@ import { ComergeStudio } from '@comergehq/studio';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import config from '../comerge.config.json';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import embeddedMeta from '../assets/comerge/base.meta.json';
 
 export default function Index() {
   const appId = String((config as any)?.appId || '');
   const appKey = String((config as any)?.appKey || 'MicroMain');
-  const apiKey = String((config as any)?.apiKey || '');
+  const clientKey = String((config as any)?.clientKey || '');
+  const embeddedBaseBundles = {
+    ios: { module: require('../assets/comerge/base.ios.jsbundle'), meta: (embeddedMeta as any)?.ios },
+    android: { module: require('../assets/comerge/base.android.jsbundle'), meta: (embeddedMeta as any)?.android },
+  };
   return (
     <>
       <Stack.Screen options={{ headerShown: false }} />
       <View style={{ flex: 1 }}>
-        {appId ? <ComergeStudio appId={appId} apiKey={apiKey} appKey={appKey} /> : null}
+        {appId ? (
+          <ComergeStudio appId={appId} clientKey={clientKey} appKey={appKey} embeddedBaseBundles={embeddedBaseBundles} />
+        ) : null}
       </View>
     </>
   );
@@ -1178,6 +1193,12 @@ function shellMetroConfigJs() {
   return `const { getDefaultConfig } = require('expo/metro-config');
 
 const config = getDefaultConfig(__dirname);
+const resolver = config.resolver || {};
+const assetExts = resolver.assetExts || [];
+if (!assetExts.includes('jsbundle')) {
+  resolver.assetExts = [...assetExts, 'jsbundle'];
+}
+config.resolver = resolver;
 
 module.exports = config;
 `;
@@ -1276,7 +1297,7 @@ async function stripProject(params) {
 }
 
 // src/commands/shellInit.ts
-import fs11 from "fs/promises";
+import fs12 from "fs/promises";
 
 // src/utils/appJsonPatch.ts
 import fs9 from "fs/promises";
@@ -1420,6 +1441,145 @@ function findMatchingBracket(text, openIdx, open, close) {
   return -1;
 }
 
+// src/services/bundles.ts
+import fs11 from "fs";
+import fsPromises from "fs/promises";
+import path9 from "path";
+import { Readable } from "stream";
+import { pipeline } from "stream/promises";
+import pc6 from "picocolors";
+function sleep2(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+function isRetryableNetworkError(e) {
+  const err = e;
+  const code = typeof err?.code === "string" ? err.code : "";
+  const message = typeof err?.message === "string" ? err.message : "";
+  if (code === "ERR_NETWORK" || code === "ECONNABORTED" || code === "ETIMEDOUT") return true;
+  if (message.toLowerCase().includes("network error")) return true;
+  if (message.toLowerCase().includes("timeout")) return true;
+  return false;
+}
+async function withRetry(fn, opts) {
+  let lastErr = null;
+  for (let attempt = 1; attempt <= opts.attempts; attempt += 1) {
+    try {
+      return await fn();
+    } catch (e) {
+      lastErr = e;
+      const retryable = isRetryableNetworkError(e);
+      if (!retryable || attempt >= opts.attempts) {
+        throw e;
+      }
+      const exp = Math.min(opts.maxDelayMs, opts.baseDelayMs * Math.pow(2, attempt - 1));
+      const jitter = Math.floor(Math.random() * 250);
+      await sleep2(exp + jitter);
+    }
+  }
+  throw lastErr;
+}
+function unwrapResponseObject(resp, label) {
+  const obj = resp?.responseObject;
+  if (obj === void 0 || obj === null) {
+    const message = typeof resp?.message === "string" && resp.message.trim().length > 0 ? resp.message : `Missing ${label} response`;
+    throw new CliError(message, { exitCode: 1, hint: resp ? JSON.stringify(resp, null, 2) : null });
+  }
+  return obj;
+}
+async function pollBundle(api, appId, bundleId, opts) {
+  const start = Date.now();
+  while (true) {
+    try {
+      const bundleResp = await api.getBundle(appId, bundleId);
+      const bundle = unwrapResponseObject(bundleResp, "bundle");
+      if (bundle.status === "succeeded" || bundle.status === "failed") return bundle;
+    } catch (e) {
+      if (!isRetryableNetworkError(e)) {
+        throw e;
+      }
+    }
+    if (Date.now() - start > opts.timeoutMs) {
+      throw new Error("Bundle build timed out.");
+    }
+    await sleep2(opts.intervalMs);
+  }
+}
+async function downloadToFile(url, targetPath) {
+  const dir = path9.dirname(targetPath);
+  await fsPromises.mkdir(dir, { recursive: true });
+  const tmpPath = `${targetPath}.tmp-${Date.now()}`;
+  await withRetry(
+    async () => {
+      const res = await fetch(url);
+      if (!res.ok) {
+        throw new Error(`Download failed (status ${res.status})`);
+      }
+      if (!res.body) {
+        throw new Error("Download response has no body.");
+      }
+      const body = Readable.fromWeb(res.body);
+      const out = fs11.createWriteStream(tmpPath);
+      await pipeline(body, out);
+    },
+    { attempts: 3, baseDelayMs: 500, maxDelayMs: 4e3 }
+  );
+  const stat = await fsPromises.stat(tmpPath);
+  if (!stat.size || stat.size <= 0) {
+    await fsPromises.unlink(tmpPath).catch(() => {
+    });
+    throw new Error("Downloaded bundle is empty.");
+  }
+  await fsPromises.rename(tmpPath, targetPath);
+}
+async function downloadBundle(api, appId, platform, targetPath) {
+  const initiateResp = await api.initiateBundle(appId, {
+    platform,
+    idempotencyKey: `${appId}:head:${platform}`
+  });
+  const initiate = unwrapResponseObject(initiateResp, "bundle initiate");
+  const finalBundle = initiate.status === "succeeded" || initiate.status === "failed" ? initiate : await pollBundle(api, appId, initiate.id, { timeoutMs: 3 * 60 * 1e3, intervalMs: 1200 });
+  if (finalBundle.status === "failed") {
+    throw new Error("Bundle build failed.");
+  }
+  const signedResp = await api.getBundleDownloadUrl(appId, finalBundle.id, { redirect: false });
+  const signed = unwrapResponseObject(signedResp, "bundle download url");
+  const url = String(signed.url || "").trim();
+  if (!url) throw new Error("Download URL is missing.");
+  await downloadToFile(url, targetPath);
+  const fingerprint = finalBundle.checksumSha256 ?? `id:${finalBundle.id}`;
+  const meta = {
+    fingerprint,
+    bundleId: finalBundle.id,
+    checksumSha256: finalBundle.checksumSha256 ?? null,
+    size: finalBundle.size ?? null,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  return { platform, bundlePath: targetPath, meta };
+}
+async function downloadEmbeddedBundles(params) {
+  const log = params.log ?? (() => {
+  });
+  const baseDir = path9.join(params.outRoot, "assets", "comerge");
+  const iosPath = path9.join(baseDir, "base.ios.jsbundle");
+  const androidPath = path9.join(baseDir, "base.android.jsbundle");
+  log(pc6.dim("Downloading base bundles for shell..."));
+  const results = await Promise.allSettled([
+    downloadBundle(params.api, params.appId, "ios", iosPath),
+    downloadBundle(params.api, params.appId, "android", androidPath)
+  ]);
+  const meta = {};
+  for (const res of results) {
+    if (res.status === "fulfilled") {
+      meta[res.value.platform] = res.value.meta;
+    } else {
+      log(pc6.yellow(`Warning: failed to download ${res.reason?.message ?? res.reason}`));
+    }
+  }
+  await fsPromises.mkdir(baseDir, { recursive: true });
+  await fsPromises.writeFile(path9.join(baseDir, "base.meta.json"), JSON.stringify(meta, null, 2) + "\n", "utf8");
+  return meta;
+}
+
 // src/commands/shellInit.ts
 async function shellInit(params) {
   const projectRoot = await findExpoProjectRoot(process.cwd());
@@ -1442,17 +1602,17 @@ async function shellInit(params) {
       exitCode: 2
     });
   }
-  const requestedOutputPath = path9.resolve(projectRoot, outDir);
+  const requestedOutputPath = path10.resolve(projectRoot, outDir);
   const outputPath = await findAvailableDirPath(requestedOutputPath);
-  console.log(pc6.dim(`Project: ${projectRoot}`));
+  console.log(pc7.dim(`Project: ${projectRoot}`));
   if (outputPath !== requestedOutputPath) {
-    console.log(pc6.dim(`Output:  ${requestedOutputPath} (already exists)`));
-    console.log(pc6.dim(`Using:   ${outputPath}`));
+    console.log(pc7.dim(`Output:  ${requestedOutputPath} (already exists)`));
+    console.log(pc7.dim(`Using:   ${outputPath}`));
   } else {
-    console.log(pc6.dim(`Output:  ${outputPath}`));
+    console.log(pc7.dim(`Output:  ${outputPath}`));
   }
-  const outputIsInsideProject = outputPath === projectRoot || outputPath.startsWith(projectRoot + path9.sep);
-  const stagingPath = outputIsInsideProject ? await fs11.mkdtemp(path9.join(os3.tmpdir(), "comerge-shell-")) : outputPath;
+  const outputIsInsideProject = outputPath === projectRoot || outputPath.startsWith(projectRoot + path10.sep);
+  const stagingPath = outputIsInsideProject ? await fs12.mkdtemp(path10.join(os3.tmpdir(), "comerge-shell-")) : outputPath;
   let movedToFinal = false;
   try {
     if (!outputIsInsideProject) {
@@ -1461,28 +1621,40 @@ async function shellInit(params) {
     await copyProject({ projectRoot, outRoot: stagingPath });
     await stripProject({ outRoot: stagingPath });
     try {
-      const didPatch = await ensureComergeShellPlugins(path9.join(stagingPath, "app.json"));
+      const didPatch = await ensureComergeShellPlugins(path10.join(stagingPath, "app.json"));
       if (didPatch) {
-        console.log(pc6.dim("Updated app.json with required Comerge shell plugins."));
+        console.log(pc7.dim("Updated app.json with required Comerge shell plugins."));
       }
     } catch {
     }
-    await writeJsonAtomic(path9.join(stagingPath, "comerge.config.json"), {
+    await writeJsonAtomic(path10.join(stagingPath, "comerge.config.json"), {
       appId,
       appKey: appKey || "MicroMain",
-      apiKey
+      clientKey: apiKey
     });
-    await writeTextAtomic(path9.join(stagingPath, "app/_layout.tsx"), shellLayoutTsx());
-    await writeTextAtomic(path9.join(stagingPath, "app/index.tsx"), shellIndexTsx());
-    await ensureTextFile(path9.join(stagingPath, "babel.config.js"), shellBabelConfigJs());
-    await ensureTextFile(path9.join(stagingPath, "metro.config.js"), shellMetroConfigJs());
     try {
-      const didPatch = await ensureReanimatedBabelPlugin(path9.join(stagingPath, "babel.config.js"));
-      if (didPatch) console.log(pc6.dim("Updated babel.config.js to include react-native-reanimated/plugin."));
+      const cfg = await resolveConfig({ yes: true });
+      const api = createApiClient(cfg, { apiKey });
+      await downloadEmbeddedBundles({
+        api,
+        appId,
+        outRoot: stagingPath,
+        log: (msg) => console.log(msg)
+      });
+    } catch (e) {
+      console.log(pc7.yellow(`Warning: failed to embed base bundles: ${e instanceof Error ? e.message : String(e)}`));
+    }
+    await writeTextAtomic(path10.join(stagingPath, "app/_layout.tsx"), shellLayoutTsx());
+    await writeTextAtomic(path10.join(stagingPath, "app/index.tsx"), shellIndexTsx());
+    await ensureTextFile(path10.join(stagingPath, "babel.config.js"), shellBabelConfigJs());
+    await ensureTextFile(path10.join(stagingPath, "metro.config.js"), shellMetroConfigJs());
+    try {
+      const didPatch = await ensureReanimatedBabelPlugin(path10.join(stagingPath, "babel.config.js"));
+      if (didPatch) console.log(pc7.dim("Updated babel.config.js to include react-native-reanimated/plugin."));
     } catch {
     }
     await ensureTextFile(
-      path9.join(stagingPath, "tsconfig.json"),
+      path10.join(stagingPath, "tsconfig.json"),
       JSON.stringify(
         {
           extends: "expo/tsconfig.base",
@@ -1496,9 +1668,9 @@ async function shellInit(params) {
     const { pkg: shellPkg, warnings, info } = buildShellPackageJson({
       original: originalPkg
     });
-    await writeJsonAtomic(path9.join(stagingPath, "package.json"), shellPkg);
-    for (const w of warnings) console.log(pc6.yellow(`Warning: ${w}`));
-    for (const i of info) console.log(pc6.dim(`Info: ${i}`));
+    await writeJsonAtomic(path10.join(stagingPath, "package.json"), shellPkg);
+    for (const w of warnings) console.log(pc7.yellow(`Warning: ${w}`));
+    for (const i of info) console.log(pc7.dim(`Info: ${i}`));
     if (outputIsInsideProject) {
       await fse4.move(stagingPath, outputPath, { overwrite: false });
       movedToFinal = true;
@@ -1506,18 +1678,18 @@ async function shellInit(params) {
     const finalPath = outputIsInsideProject ? outputPath : stagingPath;
     const pm = params.packageManager ?? await detectPackageManager(projectRoot);
     const { cmd, args } = installCommand(pm);
-    console.log(pc6.dim(`Installing dependencies with ${cmd}...`));
+    console.log(pc7.dim(`Installing dependencies with ${cmd}...`));
     const res = await execa3(cmd, args, { cwd: finalPath, stdio: "inherit" });
     if (res.exitCode !== 0) {
       throw new CliError("Dependency installation failed.", { exitCode: res.exitCode ?? 1 });
     }
-    console.log(pc6.dim("Running Expo prebuild..."));
+    console.log(pc7.dim("Running Expo prebuild..."));
     const prebuild = await execa3("npx", ["expo", "prebuild"], { cwd: finalPath, stdio: "inherit" });
     if (prebuild.exitCode !== 0) {
       throw new CliError("Expo prebuild failed.", { exitCode: prebuild.exitCode ?? 1 });
     }
-    console.log(pc6.green("Comerge has been installed successfully."));
-    console.log(pc6.dim("You can now open the app from the My apps page in the Comerge app."));
+    console.log(pc7.green("Comerge has been installed successfully."));
+    console.log(pc7.dim("You can now open the app from the My apps page in the Comerge app."));
   } finally {
     if (outputIsInsideProject && !movedToFinal) {
       try {
@@ -1529,7 +1701,7 @@ async function shellInit(params) {
 }
 async function ensureTextFile(filePath, contents) {
   try {
-    await fs11.access(filePath);
+    await fs12.access(filePath);
     return;
   } catch {
   }
@@ -1537,8 +1709,8 @@ async function ensureTextFile(filePath, contents) {
 }
 
 // src/utils/appDefaults.ts
-import fs12 from "fs/promises";
-import path10 from "path";
+import fs13 from "fs/promises";
+import path11 from "path";
 import fg2 from "fast-glob";
 import { execa as execa4 } from "execa";
 function normalizeString(value) {
@@ -1571,8 +1743,8 @@ async function loadExpoConfig(projectRoot) {
     return parsed;
   } catch {
   }
-  const appJsonPath = path10.join(projectRoot, "app.json");
-  const rawAppJson = await fs12.readFile(appJsonPath, "utf8").catch(() => null);
+  const appJsonPath = path11.join(projectRoot, "app.json");
+  const rawAppJson = await fs13.readFile(appJsonPath, "utf8").catch(() => null);
   if (!rawAppJson) return {};
   try {
     const parsed = JSON.parse(rawAppJson);
@@ -1590,7 +1762,7 @@ async function findIosBundleId(projectRoot) {
     suppressErrors: true
   });
   for (const file of pbxprojMatches) {
-    const raw = await fs12.readFile(file, "utf8").catch(() => null);
+    const raw = await fs13.readFile(file, "utf8").catch(() => null);
     if (!raw) continue;
     const match = raw.match(/PRODUCT_BUNDLE_IDENTIFIER\s*=\s*([A-Za-z0-9.\-]+)\s*;/);
     if (match && match[1]) return match[1];
@@ -1601,7 +1773,7 @@ async function findIosBundleId(projectRoot) {
     suppressErrors: true
   });
   for (const file of plistMatches) {
-    const raw = await fs12.readFile(file, "utf8").catch(() => null);
+    const raw = await fs13.readFile(file, "utf8").catch(() => null);
     if (!raw) continue;
     const match = raw.match(/<key>CFBundleIdentifier<\/key>\s*<string>([^<]+)<\/string>/);
     if (match && match[1] && !match[1].includes("$")) return match[1];
@@ -1611,8 +1783,8 @@ async function findIosBundleId(projectRoot) {
 async function findAndroidPackageName(projectRoot) {
   const gradlePaths = ["android/app/build.gradle", "android/app/build.gradle.kts"];
   for (const rel of gradlePaths) {
-    const file = path10.join(projectRoot, rel);
-    const raw = await fs12.readFile(file, "utf8").catch(() => null);
+    const file = path11.join(projectRoot, rel);
+    const raw = await fs13.readFile(file, "utf8").catch(() => null);
     if (!raw) continue;
     const match = raw.match(/applicationId\s+["']([^"']+)["']/) || raw.match(/applicationId\s*=\s*["']([^"']+)["']/);
     if (match && match[1]) return match[1];
@@ -1623,7 +1795,7 @@ async function findAndroidPackageName(projectRoot) {
     suppressErrors: true
   });
   for (const file of manifestMatches) {
-    const raw = await fs12.readFile(file, "utf8").catch(() => null);
+    const raw = await fs13.readFile(file, "utf8").catch(() => null);
     if (!raw) continue;
     const match = raw.match(/<manifest[^>]*\spackage="([^"]+)"/);
     if (match && match[1] && !match[1].includes("$")) return match[1];
@@ -1643,9 +1815,9 @@ async function inferExpoAppDefaults(projectRoot) {
     fallbackName = normalizeString(pkg?.name ?? null);
   }
   if (!fallbackName) {
-    fallbackName = normalizeString(path10.basename(projectRoot));
+    fallbackName = normalizeString(path11.basename(projectRoot));
   }
-  const resolvedSlug = slug ?? normalizeSlug(fallbackName ?? null) ?? normalizeSlug(path10.basename(projectRoot));
+  const resolvedSlug = slug ?? normalizeSlug(fallbackName ?? null) ?? normalizeSlug(path11.basename(projectRoot));
   const suggestedBundleId = suggestBundleId(resolvedSlug);
   const nativeIosBundleId = iosBundleId ?? await findIosBundleId(projectRoot);
   const nativeAndroidPackage = androidPackageName ?? await findAndroidPackageName(projectRoot);
@@ -1661,27 +1833,27 @@ async function inferExpoAppDefaults(projectRoot) {
 }
 
 // src/services/apiKeyStore.ts
-import fs13 from "fs/promises";
+import fs14 from "fs/promises";
 import os4 from "os";
-import path11 from "path";
+import path12 from "path";
 var KEYTAR_SERVICE2 = "comerge-cli-api-keys";
 function xdgConfigHome2() {
   const v = process.env.XDG_CONFIG_HOME;
   if (typeof v === "string" && v.trim().length > 0) return v;
-  return path11.join(os4.homedir(), ".config");
+  return path12.join(os4.homedir(), ".config");
 }
 function apiKeyFilePath() {
-  return path11.join(xdgConfigHome2(), "comerge", "api-keys.json");
+  return path12.join(xdgConfigHome2(), "comerge", "api-keys.json");
 }
 async function ensurePathPermissions2(filePath) {
-  const dir = path11.dirname(filePath);
-  await fs13.mkdir(dir, { recursive: true });
+  const dir = path12.dirname(filePath);
+  await fs14.mkdir(dir, { recursive: true });
   try {
-    await fs13.chmod(dir, 448);
+    await fs14.chmod(dir, 448);
   } catch {
   }
   try {
-    await fs13.chmod(filePath, 384);
+    await fs14.chmod(filePath, 384);
   } catch {
   }
 }
@@ -1704,7 +1876,7 @@ function keyId(orgId, clientAppId) {
 }
 async function readKeyFile() {
   const fp = apiKeyFilePath();
-  const raw = await fs13.readFile(fp, "utf8").catch(() => null);
+  const raw = await fs14.readFile(fp, "utf8").catch(() => null);
   if (!raw) return {};
   try {
     const parsed = JSON.parse(raw);
@@ -1744,7 +1916,7 @@ async function setStoredApiKey(orgId, clientAppId, apiKey) {
 }
 
 // src/services/initLocal.ts
-function unwrapResponseObject(resp, label) {
+function unwrapResponseObject2(resp, label) {
   const obj = resp?.responseObject;
   if (obj === void 0 || obj === null) {
     const message = typeof resp?.message === "string" && resp.message.trim().length > 0 ? resp.message : `Missing ${label} response`;
@@ -1788,7 +1960,7 @@ async function selectClientApp(apps, yes) {
       return { app: null };
     }
     console.log(
-      pc7.dim(
+      pc8.dim(
         "No apps found. Create one here or in the Comerge dashboard at dashboard.comerge.ai."
       )
     );
@@ -1914,9 +2086,9 @@ async function initLocal(params) {
     await api.autoEnableDeveloper();
   } catch {
   }
-  const orgs = unwrapResponseObject(await api.listOrganizations(), "organizations");
+  const orgs = unwrapResponseObject2(await api.listOrganizations(), "organizations");
   const selectedOrg = await selectOrganization(orgs, params.yes);
-  const apps = unwrapResponseObject(
+  const apps = unwrapResponseObject2(
     await api.listClientApps({ orgId: selectedOrg.id }),
     "client apps"
   );
@@ -1935,7 +2107,7 @@ async function initLocal(params) {
       iosBundleId: details.iosEnabled ? details.iosBundleId ?? void 0 : void 0,
       androidPackageName: details.androidEnabled ? details.androidPackageName ?? void 0 : void 0
     });
-    clientApp = unwrapResponseObject(createdResp, "client app");
+    clientApp = unwrapResponseObject2(createdResp, "client app");
     importAppName = details.name;
   }
   const clientAppId = String(clientApp.id || "").trim();
@@ -1944,17 +2116,17 @@ async function initLocal(params) {
   }
   let apiKey = await getStoredApiKey(selectedOrg.id, clientAppId);
   if (!apiKey) {
-    const me = unwrapResponseObject(await api.getMe(), "user");
+    const me = unwrapResponseObject2(await api.getMe(), "user");
     const keyName = buildKeyName({ email: me.email ?? null, id: me.id ?? null });
     const createdKeyResp = await api.createClientAppKey(clientAppId, { name: keyName });
-    const keyPayload = unwrapResponseObject(createdKeyResp, "client key");
+    const keyPayload = unwrapResponseObject2(createdKeyResp, "client key");
     apiKey = String(keyPayload.key || "").trim();
     if (!apiKey) {
       throw new CliError("Server did not return a client key.", { exitCode: 1 });
     }
     await setStoredApiKey(selectedOrg.id, clientAppId, apiKey);
   }
-  if (!params.json) console.log(pc7.dim("Importing project..."));
+  if (!params.json) console.log(pc8.dim("Importing project..."));
   const imported = await importLocal({
     apiKey,
     yes: params.yes,
@@ -1964,7 +2136,7 @@ async function initLocal(params) {
     includeDotenv: params.includeDotenv,
     dryRun: false
   });
-  if (!params.json) console.log(pc7.dim("Generating shell app..."));
+  if (!params.json) console.log(pc8.dim("Generating shell app..."));
   await shellInit({
     outDir: params.outDir,
     appId: imported.appId,
@@ -1999,8 +2171,8 @@ function registerInitCommands(program) {
       console.log(JSON.stringify(res, null, 2));
       return;
     }
-    console.log(pc8.green(`Completed. appId=${res.appId}`));
-    if (res.status) console.log(pc8.dim(`Status: ${res.status}`));
+    console.log(pc9.green(`Completed. appId=${res.appId}`));
+    if (res.status) console.log(pc9.dim(`Status: ${res.status}`));
   });
 }
 
@@ -2015,19 +2187,19 @@ async function main(argv) {
   registerLogoutCommand(program);
   registerInitCommands(program);
   program.configureOutput({
-    outputError: (str, write) => write(pc9.red(str))
+    outputError: (str, write) => write(pc10.red(str))
   });
   try {
     await program.parseAsync(argv);
   } catch (err) {
     const e = err;
     if (e instanceof CliError) {
-      console.error(pc9.red(`Error: ${e.message}`));
-      if (e.hint) console.error(pc9.dim(e.hint));
+      console.error(pc10.red(`Error: ${e.message}`));
+      if (e.hint) console.error(pc10.dim(e.hint));
       process.exitCode = e.exitCode;
       return;
     }
-    console.error(pc9.red(`Unexpected error: ${e?.message ?? String(e)}`));
+    console.error(pc10.red(`Unexpected error: ${e?.message ?? String(e)}`));
     process.exitCode = 1;
   }
 }