@instafy/cli 0.1.8 → 0.1.10

package/README.md

@@ -7,22 +7,29 @@ Run Instafy projects locally and connect them back to Instafy Studio — from an
 ## Quickstart
 
 0. Log in once: `instafy login`
+   - Opens a Studio URL; the CLI continues automatically after you sign in.
+   - Also enables Git auth (credential helper) for Instafy Git Service. Disable with `instafy login --no-git-setup`.
+   - Multiple accounts: `instafy login --profile work` (then bind folders with `instafy project init --profile work` or `instafy project profile work`).
    - Optional: set defaults with `instafy config set controller-url <url>` / `instafy config set studio-url <url>`
 1. Link a folder to a project:
    - VS Code: install the Instafy extension and run `Instafy: Link Workspace to Project`, or
-   - Terminal: `instafy project:init`
-2. Start the runtime: `instafy runtime:start`
+   - Terminal: `instafy project init`
+2. Start the runtime: `instafy runtime start`
 3. Check status / stop:
-   - `instafy runtime:status`
-   - `instafy runtime:stop`
+   - `instafy runtime status`
+   - `instafy runtime stop`
 
 ## Common commands
 
-- `instafy runtime:start` — start a local runtime (agent + origin).
-- `instafy runtime:status` — show health of the last started runtime.
-- `instafy runtime:stop` — stop the last started runtime.
-- `instafy tunnel` — request a tunnel and forward a local port.
-- `instafy api:get` — query controller endpoints (conversations, messages, runs, etc).
+ - `instafy runtime start` — start a local runtime (agent + origin).
+- `instafy runtime status` — show health of the last started runtime.
+ - `instafy runtime stop` — stop the last started runtime.
+- `instafy git <args...>` — run git commands against an Instafy canonical checkout (`.instafy/.git`) when present.
+- `instafy tunnel start` — start a detached tunnel for a local port.
+  - `instafy tunnel list` — list local tunnels started by the CLI.
+  - `instafy tunnel logs <tunnelId> --follow` — tail tunnel logs.
+  - `instafy tunnel stop <tunnelId>` — stop + revoke a tunnel.
+- `instafy api get` — query controller endpoints (conversations, messages, runs, etc).
 
 Run `instafy --help` for the full command list and options.
 

package/dist/api.js

@@ -1,5 +1,7 @@
 import fs from "node:fs";
-import { resolveConfiguredAccessToken } from "./config.js";
+import { resolveActiveProfileName, resolveConfiguredAccessToken } from "./config.js";
+import { formatAuthRejectedError } from "./errors.js";
+import { fetchWithControllerAuth } from "./controller-fetch.js";
 function normalizeUrl(raw) {
     const value = (raw ?? "").trim();
     if (!value)
@@ -12,15 +14,31 @@ function normalizeToken(raw) {
     const trimmed = raw.trim();
     return trimmed.length ? trimmed : null;
 }
-function resolveBearerToken(options) {
-    return (normalizeToken(options.accessToken) ??
-        normalizeToken(options.serviceToken) ??
-        normalizeToken(process.env["CONTROLLER_ACCESS_TOKEN"]) ??
-        normalizeToken(process.env["INSTAFY_ACCESS_TOKEN"]) ??
-        normalizeToken(process.env["INSTAFY_SERVICE_TOKEN"]) ??
-        normalizeToken(process.env["CONTROLLER_TOKEN"]) ??
-        normalizeToken(process.env["SUPABASE_ACCESS_TOKEN"]) ??
-        resolveConfiguredAccessToken());
+function resolveBearerTokenWithSource(options) {
+    const cwd = process.cwd();
+    const profile = resolveActiveProfileName({ cwd });
+    const stored = resolveConfiguredAccessToken({ profile, cwd });
+    const explicit = normalizeToken(options.accessToken) ?? normalizeToken(options.serviceToken);
+    if (explicit) {
+        return { token: explicit, source: "explicit", profile };
+    }
+    const envKeys = [
+        "CONTROLLER_ACCESS_TOKEN",
+        "INSTAFY_ACCESS_TOKEN",
+        "INSTAFY_SERVICE_TOKEN",
+        "CONTROLLER_TOKEN",
+        "SUPABASE_ACCESS_TOKEN",
+    ];
+    for (const key of envKeys) {
+        const value = normalizeToken(process.env[key]);
+        if (value) {
+            return { token: value, source: "env", profile };
+        }
+    }
+    if (stored) {
+        return { token: stored, source: "config", profile };
+    }
+    return { token: null, source: "none", profile };
 }
 function parseKeyValue(raw) {
     const trimmed = raw.trim();
@@ -98,12 +116,10 @@ function maybePrettyPrintJson(text, pretty) {
 }
 export async function requestControllerApi(options) {
     const url = buildRequestUrl(options);
-    const bearer = resolveBearerToken(options);
+    const resolved = resolveBearerTokenWithSource(options);
+    const bearer = resolved.token;
     const headers = new Headers();
     headers.set("accept", "application/json");
-    if (bearer) {
-        headers.set("authorization", `Bearer ${bearer}`);
-    }
     for (const header of options.headers ?? []) {
         const { key, value } = parseHeader(header);
         headers.set(key, value);
@@ -112,17 +128,35 @@ export async function requestControllerApi(options) {
     if (body !== undefined && !headers.has("content-type")) {
         headers.set("content-type", "application/json");
     }
-    const response = await fetch(url, {
+    const init = {
         method: options.method,
         headers,
         body,
-    });
+    };
+    const response = bearer
+        ? (await fetchWithControllerAuth({
+            url: url.toString(),
+            init,
+            accessToken: bearer,
+            tokenSource: resolved.source,
+            profile: resolved.profile,
+            cwd: process.cwd(),
+        })).response
+        : await fetch(url, init);
     const responseText = await response.text().catch(() => "");
     const contentType = response.headers.get("content-type") ?? "";
     const isJson = contentType.includes("application/json") || contentType.includes("+json");
     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}`);