@@ -0,0 +1,18 @@
+---
+'@object-ui/app-shell': patch
+---
+
+fix(app-shell): the console AI dock tells the agent which app the user has selected and which page or record is in view, instead of the constant `activeApp: 'AI'` and no page at all (#30043)
+
+Clause-②: no
+Metadata-protocol: none
+
+Every chat request the console sends to `POST /api/v1/ai/agents/:agent/chat` used to carry `context.activeApp: 'AI'`, whatever app the user was in, and the floating dock sent no `context.surface`. So the assistant asked "which app?" and "which record?" while the screen showed both.
+
+Now:
+
+- `context.activeApp` is the package of the app the user has selected: the console app the dock sits in (whether the dock runs `ask` or `build`), the app picked for editing on the full-page `/ai/build?package=…`, the package the Studio copilot designs. With no app selected the key is left out; nothing sends a placeholder.
+- The dock, on the desktop rail and the phone sheet alike, sends `context.surface` in cloud#1610's existing shape for the page in view: an object list (`artifact: { type: 'object', name }`, with `selection: { kind: 'view', id }` on a saved list view), a record page (the object plus `selection: { kind: 'record', id }`), a dashboard, report or page (`artifact: { type, name }`, `mode: 'design'` in the dashboard designer). A page that shows no one artifact (the app landing, search, a component page) sends no `surface`.
+- Both are read on every send, so navigating with the dock open moves the next turn's context.
+
+The dock's "discussing" chip now names the object by its label on object pages, as the Studio copilot's chip already did for its artifacts.
@@ -1534,6 +1534,7 @@ export function AppContent({ extraRoutes, extraRoutesNoApp }: AppContentProps =
         objects={allObjects}
         connectionState={connectionState}
         userId={user?.id}
+        hostRoutePaths={hostRoutePaths}
       >
         <CommandPalette
           apps={apps}
 
@@ -109,6 +109,7 @@ import {
 import { AppHeader } from '../../layout/AppHeader.js';
 import { CONSOLE_TOP_BAR } from '../../layout/consoleTopBar.js';
 import { armChatDockExpanded, readDockReturnLocation } from '../../layout/chatDockState.js';
+import type { ChatSurfaceContext } from '../../layout/chatSurfaceContext.js';
 import {
   useAdvertiseShortcut,
   type AdvertisedShortcut,
@@ -1572,11 +1573,7 @@ interface ChatPaneProps {
    * `context.surface` on every turn (the transport reads the body per send),
    * and surfaced to the user as a chip above the composer.
    */
-  surfaceContext?: {
-    pillar?: string;
-    artifact?: { type: string; name: string };
-    mode?: string;
-  };
+  surfaceContext?: ChatSurfaceContext;
   /**
    * objectui#8219 — the display label of `surfaceContext.artifact`, when the
    * host knows it (Studio: the Interfaces pillar's open leaf). Display-only: the
@@ -1597,6 +1594,13 @@ interface ChatPaneProps {
   /** ADR-0070 "Edit with AI": the package the user opened to edit (from `?package=`),
    *  forwarded to the build agent as `context.packageId` to scope it to that app. */
   editPackageId?: string;
+  /**
+   * objectstack#30043 — the app the user has selected, by its package: the
+   * console app the dock sits in, whichever agent it runs. Sent as
+   * `context.activeApp`; absent, `editPackageId` (the app picked for editing)
+   * is the selection, and with neither the key is omitted, never a placeholder.
+   */
+  activeAppPackageId?: string;
   /** A1.b bind-on-create: fired when this pane's build history binds to a package
    *  while the surface has no `?package=` — the page re-keys the conversation to
    *  `app:${pkg}:build` and writes `?package=` onto the URL. */
@@ -1636,6 +1640,7 @@ export function ChatPane({
   apiBase,
   conversationId,
   editPackageId,
+  activeAppPackageId,
   surfaceContext,
   surfaceArtifactLabel,
   onPackageBound,
@@ -1869,6 +1874,7 @@ export function ChatPane({
   // pane mounts while the catalog is still loading, and a server without an
   // AI service answers that catalog empty and `/models` with a 501.
   const { models: aiModels, defaultModelId } = useAiModels({ apiBase, enabled: agents.length > 0 });
+  const selectedApp = activeAppPackageId || editPackageId || undefined;
   const [selectedModelId, setSelectedModelId] = useState<string | undefined>(undefined);
   const effectiveModelId = selectedModelId ?? defaultModelId;
 
@@ -1892,7 +1898,10 @@ export function ChatPane({
     onError: handleChatError,
     body: {
       context: {
-        activeApp: 'AI',
+        // objectstack#30043 — the app the user has selected, never a constant:
+        // the agent was told "AI" while the user stood in their CRM. Omitted
+        // when nothing is selected.
+        ...(selectedApp ? { activeApp: selectedApp } : {}),
         agentName: activeAgent,
         // Tell the agent the environment's publish posture so its narration
         // matches reality (an auto-published build is live, not "to publish").
@@ -1902,6 +1911,7 @@ export function ChatPane({
         ...(editPackageId ? { packageId: editPackageId } : {}),
         // cloud#1610 — what the user is currently discussing (advisory; the
         // transport reads the body per send, so this stays fresh per turn).
+        // The console dock sends the page in view too (objectstack#30043).
         ...(surfaceContext ? { surface: surfaceContext } : {}),
       },
     },
 
@@ -32,6 +32,7 @@ import { useObjectTranslation } from '@object-ui/i18n';
 import { resolveApiBase } from '../console/ai/resolveApiBase.js';
 import { AiUsageIndicator } from './AiUsageIndicator.js';
 import { usePlanApprovalPending } from '../assistant/assistantBus.js';
+import type { ChatSurfaceContext } from './chatSurfaceContext.js';
 import {
   clampDockWidth,
   maximizedDockWidth,
@@ -248,6 +249,14 @@ export interface ChatDockPanelProps {
    * `children`.
    */
   appPackageId?: string;
+  /**
+   * objectstack#30043 — the page in view, forwarded to the default body as
+   * `context.surface` (see {@link ChatDockConversation}). Unused with
+   * `children`.
+   */
+  surfaceContext?: ChatSurfaceContext;
+  /** objectui#8219 — the chip's display label for `surfaceContext.artifact`. Unused with `children`. */
+  surfaceArtifactLabel?: string;
   /** Header title override; default "Assistant". */
   title?: string;
   /**
@@ -281,6 +290,8 @@ export function ChatDockPanel({
   apiBase: apiBaseProp,
   defaultAgent,
   appPackageId,
+  surfaceContext,
+  surfaceArtifactLabel,
   title,
   onMaximize,
   children,
@@ -367,6 +378,8 @@ export function ChatDockPanel({
               apiBase={apiBase}
               defaultAgent={defaultAgent}
               appPackageId={appPackageId}
+              surfaceContext={surfaceContext}
+              surfaceArtifactLabel={surfaceArtifactLabel}
               onCanvasOpenChange={handleCanvasOpenChange}
               onBoundPackageChange={setBoundPackageId}
             />
@@ -388,6 +401,10 @@ export interface ChatDockMobileSheetProps {
   defaultAgent?: string;
   /** objectui#10926 — same contract as {@link ChatDockPanelProps.appPackageId}. */
   appPackageId?: string;
+  /** objectstack#30043 — same contract as {@link ChatDockPanelProps.surfaceContext}. */
+  surfaceContext?: ChatSurfaceContext;
+  /** Same contract as {@link ChatDockPanelProps.surfaceArtifactLabel}. */
+  surfaceArtifactLabel?: string;
   /** Header title override; default "Assistant". */
   title?: string;
   /**
@@ -427,6 +444,8 @@ export function ChatDockMobileSheet({
   apiBase: apiBaseProp,
   defaultAgent,
   appPackageId,
+  surfaceContext,
+  surfaceArtifactLabel,
   title,
   onMaximize,
   children,
@@ -491,6 +510,8 @@ export function ChatDockMobileSheet({
                 apiBase={apiBase}
                 defaultAgent={defaultAgent}
                 appPackageId={appPackageId}
+                surfaceContext={surfaceContext}
+                surfaceArtifactLabel={surfaceArtifactLabel}
                 onBoundPackageChange={setBoundPackageId}
               />
             </React.Suspense>
 
@@ -22,6 +22,7 @@ import { chatConversationScope, chatProductOfAgent } from '../hooks/chatScope.js
 import { resolveSurfaceAgent } from '../hooks/surfaceAgent.js';
 import { useCanAuthorMetadata } from '../hooks/useCanAuthorMetadata.js';
 import { isAiStudioEnabled } from '../runtime-config.js';
+import type { ChatSurfaceContext } from './chatSurfaceContext.js';
 
 export interface ChatDockConversationProps {
   userId: string | undefined;
@@ -38,6 +39,15 @@ export interface ChatDockConversationProps {
    * authorable (see {@link ChatDockConversation}). Absent → app-less.
    */
   appPackageId?: string;
+  /**
+   * objectstack#30043 — the page in view, as `context.surface` (cloud#1610's
+   * shape; the layout reads it off the URL, see `consoleChatSurface`).
+   * Re-read on every render and so on every send: navigating with the dock
+   * open moves the next turn's surface. Absent → no `surface` key.
+   */
+  surfaceContext?: ChatSurfaceContext;
+  /** objectui#8219 — the display label of `surfaceContext.artifact`, for the chip only. */
+  surfaceArtifactLabel?: string;
   /** ADR-0037/P3c — the Live Canvas open/close seam, forwarded to ChatPane. */
   onCanvasOpenChange?: (open: boolean) => void;
   /**
@@ -74,6 +84,8 @@ export function ChatDockConversation({
   apiBase,
   defaultAgent,
   appPackageId,
+  surfaceContext,
+  surfaceArtifactLabel,
   onCanvasOpenChange,
   onBoundPackageChange,
 }: ChatDockConversationProps) {
@@ -143,6 +155,11 @@ export function ChatDockConversation({
       apiBase={apiBase}
       conversationId={paneConversationId}
       editPackageId={editPackageId}
+      // objectstack#30043 — the app the dock sits in is the selected app,
+      // whichever agent runs and whether or not a build thread binds to it.
+      activeAppPackageId={appPackageId}
+      surfaceContext={surfaceContext}
+      surfaceArtifactLabel={surfaceArtifactLabel}
       initialMessages={paneInitialMessages}
       pendingFirstMessageRef={pendingFirstMessageRef}
       onSent={() => {}}
 
@@ -8,17 +8,18 @@
  * @module
  */
 
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { AppShell } from '@object-ui/layout';
 import { useIsMobile } from '@object-ui/components';
-import { useObjectTranslation } from '@object-ui/i18n';
+import { useObjectLabel, useObjectTranslation } from '@object-ui/i18n';
 
 // Lightweight FAB stub — the heavy chat chunk graph (plugin-chatbot,
 // shiki, streamdown, mermaid, @ai-sdk, ~20MB) only downloads on first
 // hover/click. See ConsoleChatbotFab.tsx.
 import { ConsoleChatbotFab } from './ConsoleChatbotFab.js';
 import { useChatDockState, ChatDockPanel, ChatDockMobileSheet } from './ChatDock.js';
+import { consoleChatSurface } from './chatSurfaceContext.js';
 import {
   matchChatDockShortcut,
   rememberDockReturnLocation,
@@ -64,6 +65,12 @@ interface ConsoleLayoutProps {
    * server-backed conversation history. Omit for unauthenticated/local-only.
    */
   userId?: string;
+  /**
+   * objectstack#30043 — the paths of the host's extra app routes
+   * (`AppContent`'s `extraRoutes`). A page one of them draws names no surface
+   * to the dock, the way it shadows `:objectName` in `<Routes>`.
+   */
+  hostRoutePaths?: readonly string[];
 }
 
 /**
@@ -145,6 +152,7 @@ export function ConsoleLayout({
   objects,
   connectionState,
   userId,
+  hostRoutePaths,
 }: ConsoleLayoutProps) {
   const appLabel = resolveKeyedI18nLabel(activeApp?.label) || activeAppName;
   // objectstack#28077 — once, before `AppShell`'s sidebar provider reads its
@@ -187,6 +195,24 @@ export function ConsoleLayout({
   // page draws its phone face at, so the two never disagree for a frame.
   const phone = usePhoneViewport();
   const recordPageOwnsTopBar = phone && isRecordPagePath(location.pathname);
+  // objectstack#30043 — the page in view, handed to the dock as its
+  // `context.surface` (cloud#1610's shape): the object of a list, the object
+  // and record id of a record page, the dashboard, report or page. Read off the
+  // URL each render, so the next send after a navigation carries the new page.
+  const dockSurface = useMemo(
+    () => consoleChatSurface(location.pathname, hostRoutePaths),
+    [location.pathname, hostRoutePaths],
+  );
+  // The chip's label for an object surface: the object's own translated
+  // label, the one its page shows. Display only; it never enters
+  // `context.surface`. No definition in hand → the chip reads `type · name`.
+  const { objectLabel } = useObjectLabel();
+  const dockSurfaceLabel = useMemo(() => {
+    const artifact = dockSurface?.artifact;
+    if (artifact?.type !== 'object') return undefined;
+    const def = (objects as ConsoleObject[] | undefined)?.find((o) => o?.name === artifact.name);
+    return def ? objectLabel({ name: def.name, label: def.label ?? '' }) || undefined : undefined;
+  }, [dockSurface, objects, objectLabel]);
   // "/ai = the dock maximized": record where we maximized FROM at click time,
   // so the page's collapse-to-dock returns exactly here (history-back could
   // land on a prior /ai URL after in-page conversation switches).
@@ -272,6 +298,8 @@ export function ConsoleLayout({
             // objectui#10926 — the app a build thread binds to (authorable
             // packages only; the dock decides).
             appPackageId={activeApp?._packageId}
+            surfaceContext={dockSurface}
+            surfaceArtifactLabel={dockSurfaceLabel}
             // ADR-0057 P3c — "/ai = the dock maximized": the maximize button
             // opens the full-page surface on THE SAME THREAD this rail shows —
             // `/ai` for an app-less thread (canonicalized to the default agent,
@@ -352,6 +380,8 @@ export function ConsoleLayout({
           userId={userId}
           defaultAgent={activeApp?.defaultAgent}
           appPackageId={activeApp?._packageId}
+          surfaceContext={dockSurface}
+          surfaceArtifactLabel={dockSurfaceLabel}
           // Bridge to full-page /ai (history + share live there on mobile). The
           // sheet defers the navigation until it has cleanly closed.
           onMaximize={openDockFullPage}
Original file line number	Diff line number	Diff line change
`@@ -1534,6 +1534,7 @@ export function AppContent({ extraRoutes, extraRoutesNoApp }: AppContentProps =`
`1534`	`1534`	`objects={allObjects}`
`1535`	`1535`	`connectionState={connectionState}`
`1536`	`1536`	`userId={user?.id}`
	`1537`	`+ hostRoutePaths={hostRoutePaths}`
`1537`	`1538`	`>`
`1538`	`1539`	`<CommandPalette`
`1539`	`1540`	`apps={apps}`