@usefillo/cli 0.14.0 → 0.14.1

package/dist/index.js

@@ -91,7 +91,9 @@ function die(msg) {
 }
 
 // src/lib/api.ts
-var API = (process.env.FILLO_API ?? "https://fillo.so").replace(/\/$/, "");
+var DEFAULT_API = "https://fillo.so";
+var apiOverride = process.env.FILLO_API?.trim();
+var API = (apiOverride || DEFAULT_API).replace(/\/$/, "");
 var REQUEST_TIMEOUT_MS = 3e4;
 var SYNC_TOKEN_ENV = "FILLO_SYNC_TOKEN";
 function requireTokenFor(apiBase) {
@@ -113,24 +115,51 @@ function requireTokenFor(apiBase) {
 function requireToken() {
   return requireTokenFor(API);
 }
+function networkFailure(apiBase, error) {
+  const timedOut = error instanceof Error && (error.name === "TimeoutError" || error.name === "AbortError");
+  const reason = causeCode(error) ?? (timedOut ? `no response within ${REQUEST_TIMEOUT_MS / 1e3}s` : void 0);
+  const hint = apiBase === DEFAULT_API ? "Check your network connection and try again." : `The CLI is pointed there by FILLO_API or --api \u2014 unset the override to use ${DEFAULT_API}, or start that deployment.`;
+  return new Error(
+    `Couldn't reach ${terminalText(apiBase)}${reason ? ` (${reason})` : ""}. ${hint}`,
+    {
+      cause: error
+    }
+  );
+}
+function causeCode(error, depth = 0) {
+  if (!error || typeof error !== "object" || depth > 8) return void 0;
+  const { code, errors, cause } = error;
+  if (typeof code === "string" && code) return code;
+  if (Array.isArray(errors)) {
+    for (const nested of errors) {
+      const found = causeCode(nested, depth + 1);
+      if (found) return found;
+    }
+  }
+  return causeCode(cause, depth + 1);
+}
 async function api(path, init2 = {}, apiBase = API) {
   const { token, ...rest } = init2;
-  return fetch(`${apiBase}/api/v1${path}`, {
-    ...rest,
-    signal: rest.signal ?? AbortSignal.timeout(REQUEST_TIMEOUT_MS),
-    headers: {
-      "Content-Type": "application/json",
-      ...token ? { Authorization: `Bearer ${token}` } : {},
-      ...rest.headers
-    }
-  });
+  try {
+    return await fetch(`${apiBase}/api/v1${path}`, {
+      ...rest,
+      signal: rest.signal ?? AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+      headers: {
+        "Content-Type": "application/json",
+        ...token ? { Authorization: `Bearer ${token}` } : {},
+        ...rest.headers
+      }
+    });
+  } catch (error) {
+    throw networkFailure(apiBase, error);
+  }
 }
-async function readJson(res) {
+async function readJson(res, apiBase = API) {
   const text = await res.text();
   try {
     return text ? JSON.parse(text) : {};
   } catch {
-    die(`Unexpected non-JSON response from ${API} (${res.status}).`);
+    die(`Unexpected non-JSON response from ${apiBase} (${res.status}).`);
   }
 }
 
@@ -722,7 +751,7 @@ function readSecret(promptText) {
 // src/commands/init.ts
 var EMAIL_REQUIRED = 'Usage: fillo init --email you@company.com [--name "Your Name"] (or run `fillo login` for an existing account).';
 var execFileAsync = promisify(execFile);
-async function provisionWorkspace(flags, usageHint) {
+async function provisionWorkspace(flags, usageHint, apiBase = API) {
   const json = jsonMode(flags);
   let email3 = flagString(flags, "email")?.trim() ?? "";
   let name = flagString(flags, "name")?.trim() ?? "";
@@ -752,11 +781,15 @@ async function provisionWorkspace(flags, usageHint) {
       }
     }
   }
-  const res = await api("/workspaces/provision", {
-    method: "POST",
-    body: JSON.stringify({ email: email3, source: "cli", ...name ? { name } : {} })
-  });
-  const body = await readJson(res);
+  const res = await api(
+    "/workspaces/provision",
+    {
+      method: "POST",
+      body: JSON.stringify({ email: email3, source: "cli", ...name ? { name } : {} })
+    },
+    apiBase
+  );
+  const body = await readJson(res, apiBase);
   if (!res.ok || !body.key) die(body.error ?? `Provisioning failed (${res.status}).`);
   const claimToken = claimCookieValue(res);
   const { claimUrl: _legacyWorkspaceLink, ...current } = readConfig();
@@ -797,7 +830,12 @@ async function init(flags) {
   const json = jsonMode(flags);
   const ws = await provisionWorkspace(flags, EMAIL_REQUIRED);
   if (json) {
-    return emitResult({ pk: ws.pk, email: ws.email, name: ws.name || null, limits: ws.limits ?? null });
+    return emitResult({
+      pk: ws.pk,
+      email: ws.email,
+      name: ws.name || null,
+      limits: ws.limits ?? null
+    });
   }
   console.log(
     `
@@ -1059,12 +1097,14 @@ var skillCommand = {
 
 // src/commands/agent.ts
 var BOOTSTRAP_USAGE = 'To set up a workspace I need an email for your recovery link. Re-run: npx @usefillo/cli@latest agent bootstrap --email you@company.com [--name "Your Name"]. (Already have an account? `fillo login`.)';
-async function bootstrapStandalone(flags) {
+async function bootstrapStandalone(flags, apiBase) {
   if (flags.account === true) {
-    die("--account is for the browser handoff: `fillo agent bootstrap --run <id> --token <token> --account`.");
+    die(
+      "--account is for the browser handoff: `fillo agent bootstrap --run <id> --token <token> --account`."
+    );
   }
   const json = jsonMode(flags);
-  const ws = await provisionWorkspace(flags, BOOTSTRAP_USAGE);
+  const ws = await provisionWorkspace(flags, BOOTSTRAP_USAGE, apiBase);
   const targets = installSkill(flags, { quiet: json });
   if (json) {
     return emitResult({
@@ -1079,7 +1119,9 @@ async function bootstrapStandalone(flags) {
     `
   ${bold("Ready.")} Workspace provisioned and the Build with Fillo skill installed.`
   );
-  console.log(`  ${dim(`A workspace link was sent to ${terminalText(ws.email)} \u2014 claim it anytime with \`fillo claim\`.`)}`);
+  console.log(
+    `  ${dim(`A workspace link was sent to ${terminalText(ws.email)} \u2014 claim it anytime with \`fillo claim\`.`)}`
+  );
   const preview = previewLimitLine(ws.limits);
   if (preview) console.log(`  ${dim(preview)}`);
   console.log(`
@@ -1112,7 +1154,7 @@ async function agent(subcommand, flags) {
     die("--account does not take a value.");
   }
   if (subcommand === "bootstrap") {
-    if (!run || !token) return bootstrapStandalone(flags);
+    if (!run || !token) return bootstrapStandalone(flags, apiBase);
     installSkill(flags);
     if (flags.account === true) {
       await login({ ...flags, json: false }, { continueToAgentRun: true });
@@ -1176,29 +1218,39 @@ async function connectAgentRun(apiBase, run, token, attachAccount) {
   );
 }
 async function postAgentEvent(apiBase, run, token, body) {
-  const res = await fetch(`${apiBase}/api/v1/agent-runs/${encodeURIComponent(run)}/events`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${token}`,
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify(body),
-    signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
-  });
+  let res;
+  try {
+    res = await fetch(`${apiBase}/api/v1/agent-runs/${encodeURIComponent(run)}/events`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(body),
+      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
+    });
+  } catch (error) {
+    throw networkFailure(apiBase, error);
+  }
   const payload = await res.json().catch(() => ({}));
   if (!res.ok) die(payload.error ?? `agent progress failed (${res.status}).`);
 }
 async function attachAgentAccount(apiBase, run, progressToken) {
   const accountToken = requireTokenFor(apiBase);
-  const res = await fetch(`${apiBase}/api/v1/agent-runs/${encodeURIComponent(run)}/account`, {
-    method: "POST",
-    redirect: "error",
-    headers: {
-      Authorization: `Bearer ${accountToken}`,
-      "X-Fillo-Agent-Run-Token": progressToken
-    },
-    signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
-  });
+  let res;
+  try {
+    res = await fetch(`${apiBase}/api/v1/agent-runs/${encodeURIComponent(run)}/account`, {
+      method: "POST",
+      redirect: "error",
+      headers: {
+        Authorization: `Bearer ${accountToken}`,
+        "X-Fillo-Agent-Run-Token": progressToken
+      },
+      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
+    });
+  } catch (error) {
+    throw networkFailure(apiBase, error);
+  }
   const payload = await res.json().catch(() => ({}));
   if (!res.ok) {
     const hint = res.status === 401 ? " Run `fillo login` and try again." : "";
@@ -1217,6 +1269,7 @@ function agentHelp() {
     agent bootstrap     Set up a workspace and install the Build with Fillo skill
                        ${dimRaw("--email you@company.com   provision a fresh workspace (a TTY confirms your git identity)")}
                        ${dimRaw('--name "Your Name"        optional display name')}
+                       ${dimRaw("--api <url>               target a different Fillo deployment (default: FILLO_API or https://fillo.so)")}
                        ${dimRaw("--run <id> --token <token>   instead: attach to an open browser modal")}
                        ${dimRaw("--account   with --run/--token: approve an existing workspace in the browser")}
     agent connect       Connect a coding-agent run to the open browser modal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usefillo/cli",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "Create and publish Fillo forms, and install the Fillo Agent Skill.",
   "license": "MIT",
   "keywords": [
@@ -30,7 +30,7 @@
   },
   "scripts": {
     "build": "tsup && node scripts/copy-skill.mjs",
-    "test": "node scripts/validate-skill-bundle.mjs && node scripts/test-skill-bundle.mjs && node scripts/test-skill-install.mjs && node scripts/test-agent-account.mjs && node scripts/test-stage-push.mjs && node scripts/test-local-validation.mjs && node scripts/test-loopback.mjs && node scripts/test-init.mjs && node scripts/test-init-tty.mjs && node scripts/test-keys-claim.mjs && node scripts/test-responses.mjs && node scripts/test-workspace-commands.mjs",
+    "test": "node scripts/validate-skill-bundle.mjs && node scripts/test-skill-bundle.mjs && node scripts/test-skill-install.mjs && node scripts/test-agent-account.mjs && node scripts/test-stage-push.mjs && node scripts/test-local-validation.mjs && node scripts/test-loopback.mjs && node scripts/test-init.mjs && node scripts/test-api-target.mjs && node scripts/test-init-tty.mjs && node scripts/test-keys-claim.mjs && node scripts/test-responses.mjs && node scripts/test-workspace-commands.mjs",
     "typecheck": "tsc --noEmit"
   }
 }