fix(realtime): isolate notification failures

This commit is contained in:
Federico Jaramillo Martinez
2026-07-17 23:58:56 +02:00
parent 45f068ef05
commit 1f13bab58a
7 changed files with 187 additions and 24 deletions
@@ -54,6 +54,28 @@ describe("SessionEventHub", () => {
expect(removed.send).not.toHaveBeenCalled(); expect(removed.send).not.toHaveBeenCalled();
}); });
it("continues publishing session events when one socket send fails", () => {
const hub = new SessionEventHub();
const failed = new FakeSocket();
const healthy = new FakeSocket();
failed.send.mockImplementation(() => { throw new Error("socket closed"); });
hub.add("s1", failed);
hub.add("s1", healthy);
hub.publish("s1", { type: "assistant.delta", text: "hello" });
expect(failed.send).toHaveBeenCalledOnce();
expect(healthy.send).toHaveBeenCalledWith(JSON.stringify({ type: "assistant.delta", text: "hello", seq: 1 }));
expect(hub.currentSeq("s1")).toBe(1);
failed.send.mockClear();
hub.publish("s1", { type: "assistant.delta", text: "again" });
expect(failed.send).not.toHaveBeenCalled();
expect(healthy.send).toHaveBeenLastCalledWith(JSON.stringify({ type: "assistant.delta", text: "again", seq: 2 }));
expect(hub.currentSeq("s1")).toBe(2);
});
it("publishes global events only to global sockets", () => { it("publishes global events only to global sockets", () => {
const hub = new SessionEventHub(); const hub = new SessionEventHub();
const globalSocket = new FakeSocket(); const globalSocket = new FakeSocket();
@@ -78,6 +100,26 @@ describe("SessionEventHub", () => {
expect(sessionSocket.send).not.toHaveBeenCalled(); expect(sessionSocket.send).not.toHaveBeenCalled();
}); });
it("continues publishing unstamped global events when one socket send fails", () => {
const hub = new SessionEventHub();
const failed = new FakeSocket();
const healthy = new FakeSocket();
failed.send.mockImplementation(() => { throw new Error("socket closed"); });
hub.addGlobal(failed);
hub.addGlobal(healthy);
hub.publishGlobal({ type: "session.name", sessionId: "s1", name: "Renamed" });
expect(failed.send).toHaveBeenCalledOnce();
expect(healthy.send).toHaveBeenCalledWith(JSON.stringify({ type: "session.name", sessionId: "s1", name: "Renamed" }));
failed.send.mockClear();
hub.publishGlobal({ type: "session.name", sessionId: "s1", name: "Renamed again" });
expect(failed.send).not.toHaveBeenCalled();
expect(healthy.send).toHaveBeenLastCalledWith(JSON.stringify({ type: "session.name", sessionId: "s1", name: "Renamed again" }));
});
it("stamps a monotonically increasing per-session seq on published events", () => { it("stamps a monotonically increasing per-session seq on published events", () => {
const hub = new SessionEventHub(); const hub = new SessionEventHub();
const socket = new FakeSocket(); const socket = new FakeSocket();
+13 -5
View File
@@ -34,9 +34,7 @@ export class SessionEventHub {
const seq = (this.seqBySession.get(sessionId) ?? 0) + 1; const seq = (this.seqBySession.get(sessionId) ?? 0) + 1;
this.seqBySession.set(sessionId, seq); this.seqBySession.set(sessionId, seq);
const payload = JSON.stringify({ ...projectBrowserSessionEvent(event), seq }); const payload = JSON.stringify({ ...projectBrowserSessionEvent(event), seq });
for (const socket of this.socketsBySession.get(sessionId) ?? []) { this.sendToSockets(this.socketsBySession.get(sessionId), payload);
if (socket.readyState === socket.OPEN) socket.send(payload);
}
} }
/** /**
@@ -55,8 +53,18 @@ export class SessionEventHub {
publishRealtime(event: RealtimeEvent): void { publishRealtime(event: RealtimeEvent): void {
const payload = JSON.stringify(event); const payload = JSON.stringify(event);
for (const socket of this.globalSockets) { this.sendToSockets(this.globalSockets, payload);
if (socket.readyState === socket.OPEN) socket.send(payload); }
private sendToSockets(sockets: Set<RealtimeSocket> | undefined, payload: string): void {
if (sockets === undefined) return;
for (const socket of sockets) {
if (socket.readyState !== socket.OPEN) continue;
try {
socket.send(payload);
} catch {
sockets.delete(socket);
}
} }
} }
} }
+1 -1
View File
@@ -39,7 +39,7 @@ await runSessionDaemonStartup({
async createRuntime() { async createRuntime() {
const eventHub = new SessionEventHub(); const eventHub = new SessionEventHub();
const workspaceActivity = new WorkspaceActivityService(eventHub); const workspaceActivity = new WorkspaceActivityService(eventHub);
const auth = await AuthService.create({ agentDir: activeAgentProfile.dir }); const auth = await AuthService.create({ agentDir: activeAgentProfile.dir, logger: app.log });
const spawnTargets = config.spawnSessions const spawnTargets = config.spawnSessions
? new ProjectScopedSpawnTargetResolver({ projects: new ProjectService(new ProjectStore()), workspaces: new WorkspaceService() }) ? new ProjectScopedSpawnTargetResolver({ projects: new ProjectService(new ProjectStore()), workspaces: new WorkspaceService() })
: undefined; : undefined;
+79 -5
View File
@@ -5,7 +5,7 @@ import { ModelRuntime } from "@earendil-works/pi-coding-agent";
import { InMemoryCredentialStore, type AuthPrompt, type Credential } from "@earendil-works/pi-ai"; import { InMemoryCredentialStore, type AuthPrompt, type Credential } from "@earendil-works/pi-ai";
import { afterEach, describe, expect, it, vi } from "vitest"; import { afterEach, describe, expect, it, vi } from "vitest";
import type { OAuthFlowState } from "../../shared/apiTypes.js"; import type { OAuthFlowState } from "../../shared/apiTypes.js";
import { AuthService, type AuthChange } from "./authService.js"; import { AuthService, type AuthChange, type AuthServiceLogger } from "./authService.js";
import { OAuthLoginFlowService } from "./oauthLoginFlowService.js"; import { OAuthLoginFlowService } from "./oauthLoginFlowService.js";
const tempDirs: string[] = []; const tempDirs: string[] = [];
@@ -41,6 +41,54 @@ describe("AuthService", () => {
auth.dispose(); auth.dispose();
}); });
it("persists an API key and attempts every listener when propagation fails", async () => {
const error = vi.fn();
const logger: AuthServiceLogger = { error };
const { auth, credentials, changes } = await createAuthService({}, logger);
const failure = new Error("session auth refresh failed");
const attempts: string[] = [];
auth.subscribe(() => {
attempts.push("throwing");
throw failure;
});
auth.subscribe(async () => {
await Promise.resolve();
attempts.push("healthy");
});
await expect(auth.saveApiKey("anthropic", "sk-test")).resolves.toEqual({ accepted: true });
await expect(credentials.read("anthropic")).resolves.toEqual({ type: "api_key", key: "sk-test" });
expect(changes).toEqual([{}]);
expect(attempts).toEqual(["throwing", "healthy"]);
expect(error).toHaveBeenCalledWith(
{ err: failure, operation: "login", providerId: "anthropic", authType: "api_key" },
"auth-change listener failed",
);
auth.dispose();
});
it("removes a credential when auth-change propagation rejects", async () => {
const error = vi.fn();
const logger: AuthServiceLogger = { error };
const { auth, credentials, changes } = await createAuthService(
{ anthropic: { type: "api_key", key: "sk-test" } },
logger,
);
const failure = new Error("session logout refresh failed");
auth.subscribe(() => Promise.reject(failure));
await expect(auth.logoutProvider("anthropic")).resolves.toEqual({ accepted: true });
await expect(credentials.read("anthropic")).resolves.toBeUndefined();
expect(changes).toEqual([{ removedProviderId: "anthropic" }]);
expect(error).toHaveBeenCalledWith(
{ err: failure, operation: "logout", providerId: "anthropic" },
"auth-change listener failed",
);
auth.dispose();
});
it("rejects blank API keys", async () => { it("rejects blank API keys", async () => {
const { auth, changes } = await createAuthService(); const { auth, changes } = await createAuthService();
@@ -236,22 +284,48 @@ describe("AuthService", () => {
refresh.mockClear(); refresh.mockClear();
if (startOptions.onComplete === undefined) throw new Error("Expected OAuth completion callback"); if (startOptions.onComplete === undefined) throw new Error("Expected OAuth completion callback");
startOptions.onComplete(); await startOptions.onComplete();
await vi.waitFor(() => { expect(changes).toEqual([{}]); }); expect(changes).toEqual([{}]);
expect(refresh).not.toHaveBeenCalled(); expect(refresh).not.toHaveBeenCalled();
auth.dispose(); auth.dispose();
expect(authFlows.disposed).toBe(true); expect(authFlows.disposed).toBe(true);
}); });
it("completes OAuth when an auth-change listener rejects", async () => {
const error = vi.fn();
const logger: AuthServiceLogger = { error };
const { auth, runtime, changes } = await createAuthService({}, logger);
const provider = runtime.getProviders().find((option) => option.id === "anthropic" && option.auth.oauth !== undefined);
if (provider === undefined) throw new Error("Expected built-in OAuth provider");
vi.spyOn(runtime, "login").mockResolvedValue({
type: "oauth",
refresh: "refresh-token",
access: "access-token",
expires: Date.now() + 60_000,
});
const failure = new Error("session OAuth refresh failed");
auth.subscribe(() => Promise.reject(failure));
const state = await auth.startOAuthLogin(provider.id);
await vi.waitFor(() => { expect(auth.oauthFlow(state.flowId).status).toBe("complete"); });
expect(changes).toEqual([{}]);
expect(error).toHaveBeenCalledWith(
{ err: failure, operation: "login", providerId: provider.id, authType: "oauth" },
"auth-change listener failed",
);
auth.dispose();
});
}); });
async function createAuthService(seed: Record<string, Credential> = {}) { async function createAuthService(seed: Record<string, Credential> = {}, logger?: AuthServiceLogger) {
const credentials = new InMemoryCredentialStore(); const credentials = new InMemoryCredentialStore();
for (const [providerId, credential] of Object.entries(seed)) { for (const [providerId, credential] of Object.entries(seed)) {
await credentials.modify(providerId, () => Promise.resolve(credential)); await credentials.modify(providerId, () => Promise.resolve(credential));
} }
const runtime = await ModelRuntime.create({ credentials, modelsPath: null, allowModelNetwork: false }); const runtime = await ModelRuntime.create({ credentials, modelsPath: null, allowModelNetwork: false });
const auth = await AuthService.create({ runtime }); const auth = await AuthService.create({ runtime, ...(logger === undefined ? {} : { logger }) });
const changes: AuthChange[] = []; const changes: AuthChange[] = [];
auth.subscribe((change) => { changes.push(change); }); auth.subscribe((change) => { changes.push(change); });
return { auth, runtime, credentials, changes }; return { auth, runtime, credentials, changes };
+29 -10
View File
@@ -9,14 +9,28 @@ export interface AuthChange {
removedProviderId?: string; removedProviderId?: string;
} }
type AuthChangeListener = (change: AuthChange) => void; type AuthChangeListener = (change: AuthChange) => void | Promise<void>;
export interface AuthServiceDependencies { export interface AuthServiceDependencies {
agentDir?: string; agentDir?: string;
runtime?: ModelRuntime; runtime?: ModelRuntime;
authFlows?: OAuthLoginFlowService; authFlows?: OAuthLoginFlowService;
logger?: AuthServiceLogger;
} }
/** Minimal structured-logging seam for non-fatal auth propagation failures. */
export interface AuthServiceLogger {
error(details: Record<string, unknown>, message: string): void;
}
interface AuthChangeContext {
operation: "login" | "logout";
providerId: string;
authType?: AuthType;
}
const noopLogger: AuthServiceLogger = { error() { /* no-op */ } };
export function createModelRuntimeForAgentDir(agentDir: string): Promise<ModelRuntime> { export function createModelRuntimeForAgentDir(agentDir: string): Promise<ModelRuntime> {
return ModelRuntime.create({ authPath: join(agentDir, "auth.json"), modelsPath: join(agentDir, "models.json") }); return ModelRuntime.create({ authPath: join(agentDir, "auth.json"), modelsPath: join(agentDir, "models.json") });
} }
@@ -24,17 +38,19 @@ export function createModelRuntimeForAgentDir(agentDir: string): Promise<ModelRu
export class AuthService { export class AuthService {
readonly runtime: ModelRuntime; readonly runtime: ModelRuntime;
private readonly authFlows: OAuthLoginFlowService; private readonly authFlows: OAuthLoginFlowService;
private readonly logger: AuthServiceLogger;
private readonly listeners = new Set<AuthChangeListener>(); private readonly listeners = new Set<AuthChangeListener>();
private constructor(runtime: ModelRuntime, authFlows: OAuthLoginFlowService) { private constructor(runtime: ModelRuntime, authFlows: OAuthLoginFlowService, logger: AuthServiceLogger) {
this.runtime = runtime; this.runtime = runtime;
this.authFlows = authFlows; this.authFlows = authFlows;
this.logger = logger;
} }
static async create(deps: AuthServiceDependencies = {}): Promise<AuthService> { static async create(deps: AuthServiceDependencies = {}): Promise<AuthService> {
const runtime = deps.runtime ?? (deps.agentDir === undefined ? await ModelRuntime.create({}) : await createModelRuntimeForAgentDir(deps.agentDir)); const runtime = deps.runtime ?? (deps.agentDir === undefined ? await ModelRuntime.create({}) : await createModelRuntimeForAgentDir(deps.agentDir));
const authFlows = deps.authFlows ?? new OAuthLoginFlowService(); const authFlows = deps.authFlows ?? new OAuthLoginFlowService();
return new AuthService(runtime, authFlows); return new AuthService(runtime, authFlows, deps.logger ?? noopLogger);
} }
subscribe(listener: AuthChangeListener): () => void { subscribe(listener: AuthChangeListener): () => void {
@@ -74,13 +90,13 @@ export class AuthService {
notify: () => undefined, notify: () => undefined,
}; };
await this.runtime.login(providerId, "api_key", interaction); await this.runtime.login(providerId, "api_key", interaction);
this.emit({}); await this.emit({}, { operation: "login", providerId, authType: "api_key" });
return { accepted: true }; return { accepted: true };
} }
async logoutProvider(providerId: string): Promise<{ accepted: true }> { async logoutProvider(providerId: string): Promise<{ accepted: true }> {
await this.runtime.logout(providerId); await this.runtime.logout(providerId);
this.emit({ removedProviderId: providerId }); await this.emit({ removedProviderId: providerId }, { operation: "logout", providerId });
return { accepted: true }; return { accepted: true };
} }
@@ -90,9 +106,7 @@ export class AuthService {
providerId, providerId,
providerName: provider.name, providerName: provider.name,
runtime: this.runtime, runtime: this.runtime,
onComplete: () => { onComplete: () => this.emit({}, { operation: "login", providerId, authType: "oauth" }),
this.emit({});
},
}); });
} }
@@ -108,8 +122,13 @@ export class AuthService {
return this.authFlows.cancel(flowId); return this.authFlows.cancel(flowId);
} }
private emit(change: AuthChange): void { private async emit(change: AuthChange, context: AuthChangeContext): Promise<void> {
for (const listener of this.listeners) listener(change); const results = await Promise.allSettled([...this.listeners].map(async (listener) => listener(change)));
for (const result of results) {
if (result.status === "rejected") {
this.logger.error({ err: result.reason, ...context }, "auth-change listener failed");
}
}
} }
private async requireApiKeyLoginProvider(providerId: string) { private async requireApiKeyLoginProvider(providerId: string) {
@@ -41,6 +41,25 @@ describe("OAuthLoginFlowService", () => {
service.dispose(); service.dispose();
}); });
it("awaits async completion propagation before marking the flow complete", async () => {
const completion = deferred<undefined>();
const service = new OAuthLoginFlowService();
const state = service.start({
providerId: "test-provider",
providerName: "Test Provider",
runtime: fakeRuntime(() => Promise.resolve()),
onComplete: () => completion.promise,
});
await flushAsyncLogin();
expect(service.get(state.flowId).status).toBe("running");
completion.resolve(undefined);
await flushAsyncLogin();
expect(service.get(state.flowId).status).toBe("complete");
service.dispose();
});
it("allows blank text responses for providers that use blank as a default", async () => { it("allows blank text responses for providers that use blank as a default", async () => {
let domain: string | undefined; let domain: string | undefined;
const service = new OAuthLoginFlowService(); const service = new OAuthLoginFlowService();
+4 -3
View File
@@ -52,7 +52,7 @@ export class OAuthLoginFlowService {
providerId: string; providerId: string;
providerName: string; providerName: string;
runtime: OAuthLoginRuntime; runtime: OAuthLoginRuntime;
onComplete?: () => void; onComplete?: () => void | Promise<void>;
}): OAuthFlowState { }): OAuthFlowState {
const flowId = crypto.randomUUID(); const flowId = crypto.randomUUID();
const abort = new AbortController(); const abort = new AbortController();
@@ -81,11 +81,12 @@ export class OAuthLoginFlowService {
}; };
void options.runtime.login(options.providerId, "oauth", interaction) void options.runtime.login(options.providerId, "oauth", interaction)
.then(() => { .then(async () => {
if (!this.isCurrentRunning(record)) return; if (!this.isCurrentRunning(record)) return;
this.clearPending(record); this.clearPending(record);
await options.onComplete?.();
if (!this.isCurrentRunning(record)) return;
this.markTerminal(record, { ...withoutInteraction(record.state), status: "complete", progress: [...record.state.progress, "Login complete"] }); this.markTerminal(record, { ...withoutInteraction(record.state), status: "complete", progress: [...record.state.progress, "Login complete"] });
options.onComplete?.();
}) })
.catch((error: unknown) => { .catch((error: unknown) => {
if (this.flows.get(record.flowId) !== record) return; if (this.flows.get(record.flowId) !== record) return;