@memberjunction/ai-agents 6.2.0-edge.2 → 6.2.0-edge.4

package/README.md

@@ -240,6 +240,12 @@ Key pieces in this package:
 - **`MediaChannelServer`** (`src/realtime/media-channel-server.ts`, key `'MediaChannelServer'`) — the server channel plugin for the **Media** surface. Like the Whiteboard it canonicalizes the channel's persisted media state, and additionally resolves the agent's **media kit** at session start: it implements `IRealtimeChannelServerDataAware` to receive the session `contextUser`+`provider`, reads a per-session `mediaCollectionID` override out of `RealtimeChannelServerContext.AgentSessionConfig` (the persisted `AIAgentSession.Config_`), and feeds the model a manifest via `SendContextNote`. The kit-resolution logic is the pure, unit-tested `agent-media-library.ts` (`buildAgentMediaContextNote` / `resolveAgentMediaManifest` / `formatAgentMediaManifest`); precedence is `runtime override > AIAgent.DefaultMediaCollectionID > none`. The agent then surfaces items with the existing `Media_ShowMedia` client tool — no new client tool. `LoadMediaChannelServer()` is invoked from MJServer's `agentSessions` module. See the [Real-Time Co-Agents Guide](../../../guides/REALTIME_CO_AGENTS_GUIDE.md).
 - **`AgentMemoryContextBuilder`** (`src/agent-memory-context-builder.ts`) — the memory/RAG injection orchestration extracted out of `BaseAgent` so the co-agent assembles the **same** notes/examples/context a loop agent does, with no duplicated logic.
 
+- **`realtime-channel-policy.ts`** (`BuildSessionChannelPolicy`) — the **server half of channel scoping** for client-direct sessions, pure and unit-tested. At mint the browser reports its channel candidates (`channelCandidatesJson`); `RealtimeClientSessionService` matches each to its `MJ: AI Agent Channels` row *from the server's own registry* (the client's view is never trusted), folds the cascade's `realtime.channels` section (agent layers plus `Application.AgentSettings.Realtime.Channels`) through `ResolveRealtimeChannelScope`, and returns the resolved `RealtimeSessionClientPolicy` (`PrepareClientSession` → `ClientPolicy`; the resolver returns it as `ClientPolicyJson` and persists the in-scope channel keys on the session). The tools the model is told about are narrowed to match: a vetoed channel's native tools never reach the provider, an included `'opt-in'` channel's are added by name, an `'on-demand'` channel declares none (it is opened through `ContextTool`), and tools no candidate owns (the host's own) pass through. Server plugins start before the scope is known, so `RealtimeChannelServerHost.PruneSessionChannels` drops the excluded channels' server halves afterwards. Absent candidates (a client that predates scoping, or a host that mints through its own proxy) ⇒ tools used exactly as declared and no policy.
+- **`ClientOnlyChannelServer`** (`src/realtime/client-only-channel-server.ts`, key `'ClientOnlyChannelServer'`) — the generic server half for any channel that runs entirely in the browser. `MJ: AI Agent Channels.ServerPluginClass` is `NOT NULL`, so a client-only channel (an Open App's form or game channel) sets its row's `ServerPluginClass` to this key instead of writing an empty plugin. It takes its channel name from the registry row it was resolved for (`BindChannelName`, called by `RealtimeChannelServerHost`), contributes no server tools and does not interpret or rewrite saves. It does not decide scope (resolved before any plugin exists) and cannot stop a save (the host persists whatever the client submits when a plugin returns `null`), so persistence is controlled by the client plugin's `SerializeState()`. `LoadClientOnlyChannelServer()` is invoked from MJServer's `agentSessions` module.
+- **`InteractiveComponentChannelServer`** (`src/realtime/interactive-component-channel-server.ts`, key `'InteractiveComponentChannelServer'`) — the deliberately thin server half of the **Interactive Component** channel (`MJ: AI Agent Channels` row `InteractiveComponent`), a `ClientOnlyChannelServer` subclass that keeps its existing registry key: no server tools, and the client plugin saves no state of record, because the channel's actions are derived from the open component's spec and run in the browser. `LoadInteractiveComponentChannelServer()` is invoked from MJServer's `agentSessions` module.
+- **Channel exposure and zero data retention.** `BuildSessionChannelPolicy` also resolves each channel's **exposure** (`min(channel ceiling, agent cap, zero-data-retention ceiling)`; the user's own choice is applied by the browser). The agent cap is `realtime.channels.config.<Key>.maxExposure`; `requireZeroDataRetentionFor: ['state' | 'pixels']` (in the realtime configuration cascade and in `Application.AgentSettings.Realtime.Channels.RequireZeroDataRetentionFor`) lowers exposure when the session model's effective configuration (`AIEngine.GetEffectiveModelConfiguration`) does not declare `Privacy.ZeroDataRetention: true`; a failed model lookup fails closed. The resolved exposure and the reasons for any downgrade ride back in `ClientPolicyJson`. Also in the realtime session tuning section: `session.unverifiedMaxSeconds` / `session.verifiedMaxSeconds` (positive integers, carried through the cascade for the session-deadline logic; never forwarded to the provider driver).
+- **App client tools and the unified resolver.** `Application.AgentSettings.ClientTools` is now actually read by the realtime path: resolved against the tool-definition catalog and layered, through `ResolveClientTools` (`override → session → app → static`), beneath the live surface's manifest in the app-context snapshot the companion prompt renders. The agent's static `MJ: AI Agent Client Tools` junction tools ride the returned policy (so the browser can describe them) but are deliberately not added to the voice prompt — voice prompts are token-sensitive and a tool with no browser handler is noise. The app's `AgentSettings` column is parsed with `ParseAgentSettings` rather than the generated accessor.
+
 Delegated runs link to the co-agent's run via `ParentRunID` and share the session's `AgentSessionID`, so the whole episode — session, co-agent run (with its prompt run + Timeline step), delegated runs, transcript (`ConversationDetail` rows), channel state, usage telemetry (checkpointed server-side, or relayed from the browser via `RelayRealtimeUsage`) — groups under one session record with full standard observability.
 
 The browser-side driver layer lives in [`@memberjunction/ai-realtime-client`](../RealtimeClient/README.md); the model primitive (`BaseRealtimeModel` / `IRealtimeSession`) lives in `@memberjunction/ai`; the Angular UX (call overlay, interactive channels, the live whiteboard) lives in `@memberjunction/ng-conversations`. **The flagship guide — concept, triple-registry plugin architecture, topologies, session lifecycle, channels, narration, security — is [guides/REALTIME_CO_AGENTS_GUIDE.md](../../../guides/REALTIME_CO_AGENTS_GUIDE.md).**

package/dist/AgentDecisionService.d.ts

@@ -10,7 +10,7 @@
 import { UserInfo } from '@memberjunction/core';
 import { DecisionQuestion, DecisionAnswer } from '@memberjunction/ai';
 import { AIDecisionRunResult } from '@memberjunction/ai-prompts';
-import { AgentDecisionAnswerSummary } from '@memberjunction/ai-core-plus';
+import { AgentDecisionAnswerSummary, type AIPromptExecutionScope } from '@memberjunction/ai-core-plus';
 /**
  * Parameters for the AgentDecisionService.Ask method.
  */
@@ -35,6 +35,13 @@ export interface AgentDecisionAskParams {
      * Optional prompt name to resolve from AIEngine. Defaults to 'Default Decision'.
      */
     PromptName?: string;
+    /**
+     * The asking run's execution scope — its configuration, runtime API keys and credential scope.
+     * Without it a decision resolves no run key and, under the default scope, answers on the
+     * platform's keys inside a customer's run; under `'RuntimeOnly'` that is exactly what must not
+     * happen. `ContextUser` still names the user.
+     */
+    ExecutionScope?: AIPromptExecutionScope;
     /**
      * Optional cancellation token to abort execution.
      */

package/dist/AgentDecisionService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AgentDecisionService.d.ts","sourceRoot":"","sources":["../src/AgentDecisionService.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAsC,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACrG,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC;;OAEG;IACH,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAE5C;;OAEG;IACH,WAAW,EAAE,QAAQ,CAAC;IAEtB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,iBAAiB,CAAC,EAAE,WAAW,CAAC;CACnC;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACpC,gGAAgG;IAChG,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAE5C,4FAA4F;IAC5F,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB;AAqBD;;GAEG;AACH,qBAAa,oBAAoB;IAC7B;;OAEG;IACH,gBAAuB,mBAAmB,sBAAsB;IAEhE;;;OAGG;IACU,GAAG,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA+B5E;;;;OAIG;WACW,mBAAmB,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,uBAAuB;IAa9F,uDAAuD;IACvD,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAmBjC,sFAAsF;IACtF,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAc/B,yEAAyE;IACzE,OAAO,CAAC,MAAM,CAAC,eAAe;IAO9B;;OAEG;WACW,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC;CAyBtH"}
+{"version":3,"file":"AgentDecisionService.d.ts","sourceRoot":"","sources":["../src/AgentDecisionService.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAsC,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACrG,OAAO,EAAE,0BAA0B,EAA4B,KAAK,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEjI;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC;;OAEG;IACH,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAE5C;;OAEG;IACH,WAAW,EAAE,QAAQ,CAAC;IAEtB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,sBAAsB,CAAC;IAExC;;OAEG;IACH,iBAAiB,CAAC,EAAE,WAAW,CAAC;CACnC;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACpC,gGAAgG;IAChG,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAE5C,4FAA4F;IAC5F,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB;AAqBD;;GAEG;AACH,qBAAa,oBAAoB;IAC7B;;OAEG;IACH,gBAAuB,mBAAmB,sBAAsB;IAEhE;;;OAGG;IACU,GAAG,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAkC5E;;;;OAIG;WACW,mBAAmB,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,uBAAuB;IAa9F,uDAAuD;IACvD,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAmBjC,sFAAsF;IACtF,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAc/B,yEAAyE;IACzE,OAAO,CAAC,MAAM,CAAC,eAAe;IAO9B;;OAEG;WACW,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC;CAyBtH"}

package/dist/AgentDecisionService.js

@@ -9,6 +9,7 @@
  */
 import { AIEngine } from '@memberjunction/aiengine';
 import { AIDecisionRunner, AIDecisionParams } from '@memberjunction/ai-prompts';
+import { PickPromptExecutionScope } from '@memberjunction/ai-core-plus';
 /** A plain object, as opposed to null, an array or a primitive. */
 function isPlainObject(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
@@ -49,6 +50,9 @@ export class AgentDecisionService {
                 };
             }
             const params = new AIDecisionParams();
+            if (args.ExecutionScope) {
+                Object.assign(params, PickPromptExecutionScope(args.ExecutionScope));
+            }
             params.prompt = prompt;
             params.contextUser = args.ContextUser;
             params.State = args.State;

package/dist/AgentDecisionService.js.map

@@ -1 +1 @@
-{"version":3,"file":"AgentDecisionService.js","sourceRoot":"","sources":["../src/AgentDecisionService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AgentDecisionService.js","sourceRoot":"","sources":["../src/AgentDecisionService.ts"],"names":[],"mappings":"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"}

package/dist/AgentRunner.d.ts

@@ -51,6 +51,18 @@ export declare function selectPrimaryArtifact(fileArtifacts: readonly CreatedArt
  * ```
  */
 export declare class AgentRunner {
+    /**
+     * The status and message the agent's reply detail ends with, from the run's result.
+     *
+     * A run the user stopped is not an error: its reply is marked Complete with a short "stopped"
+     * message, so the chat shows a quiet end rather than a red failure, and the run row (Cancelled,
+     * with its reason and the payload as it stood) carries the detail. Every other outcome keeps the
+     * long-standing mapping: the run's message when it wrote one, else Completed or the error.
+     */
+    static ResolveFinalDetailState(agentResult: ExecuteAgentResult): {
+        Status: 'Complete' | 'Error';
+        Message: string;
+    };
     /**
      * Why a conversation-detail `Save()` returned false, for an error or log line. The owner gate in
      * `MJConversationDetailEntityExtended` refuses a non-owner's write (e.g. the elevated System user
@@ -202,6 +214,34 @@ export declare class AgentRunner {
         versionId: string;
         versionNumber: number;
     }>;
+    /**
+     * Gives the current reply an existing artifact version whose content equals the new payload.
+     * The reply gets an `Output` link to that version (unless it already has one), which makes the
+     * version visible on the reply's branch path, and the result is the same tuple the normal
+     * version-creation path returns. When the link-exists read fails, no link is written and the
+     * result is `undefined`, so a failed read never adds a second link for the same pair.
+     *
+     * @param versionId - The existing version with identical content
+     * @param conversationDetailId - The reply row to link the version to
+     * @param artifactId - The parent artifact ID
+     * @param versionNumber - The existing version's number
+     * @param contextUser - User context for the read and the save
+     * @param provider - Metadata provider for the read and the save
+     * @returns The standard artifact result tuple for the existing version, or `undefined` when
+     *   the link-exists read failed
+     */
+    private reuseVersionForReply;
+    /**
+     * Checks whether a conversation detail already has an `Output` link to an artifact version.
+     * A failed read is logged and returns `null`.
+     *
+     * @param conversationDetailId - The conversation detail to check
+     * @param versionId - The artifact version to look for
+     * @param contextUser - User context for the read
+     * @param provider - Metadata provider for the read
+     * @returns `true` when the link exists, `false` when it does not, `null` when the read failed
+     */
+    private hasOutputLink;
     /**
      * Finds the most recent artifact for a conversation detail to determine versioning.
      * Queries the junction table to locate artifacts linked to a specific conversation message.
@@ -240,6 +280,11 @@ export declare class AgentRunner {
      * 3. If previous artifact exists, creates new version of it
      * 4. If no previous artifact, creates entirely new artifact
      *
+     * When the payload equals the version a new one would follow, no version is created. Inside a
+     * conversation that existing version is linked to the reply (an `Output` link, unless one
+     * exists) and returned; if the link-exists read fails, nothing is written and the method returns
+     * `undefined`. Outside a conversation the method returns `undefined`.
+     *
      * Respects the agent's ArtifactCreationMode configuration:
      * - "Never": Skips artifact creation entirely
      * - "System Only": Creates artifact with Visibility='System Only'
@@ -402,6 +447,8 @@ export declare class AgentRunner {
      *
      * @param userMessage - The first user message to base the name on
      * @param contextUser - User context for prompt execution
+     * @param credentials - The run's configuration, runtime keys and credential scope, so naming runs
+     *   on the same credentials as the agent run it names
      * @returns Generated conversation name and description, or null if generation failed
      * @private
      */
@@ -578,12 +625,14 @@ export declare class AgentRunner {
      */
     private resolveConversationId;
     /**
-     * Gathers all artifacts from a conversation (both artifact-system records and
-     * uploaded file attachments) so the ArtifactToolManager can make them available
+     * Gathers the artifacts on the run's branch path of a conversation (both artifact-system
+     * records and uploaded file attachments) so the ArtifactToolManager can make them available
      * to the agent as input artifacts.
      *
      * @param historyFrom The run's history floor (`ExecuteAgentParams.ConversationHistoryFrom`).
      *   When set, only artifacts attached to messages written at or after it are gathered.
+     * @param branchId The run's branch; only artifacts of messages on its path that no rerun
+     *   replaced are gathered.
      */
     private gatherConversationArtifacts;
     /**

package/dist/AgentRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AgentRunner.d.ts","sourceRoot":"","sources":["../src/AgentRunner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AgentRunner.d.ts","sourceRoot":"","sources":["../src/AgentRunner.ts"],"names":[],"mappings":"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"}

package/dist/AgentRunner.js

@@ -53,6 +53,28 @@ export function selectPrimaryArtifact(fileArtifacts, payloadArtifact) {
  * ```
  */
 export class AgentRunner {
+    /**
+     * The status and message the agent's reply detail ends with, from the run's result.
+     *
+     * A run the user stopped is not an error: its reply is marked Complete with a short "stopped"
+     * message, so the chat shows a quiet end rather than a red failure, and the run row (Cancelled,
+     * with its reason and the payload as it stood) carries the detail. Every other outcome keeps the
+     * long-standing mapping: the run's message when it wrote one, else Completed or the error.
+     */
+    static ResolveFinalDetailState(agentResult) {
+        const run = agentResult.agentRun;
+        if (run?.Status === 'Cancelled') {
+            const byUser = run.CancellationReason === 'User Request';
+            return {
+                Status: 'Complete',
+                Message: byUser ? 'Stopped by user' : `Stopped: ${run.ErrorMessage || 'the run was cancelled'}`,
+            };
+        }
+        return {
+            Status: agentResult.success ? 'Complete' : 'Error',
+            Message: run?.Message || (agentResult.success ? '✅ Completed' : run?.ErrorMessage || '❌ Failed'),
+        };
+    }
     /**
      * Why a conversation-detail `Save()` returned false, for an error or log line. The owner gate in
      * `MJConversationDetailEntityExtended` refuses a non-owner's write (e.g. the elevated System user
@@ -225,7 +247,7 @@ export class AgentRunner {
                     let conversationDescription = null;
                     if (!conversationName && options.userMessage) {
                         // Try to generate a name using the "Name Conversation" prompt (same as UI)
-                        const nameResult = await this.generateConversationName(options.userMessage, contextUser, md);
+                        const nameResult = await this.generateConversationName(options.userMessage, contextUser, md, params);
                         if (nameResult) {
                             conversationName = nameResult.name;
                             conversationDescription = nameResult.description;
@@ -257,6 +279,7 @@ export class AgentRunner {
                 userMessageDetail.Role = 'User';
                 userMessageDetail.UserID = contextUser.ID;
                 userMessageDetail.HiddenToUser = false;
+                userMessageDetail.BranchID = params.ConversationBranchID ?? null;
                 // Link to test run if provided (for test execution traceability)
                 if (options.testRunId) {
                     userMessageDetail.TestRunID = options.testRunId;
@@ -275,6 +298,7 @@ export class AgentRunner {
                 agentResponseDetail.Status = 'In-Progress';
                 agentResponseDetail.HiddenToUser = false;
                 agentResponseDetail.AgentID = params.agent.ID;
+                agentResponseDetail.BranchID = params.ConversationBranchID ?? null;
                 // Link to test run if provided (for test execution traceability)
                 if (options.testRunId) {
                     agentResponseDetail.TestRunID = options.testRunId;
@@ -317,12 +341,14 @@ export class AgentRunner {
                     }
                 }
                 : originalOnProgress;
-            // Gather all artifacts from this conversation for the ArtifactToolManager.
+            // The run reads the branch the caller named, else the branch its reply row carries. Undefined is Main.
+            const runBranchId = params.ConversationBranchID ?? agentResponseDetail?.BranchID ?? undefined;
+            // Gather all artifacts on the run's branch path of this conversation for the ArtifactToolManager.
             // Per design doc Section 8.8: in the in-conversation flow, "the agent continues
             // the conversation with the artifact already available." This means ALL artifacts
-            // in the conversation (both agent-produced Output and user-attached Input) should
+            // on that path (both agent-produced Output and user-attached Input) should
             // be available to the agent via artifact tools.
-            const inputArtifacts = await this.gatherConversationArtifacts(conversationId, contextUser, params.ConversationHistoryFrom);
+            const inputArtifacts = await this.gatherConversationArtifacts(conversationId, contextUser, params.ConversationHistoryFrom, runBranchId);
             const modifiedParams = {
                 ...params,
                 // First-class conversationId gates the cross-turn context features
@@ -339,6 +365,7 @@ export class AgentRunner {
                 // (BaseAgent tests `inputArtifacts?.length`, so [] and undefined behave identically there.)
                 inputArtifacts,
                 conversationDetailId: agentResponseDetailId,
+                ...(runBranchId !== undefined ? { ConversationBranchID: runBranchId } : {}),
                 onProgress: wrappedOnProgress
             };
             // Returning-visitor memory (RV3): for a public web-widget guest with remembering on, derive the
@@ -379,11 +406,9 @@ export class AgentRunner {
                     if (!loaded) {
                         LogError(`Failed to reload agent response detail ${agentResponseDetailId}`);
                     }
-                    agentResponseDetail.Message = agentResult.agentRun?.Message ||
-                        (agentResult.success
-                            ? '✅ Completed'
-                            : agentResult.agentRun?.ErrorMessage || '❌ Failed');
-                    agentResponseDetail.Status = agentResult.success ? 'Complete' : 'Error';
+                    const finalState = AgentRunner.ResolveFinalDetailState(agentResult);
+                    agentResponseDetail.Message = finalState.Message;
+                    agentResponseDetail.Status = finalState.Status;
                     // Set response form and command fields
                     if (agentResult.responseForm) {
                         agentResponseDetail.ResponseForm = JSON.stringify(agentResult.responseForm);
@@ -536,6 +561,7 @@ export class AgentRunner {
     async GetMaxVersionForArtifact(artifactId, contextUser, provider) {
         try {
             const rv = RunView.FromMetadataProvider(provider || this._provider);
+            // conversation-scope: artifact-wide read; version numbers are unique per artifact across every path
             const result = await rv.RunView({
                 EntityName: 'MJ: Artifact Versions',
                 ExtraFilter: `ArtifactID='${AgentRunner.filterId(artifactId, 'GetMaxVersionForArtifact artifactId')}'`,
@@ -582,6 +608,7 @@ export class AgentRunner {
             return null;
         }
         const rv = RunView.FromMetadataProvider(provider || this._provider);
+        // conversation-scope: artifact-wide read; compares with the artifact's latest version number, which is global
         const result = await rv.RunView({
             EntityName: 'MJ: Artifact Versions',
             ExtraFilter: `ArtifactID='${AgentRunner.filterId(artifactId, 'CheckForDuplicateVersion artifactId')}' AND VersionNumber=${latestVersion}`,
@@ -620,6 +647,60 @@ export class AgentRunner {
         LogStatus(`Linked artifact to conversation detail ${conversationDetailId}`);
         return { artifactId, versionId, versionNumber };
     }
+    /**
+     * Gives the current reply an existing artifact version whose content equals the new payload.
+     * The reply gets an `Output` link to that version (unless it already has one), which makes the
+     * version visible on the reply's branch path, and the result is the same tuple the normal
+     * version-creation path returns. When the link-exists read fails, no link is written and the
+     * result is `undefined`, so a failed read never adds a second link for the same pair.
+     *
+     * @param versionId - The existing version with identical content
+     * @param conversationDetailId - The reply row to link the version to
+     * @param artifactId - The parent artifact ID
+     * @param versionNumber - The existing version's number
+     * @param contextUser - User context for the read and the save
+     * @param provider - Metadata provider for the read and the save
+     * @returns The standard artifact result tuple for the existing version, or `undefined` when
+     *   the link-exists read failed
+     */
+    async reuseVersionForReply(versionId, conversationDetailId, artifactId, versionNumber, contextUser, provider) {
+        LogStatus(`Reusing version ${versionNumber} of artifact ${artifactId} for this reply (identical content)`);
+        const linkExists = await this.hasOutputLink(conversationDetailId, versionId, contextUser, provider);
+        if (linkExists === null) {
+            return undefined;
+        }
+        if (linkExists) {
+            return { artifactId, versionId, versionNumber };
+        }
+        return this.LinkArtifactToConversationDetail(versionId, conversationDetailId, artifactId, versionNumber, contextUser, provider);
+    }
+    /**
+     * Checks whether a conversation detail already has an `Output` link to an artifact version.
+     * A failed read is logged and returns `null`.
+     *
+     * @param conversationDetailId - The conversation detail to check
+     * @param versionId - The artifact version to look for
+     * @param contextUser - User context for the read
+     * @param provider - Metadata provider for the read
+     * @returns `true` when the link exists, `false` when it does not, `null` when the read failed
+     */
+    async hasOutputLink(conversationDetailId, versionId, contextUser, provider) {
+        const rv = RunView.FromMetadataProvider(provider);
+        const result = await rv.RunView({
+            EntityName: 'MJ: Conversation Detail Artifacts',
+            ExtraFilter: `ConversationDetailID='${AgentRunner.filterId(conversationDetailId, 'hasOutputLink conversationDetailId')}' ` +
+                `AND ArtifactVersionID='${AgentRunner.filterId(versionId, 'hasOutputLink versionId')}' AND Direction='Output'`,
+            Fields: ['ID'],
+            MaxRows: 1,
+            ResultType: 'simple'
+        }, contextUser);
+        if (!result.Success) {
+            LogError(`Could not check for an existing artifact link on conversation detail ${conversationDetailId} ` +
+                `(no link written): ${result.ErrorMessage}`);
+            return null;
+        }
+        return result.Results.length > 0;
+    }
     /**
      * Finds the most recent artifact for a conversation detail to determine versioning.
      * Queries the junction table to locate artifacts linked to a specific conversation message.
@@ -683,6 +764,11 @@ export class AgentRunner {
      * 3. If previous artifact exists, creates new version of it
      * 4. If no previous artifact, creates entirely new artifact
      *
+     * When the payload equals the version a new one would follow, no version is created. Inside a
+     * conversation that existing version is linked to the reply (an `Output` link, unless one
+     * exists) and returned; if the link-exists read fails, nothing is written and the method returns
+     * `undefined`. Outside a conversation the method returns `undefined`.
+     *
      * Respects the agent's ArtifactCreationMode configuration:
      * - "Never": Skips artifact creation entirely
      * - "System Only": Creates artifact with Visibility='System Only'
@@ -809,12 +895,17 @@ export class AgentRunner {
             }
             // Serialize the payload once — used for both dedup check and version creation
             const serializedContent = JSON.stringify(payload, null, 2);
-            // Skip version creation if content is identical to the latest version
+            // Identical content creates no new version. Inside a conversation the existing version
+            // is linked to this reply instead; outside one there is nothing to link.
             if (!isNewArtifact && newVersionNumber > 1) {
-                const existingVersionId = await this.CheckForDuplicateVersion(artifactId, serializedContent, newVersionNumber - 1, contextUser, provider);
+                const latestVersionNumber = newVersionNumber - 1;
+                const existingVersionId = await this.CheckForDuplicateVersion(artifactId, serializedContent, latestVersionNumber, contextUser, provider);
                 if (existingVersionId) {
-                    console.debug(`Skipping duplicate artifact version — content identical to version ${newVersionNumber - 1}`);
-                    return undefined;
+                    if (!conversationDetailId) {
+                        console.debug(`Skipping duplicate artifact version — content identical to version ${latestVersionNumber}`);
+                        return undefined;
+                    }
+                    return await this.reuseVersionForReply(existingVersionId, conversationDetailId, artifactId, latestVersionNumber, contextUser, md);
                 }
             }
             // Create artifact version with content
@@ -1086,10 +1177,12 @@ export class AgentRunner {
      *
      * @param userMessage - The first user message to base the name on
      * @param contextUser - User context for prompt execution
+     * @param credentials - The run's configuration, runtime keys and credential scope, so naming runs
+     *   on the same credentials as the agent run it names
      * @returns Generated conversation name and description, or null if generation failed
      * @private
      */
-    async generateConversationName(userMessage, contextUser, provider) {
+    async generateConversationName(userMessage, contextUser, provider, credentials) {
         try {
             // Import AIPromptRunner, AIPromptParams, and AIEngine
             const { AIPromptRunner } = await import('@memberjunction/ai-prompts');
@@ -1110,6 +1203,9 @@ export class AgentRunner {
             promptParams.UserID = ResolvePromptRunUserID({ ContextUser: contextUser }) ?? undefined;
             promptParams.conversationMessages = [{ role: 'user', content: userMessage }];
             promptParams.provider = provider || this._provider;
+            promptParams.configurationId = credentials?.configurationId;
+            promptParams.apiKeys = credentials?.apiKeys;
+            promptParams.CredentialScope = credentials?.CredentialScope;
             const runner = new AIPromptRunner();
             const result = await runner.ExecutePrompt(promptParams);
             if (result && result.success && result.result) {
@@ -1660,7 +1756,7 @@ export class AgentRunner {
         if (!conversationId) {
             return params;
         }
-        const inputArtifacts = await this.gatherConversationArtifacts(conversationId, params.contextUser, params.ConversationHistoryFrom);
+        const inputArtifacts = await this.gatherConversationArtifacts(conversationId, params.contextUser, params.ConversationHistoryFrom, params.ConversationBranchID);
         return inputArtifacts.length > 0 ? { ...params, inputArtifacts } : params;
     }
     /**
@@ -1679,23 +1775,25 @@ export class AgentRunner {
         return (await detail.Load(params.conversationDetailId)) ? detail.ConversationID : undefined;
     }
     /**
-     * Gathers all artifacts from a conversation (both artifact-system records and
-     * uploaded file attachments) so the ArtifactToolManager can make them available
+     * Gathers the artifacts on the run's branch path of a conversation (both artifact-system
+     * records and uploaded file attachments) so the ArtifactToolManager can make them available
      * to the agent as input artifacts.
      *
      * @param historyFrom The run's history floor (`ExecuteAgentParams.ConversationHistoryFrom`).
      *   When set, only artifacts attached to messages written at or after it are gathered.
+     * @param branchId The run's branch; only artifacts of messages on its path that no rerun
+     *   replaced are gathered.
      */
-    async gatherConversationArtifacts(conversationId, contextUser, historyFrom) {
+    async gatherConversationArtifacts(conversationId, contextUser, historyFrom, branchId) {
         try {
             const rv = new RunView();
-            const conversationFilter = `ConversationID='${conversationId}'`;
-            // Get all conversation detail IDs for this conversation (from its floor, if the run has one)
+            const pathFilter = await ConversationEngine.BranchPathFilterFresh(conversationId, branchId, contextUser);
+            // Get the IDs of the live conversation details on the run's branch path (from its floor, if the run has one)
             const details = await rv.RunView({
                 EntityName: 'MJ: Conversation Details',
-                ExtraFilter: historyFrom
-                    ? `${conversationFilter} AND ${ConversationEngine.HistoryFromFilter(historyFrom)}`
-                    : conversationFilter,
+                ExtraFilter: ConversationEngine.LiveRowsFilter(historyFrom
+                    ? `${pathFilter} AND ${ConversationEngine.HistoryFromFilter(historyFrom)}`
+                    : pathFilter),
                 Fields: ['ID'],
                 ResultType: 'simple',
             }, contextUser);