@hs-x/cli 0.4.9 → 0.4.11

package/dist/commands/dev.js

@@ -3246,15 +3246,24 @@ async function devInvokeRemote(args) {
         const credentials = resolveCloudflareCredentials(argv);
         const { loadCloudflarePointer } = await import('../cloudflare-pointer.js');
         const pointer = await loadCloudflarePointer(root).catch(() => undefined);
-        if (!credentials.apiToken || !pointer?.cloudflareAccountId) {
-            return fail('HSX_E_INPUT_MISSING_API_TOKEN', 'Remote invoke needs CLOUDFLARE_API_TOKEN + a deployed pointer, or pass --url.', 'Set CLOUDFLARE_API_TOKEN, or pass --url with the deployed Worker origin.');
+        const cloudflareAccountId = credentials.accountId ?? pointer?.cloudflareAccountId;
+        const { resolveStoredCloudflareOAuthAccessToken } = await import('../cloudflare-workers-logs.js');
+        const apiToken = credentials.apiToken ??
+            (cloudflareAccountId
+                ? await resolveStoredCloudflareOAuthAccessToken({ argv, cloudflareAccountId })
+                : undefined);
+        if (!apiToken || !cloudflareAccountId) {
+            return fail('HSX_E_INPUT_MISSING_API_TOKEN', 'Remote invoke needs a connected Cloudflare account + a deployed pointer, or pass --url.', 'Run `hs-x connect cloudflare` (advanced automation may set CLOUDFLARE_API_TOKEN), or pass --url with the deployed Worker origin.');
         }
         try {
             url = await resolveDeployedWorkerUrl({
                 root,
                 workerName: mapping.workerName,
-                cloudflareAccountId: pointer.cloudflareAccountId,
-                apiToken: credentials.apiToken,
+                cloudflareAccountId,
+                apiToken,
+                ...(process.env.HSX_CLOUDFLARE_API_BASE_URL
+                    ? { cloudflareApiBaseUrl: process.env.HSX_CLOUDFLARE_API_BASE_URL }
+                    : {}),
             });
         }
         catch (error) {