makefx 2.0.0 → 2.0.2

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 The 1.x packages were built from the first version of makefx.app and do not
 work with the current service.
 
+## 2.0.2 — 2026-09-26
+
+- `create --wait --json` now prints each asset's final ready or failed state instead of the queued state captured before waiting, and exits 1 with the failed asset's error when waiting ends in failure.
+- Usage and unexpected errors are now also written as JSON to stdout under `--json`, and the `upload` error for an unrecognized file extension now names the supported upload types.
+
+## 2.0.1 — 2026-09-24
+
+- Always print the login authorization URL, callback port, and an SSH tunnel command with the detected hostname so remote login can be completed from a local browser.
+
 ## 2.0.0 — 2026-09-24
 
 ### One canvas for you and your agent

package/README.md

@@ -16,6 +16,19 @@ npm install -g makefx
 makefx login
 ```
 
+Login always prints the authorization URL and callback address
+(`http://127.0.0.1:8765/callback`), then tries to open a browser. If the CLI is
+running on a remote host, keep login running and open a separate terminal on
+the computer with your browser. Start the printed SSH tunnel before opening
+the authorization URL:
+
+```bash
+ssh -N -L 8765:127.0.0.1:8765 user@remote-host
+```
+
+The CLI suggests the detected hostname; replace it with your usual SSH
+destination or alias if needed. Keep the tunnel open until login finishes.
+
 Use `--env production|stage|local` to keep separate credentials and select the
 endpoint. Production is the default. `makefx logout` revokes the grant when the
 service is reachable and always removes the stored credentials; a grant can

package/dist/makefx.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import process4 from "node:process";
+import process5 from "node:process";
 
 // src/lib/project.ts
 var SERVICE_NAME = "makefx.app";
@@ -13,7 +13,7 @@ var ENVIRONMENT_ORIGINS = {
 };
 
 // src/lib/version.ts
-var CLI_VERSION = true ? "2.0.0" : "0.0.0-dev";
+var CLI_VERSION = true ? "2.0.2" : "0.0.0-dev";
 
 // src/commands/convenience.ts
 import { randomUUID } from "node:crypto";
@@ -870,6 +870,7 @@ async function handleOpen(parsed, dependencies = defaults) {
 
 // src/commands/create.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
+import process2 from "node:process";
 
 // src/lib/json-schema.ts
 import { isDeepStrictEqual } from "node:util";
@@ -1093,7 +1094,7 @@ function validateJsonSchema(schema, input) {
 // src/commands/create.ts
 var defaults2 = {
   client: authenticatedToolClient,
-  write: (text2) => process.stdout.write(`${text2}
+  write: (text2) => process2.stdout.write(`${text2}
 `),
   id: randomUUID2
 };
@@ -1360,13 +1361,13 @@ async function handleCreate(parsed, dependencies = defaults2) {
   }
   const args = createToolArguments(prepared, entry, dependencies.id());
   const created = await client.call("create_asset", args);
-  const assets = Array.isArray(created.assets) ? created.assets : [];
+  let assets = Array.isArray(created.assets) ? created.assets : [];
   if (parsed.options.wait === "true" && !assets.some(({ renders_in }) => renders_in === "browser")) {
     const spaceId2 = prepared.spaceId;
-    const failures = await Promise.all(
+    assets = await Promise.all(
       assets.map(async (asset) => {
         const assetId = asset.asset_id;
-        if (typeof assetId !== "string") return null;
+        if (typeof assetId !== "string") return asset;
         while (true) {
           const result = await client.call("get_asset", {
             space_id: spaceId2,
@@ -1374,16 +1375,26 @@ async function handleCreate(parsed, dependencies = defaults2) {
             wait_seconds: 60
           });
           const current = result.asset;
-          if (current?.status === "ready") return null;
-          if (current?.status === "failed") {
-            const error = current.error;
-            return error?.message ?? `Asset ${assetId} failed.`;
+          if (current?.status === "ready" || current?.status === "failed") {
+            return current ? { ...asset, ...current } : asset;
           }
         }
       })
     );
-    const messages = failures.filter((message) => message !== null);
-    if (messages.length > 0) throw new Error(messages.join("\n"));
+    created.assets = assets;
+    const failed = assets.filter((asset) => asset.status === "failed");
+    if (failed.length > 0) {
+      if (parsed.options.json === "true") {
+        dependencies.write(JSON.stringify(created, null, 2));
+        process2.exitCode = 1;
+        return;
+      }
+      const messages = failed.map((asset) => {
+        const error = asset.error;
+        return error?.message ?? `Asset ${String(asset.asset_id)} failed.`;
+      });
+      throw new Error(messages.join("\n"));
+    }
   }
   if (parsed.options.json === "true") {
     dependencies.write(JSON.stringify(created, null, 2));
@@ -1397,7 +1408,8 @@ async function handleCreate(parsed, dependencies = defaults2) {
 }
 
 // src/commands/login.ts
-import process2 from "node:process";
+import process3 from "node:process";
+import { hostname } from "node:os";
 async function handleLogin(parsed) {
   const isLocal = parsed.options.local === "true";
   const env = isLocal ? "local" : parsed.options.env ?? DEFAULT_ENVIRONMENT;
@@ -1407,7 +1419,7 @@ async function handleLogin(parsed) {
   const insecure = isLocal;
   if (insecure) {
     console.log("\u26A0\uFE0F  SSL certificate verification disabled (local dev mode)");
-    process2.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
+    process3.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
   }
   console.log(`Starting login for environment "${env}" using ${baseUrl}`);
   const server = await discoverAuthorizationServer(baseUrl);
@@ -1424,12 +1436,22 @@ async function handleLogin(parsed) {
   authUrl.searchParams.set("code_challenge_method", "S256");
   authUrl.searchParams.set("state", state);
   authUrl.searchParams.set("resource", mcpResourceFor(baseUrl));
+  console.log(`
+Open this URL in your browser to authenticate:
+
+${authUrl.toString()}
+`);
+  console.log(`The OAuth callback uses ${redirectUri} (port ${redirectPort}).`);
+  const detectedHost = hostname();
+  const sshHost = /^[a-zA-Z0-9][a-zA-Z0-9.-]*$/.test(detectedHost) ? detectedHost : "YOUR_SSH_HOST";
+  console.log("If this CLI is on a remote host, run this in a separate terminal on the computer with your browser before opening the URL:");
+  console.log(`  ssh -N -L ${redirectPort}:127.0.0.1:${redirectPort} ${sshHost}`);
+  console.log("Use your usual SSH destination (user@host or SSH alias) if the detected hostname is not reachable. Keep the tunnel open until login finishes.\n");
   console.log("Opening browser for Google authentication...");
   try {
     await openBrowser(authUrl.toString());
   } catch {
-    console.warn("Unable to open browser automatically. Please copy the URL below into your browser:");
-    console.log(authUrl.toString());
+    console.warn("Unable to open browser automatically. Please open the URL above in your browser.");
   }
   const { code } = await waitForAuthorizationCode(redirectPort, state);
   console.log("Received authorization code. Exchanging for access token...");
@@ -1485,20 +1507,20 @@ async function handleLogout(parsed) {
 }
 
 // src/commands/mcp.ts
-import process3 from "node:process";
+import process4 from "node:process";
 async function handleMcp(parsed) {
   const env = parsed.options.local === "true" ? "local" : parsed.options.env ?? DEFAULT_ENVIRONMENT;
   const loginHint = `Run: ${cliCommand()} login --env ${env}`;
   const stored = await loadStoredConfig(env);
   if (!stored) {
     console.error(`Not logged in for "${env}". ${loginHint}`);
-    process3.exitCode = 1;
+    process4.exitCode = 1;
     return;
   }
   const config = await ensureFreshConfig(stored);
   if (!config) {
     console.error(`Credentials for "${env}" have expired. ${loginHint}`);
-    process3.exitCode = 1;
+    process4.exitCode = 1;
     return;
   }
   const bridge = createMcpBridge({ config });
@@ -1508,15 +1530,15 @@ async function handleMcp(parsed) {
       case "accepted":
         return;
       case "response":
-        if (outcome.text) process3.stdout.write(`${outcome.text}
+        if (outcome.text) process4.stdout.write(`${outcome.text}
 `);
         return;
       case "unauthorized":
-        if (outcome.text) process3.stdout.write(`${outcome.text}
+        if (outcome.text) process4.stdout.write(`${outcome.text}
 `);
         console.error(`Access to "${env}" was revoked or has expired. ${loginHint}`);
-        process3.exitCode = 1;
-        process3.stdin.destroy();
+        process4.exitCode = 1;
+        process4.stdin.destroy();
         return;
       case "unreachable":
         console.error(`MCP request failed: ${outcome.message}`);
@@ -1525,8 +1547,8 @@ async function handleMcp(parsed) {
   }
   let buffer = "";
   const pending = [];
-  process3.stdin.setEncoding("utf8");
-  for await (const chunk of process3.stdin) {
+  process4.stdin.setEncoding("utf8");
+  for await (const chunk of process4.stdin) {
     buffer += chunk;
     let newline = buffer.indexOf("\n");
     while (newline !== -1) {
@@ -2328,7 +2350,12 @@ function uploadMime(parsed, path2) {
   const explicit = optional5(parsed, "mime");
   if (explicit) return explicit;
   const inferred = MIME_BY_EXTENSION[extname(path2).toLowerCase()];
-  if (!inferred) throw new CliUsageError("Cannot infer media type from --file; pass --mime <type>.");
+  if (!inferred) {
+    const supported = Object.keys(MIME_BY_EXTENSION).sort().join(", ");
+    throw new CliUsageError(
+      `Cannot infer media type from --file; supported uploads are ${supported} \u2014 pass --mime <type> to override.`
+    );
+  }
   return inferred;
 }
 function declaredRecipe(parsed) {
@@ -2552,11 +2579,16 @@ function reportCommandError(error, json2, output) {
     return 1;
   }
   if (error instanceof CliUsageError) {
+    if (json2) output.stdout(`${JSON.stringify({ code: "usage", message: error.message })}
+`);
     output.stderr(`Error: ${error.message}
 `);
     return 2;
   }
-  output.stderr(`Error: ${error instanceof Error ? error.message : "Unexpected error occurred"}
+  const message = error instanceof Error ? error.message : "Unexpected error occurred";
+  if (json2) output.stdout(`${JSON.stringify({ code: "error", message })}
+`);
+  output.stderr(`Error: ${message}
 `);
   return 1;
 }
@@ -2851,7 +2883,7 @@ async function handleSpaceVisibilityCommand(command, parsed, dependencies = defa
 
 // src/index.ts
 async function main() {
-  const [, , command, ...args] = process4.argv;
+  const [, , command, ...args] = process5.argv;
   try {
     if (!command || command === "--help") {
       printHelp();
@@ -2871,9 +2903,9 @@ async function main() {
     await dispatchCommand(command, parsed);
   } catch (error) {
     const parsed = parseArgs(args);
-    process4.exitCode = reportCommandError(error, parsed.options.json === "true", {
-      stdout: (text2) => process4.stdout.write(text2),
-      stderr: (text2) => process4.stderr.write(text2)
+    process5.exitCode = reportCommandError(error, parsed.options.json === "true", {
+      stdout: (text2) => process5.stdout.write(text2),
+      stderr: (text2) => process5.stderr.write(text2)
     });
   }
 }
@@ -2958,7 +2990,7 @@ Run makefx <command> --help, makefx space help, makefx asset help, makefx audio
 }
 function helpForCommand(command) {
   const staticUsage = {
-    login: "Usage: makefx login [--env production|stage|local] [--local]",
+    login: "Usage: makefx login [--env production|stage|local] [--local]\n\nPrints the browser authorization URL and loopback callback port (8765).\nFor remote hosts, also prints an SSH tunnel command to run on your browser computer.",
     logout: "Usage: makefx logout [--env production|stage|local] [--local]",
     mcp: "Usage: makefx mcp [--env production|stage|local] [--local]",
     create: "Usage: makefx create --space ACCOUNT/SPACE --kind image|video|audio --model MODEL [--prompt TEXT] [--ref ASSET:SLOT]... [--param NAME=VALUE]... [--count 1..8] [--name TEXT] [--seed INTEGER] [--position JSON] [--tags JSON] [--note TEXT] [--from-asset ASSET] [--recipe-mode current|exact] [--request-id ID] [--wait] [--json]\nRepeated --ref values preserve left-to-right order as reference order 0, 1, and so on. Reads the live catalog for the paying Space before calling create_asset.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makefx",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Make images, video, and audio on makefx.app from your terminal or coding agent.",
   "license": "Apache-2.0",
   "type": "module",