@layr-labs/ecloud-sdk 0.1.1-dev → 0.1.2-dev

package/dist/chunk-JRFZVVUB.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/client/common/auth/keyring.ts","../src/client/common/auth/resolver.ts","../src/client/common/auth/generate.ts","../src/client/common/utils/billingapi.ts","../src/client/modules/billing/index.ts"],"sourcesContent":["/**\n * OS Keyring Integration\n *\n * Provides secure storage for private keys using native OS keychains:\n * - macOS: Keychain\n * - Linux: Secret Service API (libsecret/gnome-keyring)\n * - Windows: Credential Manager\n *\n * Uses a single key for all environments.\n */\n\nimport { AsyncEntry, findCredentials } from \"@napi-rs/keyring\";\nimport { Hex } from \"viem\";\nimport { privateKeyToAddress } from \"viem/accounts\";\n\n// ecloud keyring identifiers\nconst SERVICE_NAME = \"ecloud\";\nconst ACCOUNT_NAME = \"key\"; // Single key for all environments\n\n// eigenx-cli keyring identifiers (for legacy key detection)\nconst EIGENX_SERVICE_NAME = \"eigenx-cli\";\nconst EIGENX_DEV_SERVICE_NAME = \"eigenx-cli-dev\";\nconst EIGENX_ACCOUNT_PREFIX = \"eigenx-\"; // eigenx-cli prefixes account names\n\n// go-keyring encoding constants (used by eigenx-cli on macOS)\nconst GO_KEYRING_BASE64_PREFIX = \"go-keyring-base64:\";\nconst GO_KEYRING_ENCODED_PREFIX = \"go-keyring-encoded:\"; // legacy hex encoding\n\nexport interface StoredKey {\n  address: string;\n}\n\nexport interface LegacyKey {\n  environment: string;\n  address: string;\n  source: \"eigenx\" | \"eigenx-dev\";\n}\n\n/**\n * Store a private key in OS keyring\n *\n * Note: Stores a single key for all environments.\n * The environment parameter is kept for API compatibility but is ignored.\n */\nexport async function storePrivateKey(privateKey: string): Promise<void> {\n  // Validate private key format\n  const normalizedKey = normalizePrivateKey(privateKey);\n\n  // Validate by deriving address (will throw if invalid)\n  const isValid = validatePrivateKey(normalizedKey);\n  if (!isValid) {\n    throw new Error(\"Invalid private key format\");\n  }\n\n  // Store in single-key format\n  const entry = new AsyncEntry(SERVICE_NAME, ACCOUNT_NAME);\n  try {\n    await entry.setPassword(normalizedKey);\n  } catch (err: any) {\n    throw new Error(\n      `Failed to store key in OS keyring: ${err?.message ?? err}. Ensure keyring service is available.`,\n    );\n  }\n}\n\n/**\n * Get a private key from OS keyring\n *\n * Note: Returns the single stored key for all environments.\n * The environment parameter is kept for API compatibility but is ignored.\n */\nexport async function getPrivateKey(): Promise<Hex | null> {\n  const entry = new AsyncEntry(SERVICE_NAME, ACCOUNT_NAME);\n  try {\n    const key = await entry.getPassword();\n    if (key && validatePrivateKey(key)) {\n      return key as Hex;\n    }\n  } catch {\n    // Key not found\n  }\n\n  return null;\n}\n\n/**\n * Delete a private key from OS keyring\n * Returns true if deletion was successful, false otherwise\n *\n * Note: Deletes the single stored key.\n * The environment parameter is kept for API compatibility but is ignored.\n */\nexport async function deletePrivateKey(): Promise<boolean> {\n  const entry = new AsyncEntry(SERVICE_NAME, ACCOUNT_NAME);\n  try {\n    await entry.deletePassword();\n    return true;\n  } catch {\n    console.warn(\"No key found in keyring\");\n    return false;\n  }\n}\n\n/**\n * List all stored keys\n * Returns an array with the single stored key (if it exists)\n */\nexport async function listStoredKeys(): Promise<StoredKey[]> {\n  const keys: StoredKey[] = [];\n\n  const creds = findCredentials(SERVICE_NAME);\n  for (const cred of creds) {\n    if (cred.account === ACCOUNT_NAME) {\n      try {\n        const address = getAddressFromPrivateKey(cred.password as Hex);\n        keys.push({ address });\n      } catch (err) {\n        console.warn(`Warning: Invalid key found, skipping: ${err}`);\n      }\n    }\n  }\n\n  return keys;\n}\n\n/**\n * Check if a key exists\n *\n * Note: Checks for the single stored key.\n * The environment parameter is kept for API compatibility but is ignored.\n */\nexport async function keyExists(): Promise<boolean> {\n  const key = await getPrivateKey();\n  return key !== null;\n}\n\n/**\n * Get legacy keys from eigenx-cli\n * Returns an array of keys found in eigenx-cli keyring formats\n */\nexport async function getLegacyKeys(): Promise<LegacyKey[]> {\n  const keys: LegacyKey[] = [];\n\n  // 1. Check eigenx-cli production keys\n  try {\n    const eigenxCreds = findCredentials(EIGENX_SERVICE_NAME);\n    for (const cred of eigenxCreds) {\n      // eigenx-cli stores keys with account name \"eigenx-<environment>\"\n      // Strip the prefix to get the environment name\n      const accountName = cred.account;\n      if (!accountName.startsWith(EIGENX_ACCOUNT_PREFIX)) {\n        continue; // Skip if it doesn't have the expected prefix\n      }\n      const environment = accountName.substring(EIGENX_ACCOUNT_PREFIX.length);\n\n      try {\n        // Decode go-keyring encoding (used on macOS)\n        const decodedKey = decodeGoKeyringValue(cred.password);\n        const address = getAddressFromPrivateKey(decodedKey as Hex);\n        keys.push({ environment, address, source: \"eigenx\" });\n      } catch (err) {\n        console.warn(\n          `Warning: Invalid key found for ${environment} (eigenx-cli), skipping: ${err}`,\n        );\n      }\n    }\n  } catch {\n    // eigenx-cli service not found, that's ok\n  }\n\n  // 2. Check eigenx-cli dev keys\n  try {\n    const eigenxDevCreds = findCredentials(EIGENX_DEV_SERVICE_NAME);\n    for (const cred of eigenxDevCreds) {\n      // eigenx-cli stores keys with account name \"eigenx-<environment>\"\n      // Strip the prefix to get the environment name\n      const accountName = cred.account;\n      if (!accountName.startsWith(EIGENX_ACCOUNT_PREFIX)) {\n        continue; // Skip if it doesn't have the expected prefix\n      }\n      const environment = accountName.substring(EIGENX_ACCOUNT_PREFIX.length);\n\n      try {\n        // Decode go-keyring encoding (used on macOS)\n        const decodedKey = decodeGoKeyringValue(cred.password);\n        const address = getAddressFromPrivateKey(decodedKey as Hex);\n        keys.push({ environment, address, source: \"eigenx-dev\" });\n      } catch (err) {\n        console.warn(\n          `Warning: Invalid key found for ${environment} (eigenx-dev), skipping: ${err}`,\n        );\n      }\n    }\n  } catch {\n    // eigenx-dev service not found, that's ok\n  }\n\n  return keys;\n}\n\n/**\n * Get a specific legacy private key from eigenx-cli keyring\n */\nexport async function getLegacyPrivateKey(\n  environment: string,\n  source: \"eigenx\" | \"eigenx-dev\",\n): Promise<string | null> {\n  const serviceName = source === \"eigenx\" ? EIGENX_SERVICE_NAME : EIGENX_DEV_SERVICE_NAME;\n\n  // eigenx-cli stores keys with account name \"eigenx-<environment>\"\n  const accountName = EIGENX_ACCOUNT_PREFIX + environment;\n\n  const entry = new AsyncEntry(serviceName, accountName);\n  try {\n    const rawKey = await entry.getPassword();\n    if (rawKey) {\n      // Decode go-keyring encoding (used on macOS)\n      const decodedKey = decodeGoKeyringValue(rawKey);\n      if (validatePrivateKey(decodedKey)) {\n        return decodedKey;\n      }\n    }\n  } catch {\n    // Key not found\n  }\n\n  return null;\n}\n\n/**\n * Delete a specific legacy private key from eigenx-cli keyring\n * Returns true if deletion was successful, false otherwise\n */\nexport async function deleteLegacyPrivateKey(\n  environment: string,\n  source: \"eigenx\" | \"eigenx-dev\",\n): Promise<boolean> {\n  const serviceName = source === \"eigenx\" ? EIGENX_SERVICE_NAME : EIGENX_DEV_SERVICE_NAME;\n\n  // eigenx-cli stores keys with account name \"eigenx-<environment>\"\n  const accountName = EIGENX_ACCOUNT_PREFIX + environment;\n\n  const entry = new AsyncEntry(serviceName, accountName);\n  try {\n    await entry.deletePassword();\n    return true;\n  } catch {\n    console.warn(`No key found for ${environment} in ${source}`);\n    return false;\n  }\n}\n\n/**\n * Validate private key format\n */\nexport function validatePrivateKey(privateKey: string): boolean {\n  try {\n    getAddressFromPrivateKey(privateKey);\n    return true;\n  } catch {\n    return false;\n  }\n}\n\n/**\n * Get address from private key\n */\nexport function getAddressFromPrivateKey(privateKey: string): string {\n  const normalized = normalizePrivateKey(privateKey);\n  return privateKeyToAddress(normalized);\n}\n\n/**\n * Decode go-keyring encoded values\n *\n * go-keyring (used by eigenx-cli) stores values with special encoding on macOS:\n * - \"go-keyring-base64:\" prefix + base64-encoded value\n * - \"go-keyring-encoded:\" prefix + hex-encoded value (legacy)\n *\n * This function detects and decodes these formats.\n */\nfunction decodeGoKeyringValue(rawValue: string): string {\n  // Check for base64 encoding (primary format)\n  if (rawValue.startsWith(GO_KEYRING_BASE64_PREFIX)) {\n    const encoded = rawValue.substring(GO_KEYRING_BASE64_PREFIX.length);\n    try {\n      // Decode base64\n      const decoded = Buffer.from(encoded, \"base64\").toString(\"utf8\");\n      return decoded;\n    } catch (err) {\n      console.warn(`Warning: Failed to decode go-keyring base64 value: ${err}`);\n      return rawValue; // Return as-is if decoding fails\n    }\n  }\n\n  // Check for hex encoding (legacy format)\n  if (rawValue.startsWith(GO_KEYRING_ENCODED_PREFIX)) {\n    const encoded = rawValue.substring(GO_KEYRING_ENCODED_PREFIX.length);\n    try {\n      // Decode hex\n      const decoded = Buffer.from(encoded, \"hex\").toString(\"utf8\");\n      return decoded;\n    } catch (err) {\n      console.warn(`Warning: Failed to decode go-keyring hex value: ${err}`);\n      return rawValue; // Return as-is if decoding fails\n    }\n  }\n\n  // No encoding detected, return as-is\n  return rawValue;\n}\n\n/**\n * Normalize private key (ensure 0x prefix)\n */\nfunction normalizePrivateKey(privateKey: string): Hex {\n  if (!privateKey.startsWith(\"0x\")) {\n    return `0x${privateKey}`;\n  }\n  return privateKey as Hex;\n}\n","/**\n * Private Key Resolution\n *\n * Implements 3-tier priority system for private key retrieval:\n * 1. Command-line flag (--private-key)\n * 2. Environment variable (ECLOUD_PRIVATE_KEY)\n * 3. OS keyring (stored via `ecloud auth login`)\n */\n\nimport { Hex } from \"viem\";\nimport { getPrivateKey, validatePrivateKey } from \"./keyring\";\n\nexport interface PrivateKeySource {\n  key: Hex;\n  source: string;\n}\n\n/**\n * Get private key from any available source\n *\n * Priority order:\n * 1. Direct parameter (from --private-key flag)\n * 2. Environment variable (ECLOUD_PRIVATE_KEY)\n * 3. OS keyring (single key for all environments)\n *\n * Returns null if no key found\n */\nexport async function getPrivateKeyWithSource(options: {\n  privateKey?: string; // From flag\n}): Promise<PrivateKeySource | null> {\n  // 1. Check direct parameter (flag)\n  if (options.privateKey) {\n    if (!validatePrivateKey(options.privateKey)) {\n      throw new Error(\n        \"Invalid private key format provided via command flag. Please check and try again.\",\n      );\n    }\n    return {\n      key: options.privateKey as Hex,\n      source: \"command flag\",\n    };\n  }\n\n  // 2. Check environment variable\n  const envKey = process.env.ECLOUD_PRIVATE_KEY as Hex;\n  if (envKey) {\n    if (!validatePrivateKey(envKey)) {\n      throw new Error(\n        \"Invalid private key format provided via environment variable. Please check and try again.\",\n      );\n    }\n    return {\n      key: envKey,\n      source: \"environment variable (ECLOUD_PRIVATE_KEY)\",\n    };\n  }\n\n  // 3. Check OS keyring (single key for all environments)\n  const keyringKey = await getPrivateKey();\n  if (keyringKey) {\n    return {\n      key: keyringKey,\n      source: \"stored credentials\",\n    };\n  }\n\n  return null;\n}\n\n/**\n * Get private key with source or throw error\n */\nexport async function requirePrivateKey(options: {\n  privateKey?: string;\n}): Promise<PrivateKeySource> {\n  const result = await getPrivateKeyWithSource({\n    privateKey: options.privateKey,\n  });\n\n  if (!result) {\n    throw new Error(\n      `Private key required. Please provide it via:\\n` +\n        `  • Keyring: ecloud auth login\\n` +\n        `  • Flag: --private-key YOUR_KEY\\n` +\n        `  • Environment: export ECLOUD_PRIVATE_KEY=YOUR_KEY`,\n    );\n  }\n\n  return result;\n}\n","/**\n * Private Key Generation\n *\n * Generate new secp256k1 private keys for Ethereum\n */\n\nimport { generatePrivateKey, privateKeyToAddress } from \"viem/accounts\";\n\nexport interface GeneratedKey {\n  privateKey: string;\n  address: string;\n}\n\n/**\n * Generate a new secp256k1 private key\n */\nexport function generateNewPrivateKey(): GeneratedKey {\n  const privateKey = generatePrivateKey();\n  const address = privateKeyToAddress(privateKey);\n\n  return {\n    privateKey,\n    address,\n  };\n}\n","/**\n * BillingAPI Client to manage product subscriptions\n * Standalone client - does not depend on chain infrastructure\n */\n\nimport axios, { AxiosResponse } from \"axios\";\nimport { Hex } from \"viem\";\nimport { privateKeyToAccount } from \"viem/accounts\";\nimport { ProductID, CreateSubscriptionResponse, ProductSubscriptionResponse } from \"../types\";\nimport { calculateBillingAuthSignature } from \"./auth\";\nimport { BillingEnvironmentConfig } from \"../types\";\n\nexport class BillingApiClient {\n  private readonly account: ReturnType<typeof privateKeyToAccount>;\n  private readonly config: BillingEnvironmentConfig;\n\n  constructor(config: BillingEnvironmentConfig, privateKey: Hex) {\n    this.account = privateKeyToAccount(privateKey);\n    this.config = config;\n  }\n\n  async createSubscription(productId: ProductID = \"compute\"): Promise<CreateSubscriptionResponse> {\n    const endpoint = `${this.config.billingApiServerURL}/products/${productId}/subscription`;\n    const resp = await this.makeAuthenticatedRequest(endpoint, \"POST\", productId);\n    return resp.json();\n  }\n\n  async getSubscription(productId: ProductID = \"compute\"): Promise<ProductSubscriptionResponse> {\n    const endpoint = `${this.config.billingApiServerURL}/products/${productId}/subscription`;\n    const resp = await this.makeAuthenticatedRequest(endpoint, \"GET\", productId);\n    return resp.json();\n  }\n\n  async cancelSubscription(productId: ProductID = \"compute\"): Promise<void> {\n    const endpoint = `${this.config.billingApiServerURL}/products/${productId}/subscription`;\n    await this.makeAuthenticatedRequest(endpoint, \"DELETE\", productId);\n  }\n\n  /**\n   * Make an authenticated request to the billing API\n   */\n  private async makeAuthenticatedRequest(\n    url: string,\n    method: \"GET\" | \"POST\" | \"DELETE\",\n    productId: ProductID,\n  ): Promise<{ json: () => Promise<any>; text: () => Promise<string> }> {\n    // Calculate expiry (5 minutes from now)\n    const expiry = BigInt(Math.floor(Date.now() / 1000) + 5 * 60);\n\n    // Use EIP-712 typed data signature for billing auth\n    const { signature } = await calculateBillingAuthSignature({\n      account: this.account,\n      product: productId,\n      expiry,\n    });\n\n    // Prepare headers\n    const headers: Record<string, string> = {\n      Authorization: `Bearer ${signature}`,\n      \"X-Account\": this.account.address,\n      \"X-Expiry\": expiry.toString(),\n    };\n\n    try {\n      // Use axios to make the request\n      const response: AxiosResponse = await axios({\n        method,\n        url,\n        headers,\n        timeout: 30_000,\n        maxRedirects: 0,\n        validateStatus: () => true, // Don't throw on any status\n      });\n\n      const status = response.status;\n      const statusText = status >= 200 && status < 300 ? \"OK\" : \"Error\";\n\n      if (status < 200 || status >= 300) {\n        const body =\n          typeof response.data === \"string\" ? response.data : JSON.stringify(response.data);\n        throw new Error(`BillingAPI request failed: ${status} ${statusText} - ${body}`);\n      }\n\n      // Return Response-like object for compatibility\n      return {\n        json: async () => response.data,\n        text: async () =>\n          typeof response.data === \"string\" ? response.data : JSON.stringify(response.data),\n      };\n    } catch (error: any) {\n      // Handle network errors\n      if (\n        error.message?.includes(\"fetch failed\") ||\n        error.message?.includes(\"ECONNREFUSED\") ||\n        error.message?.includes(\"ENOTFOUND\") ||\n        error.cause\n      ) {\n        const cause = error.cause?.message || error.cause || error.message;\n        throw new Error(\n          `Failed to connect to BillingAPI at ${url}: ${cause}\\n` +\n            `Please check:\\n` +\n            `1. Your internet connection\\n` +\n            `2. The API server is accessible: ${this.config.billingApiServerURL}\\n` +\n            `3. Firewall/proxy settings`,\n        );\n      }\n      // Re-throw other errors as-is\n      throw error;\n    }\n  }\n}\n","/**\n * Main Billing namespace entry point\n */\n\nimport { BillingApiClient } from \"../../common/utils/billingapi\";\nimport { getBillingEnvironmentConfig, getBuildType } from \"../../common/config/environment\";\nimport { getLogger, isSubscriptionActive, addHexPrefix } from \"../../common/utils\";\nimport { getAddressFromPrivateKey } from \"../../common/auth\";\nimport { withSDKTelemetry } from \"../../common/telemetry/wrapper\";\n\nimport type { Address, Hex } from \"viem\";\nimport type {\n  ProductID,\n  SubscriptionOpts,\n  SubscribeResponse,\n  CancelResponse,\n  ProductSubscriptionResponse,\n} from \"../../common/types\";\n\nexport interface BillingModule {\n  address: Address;\n  subscribe: (opts?: SubscriptionOpts) => Promise<SubscribeResponse>;\n  getStatus: (opts?: SubscriptionOpts) => Promise<ProductSubscriptionResponse>;\n  cancel: (opts?: SubscriptionOpts) => Promise<CancelResponse>;\n}\n\nexport interface BillingModuleConfig {\n  verbose?: boolean;\n  privateKey: Hex;\n  skipTelemetry?: boolean; // Skip telemetry when called from CLI\n}\n\nexport function createBillingModule(config: BillingModuleConfig): BillingModule {\n  const { verbose = false, skipTelemetry = false } = config;\n  const privateKey = addHexPrefix(config.privateKey);\n  const address = getAddressFromPrivateKey(privateKey) as Address;\n\n  const logger = getLogger(verbose);\n\n  // Get billing environment configuration\n  const billingEnvConfig = getBillingEnvironmentConfig(getBuildType());\n\n  // Create billing API client\n  const billingApi = new BillingApiClient(billingEnvConfig, privateKey);\n\n  return {\n    address,\n    async subscribe(opts) {\n      return withSDKTelemetry(\n        {\n          functionName: \"subscribe\",\n          skipTelemetry: skipTelemetry, // Skip if called from CLI\n          properties: { productId: opts?.productId || \"compute\" },\n        },\n        async () => {\n          const productId: ProductID = opts?.productId || \"compute\";\n\n          // Check existing subscription status first\n          logger.debug(`Checking existing subscription for ${productId}...`);\n          const currentStatus = await billingApi.getSubscription(productId);\n\n          // If already active or trialing, don't create new checkout\n          if (isSubscriptionActive(currentStatus.subscriptionStatus)) {\n            logger.debug(`Subscription already active: ${currentStatus.subscriptionStatus}`);\n            return {\n              type: \"already_active\" as const,\n              status: currentStatus.subscriptionStatus,\n            };\n          }\n\n          // If subscription has payment issues, return portal URL instead\n          if (\n            currentStatus.subscriptionStatus === \"past_due\" ||\n            currentStatus.subscriptionStatus === \"unpaid\"\n          ) {\n            logger.debug(`Subscription has payment issue: ${currentStatus.subscriptionStatus}`);\n            return {\n              type: \"payment_issue\" as const,\n              status: currentStatus.subscriptionStatus,\n              portalUrl: currentStatus.portalUrl,\n            };\n          }\n\n          // Create new checkout session\n          logger.debug(`Creating subscription for ${productId}...`);\n          const result = await billingApi.createSubscription(productId);\n\n          logger.debug(`Checkout URL: ${result.checkoutUrl}`);\n          return {\n            type: \"checkout_created\" as const,\n            checkoutUrl: result.checkoutUrl,\n          };\n        },\n      );\n    },\n\n    async getStatus(opts) {\n      return withSDKTelemetry(\n        {\n          functionName: \"getStatus\",\n          skipTelemetry: skipTelemetry, // Skip if called from CLI\n          properties: { productId: opts?.productId || \"compute\" },\n        },\n        async () => {\n          const productId: ProductID = opts?.productId || \"compute\";\n          logger.debug(`Fetching subscription status for ${productId}...`);\n\n          const result = await billingApi.getSubscription(productId);\n\n          logger.debug(`Subscription status: ${result.subscriptionStatus}`);\n          return result;\n        },\n      );\n    },\n\n    async cancel(opts) {\n      return withSDKTelemetry(\n        {\n          functionName: \"cancel\",\n          skipTelemetry: skipTelemetry, // Skip if called from CLI\n          properties: { productId: opts?.productId || \"compute\" },\n        },\n        async () => {\n          const productId: ProductID = opts?.productId || \"compute\";\n\n          // Check existing subscription status first\n          logger.debug(`Checking subscription status for ${productId}...`);\n          const currentStatus = await billingApi.getSubscription(productId);\n\n          // If no active subscription, don't attempt to cancel\n          if (!isSubscriptionActive(currentStatus.subscriptionStatus)) {\n            logger.debug(`No active subscription to cancel: ${currentStatus.subscriptionStatus}`);\n            return {\n              type: \"no_active_subscription\" as const,\n              status: currentStatus.subscriptionStatus,\n            };\n          }\n\n          // Cancel the subscription\n          logger.debug(`Canceling subscription for ${productId}...`);\n          await billingApi.cancelSubscription(productId);\n\n          logger.debug(`Subscription canceled successfully`);\n          return {\n            type: \"canceled\" as const,\n          };\n        },\n      );\n    },\n  };\n}\n"],"mappings":"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","names":["privateKeyToAddress"]}

package/dist/{chunk-X4Y6OOUS.js → chunk-XDS4EF4J.js}

@@ -17,7 +17,7 @@ import {
   getLogger,
   stripHexPrefix,
   withSDKTelemetry
-} from "./chunk-AXSYVG7H.js";
+} from "./chunk-JLZOAV5R.js";
 
 // src/client/common/contract/eip7702.ts
 import {
@@ -2756,20 +2756,20 @@ async function prepareDeployBatch(options, logger) {
     environmentConfig
   };
 }
-async function executeDeployBatch(prepared, gas, logger) {
+async function executeDeployBatch(data, context, gas, logger) {
   const pendingMessage = "Deploying new app...";
   const txHash = await executeBatch(
     {
-      walletClient: prepared.walletClient,
-      publicClient: prepared.publicClient,
-      environmentConfig: prepared.environmentConfig,
-      executions: prepared.executions,
+      walletClient: context.walletClient,
+      publicClient: context.publicClient,
+      environmentConfig: context.environmentConfig,
+      executions: data.executions,
       pendingMessage,
       gas
     },
     logger
   );
-  return { appId: prepared.appId, txHash };
+  return { appId: data.appId, txHash };
 }
 async function deployApp(options, logger) {
   const prepared = await prepareDeployBatch(
@@ -2783,7 +2783,17 @@ async function deployApp(options, logger) {
     },
     logger
   );
-  return executeDeployBatch(prepared, options.gas, logger);
+  const data = {
+    appId: prepared.appId,
+    salt: prepared.salt,
+    executions: prepared.executions
+  };
+  const context = {
+    walletClient: prepared.walletClient,
+    publicClient: prepared.publicClient,
+    environmentConfig: prepared.environmentConfig
+  };
+  return executeDeployBatch(data, context, options.gas, logger);
 }
 async function prepareUpgradeBatch(options) {
   const {
@@ -2879,14 +2889,14 @@ async function prepareUpgradeBatch(options) {
     environmentConfig
   };
 }
-async function executeUpgradeBatch(prepared, gas, logger) {
-  const pendingMessage = `Upgrading app ${prepared.appId}...`;
+async function executeUpgradeBatch(data, context, gas, logger) {
+  const pendingMessage = `Upgrading app ${data.appId}...`;
   const txHash = await executeBatch(
     {
-      walletClient: prepared.walletClient,
-      publicClient: prepared.publicClient,
-      environmentConfig: prepared.environmentConfig,
-      executions: prepared.executions,
+      walletClient: context.walletClient,
+      publicClient: context.publicClient,
+      environmentConfig: context.environmentConfig,
+      executions: data.executions,
       pendingMessage,
       gas
     },
@@ -2904,7 +2914,16 @@ async function upgradeApp(options, logger) {
     publicLogs: options.publicLogs,
     needsPermissionChange: options.needsPermissionChange
   });
-  return executeUpgradeBatch(prepared, options.gas, logger);
+  const data = {
+    appId: prepared.appId,
+    executions: prepared.executions
+  };
+  const context = {
+    walletClient: prepared.walletClient,
+    publicClient: prepared.publicClient,
+    environmentConfig: prepared.environmentConfig
+  };
+  return executeUpgradeBatch(data, context, options.gas, logger);
 }
 async function sendAndWaitForTransaction(options, logger) {
   const {
@@ -3643,6 +3662,7 @@ async function buildDockerImage(buildContext, dockerfilePath, tag, logger) {
     tag,
     "-f",
     dockerfilePath,
+    "--load",
     "--progress=plain",
     buildContext
   ];
@@ -3766,9 +3786,9 @@ async function pullDockerImage(docker, imageTag, platform = "linux/amd64", logge
 
 // src/client/common/docker/push.ts
 import * as child_process2 from "child_process";
-import { exec as exec3 } from "child_process";
+import { execFile } from "child_process";
 import { promisify as promisify2 } from "util";
-var execAsync = promisify2(exec3);
+var execFileAsync = promisify2(execFile);
 async function pushDockerImage(docker, imageRef, logger) {
   logger?.info?.(`Pushing image ${imageRef}...`);
   return new Promise((resolve2, reject) => {
@@ -3835,7 +3855,7 @@ async function verifyImageExists(imageRef, logger) {
   let retries = 5;
   while (retries > 0) {
     try {
-      await execAsync(`docker manifest inspect ${imageRef}`, {
+      await execFileAsync("docker", ["manifest", "inspect", imageRef], {
         maxBuffer: 10 * 1024 * 1024,
         timeout: 1e4
         // 10 second timeout
@@ -4293,10 +4313,10 @@ async function setupLayeredBuildDirectory(environmentConfig, layeredDockerfileCo
 // src/client/common/registry/digest.ts
 import * as child_process3 from "child_process";
 import { promisify as promisify3 } from "util";
-var execFileAsync = promisify3(child_process3.execFile);
+var execFileAsync2 = promisify3(child_process3.execFile);
 async function getImageDigestAndName(imageRef) {
   try {
-    const { stdout } = await execFileAsync(
+    const { stdout } = await execFileAsync2(
       "docker",
       ["manifest", "inspect", imageRef],
       { maxBuffer: 10 * 1024 * 1024 }
@@ -4336,7 +4356,7 @@ function extractDigestFromMultiPlatform(manifest, imageRef) {
 }
 async function extractDigestFromSinglePlatform(manifest, imageRef) {
   try {
-    const { stdout } = await execFileAsync("docker", ["inspect", imageRef], {
+    const { stdout } = await execFileAsync2("docker", ["inspect", imageRef], {
       maxBuffer: 10 * 1024 * 1024
     });
     const inspectData = JSON.parse(stdout);
@@ -5038,23 +5058,24 @@ async function prepareDeploy(options, logger = defaultLogger) {
         environmentConfig: batch.environmentConfig,
         executions: batch.executions
       });
+      const data = {
+        appId: batch.appId,
+        salt: batch.salt,
+        executions: batch.executions
+      };
       return {
         prepared: {
-          batch,
+          data,
           appName,
-          imageRef: finalImageRef,
-          preflightCtx: {
-            privateKey: preflightCtx.privateKey,
-            rpcUrl: preflightCtx.rpcUrl,
-            environmentConfig: preflightCtx.environmentConfig
-          }
+          imageRef: finalImageRef
         },
         gasEstimate
       };
     }
   );
 }
-async function executeDeploy(prepared, gas, logger = defaultLogger, skipTelemetry) {
+async function executeDeploy(options) {
+  const { prepared, context, gas, logger = defaultLogger, skipTelemetry } = options;
   return withSDKTelemetry(
     {
       functionName: "executeDeploy",
@@ -5062,7 +5083,7 @@ async function executeDeploy(prepared, gas, logger = defaultLogger, skipTelemetr
     },
     async () => {
       logger.info("Deploying on-chain...");
-      const { appId, txHash } = await executeDeployBatch(prepared.batch, gas, logger);
+      const { appId, txHash } = await executeDeployBatch(prepared.data, context, gas, logger);
       return {
         appId,
         txHash,
@@ -5289,23 +5310,23 @@ async function prepareUpgrade(options, logger = defaultLogger) {
         environmentConfig: batch.environmentConfig,
         executions: batch.executions
       });
+      const data = {
+        appId: batch.appId,
+        executions: batch.executions
+      };
       return {
         prepared: {
-          batch,
+          data,
           appId: appID,
-          imageRef: finalImageRef,
-          preflightCtx: {
-            privateKey: preflightCtx.privateKey,
-            rpcUrl: preflightCtx.rpcUrl,
-            environmentConfig: preflightCtx.environmentConfig
-          }
+          imageRef: finalImageRef
         },
         gasEstimate
       };
     }
   );
 }
-async function executeUpgrade(prepared, gas, logger = defaultLogger, skipTelemetry) {
+async function executeUpgrade(options) {
+  const { prepared, context, gas, logger = defaultLogger, skipTelemetry } = options;
   return withSDKTelemetry(
     {
       functionName: "executeUpgrade",
@@ -5313,7 +5334,7 @@ async function executeUpgrade(prepared, gas, logger = defaultLogger, skipTelemet
     },
     async () => {
       logger.info("Upgrading on-chain...");
-      const txHash = await executeUpgradeBatch(prepared.batch, gas, logger);
+      const txHash = await executeUpgradeBatch(prepared.data, context, gas, logger);
       return {
         appId: prepared.appId,
         imageRef: prepared.imageRef,
@@ -5442,10 +5463,10 @@ import * as path6 from "path";
 import * as fs5 from "fs";
 import * as path4 from "path";
 import * as os2 from "os";
-import { exec as exec4, execFile as execFile2 } from "child_process";
+import { exec as exec3, execFile as execFile3 } from "child_process";
 import { promisify as promisify4 } from "util";
-var execAsync2 = promisify4(exec4);
-var execFileAsync2 = promisify4(execFile2);
+var execAsync = promisify4(exec3);
+var execFileAsync3 = promisify4(execFile3);
 async function fetchTemplate(repoURL, ref, targetDir, config, logger) {
   if (!repoURL) {
     throw new Error("repoURL is required");
@@ -5454,13 +5475,13 @@ async function fetchTemplate(repoURL, ref, targetDir, config, logger) {
 Cloning repo: ${repoURL} \u2192 ${targetDir}
 `);
   try {
-    await execAsync2(`git clone --no-checkout --progress ${repoURL} ${targetDir}`, {
+    await execAsync(`git clone --no-checkout --progress ${repoURL} ${targetDir}`, {
       maxBuffer: 10 * 1024 * 1024
     });
-    await execFileAsync2("git", ["-C", targetDir, "checkout", "--quiet", ref], {
+    await execFileAsync3("git", ["-C", targetDir, "checkout", "--quiet", ref], {
       maxBuffer: 10 * 1024 * 1024
     });
-    await execFileAsync2(
+    await execFileAsync3(
       "git",
       ["-C", targetDir, "submodule", "update", "--init", "--recursive", "--progress"],
       { maxBuffer: 10 * 1024 * 1024 }
@@ -5505,14 +5526,14 @@ Cloning template: ${repoURL} \u2192 extracting ${subPath}
 }
 async function cloneSparse(repoURL, ref, subPath, tempDir) {
   try {
-    await execFileAsync2("git", ["init", tempDir]);
-    await execFileAsync2("git", ["-C", tempDir, "remote", "add", "origin", repoURL]);
-    await execFileAsync2("git", ["-C", tempDir, "config", "core.sparseCheckout", "true"]);
+    await execFileAsync3("git", ["init", tempDir]);
+    await execFileAsync3("git", ["-C", tempDir, "remote", "add", "origin", repoURL]);
+    await execFileAsync3("git", ["-C", tempDir, "config", "core.sparseCheckout", "true"]);
     const sparseCheckoutPath = path4.join(tempDir, ".git/info/sparse-checkout");
     fs5.writeFileSync(sparseCheckoutPath, `${subPath}
 `);
-    await execFileAsync2("git", ["-C", tempDir, "fetch", "origin", ref]);
-    await execFileAsync2("git", ["-C", tempDir, "checkout", ref]);
+    await execFileAsync3("git", ["-C", tempDir, "fetch", "origin", ref]);
+    await execFileAsync3("git", ["-C", tempDir, "checkout", ref]);
   } catch (error) {
     throw new Error(`Failed to clone sparse repository: ${error.message}`);
   }
@@ -6005,7 +6026,14 @@ async function logs(options, logger = defaultLogger, skipTelemetry = false) {
 }
 
 // src/client/modules/compute/app/index.ts
-import { parseAbi, encodeFunctionData as encodeFunctionData3 } from "viem";
+import {
+  parseAbi,
+  encodeFunctionData as encodeFunctionData3,
+  createWalletClient as createWalletClient2,
+  createPublicClient as createPublicClient4,
+  http as http4
+} from "viem";
+import { privateKeyToAccount as privateKeyToAccount3 } from "viem/accounts";
 var CONTROLLER_ABI = parseAbi([
   "function startApp(address appId)",
   "function stopApp(address appId)",
@@ -6088,6 +6116,151 @@ function createAppModule(ctx) {
         imageRef: result.imageRef
       };
     },
+    // Granular deploy control
+    async prepareDeploy(opts) {
+      return prepareDeploy(
+        {
+          privateKey,
+          rpcUrl: ctx.rpcUrl,
+          environment: ctx.environment,
+          appName: opts.name,
+          instanceType: opts.instanceType,
+          dockerfilePath: opts.dockerfile,
+          envFilePath: opts.envFile,
+          imageRef: opts.imageRef,
+          logVisibility: opts.logVisibility,
+          resourceUsageMonitoring: opts.resourceUsageMonitoring,
+          skipTelemetry
+        },
+        logger
+      );
+    },
+    async executeDeploy(prepared, gas) {
+      const account = privateKeyToAccount3(privateKey);
+      const chain = getChainFromID(environment.chainID);
+      const publicClient = createPublicClient4({
+        chain,
+        transport: http4(ctx.rpcUrl)
+      });
+      const walletClient = createWalletClient2({
+        account,
+        chain,
+        transport: http4(ctx.rpcUrl)
+      });
+      const result = await executeDeploy({
+        prepared,
+        context: {
+          walletClient,
+          publicClient,
+          environmentConfig: environment
+        },
+        gas,
+        logger,
+        skipTelemetry
+      });
+      return {
+        appId: result.appId,
+        txHash: result.txHash,
+        appName: result.appName,
+        imageRef: result.imageRef
+      };
+    },
+    async watchDeployment(appId) {
+      return watchDeployment(
+        appId,
+        privateKey,
+        ctx.rpcUrl,
+        ctx.environment,
+        logger,
+        ctx.clientId,
+        skipTelemetry
+      );
+    },
+    // Granular upgrade control
+    async prepareUpgrade(appId, opts) {
+      return prepareUpgrade(
+        {
+          appId,
+          privateKey,
+          rpcUrl: ctx.rpcUrl,
+          environment: ctx.environment,
+          instanceType: opts.instanceType,
+          dockerfilePath: opts.dockerfile,
+          envFilePath: opts.envFile,
+          imageRef: opts.imageRef,
+          logVisibility: opts.logVisibility,
+          resourceUsageMonitoring: opts.resourceUsageMonitoring,
+          skipTelemetry
+        },
+        logger
+      );
+    },
+    async executeUpgrade(prepared, gas) {
+      const account = privateKeyToAccount3(privateKey);
+      const chain = getChainFromID(environment.chainID);
+      const publicClient = createPublicClient4({
+        chain,
+        transport: http4(ctx.rpcUrl)
+      });
+      const walletClient = createWalletClient2({
+        account,
+        chain,
+        transport: http4(ctx.rpcUrl)
+      });
+      const result = await executeUpgrade({
+        prepared,
+        context: {
+          walletClient,
+          publicClient,
+          environmentConfig: environment
+        },
+        gas,
+        logger,
+        skipTelemetry
+      });
+      return {
+        appId: result.appId,
+        txHash: result.txHash,
+        imageRef: result.imageRef
+      };
+    },
+    async watchUpgrade(appId) {
+      return watchUpgrade(
+        appId,
+        privateKey,
+        ctx.rpcUrl,
+        ctx.environment,
+        logger,
+        ctx.clientId,
+        skipTelemetry
+      );
+    },
+    // Profile management
+    async setProfile(appId, profile) {
+      return withSDKTelemetry(
+        {
+          functionName: "setProfile",
+          skipTelemetry,
+          properties: { environment: ctx.environment }
+        },
+        async () => {
+          const userApiClient = new UserApiClient(
+            environment,
+            privateKey,
+            ctx.rpcUrl,
+            ctx.clientId
+          );
+          return userApiClient.uploadAppProfile(
+            appId,
+            profile.name,
+            profile.website,
+            profile.description,
+            profile.xURL,
+            profile.imagePath
+          );
+        }
+      );
+    },
     async logs(opts) {
       return logs(
         {
@@ -6286,4 +6459,4 @@ export {
   createAppModule,
   createComputeModule
 };
-//# sourceMappingURL=chunk-X4Y6OOUS.js.map
+//# sourceMappingURL=chunk-XDS4EF4J.js.map