@stigmer/react 3.12.7 → 3.12.8

package/src/memory/__tests__/memoryHooks.test.tsx

@@ -5,9 +5,11 @@ import { create } from "@bufbuild/protobuf";
 import { MemorySchema, type Memory } from "@stigmer/protos/ai/stigmer/agentic/memory/v1/api_pb";
 import { MemoryLifecycleState } from "@stigmer/protos/ai/stigmer/agentic/memory/v1/enum_pb";
 import { MemoryListSchema } from "@stigmer/protos/ai/stigmer/agentic/memory/v1/io_pb";
+import { StigmerError } from "@stigmer/sdk";
 import { StigmerContext } from "../../context";
 import { FetchCacheContext } from "../../internal/FetchCacheProvider";
 import { useMemories } from "../useMemories";
+import { useMemory } from "../useMemory";
 import { useConfirmMemory } from "../useConfirmMemory";
 import { useRejectMemory } from "../useRejectMemory";
 import { useDeleteMemory } from "../useDeleteMemory";
@@ -101,6 +103,67 @@ describe("useMemories", () => {
   });
 });
 
+describe("useMemory", () => {
+  it("fetches one record by id", async () => {
+    const get = vi.fn().mockResolvedValue(PROPOSED);
+    const client = { memory: { get } };
+
+    const { result } = renderHook(() => useMemory("mem_proposed"), {
+      wrapper: wrapper(client),
+    });
+
+    await waitFor(() => expect(result.current.isLoading).toBe(false));
+    expect(result.current.memory).toBe(PROPOSED);
+    expect(result.current.notFound).toBe(false);
+    expect(result.current.error).toBeNull();
+    expect(get).toHaveBeenCalledWith("mem_proposed");
+  });
+
+  it("reports a deleted record as the notFound STATE, never an error", async () => {
+    // Deletion is the consent-revocation mechanism — a consumer must
+    // render "no longer stored", not a failure.
+    const get = vi
+      .fn()
+      .mockRejectedValue(new StigmerError("not-found", "memory not found", 5));
+    const client = { memory: { get } };
+
+    const { result } = renderHook(() => useMemory("mem_gone"), {
+      wrapper: wrapper(client),
+    });
+
+    await waitFor(() => expect(result.current.isLoading).toBe(false));
+    expect(result.current.notFound).toBe(true);
+    expect(result.current.memory).toBeNull();
+    expect(result.current.error).toBeNull();
+  });
+
+  it("propagates every other failure as an error", async () => {
+    const failure = new StigmerError("unavailable", "server down", 14);
+    const client = { memory: { get: vi.fn().mockRejectedValue(failure) } };
+
+    const { result } = renderHook(() => useMemory("mem_x"), {
+      wrapper: wrapper(client),
+    });
+
+    await waitFor(() => expect(result.current.isLoading).toBe(false));
+    expect(result.current.error).toBe(failure);
+    expect(result.current.notFound).toBe(false);
+  });
+
+  it("skips fetching when id is null", () => {
+    const get = vi.fn();
+    const client = { memory: { get } };
+
+    const { result } = renderHook(() => useMemory(null), {
+      wrapper: wrapper(client),
+    });
+
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.memory).toBeNull();
+    expect(get).not.toHaveBeenCalled();
+  });
+});
+
 // ---------------------------------------------------------------------------
 // Decision hooks
 // ---------------------------------------------------------------------------

package/src/memory/index.ts

@@ -4,12 +4,17 @@
 // is recalled until its subject confirms it.
 
 export { MemoryListPanel, type MemoryListPanelProps } from "./MemoryListPanel.js";
+export {
+  MemoryProposalCardBody,
+  type MemoryProposalCardBodyProps,
+} from "./MemoryProposalCard.js";
 export {
   groupMemoriesByLifecycle,
   formatMemoryProvenance,
   type MemoryGroups,
 } from "./memoryGroups.js";
 export { useMemories, type UseMemoriesReturn } from "./useMemories.js";
+export { useMemory, type UseMemoryReturn } from "./useMemory.js";
 export { useConfirmMemory, type UseConfirmMemoryReturn } from "./useConfirmMemory.js";
 export { useRejectMemory, type UseRejectMemoryReturn } from "./useRejectMemory.js";
 export { useDeleteMemory, type UseDeleteMemoryReturn } from "./useDeleteMemory.js";

package/src/memory/useMemory.ts

@@ -0,0 +1,80 @@
+"use client";
+
+import type { Memory } from "@stigmer/protos/ai/stigmer/agentic/memory/v1/api_pb";
+import { isNotFound } from "@stigmer/sdk";
+import { useStigmer } from "../hooks.js";
+import { useFetch } from "../internal/useFetch.js";
+
+/** Return value of {@link useMemory}. */
+export interface UseMemoryReturn {
+  /** The memory record, or `null` while loading / not found / on error. */
+  readonly memory: Memory | null;
+  /** `true` while the initial fetch is in flight. */
+  readonly isLoading: boolean;
+  /**
+   * `true` when the record no longer exists. A first-class STATE, not an
+   * error: deletion is the platform's consent-revocation mechanism, so a
+   * consumer (the proposal chip, a deep link) must render "no longer
+   * stored" honestly rather than a failure.
+   */
+  readonly notFound: boolean;
+  /** Error from the last failed request (never not-found), or `null`. */
+  readonly error: Error | null;
+  /** Discard cached data and re-fetch the record from the server. */
+  readonly refetch: () => void;
+}
+
+/** The fetch result shape that keeps not-found distinct from errors. */
+interface MemoryLookup {
+  readonly memory: Memory | null;
+  readonly notFound: boolean;
+}
+
+const PENDING_LOOKUP: MemoryLookup = { memory: null, notFound: false };
+
+/**
+ * Data hook that fetches one memory record by id.
+ *
+ * Built for surfaces that hold a memory's identity but not its CURRENT
+ * lifecycle state — the in-thread proposal chip is the primary consumer:
+ * the tool result it renders from is frozen at capture time, while the
+ * record may have been confirmed, rejected, or deleted since (from the
+ * chip itself, the memory settings page, or another device). Content
+ * visibility is subject-only, so the fetch answers only for the person
+ * the memory is about.
+ *
+ * Pass `null` as `id` to skip fetching (stable no-op).
+ *
+ * @example
+ * ```tsx
+ * const { memory, isLoading, notFound } = useMemory(memoryId);
+ * ```
+ */
+export function useMemory(id: string | null): UseMemoryReturn {
+  const stigmer = useStigmer();
+
+  const { data, isLoading, error, refetch } = useFetch(
+    id
+      ? () =>
+          stigmer.memory.get(id).then(
+            (memory): MemoryLookup => ({ memory, notFound: false }),
+            (err): MemoryLookup => {
+              // Deletion is a state this hook reports, never an error it
+              // throws — every other failure propagates.
+              if (isNotFound(err)) return { memory: null, notFound: true };
+              throw err;
+            },
+          )
+      : null,
+    [stigmer, id],
+    PENDING_LOOKUP,
+  );
+
+  return {
+    memory: data.memory,
+    isLoading,
+    notFound: data.notFound,
+    error,
+    refetch,
+  };
+}

package/src/organization/OrgPreferencesPanel.tsx

@@ -7,6 +7,7 @@ import type { Organization } from "@stigmer/protos/ai/stigmer/tenancy/organizati
 import { useOrganization } from "./useOrganization.js";
 import { useUpdateOrganization } from "./useUpdateOrganization.js";
 import { useCheckPermission } from "../iam-policy/useCheckPermission.js";
+import { MemoryEnabledRow } from "../internal/MemoryEnabledRow.js";
 import { StandingContextField } from "../internal/StandingContextField.js";
 import { SpinnerIcon } from "../internal/SpinnerIcon.js";
 
@@ -60,6 +61,14 @@ export function OrgPreferencesPanel({
     clearError,
   } = useUpdateOrganization();
 
+  // The memory toggle saves instantly (its own hook instance, so a flip's
+  // in-flight/error state never bleeds into the form's Save button).
+  const {
+    update: updateMemoryFlag,
+    isUpdating: isSavingMemoryFlag,
+    error: memoryFlagError,
+  } = useUpdateOrganization();
+
   // Fail-open: OSS local mode has no IAM service, so editing stays
   // available there; cloud gets a genuine server verdict.
   const { allowed: canEdit } = useCheckPermission(
@@ -100,10 +109,16 @@ export function OrgPreferencesPanel({
       clearError();
       try {
         // update() is a full-spec replace: spread the complete mapped input
-        // so unedited spec fields survive, and override only preferences.
+        // so unedited spec fields survive. `preferences` is a nested message,
+        // so the override spreads the mapper's COMPLETE preferences too —
+        // fields this form does not own (memory_enabled) survive the save.
+        const mapped = toOrganizationUpdateInput(organization);
         const updated = await update({
-          ...toOrganizationUpdateInput(organization),
-          preferences: { standingContext: standingContext.trim() || undefined },
+          ...mapped,
+          preferences: {
+            ...mapped.preferences,
+            standingContext: standingContext.trim() || undefined,
+          },
         });
         refetch();
         onUpdated?.(updated);
@@ -114,6 +129,30 @@ export function OrgPreferencesPanel({
     [canSubmit, organization, standingContext, update, clearError, refetch, onUpdated],
   );
 
+  // The memory consent flag applies instantly (the UX-checkpoint decision):
+  // a consent bit flipped-but-unsaved that silently reverts on navigation is
+  // the failure consent UX must not have. Same wipe-safe double spread.
+  const handleMemoryToggle = useCallback(
+    async (next: boolean) => {
+      if (!organization) return;
+      try {
+        const mapped = toOrganizationUpdateInput(organization);
+        const updated = await updateMemoryFlag({
+          ...mapped,
+          preferences: {
+            ...mapped.preferences,
+            memoryEnabled: next || undefined,
+          },
+        });
+        refetch();
+        onUpdated?.(updated);
+      } catch {
+        // error state is managed by the toggle's own hook instance
+      }
+    },
+    [organization, updateMemoryFlag, refetch, onUpdated],
+  );
+
   // -----------------------------------------------------------------------
   // Loading state
   // -----------------------------------------------------------------------
@@ -175,6 +214,16 @@ export function OrgPreferencesPanel({
         helperText="Shared with agents as background context — not instructions. Applies to executions started by signed-in members of this organization and is visible on their execution records."
       />
 
+      <MemoryEnabledRow
+        id={`${baseId}-memory-enabled`}
+        checked={organization.spec?.preferences?.memoryEnabled ?? false}
+        onToggle={(next) => void handleMemoryToggle(next)}
+        saving={isSavingMemoryFlag}
+        readOnly={!canEdit}
+        error={memoryFlagError}
+        helperText="Allow agents to remember confirmed facts about members of this organization. Each member must also turn memory on in their own account preferences. Changes apply immediately."
+      />
+
       {!canEdit && (
         <p className="stg:text-[0.65rem] stg:text-muted-foreground">
           Only organization admins can edit these preferences.

package/src/organization/__tests__/OrgPreferencesPanel.test.tsx

@@ -125,6 +125,71 @@ describe("OrgPreferencesPanel", () => {
     expect(screen.queryByRole("button", { name: "Save changes" })).toBeNull();
   });
 
+  it("memory toggle applies instantly with the full mapped input (wipe-safe)", async () => {
+    const update = vi.fn(async (_input: OrganizationInput) => ORG);
+    renderPanel(createMockStigmer({ update }));
+    await findSyncedField("We deploy to us-east-1.");
+
+    // No Save click: consent applies the moment it is flipped (the
+    // UX-checkpoint decision — a flipped-but-unsaved consent bit that
+    // silently reverts on navigation is the failure this prevents).
+    fireEvent.click(screen.getByRole("switch", { name: "Memory" }));
+
+    await waitFor(() => expect(update).toHaveBeenCalledTimes(1));
+    const input = update.mock.calls[0]![0];
+    expect(input.preferences?.memoryEnabled).toBe(true);
+    // The double spread: the flip must not wipe the sibling preference…
+    expect(input.preferences?.standingContext).toBe("We deploy to us-east-1.");
+    // …nor any profile field this row never renders.
+    expect(input.name).toBe("Acme Corp");
+    expect(input.description).toBe("We make everything.");
+  });
+
+  it("saving standing context preserves memory_enabled (the wipe-hazard regression)", async () => {
+    const orgWithMemoryOn = create(OrganizationSchema, {
+      metadata: { id: "acme", name: "Acme Corp", slug: "acme", org: "acme" },
+      spec: {
+        description: "We make everything.",
+        logoUrl: "https://acme.example/logo.png",
+        preferences: {
+          standingContext: "We deploy to us-east-1.",
+          memoryEnabled: true,
+        },
+      },
+    });
+    const update = vi.fn(async (_input: OrganizationInput) => orgWithMemoryOn);
+    const client = {
+      organization: {
+        get: vi.fn(async () => orgWithMemoryOn),
+        update,
+      },
+      iamPolicy: {
+        checkMyPermission: vi.fn(async () => ({ isAuthorized: true })),
+      },
+    } as never;
+    renderPanel(client);
+
+    const field = await findSyncedField("We deploy to us-east-1.");
+    fireEvent.change(field, { target: { value: "Prefer terse answers." } });
+    fireEvent.click(screen.getByRole("button", { name: "Save changes" }));
+
+    await waitFor(() => expect(update).toHaveBeenCalledTimes(1));
+    // Update is a full-spec replace: without the nested preferences
+    // spread, this save would silently switch the org's memory OFF.
+    expect(update.mock.calls[0]![0].preferences?.memoryEnabled).toBe(true);
+  });
+
+  it("memory toggle is read-only without can_edit", async () => {
+    renderPanel(createMockStigmer({ canEdit: false }));
+    await screen.findByLabelText("Standing context");
+
+    await waitFor(() =>
+      expect(
+        screen.getByRole("switch", { name: "Memory" }).hasAttribute("disabled"),
+      ).toBe(true),
+    );
+  });
+
   it("shows the fetch error with a retry action when loading fails", async () => {
     const client = {
       organization: {

package/src/session/AutoApproveIndicator.tsx

@@ -0,0 +1,45 @@
+"use client";
+
+/**
+ * Armed-only indicator for the session-scoped auto-approve state, docked
+ * above the composer. Renders nothing about approvals until auto-approve is
+ * actually ON — the composer stays clean by default — and while ON it is the
+ * always-visible safety surface: the user can never be silently
+ * auto-approving without seeing this strip and its one-click "Turn off".
+ *
+ * The way ON lives elsewhere (the Config facet's Run Config switch, the
+ * gate-time "Approve & don't ask again", the account's `default_auto_approve`
+ * preference, the host's `approvalDefaults`); this strip is deliberately only
+ * the way OFF plus the disclosure. Shared by `SessionViewer` and
+ * `NewSessionViewer` (DD-016) — a persisted account preference can arm the
+ * launcher before the first message, so both surfaces need the disclosure.
+ */
+export function AutoApproveIndicator({ onTurnOff }: { readonly onTurnOff: () => void }) {
+  return (
+    <div
+      role="status"
+      className="stg:flex stg:items-center stg:gap-2 stg:border-t stg:border-border-muted stg:px-4 stg:py-1.5 stg:text-xs stg:text-muted-foreground"
+    >
+      <ShieldCheckIcon />
+      <span className="stg:min-w-0 stg:flex-1 stg:truncate">
+        Auto-approving tool calls for this session
+      </span>
+      <button
+        type="button"
+        onClick={onTurnOff}
+        className="stg:shrink-0 stg:rounded stg:font-medium stg:text-foreground stg:underline-offset-2 stg:hover:underline stg:focus-visible:outline-none stg:focus-visible:ring-2 stg:focus-visible:ring-ring"
+      >
+        Turn off
+      </button>
+    </div>
+  );
+}
+
+function ShieldCheckIcon() {
+  return (
+    <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="stg:shrink-0 stg:text-success" aria-hidden="true">
+      <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z" />
+      <path d="m9 12 2 2 4-4" />
+    </svg>
+  );
+}

package/src/session/NewSessionViewer.tsx

@@ -6,7 +6,7 @@ import type { UseGitHubConnectionReturn } from "../github/useGitHubConnection.js
 import type { WorkspaceFileLister } from "../workspace/WorkspaceFileLister.js";
 import type { WorkspaceFileReader } from "../workspace/WorkspaceFileReader.js";
 import type { WorkspaceContentSearcher } from "../workspace/WorkspaceContentSearcher.js";
-import type { ComposerAutoApproveProps, InteractionModeOption } from "../composer/index.js";
+import type { InteractionModeOption } from "../composer/index.js";
 import { SessionComposer } from "../composer/index.js";
 import type { HarnessOption } from "../models/harness.js";
 import type { AccountExecutionDefaults } from "../identity-account/useAccountExecutionDefaults.js";
@@ -18,6 +18,7 @@ import { useNewSessionFlow } from "./useNewSessionFlow.js";
 import { useSessionPanel } from "./useSessionPanel.js";
 import { useSessionRailViews } from "./useSessionRailViews.js";
 import { SessionPanelChip } from "./SessionPanelChip.js";
+import { AutoApproveIndicator } from "./AutoApproveIndicator.js";
 import type { RuntimeEnvProvider } from "./runtime-env.js";
 import type { SessionAudience, SessionPanelMode } from "./audience.js";
 import type { SessionRunConfig } from "./run-config.js";
@@ -299,19 +300,6 @@ export function NewSessionViewer({
   // SessionViewer derives (DD-016), gating the chip and the region together.
   const panelEnabled = panelMode !== "none" && !isGuest;
 
-  // Always-visible auto-approve toggle (#816), present before the first
-  // message is ever typed — the walk-away user arms it here and the create
-  // carries spec.auto_approve_all server-side. Guests never get it (the
-  // operator-consent reasoning as the #302 host default). Memoized per
-  // DD-010 — the composer is memo'd and an inline object would defeat it.
-  const autoApprove = useMemo<ComposerAutoApproveProps | undefined>(
-    () =>
-      isGuest
-        ? undefined
-        : { armed: flow.autoApproveAll, onChange: flow.setAutoApproveAll },
-    [isGuest, flow.autoApproveAll, flow.setAutoApproveAll],
-  );
-
   // Guest agent binding is host configuration, not a picker interaction:
   // the composer's agent machinery (picker, env-collection, personal
   // environments — all org reads a guest token cannot make) stays fully
@@ -387,6 +375,13 @@ export function NewSessionViewer({
       harness: flow.harness,
       executionTarget: undefined,
       modelId: flow.modelId,
+      // Pre-session arming (#816): the switch covers the session this
+      // surface will create — the bootstrap execution carries
+      // spec.auto_approve_all. Guests never get it (they never render the
+      // panel either — belt and braces for the operator-consent withhold).
+      autoApprove: isGuest
+        ? undefined
+        : { armed: flow.autoApproveAll, onChange: flow.setAutoApproveAll },
       // Curated audiences see the configuration but cannot strip it — the
       // Setup tab renders read-only without mutation callbacks (DD-011).
       mutations: isCurated
@@ -400,6 +395,7 @@ export function NewSessionViewer({
     [
       flow.agentRef, flow.mcpServerUsages, flow.skillRefs,
       flow.sessionVariables, flow.harness, flow.modelId,
+      flow.autoApproveAll, flow.setAutoApproveAll, isGuest,
       isCurated, handleRemoveAgent, handleRemoveMcp, handleRemoveSkill,
     ],
   );
@@ -465,7 +461,6 @@ export function NewSessionViewer({
           onInteractionModeChange={setInteractionMode}
           showInteractionModePicker={!isGuest}
           showModelSelector={modelSelectorVisible}
-          autoApprove={autoApprove}
           enableAttachments={!isGuest}
           defaultModelId={flow.modelId}
           onModelChange={flow.setModelId}
@@ -475,6 +470,14 @@ export function NewSessionViewer({
           ariaLabel="Start a new session"
         />
 
+        {/* Armed-only disclosure (#816 rework): a persisted account preference
+            or the host's approvalDefaults can pre-arm the session this surface
+            will create — the user must see that before the first send, with
+            the one-click way off. Guests never inherit either seed. */}
+        {!isGuest && flow.autoApproveAll && (
+          <AutoApproveIndicator onTurnOff={() => flow.setAutoApproveAll(false)} />
+        )}
+
         {footerContent}
 
         <p className="stg:text-center stg:text-[0.65rem] stg:text-muted-foreground">

package/src/session/SessionViewer.tsx

@@ -17,7 +17,8 @@ import {
   WorkspaceSurface,
   type SurfaceVirtualDocument,
 } from "../workspace/WorkspaceSurface.js";
-import type { ComposerAutoApproveProps, InteractionModeOption, SessionComposerHandle, SessionComposerSubmitContext } from "../composer/index.js";
+import type { InteractionModeOption, SessionComposerHandle, SessionComposerSubmitContext } from "../composer/index.js";
+import type { AccountExecutionDefaults } from "../identity-account/useAccountExecutionDefaults.js";
 import type { ApplyResourceResult } from "../library/useApplyResource.js";
 import { SessionViewerLayout } from "./SessionViewerLayout.js";
 import { useWorkspaceEditors, isVirtualEntryId } from "../internal/store/index.js";
@@ -52,6 +53,7 @@ import { useSessionRailViews } from "./useSessionRailViews.js";
 import { useSessionPanel, type SessionPanelController } from "./useSessionPanel.js";
 import { SessionPanelChip } from "./SessionPanelChip.js";
 import { TranscriptExportMenu } from "./TranscriptExportMenu.js";
+import { AutoApproveIndicator } from "./AutoApproveIndicator.js";
 import { useSessionWriteBacks } from "./useSessionWriteBacks.js";
 import { useWorkspaceReadRefs } from "./useWorkspaceReadRefs.js";
 import {
@@ -240,6 +242,17 @@ export interface SessionViewerProps {
    * server-side share policy owns. See {@link SessionRunConfig}.
    */
   readonly runConfig?: SessionRunConfig;
+  /**
+   * The user's account-level execution defaults, typically from
+   * `useAccountExecutionDefaults()` — same seam as
+   * `NewSessionViewer.accountDefaults` (DD-016). On the session page only
+   * the `autoApprove` default applies: it seeds the session-scoped
+   * auto-approve state so a declared `default_auto_approve` preference
+   * covers follow-ups on existing sessions too. An explicit flip of the
+   * Config facet's switch wins for this session. Ignored for the
+   * `"guest"` audience.
+   */
+  readonly accountDefaults?: AccountExecutionDefaults;
   /**
    * Whether the follow-up composer offers the model picker. `false`
    * hides the picker while keeping the SDK's model sourcing (persisted
@@ -295,14 +308,14 @@ export interface SessionViewerProps {
    */
   readonly headerActions?: ReactNode;
   /**
-   * Whether the viewer renders its built-in whole-conversation export
-   * control ({@link TranscriptExportMenu}) in the header corner
-   * (stigmer/stigmer#814). Default ON — a deliberate DD-011 divergence,
-   * owner-ratified: wherever a conversation can be viewed its transcript
-   * should be one click away, the control is an additive header button (no
-   * rendering-strategy or DOM-structure change to existing content), and
-   * the export carries only what the current caller can already read.
-   * Hosts that own their export surface (or inert demo scenes) opt out.
+   * Whether the viewer offers its built-in whole-conversation export
+   * (stigmer/stigmer#814). Placement is panel-aware: viewers with the
+   * session panel export from the Config facet's Transcript section, and
+   * panel-less viewers (guests, `panel="none"`) render the header
+   * {@link TranscriptExportMenu} instead — so wherever a conversation can
+   * be viewed, its transcript stays reachable. The export carries only
+   * what the current caller can already read (`can_view`-scoped). Hosts
+   * that own their export surface (or inert demo scenes) opt out.
    *
    * @default true
    */
@@ -382,6 +395,7 @@ export function SessionViewer({
   getRuntimeEnv,
   audience = "integrator",
   runConfig,
+  accountDefaults,
   showModelSelector = true,
   panel: panelMode = "auto",
   defaultPanelOpen,
@@ -400,6 +414,7 @@ export function SessionViewer({
     getRuntimeEnv,
     audience,
     runConfig,
+    accountDefaults,
   });
   const { conv } = flow;
   const isGuest = audience === "guest";
@@ -661,15 +676,18 @@ export function SessionViewer({
   return (
     <SessionViewerLayout
       className={className}
-      // Top-right controls: host actions + the built-in transcript export +
-      // the panel chip. The chip is the panel's always-mounted toggle; while
-      // collapsed it carries only the pending-item count. Execution status
-      // is never surfaced as header chrome — the thread itself communicates
-      // run state. A viewer without a panel (guests — session configuration
-      // is not a visitor's business — or a host's panel="none") has no
-      // toggle: it is simply absent.
+      // Top-right controls: host actions + the panel chip. The chip is the
+      // panel's always-mounted toggle; while collapsed it carries only the
+      // pending-item count. Execution status is never surfaced as header
+      // chrome — the thread itself communicates run state. A viewer without
+      // a panel (guests — session configuration is not a visitor's business —
+      // or a host's panel="none") has no toggle: it is simply absent.
+      //
+      // Transcript export lives in the panel's Config facet; the header menu
+      // renders ONLY for panel-less viewers, so no audience loses export
+      // (guests and panel="none" hosts have no facet to reach it through).
       headerActions={
-        transcriptExport ? (
+        transcriptExport && !panelEnabled ? (
           <>
             {headerActions}
             <TranscriptExportMenu sessionId={sessionId} />
@@ -745,6 +763,10 @@ export function SessionViewer({
             workspaceFileReader={workspaceFileReader}
             workspaceContentSearcher={workspaceContentSearcher}
             isCurated={isCurated}
+            isObserver={isObserver}
+            // Drives the Config facet's Transcript section only — a host
+            // that opted out of export gets no facet section either.
+            exportSessionId={transcriptExport ? sessionId : null}
           />
         ) : null
       }
@@ -849,20 +871,6 @@ const ConversationColumn = memo(function ConversationColumn({
     void conv.stop();
   }, [conv.stop]);
 
-  // Always-visible auto-approve toggle (#816), replacing the old armed-only
-  // indicator banner: the walk-away user needs a way ON before any gate
-  // exists, not just a way off after one. Guests never get it (they don't
-  // inherit the host default and this is the operator's consent surface);
-  // observers have no composer at all. Memoized per DD-010 — the composer
-  // is memo'd and an inline object would defeat it.
-  const autoApprove = useMemo<ComposerAutoApproveProps | undefined>(
-    () =>
-      isGuest
-        ? undefined
-        : { armed: flow.autoApproveAll, onChange: flow.setAutoApproveAll },
-    [isGuest, flow.autoApproveAll, flow.setAutoApproveAll],
-  );
-
   // Edit-and-resubmit: stop the in-flight turn, pre-fill the composer with
   // the original text, and remember which execution is being edited. The
   // append-only execution log is never rewritten — submitting while editing
@@ -987,6 +995,13 @@ const ConversationColumn = memo(function ConversationColumn({
           />
         )}
         {!isObserver && sendError && <SendErrorBanner error={sendError} />}
+        {/* Armed-only disclosure (#816 rework): auto-approve's way ON lives in
+            the Config facet and the account preference — this strip is the
+            always-visible proof it is on, plus the one-click way off. Never
+            shown to observers (they cannot arm or disarm anything). */}
+        {!isObserver && flow.autoApproveAll && (
+          <AutoApproveIndicator onTurnOff={() => flow.setAutoApproveAll(false)} />
+        )}
         {/* Pending file reviews dock here — pinned above the composer so the
             decision the agent is blocked on can never scroll out of view. The
             thread renders only observational rows (badges) and read-only
@@ -1028,7 +1043,6 @@ const ConversationColumn = memo(function ConversationColumn({
             onInteractionModeChange={setInteractionMode}
             showInteractionModePicker={!isGuest}
             showModelSelector={modelSelectorVisible}
-            autoApprove={autoApprove}
             enableAttachments={!isGuest}
             workspace={isGuest ? undefined : flow.workspace}
             gitHubConnection={isGuest ? undefined : gitHubConnection}
@@ -1105,6 +1119,17 @@ interface SessionPanelRegionProps {
   readonly workspaceContentSearcher?: WorkspaceContentSearcher;
   /** Curated audience (endUser or guest): the Setup facet renders read-only. */
   readonly isCurated: boolean;
+  /**
+   * Observer audience (incl. channel-origin sessions): read-only viewers who
+   * must never receive the Config facet's auto-approve switch — the same
+   * withhold as approval submission. (Guests never render the panel at all.)
+   */
+  readonly isObserver: boolean;
+  /**
+   * Session id for the Config facet's Transcript export section, or `null`
+   * when the host opted out of export (`transcriptExport={false}`).
+   */
+  readonly exportSessionId: string | null;
 }
 
 function SessionPanelRegion({
@@ -1128,6 +1153,8 @@ function SessionPanelRegion({
   workspaceFileReader,
   workspaceContentSearcher,
   isCurated,
+  isObserver,
+  exportSessionId,
 }: SessionPanelRegionProps) {
   const { editors, activeKey, activeFile, reveal } = useWorkspaceEditors(
     panel.editorsStore,
@@ -1295,6 +1322,16 @@ function SessionPanelRegion({
       harness: flow.harness,
       executionTarget: flow.executionTarget,
       modelId: flow.model[0],
+      // Arming auto-approve is an operator decision — withheld from
+      // observers with the same gate as approval submission (guests never
+      // render the panel). The switch stays interactive mid-run: flipping
+      // it ON releases the in-flight run's gates via the flow's standing
+      // responder (#816).
+      autoApprove: isObserver
+        ? undefined
+        : { armed: flow.autoApproveAll, onChange: flow.setAutoApproveAll },
+      // Transcript export is view-scoped, so observers keep it (#814).
+      sessionId: exportSessionId,
       // Curated audiences see the configuration but cannot strip it — the
       // Config facet renders read-only without mutation callbacks (DD-011).
       mutations: isCurated
@@ -1309,6 +1346,7 @@ function SessionPanelRegion({
     [
       flow.agentRef, flow.isDefaultAgent, flow.mcpServerUsages, flow.skillRefs,
       flow.sessionVariables, flow.harness, flow.executionTarget, flow.model,
+      flow.autoApproveAll, flow.setAutoApproveAll, isObserver, exportSessionId,
       isCurated, handleRemoveAgent, handleRemoveMcp, handleRemoveSkill,
       accessSlot,
     ],