@ateam-ai-mobile/core 0.1.9 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ateam-ai-mobile/core",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "Headless ADAS SDK core — auth bridge, API client, chat/job streaming, MCP calls, theme tokens. No UI, no Expo dependencies.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/authSession.ts

@@ -22,6 +22,7 @@
  * so behaviour is identical (the R0.5 authRefresh baseline is the oracle).
  */
 import { getCoreApiUrl, type RefreshOutcome } from './config';
+import { decodeJwtPayload } from './jwt';
 
 export interface SessionUser {
   actorId: string;
@@ -71,26 +72,6 @@ export interface AuthSessionDeps {
   onToken?: (token: string, user: SessionUser | null) => void | Promise<void>;
 }
 
-// ── JWT projection (verbatim from the app) ──────────────────────────────────
-
-function decodeJwtPayload(token: string): Record<string, any> | null {
-  try {
-    const segs = token.split('.');
-    if (segs.length !== 3) return null;
-    // base64url → base64
-    const b64 = segs[1].replace(/-/g, '+').replace(/_/g, '/');
-    // Pad to a multiple of 4
-    const padded = b64 + '='.repeat((4 - (b64.length % 4)) % 4);
-    const json = typeof atob === 'function'
-      ? atob(padded)
-      // Hermes always has atob; fallback for older runtimes
-      : Buffer.from(padded, 'base64').toString('utf8');
-    return JSON.parse(json);
-  } catch {
-    return null;
-  }
-}
-
 export function userFromJwt(token: string): SessionUser | null {
   const claims = decodeJwtPayload(token);
   if (!claims?.sub) return null;

package/src/config.ts

@@ -9,6 +9,7 @@
  */
 
 import type { AttachmentCache } from './storage/types';
+import { tenantFromToken } from './jwt';
 
 /** Result of a host-driven token refresh. Mirrors the semantics the API
  *  client depends on: only 'auth_failed' logs the user out; 'transient'
@@ -62,10 +63,9 @@ export interface AdasConfig {
    *  the user belongs to). */
   consumerAuthUrl?: UrlSource;
   tokenProvider: TokenProvider;
-  /** Tenant slug — used for plugin URL resolution and voice, never sent as a
-   *  header (the backend derives the tenant from the JWT). Pass a getter when
-   *  the host resolves the tenant after startup (storage hydration, runtime
-   *  tenant switch). */
+  /** The host's tenant PICK — used only while signed out (e.g. the login
+   *  screen's chosen workspace). A signed-in session's tenant is always the
+   *  token's `tenant` claim, the one the backend acts on (getTenant()). */
   tenant?: string | (() => string);
   /** Current end user as known to the host. actorId is used as the chat
    *  reply context; without it, replies route to 'unknown'. */
@@ -132,7 +132,17 @@ export function getConsumerAuthApiUrl(): string {
   return resolveUrl(url);
 }
 
+/** The tenant the app is scoped to. Signed in: the live token's `tenant` claim,
+ *  the same tenant every API call acts on, so a plugin URL, the voice session
+ *  and the header can never name a different workspace than the backend does
+ *  (2026-09-29: a stored pick still said 'ada' while the token said
+ *  ateam-mcp-test, and a plugin page 401'd). Signed out: the host's pick, or ''
+ *  when there is none — never a default tenant. */
 export function getTenant(): string {
+  const token = getConfig().tokenProvider.getToken();
+  // Signed in, the token is the ONLY answer: a token without a claim names no
+  // tenant (''), never the host's stored pick and never a default.
+  if (token) return tenantFromToken(token) || '';
   const t = getConfig().tenant;
   return (typeof t === 'function' ? t() : t) || '';
 }

package/src/index.ts

@@ -50,6 +50,7 @@ export type { Session, SessionEnv } from './session';
 // SDK-owned session state machine (R6) — JWT lifecycle, refresh table, restore,
 // logout orchestration. The host provides secure storage + a logout teardown hook.
 export { createAuthSession, userFromJwt } from './authSession';
+export { tenantFromToken } from './jwt';
 export type {
   AuthSession,
   AuthSessionState,

package/src/jwt.ts

@@ -0,0 +1,29 @@
+// JWT projection shared by the session state machine and the tenant getter.
+// Decode only: the token was issued and is verified by the platform; the client
+// reads its claims to know WHO and WHERE, never to trust them for access.
+
+export function decodeJwtPayload(token: string): Record<string, any> | null {
+  try {
+    const segs = token.split('.');
+    if (segs.length !== 3) return null;
+    // base64url → base64
+    const b64 = segs[1].replace(/-/g, '+').replace(/_/g, '/');
+    // Pad to a multiple of 4
+    const padded = b64 + '='.repeat((4 - (b64.length % 4)) % 4);
+    const json = typeof atob === 'function'
+      ? atob(padded)
+      // Hermes always has atob; fallback for older runtimes
+      : Buffer.from(padded, 'base64').toString('utf8');
+    return JSON.parse(json);
+  } catch {
+    return null;
+  }
+}
+
+/** The tenant a signed-in session is scoped to: the token's `tenant` claim, the
+ *  same value the backend reads. Null for no token or a token without one. */
+export function tenantFromToken(token: string | null | undefined): string | null {
+  if (!token) return null;
+  const t = decodeJwtPayload(token)?.tenant;
+  return typeof t === 'string' && t ? t : null;
+}