@neomei/opencode-feishu 0.2.6 → 0.2.8

package/dist/opencode/client.js

@@ -18,12 +18,28 @@ export class OpenCodeClient {
         }
         this.client = createOpencodeClient(config);
     }
+    formatError(error) {
+        if (typeof error === 'string')
+            return error;
+        if (error instanceof Error)
+            return error.message;
+        try {
+            // Try to stringify with all own property names (including non-enumerable)
+            const props = error && typeof error === 'object'
+                ? Object.getOwnPropertyNames(error)
+                : undefined;
+            return JSON.stringify(error, props);
+        }
+        catch {
+            return String(error);
+        }
+    }
     async createSession(title) {
         const { data, error } = await this.client.session.create({
             title: title || 'Feishu Chat',
         });
         if (error) {
-            throw new Error(`Failed to create session: ${error}`);
+            throw new Error(`Failed to create session: ${this.formatError(error)}`);
         }
         return data;
     }
@@ -41,12 +57,14 @@ export class OpenCodeClient {
                 });
             }
         }
-        const { data, error } = await this.client.session.prompt({
+        // Use promptAsync so the call returns immediately instead of blocking
+        // until the AI finishes. Responses arrive through the event stream.
+        const { data, error } = await this.client.session.promptAsync({
             sessionID: sessionId,
             parts,
         });
         if (error) {
-            throw new Error(`Failed to send prompt: ${error}`);
+            throw new Error(`Failed to send prompt: ${this.formatError(error)}`);
         }
         return data;
     }
@@ -57,14 +75,14 @@ export class OpenCodeClient {
     async getSessionStatus() {
         const { data, error } = await this.client.session.status({});
         if (error) {
-            throw new Error(`Failed to get session status: ${error}`);
+            throw new Error(`Failed to get session status: ${this.formatError(error)}`);
         }
         return data || {};
     }
     async listSessions() {
         const { data, error } = await this.client.session.list({});
         if (error) {
-            throw new Error(`Failed to list sessions: ${error}`);
+            throw new Error(`Failed to list sessions: ${this.formatError(error)}`);
         }
         return data || [];
     }
@@ -95,7 +113,7 @@ export class OpenCodeClient {
             reply,
         });
         if (error) {
-            throw new Error(`Failed to reply to permission: ${error}`);
+            throw new Error(`Failed to reply to permission: ${this.formatError(error)}`);
         }
         return !!data;
     }
@@ -105,7 +123,7 @@ export class OpenCodeClient {
             answers,
         });
         if (error) {
-            throw new Error(`Failed to reply to question: ${error}`);
+            throw new Error(`Failed to reply to question: ${this.formatError(error)}`);
         }
         return !!data;
     }
@@ -113,10 +131,103 @@ export class OpenCodeClient {
         const { data, error } = await this.client.session.command({
             sessionID: sessionId,
             command,
-            arguments: args,
+            arguments: args || '',
+        });
+        if (error) {
+            // Pass the original error object so the caller can extract meaningful messages
+            throw error;
+        }
+        return data;
+    }
+    async executeTuiCommand(command) {
+        const { data, error } = await this.client.tui.executeCommand({
+            directory: this.directory,
+            command,
+        });
+        if (error) {
+            throw new Error(`Failed to execute TUI command: ${this.formatError(error)}`);
+        }
+        return data;
+    }
+    async getProviders() {
+        const { data, error } = await this.client.config.providers({
+            directory: this.directory,
+        });
+        if (error) {
+            throw new Error(`Failed to get providers: ${this.formatError(error)}`);
+        }
+        return data;
+    }
+    async getAgents() {
+        const { data, error } = await this.client.app.agents({
+            directory: this.directory,
+        });
+        if (error) {
+            throw new Error(`Failed to get agents: ${this.formatError(error)}`);
+        }
+        return data;
+    }
+    async getCommands() {
+        const { data, error } = await this.client.command.list({
+            directory: this.directory,
+        });
+        if (error) {
+            throw new Error(`Failed to get commands: ${this.formatError(error)}`);
+        }
+        return data;
+    }
+    async getSessions() {
+        const { data, error } = await this.client.session.list({
+            directory: this.directory,
+        });
+        if (error) {
+            throw new Error(`Failed to get sessions: ${this.formatError(error)}`);
+        }
+        return data;
+    }
+    async getTools() {
+        const { data, error } = await this.client.tool.ids({
+            directory: this.directory,
+        });
+        if (error) {
+            throw new Error(`Failed to get tools: ${this.formatError(error)}`);
+        }
+        return data;
+    }
+    async getWorktrees() {
+        const { data, error } = await this.client.worktree.list({
+            directory: this.directory,
+        });
+        if (error) {
+            throw new Error(`Failed to get worktrees: ${this.formatError(error)}`);
+        }
+        return data;
+    }
+    async getFiles(path) {
+        const { data, error } = await this.client.file.list({
+            directory: this.directory,
+            path: path || '.',
+        });
+        if (error) {
+            throw new Error(`Failed to get files: ${this.formatError(error)}`);
+        }
+        return data;
+    }
+    async getStatus() {
+        const { data, error } = await this.client.file.status({
+            directory: this.directory,
+        });
+        if (error) {
+            throw new Error(`Failed to get status: ${this.formatError(error)}`);
+        }
+        return data;
+    }
+    async getConfig() {
+        const { data, error } = await this.client.config.get({
+            directory: this.directory,
         });
         if (error) {
-            throw new Error(`Failed to send command: ${error}`);
+            throw new Error(`Failed to get config: ${this.formatError(error)}`);
         }
         return data;
     }

package/dist/opencode/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/opencode/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/opencode/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,MAAM,OAAO,cAAc;IACjB,MAAM,CAA0C;IAChD,OAAO,CAAS;IAChB,SAAS,CAAS;IAE1B,YAAY,OAAmE;QAC7E,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAEpD,MAAM,MAAM,GAAQ;YAClB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC;QAEF,iBAAiB;QACjB,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,CAAC,OAAO,GAAG;gBACf,eAAe,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,YAAY,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;aAC3F,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IAEO,WAAW,CAAC,KAAc;QAChC,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAC5C,IAAI,KAAK,YAAY,KAAK;YAAE,OAAO,KAAK,CAAC,OAAO,CAAC;QACjD,IAAI,CAAC;YACH,0EAA0E;YAC1E,MAAM,KAAK,GAAG,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAC9C,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC;gBACnC,CAAC,CAAC,SAAS,CAAC;YACd,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAc;QAChC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YACvD,KAAK,EAAE,KAAK,IAAI,aAAa;SAC9B,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB,EAAE,IAAY,EAAE,KAAuE;QACvH,MAAM,KAAK,GAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAE9C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,KAAK,CAAC,IAAI,CAAC;oBACT,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE;wBACJ,IAAI,EAAE,IAAI,CAAC,QAAQ;wBACnB,IAAI,EAAE,IAAI,CAAC,QAAQ;wBACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;qBACxB;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,sEAAsE;QACtE,oEAAoE;QACpE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;YAC5D,SAAS,EAAE,SAAS;YACpB,KAAK;SACN,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,0BAA0B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7D,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC9E,CAAC;QAED,OAAO,IAAI,IAAI,EAAE,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE3D,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,OAAO,IAAI,IAAI,EAAE,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,SAAiB;QAClC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;YAC9B,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,aAAa,CAAC,SAAiB;QACnC,IAAI,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;YAChF,IAAI,KAAK;gBAAE,OAAO,KAAK,CAAC;YACxB,OAAO,CAAC,CAAC,IAAI,CAAC;QAChB,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAiB,EAAE,KAAmC;QAC1E,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;YACzD,SAAS;YACT,KAAK;SACN,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/E,CAAC;QAED,OAAO,CAAC,CAAC,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAiB,EAAE,OAAmB;QACxD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;YACvD,SAAS;YACT,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7E,CAAC;QAED,OAAO,CAAC,CAAC,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,SAAiB,EAAE,OAAe,EAAE,IAAa;QACjE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;YACxD,SAAS,EAAE,SAAS;YACpB,OAAO;YACP,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,+EAA+E;YAC/E,MAAM,KAAK,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAe;QACrC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;YAC3D,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/E,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;YACzD,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;YACnD,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YACrD,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YACrD,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YACjD,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YACtD,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAa;QAC1B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;YAClD,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,IAAI,IAAI,GAAG;SAClB,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;YACpD,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;YACnD,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CACF"}

package/dist/opencode/event-handler.d.ts

@@ -9,13 +9,25 @@ export declare class OpenCodeEventHandler {
     private opencodeUrl;
     private showProcess;
     private botName;
-    constructor(sessionManager: SessionManager, feishuApi: FeishuAPI, hookManager?: HookManager, opencodeUrl?: string, showProcess?: boolean, botName?: string);
+    constructor(sessionManager: SessionManager, feishuApi: FeishuAPI, hookManager?: HookManager, opencodeUrl?: string, showProcess?: 'none' | 'tools' | 'thinking' | 'full', botName?: string);
+    /**
+     * Check if thinking content should be shown based on showProcess config.
+     */
+    private shouldShowThinking;
+    /**
+     * Check if tools should be shown based on showProcess config.
+     */
+    private shouldShowTools;
     start(eventStream: {
         stream: AsyncGenerator<any, void, unknown>;
     }): Promise<void>;
     stop(): void;
     private handleEvent;
     private handleTextDelta;
+    /**
+     * Determine if a field should be displayed based on showProcess config.
+     */
+    private shouldShowField;
     private handlePartUpdate;
     private handleStatusChange;
     private handleError;
@@ -25,6 +37,7 @@ export declare class OpenCodeEventHandler {
     private handleQuestionAsked;
     private handleQuestionReplied;
     private handleQuestionRejected;
+    private handleCommandExecuted;
     /**
      * 合成并推送主流式卡片（一个 chat 对应一张持续更新的卡片）。
      * - 首次调用：sendCard 新建一张并记录 message_id

package/dist/opencode/event-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-handler.d.ts","sourceRoot":"","sources":["../../src/opencode/event-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAQ3D,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,OAAO,CAAS;gBAEtB,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,SAAS,EACpB,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,UAAQ,EACnB,OAAO,SAAO;IAUV,KAAK,CAAC,WAAW,EAAE;QAAE,MAAM,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBvF,IAAI,IAAI,IAAI;YAKE,WAAW;YAiDX,eAAe;YAsBf,gBAAgB;YA0ChB,kBAAkB;YAgClB,WAAW;YAkBX,iBAAiB;YA6BjB,qBAAqB;YAuBrB,uBAAuB;YAWvB,mBAAmB;YA6BnB,qBAAqB;YAYrB,sBAAsB;IASpC;;;;;OAKG;YACW,SAAS;CA4CxB"}
+{"version":3,"file":"event-handler.d.ts","sourceRoot":"","sources":["../../src/opencode/event-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAQ3D,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,OAAO,CAAS;gBAEtB,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,SAAS,EACpB,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,GAAE,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,MAAe,EAC5D,OAAO,SAAO;IAUhB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAI1B;;OAEG;IACH,OAAO,CAAC,eAAe;IAIjB,KAAK,CAAC,WAAW,EAAE;QAAE,MAAM,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBvF,IAAI,IAAI,IAAI;YAKE,WAAW;YAoDX,eAAe;IA0C7B;;OAEG;IACH,OAAO,CAAC,eAAe;YAcT,gBAAgB;YA0ChB,kBAAkB;YAsClB,WAAW;YA8BX,iBAAiB;YAkCjB,qBAAqB;YA4BrB,uBAAuB;YAyBvB,mBAAmB;YA6BnB,qBAAqB;YAsBrB,sBAAsB;YAoBtB,qBAAqB;IAmBnC;;;;;OAKG;YACW,SAAS;CAsExB"}

package/dist/opencode/event-handler.js

@@ -1,7 +1,7 @@
 import { FeishuCard } from '../feishu/card.js';
 import { createLogger } from '../core/logger.js';
 const log = createLogger('EventHandler');
-const UPDATE_THROTTLE_MS = 1000;
+const UPDATE_THROTTLE_MS = 2000;
 export class OpenCodeEventHandler {
     sessionManager;
     feishuApi;
@@ -10,7 +10,7 @@ export class OpenCodeEventHandler {
     opencodeUrl;
     showProcess;
     botName;
-    constructor(sessionManager, feishuApi, hookManager, opencodeUrl, showProcess = false, botName = '点点') {
+    constructor(sessionManager, feishuApi, hookManager, opencodeUrl, showProcess = 'none', botName = '点点') {
         this.sessionManager = sessionManager;
         this.feishuApi = feishuApi;
         this.hookManager = hookManager;
@@ -18,6 +18,18 @@ export class OpenCodeEventHandler {
         this.showProcess = showProcess;
         this.botName = botName;
     }
+    /**
+     * Check if thinking content should be shown based on showProcess config.
+     */
+    shouldShowThinking() {
+        return this.showProcess === 'thinking' || this.showProcess === 'full';
+    }
+    /**
+     * Check if tools should be shown based on showProcess config.
+     */
+    shouldShowTools() {
+        return this.showProcess === 'tools' || this.showProcess === 'full';
+    }
     async start(eventStream) {
         if (this.isRunning) {
             log.warn('Already running');
@@ -81,11 +93,14 @@ export class OpenCodeEventHandler {
                     await this.handleQuestionRejected(props);
                     break;
                 case 'command.executed':
-                    log.info({ command: props.name, sessionID: props.sessionID, args: props.arguments }, 'Command executed');
+                    await this.handleCommandExecuted(props);
                     break;
                 case 'server.heartbeat':
                     // Silently ignore heartbeat events to reduce log noise
                     break;
+                default:
+                    log.debug({ type: payload.type }, 'Unhandled event type');
+                    break;
             }
         }
         catch (err) {
@@ -95,20 +110,56 @@ export class OpenCodeEventHandler {
     async handleTextDelta(properties) {
         if (!properties)
             return;
-        // In quiet mode, skip non-content fields (reasoning/thinking)
-        log.info({ field: properties.field, partID: properties.partID?.substring(0, 20), deltaLen: properties.delta?.length, deltaPreview: properties.delta?.substring(0, 80) }, 'Text delta');
-        if (!this.showProcess && properties.field && properties.field !== 'text') {
+        // Handle non-string delta (e.g. object, array) by converting to string
+        let deltaStr;
+        if (typeof properties.delta === 'string') {
+            deltaStr = properties.delta;
+        }
+        else if (properties.delta === null || properties.delta === undefined) {
+            deltaStr = '';
+        }
+        else if (typeof properties.delta === 'object') {
+            // If it's an object, try to extract text content or stringify
+            deltaStr = properties.delta.text || properties.delta.content || JSON.stringify(properties.delta);
+        }
+        else {
+            deltaStr = String(properties.delta);
+        }
+        // Skip empty deltas
+        if (!deltaStr) {
             return;
         }
+        log.info({ field: properties.field, partID: properties.partID?.substring(0, 20), deltaLen: deltaStr.length, deltaPreview: deltaStr.substring(0, 80) }, 'Text delta');
         const chatId = this.sessionManager.getChatIdBySession(properties.sessionID);
         if (!chatId)
             return;
-        this.sessionManager.appendContent(chatId, properties.delta, properties.partID);
+        // Determine if we should show this field based on showProcess config
+        const shouldShowField = this.shouldShowField(properties.field);
+        if (!shouldShowField) {
+            return;
+        }
+        this.sessionManager.appendContent(chatId, deltaStr, properties.partID, properties.field);
         await this.flushCard(chatId);
     }
+    /**
+     * Determine if a field should be displayed based on showProcess config.
+     */
+    shouldShowField(field) {
+        switch (this.showProcess) {
+            case 'full':
+                return true;
+            case 'thinking':
+                return field === 'text' || field === 'thinking' || field === 'reasoning';
+            case 'tools':
+                return field === 'text' || !field;
+            case 'none':
+            default:
+                return !field || field === 'text';
+        }
+    }
     async handlePartUpdate(properties) {
-        // Skip tool display in quiet mode
-        if (!this.showProcess)
+        // Skip tool display if not showing tools
+        if (!this.shouldShowTools())
             return;
         const { part } = properties;
         if (part?.type !== 'tool')
@@ -163,7 +214,14 @@ export class OpenCodeEventHandler {
                 break;
             case 'idle':
                 // 不在这里清理 currentMessage，等 session.idle 事件做 final flush 后再清
-                session.status = 'idle';
+                // 但如果用户在处理交互（权限/问题），保持 busy 状态，防止新消息绕过检查。
+                if (session.pendingInteraction) {
+                    log.info({ chatId, interactionKind: session.pendingInteraction.kind }, 'OpenCode reports idle but pending interaction remains; keeping status busy');
+                    session.status = 'busy';
+                }
+                else {
+                    session.status = 'idle';
+                }
                 break;
             case 'retry':
                 session.retryMessage = properties.status.message || '等待重试';
@@ -177,8 +235,19 @@ export class OpenCodeEventHandler {
         const chatId = this.sessionManager.getChatIdBySession(properties.sessionID);
         if (!chatId)
             return;
-        await this.feishuApi.sendCard(chatId, FeishuCard.createErrorCard(properties.error));
+        // If the session is already idle or error was already handled,
+        // the error was likely already handled by MessageHandler.
+        // Avoid sending a duplicate error card.
         const session = this.sessionManager.getSession(chatId);
+        if (session?.status === 'idle') {
+            log.info({ chatId, sessionId: properties.sessionID }, 'Session already idle, skipping duplicate error card');
+            return;
+        }
+        if (session?.errorHandled) {
+            log.info({ chatId, sessionId: properties.sessionID }, 'Error already handled, skipping duplicate error card');
+            return;
+        }
+        await this.feishuApi.sendCard(chatId, FeishuCard.createErrorCard(properties.error));
         if (session) {
             session.tools = undefined;
             session.retryMessage = undefined;
@@ -195,13 +264,18 @@ export class OpenCodeEventHandler {
             return;
         const hasContent = !!(session.currentContent && session.currentContent.length > 0);
         const hasTools = !!(session.tools && session.tools.length > 0);
-        if (hasContent || hasTools) {
+        // Always finalize the card if one exists, even when the bot turn produced
+        // no text (e.g. slash commands that only trigger side effects).
+        if (hasContent || hasTools || session.currentMessageId) {
             await this.flushCard(chatId, { force: true, done: true });
         }
         session.tools = undefined;
         session.retryMessage = undefined;
+        session.interactionReplied = undefined;
         this.sessionManager.updateStatus(chatId, 'idle');
-        this.sessionManager.clearCurrentMessage(chatId);
+        // Don't clear currentMessageId here — let MessageHandler clear it when a
+        // new user message arrives. This prevents race conditions where AI sends
+        // a card (via MCP) and our flushCard updates the wrong message.
         // Fire hook on session idle (context may have been compressed)
         if (this.hookManager) {
             this.hookManager.run('onSessionIdle', {
@@ -211,9 +285,12 @@ export class OpenCodeEventHandler {
         }
     }
     async handlePermissionAsked(properties) {
+        log.info({ sessionID: properties.sessionID }, 'handlePermissionAsked called');
         const chatId = this.sessionManager.getChatIdBySession(properties.sessionID);
-        if (!chatId)
+        if (!chatId) {
+            log.warn({ sessionID: properties.sessionID, sessions: this.sessionManager.getAllSessions().map(s => ({ chatId: s.chatId, sessionId: s.id })) }, 'getChatIdBySession returned undefined');
             return;
+        }
         const perm = properties.permission || properties.type || 'unknown';
         const patterns = properties.patterns || (properties.pattern ? [properties.pattern] : []);
         const title = properties.title || `${perm}: ${patterns.join(', ')}`;
@@ -227,7 +304,8 @@ export class OpenCodeEventHandler {
             },
         };
         this.sessionManager.setPendingInteraction(chatId, interaction);
-        log.info({ chatId, permission: perm, patterns }, 'Permission asked');
+        const session = this.sessionManager.getSession(chatId);
+        log.info({ chatId, permission: perm, patterns, currentMessageId: session?.currentMessageId }, 'Permission asked');
         await this.flushCard(chatId, { force: true });
     }
     async handlePermissionReplied(properties) {
@@ -235,9 +313,22 @@ export class OpenCodeEventHandler {
         if (!chatId)
             return;
         const reply = properties.reply || 'once';
-        log.info({ chatId, reply }, 'Permission replied');
+        const hadPending = this.sessionManager.getPendingInteraction(chatId) !== undefined;
+        log.info({ chatId, reply, hadPending }, 'Permission replied');
+        // Only flush if the interaction was still pending (i.e. user replied via text).
+        // If the user already clicked a card button, handleCardAction already updated
+        // the card to a confirmation state — don't overwrite it.
         this.sessionManager.clearPendingInteraction(chatId);
-        await this.flushCard(chatId, { force: true });
+        if (hadPending) {
+            await this.flushCard(chatId, { force: true });
+        }
+        // Clear interactionReplied flag so subsequent AI streaming output can update the card.
+        // The confirmation state has already been shown; now we need to allow the AI to continue.
+        const session = this.sessionManager.getSession(chatId);
+        if (session) {
+            session.interactionReplied = undefined;
+            log.info({ chatId }, 'Cleared interactionReplied to allow AI streaming');
+        }
     }
     async handleQuestionAsked(properties) {
         const chatId = this.sessionManager.getChatIdBySession(properties.sessionID);
@@ -272,15 +363,46 @@ export class OpenCodeEventHandler {
         const answers = properties.answers || [];
         const label = answers.map((a) => a.join(', ')).join('; ');
         log.info({ chatId, label }, 'Question replied');
+        const hadPending = this.sessionManager.getPendingInteraction(chatId) !== undefined;
         this.sessionManager.clearPendingInteraction(chatId);
-        await this.flushCard(chatId, { force: true });
+        if (hadPending) {
+            await this.flushCard(chatId, { force: true });
+        }
+        // Clear interactionReplied flag so subsequent AI streaming output can update the card.
+        const session = this.sessionManager.getSession(chatId);
+        if (session) {
+            session.interactionReplied = undefined;
+            log.info({ chatId }, 'Cleared interactionReplied to allow AI streaming');
+        }
     }
     async handleQuestionRejected(properties) {
         const chatId = this.sessionManager.getChatIdBySession(properties.sessionID);
         if (!chatId)
             return;
         log.info({ chatId }, 'Question rejected');
+        const hadPending = this.sessionManager.getPendingInteraction(chatId) !== undefined;
         this.sessionManager.clearPendingInteraction(chatId);
+        if (hadPending) {
+            await this.flushCard(chatId, { force: true });
+        }
+        // Clear interactionReplied flag so subsequent AI streaming output can update the card.
+        const session = this.sessionManager.getSession(chatId);
+        if (session) {
+            session.interactionReplied = undefined;
+            log.info({ chatId }, 'Cleared interactionReplied to allow AI streaming');
+        }
+    }
+    async handleCommandExecuted(properties) {
+        const chatId = this.sessionManager.getChatIdBySession(properties.sessionID);
+        if (!chatId)
+            return;
+        const commandName = properties.name || 'unknown';
+        const args = properties.arguments || '';
+        log.info({ chatId, command: commandName, args }, 'Command executed');
+        // Append a command notice to the session content so the user sees
+        // feedback in the card (and the thinking animation stops).
+        const notice = `⚡ 命令 \`/${commandName}\`${args ? ` \`${args}\`` : ''} 已执行`;
+        this.sessionManager.appendContent(chatId, notice);
         await this.flushCard(chatId, { force: true });
     }
     /**
@@ -293,11 +415,24 @@ export class OpenCodeEventHandler {
         const session = this.sessionManager.getSession(chatId);
         if (!session)
             return;
+        // When the user replied via card button, the confirmation card should stay
+        // as-is. Skip flushCard updates so the AI streaming output doesn't overwrite
+        // the confirmation state. The flag is cleared on session.idle.
+        if (session.interactionReplied) {
+            log.info({ chatId, targetMessageId: session.currentMessageId, done: opts.done }, 'flushCard skipped: interaction was handled via card');
+            return;
+        }
+        // Capture target message ID at the start so concurrent flushCard calls
+        // don't race against each other and update different messages.
+        const targetMessageId = session.currentMessageId;
         const content = session.currentContent || '';
-        const tools = this.showProcess ? (session.tools || []) : [];
+        const thinkingContent = this.shouldShowThinking() ? (session.thinkingContent || '') : '';
+        const tools = this.shouldShowTools() ? (session.tools || []) : [];
         const interaction = session.pendingInteraction;
+        log.info({ chatId, hasInteraction: !!interaction, interactionKind: interaction?.kind, targetMessageId, force: opts.force, done: opts.done }, 'flushCard');
         const card = FeishuCard.createStreamingCard({
             content,
+            thinkingContent,
             tools,
             done: !!opts.done,
             retry: session.retryMessage,
@@ -305,11 +440,18 @@ export class OpenCodeEventHandler {
             botName: this.botName,
             interaction,
         });
-        if (!session.currentMessageId) {
+        if (!targetMessageId) {
             try {
                 const message = await this.feishuApi.sendCard(chatId, card);
                 if (message && message.message_id) {
-                    this.sessionManager.setCurrentMessage(chatId, message.message_id);
+                    // Only set currentMessageId if it hasn't been set by another concurrent flushCard
+                    if (!session.currentMessageId) {
+                        this.sessionManager.setCurrentMessage(chatId, message.message_id);
+                        log.info({ chatId, messageId: message.message_id }, 'sendCard created new card');
+                    }
+                    else {
+                        log.info({ chatId, messageId: message.message_id, existingMessageId: session.currentMessageId }, 'sendCard created card but currentMessageId already set by concurrent flushCard');
+                    }
                 }
             }
             catch (err) {
@@ -319,12 +461,16 @@ export class OpenCodeEventHandler {
         }
         const now = Date.now();
         const lastUpdate = session.lastUpdateTime || 0;
-        if (!opts.force && now - lastUpdate <= UPDATE_THROTTLE_MS)
+        if (!opts.force && now - lastUpdate <= UPDATE_THROTTLE_MS) {
+            log.info({ chatId, targetMessageId, elapsed: now - lastUpdate }, 'flushCard throttled');
             return;
+        }
+        // Update timestamp immediately to prevent concurrent flushCard calls
+        // from all passing the throttle check while this one awaits updateCard.
+        session.lastUpdateTime = now;
         try {
-            await this.feishuApi.updateCard(session.currentMessageId, card);
-            // 只有在更新成功后才更新时间戳，避免失败时丢失后续更新
-            session.lastUpdateTime = now;
+            await this.feishuApi.updateCard(targetMessageId, card);
+            log.info({ chatId, targetMessageId }, 'updateCard success');
         }
         catch (err) {
             log.error({ err }, 'Failed to update card');