diff --git a/packages/bot/core/src/index.ts b/packages/bot/core/src/index.ts
index 00073aba..434f6517 100644
--- a/packages/bot/core/src/index.ts
+++ b/packages/bot/core/src/index.ts
@@ -111,16 +111,7 @@ export class SessionManager {
       proc.stderr?.on("data", (chunk) => (stderr += chunk.toString()));
 
       return new Promise((resolve) => {
-        const finish = (result: {
-          type: string;
-          subtype: string;
-          is_error: boolean;
-          result: string;
-          duration_ms: number;
-          num_turns: number;
-          session_id: string;
-          total_cost_usd: number;
-        }) => {
+        const finish = (result: AIResult) => {
           session.busy = false;
           session.abortController = null;
           resolve(result);
diff --git a/packages/bots/core/src/index.ts b/packages/bots/core/src/index.ts
index 9284cf07..e15d0383 100644
--- a/packages/bots/core/src/index.ts
+++ b/packages/bots/core/src/index.ts
@@ -111,16 +111,7 @@ export class SessionManager {
       proc.stderr?.on("data", (chunk) => (stderr += chunk.toString()));
 
       return new Promise((resolve) => {
-        const finish = (result: {
-          type: string;
-          subtype: string;
-          is_error: boolean;
-          result: string;
-          duration_ms: number;
-          num_turns: number;
-          session_id: string;
-          total_cost_usd: number;
-        }) => {
+        const finish = (result: AIResult) => {
           session.busy = false;
           session.abortController = null;
           resolve(result);
diff --git a/packages/bots/signal/src/index.test.ts b/packages/bots/signal/src/index.test.ts
index 4a479d93..c074aafb 100644
--- a/packages/bots/signal/src/index.test.ts
+++ b/packages/bots/signal/src/index.test.ts
@@ -59,8 +59,8 @@ describe('toBotEvent', () => {
       text: 'hello',
       timestamp: Number.POSITIVE_INFINITY,
       groupId: undefined,
+      isGroup: false,
       attachments: [],
-      raw: {},
     }).timestamp).toBe('1970-01-01T00:00:00.000Z');
   });
 });
diff --git a/packages/bots/signal/src/index.ts b/packages/bots/signal/src/index.ts
index a9bec189..8a28777f 100644
--- a/packages/bots/signal/src/index.ts
+++ b/packages/bots/signal/src/index.ts
@@ -24,7 +24,7 @@ export interface IncomingMessage {
   sourceName: string;
   text: string;
   timestamp: number;
-  groupId: string | null;
+  groupId: string | null | undefined;
   isGroup: boolean;
   attachments: Array<{ filename: string; url: string }>;
 }