@memberjunction/server 6.2.0-edge.3 → 6.2.0-edge.4

package/src/__tests__/RemoteBrowserActionResolver.goalRunLink.test.ts

@@ -0,0 +1,129 @@
+/**
+ * `ExecuteRemoteBrowserGoal` attaches a "Browser goal" step to the realtime co-agent run named by the
+ * session's `coAgentRunID`. The session owner can edit `Config`, so the run must be a record of the
+ * session before a step is attached to it.
+ */
+// type-graphql decorators on the resolver need the reflect-metadata polyfill loaded first.
+import 'reflect-metadata';
+
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+// As in RemoteBrowserActionRecovery.test.ts: the decorators become no-ops so the resolver's plain logic runs.
+vi.mock('type-graphql', () => {
+    const noopDecorator = () => () => undefined;
+    return {
+        Resolver: noopDecorator,
+        Mutation: noopDecorator,
+        Query: noopDecorator,
+        Subscription: noopDecorator,
+        ObjectType: noopDecorator,
+        InputType: noopDecorator,
+        Field: noopDecorator,
+        Arg: noopDecorator,
+        Args: noopDecorator,
+        Ctx: noopDecorator,
+        PubSub: noopDecorator,
+        Root: noopDecorator,
+        Float: class {},
+        Int: class {},
+        ID: class {},
+    };
+});
+
+const achieveGoalMock = vi.fn(async (_sessionID: string, _goal: string, _options: Record<string, unknown>) => ({ Success: true, Status: 'Done' }));
+vi.mock('@memberjunction/remote-browser-server', () => ({
+    NormalizeInstanceKey: (key?: string) => key,
+    RemoteBrowserEngine: {
+        Instance: {
+            AchieveGoal: (sessionID: string, goal: string, options: Record<string, unknown>) => achieveGoalMock(sessionID, goal, options),
+        },
+    },
+}));
+
+const beginStepMock = vi.fn(async (_provider: unknown, _user: unknown, _coAgentRunID: string | undefined, _goal: string) => null);
+vi.mock('../agentSessions/remoteBrowserGoalEngine.js', async (importOriginal) => ({
+    ...(await importOriginal<typeof import('../agentSessions/remoteBrowserGoalEngine.js')>()),
+    BeginBrowserGoalStep: (provider: unknown, user: unknown, coAgentRunID: string | undefined, goal: string) =>
+        beginStepMock(provider, user, coAgentRunID, goal),
+    FinalizeBrowserGoalStep: vi.fn(async () => undefined),
+}));
+
+vi.mock('@memberjunction/aiengine', () => ({ AIEngine: { Instance: { Config: vi.fn(), Prompts: [] } } }));
+vi.mock('@memberjunction/ai-prompts', async (importOriginal) => ({
+    ...(await importOriginal<typeof import('@memberjunction/ai-prompts')>()),
+    AIPromptRunner: class {},
+}));
+vi.mock('@memberjunction/ai-core-plus', async (importOriginal) => ({
+    ...(await importOriginal<typeof import('@memberjunction/ai-core-plus')>()),
+    AIPromptParams: class {},
+}));
+
+import { RemoteBrowserActionResolver } from '../resolvers/RemoteBrowserActionResolver.js';
+import type { AppContext } from '../types.js';
+import type { IMetadataProvider, UserInfo } from '@memberjunction/core';
+import type { MJAIAgentSessionEntity } from '@memberjunction/core-entities';
+
+const SESSION_ID = 'c3c3c3c3-2000-4000-8000-000000000001';
+const CO_RUN_ID = 'c3c3c3c3-2000-4000-8000-000000000002';
+/** A run that exists, but belongs to someone else's session. */
+const FOREIGN_RUN_ID = 'c3c3c3c3-2000-4000-8000-0000000000f1';
+
+/** The runs the fake lookup reports as records of the session. */
+let sessionRunIDs: string[] = [];
+const runViewsMock = vi.fn(async (paramsList: Array<{ EntityName?: string }>) =>
+    paramsList.map((params) => ({
+        Success: true,
+        Results: params.EntityName === 'MJ: AI Agent Runs' ? sessionRunIDs.map((ID) => ({ ID })) : [],
+    })),
+);
+
+/** Bypasses the ownership/provider plumbing (covered elsewhere); the session carries `ConfigJson`. */
+class TestableResolver extends RemoteBrowserActionResolver {
+    public ConfigJson = '';
+    protected override requireUserAndProvider(): { contextUser: UserInfo; provider: IMetadataProvider } {
+        return {
+            contextUser: { ID: 'c3c3c3c3-2000-4000-8000-0000000000aa' } as unknown as UserInfo,
+            provider: { RunViews: runViewsMock } as unknown as IMetadataProvider,
+        };
+    }
+    protected override async loadOwnedSession(): Promise<MJAIAgentSessionEntity> {
+        return { ID: SESSION_ID, AgentID: 'agent-1', Config_: this.ConfigJson } as unknown as MJAIAgentSessionEntity;
+    }
+    protected override async resolveProviderName(): Promise<string | undefined> {
+        return 'Self-Hosted Chrome';
+    }
+}
+
+const ctx = { userPayload: { sessionId: 'push-sess-1' }, providers: [] } as unknown as AppContext;
+
+async function startGoal(config: Record<string, unknown>): Promise<void> {
+    const resolver = new TestableResolver();
+    resolver.ConfigJson = JSON.stringify(config);
+    await resolver.ExecuteRemoteBrowserGoal(SESSION_ID, 'open the docs', ctx);
+}
+
+beforeEach(() => {
+    sessionRunIDs = [];
+    runViewsMock.mockClear();
+    beginStepMock.mockClear();
+    achieveGoalMock.mockClear();
+});
+
+describe('RemoteBrowserActionResolver.ExecuteRemoteBrowserGoal — co-agent run from Config', () => {
+    it('does not attach the goal to a run that is not a record of the session', async () => {
+        await startGoal({ targetAgentID: 'target-1', coAgentRunID: FOREIGN_RUN_ID });
+
+        expect(beginStepMock).toHaveBeenCalledTimes(1);
+        expect(beginStepMock.mock.calls[0][2]).toBeUndefined();
+        expect(achieveGoalMock.mock.calls[0][2].AgentRunID).toBeUndefined();
+    });
+
+    it('attaches the goal to the session\'s co-agent run', async () => {
+        sessionRunIDs = [CO_RUN_ID];
+
+        await startGoal({ targetAgentID: 'target-1', coAgentRunID: CO_RUN_ID });
+
+        expect(beginStepMock.mock.calls[0][2]).toBe(CO_RUN_ID);
+        expect(achieveGoalMock.mock.calls[0][2].AgentRunID).toBe(CO_RUN_ID);
+    });
+});

package/src/__tests__/ResolverBase.aggregateScreen.test.ts

@@ -0,0 +1,174 @@
+// ResolverBase transitively pulls in type-graphql decorators, which need the
+// Reflect.metadata polyfill at import time.
+import 'reflect-metadata';
+import { describe, it, expect } from 'vitest';
+import type { AggregateExpression, DatabaseProviderBase, IMetadataProvider, RunViewParams, RunViewResult, UserInfo } from '@memberjunction/core';
+import type { PubSubEngine } from 'type-graphql';
+import { ResolverBase } from '../generic/ResolverBase.js';
+import { RunViewResolver, type RunDynamicViewInput } from '../generic/RunViewResolver.js';
+import type { AppContext, UserPayload } from '../types.js';
+
+/**
+ * `Aggregates[].expression` is spliced into `SELECT <expression> AS [Agg_0] FROM <view> WHERE …`.
+ * The GraphQL-boundary screen must treat it like the other client SQL fragments (ExtraFilter,
+ * OrderBy, OverrideExcludeFilter): one statement, no writes, and subqueries only against entity
+ * base views the caller can read.
+ *
+ * The payloads below are harmless (`SELECT 1`).
+ */
+
+const ENTITY_NAME = 'MJ: Users';
+
+/** An aggregate that carries a second statement. */
+const STACKED_AGGREGATE = "COUNT(*) AS [a'] ; SELECT 1 AS [b'], COUNT(*)";
+
+/** A subquery against a base table rather than an entity base view. */
+const BASE_TABLE_AGGREGATE = 'COUNT(*) + (SELECT COUNT(*) FROM __mj.[User])';
+
+type Captured = { params: RunViewParams | null };
+
+/** Entity metadata the screen reads, plus a `RunView` that records what reached it. */
+function fakeProvider(captured: Captured): DatabaseProviderBase {
+    return {
+        Entities: [
+            {
+                ID: 'E1',
+                Name: ENTITY_NAME,
+                SchemaName: '__mj',
+                BaseView: 'vwUsers',
+                BaseTable: 'User',
+                Fields: [
+                    { Name: 'ID', NeedsQuotes: true },
+                    { Name: 'Name', NeedsQuotes: true },
+                    { Name: 'Sequence', NeedsQuotes: false },
+                ],
+                PrimaryKeys: [{ Name: 'ID' }],
+                GetUserPermisions: () => ({ CanRead: true }),
+            },
+        ],
+        EntityByName: (name: string) => (name === ENTITY_NAME ? { ID: 'E1', Name: ENTITY_NAME, PrimaryKeys: [{ Name: 'ID' }] } : undefined),
+        RunView: async (params: RunViewParams): Promise<RunViewResult> => {
+            captured.params = params;
+            return { Success: true, Results: [], RowCount: 0, TotalRowCount: 0, ErrorMessage: '' } as RunViewResult;
+        },
+        RunViews: async (params: RunViewParams[]): Promise<RunViewResult[]> => {
+            captured.params = params[0] ?? null;
+            return params.map(() => ({ Success: true, Results: [], RowCount: 0, TotalRowCount: 0, ErrorMessage: '' } as RunViewResult));
+        },
+    } as unknown as DatabaseProviderBase;
+}
+
+const fakeUser = () => ({ Email: 'tester@example.com' } as UserInfo);
+const fakePayload = () => ({ email: 'tester@example.com', userRecord: fakeUser() } as UserPayload);
+
+/** Reaches the boundary screen and the dynamic-view entry point. */
+class Probe extends ResolverBase {
+    public ScreenAll(
+        clauses: { extraFilter?: string | null; aggregates?: AggregateExpression[] | null },
+        provider: DatabaseProviderBase,
+    ) {
+        return this.screenClientViewClauses(clauses, provider as unknown as IMetadataProvider);
+    }
+
+    public RunDynamic(input: RunDynamicViewInput, provider: DatabaseProviderBase) {
+        return this.RunDynamicViewGeneric(input, provider, fakePayload(), undefined as unknown as PubSubEngine);
+    }
+}
+
+describe('ResolverBase.screenClientViewClauses — aggregate expressions', () => {
+    it('rejects an aggregate that carries a second statement', () => {
+        expect(() =>
+            new Probe().ScreenAll({ aggregates: [{ expression: STACKED_AGGREGATE }] }, fakeProvider({ params: null })),
+        ).toThrow(/Invalid Aggregate: multiple statements/);
+    });
+
+    it('rejects an aggregate whose subquery reads a base table', () => {
+        expect(() =>
+            new Probe().ScreenAll({ aggregates: [{ expression: BASE_TABLE_AGGREGATE }] }, fakeProvider({ params: null })),
+        ).toThrow(/Invalid Aggregate: subquery must use an entity base view/);
+    });
+
+    it('screens every aggregate in the list, not only the first', () => {
+        expect(() =>
+            new Probe().ScreenAll(
+                { aggregates: [{ expression: 'COUNT(*)' }, { expression: STACKED_AGGREGATE }] },
+                fakeProvider({ params: null }),
+            ),
+        ).toThrow(/Invalid Aggregate: multiple statements/);
+    });
+
+    it('leaves an aggregate the parser cannot read to the provider, which refuses it per aggregate', () => {
+        expect(() =>
+            new Probe().ScreenAll({ aggregates: [{ expression: 'COUNT_BIG(*)' }] }, fakeProvider({ params: null })),
+        ).not.toThrow();
+    });
+
+    it('lets ordinary aggregate expressions through', () => {
+        const ordinary = [
+            'COUNT(*)',
+            'SUM(Sequence)',
+            'AVG(Sequence * 2)',
+            'COUNT(DISTINCT Name)',
+            "COUNT(CASE WHEN Name = 'x' THEN 1 END)",
+            'MIN([Name])',
+        ];
+        expect(() =>
+            new Probe().ScreenAll({ aggregates: ordinary.map((expression) => ({ expression })) }, fakeProvider({ params: null })),
+        ).not.toThrow();
+    });
+});
+
+describe('ResolverBase RunView entry points — aggregate expressions', () => {
+    it('RunDynamicViewGeneric never reaches RunView with a stacked aggregate', async () => {
+        const captured: Captured = { params: null };
+        const input = { EntityName: ENTITY_NAME, Aggregates: [{ expression: STACKED_AGGREGATE }] } as RunDynamicViewInput;
+
+        await expect(new Probe().RunDynamic(input, fakeProvider(captured))).rejects.toThrow(/Invalid Aggregate: multiple statements/);
+        expect(captured.params).toBeNull();
+    });
+
+    it('RunDynamicViewGeneric passes ordinary aggregates through to RunView', async () => {
+        const captured: Captured = { params: null };
+        const aggregates = [{ expression: 'COUNT(*)', alias: 'Total' }, { expression: 'SUM(Sequence)' }];
+        const input = { EntityName: ENTITY_NAME, Aggregates: aggregates } as RunDynamicViewInput;
+
+        await new Probe().RunDynamic(input, fakeProvider(captured));
+
+        expect(captured.params?.Aggregates).toEqual(aggregates);
+    });
+
+    it('RunViews returns a failure result, and never reaches the provider, for a stacked aggregate', async () => {
+        const captured: Captured = { params: null };
+        const provider = fakeProvider(captured);
+        const input = [{ EntityName: ENTITY_NAME, Aggregates: [{ expression: STACKED_AGGREGATE }] }] as Parameters<RunViewResolver['RunViews']>[0];
+
+        const results = await new RunViewResolver().RunViews(
+            input,
+            { providers: [{ type: 'Read-Only', provider }] as unknown as AppContext['providers'], userPayload: fakePayload() } as AppContext,
+            undefined as unknown as PubSubEngine,
+        );
+
+        expect(results).toHaveLength(1);
+        expect(results[0].Success).toBe(false);
+        expect(results[0].ErrorMessage).toMatch(/Invalid Aggregate: multiple statements/);
+        expect(captured.params).toBeNull();
+    });
+
+    it('RunViews does not fail the batch because one aggregate cannot be parsed', async () => {
+        const captured: Captured = { params: null };
+        const provider = fakeProvider(captured);
+        const input = [
+            { EntityName: ENTITY_NAME, Aggregates: [{ expression: 'COUNT_BIG(*)' }] },
+            { EntityName: ENTITY_NAME },
+        ] as Parameters<RunViewResolver['RunViews']>[0];
+
+        const results = await new RunViewResolver().RunViews(
+            input,
+            { providers: [{ type: 'Read-Only', provider }] as unknown as AppContext['providers'], userPayload: fakePayload() } as AppContext,
+            undefined as unknown as PubSubEngine,
+        );
+
+        expect(results.map((r) => r.Success)).toEqual([true, true]);
+        expect(captured.params?.Aggregates).toEqual([{ expression: 'COUNT_BIG(*)' }]);
+    });
+});

package/src/__tests__/ResolverBase.clientOldValues.test.ts

@@ -1,7 +1,7 @@
 // Reflect.metadata polyfill at import time.
 import 'reflect-metadata';
 import { describe, it, expect } from 'vitest';
-import { EntityFieldTSType, type EntityFieldInfo, type EntityInfo } from '@memberjunction/core';
+import { EntityFieldTSType, EntityInfo, UserInfo, type EntityFieldInfo } from '@memberjunction/core';
 import { ResolverBase } from '../generic/ResolverBase.js';
 
 /**
@@ -13,8 +13,11 @@ class Probe extends ResolverBase {
     public Convert(field: Partial<EntityFieldInfo>, raw: unknown) {
         return this.ClientOldValueToFieldValue(field as EntityFieldInfo, raw);
     }
-    public MustLoad(entity: Partial<EntityInfo>, oldValues: boolean) {
-        return this.MustLoadTruthFromDatabase(entity as EntityInfo, { OldValues___: oldValues ? [{ Key: 'Comments', Value: null }] : undefined }, false, false);
+    public MustLoad(entity: Record<string, unknown>, oldValues: boolean) {
+        // A real entity with no permission rows and a user with no roles: no row filter applies.
+        // The Update RLS term itself is covered in resolverBase.fls.test.ts.
+        const user = new UserInfo(null, { ID: 'u-1', Name: 'Probe', Email: 'probe@example.test', IsActive: true, UserRoles: [] });
+        return this.MustLoadTruthFromDatabase(new EntityInfo({ Fields: [], ...entity }), { OldValues___: oldValues ? [{ Key: 'Comments', Value: null }] : undefined }, false, false, user);
     }
 }
 const probe = new Probe();

package/src/__tests__/ReturningVisitorRecap.test.ts

@@ -0,0 +1,115 @@
+/**
+ * @fileoverview The returning-visitor recap transcript reads Main.
+ *
+ * The transcript query filters with `ConversationEngine.ScopeFilter(ConversationEngine.TrunkScope(id))`
+ * and takes the newest turns by `Sequence`. It reads no branch or conversation scope first.
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import type { IMetadataProvider, UserInfo } from '@memberjunction/core';
+
+interface ViewCall {
+    EntityName: string;
+    ExtraFilter?: string;
+    OrderBy?: string;
+    MaxRows?: number;
+}
+
+const hoisted = vi.hoisted(() => ({
+    views: [] as ViewCall[],
+    detailRows: [] as Array<{ Role: string; Message: string }>,
+    transcripts: [] as string[],
+    logError: vi.fn(),
+    logStatus: vi.fn(),
+    aiConfig: vi.fn(),
+}));
+
+vi.mock('@memberjunction/core', async (importOriginal) => {
+    const actual = await importOriginal<typeof import('@memberjunction/core')>();
+    return {
+        ...actual,
+        LogError: hoisted.logError,
+        LogStatus: hoisted.logStatus,
+        RunView: class {
+            async RunView(params: ViewCall) {
+                hoisted.views.push(params);
+                if (params.EntityName === 'MJ: Conversation Details') {
+                    return { Success: true, Results: hoisted.detailRows };
+                }
+                return { Success: true, Results: [] };
+            }
+        },
+    };
+});
+
+vi.mock('@memberjunction/aiengine', () => ({
+    AIEngine: {
+        Instance: {
+            Config: hoisted.aiConfig,
+            Prompts: [{ Name: 'Returning-Visitor Recap', SelectionStrategy: 'Default', Status: 'Active' }],
+        },
+    },
+}));
+
+vi.mock('@memberjunction/ai-core-plus', () => ({
+    AIPromptParams: class {},
+}));
+
+vi.mock('@memberjunction/ai-prompts', () => ({
+    AIPromptRunner: class {
+        async ExecutePrompt(params: { data?: { transcript?: string } }) {
+            hoisted.transcripts.push(params.data?.transcript ?? '');
+            return { success: true, rawResult: 'NO_RECAP' };
+        }
+    },
+}));
+
+import { ConversationEngine } from '@memberjunction/core-entities';
+import { WriteReturningVisitorRecap } from '../agentSessions/ReturningVisitorRecap.js';
+
+const USER = { ID: 'user-1' } as unknown as UserInfo;
+
+function makeProvider(): IMetadataProvider {
+    const conversation = {
+        ID: 'conv-1',
+        LinkedEntityID: 'entity-1',
+        LinkedRecordID: 'record-1',
+        VisitorKey: null,
+        Load: vi.fn().mockResolvedValue(true),
+    };
+    return {
+        Entities: [],
+        GetEntityObject: vi.fn().mockResolvedValue(conversation),
+    } as unknown as IMetadataProvider;
+}
+
+function detailView(): ViewCall | undefined {
+    return hoisted.views.find((v) => v.EntityName === 'MJ: Conversation Details');
+}
+
+describe('WriteReturningVisitorRecap — transcript scope', () => {
+    beforeEach(() => {
+        hoisted.views.length = 0;
+        hoisted.transcripts.length = 0;
+        hoisted.detailRows = [
+            { Role: 'AI', Message: 'second' },
+            { Role: 'User', Message: 'first' },
+        ];
+        hoisted.logError.mockReset();
+        hoisted.logStatus.mockReset();
+        hoisted.aiConfig.mockReset();
+    });
+
+    it('reads the newest turns in Main with the trunk predicate, in chronological order', async () => {
+        const provider = makeProvider();
+
+        await WriteReturningVisitorRecap('conv-1', 'agent-1', USER, provider);
+
+        const view = detailView();
+        expect(view?.ExtraFilter).toBe(ConversationEngine.LiveRowsFilter(ConversationEngine.ScopeFilter(ConversationEngine.TrunkScope('conv-1'))));
+        expect(view?.ExtraFilter).toBe("[ConversationID]='conv-1' AND [BranchID] IS NULL AND [ReplacedAt] IS NULL");
+        expect(view?.OrderBy).toBe('Sequence DESC');
+        expect(view?.MaxRows).toBe(60);
+        expect(hoisted.views.some((v) => v.EntityName === 'MJ: Conversation Branches' || v.EntityName === 'MJ: Conversations')).toBe(false);
+        expect(hoisted.transcripts).toEqual(['User: first\nAI: second']);
+    });
+});

package/src/__tests__/RunAIAgentResolver.branch.test.ts

@@ -0,0 +1,169 @@
+/**
+ * @fileoverview The conversation branch on `RunAIAgentFromConversationDetail`.
+ *
+ * The branch comes from the placeholder row the mutation is given, never from a request argument.
+ * These tests pin that the mutation loads history along that branch's path, hands the branch to the
+ * agent run on both the synchronous and fire-and-forget paths, and reads the trunk when the row has
+ * no branch; and that `executeAIAgent` puts the branch on the run's params only when there is one.
+ */
+import 'reflect-metadata'; // must precede any type-graphql decorator evaluation
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import type { PubSubEngine } from 'type-graphql';
+
+// type-graphql's real decorators need emitDecoratorMetadata, which vitest's esbuild transform
+// does not emit; the schema is irrelevant here, so every decorator is a no-op.
+vi.mock('type-graphql', () => {
+    const decoratorFactory = (..._args: unknown[]) => (..._decorated: unknown[]) => undefined;
+    const exportNames = [
+        'Resolver', 'Query', 'Mutation', 'Subscription', 'Arg', 'Args', 'ArgsType', 'Ctx', 'Root',
+        'Info', 'Field', 'FieldResolver', 'ObjectType', 'InputType', 'InterfaceType', 'Authorized',
+        'UseMiddleware', 'Extensions', 'Directive', 'ID', 'Int', 'Float', 'GraphQLISODateTime',
+        'GraphQLTimestamp', 'registerEnumType', 'createMethodDecorator', 'createParamDecorator',
+        'buildSchema', 'buildSchemaSync', 'PubSub',
+    ];
+    return Object.fromEntries(exportNames.map((name) => [name, decoratorFactory]));
+});
+
+const hoisted = vi.hoisted(() => ({
+    runAgentInConversation: vi.fn(),
+}));
+
+vi.mock('@memberjunction/ai-agents', () => ({
+    AgentRunner: class {
+        RunAgentInConversation(...args: unknown[]) {
+            return hoisted.runAgentInConversation(...args);
+        }
+    },
+    ArtifactToolManager: class {},
+}));
+
+vi.mock('../realtimeWidget/widgetGuestElevation.js', () => ({
+    ResolveWidgetGuestRunContext: vi.fn().mockResolvedValue(null),
+    ElevateUserPayload: vi.fn(),
+}));
+
+import { ConversationEngine } from '@memberjunction/core-entities';
+import { RunAIAgentResolver } from '../resolvers/RunAIAgentResolver.js';
+import type { AppContext, UserPayload } from '../types.js';
+
+const USER = { ID: 'user-1', Email: 'user@example.com' };
+
+type Fn = ReturnType<typeof vi.fn>;
+
+/** The private members this test reaches, through an explicit shape (no `any`). */
+interface ResolverSeams {
+    CheckAPIKeyScopeAuthorization: Fn;
+    GetUserFromPayload: Fn;
+    loadConversationHistoryWithAttachments: Fn;
+    executeAIAgent: Fn;
+    executeAgentInBackground: Fn;
+    loadInputArtifactsBatch: Fn;
+    validateAgent: Fn;
+    persistInFlightAgentFailure: Fn;
+}
+
+function makeResolver(): { resolver: RunAIAgentResolver; seams: ResolverSeams } {
+    const resolver = new RunAIAgentResolver();
+    const seams = resolver as unknown as ResolverSeams;
+    seams.CheckAPIKeyScopeAuthorization = vi.fn().mockResolvedValue(undefined);
+    seams.GetUserFromPayload = vi.fn().mockReturnValue(USER);
+    return { resolver, seams };
+}
+
+function makeContext(branchId: string | null): AppContext {
+    const provider = {
+        GetEntityObject: vi.fn().mockResolvedValue({
+            ConversationID: 'conv-1',
+            BranchID: branchId,
+            Load: vi.fn().mockResolvedValue(true),
+        }),
+    };
+    return {
+        userPayload: { sessionId: 'session-1', userRecord: USER } as unknown as UserPayload,
+        providers: [{ type: 'Read-Write', provider }],
+        dataSource: {},
+    } as unknown as AppContext;
+}
+
+const pubSub = { publish: vi.fn() } as unknown as PubSubEngine;
+
+async function runMutation(resolver: RunAIAgentResolver, branchId: string | null, fireAndForget?: boolean) {
+    return resolver.RunAIAgentFromConversationDetail(
+        'detail-1', 'agent-1', makeContext(branchId), 'session-1', pubSub,
+        undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined,
+        undefined, undefined, fireAndForget, undefined, undefined, undefined
+    );
+}
+
+afterEach(() => {
+    vi.restoreAllMocks();
+});
+
+describe('RunAIAgentFromConversationDetail — branch', () => {
+    let resolver: RunAIAgentResolver;
+    let seams: ResolverSeams;
+
+    beforeEach(() => {
+        ({ resolver, seams } = makeResolver());
+        seams.loadConversationHistoryWithAttachments = vi.fn().mockResolvedValue([]);
+        seams.executeAIAgent = vi.fn().mockResolvedValue({ success: true, result: '{}' });
+        seams.executeAgentInBackground = vi.fn();
+    });
+
+    it('loads history on the placeholder row\'s branch and hands the branch to the run', async () => {
+        await runMutation(resolver, 'branch-b');
+        expect(seams.loadConversationHistoryWithAttachments.mock.calls[0][6]).toBe('branch-b');
+        expect(seams.executeAIAgent.mock.calls[0].at(-1)).toBe('branch-b');
+    });
+
+    it('passes the branch to the background path too', async () => {
+        await runMutation(resolver, 'branch-b', true);
+        expect(seams.executeAgentInBackground.mock.calls[0].at(-1)).toBe('branch-b');
+    });
+
+    it('reads the trunk when the placeholder has no branch (control)', async () => {
+        await runMutation(resolver, null);
+        expect(seams.loadConversationHistoryWithAttachments.mock.calls[0][6]).toBeNull();
+        expect(seams.executeAIAgent.mock.calls[0].at(-1)).toBeNull();
+    });
+});
+
+describe('loadConversationHistoryWithAttachments — branch', () => {
+    it('passes the branch to the fresh loader', async () => {
+        const { resolver, seams } = makeResolver();
+        seams.loadInputArtifactsBatch = vi.fn().mockResolvedValue(new Map());
+        const loadRows = vi.spyOn(ConversationEngine, 'LoadWindowRowsFresh').mockResolvedValue([]);
+        const provider = {};
+        const load = (resolver as unknown as {
+            loadConversationHistoryWithAttachments(
+                conversationId: string, user: unknown, max: number, provider: unknown,
+                exclude?: string[], historyFrom?: Date, branchId?: string | null
+            ): Promise<unknown[]>;
+        }).loadConversationHistoryWithAttachments.bind(resolver);
+        await load('conv-1', USER, 20, provider, ['detail-1'], undefined, 'branch-b');
+        expect(loadRows).toHaveBeenCalledWith('conv-1', USER, provider, undefined, 'branch-b');
+    });
+});
+
+describe('executeAIAgent — ConversationBranchID', () => {
+    it('puts the branch on the run\'s params, and leaves it unset for the trunk', async () => {
+        const { resolver, seams } = makeResolver();
+        seams.validateAgent = vi.fn().mockResolvedValue({ ID: 'agent-1', Name: 'Test Agent' });
+        seams.persistInFlightAgentFailure = vi.fn().mockResolvedValue(undefined);
+        hoisted.runAgentInConversation.mockReset().mockRejectedValue(new Error('stop here'));
+        vi.spyOn(console, 'error').mockImplementation(() => undefined);
+        vi.spyOn(console, 'log').mockImplementation(() => undefined);
+        const execute = (resolver as unknown as { executeAIAgent(...args: unknown[]): Promise<unknown> }).executeAIAgent.bind(resolver);
+        const userPayload = { sessionId: 'session-1', userRecord: USER };
+        const base = [
+            {}, {}, 'agent-1', userPayload, '[{"role":"user","content":"hi"}]', 'session-1', pubSub,
+            undefined, undefined, undefined, undefined, undefined, undefined, 'detail-1', false, false,
+            undefined, undefined, 'conv-1', undefined, undefined, undefined, undefined, undefined,
+        ];
+        await execute(...base, 'branch-b');
+        await execute(...base, null);
+        const [withBranch, trunk] = hoisted.runAgentInConversation.mock.calls.map(c => c[0] as Record<string, unknown>);
+        expect(withBranch.ConversationBranchID).toBe('branch-b');
+        expect(trunk).not.toHaveProperty('ConversationBranchID');
+    });
+});

package/src/__tests__/RunAIAgentResolver.historyFrom.test.ts

@@ -124,7 +124,7 @@ describe('RunAIAgentFromConversationDetail — agentHistoryFrom', () => {
         expect(loaderArgs[0]).toBe('conv-1');
         expect(loaderArgs[4]).toEqual(['detail-1']);
         expect((loaderArgs[5] as Date).toISOString()).toBe(FLOOR_ISO);
-        const runFloor = seams.executeAIAgent.mock.calls[0].at(-1) as Date;
+        const runFloor = seams.executeAIAgent.mock.calls[0].at(-2) as Date;
         expect(runFloor.toISOString()).toBe(FLOOR_ISO);
     });
 
@@ -133,7 +133,7 @@ describe('RunAIAgentFromConversationDetail — agentHistoryFrom', () => {
 
         expect(result.success).toBe(true);
         expect(seams.executeAIAgent).not.toHaveBeenCalled();
-        const runFloor = seams.executeAgentInBackground.mock.calls[0].at(-1) as Date;
+        const runFloor = seams.executeAgentInBackground.mock.calls[0].at(-2) as Date;
         expect(runFloor.toISOString()).toBe(FLOOR_ISO);
     });
 
@@ -141,7 +141,7 @@ describe('RunAIAgentFromConversationDetail — agentHistoryFrom', () => {
         await runMutation(resolver, {});
 
         expect(seams.loadConversationHistoryWithAttachments.mock.calls[0][5]).toBeUndefined();
-        expect(seams.executeAIAgent.mock.calls[0].at(-1)).toBeUndefined();
+        expect(seams.executeAIAgent.mock.calls[0].at(-2)).toBeUndefined();
     });
 
     it('fails the request on an unreadable floor, before loading or running anything', async () => {
@@ -178,7 +178,7 @@ describe('loadConversationHistoryWithAttachments — history floor', () => {
         }).loadConversationHistoryWithAttachments.bind(resolver);
         await load('conv-1', USER, 20, provider, ['detail-1'], floor);
 
-        expect(loadRows).toHaveBeenCalledWith('conv-1', USER, provider, floor);
+        expect(loadRows).toHaveBeenCalledWith('conv-1', USER, provider, floor, undefined);
         expect(assemble.mock.calls[0][1]).toEqual({ maxTailMessages: 20, excludeDetailIds: ['detail-1'], historyFrom: floor });
     });
 });