@datalayer/agent-runtimes 1.5.59 → 1.5.60

package/lib/apps/plugins/chat/ChatView.js

@@ -1720,7 +1720,9 @@ export default function ChatView({ workspace }) {
                     playbackLevel: () => controlsRef.current?.voiceLevel?.() ?? 0, 
                     // Hands-free (VO-12, VO-13): the run in progress, stopped when
                     // the person speaks over it, and the answer marked interrupted.
-                    running: busy, onStopRun: () => controlsRef.current?.stop?.(), onInterrupted: () => controlsRef.current?.markInterrupted(), onInterimChange: setVoiceInterim, 
+                    running: busy, 
+                    // Spoken over, the application's session stays open (VO-46).
+                    onStopRun: () => (controlsRef.current?.interrupt ?? controlsRef.current?.stop)?.(), onInterrupted: () => controlsRef.current?.markInterrupted(), onInterimChange: setVoiceInterim, 
                     // The menu offers when answers are heard where the
                     // application lets them be (VO-21, VO-30).
                     answers: Boolean(config?.voice?.output &&

package/lib/chat/ChatFloating.js

@@ -10,6 +10,7 @@ import { ButtonGlow } from './display/ButtonGlow';
 import { useViewportDrag } from './useViewportDrag';
 import { disabledChatViewModes, resolveMountPoint } from './viewModes';
 import { AssistantStage } from './assistant/AssistantStage';
+import { ASSISTANT_CLEARANCE_VAR } from './assistant/clearance';
 import { decisionsAskerAt } from './assistant/decisions';
 import { DecisionAsk } from './assistant/DecisionAsk';
 import { useSpokenAnswers } from '../voice/useSpokenAnswers';
@@ -854,6 +855,9 @@ export function ChatFloating({ endpoint, protocol: protocolProp, useStore: useSt
         : undefined;
     /* The window itself; where it goes is decided below. */
     const chatWindow = (_jsxs(Box, { ref: popupRef, className: className, sx: {
+            // Its own conversation stands beside the character, never under it:
+            // its prompt's controls keep their own padding (T-27).
+            ...(assistantShown ? { [ASSISTANT_CLEARANCE_VAR]: 'initial' } : {}),
             position: viewMode === 'panel' && !isMobile && (panelInFlow || dockedInMount)
                 ? 'relative'
                 : 'fixed',

package/lib/chat/base/ChatBase.js

@@ -59,7 +59,7 @@ import { useVoiceSettings } from '../../voice/useVoiceSettings';
 import { useVoiceSpeaker } from '../../voice/useVoiceSpeaker';
 import { useSpokenAnswers } from '../../voice/useSpokenAnswers';
 import { saidMessageId, useSaidSentence } from '../../voice/captions';
-import { lineToSay } from '../../voice/sayAloud';
+import { isVoiceInterrupted, lineToSay, } from '../../voice/sayAloud';
 import { isFloatingChatViewMode } from '../viewModes';
 import { ToolApprovalBanner, ToolApprovalDialog, } from '../tools';
 import { initialModelId, isOffered, offeredModels as offeredModelsFor, } from './modelChoice';
@@ -2986,6 +2986,16 @@ showToolApprovalBanner = true, pendingApprovals: pendingApprovalsProp, onApprove
      */
     const [voiceSaid, setVoiceSaid] = useState('');
     voiceSayRef.current = activity => {
+        if (isVoiceInterrupted(activity)) {
+            // Spoken over, the runtime says (VO-46): its voice stops.
+            if (onStopSpeaking) {
+                onStopSpeaking();
+            }
+            else if (ownVoice.speaker) {
+                ownVoice.stop();
+            }
+            return;
+        }
         const line = lineToSay(activity);
         if (!line) {
             return;
@@ -3251,7 +3261,9 @@ showToolApprovalBanner = true, pendingApprovals: pendingApprovalsProp, onApprove
         applyServerApprovalDecision,
     ]);
     // ---- handleStop ----
-    const handleStop = useCallback(() => {
+    // Spoken over (VO-46, VO-13), an application's session is told so and
+    // stays open; Stop leaves it to be resumed.
+    const stopTurn = useCallback((spokenOver) => {
         stoppedRef.current = true;
         abortControllerRef.current?.abort();
         // Best-effort cancellation without tearing down adapter/session.
@@ -3262,7 +3274,10 @@ showToolApprovalBanner = true, pendingApprovals: pendingApprovalsProp, onApprove
                 adapter.stopGeneration();
             }
             // Also tell the backend to stop (server-side cancellation).
-            if (typeof adapter.terminateSession === 'function') {
+            if (spokenOver && typeof adapter.interruptSession === 'function') {
+                void adapter.interruptSession().catch(() => { });
+            }
+            else if (typeof adapter.terminateSession === 'function') {
                 void adapter.terminateSession().catch(() => { });
             }
             else if (typeof adapter.terminateAgent === 'function') {
@@ -3314,6 +3329,8 @@ showToolApprovalBanner = true, pendingApprovals: pendingApprovalsProp, onApprove
         protocol?.authToken,
         protocol?.agentId,
     ]);
+    const handleStop = useCallback(() => stopTurn(false), [stopTurn]);
+    const handleSpokenOver = useCallback(() => stopTurn(true), [stopTurn]);
     /*
      * How a message's display presses what it offered (RU-4,
      * RU-W): with the token of the offer, as the run's press — which
@@ -3390,6 +3407,8 @@ showToolApprovalBanner = true, pendingApprovals: pendingApprovalsProp, onApprove
             voiceLevel: playbackLevel,
             // The answer spoken over, marked for a host's own composer (VO-13).
             markInterrupted,
+            // Spoken over: the run ends, the application's session stays open (VO-46).
+            interrupt: handleSpokenOver,
         });
         return () => {
             onSendReady(null);
@@ -3400,6 +3419,7 @@ showToolApprovalBanner = true, pendingApprovals: pendingApprovalsProp, onApprove
         onSendMessage,
         handleSend,
         handleStop,
+        handleSpokenOver,
         handleNewChat,
         stopSpeaking,
         playbackLevel,
@@ -3808,7 +3828,9 @@ showToolApprovalBanner = true, pendingApprovals: pendingApprovalsProp, onApprove
         playbackLevel: playbackLevel, 
         // Hands-free (VO-12, VO-13): the run in progress, stopped when the
         // person speaks over it, and the answer marked interrupted.
-        running: isLoading, onStopRun: handleStop, onInterrupted: markInterrupted, onInterimChange: setVoiceInterim, 
+        running: isLoading, 
+        // Spoken over, the application's session stays open (VO-46).
+        onStopRun: handleSpokenOver, onInterrupted: markInterrupted, onInterimChange: setVoiceInterim, 
         // The menu offers when answers are heard where the application
         // lets them be (VO-21, VO-30).
         answers: Boolean(voice?.output && voice.output !== 'off' && voice.speechUrl), onSpoken: metadata => {

package/lib/chat/prompt/InputPrompt.js

@@ -151,6 +151,9 @@ export function InputPrompt({ input, setInput, isLoading, kernelStatus, connecti
                         {
                             id: 'session-controls',
                             px: padding,
+                            // Its right end — the voice controls — is never under
+                            // the floating assistant in its corner (T-27).
+                            clearsAssistant: true,
                             py: 0.5,
                             minHeight: 36,
                             bordered: true,

package/lib/chat/prompt/stack.d.ts

@@ -18,6 +18,19 @@
  * @module chat/prompt/stack
  */
 import type { ReactNode } from 'react';
+/**
+ * A theme space step (`px={2}`) as a CSS length, from the theme's scale or
+ * else Primer's own.
+ */
+export declare function spaceLength(step: number, scale?: readonly (string | number)[]): string;
+/**
+ * The right padding of a band that `clearsAssistant`: the floating
+ * assistant's clearance while it stands in a bottom corner (what it covers
+ * from the window's right edge, `--assistant-clearance`), so that the
+ * character is never drawn over the band's controls and never takes their
+ * clicks; else the band's own `padding`, a CSS length.
+ */
+export declare function clearOfAssistant(padding: string): string;
 /** One band in a region. */
 export type PromptStack = {
     /** Identity, for React and for a host reasoning about which band is which. */
@@ -69,6 +82,15 @@ export type PromptStack = {
      * showing the page behind it — a pale stripe down the right-hand side.
      */
     layout?: 'row' | 'block';
+    /**
+     * Keep the band's right end clear of the floating assistant while it
+     * stands in a bottom corner: its right padding becomes the assistant's
+     * clearance (`--assistant-clearance`), so that the character is never
+     * drawn over the band's controls and never takes their clicks. For a band
+     * that runs to the page's right edge, as the composer's session controls
+     * do on an application's page.
+     */
+    clearsAssistant?: boolean;
 };
 export type PromptStacksProps = {
     /** The bands, top to bottom. */

package/lib/chat/prompt/stack.js

@@ -1,5 +1,37 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { useTheme } from '@primer/react';
 import { Box } from '@datalayer/primer-addons';
+import { ASSISTANT_CLEARANCE_VAR } from '../assistant/clearance';
+/** Primer's space scale, for a band drawn without a theme. */
+const PRIMER_SPACE = [
+    '0',
+    '4px',
+    '8px',
+    '16px',
+    '24px',
+    '32px',
+    '40px',
+    '48px',
+    '64px',
+];
+/**
+ * A theme space step (`px={2}`) as a CSS length, from the theme's scale or
+ * else Primer's own.
+ */
+export function spaceLength(step, scale = PRIMER_SPACE) {
+    const value = scale[step] ?? PRIMER_SPACE[step] ?? `${step * 8}px`;
+    return typeof value === 'number' ? `${value}px` : value;
+}
+/**
+ * The right padding of a band that `clearsAssistant`: the floating
+ * assistant's clearance while it stands in a bottom corner (what it covers
+ * from the window's right edge, `--assistant-clearance`), so that the
+ * character is never drawn over the band's controls and never takes their
+ * clicks; else the band's own `padding`, a CSS length.
+ */
+export function clearOfAssistant(padding) {
+    return `var(${ASSISTANT_CLEARANCE_VAR}, ${padding})`;
+}
 /**
  * Whether a band would draw anything.
  *
@@ -12,12 +44,19 @@ function isRendered(stack) {
 /** Render a region's bands, skipping the ones with nothing to show. */
 export function PromptStacks({ stacks, disabled = false, }) {
     const visible = stacks.filter(isRendered);
+    const { theme } = useTheme();
     if (visible.length === 0) {
         return null;
     }
     return (_jsx(_Fragment, { children: visible.map(stack => {
             const isDisabled = disabled || stack.disabled;
-            return (_jsx(Box, { "data-prompt-stack": stack.id, "aria-disabled": isDisabled || undefined, px: stack.px ?? 2, py: stack.py ?? 1, minHeight: stack.minHeight, display: stack.layout === 'block' ? undefined : 'flex', alignItems: stack.layout === 'block' ? undefined : 'center', gap: stack.layout === 'block' ? undefined : (stack.gap ?? 2), pt: stack.pt === undefined ? undefined : stack.pt, pb: stack.pb === undefined ? undefined : stack.pb, borderTop: stack.bordered ? '1px solid' : undefined, borderColor: stack.bordered ? 'border.default' : undefined, bg: stack.subtle ? 'canvas.subtle' : undefined, opacity: isDisabled ? 0.5 : undefined, pointerEvents: isDisabled ? 'none' : undefined, children: stack.content }, stack.id));
+            const px = stack.px ?? 2;
+            const right = Array.isArray(px) ? px[px.length - 1] : px;
+            return (_jsx(Box, { "data-prompt-stack": stack.id, "aria-disabled": isDisabled || undefined, px: px, "data-clears-assistant": stack.clearsAssistant ? '' : undefined, sx: stack.clearsAssistant
+                    ? {
+                        paddingRight: clearOfAssistant(spaceLength(right, theme?.space)),
+                    }
+                    : undefined, py: stack.py ?? 1, minHeight: stack.minHeight, display: stack.layout === 'block' ? undefined : 'flex', alignItems: stack.layout === 'block' ? undefined : 'center', gap: stack.layout === 'block' ? undefined : (stack.gap ?? 2), pt: stack.pt === undefined ? undefined : stack.pt, pb: stack.pb === undefined ? undefined : stack.pb, borderTop: stack.bordered ? '1px solid' : undefined, borderColor: stack.bordered ? 'border.default' : undefined, bg: stack.subtle ? 'canvas.subtle' : undefined, opacity: isDisabled ? 0.5 : undefined, pointerEvents: isDisabled ? 'none' : undefined, children: stack.content }, stack.id));
         }) }));
 }
 export default PromptStacks;

package/lib/models/PageTag.d.ts

@@ -15,5 +15,5 @@ export type PageTag = {
 export declare const PAGE_TAGE_NONE: PageTag;
 export declare const PAGE_TAGS: PageTag[];
 export declare const PAGE_TAGS_BY_NAME_MAP: Map<PageTagName | undefined, PageTag>;
-export declare const PAGE_TAGS_BY_COLOR_MAP: Map<"default" | "green" | "lime" | "blue" | "coral" | "gray" | "indigo" | "orange" | "pink" | "purple" | "red" | "teal" | "yellow" | "lemon", PageTag>;
+export declare const PAGE_TAGS_BY_COLOR_MAP: Map<"blue" | "coral" | "gray" | "green" | "indigo" | "lime" | "orange" | "pink" | "purple" | "red" | "teal" | "yellow" | "default" | "lemon", PageTag>;
 export {};

package/lib/protocols/AGUIAdapter.d.ts

@@ -66,6 +66,14 @@ export declare class AGUIAdapter extends BaseProtocolAdapter {
      * Terminate a running agent thread on the backend
      */
     terminateAgent(threadId?: string): Promise<void>;
+    /**
+     * The person spoke over the agent (VO-46, VO-13): an application's
+     * session is told (`POST {sessions}/{uid}/interrupt`) — what runs is
+     * cancelled, its code's `@app.interrupted` runs, and it stays open for
+     * what is said next, where Stop would leave it waiting to be resumed.
+     * Another agent's run is stopped, as Stop stops it.
+     */
+    interruptSession(threadId?: string): Promise<void>;
     /**
      * Stop an application's session (`POST {sessions}/{uid}/stop`): what runs
      * is cancelled and it waits to be resumed. Its thread is the session; with

package/lib/protocols/AGUIAdapter.js

@@ -126,6 +126,32 @@ export class AGUIAdapter extends BaseProtocolAdapter {
             // Ignore errors - agent may have already completed
         }
     }
+    /**
+     * The person spoke over the agent (VO-46, VO-13): an application's
+     * session is told (`POST {sessions}/{uid}/interrupt`) — what runs is
+     * cancelled, its code's `@app.interrupted` runs, and it stays open for
+     * what is said next, where Stop would leave it waiting to be resumed.
+     * Another agent's run is stopped, as Stop stops it.
+     */
+    async interruptSession(threadId) {
+        const sessions = this.aguiConfig.appSessions;
+        const thread = threadId || this.currentThreadId;
+        if (!sessions) {
+            await this.terminateAgent(threadId);
+            return;
+        }
+        if (!thread) {
+            return;
+        }
+        const url = `${sessions.replace(/\/+$/, '')}/${encodeURIComponent(thread)}/interrupt`;
+        const response = await this.fetchOf()(url, {
+            method: 'POST',
+            headers: this.buildHeaders(),
+        });
+        if (!response.ok) {
+            throw new Error(`The session ${thread} could not be told it was spoken over (${response.status}).`);
+        }
+    }
     /**
      * Stop an application's session (`POST {sessions}/{uid}/stop`): what runs
      * is cancelled and it waits to be resumed. Its thread is the session; with

package/lib/types/chat.d.ts

@@ -700,6 +700,12 @@ export interface ChatBaseProps {
          * for a host whose composer holds the microphone.
          */
         markInterrupted: () => void;
+        /**
+         * The person spoke over the run (VO-46, VO-13): it ends as Stop ends
+         * it, but an application's session is told it was spoken over and
+         * stays open for what is said next — Stop leaves it to be resumed.
+         */
+        interrupt?: () => void;
     } | null) => void;
     /**
      * Reports whether the agent's voice is speaking, for a host that draws the

package/lib/voice/sayAloud.d.ts

@@ -14,6 +14,11 @@
 export declare const VOICE_SAY_EVENT = "voice.say";
 /** The running application's voice, at a run's start. */
 export declare const VOICE_SETTINGS_EVENT = "voice.settings";
+/**
+ * The person spoke over the agent, the runtime says (VO-46): a client
+ * playing its voice stops it.
+ */
+export declare const VOICE_INTERRUPTED_EVENT = "voice.interrupted";
 /** The longest line said aloud: the runtime refuses longer ones. */
 export declare const SAY_ALOUD_MAX_CHARACTERS = 200;
 /** A custom event or data part, as the chat's adapters give it. */
@@ -21,5 +26,7 @@ export interface VoiceActivity {
     type: string;
     data: unknown;
 }
+/** Whether an activity is the runtime's `voice.interrupted` (VO-46). */
+export declare const isVoiceInterrupted: (activity: VoiceActivity) => boolean;
 /** The line a `voice.say` says, or `undefined` for anything else. */
 export declare function lineToSay(activity: VoiceActivity): string | undefined;

package/lib/voice/sayAloud.js

@@ -18,9 +18,16 @@
 export const VOICE_SAY_EVENT = 'voice.say';
 /** The running application's voice, at a run's start. */
 export const VOICE_SETTINGS_EVENT = 'voice.settings';
+/**
+ * The person spoke over the agent, the runtime says (VO-46): a client
+ * playing its voice stops it.
+ */
+export const VOICE_INTERRUPTED_EVENT = 'voice.interrupted';
 /** The longest line said aloud: the runtime refuses longer ones. */
 export const SAY_ALOUD_MAX_CHARACTERS = 200;
 const nameOf = (type) => type.replace(/^data-/, '');
+/** Whether an activity is the runtime's `voice.interrupted` (VO-46). */
+export const isVoiceInterrupted = (activity) => nameOf(activity.type) === VOICE_INTERRUPTED_EVENT;
 /** The line a `voice.say` says, or `undefined` for anything else. */
 export function lineToSay(activity) {
     if (nameOf(activity.type) !== VOICE_SAY_EVENT) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@datalayer/agent-runtimes",
-    "version": "1.5.59",
+    "version": "1.5.60",
     "type": "module",
     "workspaces": [
         ".",