Revert commits to fix bug that plain mode not notifing (#12)

* Revert "feat: Only output the last assistant message in plain-cli"

This reverts commit b42b607.

* Revert "feat: Execute saveSession and Stop hooks in parallel using IIFE"

This reverts commit 2f775cb.

Author: lewis617

packages/agent-sdk/src/managers/aiManager.ts

@@ -444,14 +444,11 @@ export class AIManager {
       if (recursionDepth === 0) {
         this.setIsLoading(false);
 
-        // Save session and execute Stop hooks in parallel but maintain order
-        (async () => {
-          // Save session before executing Stop hooks
-          await this.messageManager.saveSession();
-
-          // Execute Stop hooks when AI response cycle completes
-          await this.executeStopHooks();
-        })();
+        // Save session before executing Stop hooks
+        await this.messageManager.saveSession();
+
+        // Execute Stop hooks when AI response cycle completes
+        await this.executeStopHooks();
       }
     }
   }

packages/code/src/plain-cli.ts

@@ -22,14 +22,13 @@ export async function startPlainCli(options: PlainCliOptions): Promise<void> {
   }
 
   let agent: Agent;
-  let lastAssistantMessage: string | undefined;
 
   // Setup callbacks for agent
   const callbacks: AgentCallbacks = {
     onAssistantMessageAdded: (content?: string) => {
-      // Store the content instead of immediately printing it
+      // Only output the content field, not tool calls
       if (content) {
-        lastAssistantMessage = content;
+        console.log(content);
       }
     },
   };
@@ -48,11 +47,6 @@ export async function startPlainCli(options: PlainCliOptions): Promise<void> {
       await agent.sendMessage(message);
     }
 
-    // Output only the last assistant message
-    if (lastAssistantMessage) {
-      console.log(lastAssistantMessage);
-    }
-
     // Destroy agent and exit after sendMessage completes
     agent.destroy();
     process.exit(0);

packages/code/tests/plain-cli.test.ts

@@ -77,7 +77,7 @@ test("startPlainCli sends message and exits after completion", async () => {
   expect(mockExit).toHaveBeenCalledWith(0);
 });
 
-test("onAssistantMessageAdded collects content but doesn't output immediately", async () => {
+test("onAssistantMessageAdded outputs content", async () => {
   const mockAgent = {
     sendMessage: vi.fn(),
     destroy: vi.fn(),
@@ -103,15 +103,13 @@ test("onAssistantMessageAdded collects content but doesn't output immediately",
     expect(String(error)).toContain("process.exit called");
   }
 
-  // Test the onAssistantMessageAdded callback - it should NOT output immediately
+  // Test the onAssistantMessageAdded callback
   capturedCallbacks?.onAssistantMessageAdded?.(
     "Hello, this is assistant content!",
   );
 
-  // Verify that console.log was NOT called during the callback
-  expect(consoleSpy).not.toHaveBeenCalledWith(
-    "Hello, this is assistant content!",
-  );
+  // Verify that console.log was called with the content
+  expect(consoleSpy).toHaveBeenCalledWith("Hello, this is assistant content!");
 
   consoleSpy.mockRestore();
 });
@@ -148,49 +146,6 @@ test("startPlainCli works with continue session", async () => {
   expect(mockExit).toHaveBeenCalledWith(0);
 });
 
-test("outputs only the last assistant message after sendMessage completes", async () => {
-  const mockAgent = {
-    sendMessage: vi.fn(),
-    destroy: vi.fn(),
-    abortMessage: vi.fn(),
-  };
-
-  interface AgentCallbacks {
-    onAssistantMessageAdded?: (content?: string) => void;
-  }
-
-  let capturedCallbacks: AgentCallbacks | undefined;
-  vi.mocked(Agent.create).mockImplementation(async (options) => {
-    capturedCallbacks = options.callbacks;
-    return mockAgent as unknown as Agent;
-  });
-
-  const consoleSpy = vi.spyOn(console, "log").mockImplementation(() => {});
-
-  // Simulate multiple assistant messages during sendMessage
-  mockAgent.sendMessage.mockImplementation(async () => {
-    // Simulate first assistant message
-    capturedCallbacks?.onAssistantMessageAdded?.("First message");
-    // Simulate second assistant message
-    capturedCallbacks?.onAssistantMessageAdded?.("Second message");
-    // Simulate final assistant message
-    capturedCallbacks?.onAssistantMessageAdded?.("Final message");
-  });
-
-  try {
-    await startPlainCli({ message: "test message" });
-  } catch (error) {
-    // Expected when process.exit is called
-    expect(String(error)).toContain("process.exit called");
-  }
-
-  // Verify that only the last message was output
-  expect(consoleSpy).toHaveBeenCalledTimes(1);
-  expect(consoleSpy).toHaveBeenCalledWith("Final message");
-
-  consoleSpy.mockRestore();
-});
-
 afterEach(() => {
   vi.clearAllMocks();
   mockExit.mockClear();