@poncho-ai/cli 0.32.2 → 0.32.4

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @poncho-ai/cli@0.32.2 build /home/runner/work/poncho-ai/poncho-ai/packages/cli
+> @poncho-ai/cli@0.32.4 build /home/runner/work/poncho-ai/poncho-ai/packages/cli
 > tsup src/index.ts src/cli.ts --format esm --dts
 
 CLI Building entry: src/cli.ts, src/index.ts
@@ -8,11 +8,11 @@
 CLI Target: es2022
 ESM Build start
 ESM dist/cli.js                          94.00 B
-ESM dist/run-interactive-ink-GD3IRICQ.js 56.86 KB
 ESM dist/index.js                        857.00 B
-ESM dist/chunk-TQRPRFR3.js               522.85 KB
-ESM ⚡️ Build success in 78ms
+ESM dist/run-interactive-ink-GPCI4L6G.js 56.86 KB
+ESM dist/chunk-F6NA3N2R.js               524.82 KB
+ESM ⚡️ Build success in 66ms
 DTS Build start
-DTS ⚡️ Build success in 4067ms
+DTS ⚡️ Build success in 4059ms
 DTS dist/cli.d.ts   20.00 B
 DTS dist/index.d.ts 4.16 KB

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @poncho-ai/cli
 
+## 0.32.4
+
+### Patch Changes
+
+- [#58](https://github.com/cesr/poncho-ai/pull/58) [`07aad37`](https://github.com/cesr/poncho-ai/commit/07aad371ae5152199347bab11ed5c6270086db2b) Thanks [@cesr](https://github.com/cesr)! - Fix messaging conversation consistency for Telegram and other adapter-backed channels.
+
+  This serializes per-conversation messaging runs to avoid stale concurrent context, refreshes latest conversation history before each run, and normalizes internal assistant tool-call payloads in API conversation responses for cleaner Web UI rendering.
+
+## 0.32.3
+
+### Patch Changes
+
+- Updated dependencies [[`28b2913`](https://github.com/cesr/poncho-ai/commit/28b291379e640dec53a66c41a2795d0a9fbb9ee7)]:
+  - @poncho-ai/harness@0.31.3
+
 ## 0.32.2
 
 ### Patch Changes

package/dist/{chunk-TQRPRFR3.js → chunk-F6NA3N2R.js}

@@ -7528,6 +7528,24 @@ var parseParams = (values) => {
   }
   return params;
 };
+var normalizeMessageForClient = (message) => {
+  if (message.role !== "assistant" || typeof message.content !== "string") {
+    return message;
+  }
+  try {
+    const parsed = JSON.parse(message.content);
+    const text = typeof parsed.text === "string" ? parsed.text : void 0;
+    const toolCalls = Array.isArray(parsed.tool_calls) ? parsed.tool_calls : void 0;
+    if (typeof text === "string" && toolCalls) {
+      return {
+        ...message,
+        content: text
+      };
+    }
+  } catch {
+  }
+  return message;
+};
 var AGENT_TEMPLATE = (name, id, options) => `---
 name: ${name}
 id: ${id}
@@ -9706,6 +9724,7 @@ ${resultBody}`,
     }
   };
   const messagingRoutes = /* @__PURE__ */ new Map();
+  const messagingRunQueues = /* @__PURE__ */ new Map();
   const messagingRouteRegistrar = (method, path, routeHandler) => {
     let byMethod = messagingRoutes.get(path);
     if (!byMethod) {
@@ -9748,245 +9767,265 @@ ${resultBody}`,
       return { messages: [] };
     },
     async run(conversationId, input2) {
-      const isContinuation = input2.task == null;
-      console.log("[messaging-runner] starting run for", conversationId, isContinuation ? "(continuation)" : `task: ${input2.task.slice(0, 80)}`);
-      const historyMessages = [...input2.messages];
-      const preRunMessages = [...input2.messages];
-      const userContent = input2.task;
-      const updateConversation = async (patch) => {
-        const fresh = await conversationStore.get(conversationId);
-        if (!fresh) return;
-        patch(fresh);
-        fresh.updatedAt = Date.now();
-        await conversationStore.update(fresh);
-      };
-      await updateConversation((c) => {
-        if (!isContinuation) {
-          c.messages = [...historyMessages, { role: "user", content: userContent }];
-        }
-        c.runStatus = "running";
+      const previous = messagingRunQueues.get(conversationId) ?? Promise.resolve();
+      let releaseQueue;
+      const current = new Promise((resolve4) => {
+        releaseQueue = resolve4;
       });
-      let latestRunId = "";
-      let assistantResponse = "";
-      const toolTimeline = [];
-      const sections = [];
-      let currentTools = [];
-      let currentText = "";
-      let checkpointedRun = false;
-      let runContextTokens = 0;
-      let runContextWindow = 0;
-      let runContinuation2 = false;
-      let runContinuationMessages;
-      let runSteps = 0;
-      let runMaxSteps;
-      const buildMessages = () => {
-        const draftSections = [
-          ...sections.map((s) => ({
-            type: s.type,
-            content: Array.isArray(s.content) ? [...s.content] : s.content
-          }))
-        ];
-        if (currentTools.length > 0) {
-          draftSections.push({ type: "tools", content: [...currentTools] });
-        }
-        if (currentText.length > 0) {
-          draftSections.push({ type: "text", content: currentText });
-        }
-        const userTurn = userContent != null ? [{ role: "user", content: userContent }] : [];
-        const hasDraftContent = assistantResponse.length > 0 || toolTimeline.length > 0 || draftSections.length > 0;
-        if (!hasDraftContent) {
-          return [...historyMessages, ...userTurn];
-        }
-        return [
-          ...historyMessages,
-          ...userTurn,
-          {
-            role: "assistant",
-            content: assistantResponse,
-            metadata: toolTimeline.length > 0 || draftSections.length > 0 ? {
-              toolActivity: [...toolTimeline],
-              sections: draftSections.length > 0 ? draftSections : void 0
-            } : void 0
-          }
-        ];
-      };
-      const persistDraftAssistantTurn = async () => {
-        if (assistantResponse.length === 0 && toolTimeline.length === 0) return;
-        await updateConversation((c) => {
-          c.messages = buildMessages();
-        });
-      };
-      const runInput = {
-        task: input2.task,
-        conversationId,
-        messages: input2.messages,
-        files: input2.files,
-        parameters: input2.metadata ? {
-          __messaging_platform: input2.metadata.platform,
-          __messaging_sender_id: input2.metadata.sender.id,
-          __messaging_sender_name: input2.metadata.sender.name ?? "",
-          __messaging_thread_id: input2.metadata.threadId
-        } : void 0
-      };
+      const chained = previous.then(() => current);
+      messagingRunQueues.set(conversationId, chained);
+      await previous;
       try {
-        for await (const event of harness.runWithTelemetry(runInput)) {
-          if (event.type === "run:started") {
-            latestRunId = event.runId;
-            runOwners.set(event.runId, "local-owner");
-            runConversations.set(event.runId, conversationId);
-          }
-          if (event.type === "model:chunk") {
-            if (currentTools.length > 0) {
-              sections.push({ type: "tools", content: currentTools });
-              currentTools = [];
-              if (assistantResponse.length > 0 && !/\s$/.test(assistantResponse)) {
-                assistantResponse += " ";
-              }
-            }
-            assistantResponse += event.content;
-            currentText += event.content;
-          }
-          if (event.type === "tool:started") {
-            if (currentText.length > 0) {
-              sections.push({ type: "text", content: currentText });
-              currentText = "";
-            }
-            const toolText = `- start \`${event.tool}\``;
-            toolTimeline.push(toolText);
-            currentTools.push(toolText);
+        const latestConversation = await conversationStore.get(conversationId);
+        const latestMessages = latestConversation ? latestConversation._harnessMessages?.length ? [...latestConversation._harnessMessages] : [...latestConversation.messages] : [...input2.messages];
+        const isContinuation = input2.task == null;
+        console.log("[messaging-runner] starting run for", conversationId, isContinuation ? "(continuation)" : `task: ${input2.task.slice(0, 80)}`);
+        const historyMessages = [...latestMessages];
+        const preRunMessages = [...latestMessages];
+        const userContent = input2.task;
+        const updateConversation = async (patch) => {
+          const fresh = await conversationStore.get(conversationId);
+          if (!fresh) return;
+          patch(fresh);
+          fresh.updatedAt = Date.now();
+          await conversationStore.update(fresh);
+        };
+        await updateConversation((c) => {
+          if (!isContinuation) {
+            c.messages = [...historyMessages, { role: "user", content: userContent }];
           }
-          if (event.type === "tool:completed") {
-            const toolText = `- done \`${event.tool}\` (${event.duration}ms)`;
-            toolTimeline.push(toolText);
-            currentTools.push(toolText);
+          c.runStatus = "running";
+        });
+        let latestRunId = "";
+        let assistantResponse = "";
+        const toolTimeline = [];
+        const sections = [];
+        let currentTools = [];
+        let currentText = "";
+        let checkpointedRun = false;
+        let runContextTokens = 0;
+        let runContextWindow = 0;
+        let runContinuation2 = false;
+        let runContinuationMessages;
+        let runSteps = 0;
+        let runMaxSteps;
+        const buildMessages = () => {
+          const draftSections = [
+            ...sections.map((s) => ({
+              type: s.type,
+              content: Array.isArray(s.content) ? [...s.content] : s.content
+            }))
+          ];
+          if (currentTools.length > 0) {
+            draftSections.push({ type: "tools", content: [...currentTools] });
           }
-          if (event.type === "tool:error") {
-            const toolText = `- error \`${event.tool}\`: ${event.error}`;
-            toolTimeline.push(toolText);
-            currentTools.push(toolText);
+          if (currentText.length > 0) {
+            draftSections.push({ type: "text", content: currentText });
           }
-          if (event.type === "step:completed") {
-            await persistDraftAssistantTurn();
+          const userTurn = userContent != null ? [{ role: "user", content: userContent }] : [];
+          const hasDraftContent = assistantResponse.length > 0 || toolTimeline.length > 0 || draftSections.length > 0;
+          if (!hasDraftContent) {
+            return [...historyMessages, ...userTurn];
           }
-          if (event.type === "tool:approval:required") {
-            const toolText = `- approval required \`${event.tool}\``;
-            toolTimeline.push(toolText);
-            currentTools.push(toolText);
-            await persistDraftAssistantTurn();
+          return [
+            ...historyMessages,
+            ...userTurn,
+            {
+              role: "assistant",
+              content: assistantResponse,
+              metadata: toolTimeline.length > 0 || draftSections.length > 0 ? {
+                toolActivity: [...toolTimeline],
+                sections: draftSections.length > 0 ? draftSections : void 0
+              } : void 0
+            }
+          ];
+        };
+        const persistDraftAssistantTurn = async () => {
+          if (assistantResponse.length === 0 && toolTimeline.length === 0) return;
+          await updateConversation((c) => {
+            c.messages = buildMessages();
+          });
+        };
+        const runInput = {
+          task: input2.task,
+          conversationId,
+          messages: historyMessages,
+          files: input2.files,
+          parameters: {
+            ...input2.metadata ? {
+              __messaging_platform: input2.metadata.platform,
+              __messaging_sender_id: input2.metadata.sender.id,
+              __messaging_sender_name: input2.metadata.sender.name ?? "",
+              __messaging_thread_id: input2.metadata.threadId
+            } : {},
+            __activeConversationId: conversationId
           }
-          if (event.type === "tool:approval:checkpoint") {
-            await updateConversation((c) => {
-              c.messages = buildMessages();
-              c.pendingApprovals = event.approvals.map((a) => ({
-                approvalId: a.approvalId,
-                runId: latestRunId,
-                tool: a.tool,
-                toolCallId: a.toolCallId,
-                input: a.input,
-                checkpointMessages: event.checkpointMessages,
-                baseMessageCount: historyMessages.length,
-                pendingToolCalls: event.pendingToolCalls
-              }));
-            });
-            checkpointedRun = true;
-            const conv = await conversationStore.get(conversationId);
-            if (conv?.channelMeta?.platform === "telegram") {
-              const tgAdapter = messagingAdapters.get("telegram");
-              if (tgAdapter) {
-                const approvals = event.approvals.map((a) => ({
+        };
+        try {
+          for await (const event of harness.runWithTelemetry(runInput)) {
+            if (event.type === "run:started") {
+              latestRunId = event.runId;
+              runOwners.set(event.runId, "local-owner");
+              runConversations.set(event.runId, conversationId);
+            }
+            if (event.type === "model:chunk") {
+              if (currentTools.length > 0) {
+                sections.push({ type: "tools", content: currentTools });
+                currentTools = [];
+                if (assistantResponse.length > 0 && !/\s$/.test(assistantResponse)) {
+                  assistantResponse += " ";
+                }
+              }
+              assistantResponse += event.content;
+              currentText += event.content;
+            }
+            if (event.type === "tool:started") {
+              if (currentText.length > 0) {
+                sections.push({ type: "text", content: currentText });
+                currentText = "";
+              }
+              const toolText = `- start \`${event.tool}\``;
+              toolTimeline.push(toolText);
+              currentTools.push(toolText);
+            }
+            if (event.type === "tool:completed") {
+              const toolText = `- done \`${event.tool}\` (${event.duration}ms)`;
+              toolTimeline.push(toolText);
+              currentTools.push(toolText);
+            }
+            if (event.type === "tool:error") {
+              const toolText = `- error \`${event.tool}\`: ${event.error}`;
+              toolTimeline.push(toolText);
+              currentTools.push(toolText);
+            }
+            if (event.type === "step:completed") {
+              await persistDraftAssistantTurn();
+            }
+            if (event.type === "tool:approval:required") {
+              const toolText = `- approval required \`${event.tool}\``;
+              toolTimeline.push(toolText);
+              currentTools.push(toolText);
+              await persistDraftAssistantTurn();
+            }
+            if (event.type === "tool:approval:checkpoint") {
+              await updateConversation((c) => {
+                c.messages = buildMessages();
+                c.pendingApprovals = event.approvals.map((a) => ({
                   approvalId: a.approvalId,
+                  runId: latestRunId,
                   tool: a.tool,
-                  input: a.input
+                  toolCallId: a.toolCallId,
+                  input: a.input,
+                  checkpointMessages: event.checkpointMessages,
+                  baseMessageCount: historyMessages.length,
+                  pendingToolCalls: event.pendingToolCalls
                 }));
-                void tgAdapter.sendApprovalRequest(
-                  conv.channelMeta.channelId,
-                  approvals
-                ).catch((err) => {
-                  console.error("[messaging-runner] failed to send Telegram approval request:", err instanceof Error ? err.message : err);
+              });
+              checkpointedRun = true;
+              const conv = await conversationStore.get(conversationId);
+              if (conv?.channelMeta?.platform === "telegram") {
+                const tgAdapter = messagingAdapters.get("telegram");
+                if (tgAdapter) {
+                  const approvals = event.approvals.map((a) => ({
+                    approvalId: a.approvalId,
+                    tool: a.tool,
+                    input: a.input
+                  }));
+                  void tgAdapter.sendApprovalRequest(
+                    conv.channelMeta.channelId,
+                    approvals
+                  ).catch((err) => {
+                    console.error("[messaging-runner] failed to send Telegram approval request:", err instanceof Error ? err.message : err);
+                  });
+                }
+              }
+            }
+            if (event.type === "compaction:completed") {
+              if (event.compactedMessages) {
+                historyMessages.length = 0;
+                historyMessages.push(...event.compactedMessages);
+                const preservedFromHistory = historyMessages.length - 1;
+                const removedCount = preRunMessages.length - Math.max(0, preservedFromHistory);
+                await updateConversation((c) => {
+                  const existingHistory = c.compactedHistory ?? [];
+                  c.compactedHistory = [
+                    ...existingHistory,
+                    ...preRunMessages.slice(0, removedCount)
+                  ];
                 });
               }
             }
-          }
-          if (event.type === "compaction:completed") {
-            if (event.compactedMessages) {
-              historyMessages.length = 0;
-              historyMessages.push(...event.compactedMessages);
-              const preservedFromHistory = historyMessages.length - 1;
-              const removedCount = preRunMessages.length - Math.max(0, preservedFromHistory);
-              await updateConversation((c) => {
-                const existingHistory = c.compactedHistory ?? [];
-                c.compactedHistory = [
-                  ...existingHistory,
-                  ...preRunMessages.slice(0, removedCount)
-                ];
-              });
+            if (event.type === "run:completed") {
+              if (assistantResponse.length === 0 && event.result.response) {
+                assistantResponse = event.result.response;
+              }
+              runContinuation2 = event.result.continuation === true;
+              if (event.result.continuationMessages) {
+                runContinuationMessages = event.result.continuationMessages;
+              }
+              runSteps = event.result.steps;
+              if (typeof event.result.maxSteps === "number") runMaxSteps = event.result.maxSteps;
+              runContextTokens = event.result.contextTokens ?? runContextTokens;
+              runContextWindow = event.result.contextWindow ?? runContextWindow;
+            }
+            if (event.type === "run:error") {
+              assistantResponse = assistantResponse || `[Error: ${event.error.message}]`;
             }
+            broadcastEvent(conversationId, event);
           }
-          if (event.type === "run:completed") {
-            if (assistantResponse.length === 0 && event.result.response) {
-              assistantResponse = event.result.response;
+        } catch (err) {
+          console.error("[messaging-runner] run failed:", err instanceof Error ? err.message : err);
+          assistantResponse = assistantResponse || `[Error: ${err instanceof Error ? err.message : "Unknown error"}]`;
+        }
+        if (currentTools.length > 0) {
+          sections.push({ type: "tools", content: currentTools });
+          currentTools = [];
+        }
+        if (currentText.length > 0) {
+          sections.push({ type: "text", content: currentText });
+          currentText = "";
+        }
+        if (!checkpointedRun) {
+          await updateConversation((c) => {
+            if (runContinuation2 && runContinuationMessages) {
+              c._continuationMessages = runContinuationMessages;
+            } else {
+              c._continuationMessages = void 0;
+              c.messages = buildMessages();
             }
-            runContinuation2 = event.result.continuation === true;
-            if (event.result.continuationMessages) {
-              runContinuationMessages = event.result.continuationMessages;
+            if (runContinuationMessages) {
+              c._harnessMessages = runContinuationMessages;
             }
-            runSteps = event.result.steps;
-            if (typeof event.result.maxSteps === "number") runMaxSteps = event.result.maxSteps;
-            runContextTokens = event.result.contextTokens ?? runContextTokens;
-            runContextWindow = event.result.contextWindow ?? runContextWindow;
-          }
-          if (event.type === "run:error") {
-            assistantResponse = assistantResponse || `[Error: ${event.error.message}]`;
-          }
-          broadcastEvent(conversationId, event);
+            c.runtimeRunId = latestRunId || c.runtimeRunId;
+            c.pendingApprovals = [];
+            c.runStatus = "idle";
+            if (runContextTokens > 0) c.contextTokens = runContextTokens;
+            if (runContextWindow > 0) c.contextWindow = runContextWindow;
+          });
+        } else {
+          await updateConversation((c) => {
+            c.runStatus = "idle";
+          });
+        }
+        finishConversationStream(conversationId);
+        if (latestRunId) {
+          runOwners.delete(latestRunId);
+          runConversations.delete(latestRunId);
+        }
+        console.log("[messaging-runner] run complete, response length:", assistantResponse.length, runContinuation2 ? "(continuation)" : "");
+        const response = assistantResponse;
+        return {
+          response,
+          continuation: runContinuation2,
+          steps: runSteps,
+          maxSteps: runMaxSteps
+        };
+      } finally {
+        releaseQueue?.();
+        if (messagingRunQueues.get(conversationId) === chained) {
+          messagingRunQueues.delete(conversationId);
         }
-      } catch (err) {
-        console.error("[messaging-runner] run failed:", err instanceof Error ? err.message : err);
-        assistantResponse = assistantResponse || `[Error: ${err instanceof Error ? err.message : "Unknown error"}]`;
-      }
-      if (currentTools.length > 0) {
-        sections.push({ type: "tools", content: currentTools });
-        currentTools = [];
-      }
-      if (currentText.length > 0) {
-        sections.push({ type: "text", content: currentText });
-        currentText = "";
-      }
-      if (!checkpointedRun) {
-        await updateConversation((c) => {
-          if (runContinuation2 && runContinuationMessages) {
-            c._continuationMessages = runContinuationMessages;
-          } else {
-            c._continuationMessages = void 0;
-            c.messages = buildMessages();
-          }
-          if (runContinuationMessages) {
-            c._harnessMessages = runContinuationMessages;
-          }
-          c.runtimeRunId = latestRunId || c.runtimeRunId;
-          c.pendingApprovals = [];
-          c.runStatus = "idle";
-          if (runContextTokens > 0) c.contextTokens = runContextTokens;
-          if (runContextWindow > 0) c.contextWindow = runContextWindow;
-        });
-      } else {
-        await updateConversation((c) => {
-          c.runStatus = "idle";
-        });
-      }
-      finishConversationStream(conversationId);
-      if (latestRunId) {
-        runOwners.delete(latestRunId);
-        runConversations.delete(latestRunId);
       }
-      console.log("[messaging-runner] run complete, response length:", assistantResponse.length, runContinuation2 ? "(continuation)" : "");
-      const response = assistantResponse;
-      return {
-        response,
-        continuation: runContinuation2,
-        steps: runSteps,
-        maxSteps: runMaxSteps
-      };
     }
   };
   let waitUntilHook;
@@ -11457,6 +11496,7 @@ data: ${JSON.stringify(frame)}
         writeJson(response, 200, {
           conversation: {
             ...conversation,
+            messages: conversation.messages.map(normalizeMessageForClient),
             pendingApprovals: storedPending,
             _continuationMessages: void 0,
             _harnessMessages: void 0
@@ -12920,7 +12960,7 @@ var runInteractive = async (workingDir, params) => {
   await harness.initialize();
   const identity = await ensureAgentIdentity2(workingDir);
   try {
-    const { runInteractiveInk } = await import("./run-interactive-ink-GD3IRICQ.js");
+    const { runInteractiveInk } = await import("./run-interactive-ink-GPCI4L6G.js");
     await runInteractiveInk({
       harness,
       params,

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   main
-} from "./chunk-TQRPRFR3.js";
+} from "./chunk-F6NA3N2R.js";
 
 // src/cli.ts
 void main();

package/dist/index.js

@@ -23,7 +23,7 @@ import {
   runTests,
   startDevServer,
   updateAgentGuidance
-} from "./chunk-TQRPRFR3.js";
+} from "./chunk-F6NA3N2R.js";
 export {
   addSkill,
   buildCli,

package/dist/{run-interactive-ink-GD3IRICQ.js → run-interactive-ink-GPCI4L6G.js}

@@ -2,7 +2,7 @@ import {
   consumeFirstRunIntro,
   inferConversationTitle,
   resolveHarnessEnvironment
-} from "./chunk-TQRPRFR3.js";
+} from "./chunk-F6NA3N2R.js";
 
 // src/run-interactive-ink.ts
 import * as readline from "readline";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poncho-ai/cli",
-  "version": "0.32.2",
+  "version": "0.32.4",
   "description": "CLI for building and deploying AI agents",
   "repository": {
     "type": "git",
@@ -27,9 +27,9 @@
     "react": "^19.2.4",
     "react-devtools-core": "^6.1.5",
     "yaml": "^2.8.1",
-    "@poncho-ai/harness": "0.31.2",
-    "@poncho-ai/messaging": "0.7.6",
-    "@poncho-ai/sdk": "1.7.1"
+    "@poncho-ai/harness": "0.31.3",
+    "@poncho-ai/sdk": "1.7.1",
+    "@poncho-ai/messaging": "0.7.6"
   },
   "devDependencies": {
     "@types/busboy": "^1.5.4",

package/src/index.ts

@@ -292,6 +292,26 @@ const parseParams = (values: string[]): Record<string, string> => {
   return params;
 };
 
+const normalizeMessageForClient = (message: Message): Message => {
+  if (message.role !== "assistant" || typeof message.content !== "string") {
+    return message;
+  }
+  try {
+    const parsed = JSON.parse(message.content) as Record<string, unknown>;
+    const text = typeof parsed.text === "string" ? parsed.text : undefined;
+    const toolCalls = Array.isArray(parsed.tool_calls) ? parsed.tool_calls : undefined;
+    if (typeof text === "string" && toolCalls) {
+      return {
+        ...message,
+        content: text,
+      };
+    }
+  } catch {
+    // Keep original assistant content when it's plain text or non-JSON.
+  }
+  return message;
+};
+
 const AGENT_TEMPLATE = (
   name: string,
   id: string,
@@ -2766,6 +2786,7 @@ export const createRequestHandler = async (options?: {
   // adapter handles its own request verification (e.g. Slack signing secret).
   // ---------------------------------------------------------------------------
   const messagingRoutes = new Map<string, Map<string, (req: IncomingMessage, res: ServerResponse) => Promise<void>>>();
+  const messagingRunQueues = new Map<string, Promise<void>>();
   const messagingRouteRegistrar: RouteRegistrar = (method, path, routeHandler) => {
     let byMethod = messagingRoutes.get(path);
     if (!byMethod) {
@@ -2811,12 +2832,28 @@ export const createRequestHandler = async (options?: {
       return { messages: [] };
     },
     async run(conversationId, input) {
-      const isContinuation = input.task == null;
-      console.log("[messaging-runner] starting run for", conversationId, isContinuation ? "(continuation)" : `task: ${input.task!.slice(0, 80)}`);
+      const previous = messagingRunQueues.get(conversationId) ?? Promise.resolve();
+      let releaseQueue: (() => void) | undefined;
+      const current = new Promise<void>((resolve) => {
+        releaseQueue = resolve;
+      });
+      const chained = previous.then(() => current);
+      messagingRunQueues.set(conversationId, chained);
+      await previous;
+      try {
+        const latestConversation = await conversationStore.get(conversationId);
+        const latestMessages = latestConversation
+          ? (latestConversation._harnessMessages?.length
+            ? [...latestConversation._harnessMessages]
+            : [...latestConversation.messages])
+          : [...input.messages];
 
-      const historyMessages = [...input.messages];
-      const preRunMessages = [...input.messages];
-      const userContent = input.task;
+        const isContinuation = input.task == null;
+        console.log("[messaging-runner] starting run for", conversationId, isContinuation ? "(continuation)" : `task: ${input.task!.slice(0, 80)}`);
+
+        const historyMessages = [...latestMessages];
+        const preRunMessages = [...latestMessages];
+        const userContent = input.task;
 
       // Read-modify-write helper: always fetches the latest version from
       // the store before writing, so concurrent writers don't get clobbered.
@@ -2899,14 +2936,17 @@ export const createRequestHandler = async (options?: {
       const runInput = {
         task: input.task,
         conversationId,
-        messages: input.messages,
+        messages: historyMessages,
         files: input.files,
-        parameters: input.metadata ? {
-          __messaging_platform: input.metadata.platform,
-          __messaging_sender_id: input.metadata.sender.id,
-          __messaging_sender_name: input.metadata.sender.name ?? "",
-          __messaging_thread_id: input.metadata.threadId,
-        } : undefined,
+        parameters: {
+          ...(input.metadata ? {
+            __messaging_platform: input.metadata.platform,
+            __messaging_sender_id: input.metadata.sender.id,
+            __messaging_sender_name: input.metadata.sender.name ?? "",
+            __messaging_thread_id: input.metadata.threadId,
+          } : {}),
+          __activeConversationId: conversationId,
+        },
       };
 
       try {
@@ -3067,15 +3107,21 @@ export const createRequestHandler = async (options?: {
         runConversations.delete(latestRunId);
       }
 
-      console.log("[messaging-runner] run complete, response length:", assistantResponse.length, runContinuation ? "(continuation)" : "");
-      const response = assistantResponse;
+        console.log("[messaging-runner] run complete, response length:", assistantResponse.length, runContinuation ? "(continuation)" : "");
+        const response = assistantResponse;
 
-      return {
-        response,
-        continuation: runContinuation,
-        steps: runSteps,
-        maxSteps: runMaxSteps,
-      };
+        return {
+          response,
+          continuation: runContinuation,
+          steps: runSteps,
+          maxSteps: runMaxSteps,
+        };
+      } finally {
+        releaseQueue?.();
+        if (messagingRunQueues.get(conversationId) === chained) {
+          messagingRunQueues.delete(conversationId);
+        }
+      }
     },
   };
 
@@ -4782,6 +4828,7 @@ export const createRequestHandler = async (options?: {
         writeJson(response, 200, {
           conversation: {
             ...conversation,
+            messages: conversation.messages.map(normalizeMessageForClient),
             pendingApprovals: storedPending,
             _continuationMessages: undefined,
             _harnessMessages: undefined,