Fix task completion events

Author: cte

package-lock.json

@@ -3202,6 +3202,9 @@ export class Cline extends EventEmitter<ClineEvents> {
 											false,
 										)
 
+										telemetryService.captureTaskCompleted(this.taskId)
+										this.emit("taskCompleted", this.taskId, this.getTokenUsage())
+
 										await this.ask(
 											"command",
 											removeClosingTag("command", command),
@@ -3233,9 +3236,10 @@ export class Cline extends EventEmitter<ClineEvents> {
 
 								if (command) {
 									if (lastMessage && lastMessage.ask !== "command") {
-										// Haven't sent a command message yet so
-										// first send completion_result then command.
+										// Haven't sent a command message yet so first send completion_result then command.
 										await this.say("completion_result", result, undefined, false)
+										telemetryService.captureTaskCompleted(this.taskId)
+										this.emit("taskCompleted", this.taskId, this.getTokenUsage())
 									}
 
 									// Complete command message.
@@ -3257,11 +3261,10 @@ export class Cline extends EventEmitter<ClineEvents> {
 									commandResult = execCommandResult
 								} else {
 									await this.say("completion_result", result, undefined, false)
+									telemetryService.captureTaskCompleted(this.taskId)
+									this.emit("taskCompleted", this.taskId, this.getTokenUsage())
 								}
 
-								telemetryService.captureTaskCompleted(this.taskId)
-								this.emit("taskCompleted", this.taskId, this.getTokenUsage())
-
 								if (this.parentTask) {
 									const didApprove = await askFinishSubTaskApproval()
 

src/core/Cline.ts

@@ -27,15 +27,13 @@ export class API extends EventEmitter<RooCodeEvents> implements RooCodeAPI {
 			cline.on("taskUnpaused", () => this.emit("taskUnpaused", cline.taskId))
 			cline.on("taskAskResponded", () => this.emit("taskAskResponded", cline.taskId))
 			cline.on("taskAborted", () => this.emit("taskAborted", cline.taskId))
-			cline.on("taskSpawned", (taskId) => this.emit("taskSpawned", cline.taskId, taskId))
+			cline.on("taskSpawned", (childTaskId) => this.emit("taskSpawned", cline.taskId, childTaskId))
+			cline.on("taskCompleted", (_, usage) => this.emit("taskCompleted", cline.taskId, usage))
+			cline.on("taskTokenUsageUpdated", (_, usage) => this.emit("taskTokenUsageUpdated", cline.taskId, usage))
 			this.emit("taskCreated", cline.taskId)
 		})
 
 		this.on("message", ({ taskId, action, message }) => {
-			// if (message.type === "say") {
-			// 	console.log("message", { taskId, action, message })
-			// }
-
 			if (action === "created") {
 				this.history.add(taskId, message)
 			} else if (action === "updated") {