@ateam-ai-mobile/core 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ateam-ai-mobile/core",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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/chat/store.ts

@@ -182,7 +182,16 @@ function renderTableShape(content: any): string | null {
  */
 export function blocksToText(blocks?: Array<{ kind: string; content: any }>): string {
   if (!blocks || blocks.length === 0) return '';
+  // Mirror the web renderer: when a human-readable text/markdown block exists in
+  // the same turn, drop internal-state json/code blocks (planning state,
+  // askUser payloads) — otherwise they render as a raw ```json blob AFTER the
+  // real answer. Standalone json/code (no text block, e.g. a table-only turn)
+  // still renders as before.
+  const hasTextBlock = blocks.some(
+    b => b.kind === 'text' || b.kind === 'markdown' || b.kind === 'description',
+  );
   return blocks.map(b => {
+    if ((b.kind === 'json' || b.kind === 'code') && hasTextBlock) return '';
     if (b.kind === 'text' || b.kind === 'markdown' || b.kind === 'description') {
       return typeof b.content === 'string' ? b.content : '';
     }

package/src/index.ts

@@ -44,6 +44,8 @@ export {
 } from './api/mcp';
 
 // Tenant memberships
+export { getSession, isDevHost } from './session';
+export type { Session, SessionEnv } from './session';
 export { listMyTenants, switchTenant } from './api/tenants';
 export type { TenantMembership } from './api/tenants';
 

package/src/session.ts

@@ -0,0 +1,62 @@
+// packages/core/src/session.ts
+//
+// THE single answer to "where am I / what am I talking to / who am I", derived
+// from the SDK config the REQUESTS themselves use — getTenant / getConsumerAuthApiUrl
+// / getCoreApiUrl / getUser. Because the label reads from the same place the
+// request reads, they cannot disagree. Host-agnostic: any host that calls
+// initAdas() gets a correct session with no parallel copy to drift.
+//
+// Rule: DERIVE, NEVER STORE — see Docs/DERIVE_NEVER_STORE.md. This lives in the
+// SDK (not a host app) so iOS/Android/RN hosts share one derivation; the host's
+// React hook (e.g. useSession) is a thin wrapper that just re-renders on change.
+
+import { getTenant, getConsumerAuthApiUrl, getCoreApiUrl, getUser } from './config';
+
+export type SessionEnv = 'dev' | 'prod';
+
+export interface Session {
+  /** Tenant slug the app is actually scoped to (getTenant = signed-in tenant,
+   *  falling back to the pre-auth choice). Null when neither is set. */
+  tenant: string | null;
+  /** Human label for the tenant — slug today; callers must not compute their own. */
+  tenantName: string;
+  /** dev | prod — derived from the resolved host, never a stored word. */
+  env: SessionEnv;
+  /** The actual backend host — a host can't be ambiguous the way a word can. */
+  host: string;
+  actorId: string | null;
+  email: string | null;
+}
+
+function hostOf(u: string | undefined | null): string {
+  if (!u) return '';
+  try { return new URL(u).host; } catch { return u; }
+}
+
+/** Is a resolved base URL a dev backend? Keyed on the hostname (dev-app…,
+ *  dev-consumer-auth…) so it matches wherever the request goes. */
+export function isDevHost(u: string | undefined | null): boolean {
+  const h = hostOf(u);
+  return !!h && (h.includes('dev-') || /(^|\.)dev\./.test(h));
+}
+
+/** Compute the session from the live SDK config. Plain function — a host hook
+ *  wraps this for reactivity; imperative code can call it directly. */
+export function getSession(): Session {
+  let consumerUrl = '';
+  try { consumerUrl = getConsumerAuthApiUrl(); } catch { /* not configured yet */ }
+  let coreUrl = '';
+  try { coreUrl = getCoreApiUrl(); } catch { /* not configured yet */ }
+
+  const tenant = getTenant() || null;
+  const user = getUser();
+
+  return {
+    tenant,
+    tenantName: tenant || '—',
+    env: isDevHost(consumerUrl) || isDevHost(coreUrl) ? 'dev' : 'prod',
+    host: hostOf(consumerUrl || coreUrl),
+    actorId: user?.actorId ?? null,
+    email: user?.email ?? null,
+  };
+}