Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(web): stop magic chips logging a load their unmount abandoned (#7006)

Wolf Mermelsteinf192ff0eb5bb
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/create-magic-chip-model.test.ts b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/create-magic-chip-model.test.ts
index 6274f54901..c8236ae63e 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/create-magic-chip-model.test.ts
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/create-magic-chip-model.test.ts
@@ -21,6 +21,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
*/
const live = vi.hoisted(() => ({
acquire: vi.fn(),
+ load: vi.fn(),
release: vi.fn(),
issue: vi.fn(),
snapshot: {
@@ -49,7 +50,7 @@ vi.mock('@core/agent-session/AgentSession', () => ({
live.acquire(id);
return {
id,
- load: () => Promise.resolve({ session: {}, bot: {} }),
+ load: live.load,
snapshot: () => Promise.resolve(live.snapshot),
subscribe: (listener: (events: unknown[]) => void) => {
live.listeners.add(listener);
@@ -173,6 +174,33 @@ describe('createMagicChipModel', () => {
},
});
live.issue.mockResolvedValue({ isErr: () => false });
+ live.load.mockResolvedValue({ session: {}, bot: {} });
+ });
+
+ it('reports a failed load only while the chip is mounted', async () => {
+ const consoleError = vi
+ .spyOn(console, 'error')
+ .mockImplementation(() => {});
+ const loads: Array<(error: Error) => void> = [];
+ live.load.mockImplementation(
+ () => new Promise((_, reject) => loads.push(reject))
+ );
+ const [mounted, unmounted] = [0, 1].map(() =>
+ createRoot((dispose) => {
+ createModel(props);
+ return dispose;
+ })
+ );
+ unmounted?.();
+ loads[1]?.(new Error('agent session released: session'));
+ await settle();
+ expect(consoleError).not.toHaveBeenCalled();
+
+ loads[0]?.(new Error('agent session log could not be fetched: session'));
+ await settle();
+ expect(consoleError).toHaveBeenCalledOnce();
+ mounted?.();
+ consoleError.mockRestore();
});
it.each([0, '0'])(
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/create-magic-chip-model.ts b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/create-magic-chip-model.ts
index ff35c150bf..7f95e70046 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/create-magic-chip-model.ts
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/create-magic-chip-model.ts
@@ -131,6 +131,9 @@ export function createMagicChipModel(props: MagicChipData): {
}
};
const unsubscribe = live.subscribe(applyEvents);
+ // A chip scrolled out of a virtualized list mid-load releases the session,
+ // which rejects the load or the snapshot. That is not a fault.
+ let released = false;
void live
.load()
.then(() => live.snapshot())
@@ -139,10 +142,12 @@ export function createMagicChipModel(props: MagicChipData): {
setMetadata(snapshot.metadata);
})
.catch((error: unknown) => {
+ if (released) return;
console.error('[magic-chip] session log could not be folded', error);
});
onCleanup(() => {
+ released = true;
unsubscribe();
live.release();
});