new(chat, org-workbench, workspace): didi knows which org is loaded — focused-entity context lands

The org workbench broadcasts its active org (augment-it:active-entity
event + localStorage, the search-envelope race-hardening pattern) on
every card load, clear, and workspace switch. The chat rail picks it up
and rides focused_org_slug/name on every chat_turn; the context slab
tells didi "the user is viewing X (org_slug: …) — 'this org' refers to
it", and the crawl shortcuts accept bare /crawl-links, /crawl-streams,
/crawl-team (no argument) against the focused org. This is the
didi-chat plan's step-1 context plumbing, landed ahead of the team-page
staging it was scoped for.

Rider on #33.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UvYzx7vDWeafnkAi2nEQeb

Author: mpstaton

apps/chat/src/ChatSurface.svelte

@@ -119,6 +119,28 @@
     suggest(workspace.activeView, workspace.last_capability),
   );
 
+  // Focused entity — the org card open in the Org Workbench, broadcast via
+  // augment-it:active-entity + localStorage (race-hardened like the search
+  // envelope). Lets didi resolve "this org" without asking.
+  const ACTIVE_ENTITY_KEY = 'augment-it:active-entity';
+  type ActiveEntity = { type: 'organization'; org_slug: string; display_name?: string };
+  function readActiveEntity(): ActiveEntity | null {
+    try {
+      const raw = typeof localStorage !== 'undefined' ? localStorage.getItem(ACTIVE_ENTITY_KEY) : null;
+      return raw ? (JSON.parse(raw) as ActiveEntity) : null;
+    } catch {
+      return null;
+    }
+  }
+  let activeEntity = $state<ActiveEntity | null>(readActiveEntity());
+  $effect(() => {
+    const onEntity = (e: Event) => {
+      activeEntity = ((e as CustomEvent).detail as ActiveEntity | null) ?? null;
+    };
+    window.addEventListener('augment-it:active-entity', onEntity);
+    return () => window.removeEventListener('augment-it:active-entity', onEntity);
+  });
+
   // Send context — what the user is looking at right now. The server
   // inlines this in the prompt so the model can pick a record_set_id
   // for prompt.draft without asking. `client_id` is the active workspace,
@@ -128,13 +150,24 @@
     focused_prompt_id?: string;
     record_set_id?: string;
     client_id?: string;
+    focused_org_slug?: string;
+    focused_org_name?: string;
   } | undefined>(
     (() => {
-      const ctx: { record_set_id?: string; client_id?: string } = {};
+      const ctx: {
+        record_set_id?: string;
+        client_id?: string;
+        focused_org_slug?: string;
+        focused_org_name?: string;
+      } = {};
       if (workspace.activeView.kind === 'record_set') {
         ctx.record_set_id = workspace.activeView.record_set_id;
       }
       if (workspace.active_client_id) ctx.client_id = workspace.active_client_id;
+      if (activeEntity?.type === 'organization') {
+        ctx.focused_org_slug = activeEntity.org_slug;
+        if (activeEntity.display_name) ctx.focused_org_name = activeEntity.display_name;
+      }
       return Object.keys(ctx).length ? ctx : undefined;
     })(),
   );

apps/chat/src/chat-state.svelte.ts

@@ -41,7 +41,16 @@ class ChatState {
    * The propose / invoke branches don't auto-act — the surface renders
    * affordances and the user clicks to accept.
    */
-  async sendMessage(message: string, context?: { focused_prompt_id?: string; record_set_id?: string; client_id?: string }): Promise<void> {
+  async sendMessage(
+    message: string,
+    context?: {
+      focused_prompt_id?: string;
+      record_set_id?: string;
+      client_id?: string;
+      focused_org_slug?: string;
+      focused_org_name?: string;
+    },
+  ): Promise<void> {
     if (this.sending) return;
     if (!message.trim()) return;
     const id = `t_${Date.now().toString(36)}`;

apps/org-workbench/src/App.svelte

@@ -20,6 +20,20 @@
   const WS_URL = 'ws://localhost:3001/ws';
   // Restore the last-worked org on remount (HMR, flow switch, tab reopen).
   const ACTIVE_ORG_KEY = 'augment-it:org-workbench:active-org';
+  // Cross-remote focused-entity broadcast — the chat rail includes it in
+  // every chat_turn so didi knows what "this org" means. Event + localStorage
+  // (the search-envelope race-hardening pattern, spec D2).
+  const ACTIVE_ENTITY_KEY = 'augment-it:active-entity';
+
+  function broadcastActiveEntity(
+    detail: { type: 'organization'; org_slug: string; display_name?: string } | null,
+  ) {
+    if (typeof localStorage !== 'undefined') {
+      if (detail) localStorage.setItem(ACTIVE_ENTITY_KEY, JSON.stringify(detail));
+      else localStorage.removeItem(ACTIVE_ENTITY_KEY);
+    }
+    window.dispatchEvent(new CustomEvent('augment-it:active-entity', { detail }));
+  }
 
   let status = $state<'connecting' | 'open' | 'closed' | 'error'>('connecting');
   let client = $state<string>('reach-edu');
@@ -34,9 +48,15 @@
     try {
       org = await fetchOrgDetail(org_slug, client);
       if (typeof localStorage !== 'undefined') localStorage.setItem(ACTIVE_ORG_KEY, org_slug);
+      broadcastActiveEntity({
+        type: 'organization',
+        org_slug: org.slug,
+        display_name: org.complete_name ?? org.conventional_name ?? org.slug,
+      });
     } catch (err) {
       error = err instanceof Error ? err.message : String(err);
       org = null;
+      broadcastActiveEntity(null);
     } finally {
       loading = false;
     }
@@ -73,6 +93,7 @@
     // A different client sees a different slice of the canonical layer —
     // drop the card rather than show rows the new client may not access.
     org = null;
+    broadcastActiveEntity(null);
   }
 
   async function loadActiveClient() {

packages/workspace/src/types.ts

@@ -269,7 +269,16 @@ export type ChatTurnFrame = {
    * the wire field is `client_id` (lived-with naming with the prior
    * substrate plan; the UI/spec word is "workspace").
    */
-  context?: { focused_prompt_id?: string; record_set_id?: string; client_id?: string };
+  context?: {
+    focused_prompt_id?: string;
+    record_set_id?: string;
+    client_id?: string;
+    // The org card open in the Org Workbench — broadcast via
+    // augment-it:active-entity (+ localStorage, same race-hardening as the
+    // search envelope) so didi's "this org" resolves without asking.
+    focused_org_slug?: string;
+    focused_org_name?: string;
+  };
 };
 
 // One workspace as discovered by the workspace-service. The directory

services/workspace/src/chat.ts

@@ -127,6 +127,7 @@ VERB RECOGNITION SHORTCUTS:
 - "/crawl-links <org-slug>" → chat_invoke organization.crawl with target "links".
 - "/crawl-streams <org-slug>" → chat_invoke organization.crawl with target "streams".
 - "/crawl-team <org-slug>" → chat_invoke organization.crawl with target "team".
+- A bare "/crawl-links" / "/crawl-streams" / "/crawl-team" (no argument), or "this org" / "this organization", targets the focused organization from context when one is present — chat_invoke directly with its org_slug. No focused org and no argument → ask.
 - Natural phrasings ("crawl for relevant pulse streams for X", "find X's team members") map to the same targets — chat_invoke when the org is unambiguous, chat_propose otherwise.
 `;
 
@@ -221,7 +222,14 @@ export const CHAT_TOOLS = [
 export type ChatTurnInput = {
   message: string;
   thread?: { role: 'user' | 'assistant'; content: string }[];
-  context?: { focused_prompt_id?: string; record_set_id?: string; client_id?: string };
+  context?: {
+    focused_prompt_id?: string;
+    record_set_id?: string;
+    client_id?: string;
+    // The org card open in the Org Workbench — "this org" resolves to it.
+    focused_org_slug?: string;
+    focused_org_name?: string;
+  };
   suggestions?: { capability: string; hint: string }[];
 };
 
@@ -262,6 +270,11 @@ function contextSlab(ctx?: ChatTurnInput['context']): string {
   }
   if (ctx?.focused_prompt_id) parts.push(`The user is currently looking at prompt: ${ctx.focused_prompt_id}`);
   if (ctx?.record_set_id) parts.push(`The user is currently in record set: ${ctx.record_set_id}`);
+  if (ctx?.focused_org_slug) {
+    parts.push(
+      `The user is currently viewing the organization "${ctx.focused_org_name ?? ctx.focused_org_slug}" (org_slug: ${ctx.focused_org_slug}) in the Org Workbench. "This org" / "this organization" refers to it — use this org_slug for organization.crawl and any org-scoped capability.`,
+    );
+  }
   return parts.join('\n') + '\n';
 }
 

services/workspace/src/ws.ts

@@ -156,7 +156,13 @@ export async function registerWebsocket(app: FastifyInstance): Promise<void> {
         via?: string;
         message?: string;
         thread_id?: string;
-        context?: { focused_prompt_id?: string; record_set_id?: string; client_id?: string };
+        context?: {
+          focused_prompt_id?: string;
+          record_set_id?: string;
+          client_id?: string;
+          focused_org_slug?: string;
+          focused_org_name?: string;
+        };
         thread?: { role: 'user' | 'assistant'; content: string }[];
         suggestions?: { capability: string; hint: string }[];
       };