@cremini/skillpack 1.2.12 → 1.2.13

package/dist/cli.js

@@ -4014,12 +4014,36 @@ var PackAgent = class {
     const run = async () => {
       cs.running = true;
       let turnHadVisibleOutput = false;
+      let sawAgentStart = false;
+      let sawAgentEnd = false;
       const runId = randomUUID4();
       let unsubscribe = () => void 0;
+      const waitForQueuedAgentEvents = async () => {
+        const maybeQueue = cs.session._agentEventQueue;
+        if (!maybeQueue || typeof maybeQueue.then !== "function") {
+          return;
+        }
+        try {
+          await maybeQueue;
+        } catch (error) {
+          log("[PackAgent] Waiting for queued agent events failed:", error);
+        }
+      };
       try {
-        cs.fileOutputCallbackRef.current = (event) => {
+        const forwardAgentEvent = (event) => {
+          if (event.type === "agent_start") {
+            sawAgentStart = true;
+          } else if (event.type === "agent_end") {
+            if (sawAgentEnd) {
+              return;
+            }
+            sawAgentEnd = true;
+          }
           onEvent(event);
         };
+        cs.fileOutputCallbackRef.current = (event) => {
+          forwardAgentEvent(event);
+        };
         cs.delegatedToolRunContextRef.current = {
           runId,
           channelId,
@@ -4031,7 +4055,7 @@ var PackAgent = class {
               log("\n=== [AGENT SESSION START] ===");
               log("System Prompt:\n", cs.session.systemPrompt);
               log("============================\n");
-              onEvent({ type: "agent_start" });
+              forwardAgentEvent({ type: "agent_start" });
               break;
             case "message_start":
               log(`
@@ -4039,7 +4063,7 @@ var PackAgent = class {
               if (event.message?.role === "user") {
                 log(JSON.stringify(event.message.content, null, 2));
               }
-              onEvent({
+              forwardAgentEvent({
                 type: "message_start",
                 role: event.message?.role ?? ""
               });
@@ -4048,13 +4072,13 @@ var PackAgent = class {
               if (event.assistantMessageEvent?.type === "text_delta") {
                 turnHadVisibleOutput = true;
                 write(event.assistantMessageEvent.delta);
-                onEvent({
+                forwardAgentEvent({
                   type: "text_delta",
                   delta: event.assistantMessageEvent.delta
                 });
               } else if (event.assistantMessageEvent?.type === "thinking_delta") {
                 turnHadVisibleOutput = true;
-                onEvent({
+                forwardAgentEvent({
                   type: "thinking_delta",
                   delta: event.assistantMessageEvent.delta
                 });
@@ -4074,14 +4098,17 @@ var PackAgent = class {
                   }
                 }
               }
-              onEvent({ type: "message_end", role: event.message?.role ?? "" });
+              forwardAgentEvent({
+                type: "message_end",
+                role: event.message?.role ?? ""
+              });
               break;
             case "tool_execution_start":
               turnHadVisibleOutput = true;
               log(`
 >>> [Tool Start: ${event.toolName}] >>>`);
               log("Args:", JSON.stringify(event.args, null, 2));
-              onEvent({
+              forwardAgentEvent({
                 type: "tool_start",
                 toolCallId: event.toolCallId ?? "",
                 toolName: event.toolName,
@@ -4092,7 +4119,7 @@ var PackAgent = class {
               turnHadVisibleOutput = true;
               log(`<<< [Tool End: ${event.toolName}] <<<`);
               log(`Error: ${event.isError ? "Yes" : "No"}`);
-              onEvent({
+              forwardAgentEvent({
                 type: "tool_end",
                 toolCallId: event.toolCallId ?? "",
                 toolName: event.toolName,
@@ -4102,7 +4129,7 @@ var PackAgent = class {
               break;
             case "agent_end":
               log("\n=== [AGENT SESSION END] ===\n");
-              onEvent({ type: "agent_end" });
+              forwardAgentEvent({ type: "agent_end" });
               break;
           }
         });
@@ -4149,6 +4176,12 @@ ${text}`;
         }
         return { stopReason: diagnostics?.stopReason ?? "unknown" };
       } finally {
+        await waitForQueuedAgentEvents();
+        if (sawAgentStart && !sawAgentEnd) {
+          sawAgentEnd = true;
+          log(`[PackAgent] Synthesizing terminal agent_end for ${channelId}`);
+          onEvent({ type: "agent_end" });
+        }
         cs.running = false;
         cs.fileOutputCallbackRef.current = null;
         cs.delegatedToolRunContextRef.current = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cremini/skillpack",
-  "version": "1.2.12",
+  "version": "1.2.13",
   "description": "Pack AI Skills into Local Agents",
   "type": "module",
   "repository": {