@opengeni/react 1.4.2 → 1.4.5-canary.37458084490001

package/src/components/session-conversation.tsx

@@ -35,6 +35,7 @@ import {
   createWorkspaceRetainedVideoLoader,
 } from "../timeline/retained-loaders";
 import { useRealtimeVoiceModels } from "../hooks/use-realtime-voice-models";
+import { EMBEDDED_GENIE_LOADING, type GenieLoadingOptions } from "../timeline/genie-loading";
 import { projectPendingApprovals } from "../approvals";
 import { ApprovalSurface } from "./approval-surface";
 import { ChatComposer, type ChatComposerProps } from "./chat-composer";
@@ -42,6 +43,8 @@ import type { ComposerTranscriptionControlProps } from "./composer-transcription
 import { SessionChrome } from "./session-chrome";
 import { HumanInputSurface, type HumanInputSurfaceProps } from "./human-input-surface";
 import { MessageTimeline, type MessageTimelineProps } from "./message-timeline";
+import { ProviderRecoveryNotice } from "./provider-recovery-notice";
+import { currentProviderRecovery } from "../lib/provider-recovery";
 import {
   chainLinkResolvers,
   sessionLinkResolver,
@@ -119,6 +122,8 @@ export type SessionConversationProps = ClientOverride &
     /**
      * File attachments in the composer. Defaults to true; the attach control
      * appears only when the deployment's client config enables file uploads.
+     * A session proxy reports them off when `files` is false and for anonymous
+     * visitors (`visitor: true` from `resolve`) unless it sets `visitorUploads`.
      */
     attachments?: boolean | undefined;
     /**
@@ -128,11 +133,20 @@ export type SessionConversationProps = ClientOverride &
      */
     voiceInput?: boolean | undefined;
     /**
-     * Live speech-to-speech voice in the composer. Defaults to true; the voice
-     * button appears only when the workspace offers an available voice model
-     * and the proxy has not turned it off (`realtimeVoice: false`).
+     * Live speech-to-speech voice in the composer. Opt-in: a call spends the
+     * workspace's credits and asks for the microphone, so it is off unless this
+     * is `true` or the client config reports `realtimeVoice: true`
+     * (`createSessionProxyHandler({ realtimeVoice: true })`). The button then
+     * appears only when the workspace offers an available voice model and the
+     * proxy has not turned voice off (`realtimeVoice: false`).
      */
     realtimeVoice?: boolean | undefined;
+    /**
+     * Copy and visual for the "working" indicator before the first reply.
+     * Defaults to neutral copy ("Thinking…"); omitted fields keep those
+     * defaults. See `MessageTimeline`'s `genieLoading`.
+     */
+    genieLoading?: GenieLoadingOptions | undefined;
     /**
      * Show the model/reasoning picker. End users of an embedded product rarely
      * choose models, so it is hidden unless this is `true` or the client config
@@ -217,7 +231,8 @@ function Conversation({
   allowanceExhaustedLabels,
   attachments: attachmentsRequested = true,
   voiceInput: voiceInputRequested = true,
-  realtimeVoice: realtimeVoiceRequested = true,
+  realtimeVoice: realtimeVoiceProp,
+  genieLoading,
   modelPicker,
   modelPickerProps,
   userMessageDisclosureLabels,
@@ -327,6 +342,24 @@ function Conversation({
     if (feed.error) void feed.jumpToLatest();
   };
   const running = status === "running" || status === "recovering" || status === "waiting_capacity";
+  const realtimeVoiceRequested = realtimeVoiceProp ?? config.realtimeVoiceOffered;
+  const loadingOptions = useMemo(() => embeddedGenieLoading(genieLoading), [genieLoading]);
+  const providerRecovery = useMemo(
+    () =>
+      detail.session
+        ? currentProviderRecovery(
+            {
+              id: detail.session.id,
+              status,
+              activeTurnId: detail.session.activeTurnId,
+              effectiveControl:
+                queue.effectiveControl ?? detail.session.effectiveControl ?? undefined,
+            },
+            feed.events,
+          )
+        : null,
+    [detail.session, status, queue.effectiveControl, feed.events],
+  );
   const voiceModels = useRealtimeVoiceModels(
     context.client,
     context.workspaceId,
@@ -404,6 +437,7 @@ function Conversation({
               : (renderInteractiveBlock ?? defaultInteractiveBlock)
           }
           userMessageDisclosureLabels={userMessageDisclosureLabels}
+          genieLoading={loadingOptions}
           renderAllowanceExhausted={renderAllowanceExhausted}
           allowanceExhaustedLabels={allowanceExhaustedLabels}
           // Isolated and clipped: floating navigation stays inside the timeline.
@@ -457,6 +491,10 @@ function Conversation({
                 error={control.error}
               />
             ) : null}
+            <ProviderRecoveryNotice
+              className="mx-auto max-w-3xl px-1"
+              recovery={providerRecovery}
+            />
             <HumanInputSurface
               className="mx-auto max-w-3xl"
               loadSkillReview={loadSkillReview}
@@ -551,6 +589,17 @@ function Conversation({
   );
 }
 
+/** Neutral embedded defaults under the host's overrides; an empty phrase list keeps them. */
+function embeddedGenieLoading(options: GenieLoadingOptions | undefined): GenieLoadingOptions {
+  if (!options) return EMBEDDED_GENIE_LOADING;
+  return {
+    ...EMBEDDED_GENIE_LOADING,
+    ...options,
+    phrases: options.phrases?.length ? options.phrases : EMBEDDED_GENIE_LOADING.phrases,
+    messages: { ...EMBEDDED_GENIE_LOADING.messages, ...options.messages },
+  };
+}
+
 type ConversationChromeProps = {
   sessionId: string;
   client: unknown;
@@ -668,11 +717,11 @@ function useRetainedLoaders(
       ...(typeof base.downloadRetainedArtifact === "function" &&
       typeof base.createRetainedArtifactDownloadUrl === "function"
         ? {
-            loadRetainedArtifact: (artifact, signal) =>
+            loadRetainedArtifact: (artifact, signal, options) =>
               createWorkspaceRetainedArtifactLoader(
                 get() as Required<RetainedLoaderClient>,
                 workspaceId,
-              )(artifact, signal),
+              )(artifact, signal, options),
           }
         : {}),
       ...(typeof base.downloadRetainedScreenshot === "function"

package/src/components/session-list.tsx

@@ -215,7 +215,7 @@ export function SessionList({
                   {formatRelativeTime(session.updatedAt)}
                 </span>
               </button>
-              <span className="absolute right-1 top-1.5 hidden gap-0.5 group-focus-within:flex group-hover:flex">
+              <span className="absolute right-1 top-1.5 hidden gap-0.5 group-focus-within:flex group-hover:flex pointer-coarse:flex">
                 {rename ? (
                   <button
                     type="button"

package/src/components/session-status.tsx

@@ -1,5 +1,6 @@
 import type { SessionStatus as SessionStatusValue } from "@opengeni/sdk";
 import { cn } from "../lib/cn";
+import { SESSION_STATUS_PRESENTATION } from "../session-status-model";
 
 export type SessionStatusMeta = {
   label: string;
@@ -12,52 +13,52 @@ export type SessionStatusMeta = {
 
 export const SESSION_STATUS_META: Record<SessionStatusValue, SessionStatusMeta> = {
   queued: {
-    label: "Queued",
+    label: SESSION_STATUS_PRESENTATION.queued.label,
     dotClassName: "bg-og-status-queued",
     badgeClassName: "text-og-fg-muted border-og-border bg-og-status-queued/10",
-    pulse: false,
+    pulse: SESSION_STATUS_PRESENTATION.queued.pulse,
   },
   running: {
-    label: "Running",
+    label: SESSION_STATUS_PRESENTATION.running.label,
     dotClassName: "bg-og-status-running",
     badgeClassName: "text-og-status-running border-og-status-running/30 bg-og-status-running/10",
-    pulse: true,
+    pulse: SESSION_STATUS_PRESENTATION.running.pulse,
   },
   recovering: {
-    label: "Recovering",
+    label: SESSION_STATUS_PRESENTATION.recovering.label,
     dotClassName: "bg-og-status-running",
     badgeClassName: "text-og-status-running border-og-status-running/30 bg-og-status-running/10",
-    pulse: true,
+    pulse: SESSION_STATUS_PRESENTATION.recovering.pulse,
   },
   waiting_capacity: {
-    label: "Waiting for capacity",
+    label: SESSION_STATUS_PRESENTATION.waiting_capacity.label,
     dotClassName: "bg-og-status-waiting",
     badgeClassName: "text-og-status-waiting border-og-status-waiting/35 bg-og-status-waiting/10",
-    pulse: true,
+    pulse: SESSION_STATUS_PRESENTATION.waiting_capacity.pulse,
   },
   idle: {
-    label: "Idle",
+    label: SESSION_STATUS_PRESENTATION.idle.label,
     dotClassName: "bg-og-status-idle",
     badgeClassName: "text-og-status-idle border-og-status-idle/30 bg-og-status-idle/10",
-    pulse: false,
+    pulse: SESSION_STATUS_PRESENTATION.idle.pulse,
   },
   requires_action: {
-    label: "Waiting on you",
+    label: SESSION_STATUS_PRESENTATION.requires_action.label,
     dotClassName: "bg-og-status-waiting",
     badgeClassName: "text-og-status-waiting border-og-status-waiting/35 bg-og-status-waiting/10",
-    pulse: true,
+    pulse: SESSION_STATUS_PRESENTATION.requires_action.pulse,
   },
   failed: {
-    label: "Failed",
+    label: SESSION_STATUS_PRESENTATION.failed.label,
     dotClassName: "bg-og-status-failed",
     badgeClassName: "text-og-status-failed border-og-status-failed/35 bg-og-status-failed/10",
-    pulse: false,
+    pulse: SESSION_STATUS_PRESENTATION.failed.pulse,
   },
   cancelled: {
-    label: "Cancelled",
+    label: SESSION_STATUS_PRESENTATION.cancelled.label,
     dotClassName: "bg-og-status-cancelled",
     badgeClassName: "text-og-fg-subtle border-og-border bg-og-status-cancelled/10",
-    pulse: false,
+    pulse: SESSION_STATUS_PRESENTATION.cancelled.pulse,
   },
 };
 

package/src/composer-messages.ts

@@ -0,0 +1,150 @@
+/**
+ * The composer's user-facing copy, renderer-free so web and native composers
+ * (and hosts translating them) share one message catalog.
+ */
+import type { SlashCommand } from "./commands/types";
+import { formatBytes, formatRelativeTime } from "./lib/format";
+
+export type ChatComposerMessages = {
+  messagePlaceholder: string;
+  pausedPlaceholder: string;
+  inputLabel: string;
+  keyboardHint: string;
+  slashCommandBlocked: string;
+  controlChangedError: string;
+  sendFailedError: string;
+  dropFiles: string;
+  attachFiles: string;
+  pauseAriaLabel: string;
+  pauseTitle: string;
+  /** Stop control shown while a response runs (`runControl="stop"`). */
+  stopAriaLabel?: string | undefined;
+  stopTitle?: string | undefined;
+  sendMessageAriaLabel: string;
+  sendAndResumeAriaLabel: string;
+  sendTitle: string;
+  sendAndResumeTitle: string;
+  annotationNotesRequired: string;
+  workspacePaused: string;
+  pausedHere: string;
+  parentBlocker: string;
+  narrowerPause: string;
+  pausedBy: (displayName: string) => string;
+  queuedAhead: (count: number) => string;
+  resumingAndSending: string;
+  nextMessageResumes: string;
+  resumeThisWorkstream: string;
+  resumeShort: string;
+  hidePauseDetails: string;
+  showPauseDetails: string;
+  pauseReasonsLabel: string;
+  pausedByLabel: string;
+  alsoPausedByLabel: string;
+  resumeWorkspace: string;
+  resumeFromSession: string;
+  sessionCanRun: string;
+  stillPausedBy: (displayName: string) => string;
+  restoredResourcesLabel: string;
+  restoredFile: (fileId: string) => string;
+  removeRestoredResource: (index: number) => string;
+  uploading: string;
+  uploadFailed: string;
+  previewAttachment: (name: string) => string;
+  previewUnavailable?: string | undefined;
+  attachmentPreviewLabel: string;
+  downloadAttachment: (name: string) => string;
+  closeAttachmentPreview: string;
+  retryAttachment: (name: string) => string;
+  retryUpload: string;
+  removeAttachment: (name: string) => string;
+  confirmCommand: (name: string) => string;
+  confirmDescription: (command: SlashCommand) => string;
+  cancel: string;
+  runCommand: (name: string) => string;
+  commands: string;
+  slashCommandsLabel: string;
+  modelLabel: string;
+  close: string;
+  danger: string;
+  draftConflict: string;
+  useOtherDraft: string;
+  keepMine: string;
+  savingDraft: string;
+  formatBytes: (bytes: number) => string;
+  formatRelativeTime: (changedAt: string) => string;
+};
+
+export const defaultChatComposerMessages: ChatComposerMessages = {
+  messagePlaceholder: "Message the agent…",
+  pausedPlaceholder: "Message the agent — it will wait in the queue…",
+  inputLabel: "Message the agent",
+  // Shortcuts live in the send button's title; the footer stays quiet unless
+  // the host supplies its own hint.
+  keyboardHint: "",
+  slashCommandBlocked:
+    "That's a slash command — press Enter in the command list to run it, or edit the line to send a message.",
+  controlChangedError:
+    "This workstream was paused while you were sending. Nothing was sent, and your draft is still here.",
+  sendFailedError: "Sending failed — your draft is still here. Try again.",
+  dropFiles: "Drop files to attach",
+  attachFiles: "Attach files",
+  pauseAriaLabel: "Pause this workstream",
+  pauseTitle: "Pause this workstream; queued prompts and approvals are preserved",
+  stopAriaLabel: "Stop",
+  stopTitle: "Stop the response",
+  sendMessageAriaLabel: "Send message",
+  sendAndResumeAriaLabel: "Add message to queue",
+  sendTitle: "Queue message (Enter); steer with Cmd/Ctrl+Enter",
+  sendAndResumeTitle: "Add to queue (Enter); steer now with Cmd/Ctrl+Enter",
+  annotationNotesRequired: "Add a note to each quote before sending.",
+  workspacePaused: "Workspace paused",
+  pausedHere: "Paused here",
+  parentBlocker: "parent",
+  narrowerPause: "a narrower pause",
+  pausedBy: (displayName) => `Paused by ${displayName}`,
+  queuedAhead: (count) =>
+    `${count} waiting prompt${count === 1 ? "" : "s"}; your message joins the queue.`,
+  resumingAndSending: "Sending…",
+  nextMessageResumes: "Messages wait in the queue until you resume.",
+  resumeThisWorkstream: "Resume this workstream",
+  resumeShort: "Resume",
+  hidePauseDetails: "Hide pause details",
+  showPauseDetails: "Show pause details",
+  pauseReasonsLabel: "Reasons this workstream is paused",
+  pausedByLabel: "Paused by ",
+  alsoPausedByLabel: "Also paused by ",
+  resumeWorkspace: "Resume workspace",
+  resumeFromSession: "Resume from this session",
+  sessionCanRun: "This session will be able to run",
+  stillPausedBy: (displayName) => `Still paused by ${displayName}`,
+  restoredResourcesLabel: "Restored prompt resources",
+  restoredFile: (fileId) => `File ${fileId.slice(0, 8)}`,
+  removeRestoredResource: (index) => `Remove restored resource ${index + 1}`,
+  uploading: "Uploading",
+  uploadFailed: "Upload failed",
+  previewAttachment: (name) => `Preview ${name}`,
+  previewUnavailable: "Preview unavailable",
+  attachmentPreviewLabel: "Attachment preview",
+  downloadAttachment: (name) => `Download ${name}`,
+  closeAttachmentPreview: "Close",
+  retryAttachment: (name) => `Retry ${name}`,
+  retryUpload: "Retry upload",
+  removeAttachment: (name) => `Remove ${name}`,
+  confirmCommand: (name) => `Confirm /${name}`,
+  confirmDescription: (command) => `Run /${command.name}? ${command.description}`,
+  cancel: "Cancel",
+  runCommand: (name) => `Run /${name}`,
+  commands: "Commands",
+  slashCommandsLabel: "Slash commands",
+  modelLabel: "Model",
+  close: "Close",
+  danger: "danger",
+  draftConflict: "This draft changed in another tab. Your local draft is still here.",
+  useOtherDraft: "Use other draft",
+  keepMine: "Keep mine",
+  // Kept for embedder message overrides / back-compat. Routine autosave is
+  // silent — only draft conflicts surface under the composer.
+  savingDraft: "Saving draft…",
+  formatBytes,
+  formatRelativeTime,
+};

package/src/connect-setup.tsx

@@ -19,6 +19,11 @@ const setupStatus: Record<ConnectAttempt["state"], string> = {
   uncertain: "Setup outcome needs checking",
 };
 
+/** GitHub returned from a non-owner's install request: an organization owner must approve. */
+export function isOwnerApprovalPending(attempt: Pick<ConnectAttempt, "error">): boolean {
+  return attempt.error?.code === "owner_approval_pending";
+}
+
 function deviceVerificationUrl(action: ConnectAttempt["nextAction"]): string | null {
   if (action.type !== "wait" || !action.verificationUrl) return null;
   try {
@@ -91,6 +96,11 @@ function ScopedSetup({
   const action = attempt.nextAction;
   const verificationUrl = deviceVerificationUrl(action);
   const terminal = ["complete", "cancelled", "expired"].includes(attempt.state);
+  const awaitingOwner = isOwnerApprovalPending(attempt);
+  const offersGitHubRequest =
+    action.type === "select_account" &&
+    attempt.providerId.startsWith("github") &&
+    action.accounts.some((account) => account.id === "new");
   const submit = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
     const form = event.currentTarget;
@@ -148,7 +158,7 @@ function ScopedSetup({
           {attempt.ownership === "personal" ? "Personal connection" : "Workspace connection"}
         </p>
         <p role="status" className="og-connect-setup-status">
-          {setupStatus[attempt.state]}
+          {awaitingOwner ? "Waiting for an organization owner" : setupStatus[attempt.state]}
         </p>
         <p className="og-connect-setup-description">
           {attempt.ownership === "personal"
@@ -157,7 +167,22 @@ function ScopedSetup({
         </p>
       </div>
       {attempt.account && <p>Account: {attempt.account.label}</p>}
-      {(localError || view.error || attempt.error) && (
+      {awaitingOwner && (
+        <div className="og-connect-setup-pending">
+          <p>
+            Your request was sent. GitHub asked the owners of your organization to approve Opengeni.
+          </p>
+          <ol>
+            <li>An organization owner approves the request on GitHub.</li>
+            <li>
+              An owner then connects the organization here. If they don't use Opengeni yet, invite
+              them to this workspace first.
+            </li>
+          </ol>
+          <p>Nothing is connected until then. You can close this and keep working.</p>
+        </div>
+      )}
+      {(localError || view.error || (attempt.error && !awaitingOwner)) && (
         <p role="alert">
           {attempt.error?.code === "source_changed"
             ? "The integration source changed. Review the updated tools before adding them."
@@ -172,15 +197,17 @@ function ScopedSetup({
             ) ? (
               <legend>Connection details</legend>
             ) : null}
-            {attempt.state === "connected_but_incomplete" && action.type === "none" && (
-              <button
-                type="button"
-                className="og-connect-setup-primary"
-                onClick={() => invoke(() => view.advance({ type: "retry" }, crypto.randomUUID()))}
-              >
-                Choose tools
-              </button>
-            )}
+            {attempt.state === "connected_but_incomplete" &&
+              action.type === "none" &&
+              !awaitingOwner && (
+                <button
+                  type="button"
+                  className="og-connect-setup-primary"
+                  onClick={() => invoke(() => view.advance({ type: "retry" }, crypto.randomUUID()))}
+                >
+                  Choose tools
+                </button>
+              )}
             {action.type === "credentials" &&
               action.fields.map((field, i) => (
                 <label key={field.name}>
@@ -225,6 +252,13 @@ function ScopedSetup({
                 </select>
               </label>
             )}
+            {offersGitHubRequest && (
+              <p className="og-connect-setup-hint">
+                Don't see your organization? Only its owners can connect it. Choose "Install on
+                another GitHub account" and pick the organization: GitHub lets you send its owners a
+                request to approve.
+              </p>
+            )}
             {action.type === "select_resources" &&
               action.resources.map((resource) => (
                 <label key={resource.id}>

package/src/connect.ts

@@ -15,7 +15,7 @@ export {
   type SkillDiscoveryItem,
   type SkillDiscoveryPage,
 } from "./skill-discovery";
-export { ConnectSetup, type ConnectSetupProps } from "./connect-setup";
+export { ConnectSetup, isOwnerApprovalPending, type ConnectSetupProps } from "./connect-setup";
 export { ConnectChooser, type ConnectChooserProps } from "./connect-chooser";
 export { ConnectAccounts, type ConnectAccountsProps } from "./connect-accounts";
 export { ConnectPanel, type ConnectPanelProps } from "./connect-panel";

package/src/hooks/shared-machines-list.ts

@@ -31,10 +31,22 @@ type Share = {
   inFlight: Promise<void> | null;
   trailing: Promise<void> | null;
   generation: number;
+  /** The last read was refused (401/403/404). Polling stays stopped until the
+   *  read is disabled (a permission/workspace change) or explicitly refreshed. */
+  halted: boolean;
 };
 
 const shares = new Map<string, Share>();
 
+/** A refusal that repeating the identical read cannot fix: the caller lacks
+ *  `enrollments:read` (403), is signed out (401), or the workspace/feature is
+ *  gone (404). Structural so host adapters with their own error types work. */
+export function isMachinesAccessRefusal(cause: unknown): boolean {
+  if (!cause || typeof cause !== "object" || !("status" in cause)) return false;
+  const status = (cause as { status: unknown }).status;
+  return status === 401 || status === 403 || status === 404;
+}
+
 function emit(share: Share): void {
   for (const subscriber of share.subscribers) {
     subscriber.onChange();
@@ -81,6 +93,7 @@ function cancelDispose(share: Share): void {
 
 function arm(share: Share): void {
   stopTimer(share);
+  if (share.halted) return;
   const { enabled, pollIntervalMs } = effective(share);
   if (!enabled || pollIntervalMs === undefined) return;
   share.timer = setTimeout(() => {
@@ -98,10 +111,15 @@ async function runFresh(share: Share): Promise<void> {
   try {
     const data = await load(abort.signal);
     if (ticket !== share.generation || abort.signal.aborted) return;
+    share.halted = false;
     share.snapshot = { data, loading: false, error: null };
     emit(share);
   } catch (cause) {
     if (ticket !== share.generation || abort.signal.aborted) return;
+    if (isMachinesAccessRefusal(cause)) {
+      share.halted = true;
+      stopTimer(share);
+    }
     share.snapshot = {
       data: share.snapshot.data,
       loading: false,
@@ -120,7 +138,7 @@ function run(share: Share, force = false): Promise<void> {
     let trailing!: Promise<void>;
     trailing = share.inFlight
       .then(async () => {
-        if (!effective(share).enabled) return;
+        if (!effective(share).enabled || share.halted) return;
         await run(share);
       })
       .finally(() => {
@@ -145,12 +163,21 @@ function reconcile(share: Share): void {
     share.abort = null;
     share.inFlight = null;
     stopTimer(share);
+    if (share.halted) {
+      // Disabling is the host's permission/workspace signal. Forget the
+      // refusal so a later re-enable reads once immediately.
+      share.halted = false;
+      share.snapshot = { data: share.snapshot.data, loading: false, error: null };
+      emit(share);
+      return;
+    }
     if (share.snapshot.loading) {
       share.snapshot = { ...share.snapshot, loading: false };
       emit(share);
     }
     return;
   }
+  if (share.halted) return;
   if (share.snapshot.data !== null || share.snapshot.error) {
     arm(share);
     return;
@@ -175,6 +202,7 @@ function getOrCreate(shareKey: string): Share {
     inFlight: null,
     trailing: null,
     generation: 0,
+    halted: false,
   };
   shares.set(shareKey, created);
   return created;
@@ -183,7 +211,12 @@ function getOrCreate(shareKey: string): Share {
 export async function refreshSharedMachinesList(shareKey: string): Promise<void> {
   const share = shares.get(shareKey);
   if (!share) return;
+  // An explicit refresh (user action, post-mutation reconcile) may retry once;
+  // a repeated refusal halts polling again.
+  const wasHalted = share.halted;
+  share.halted = false;
   await run(share, true);
+  if (wasHalted) arm(share);
 }
 
 export function useSharedMachinesList(