@gravity-rail/cli 0.13.1 → 0.14.0

package/README.md

@@ -59,15 +59,15 @@ profiles; re-run import after re-seed. Worktree API ports get isolated credentia
 
 ### Credential store (security)
 
-| Item            | Detail                                                                       |
-| --------------- | ---------------------------------------------------------------------------- |
-| Location        | `~/.gr-cli/credentials-<env>.json` (e.g. `credentials-prod.json`)            |
-| Directory mode  | `0700` on `~/.gr-cli`                                                        |
-| File mode       | `0600` on credential files                                                   |
+| Item            | Detail                                                                                      |
+| --------------- | ------------------------------------------------------------------------------------------- |
+| Location        | `~/.gr-cli/credentials-<env>.json` (e.g. `credentials-prod.json`)                           |
+| Directory mode  | `0700` on `~/.gr-cli`                                                                       |
+| File mode       | `0600` on credential files                                                                  |
 | Contents        | OAuth client id/secret + tokens, and/or token-only dev profiles (+ optional workspace UUID) |
-| Not stored      | `GRAVITY_RAIL_API_KEY` (process environment only; always overrides profiles) |
-| Name validation | Profiles allow `name` or `workspace/member`; env names are allowlisted       |
-| Logging         | CLI code never writes token or secret values to stdout/stderr                |
+| Not stored      | `GRAVITY_RAIL_API_KEY` (process environment only; always overrides profiles)                |
+| Name validation | Profiles allow `name` or `workspace/member`; env names are allowlisted                      |
+| Logging         | CLI code never writes token or secret values to stdout/stderr                               |
 
 **Security review notes:** tokens never leave the local filesystem except on HTTPS calls to the Gravity Rail API. There is no cloud sync of CLI credentials. Rotate by `gr auth logout --name <profile>` (or deleting the store file) and logging in again. Multi-user machines should rely on OS home-directory isolation plus the `0600`/`0700` modes. Do not commit `~/.gr-cli` into repositories or bake it into container images.
 
@@ -88,6 +88,16 @@ gr tasks list -w $WORKSPACE
 
 Useful for scripts, CI/CD, and automation. Create scoped keys from workspace settings or via [`@gravity-rail/sdk`](https://www.npmjs.com/package/@gravity-rail/sdk). API keys are **not** written into the profile store.
 
+### Organizations that require SSO
+
+Workspaces in an SSO-enforced organization need an org-scoped session in addition to your account login. When you run a `gr` command against such a workspace after `gr login`, the CLI opens your browser once to complete the organization's SSO, captures the resulting session over a local `127.0.0.1` callback, and caches it under your profile — subsequent commands reuse it silently until it expires. No token is ever placed in a URL.
+
+For **non-interactive** use (CI, scripts, code-interpreter sandboxes, or any machine with no browser), org SSO cannot run; use an **API key** instead — API keys are exempt from the org SSO gate:
+
+```sh
+export GRAVITY_RAIL_API_KEY=your-api-key   # set GRAVITY_RAIL_NO_BROWSER=1 to force the API-key hint
+```
+
 ## Command Pattern
 
 ```
@@ -190,12 +200,12 @@ cat member.json | gr members update -w $WORKSPACE --id 42 --allow-write
 
 ## Exit Codes
 
-| Code | Meaning                                                                                            |
-| ---- | -------------------------------------------------------------------------------------------------- |
-| `0`  | Success                                                                                            |
-| `1`  | General error                                                                                      |
-| `2`  | Authentication required (run `gr login` or set `GRAVITY_RAIL_API_KEY`)                             |
-| `3`  | A human-in-the-loop (HITL) interrupt requires out-of-band action before the operation can continue |
+| Code | Meaning                                                                                                                                                                          |
+| ---- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `0`  | Success                                                                                                                                                                          |
+| `1`  | General error                                                                                                                                                                    |
+| `2`  | Authentication required (run `gr login` or set `GRAVITY_RAIL_API_KEY`)                                                                                                           |
+| `3`  | A human-in-the-loop (HITL) interrupt requires out-of-band action before the operation can continue                                                                               |
 | `4`  | No assistant reply — a `--message` turn made tool calls but returned no final summary, or an inference error occurred with no final message (side effects may have been applied) |
 
 When a concierge command run with `--message` (non-interactive mode) hits a HITL
@@ -268,6 +278,7 @@ not forwarded, as it may contain sensitive data. Use `resume.chatUuid` /
 | `slack-apps`       | Slack app management — installations, threads, accounts                                            |
 | `fhir-connections` | FHIR healthcare connections — patients, practitioners, encounters                                  |
 | `patientsync`      | PatientSync PSTN-transfer connection — `configure` / `status` / `delete` (singleton per workspace) |
+| `documo-fax`       | Documo (mFax) inbound fax — `install` / `configure` / `setup` / `verify` / `status` / `faxes`     |
 | `app-connections`  | Platform app integrations                                                                          |
 | `monday`           | Monday.com — boards, columns, webhooks                                                             |
 

package/dist/{account-verify-phone-N7EJS4J3.js → account-verify-phone-UA5OUOOR.js}

@@ -2,9 +2,9 @@ import {
   confirmAccountPhoneVerify,
   requireAuth,
   startAccountPhoneVerify
-} from "./chunk-LE5IR5MC.js";
-import "./chunk-XSFAJ5ZO.js";
-import "./chunk-WZVMWN3S.js";
+} from "./chunk-M4XMXS5D.js";
+import "./chunk-PODEUTUQ.js";
+import "./chunk-3T7A5PSF.js";
 
 // src/commands/account-verify-phone.ts
 import * as readline from "readline/promises";
@@ -38,4 +38,4 @@ async function promptLine(question) {
 export {
   accountVerifyPhoneCommand
 };
-//# sourceMappingURL=account-verify-phone-N7EJS4J3.js.map
+//# sourceMappingURL=account-verify-phone-UA5OUOOR.js.map

package/dist/{chunk-WZVMWN3S.js → chunk-3T7A5PSF.js}

@@ -39,9 +39,8 @@ Hint: Run "gr login" to authenticate, or set GRAVITY_RAIL_API_KEY for non-intera
       process.stderr.write(
         `
 Hint: This is a write/admin operation and the sandbox token lacks the required scope.
-Re-run the exec tool with the needed write scope, e.g.:
-  exec(code="<your gr command>", language="bash", scopes=["datatypes:write"])
-Common scopes: datatypes:write, workflows:write, members:write, automations:admin, agents:write
+If the error above names a required scope, re-run the exec tool with it, e.g.:
+  exec(code="<your gr command>", language="bash", scopes=["<required scope>"])
 `
       );
     }
@@ -57,4 +56,4 @@ export {
   AuthRequiredError,
   handleError
 };
-//# sourceMappingURL=chunk-WZVMWN3S.js.map
+//# sourceMappingURL=chunk-3T7A5PSF.js.map

package/dist/chunk-3T7A5PSF.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/lib/errors.ts"],"sourcesContent":["export class CLIError extends Error {\n   constructor(\n      message: string,\n      public exitCode: number = 1\n   ) {\n      super(message);\n      this.name = 'CLIError';\n   }\n}\n\nexport class AuthRequiredError extends CLIError {\n   constructor(message = 'Not authenticated. Run `gr login` or set GRAVITY_RAIL_API_KEY.') {\n      super(message, 2);\n      this.name = 'AuthRequiredError';\n   }\n}\n\nexport function handleError(err: unknown): never {\n   if (err instanceof CLIError) {\n      process.stderr.write(`Error: ${err.message}\\n`);\n      process.exit(err.exitCode);\n   }\n\n   if (err instanceof Error) {\n      process.stderr.write(`Error: ${err.message}\\n`);\n      if ('errors' in err && Array.isArray((err as any).errors)) {\n         for (const e of (err as any).errors) {\n            process.stderr.write(`  - ${e}\\n`);\n         }\n      }\n      if ('statusCode' in err && (err as any).statusCode === 401) {\n         process.stderr.write(\n            `\\nHint: Run \"gr login\" to authenticate, or set GRAVITY_RAIL_API_KEY for non-interactive use.\\n`\n         );\n      }\n      // In the manager sandbox a 403 almost always means the service token lacks the\n      // write/admin scope for this command. The token's scopes are granted by the exec\n      // tool's `scopes=[...]` (HITL-approved), so tell the agent how to re-request them.\n      //\n      // Deliberately NO hard-coded scope list: it drifts from the Scope enum and then\n      // actively misleads the agent (prod manager chat 287 — the omitted scope was\n      // records:write). Scope-only denials name the scope in `err.message`\n      // (\"... Required scopes: records:write\"), which is printed above, and the exec\n      // tool derives its retry hint from that same text.\n      if (\n         'statusCode' in err &&\n         (err as any).statusCode === 403 &&\n         process.env.GRAVITY_RAIL_SANDBOX === '1'\n      ) {\n         process.stderr.write(\n            `\\nHint: This is a write/admin operation and the sandbox token lacks the required scope.\\n` +\n               `If the error above names a required scope, re-run the exec tool with it, e.g.:\\n` +\n               `  exec(code=\"<your gr command>\", language=\"bash\", scopes=[\"<required scope>\"])\\n`\n         );\n      }\n      process.exit(1);\n   }\n\n   process.stderr.write(`Error: ${String(err)}\\n`);\n   process.exit(1);\n}\n"],"mappings":";AAAO,IAAM,WAAN,cAAuB,MAAM;AAAA,EACjC,YACG,SACO,WAAmB,GAC3B;AACC,UAAM,OAAO;AAFN;AAGP,SAAK,OAAO;AAAA,EACf;AAAA,EAJU;AAKb;AAEO,IAAM,oBAAN,cAAgC,SAAS;AAAA,EAC7C,YAAY,UAAU,kEAAkE;AACrF,UAAM,SAAS,CAAC;AAChB,SAAK,OAAO;AAAA,EACf;AACH;AAEO,SAAS,YAAY,KAAqB;AAC9C,MAAI,eAAe,UAAU;AAC1B,YAAQ,OAAO,MAAM,UAAU,IAAI,OAAO;AAAA,CAAI;AAC9C,YAAQ,KAAK,IAAI,QAAQ;AAAA,EAC5B;AAEA,MAAI,eAAe,OAAO;AACvB,YAAQ,OAAO,MAAM,UAAU,IAAI,OAAO;AAAA,CAAI;AAC9C,QAAI,YAAY,OAAO,MAAM,QAAS,IAAY,MAAM,GAAG;AACxD,iBAAW,KAAM,IAAY,QAAQ;AAClC,gBAAQ,OAAO,MAAM,OAAO,CAAC;AAAA,CAAI;AAAA,MACpC;AAAA,IACH;AACA,QAAI,gBAAgB,OAAQ,IAAY,eAAe,KAAK;AACzD,cAAQ,OAAO;AAAA,QACZ;AAAA;AAAA;AAAA,MACH;AAAA,IACH;AAUA,QACG,gBAAgB,OACf,IAAY,eAAe,OAC5B,QAAQ,IAAI,yBAAyB,KACtC;AACC,cAAQ,OAAO;AAAA,QACZ;AAAA;AAAA;AAAA;AAAA;AAAA,MAGH;AAAA,IACH;AACA,YAAQ,KAAK,CAAC;AAAA,EACjB;AAEA,UAAQ,OAAO,MAAM,UAAU,OAAO,GAAG,CAAC;AAAA,CAAI;AAC9C,UAAQ,KAAK,CAAC;AACjB;","names":[]}

package/dist/{chunk-LE5IR5MC.js → chunk-M4XMXS5D.js}

@@ -3,11 +3,11 @@ import {
   getEnvironmentConfig,
   printTable,
   refreshAccessToken
-} from "./chunk-XSFAJ5ZO.js";
+} from "./chunk-PODEUTUQ.js";
 import {
   AuthRequiredError,
   CLIError
-} from "./chunk-WZVMWN3S.js";
+} from "./chunk-3T7A5PSF.js";
 
 // src/lib/pagination.ts
 function isListResult(data) {
@@ -232,8 +232,13 @@ import { GravityRailClient } from "@gravity-rail/sdk";
 import { homedir } from "os";
 
 // src/lib/org-auth.ts
+import { createServer } from "http";
 import { execFile } from "child_process";
+import { randomBytes } from "crypto";
 var ORG_AUTH_TIMEOUT_MS = 5 * 60 * 1e3;
+var ORG_SESSION_CACHE_TTL_MS = 6.5 * 24 * 60 * 60 * 1e3;
+var CLI_ORG_AUTH_BRIDGE_PATH = "/cli/org-auth";
+var ORG_UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function extractOrgSessionFromSetCookies(setCookieValues, preferredCookieName) {
   let fallback;
   for (const value of setCookieValues) {
@@ -276,19 +281,18 @@ async function tryDirectJoin(apiUrl, accessToken, orgAuthInfo) {
   }
   return orgSession;
 }
-function isAllowedAuthUrl(url, apiUrl) {
+function isAllowedAuthUrl(url, apiUrl, frontendUrl) {
   try {
     const parsed = new URL(url);
-    const api = new URL(apiUrl);
     if (parsed.protocol !== "https:" && parsed.protocol !== "http:") return false;
-    if (parsed.hostname === api.hostname) return true;
-    const lastTwo = (host) => {
-      const parts = host.split(".").filter(Boolean);
-      return parts.length >= 2 ? parts.slice(-2).join(".") : host;
-    };
-    const isIp = /^[0-9.]+$|^\[.*\]$/.test(parsed.hostname);
-    if (isIp) return false;
-    return lastTwo(parsed.hostname) === lastTwo(api.hostname);
+    const allowedHosts = [apiUrl, frontendUrl].filter((u) => Boolean(u)).map((u) => {
+      try {
+        return new URL(u).hostname;
+      } catch {
+        return void 0;
+      }
+    }).filter((h) => Boolean(h));
+    return allowedHosts.includes(parsed.hostname);
   } catch {
     return false;
   }
@@ -309,84 +313,175 @@ function openBrowser(url) {
   execFile(command, args, (_err) => {
   });
 }
-function registerOrgAuthHandler(apiClient, apiUrl, accessToken) {
+function isHeadless() {
+  if (process.env.GRAVITY_RAIL_NO_BROWSER) return true;
+  if (process.platform === "linux") {
+    return !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY;
+  }
+  return false;
+}
+function startOrgSessionCapture(expectedState, expectedOrgUuid, allowedOrigin) {
+  let resolveSession;
+  let rejectSession;
+  const session = new Promise((resolve, reject) => {
+    resolveSession = resolve;
+    rejectSession = reject;
+  });
+  const applyCors = (req, res) => {
+    if (req.headers.origin && req.headers.origin === allowedOrigin) {
+      res.setHeader("Access-Control-Allow-Origin", allowedOrigin);
+      res.setHeader("Vary", "Origin");
+    }
+    res.setHeader("Access-Control-Allow-Methods", "POST, OPTIONS");
+    res.setHeader("Access-Control-Allow-Headers", "Content-Type");
+  };
+  const server = createServer((req, res) => {
+    applyCors(req, res);
+    if (req.method === "OPTIONS") {
+      res.setHeader("Access-Control-Allow-Private-Network", "true");
+      res.writeHead(204);
+      res.end();
+      return;
+    }
+    if (req.method !== "POST") {
+      res.writeHead(405);
+      res.end();
+      return;
+    }
+    let body = "";
+    let tooLarge = false;
+    req.on("data", (chunk) => {
+      body += chunk;
+      if (body.length > 16 * 1024) {
+        tooLarge = true;
+        req.destroy();
+      }
+    });
+    req.on("end", () => {
+      if (tooLarge) return;
+      let capturedSession;
+      try {
+        const payload = JSON.parse(body);
+        if (typeof payload.org_session === "string" && payload.org_session.length > 0 && payload.state === expectedState && payload.org_uuid === expectedOrgUuid) {
+          capturedSession = payload.org_session;
+        }
+      } catch {
+      }
+      if (capturedSession) {
+        res.writeHead(200, { "Content-Type": "application/json" });
+        res.end('{"ok":true}');
+        resolveSession(capturedSession);
+      } else {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end('{"ok":false}');
+      }
+    });
+  });
+  let resolveReady;
+  let rejectReady;
+  const ready = new Promise((resolve, reject) => {
+    resolveReady = resolve;
+    rejectReady = reject;
+  });
+  server.on("error", (err) => {
+    rejectReady(err);
+    rejectSession(err);
+  });
+  server.listen(0, "127.0.0.1", () => {
+    resolveReady(server.address().port);
+  });
+  const timeout = setTimeout(() => {
+    rejectSession(
+      new Error(
+        "Organization authentication timed out.\nComplete sign-in in the browser, then re-run the command."
+      )
+    );
+  }, ORG_AUTH_TIMEOUT_MS);
+  timeout.unref();
+  let closed = false;
+  const close = () => {
+    if (closed) return;
+    closed = true;
+    clearTimeout(timeout);
+    server.close();
+  };
+  return { ready, session, close };
+}
+function buildStepUpUrl(authUrl, orgUuid, port, state) {
+  const url = new URL(authUrl);
+  const bridgeQuery = new URLSearchParams({ org: orgUuid, port: String(port), state });
+  url.searchParams.set("return_to", `${CLI_ORG_AUTH_BRIDGE_PATH}?${bridgeQuery.toString()}`);
+  return url.toString();
+}
+function newStateNonce() {
+  return randomBytes(16).toString("hex");
+}
+async function stepUpViaBrowser(orgAuthInfo) {
+  const state = newStateNonce();
+  const allowedOrigin = new URL(orgAuthInfo.authUrl).origin;
+  const capture = startOrgSessionCapture(state, orgAuthInfo.orgUuid, allowedOrigin);
+  try {
+    const port = await capture.ready;
+    const stepUpUrl = buildStepUpUrl(orgAuthInfo.authUrl, orgAuthInfo.orgUuid, port, state);
+    stderr(`
+This workspace requires organization SSO authentication.`);
+    stderr(`Opening browser to complete sign-in...`);
+    stderr(`  ${stepUpUrl}
+`);
+    stderr(`If the browser does not open, visit the URL above manually.`);
+    openBrowser(stepUpUrl);
+    return await capture.session;
+  } finally {
+    capture.close();
+  }
+}
+function registerOrgAuthHandler(apiClient, apiUrl, accessToken, orgAuthCtx) {
   apiClient.setOrgAuthHandler(async (orgAuthInfo) => {
+    const orgUuid = orgAuthInfo.orgUuid;
+    if (!ORG_UUID_RE.test(orgUuid)) {
+      throw new Error("Invalid organization id in auth challenge");
+    }
+    const cm = orgAuthCtx?.credentialsManager;
+    const adopt = (session2) => {
+      if (cm && orgAuthCtx) {
+        const expiresAt = new Date(Date.now() + ORG_SESSION_CACHE_TTL_MS).toISOString();
+        cm.setOrgSession(orgAuthCtx.env, orgAuthCtx.profile, orgUuid, session2, expiresAt);
+      }
+      apiClient.setOrgSession(session2, orgUuid);
+    };
+    if (cm && orgAuthCtx) {
+      const cached = cm.getOrgSession(orgAuthCtx.env, orgAuthCtx.profile, orgUuid);
+      if (cached) {
+        apiClient.setOrgSession(cached, orgUuid);
+        return;
+      }
+    }
     try {
       const orgSession = await tryDirectJoin(apiUrl, accessToken, orgAuthInfo);
       if (orgSession !== null) {
-        apiClient.setOrgSession(orgSession, orgAuthInfo.orgUuid);
+        adopt(orgSession);
         return;
       }
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
-      stderr(`Warning: org direct-join failed (${msg}); trying browser auth`);
+      stderr(`Warning: org direct-join failed (${msg}); trying browser sign-in`);
     }
-    if (!isAllowedAuthUrl(orgAuthInfo.authUrl, apiUrl)) {
+    if (!orgAuthCtx?.interactive || isHeadless()) {
       throw new Error(
-        `Refusing to open organization auth URL: scheme/host does not match the configured API host. Re-run with the expected --api-url, or contact support.`
+        "This workspace\u2019s organization requires SSO sign-in, which needs a browser.\nRun an interactive `gr` command on a machine with a browser to sign in once (the session is then cached), or use an API key for non-interactive use:\n  export GRAVITY_RAIL_API_KEY=<key>   (see: gr api-keys)"
       );
     }
-    stderr(`
-This workspace requires organization SSO authentication.`);
-    stderr(`Opening browser to complete authentication...`);
-    stderr(`  ${orgAuthInfo.authUrl}
-`);
-    stderr(`If the browser does not open, visit the URL above manually.`);
-    stderr(
-      `After signing in, re-run the command \u2014 the CLI cannot receive the SSO session directly.`
-    );
-    openBrowser(orgAuthInfo.authUrl);
-    await new Promise((_, reject) => {
-      const t = setTimeout(
-        () => reject(
-          new Error(
-            "Organization authentication timed out.\nPlease complete authentication in the browser, then re-run the command."
-          )
-        ),
-        ORG_AUTH_TIMEOUT_MS
+    if (!isAllowedAuthUrl(orgAuthInfo.authUrl, apiUrl, orgAuthCtx.frontendUrl)) {
+      throw new Error(
+        `Refusing to open organization auth URL: host does not match the configured API/frontend host. Re-run with the expected --api-url, or contact support.`
       );
-      t.unref?.();
-    });
-  });
-}
-
-// src/lib/pinned-fetch.ts
-import { Agent, fetch as undiciFetch } from "undici";
-function createPinnedFetch(apiUrl, apiIp) {
-  if (!apiIp) return fetch;
-  let parsed;
-  try {
-    parsed = new URL(apiUrl);
-  } catch {
-    return fetch;
-  }
-  const hostname = parsed.hostname;
-  const dispatcher = new Agent({
-    connect: {
-      servername: hostname
     }
+    const session = await stepUpViaBrowser(orgAuthInfo);
+    adopt(session);
   });
-  return async (input, init) => {
-    const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
-    let reqUrl;
-    try {
-      reqUrl = new URL(url, apiUrl);
-    } catch {
-      return fetch(input, init);
-    }
-    const headers = new Headers(init?.headers);
-    if (reqUrl.hostname === hostname) {
-      headers.set("Host", hostname);
-      reqUrl = new URL(reqUrl.href);
-      reqUrl.hostname = apiIp;
-    }
-    return undiciFetch(reqUrl, {
-      ...init,
-      headers,
-      dispatcher
-    });
-  };
 }
+
+// src/lib/sandbox-fetch.ts
 function withAuditHeaders(fetchFn, headers) {
   const { chatId, sessionId, toolCallId } = headers;
   return async (input, init) => {
@@ -404,7 +499,7 @@ function withAuditHeaders(fetchFn, headers) {
     return fetchFn(input, { ...init, headers: reqHeaders });
   };
 }
-function createBrokerFetchFromEnv(_brokerUrl) {
+function createSandboxFetchFromEnv() {
   const env = typeof process !== "undefined" ? process.env : {};
   const chatIdRaw = env.GRAVITY_RAIL_CHAT_ID;
   const chatId = chatIdRaw ? Number(chatIdRaw) : void 0;
@@ -414,30 +509,42 @@ function createBrokerFetchFromEnv(_brokerUrl) {
     toolCallId: env.GRAVITY_RAIL_TOOL_CALL_ID
   });
 }
-function createSandboxFetchFromEnv(apiUrl) {
-  const env = typeof process !== "undefined" ? process.env : {};
-  const apiIp = env.GRAVITY_RAIL_API_IP;
-  let fetchFn = createPinnedFetch(apiUrl, apiIp);
-  const chatIdRaw = env.GRAVITY_RAIL_CHAT_ID;
-  const chatId = chatIdRaw ? Number(chatIdRaw) : void 0;
-  return withAuditHeaders(fetchFn, {
-    chatId: chatId !== void 0 && Number.isFinite(chatId) ? chatId : void 0,
-    sessionId: env.GRAVITY_RAIL_SESSION_ID,
-    toolCallId: env.GRAVITY_RAIL_TOOL_CALL_ID
-  });
-}
 
 // src/lib/context.ts
-function makeApiClient(accessToken, apiUrl, fetchFn) {
-  const resolvedFetch = fetchFn ?? createSandboxFetchFromEnv(apiUrl);
+function makeApiClient(accessToken, apiUrl, fetchFn, orgAuthCtx) {
+  const resolvedFetch = fetchFn ?? createSandboxFetchFromEnv();
   const apiClient = new GravityRailClient(accessToken, apiUrl, resolvedFetch);
-  registerOrgAuthHandler(apiClient, apiUrl, accessToken ?? "");
+  registerOrgAuthHandler(apiClient, apiUrl, accessToken ?? "", orgAuthCtx);
   return apiClient;
 }
-function tryBrokerContext(ctx) {
+function interactiveOrgAuth(ctx) {
+  return {
+    credentialsManager: ctx.credentialsManager,
+    env: ctx.env,
+    profile: ctx.profile,
+    frontendUrl: ctx.envConfig.frontendUrl,
+    interactive: true
+  };
+}
+function isLoopbackBrokerUrl(rawUrl) {
+  try {
+    const { hostname, protocol } = new URL(rawUrl);
+    if (protocol !== "http:" && protocol !== "https:") return false;
+    const host = hostname.replace(/^\[|\]$/g, "");
+    return host === "127.0.0.1" || host === "::1" || host === "localhost";
+  } catch {
+    return false;
+  }
+}
+function sandboxBrokerUrl() {
   const brokerUrl = process.env.GRAVITY_RAIL_BROKER_URL;
+  if (!brokerUrl || !isLoopbackBrokerUrl(brokerUrl)) return null;
+  return brokerUrl;
+}
+function tryBrokerContext(ctx) {
+  const brokerUrl = sandboxBrokerUrl();
   if (!brokerUrl) return null;
-  const apiClient = makeApiClient(void 0, brokerUrl, createBrokerFetchFromEnv(brokerUrl));
+  const apiClient = makeApiClient(void 0, brokerUrl, createSandboxFetchFromEnv());
   return { ...ctx, accessToken: "", apiClient };
 }
 async function tryTokenRefresh(ctx, creds) {
@@ -450,7 +557,12 @@ async function tryTokenRefresh(ctx, creds) {
     ctx.profile
   );
   if (!refreshed?.accessToken) return null;
-  const apiClient = makeApiClient(refreshed.accessToken, ctx.envConfig.apiUrl);
+  const apiClient = makeApiClient(
+    refreshed.accessToken,
+    ctx.envConfig.apiUrl,
+    void 0,
+    interactiveOrgAuth(ctx)
+  );
   return {
     ...ctx,
     accessToken: refreshed.accessToken,
@@ -488,7 +600,12 @@ async function createAuthenticatedContext(opts) {
     const buffer = 5 * 60 * 1e3;
     const notExpired = !creds.expiresAt || new Date(creds.expiresAt) > new Date(Date.now() + buffer);
     if (notExpired) {
-      const apiClient = makeApiClient(creds.accessToken, ctx.envConfig.apiUrl);
+      const apiClient = makeApiClient(
+        creds.accessToken,
+        ctx.envConfig.apiUrl,
+        void 0,
+        interactiveOrgAuth(ctx)
+      );
       return {
         ...ctx,
         accessToken: creds.accessToken,
@@ -534,6 +651,8 @@ function createPublicContext(opts) {
 }
 async function createPublicAuthenticatedContext(opts) {
   const ctx = createPublicContext(opts);
+  const brokerCtx = tryBrokerContext(ctx);
+  if (brokerCtx) return brokerCtx;
   const apiKey = process.env.GRAVITY_RAIL_API_KEY;
   if (apiKey) {
     const apiClient = makeApiClient(apiKey, ctx.envConfig.apiUrl);
@@ -544,7 +663,12 @@ async function createPublicAuthenticatedContext(opts) {
     const buffer = 5 * 60 * 1e3;
     const notExpired = !creds.expiresAt || new Date(creds.expiresAt) > new Date(Date.now() + buffer);
     if (notExpired) {
-      const apiClient = makeApiClient(creds.accessToken, ctx.envConfig.apiUrl);
+      const apiClient = makeApiClient(
+        creds.accessToken,
+        ctx.envConfig.apiUrl,
+        void 0,
+        interactiveOrgAuth(ctx)
+      );
       return {
         ...ctx,
         accessToken: creds.accessToken,
@@ -694,6 +818,7 @@ export {
   COL,
   stderr,
   createSandboxFetchFromEnv,
+  sandboxBrokerUrl,
   createContext,
   createAuthenticatedContext,
   requireAuth,
@@ -708,4 +833,4 @@ export {
   confirmAccountPhoneVerify,
   getConciergeChatMessages
 };
-//# sourceMappingURL=chunk-LE5IR5MC.js.map
+//# sourceMappingURL=chunk-M4XMXS5D.js.map