@genesislcap/ai-assistant 14.409.0-FUI-2495.2 → 14.409.1

package/dist/esm/main/main.template.js

@@ -3,9 +3,6 @@ import { ANIMATION_DEFS } from './main.types';
 const animationItemRenderer = (option) => html `
   <span part="option-label" title="${() => option.tooltip}">${() => option.label}</span>
 `;
-const HALO_SPEED_DEFAULT = 1.5;
-const HALO_SPEED_ORCHESTRATING = 0.4;
-const HALO_BORDER_SIZE_DEFAULT = 3;
 const animationOptions = Object.entries(ANIMATION_DEFS).map(([value, def]) => ({
     value,
     label: def.label,
@@ -31,8 +28,6 @@ const genesisIconTemplate = html `
  */
 const messageType = (m) => {
     switch (true) {
-        case m.role === 'system-event':
-            return 'agent-switch';
         case m.role === 'user':
             return 'user';
         case !!m.thinking:
@@ -61,31 +56,30 @@ export const FoundationAiAssistantTemplate = (designSystemPrefix) => {
     const iconTag = `${designSystemPrefix}-icon`;
     return html `
     <div class="chat-wrapper" part="chat-wrapper">
-      ${when((x) => { var _a; return !!((_a = x.chatConfig.ui) === null || _a === void 0 ? void 0 : _a.acceptedFiles); }, html `
+      ${when((x) => !!x.chatConfig.acceptedFiles, html `
           <input
             class="file-input"
             type="file"
             multiple
-            accept=${(x) => { var _a; return (_a = x.chatConfig.ui) === null || _a === void 0 ? void 0 : _a.acceptedFiles; }}
+            accept=${(x) => x.chatConfig.acceptedFiles}
             @change=${(x, c) => x.handleFileSelect(c.event)}
           />
         `)}
-      ${when((x) => {
-        var _a, _b, _c, _d, _e;
-        return !!x.popoutMode ||
-            ((_a = x.chatConfig.ui) === null || _a === void 0 ? void 0 : _a.showToolCalls) != null ||
-            ((_b = x.chatConfig.ui) === null || _b === void 0 ? void 0 : _b.showThinkingSteps) != null ||
-            ((_c = x.chatConfig.ui) === null || _c === void 0 ? void 0 : _c.showAgentSwitchIndicator) != null ||
-            ((_d = x.chatConfig.ui) === null || _d === void 0 ? void 0 : _d.allowDebugDownload) === true ||
-            ((_e = x.chatConfig.ui) === null || _e === void 0 ? void 0 : _e.animations) != null;
-    }, html `
+      ${when((x) => !!x.popoutMode ||
+        x.chatConfig.showToolCalls != null ||
+        x.chatConfig.showThinkingSteps != null ||
+        x.chatConfig.allowDebugDownload === true ||
+        x.chatConfig.animations != null, html `
           <div
-            class="chat-header ${(x) => (x.popoutMode !== 'collapse' ? 'draggable' : '')}"
+            class="chat-header ${(x) => (x.popoutMode === 'expand' ? 'draggable' : '')}"
             part="chat-header"
             @mousedown="${(x, c) => x.onChatHeaderMouseDown(c.event)}"
           >
-            ${when((x) => !!x.headerTitle, html `
-                <span class="chat-title" part="chat-title">${(x) => x.headerTitle}</span>
+            ${when((x) => { var _a, _b, _c; return !!((_a = x.headerTitle) !== null && _a !== void 0 ? _a : (_c = (_b = x.agents) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.name); }, html `
+                <!-- TODO: multi-agent orchestration — bind to active agent name rather than always agents[0] -->
+                <span class="chat-title" part="chat-title">
+                  ${(x) => { var _a, _b, _c; return (_a = x.headerTitle) !== null && _a !== void 0 ? _a : (_c = (_b = x.agents) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.name; }}
+                </span>
               `)}
             <div class="header-actions" part="header-actions">
               <slot name="header-actions-extra"></slot>
@@ -99,14 +93,10 @@ export const FoundationAiAssistantTemplate = (designSystemPrefix) => {
                     @click=${(x) => x.handlePopout()}
                   ><${iconTag} name="${(x) => (x.popoutMode === 'expand' ? 'external-link-alt' : 'compress-alt')}"></${iconTag}></${buttonTag}>
                 `)}
-              ${when((x) => {
-        var _a, _b, _c, _d, _e;
-        return ((_a = x.chatConfig.ui) === null || _a === void 0 ? void 0 : _a.showToolCalls) != null ||
-            ((_b = x.chatConfig.ui) === null || _b === void 0 ? void 0 : _b.showThinkingSteps) != null ||
-            ((_c = x.chatConfig.ui) === null || _c === void 0 ? void 0 : _c.showAgentSwitchIndicator) != null ||
-            ((_d = x.chatConfig.ui) === null || _d === void 0 ? void 0 : _d.allowDebugDownload) === true ||
-            ((_e = x.chatConfig.ui) === null || _e === void 0 ? void 0 : _e.animations) != null;
-    }, html `
+              ${when((x) => x.chatConfig.showToolCalls != null ||
+        x.chatConfig.showThinkingSteps != null ||
+        x.chatConfig.allowDebugDownload === true ||
+        x.chatConfig.animations != null, html `
                   <${buttonTag}
                     class="settings-button"
                     part="settings-button"
@@ -119,35 +109,28 @@ export const FoundationAiAssistantTemplate = (designSystemPrefix) => {
           </div>
           ${when((x) => x.settingsOpen, html `
               <div class="settings-panel" part="settings-panel">
-                ${when((x) => { var _a; return ((_a = x.chatConfig.ui) === null || _a === void 0 ? void 0 : _a.showToolCalls) != null; }, html `
+                ${when((x) => x.chatConfig.showToolCalls != null, html `
                     <${switchTag}
                       part="toggle-tool-calls"
                       :checked=${(x) => x.showToolCalls}
                       @change=${(x) => x.toggleShowToolCalls()}
                     >Tool calls</${switchTag}>
                   `)}
-                ${when((x) => { var _a; return ((_a = x.chatConfig.ui) === null || _a === void 0 ? void 0 : _a.showThinkingSteps) != null; }, html `
+                ${when((x) => x.chatConfig.showThinkingSteps != null, html `
                     <${switchTag}
                       part="toggle-thinking"
                       :checked=${(x) => x.showThinkingSteps}
                       @change=${(x) => x.toggleShowThinkingSteps()}
                     >Thinking</${switchTag}>
                   `)}
-                ${when((x) => { var _a; return ((_a = x.chatConfig.ui) === null || _a === void 0 ? void 0 : _a.showAgentSwitchIndicator) != null; }, html `
-                    <${switchTag}
-                      part="toggle-agent-switch"
-                      :checked=${(x) => x.showAgentSwitchIndicator}
-                      @change=${(x) => x.toggleShowAgentSwitchIndicator()}
-                    >Agents</${switchTag}>
-                  `)}
-                ${when((x) => { var _a; return ((_a = x.chatConfig.ui) === null || _a === void 0 ? void 0 : _a.allowDebugDownload) === true; }, html `
+                ${when((x) => x.chatConfig.allowDebugDownload === true, html `
                     <${buttonTag}
                       part="download-button"
                       appearance="stealth"
-                      @click=${(x) => x.downloadDebugLog()}
-                    >Download agent log</${buttonTag}>
+                      @click=${(x) => x.downloadHistory()}
+                    >Download debug state</${buttonTag}>
                   `)}
-                ${when((x) => { var _a, _b; return ((_b = (_a = x.chatConfig.ui) === null || _a === void 0 ? void 0 : _a.animations) === null || _b === void 0 ? void 0 : _b.userConfigurable) === true; }, html `
+                ${when((x) => { var _a; return ((_a = x.chatConfig.animations) === null || _a === void 0 ? void 0 : _a.userConfigurable) === true; }, html `
                     <div class="settings-animations">
                       <span class="settings-label">Animations</span>
                       <${multiselectTag}
@@ -168,61 +151,45 @@ export const FoundationAiAssistantTemplate = (designSystemPrefix) => {
       <div class="messages" part="messages">
 
         ${repeat((x) => x.visibleMessages, html `
-            ${when((m) => m.role === 'system-event', html `
-                <div class="agent-switch-indicator" part="agent-switch-indicator">
-                  <span class="agent-switch-label">${(m) => m.content}</span>
-                </div>
-              `)}
-            ${when((m) => m.role !== 'system-event', html `
-                <div class="message-row ${(m) => messageType(m)}">
-                  ${when((m) => m.role !== 'user', html `
-                      <div class="avatar ${(m) => messageType(m)}">
-                        ${when((m, c) => !!c.parent.imageSrc, html `
-                            <img
-                              src="${(m, c) => c.parent.imageSrc}"
-                              alt="Assistant"
-                              class="avatar-img"
-                            />
-                          `)}
-                        ${when((m, c) => !c.parent.imageSrc, genesisIconTemplate)}
-                      </div>
+            <div class="message-row ${(m) => messageType(m)}">
+              ${when((m) => m.role !== 'user', html `
+                  <div class="avatar ${(m) => messageType(m)}">
+                    ${when((m, c) => !!c.parent.imageSrc, html `
+                        <img
+                          src="${(m, c) => c.parent.imageSrc}"
+                          alt="Assistant"
+                          class="avatar-img"
+                        />
+                      `)}
+                    ${when((m, c) => !c.parent.imageSrc, genesisIconTemplate)}
+                  </div>
+                `)}
+              <div class="message ${(m) => messageType(m)}">
+                <div class="sender">${(m) => senderLabel[messageType(m)]}</div>
+                <div class="content">
+                  ${when((m) => m.content, html `
+                      <ai-chat-markdown :content="${(m) => m.content}"></ai-chat-markdown>
                     `)}
-                  <div class="message ${(m) => messageType(m)}">
-                    <div class="sender">
-                      ${(m, c) => messageType(m) === 'ai-function' &&
-        m.agentName &&
-        c.parent.showAgentSwitchIndicator
-        ? `Tool Call · ${m.agentName}`
-        : senderLabel[messageType(m)]}
-                    </div>
-                    <div class="content">
-                      ${when((m) => m.content, html `
-                          <ai-chat-markdown :content="${(m) => m.content}"></ai-chat-markdown>
-                        `)}
-                      ${when((m) => m.toolCalls, html `
-                          ${repeat((m) => { var _a; return (_a = m.toolCalls) !== null && _a !== void 0 ? _a : []; }, html `
-                              <pre class="payload"><strong>${(tc) => tc.name}</strong>(${(tc) => JSON.stringify(tc.args, null, 2)})</pre>
-                            `)}
+                  ${when((m) => m.toolCalls, html `
+                      ${repeat((m) => { var _a; return (_a = m.toolCalls) !== null && _a !== void 0 ? _a : []; }, html `
+                          <pre class="payload"><strong>${(tc) => tc.name}</strong>(${(tc) => JSON.stringify(tc.args, null, 2)})</pre>
                         `)}
-                      ${when((m) => m.interaction, html `
-                          <ai-chat-interaction-wrapper
-                            :componentName=${(m) => m.interaction.componentName}
-                            :data=${(m) => m.interaction.data}
-                            :interactionId=${(m) => m.interaction.interactionId}
-                            :resolved=${(m) => !!m.interaction.resolved}
-                            @interaction-completed=${(m, c) => c.parent.handleInteractionCompleted(c.event)}
-                          ></ai-chat-interaction-wrapper>
-                        `)}
-                    </div>
-                  </div>
+                    `)}
+                  ${when((m) => m.interaction, html `
+                      <ai-chat-interaction-wrapper
+                        :componentName=${(m) => m.interaction.componentName}
+                        :data=${(m) => m.interaction.data}
+                        :interactionId=${(m) => m.interaction.interactionId}
+                        :resolved=${(m) => !!m.interaction.resolved}
+                        @interaction-completed=${(m, c) => c.parent.handleInteractionCompleted(c.event)}
+                      ></ai-chat-interaction-wrapper>
+                    `)}
                 </div>
-              `)}
+              </div>
+            </div>
           `)}
-        ${when((x) => {
-        var _a;
-        return x.showLoadingIndicator &&
-            (((_a = x.chatConfig.ui) === null || _a === void 0 ? void 0 : _a.animations) == null || x.enabledAnimations.includes('loading'));
-    }, html `
+        ${when((x) => x.showLoadingIndicator &&
+        (x.chatConfig.animations == null || x.enabledAnimations.includes('loading')), html `
             <div class="message-row ai" part="thinking">
               <div class="avatar">
                 ${when((x) => !!x.imageSrc, html `
@@ -270,12 +237,12 @@ export const FoundationAiAssistantTemplate = (designSystemPrefix) => {
         `)}
 
       <div class="input-row" part="input-row">
-        ${when((x) => { var _a; return !!((_a = x.chatConfig.ui) === null || _a === void 0 ? void 0 : _a.acceptedFiles); }, html `
+        ${when((x) => !!x.chatConfig.acceptedFiles, html `
             <${buttonTag}
               class="attach-button"
               part="attach-button"
               appearance="stealth"
-              title=${(x) => { var _a; return `Attach file (${(_a = x.chatConfig.ui) === null || _a === void 0 ? void 0 : _a.acceptedFiles})`; }}
+              title=${(x) => `Attach file (${x.chatConfig.acceptedFiles})`}
               ?disabled=${(x) => x.state === 'loading'}
               @click=${(x) => x.triggerFileInput()}
             ><${iconTag} name="paperclip"></${iconTag}></${buttonTag}>
@@ -306,10 +273,7 @@ export const FoundationAiAssistantTemplate = (designSystemPrefix) => {
       </div>
       <ai-halo-overlay
         part="halo-overlay"
-        ?active=${(x) => x.showHalo !== 'no' && x.enabledAnimations.includes('halo')}
-        :speed="${(x) => (x.showHalo === 'orchestrating' ? HALO_SPEED_ORCHESTRATING : HALO_SPEED_DEFAULT)}"
-        direction="${(x) => (x.showHalo === 'orchestrating' ? 'ccw' : 'cw')}"
-        :borderSize="${(x) => (x.showHalo === 'orchestrating' ? 2 : HALO_BORDER_SIZE_DEFAULT)}"
+        ?active=${(x) => x.showHalo && x.enabledAnimations.includes('halo')}
       ></ai-halo-overlay>
     </div>
   `;

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/channel/ai-activity-bus.ts","../src/channel/ai-activity-channel.ts","../src/components/halo-overlay.ts","../src/components/activity-halo/activity-halo.ts","../src/components/ai-driver/ai-driver.ts","../src/components/ai-driver/index.ts","../src/components/chat-bubble/chat-bubble.styles.ts","../src/components/chat-bubble/chat-bubble.template.ts","../src/components/chat-bubble/chat-bubble.ts","../src/components/chat-bubble/index.ts","../src/components/chat-driver/chat-driver.ts","../src/components/chat-driver/index.ts","../src/components/chat-interaction-wrapper/chat-interaction-wrapper.styles.ts","../src/components/chat-interaction-wrapper/chat-interaction-wrapper.template.ts","../src/components/chat-interaction-wrapper/chat-interaction-wrapper.ts","../src/components/chat-interaction-wrapper/index.ts","../src/components/chat-markdown/chat-markdown.ts","../src/components/chat-markdown/index.ts","../src/components/orchestrating-driver/index.ts","../src/components/orchestrating-driver/orchestrating-driver.ts","../src/components/popout-manager/index.ts","../src/components/popout-manager/popout-manager.ts","../src/config/config.ts","../src/config/fallback-agents.ts","../src/config/index.ts","../src/main/index.ts","../src/main/main.styles.ts","../src/main/main.template.ts","../src/main/main.ts","../src/main/main.types.ts","../src/styles/ai-colours.ts","../src/styles/index.ts","../src/styles/styles.ts","../src/tags/index.ts","../src/types/ai-chat-widget.ts","../src/utils/index.ts","../src/utils/logger.ts"],"version":"5.9.2"}
+{"root":["../src/index.ts","../src/channel/ai-activity-bus.ts","../src/channel/ai-activity-channel.ts","../src/components/halo-overlay.ts","../src/components/activity-halo/activity-halo.ts","../src/components/chat-bubble/chat-bubble.styles.ts","../src/components/chat-bubble/chat-bubble.template.ts","../src/components/chat-bubble/chat-bubble.ts","../src/components/chat-bubble/index.ts","../src/components/chat-driver/chat-driver.ts","../src/components/chat-driver/index.ts","../src/components/chat-interaction-wrapper/chat-interaction-wrapper.styles.ts","../src/components/chat-interaction-wrapper/chat-interaction-wrapper.template.ts","../src/components/chat-interaction-wrapper/chat-interaction-wrapper.ts","../src/components/chat-interaction-wrapper/index.ts","../src/components/chat-markdown/chat-markdown.ts","../src/components/chat-markdown/index.ts","../src/config/config.ts","../src/config/index.ts","../src/main/index.ts","../src/main/main.styles.ts","../src/main/main.template.ts","../src/main/main.ts","../src/main/main.types.ts","../src/styles/ai-colours.ts","../src/styles/index.ts","../src/styles/styles.ts","../src/tags/index.ts","../src/types/ai-chat-widget.ts","../src/utils/index.ts","../src/utils/logger.ts"],"version":"5.9.2"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/ai-assistant",
   "description": "Genesis AI Assistant micro-frontend",
-  "version": "14.409.0-FUI-2495.2",
+  "version": "14.409.1",
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
   "types": "dist/ai-assistant.d.ts",
@@ -59,23 +59,23 @@
     }
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "14.409.0-FUI-2495.2",
-    "@genesislcap/genx": "14.409.0-FUI-2495.2",
-    "@genesislcap/rollup-builder": "14.409.0-FUI-2495.2",
-    "@genesislcap/ts-builder": "14.409.0-FUI-2495.2",
-    "@genesislcap/uvu-playwright-builder": "14.409.0-FUI-2495.2",
-    "@genesislcap/vite-builder": "14.409.0-FUI-2495.2",
-    "@genesislcap/webpack-builder": "14.409.0-FUI-2495.2",
+    "@genesislcap/foundation-testing": "14.409.1",
+    "@genesislcap/genx": "14.409.1",
+    "@genesislcap/rollup-builder": "14.409.1",
+    "@genesislcap/ts-builder": "14.409.1",
+    "@genesislcap/uvu-playwright-builder": "14.409.1",
+    "@genesislcap/vite-builder": "14.409.1",
+    "@genesislcap/webpack-builder": "14.409.1",
     "@types/dompurify": "^3.0.5",
     "@types/marked": "^5.0.2"
   },
   "dependencies": {
-    "@genesislcap/foundation-ai": "14.409.0-FUI-2495.2",
-    "@genesislcap/foundation-logger": "14.409.0-FUI-2495.2",
-    "@genesislcap/foundation-ui": "14.409.0-FUI-2495.2",
-    "@genesislcap/foundation-utils": "14.409.0-FUI-2495.2",
-    "@genesislcap/rapid-design-system": "14.409.0-FUI-2495.2",
-    "@genesislcap/web-core": "14.409.0-FUI-2495.2",
+    "@genesislcap/foundation-ai": "14.409.1",
+    "@genesislcap/foundation-logger": "14.409.1",
+    "@genesislcap/foundation-ui": "14.409.1",
+    "@genesislcap/foundation-utils": "14.409.1",
+    "@genesislcap/rapid-design-system": "14.409.1",
+    "@genesislcap/web-core": "14.409.1",
     "dompurify": "^3.3.1",
     "marked": "^17.0.3"
   },
@@ -87,5 +87,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1fcaf08e9b7559024b25dc6ccc27e3bc62f1512b"
+  "gitHead": "a23531e1359a6381e7d4fd81e98bd8d2e9981560"
 }

package/src/channel/ai-activity-channel.ts

@@ -11,7 +11,6 @@ export interface AiAssistantSerializedState {
   messages: ChatMessage[];
   showToolCalls: boolean;
   showThinkingSteps: boolean;
-  showAgentSwitchIndicator: boolean;
   enabledAnimations: AiAssistantAnimation[];
 }
 

package/src/components/chat-driver/chat-driver.ts

@@ -1,23 +1,17 @@
 import type {
   AIProvider,
   ChatAttachment,
-  ChatDriverResult,
   ChatMessage,
   ChatRequestOptions,
   ChatToolDefinition,
   ChatToolHandlers,
 } from '@genesislcap/foundation-ai';
 import { MalformedFunctionCallError } from '@genesislcap/foundation-ai';
-import type { AgentConfig } from '../../config/config';
 import { logger } from '../../utils/logger';
-import type { AiDriver } from '../ai-driver/ai-driver';
 
 const DEFAULT_MAX_TOOL_ITERATIONS = 50;
 const MAX_MALFORMED_RETRIES = 2;
 
-/** Name reserved for the cross-agent handoff tool — injected by OrchestratingDriver. */
-export const REQUEST_CONTINUATION_TOOL = 'request_continuation';
-
 /**
  * Event emitted when the chat history is updated (new message appended).
  *
@@ -33,7 +27,7 @@ export type ChatHistoryUpdatedEvent = CustomEvent<ReadonlyArray<ChatMessage>>;
  *
  * @beta
  */
-export class ChatDriver extends EventTarget implements AiDriver {
+export class ChatDriver extends EventTarget {
   private history: ChatMessage[] = [];
   private busy = false;
   private pendingInteractions = new Map<
@@ -41,47 +35,26 @@ export class ChatDriver extends EventTarget implements AiDriver {
     { resolve: (value: any) => void; reject: (reason?: any) => void }
   >();
 
-  private systemPrompt?: string;
-  private toolDefinitions: ChatToolDefinition[];
-  private toolHandlers: ChatToolHandlers;
-  private primerHistory?: ChatMessage[];
-  private activeAgentName?: string;
-
   constructor(
     private readonly aiProvider: AIProvider,
-    toolHandlers: ChatToolHandlers = {},
-    toolDefinitions: ChatToolDefinition[] = [],
-    systemPrompt?: string,
-    primerHistory?: ChatMessage[],
+    private readonly toolHandlers: ChatToolHandlers = {},
+    private readonly toolDefinitions: ChatToolDefinition[] = [],
+    private readonly systemPrompt?: string,
+    private readonly primerHistory?: ChatMessage[],
     private readonly maxToolIterations: number = DEFAULT_MAX_TOOL_ITERATIONS,
   ) {
     super();
-    this.toolHandlers = toolHandlers;
-    this.toolDefinitions = toolDefinitions;
-    this.systemPrompt = systemPrompt;
-    this.primerHistory = primerHistory;
-  }
-
-  /**
-   * Swap in a new agent's configuration. Called by OrchestratingDriver before
-   * each specialist turn so the shared driver runs with the right tools and prompt.
-   */
-  applyAgent(config: AgentConfig): void {
-    this.systemPrompt = config.systemPrompt;
-    this.toolDefinitions = config.toolDefinitions ?? [];
-    this.toolHandlers = config.toolHandlers ?? {};
-    this.primerHistory = config.primerHistory;
-    this.activeAgentName = config.name;
+    if (!systemPrompt) {
+      logger.error(
+        'ChatDriver: no systemPrompt provided. The assistant will have no instructions — set the systemPrompt property on foundation-ai-assistant.',
+      );
+    }
   }
 
   getHistory(): ReadonlyArray<ChatMessage> {
     return this.history;
   }
 
-  getRawHistory(): readonly ChatMessage[] {
-    return this.history;
-  }
-
   isBusy(): boolean {
     return this.busy;
   }
@@ -136,95 +109,55 @@ export class ChatDriver extends EventTarget implements AiDriver {
    */
   public loadHistory(messages: ChatMessage[]): void {
     this.history = [...messages];
-    this.dispatchEvent(
-      new CustomEvent<ReadonlyArray<ChatMessage>>('history-updated', {
-        detail: this.history,
-      }),
-    );
   }
 
-  async sendMessage(userInput: string, attachments?: ChatAttachment[]): Promise<ChatDriverResult> {
-    if (this.busy || (!userInput.trim() && !attachments?.length)) return { reason: 'done' };
+  async sendMessage(userInput: string, attachments?: ChatAttachment[]): Promise<void> {
+    if (this.busy || (!userInput.trim() && !attachments?.length)) return;
     if (!this.aiProvider.chat) {
       logger.warn('ChatDriver: AIProvider does not implement chat()');
-      return { reason: 'done' };
+      return;
     }
 
     this.busy = true;
     this.appendToHistory({ role: 'user', content: userInput, attachments });
 
     try {
-      return await this.runToolLoop(userInput, attachments);
-    } catch (e) {
-      logger.error('ChatDriver error:', e);
-      this.appendToHistory({ role: 'assistant', content: 'Sorry, something went wrong.' });
-      return { reason: 'done' };
-    } finally {
-      this.busy = false;
-    }
-  }
-
-  /**
-   * Continue the tool loop from current history without appending a new user message.
-   * Used by OrchestratingDriver after an agent handoff — the handoff context is
-   * already in history; `transientPrimer` is injected as an invisible one-shot
-   * message for this call only.
-   */
-  async continueFromHistory(transientPrimer?: ChatMessage[]): Promise<ChatDriverResult> {
-    if (this.busy) return { reason: 'done' };
-    if (!this.aiProvider.chat) {
-      logger.warn('ChatDriver: AIProvider does not implement chat()');
-      return { reason: 'done' };
-    }
-
-    this.busy = true;
-    try {
-      return await this.runToolLoop('', undefined, transientPrimer);
+      await this.runToolLoop(userInput, attachments);
     } catch (e) {
       logger.error('ChatDriver error:', e);
       this.appendToHistory({ role: 'assistant', content: 'Sorry, something went wrong.' });
-      return { reason: 'done' };
     } finally {
       this.busy = false;
     }
   }
 
-  private async runToolLoop(
-    userInput: string,
-    attachments?: ChatAttachment[],
-    transientPrimer?: ChatMessage[],
-  ): Promise<ChatDriverResult> {
-    if (!this.systemPrompt) {
-      logger.warn(
-        'ChatDriver: no systemPrompt set. The assistant will have no instructions — provide a systemPrompt via agents config or the foundation-ai-assistant property.',
-      );
-    }
+  private async runToolLoop(userInput: string, attachments?: ChatAttachment[]): Promise<void> {
     const baseOptions: ChatRequestOptions = {
       systemPrompt: this.systemPrompt,
       tools: this.toolDefinitions.length ? this.toolDefinitions : undefined,
     };
 
+    // History has the user message at the end — pass everything before it as history,
+    // and the user input as the userMessage argument.
     let currentInput = userInput;
     let currentAttachments: ChatAttachment[] | undefined = attachments;
     let iterations = 0;
     let malformedAttempts = 0;
-    // continueFromHistory callers pass empty input — start at iteration 1 so
-    // the first LLM call sees the full history (no slice-off-last logic).
-    const startIteration = currentInput ? 1 : 0;
 
     while (iterations < this.maxToolIterations) {
       iterations += 1;
 
-      // On the first iteration of a normal sendMessage call, the last item in
-      // history is the user message passed separately — exclude it from history.
-      // On continueFromHistory calls (startIteration=0) or subsequent iterations,
-      // the full history is sent and currentInput is empty.
-      const primer = [...(this.primerHistory ?? []), ...(transientPrimer ?? [])];
+      // On the first iteration, the last item in history is the user message which is
+      // passed separately as currentInput — exclude it. On subsequent iterations, the
+      // full history (including tool results) should be sent and currentInput is empty.
+      // primerHistory (if provided) is prepended to every call but never stored in
+      // this.history and never shown in the UI.
+      const primer = this.primerHistory ?? [];
       const historyForCall =
-        iterations === startIteration
-          ? [...primer, ...this.history.slice(0, -1)]
-          : [...primer, ...this.history];
+        iterations === 1 ? [...primer, ...this.history.slice(0, -1)] : [...primer, ...this.history];
 
+      // On malformed-call retries, augment the system prompt to steer the model
+      // away from generating Python-style batched function call syntax.
       const systemPrompt =
         malformedAttempts > 0
           ? `${baseOptions.systemPrompt ?? ''}\n\nIMPORTANT: Use only the structured function-call API to invoke tools. Do not write Python code or use Python-style syntax to call tools.`
@@ -247,7 +180,7 @@ export class ChatDriver extends EventTarget implements AiDriver {
             logger.warn(
               `ChatDriver: MALFORMED_FUNCTION_CALL, retrying (${malformedAttempts}/${MAX_MALFORMED_RETRIES})`,
             );
-            iterations -= 1;
+            iterations -= 1; // don't consume an iteration budget slot for a failed attempt
             continue;
           }
           logger.error('ChatDriver: MALFORMED_FUNCTION_CALL, max retries reached');
@@ -256,19 +189,20 @@ export class ChatDriver extends EventTarget implements AiDriver {
             content:
               "I'm sorry, I wasn't able to complete that request. Please try rephrasing or breaking it into smaller steps.",
           });
-          return { reason: 'done' };
+          return;
         }
         throw e;
       }
 
-      currentAttachments = undefined;
+      currentAttachments = undefined; // attachments only sent on first call
 
       const isThinkingStep = response.content && response.toolCalls?.length;
       const isEmptyResponse = !response.content?.trim() && !response.toolCalls?.length;
 
       if (isEmptyResponse) {
-        // Discard empty/whitespace-only responses
+        // Do nothing, discard empty/whitespace-only responses
       } else if (isThinkingStep) {
+        // Separate thinking message and tool call message
         this.appendToHistory({ ...response, toolCalls: undefined, thinking: true });
         this.appendToHistory({ ...response, content: '' });
       } else {
@@ -276,22 +210,11 @@ export class ChatDriver extends EventTarget implements AiDriver {
       }
 
       if (!response.toolCalls?.length) {
+        // Terminal text response — done
         break;
       }
 
-      // Check for request_continuation before executing tool calls — it is a
-      // system tool intercepted by OrchestratingDriver, not a real handler.
-      const continuationCall = response.toolCalls.find(
-        (tc) => tc.name === REQUEST_CONTINUATION_TOOL,
-      );
-      if (continuationCall) {
-        const { summary, remaining_task: remainingTask } = continuationCall.args as {
-          summary: string;
-          remaining_task: string;
-        };
-        return { reason: 'agent-handoff', summary, remainingTask };
-      }
-
+      // Execute all tool calls for this iteration concurrently, then append results in order
       // eslint-disable-next-line no-await-in-loop
       const toolResults = await Promise.all(
         response.toolCalls.map(async (tc) => {
@@ -322,21 +245,17 @@ export class ChatDriver extends EventTarget implements AiDriver {
         });
       }
 
+      // Next iteration sends an empty string — the tool results are in history
       currentInput = '';
     }
 
     if (iterations >= this.maxToolIterations) {
       logger.warn('ChatDriver: reached max tool iterations, stopping');
     }
-
-    return { reason: 'done' };
   }
 
   private appendToHistory(message: ChatMessage): void {
-    const tagged: ChatMessage = this.activeAgentName
-      ? { ...message, agentName: this.activeAgentName }
-      : message;
-    this.history = [...this.history, tagged];
+    this.history = [...this.history, message];
     this.dispatchEvent(
       new CustomEvent<ReadonlyArray<ChatMessage>>('history-updated', {
         detail: this.history,