@instafy/cli 0.1.8-staging.376 → 0.1.8-staging.377

package/dist/api.js

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import { resolveConfiguredAccessToken } from "./config.js";
+import { formatAuthRejectedError } from "./errors.js";
 function normalizeUrl(raw) {
     const value = (raw ?? "").trim();
     if (!value)
@@ -123,6 +124,14 @@ export async function requestControllerApi(options) {
     const pretty = options.pretty !== false;
     const formattedBody = isJson ? maybePrettyPrintJson(responseText, pretty) : responseText;
     if (!response.ok) {
+        if (response.status === 401 || response.status === 403) {
+            throw formatAuthRejectedError({
+                status: response.status,
+                responseBody: responseText,
+                retryCommand: "instafy login",
+                advancedHint: "pass --access-token / --service-token, or set INSTAFY_ACCESS_TOKEN / INSTAFY_SERVICE_TOKEN",
+            });
+        }
         const prefix = `Request failed (${response.status} ${response.statusText})`;
         const suffix = formattedBody.trim() ? `: ${formattedBody}` : "";
         throw new Error(`${prefix}${suffix}`);

package/dist/errors.js

@@ -8,3 +8,56 @@ export function formatAuthRequiredError(params) {
     }
     return new Error(lines.join("\n"));
 }
+export function extractControllerErrorMessage(body) {
+    const trimmed = body.trim();
+    if (!trimmed) {
+        return null;
+    }
+    try {
+        const parsed = JSON.parse(trimmed);
+        if (parsed && typeof parsed === "object") {
+            const record = parsed;
+            const message = typeof record.message === "string" ? record.message.trim() : "";
+            if (message)
+                return message;
+            const error = typeof record.error === "string" ? record.error.trim() : "";
+            if (error)
+                return error;
+            const hint = typeof record.hint === "string" ? record.hint.trim() : "";
+            if (hint)
+                return hint;
+        }
+    }
+    catch {
+        // ignore malformed json
+    }
+    return trimmed;
+}
+export function formatAuthRejectedError(params) {
+    const status = params?.status ?? 0;
+    const message = params?.responseBody ? extractControllerErrorMessage(params.responseBody) : null;
+    const normalized = (message ?? "").toLowerCase();
+    const headline = (() => {
+        if (status === 403) {
+            return "Access denied. Make sure you are signed into the right account (`instafy login`).";
+        }
+        if (status === 401 && normalized.includes("expired")) {
+            return "Your login has expired. Run `instafy login` again.";
+        }
+        if (status === 401) {
+            return "Not authenticated. Run `instafy login` again.";
+        }
+        return "Not authenticated. Run `instafy login` first.";
+    })();
+    const lines = [headline];
+    if (params?.retryCommand) {
+        lines.push("", `Then retry: ${params.retryCommand}`);
+    }
+    if (message) {
+        lines.push("", `Server: ${message}`);
+    }
+    if (params?.advancedHint) {
+        lines.push("", `Advanced: ${params.advancedHint}`);
+    }
+    return new Error(lines.join("\n"));
+}

package/dist/git.js

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import kleur from "kleur";
 import { resolveConfiguredAccessToken, resolveControllerUrl } from "./config.js";
+import { formatAuthRejectedError } from "./errors.js";
 function normalizeToken(value) {
     if (typeof value !== "string") {
         return null;
@@ -52,6 +53,12 @@ export async function mintGitAccessToken(params) {
     });
     if (!response.ok) {
         const text = await response.text().catch(() => "");
+        if (response.status === 401 || response.status === 403) {
+            throw formatAuthRejectedError({
+                status: response.status,
+                responseBody: text,
+            });
+        }
         throw new Error(`Instafy server rejected git token request (${response.status} ${response.statusText}): ${text}`);
     }
     const payload = (await response.json());

package/dist/org.js

@@ -1,6 +1,6 @@
 import kleur from "kleur";
 import { resolveControllerUrl, resolveUserAccessToken } from "./config.js";
-import { formatAuthRequiredError } from "./errors.js";
+import { formatAuthRejectedError, formatAuthRequiredError } from "./errors.js";
 export async function listOrganizations(params) {
     const controllerUrl = resolveControllerUrl({ controllerUrl: params.controllerUrl ?? null });
     const token = resolveUserAccessToken({ accessToken: params.accessToken ?? null });
@@ -12,6 +12,13 @@ export async function listOrganizations(params) {
     });
     if (!response.ok) {
         const text = await response.text().catch(() => "");
+        if (response.status === 401 || response.status === 403) {
+            throw formatAuthRejectedError({
+                status: response.status,
+                responseBody: text,
+                retryCommand: "instafy org list",
+            });
+        }
         throw new Error(`Organization list failed (${response.status} ${response.statusText}): ${text}`);
     }
     const body = (await response.json());

package/dist/project.js

@@ -3,14 +3,14 @@ import path from "node:path";
 import kleur from "kleur";
 import { stdin as input } from "node:process";
 import { getInstafyProfileConfigPath, resolveConfiguredStudioUrl, resolveControllerUrl, resolveUserAccessToken, } from "./config.js";
-import { formatAuthRequiredError } from "./errors.js";
+import { formatAuthRejectedError, formatAuthRequiredError } from "./errors.js";
 import { findProjectManifest } from "./project-manifest.js";
 let promptsModule = null;
 async function loadPrompts() {
     promptsModule ?? (promptsModule = import("@clack/prompts"));
     return promptsModule;
 }
-async function fetchOrganizations(controllerUrl, token) {
+async function fetchOrganizations(controllerUrl, token, retryCommand) {
     const response = await fetch(`${controllerUrl}/orgs`, {
         headers: {
             authorization: `Bearer ${token}`,
@@ -18,12 +18,19 @@ async function fetchOrganizations(controllerUrl, token) {
     });
     if (!response.ok) {
         const text = await response.text().catch(() => "");
+        if (response.status === 401 || response.status === 403) {
+            throw formatAuthRejectedError({
+                status: response.status,
+                responseBody: text,
+                retryCommand,
+            });
+        }
         throw new Error(`Organization list failed (${response.status} ${response.statusText}): ${text}`);
     }
     const body = (await response.json());
     return Array.isArray(body.orgs) ? body.orgs : [];
 }
-async function fetchOrgProjects(controllerUrl, token, orgId) {
+async function fetchOrgProjects(controllerUrl, token, orgId, retryCommand) {
     const response = await fetch(`${controllerUrl}/orgs/${encodeURIComponent(orgId)}/projects`, {
         headers: {
             authorization: `Bearer ${token}`,
@@ -31,12 +38,19 @@ async function fetchOrgProjects(controllerUrl, token, orgId) {
     });
     if (!response.ok) {
         const text = await response.text().catch(() => "");
+        if (response.status === 401 || response.status === 403) {
+            throw formatAuthRejectedError({
+                status: response.status,
+                responseBody: text,
+                retryCommand,
+            });
+        }
         throw new Error(`Project list failed (${response.status} ${response.statusText}): ${text}`);
     }
     const body = (await response.json());
     return Array.isArray(body.projects) ? body.projects : [];
 }
-async function createOrganization(controllerUrl, token, payload) {
+async function createOrganization(controllerUrl, token, payload, retryCommand) {
     const response = await fetch(`${controllerUrl}/orgs`, {
         method: "POST",
         headers: {
@@ -47,6 +61,13 @@ async function createOrganization(controllerUrl, token, payload) {
     });
     if (!response.ok) {
         const text = await response.text().catch(() => "");
+        if (response.status === 401 || response.status === 403) {
+            throw formatAuthRejectedError({
+                status: response.status,
+                responseBody: text,
+                retryCommand,
+            });
+        }
         throw new Error(`Organization creation failed (${response.status} ${response.statusText}): ${text}`);
     }
     const json = (await response.json());
@@ -56,7 +77,7 @@ async function createOrganization(controllerUrl, token, payload) {
     }
     return { orgId, orgName: json.org_name ?? json.orgName ?? null };
 }
-async function resolveOrg(controllerUrl, token, options) {
+async function resolveOrg(controllerUrl, token, options, retryCommand) {
     if (options.orgId) {
         return { orgId: options.orgId, orgName: options.orgName ?? null };
     }
@@ -91,18 +112,18 @@ async function resolveOrg(controllerUrl, token, options) {
         if (chosenSlug) {
             payload.orgSlug = chosenSlug;
         }
-        const created = await createOrganization(controllerUrl, token, payload);
+        const created = await createOrganization(controllerUrl, token, payload, retryCommand);
         return { orgId: created.orgId, orgName: created.orgName ?? chosenName };
     }
     if (orgSlug) {
-        const orgs = await fetchOrganizations(controllerUrl, token);
+        const orgs = await fetchOrganizations(controllerUrl, token, retryCommand);
         const matches = orgs.filter((org) => org.slug === orgSlug);
         if (matches.length === 1) {
             return { orgId: matches[0].id, orgName: matches[0].name ?? null };
         }
     }
     if (!orgSlug && !orgName) {
-        const orgs = await fetchOrganizations(controllerUrl, token);
+        const orgs = await fetchOrganizations(controllerUrl, token, retryCommand);
         if (orgs.length === 0) {
             if (allowInteractive) {
                 const { confirm, isCancel } = await loadPrompts();
@@ -170,7 +191,7 @@ async function resolveOrg(controllerUrl, token, options) {
             if (options.ownerUserId) {
                 payload.ownerUserId = options.ownerUserId;
             }
-            const created = await createOrganization(controllerUrl, token, payload);
+            const created = await createOrganization(controllerUrl, token, payload, retryCommand);
             return { orgId: created.orgId, orgName: created.orgName ?? chosenName };
         }
         throw new Error(`Organization slug "${orgSlug}" did not match an existing org, and org name is required to create one.\n\nNext:\n- Create an org in Studio: ${studioOrgUrl}\n- Or rerun: instafy project init --org-name \"My Org\" --org-slug "${orgSlug}"`);
@@ -188,7 +209,7 @@ async function resolveOrg(controllerUrl, token, options) {
     if (!payload.orgName) {
         throw new Error(`Organization name is required.\n\nNext:\n- Create an org in Studio: ${studioOrgUrl}\n- Or rerun: instafy project init --org-name \"My Org\"`);
     }
-    const created = await createOrganization(controllerUrl, token, payload);
+    const created = await createOrganization(controllerUrl, token, payload, retryCommand);
     return { orgId: created.orgId, orgName: created.orgName ?? orgName ?? null };
 }
 export async function listProjects(options) {
@@ -197,7 +218,8 @@ export async function listProjects(options) {
     if (!token) {
         throw formatAuthRequiredError({ retryCommand: "instafy project list" });
     }
-    const orgs = await fetchOrganizations(controllerUrl, token);
+    const retryCommand = "instafy project list";
+    const orgs = await fetchOrganizations(controllerUrl, token, retryCommand);
     let targetOrgs = orgs;
     if (options.orgId) {
         targetOrgs = orgs.filter((org) => org.id === options.orgId);
@@ -213,7 +235,7 @@ export async function listProjects(options) {
     }
     const summaries = [];
     for (const org of targetOrgs) {
-        const projects = await fetchOrgProjects(controllerUrl, token, org.id);
+        const projects = await fetchOrgProjects(controllerUrl, token, org.id, retryCommand);
         summaries.push({ org, projects });
     }
     if (options.json) {
@@ -256,7 +278,8 @@ export async function projectInit(options) {
             advancedHint: "pass --access-token or set INSTAFY_ACCESS_TOKEN / SUPABASE_ACCESS_TOKEN",
         });
     }
-    const org = await resolveOrg(controllerUrl, token, options);
+    const retryCommand = "instafy project init";
+    const org = await resolveOrg(controllerUrl, token, options, retryCommand);
     const body = {
         projectType: options.projectType,
         ownerUserId: options.ownerUserId,
@@ -271,6 +294,13 @@ export async function projectInit(options) {
     });
     if (!response.ok) {
         const text = await response.text().catch(() => "");
+        if (response.status === 401 || response.status === 403) {
+            throw formatAuthRejectedError({
+                status: response.status,
+                responseBody: text,
+                retryCommand,
+            });
+        }
         throw new Error(`Project creation failed (${response.status} ${response.statusText}): ${text}`);
     }
     const json = (await response.json());

package/dist/runtime.js

@@ -7,6 +7,7 @@ import { randomUUID } from "node:crypto";
 import os from "node:os";
 import { ensureRatholeBinary } from "./rathole.js";
 import { resolveConfiguredAccessToken } from "./config.js";
+import { formatAuthRejectedError } from "./errors.js";
 import { findProjectManifest } from "./project-manifest.js";
 const INSTAFY_DIR = path.join(os.homedir(), ".instafy");
 const STATE_FILE = path.join(INSTAFY_DIR, "cli-runtime-state.json");
@@ -257,6 +258,12 @@ export async function mintRuntimeAccessToken(params) {
     });
     if (!response.ok) {
         const text = await response.text().catch(() => "");
+        if (response.status === 401 || response.status === 403) {
+            throw formatAuthRejectedError({
+                status: response.status,
+                responseBody: text,
+            });
+        }
         throw new Error(`Instafy server rejected runtime token request (${response.status} ${response.statusText}): ${text}`);
     }
     const payload = (await response.json());

package/dist/tunnel.js

@@ -6,7 +6,7 @@ import { randomUUID } from "node:crypto";
 import kleur from "kleur";
 import { findProjectManifest, resolveRatholeBinaryForCli } from "./runtime.js";
 import { resolveConfiguredControllerUrl, resolveControllerUrl as resolveDefaultControllerUrl, resolveUserAccessToken, } from "./config.js";
-import { formatAuthRequiredError } from "./errors.js";
+import { formatAuthRejectedError, formatAuthRequiredError } from "./errors.js";
 const INSTAFY_DIR = path.join(os.homedir(), ".instafy");
 const TUNNEL_STATE_FILE = path.join(INSTAFY_DIR, "cli-tunnel-state.json");
 const TUNNEL_LOG_DIR = path.join(INSTAFY_DIR, "cli-tunnel-logs");
@@ -169,6 +169,13 @@ async function requestTunnel(controllerUrl, token, projectId, metadata) {
     });
     if (!response.ok) {
         const text = await response.text().catch(() => "");
+        if (response.status === 401 || response.status === 403) {
+            throw formatAuthRejectedError({
+                status: response.status,
+                responseBody: text,
+                retryCommand: "instafy tunnel start",
+            });
+        }
         throw new Error(`Tunnel request failed (${response.status} ${response.statusText}): ${text}`);
     }
     const body = (await response.json());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instafy/cli",
-  "version": "0.1.8-staging.376",
+  "version": "0.1.8-staging.377",
   "description": "Run Instafy projects locally, link folders to Studio, and share previews/webhooks via tunnels.",
   "private": false,
   "publishConfig": {