Fix Codex P1 issues:

- Fix subscription filtering to preserve correct indexes
- Move notification trigger to server-side for PWA support
- Remove frontend notification logic (now server-side only)

Author: kylecarbs

src/debug/agentSessionCli.ts

@@ -9,6 +9,7 @@ import { HistoryService } from "@/services/historyService";
 import { PartialService } from "@/services/partialService";
 import { AIService } from "@/services/aiService";
 import { InitStateManager } from "@/services/initStateManager";
+import { NotificationService } from "@/services/NotificationService";
 import { AgentSession, type AgentSessionChatEvent } from "@/services/agentSession";
 import {
   isCaughtUpMessage,
@@ -211,6 +212,7 @@ async function main(): Promise<void> {
   const partialService = new PartialService(config, historyService);
   const aiService = new AIService(config, historyService, partialService);
   const initStateManager = new InitStateManager(config);
+  const notificationService = new NotificationService(config.rootDir, true);
   ensureProvidersConfig(config);
 
   const session = new AgentSession({
@@ -220,6 +222,7 @@ async function main(): Promise<void> {
     partialService,
     aiService,
     initStateManager,
+    notificationService,
   });
 
   session.ensureMetadata({

src/services/NotificationService.ts

@@ -141,15 +141,11 @@ export class NotificationService {
 
     const results = await Promise.allSettled(sendPromises);
 
-    // Remove failed subscriptions
-    const validSubscriptions = results
-      .filter((result) => {
-        if (result.status === "fulfilled" && result.value.success) {
-          return true;
-        }
-        return false;
-      })
-      .map((_result, index) => subscriptions[index]);
+    // Remove failed subscriptions - filter by original index to preserve correct mapping
+    const validSubscriptions = subscriptions.filter((_, index) => {
+      const result = results[index];
+      return result.status === "fulfilled" && result.value.success;
+    });
 
     this.subscriptions.set(workspaceId, validSubscriptions);
   }

src/services/agentSession.ts

@@ -7,6 +7,7 @@ import type { AIService } from "@/services/aiService";
 import type { HistoryService } from "@/services/historyService";
 import type { PartialService } from "@/services/partialService";
 import type { InitStateManager } from "@/services/initStateManager";
+import type { NotificationService } from "@/services/NotificationService";
 import type { WorkspaceMetadata } from "@/types/workspace";
 import type { WorkspaceChatMessage, StreamErrorMessage, SendMessageOptions } from "@/types/ipc";
 import type { SendMessageError } from "@/types/errors";
@@ -39,6 +40,7 @@ interface AgentSessionOptions {
   partialService: PartialService;
   aiService: AIService;
   initStateManager: InitStateManager;
+  notificationService: NotificationService;
 }
 
 export class AgentSession {
@@ -48,6 +50,7 @@ export class AgentSession {
   private readonly partialService: PartialService;
   private readonly aiService: AIService;
   private readonly initStateManager: InitStateManager;
+  private readonly notificationService: NotificationService;
   private readonly emitter = new EventEmitter();
   private readonly aiListeners: Array<{ event: string; handler: (...args: unknown[]) => void }> =
     [];
@@ -57,8 +60,15 @@ export class AgentSession {
 
   constructor(options: AgentSessionOptions) {
     assert(options, "AgentSession requires options");
-    const { workspaceId, config, historyService, partialService, aiService, initStateManager } =
-      options;
+    const {
+      workspaceId,
+      config,
+      historyService,
+      partialService,
+      aiService,
+      initStateManager,
+      notificationService,
+    } = options;
 
     assert(typeof workspaceId === "string", "workspaceId must be a string");
     const trimmedWorkspaceId = workspaceId.trim();
@@ -70,6 +80,7 @@ export class AgentSession {
     this.partialService = partialService;
     this.aiService = aiService;
     this.initStateManager = initStateManager;
+    this.notificationService = notificationService;
 
     this.attachAiListeners();
     this.attachInitListeners();
@@ -393,7 +404,11 @@ export class AgentSession {
 
     forward("stream-start", (payload) => this.emitChatEvent(payload));
     forward("stream-delta", (payload) => this.emitChatEvent(payload));
-    forward("stream-end", (payload) => this.emitChatEvent(payload));
+    forward("stream-end", (payload) => {
+      this.emitChatEvent(payload);
+      // Trigger completion notification (server-side so it works when app is closed)
+      void this.notificationService.sendCompletionNotification(this.workspaceId, this.workspaceId);
+    });
     forward("tool-call-start", (payload) => this.emitChatEvent(payload));
     forward("tool-call-delta", (payload) => this.emitChatEvent(payload));
     forward("tool-call-end", (payload) => this.emitChatEvent(payload));

src/services/ipcMain.ts

@@ -162,6 +162,7 @@ export class IpcMain {
       partialService: this.partialService,
       aiService: this.aiService,
       initStateManager: this.initStateManager,
+      notificationService: this.notificationService,
     });
 
     const chatUnsubscribe = session.onChatEvent((event) => {

src/stores/WorkspaceStore.ts

@@ -5,8 +5,8 @@ import type { FrontendWorkspaceMetadata } from "@/types/workspace";
 import type { WorkspaceChatMessage } from "@/types/ipc";
 import type { TodoItem } from "@/types/tools";
 import { StreamingMessageAggregator } from "@/utils/messages/StreamingMessageAggregator";
-import { updatePersistedState, readPersistedState } from "@/hooks/usePersistedState";
-import { getRetryStateKey, NOTIFICATION_ENABLED_KEY } from "@/constants/storage";
+import { updatePersistedState } from "@/hooks/usePersistedState";
+import { getRetryStateKey } from "@/constants/storage";
 import { CUSTOM_EVENTS } from "@/constants/events";
 import { useSyncExternalStore } from "react";
 import { isCaughtUpMessage, isStreamError, isDeleteMessage, isCmuxMessage } from "@/types/ipc";
@@ -154,17 +154,8 @@ export class WorkspaceStore {
       this.states.bump(workspaceId);
       this.checkAndBumpRecencyIfChanged();
       this.finalizeUsageStats(workspaceId, (data as { metadata?: never }).metadata);
-
-      // Trigger completion notification if enabled
-      const notificationsEnabled = readPersistedState(NOTIFICATION_ENABLED_KEY, false);
-      if (notificationsEnabled) {
-        // Only notify if document is hidden (tab backgrounded) or on desktop
-        const shouldNotify = typeof document === "undefined" || document.hidden;
-        if (shouldNotify) {
-          // Use workspaceId as the display name for notifications
-          void window.api.notification.send(workspaceId, workspaceId);
-        }
-      }
+      // Note: Completion notifications are now triggered server-side in AgentSession
+      // to support push notifications when the app is closed
     },
     "stream-abort": (workspaceId, aggregator, data) => {
       aggregator.clearTokenState((data as { messageId: string }).messageId);