The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
[Metabot] Backend driven conversation state (#76939)
Sloan Spargerbf26412ac56f
diff --git a/e2e/test/scenarios/metabot/native-sql-generation.cy.spec.ts b/e2e/test/scenarios/metabot/native-sql-generation.cy.spec.tsindex b38b8349671..c4c15e27fdf 100644--- a/e2e/test/scenarios/metabot/native-sql-generation.cy.spec.ts+++ b/e2e/test/scenarios/metabot/native-sql-generation.cy.spec.ts@@ -166,7 +166,7 @@ describe("Native SQL generation", () => {});generateButton().click();cy.wait("@metabotAgent").then(({ request }) => {- expect(request.body.history).to.have.length.greaterThan(0);+ expect(request.body.parent_message_id).to.be.a("string");expect(request.body.message).to.include("User rejected the following suggestion:\n\nSELECT * FROM users",);@@ -180,7 +180,7 @@ describe("Native SQL generation", () => {H.NativeEditor.selectDataSource("QA Postgres12");inlinePrompt().should("be.visible");- // send a prompt, req.body.history should be empty+ // changing the database starts a fresh conversation, so there's no parentinlinePromptInput().click();cy.realType("select something", { pressDelay: 10 });H.mockMetabotResponse({@@ -188,7 +188,7 @@ describe("Native SQL generation", () => {});generateButton().click();cy.wait("@metabotAgent").then(({ request }) => {- expect(request.body.history).to.have.length(0);+ expect(request.body.parent_message_id).to.be.undefined;});// should get a valid response back@@ -208,7 +208,7 @@ describe("Native SQL generation", () => {});generateButton().click();cy.wait("@metabotAgent").then(({ request }) => {- expect(request.body.history).to.have.length(0);+ expect(request.body.parent_message_id).to.be.undefined;});acceptButton().should("be.visible");diff --git a/enterprise/backend/src/metabase_enterprise/metabot/tools/transforms/write.clj b/enterprise/backend/src/metabase_enterprise/metabot/tools/transforms/write.cljindex a39df49633a..a1af51e7d70 100644--- a/enterprise/backend/src/metabase_enterprise/metabot/tools/transforms/write.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot/tools/transforms/write.clj@@ -2,6 +2,7 @@"Tools for writing/editing Python transform source code."(:require[metabase-enterprise.transforms-python.api :as transforms-python.api]+ [metabase.metabot.agent.memory :as memory][metabase.metabot.agent.streaming :as streaming][metabase.metabot.tools.transforms.write :as transforms-write][metabase.metabot.tools.util :as metabot.tools.u]@@ -78,7 +79,7 @@true (assoc-in [:source :body] new-python))];; Store in memory if we have an ID(when (and transform_id memory-atom)- (swap! memory-atom assoc-in [:state :transforms (str transform_id)] suggested-transform))+ (swap! memory-atom memory/set-transform transform_id suggested-transform))(log/debug "Python transform written" {:transform-id transform_id:python-length (count new-python)}){:structured-output {:transform suggested-transformdiff --git a/enterprise/backend/src/metabase_enterprise/metabot_analytics/api.clj b/enterprise/backend/src/metabase_enterprise/metabot_analytics/api.cljindex d1065b15d53..45588b65a54 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_analytics/api.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_analytics/api.clj@@ -98,6 +98,13 @@[:created_at ms/TemporalInstant][:updated_at ms/TemporalInstant]])+(def ^:private ConversationMessage+ [:map+ [:id :string]+ [:parent_message_id [:maybe :string]]+ [:role [:enum "user" "agent"]]+ [:type :string]])+(def ^:private ConversationDetail"Schema for full conversation detail response."[:map@@ -109,7 +116,7 @@[:total_tokens ms/IntGreaterThanOrEqualToZero][:profile_id [:maybe :string]][:slack_permalink [:maybe :string]]- [:chat_messages [:sequential :map]]+ [:messages [:sequential ConversationMessage]][:queries [:sequential GeneratedQuery]][:search_count ms/IntGreaterThanOrEqualToZero][:query_count ms/IntGreaterThanOrEqualToZero]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_analytics/conversations.clj b/enterprise/backend/src/metabase_enterprise/metabot_analytics/conversations.cljindex a31684cdc9d..600b328dc46 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_analytics/conversations.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_analytics/conversations.clj@@ -84,24 +84,18 @@"ip_address" [:c.ip_address]})(def ^:private list-query- "HoneySQL query that selects one row per conversation with the aggregate- message stats the frontend needs. Filters, sorting, and paging are applied- by [[list-conversations]]."+ "Conversation rows with aggregate stats, including deleted attempts."{:select [:c.*[[:count :m.id] :message_count][[:count [:case [:= :m.role "user"] 1]] :user_message_count][[:count [:case [:= :m.role "assistant"] 1]] :assistant_message_count][[:coalesce [:sum :m.total_tokens] 0] :total_tokens][[:max :m.created_at] :last_message_at]- ;; First assistant message's profile_id, matching the- ;; `v_metabot_conversations` analytics view. User messages carry- ;; a placeholder `profile_id` and are excluded.[{:select [:mm.profile_id]:from [[:metabot_message :mm]]:where [:and[:= :mm.conversation_id :c.id]- [:= :mm.role "assistant"]- [:= :mm.deleted_at nil]]+ [:= :mm.role "assistant"]]:order-by [[:mm.created_at :asc] [:mm.id :asc]]:limit 1}:profile_id]@@ -117,9 +111,7 @@0]:cache_read_tokens]]:from [[:metabot_conversation :c]]- :left-join [[:metabot_message :m] [:and- [:= :m.conversation_id :c.id]- [:= :m.deleted_at nil]]+ :left-join [[:metabot_message :m] [:= :m.conversation_id :c.id][:core_user :u] [:= :u.id :c.user_id]]:group-by [:c.id]})@@ -156,8 +148,7 @@(let [conversation-ids (map :id rows)messages-by-conv (when (seq conversation-ids)(->> (t2/select [:model/MetabotMessage :conversation_id :data :data_version]- :conversation_id [:in conversation-ids]- {:where [:= :deleted_at nil]})+ :conversation_id [:in conversation-ids])(group-by :conversation_id)))](map (fn [row](let [msgs (get messages-by-conv (:id row) [])]@@ -230,31 +221,28 @@(t2/hydrate rows :user)))(defn fetch-conversation-detail- "Fetch a conversation with its user info, the frontend-ready flattened- chat messages, the queries the bot generated, and any user-submitted feedback.- 404s via `api/check-404` if no conversation matches `conversation-id`."+ "Fetch a conversation detail or throw a 404."[conversation-id](let [conversation (t2/select-one :model/MetabotConversation :id conversation-id)](api/check-404 conversation)- (let [messages (t2/select :model/MetabotMessage- :conversation_id conversation-id- {:where [:= :deleted_at nil]- :order-by [[:created_at :asc] [:id :asc]]})- hydrated (t2/hydrate conversation :user)]+ (let [all-messages (t2/select :model/MetabotMessage+ :conversation_id conversation-id+ {:order-by [[:created_at :asc] [:id :asc]]})+ hydrated (t2/hydrate conversation :user)]{:conversation_id (:id conversation):created_at (:created_at conversation):summary (:summary conversation):user (trim-user (:user hydrated))- :message_count (count messages)- :total_tokens (transduce (keep :total_tokens) + 0 messages)- :profile_id (some #(when (= :assistant (:role %)) (:profile_id %)) messages)+ :message_count (count all-messages)+ :total_tokens (transduce (keep :total_tokens) + 0 all-messages)+ :profile_id (some #(when (= :assistant (:role %)) (:profile_id %)) all-messages):slack_permalink (slack-permalink conversation)- :chat_messages (metabot-persistence/messages->chat-messages- messages {:include-errored? true})- :queries (analytics.queries/messages->generated-queries messages)- :search_count (analytics.queries/count-tool-invocations messages "search")+ :messages (metabot-persistence/messages->flat-messages+ all-messages {:include-rewound-errors? true})+ :queries (analytics.queries/messages->generated-queries all-messages)+ :search_count (analytics.queries/count-tool-invocations all-messages "search"):query_count (analytics.queries/count-tool-invocations- messages metabot.tools/query-generation-tool-names)+ all-messages metabot.tools/query-generation-tool-names):ip_address (:ip_address conversation):embedding_hostname (:embedding_hostname conversation):embedding_path (:embedding_path conversation)diff --git a/enterprise/backend/test/metabase_enterprise/internal_stats/metabot_test.clj b/enterprise/backend/test/metabase_enterprise/internal_stats/metabot_test.cljindex b519173a711..9090449400b 100644--- a/enterprise/backend/test/metabase_enterprise/internal_stats/metabot_test.clj+++ b/enterprise/backend/test/metabase_enterprise/internal_stats/metabot_test.clj@@ -39,9 +39,7 @@(mt/user-http-request :rasta :post 202 "metabot/agent-streaming"{:message message:context {}- :conversation_id conversation-id- :history []- :state {}}))))+ :conversation_id conversation-id}))))(defn- backdate-messages!"Update created_at on all messages and usage log rows for a conversation to the given timestamp."diff --git a/enterprise/backend/test/metabase_enterprise/metabot_analytics/api_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_analytics/api_test.cljindex 0d3d2800ab7..a412b7d48fc 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_analytics/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/metabot_analytics/api_test.clj@@ -9,20 +9,21 @@(set! *warn-on-reflection* true)(defn- insert-conversation!- [{:keys [conversation-id user-id created-at summary state slack-team-id slack-channel-id slack-thread-ts ip-address]}]+ [{:keys [conversation-id user-id created-at summary slack-team-id slack-channel-id slack-thread-ts ip-address]}](t2/insert! :model/MetabotConversation(cond-> {:id conversation-id:user_id user-id}created-at (assoc :created_at created-at)summary (assoc :summary summary)- state (assoc :state state)slack-team-id (assoc :slack_team_id slack-team-id)slack-channel-id (assoc :slack_channel_id slack-channel-id)slack-thread-ts (assoc :slack_thread_ts slack-thread-ts)ip-address (assoc :ip_address ip-address))))(defn- insert-message!- [{:keys [conversation-id created-at role profile-id total-tokens data data-version deleted-at]+ [{:keys [conversation-id created-at role profile-id total-tokens data data-version+ deleted-at external-id finished]+ :as options:or {data-version 2}}](first (t2/insert-returning-pks!:model/MetabotMessage@@ -32,9 +33,10 @@:total_tokens total-tokens:data data:data_version data-version- :external_id (str (random-uuid))}- created-at (assoc :created_at created-at)- deleted-at (assoc :deleted_at deleted-at)))))+ :external_id (or external-id (str (random-uuid)))}+ created-at (assoc :created_at created-at)+ deleted-at (assoc :deleted_at deleted-at)+ (contains? options :finished) (assoc :finished finished)))))(defn- insert-usage!"Insert an `ai_usage_log` row for a conversation. `cache-read-tokens` may be@@ -50,8 +52,6 @@cache-read-tokens (assoc :cache_read_tokens cache-read-tokens))))(defn- delete-conversations!- "Delete seeded conversations and their `ai_usage_log` rows (no FK links the- two tables, so usage rows must be removed explicitly)."[conversation-ids](t2/delete! :model/AiUsageLog {:where [:in :conversation_id (vec conversation-ids)]})(t2/delete! :model/MetabotConversation {:where [:in :id (vec conversation-ids)]}))@@ -94,8 +94,7 @@(insert-conversation! {:conversation-id convo-1:user-id test-user-id:created-at jan-1- :summary "First conversation"- :state {:step "one"}})+ :summary "First conversation"})(insert-conversation! {:conversation-id convo-2:user-id test-user-id:created-at jan-2@@ -173,11 +172,12 @@(is (= 50 (:limit response)))(is (= 0 (:offset response)))(is (= [convo-3 convo-2 convo-1] conversation-ids))- (is (nil? (:profile_id convo-3-response)))- (is (= 0 (:message_count convo-3-response)))- (is (= 0 (:assistant_message_count convo-3-response)))- (is (= 0 (:total_tokens convo-3-response)))- (is (= 0 (:cache_read_tokens convo-3-response)))+ (testing "a soft-deleted / regenerated agent response still counts as spend"+ (is (= "deleted-model" (:profile_id convo-3-response)))+ (is (= 1 (:message_count convo-3-response)))+ (is (= 1 (:assistant_message_count convo-3-response)))+ (is (= 99 (:total_tokens convo-3-response)))+ (is (= 0 (:cache_read_tokens convo-3-response))))(is (= {:conversation_id convo-1:summary "First conversation":message_count 2@@ -205,6 +205,53 @@:assistant_message_count :total_tokens :cache_read_tokens:profile_id])))))))+(deftest list-and-detail-agree-for-regenerated-conversation-test+ (mt/with-premium-features #{:audit-app}+ (testing "the list summary and detail report the same counts for a regenerated conversation"+ (mt/with-temp [:model/User {owner-id :id} {}]+ (let [conversation-id (str (random-uuid))+ day #(offset-date-time (format "2026-01-0%dT00:00:00Z" %))+ insert! #(insert-message! (assoc % :conversation-id conversation-id))]+ (try+ (insert-conversation! {:conversation-id conversation-id+ :user-id owner-id+ :created-at (day 1)+ :summary "Regeneration parity"})+ (insert! {:created-at (day 1)+ :role "user"+ :profile-id "ignored-user-profile"+ :total-tokens 2+ :data [{:type "text" :text "find orders"}]})+ (insert! {:created-at (day 2)+ :role "assistant"+ :profile-id "internal"+ :total-tokens 10+ :deleted-at (day 3)+ :data [{:type "text" :text "first"}+ {:type "tool-search"+ :toolCallId "s1"+ :state "output-available"+ :input {}+ :output {:output "results"}}]})+ (insert! {:created-at (day 3)+ :role "assistant"+ :profile-id "internal"+ :total-tokens 20+ :data [{:type "text" :text "kept"}]})+ (let [summary (find-conversation+ (:data (mt/user-http-request :crowberto :get 200+ (str "ee/metabot-analytics/conversations?user_id=" owner-id)))+ conversation-id)+ detail (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations/%s" conversation-id))]+ (is (some? summary))+ (doseq [k [:message_count :total_tokens :search_count :query_count]]+ (is (= (get detail k) (get summary k))))+ (is (= [3 32 1]+ ((juxt :message_count :total_tokens :search_count) detail))))+ (finally+ (delete-conversations! [conversation-id]))))))))+(deftest list-conversations-pagination-test(with-list-conversations-fixture!(fn [{:keys [response-path convo-2]}]@@ -411,8 +458,7 @@(insert-conversation! {:conversation-id conversation-id:user-id user-id:created-at jan-1- :summary "Conversation detail"- :state {:foo "bar"}})+ :summary "Conversation detail"})(insert-message! {:conversation-id conversation-id:created-at jan-1:role "user"@@ -437,14 +483,132 @@(is (nil? (:slack_permalink response)))(is (= "internal" (:profile_id response))"profile_id comes from the first assistant message, ignoring user-message placeholders")- (is (= 2 (count (:chat_messages response))))+ (is (= 2 (:message_count response)))(is (= [] (:feedback response)))- (let [{:keys [role type externalId]} (last (:chat_messages response))]- (is (= ["agent" "text"] [role type]))- (is (string? externalId))))+ (is (= 2 (count (:messages response)))+ "one user prompt + one assistant reply, as flat single-level chat messages")+ (let [[user-msg asst-msg] (:messages response)]+ (is (= ["user" "text" "hello"] [(:role user-msg) (:type user-msg) (:message user-msg)]))+ (is (nil? (:parent_message_id user-msg)) "the root prompt has no parent")+ (is (not (contains? asst-msg :kept))+ "no :kept on the wire; the client derives the current path from sibling order")+ (is (= ["agent" "text"] [(:role asst-msg) (:type asst-msg)]))+ (is (= (:id user-msg) (:parent_message_id asst-msg))+ "the reply points at its prompt's message id")+ (is (string? (:externalId asst-msg)) "the agent message keeps its feedback external id")))(finally(delete-conversations! [conversation-id])))))))+(defn- with-detail-conversation!+ [thunk]+ (mt/with-premium-features #{:audit-app}+ (let [conversation-id (str (random-uuid))+ user-id (mt/user->id :crowberto)+ day #(offset-date-time (format "2026-01-0%dT00:00:00Z" %))+ insert! #(insert-message! (assoc % :conversation-id conversation-id))+ fetch #(mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations/%s" conversation-id))]+ (try+ (insert-conversation! {:conversation-id conversation-id :user-id user-id :created-at (day 1)})+ (thunk {:user-id user-id :day day :insert! insert! :fetch fetch})+ (finally+ (delete-conversations! [conversation-id]))))))++(defn- message-by-text+ [messages text]+ (or (some #(when (= text (:message %)) %) messages)+ (throw (ex-info (str "Message not found: " text) {:text text}))))++(deftest get-conversation-detail-attempts-test+ (testing "a prompt's regenerated attempts surface as flat, chronologically ordered sibling messages"+ (with-detail-conversation!+ (fn [{:keys [insert! day fetch]}]+ (insert! {:created-at (day 1) :role "user" :profile-id "p" :total-tokens 2+ :data [{:type "text" :text "count the orders"}]})+ (insert! {:created-at (day 2) :role "assistant" :profile-id "internal" :total-tokens 10+ :deleted-at (day 4) :data [{:type "text" :text "first try"}]})+ (insert! {:created-at (day 3) :role "assistant" :profile-id "internal" :total-tokens 20+ :deleted-at (day 4) :data [{:type "text" :text "second try"}]})+ (insert! {:created-at (day 4) :role "assistant" :profile-id "internal" :total-tokens 30+ :data [{:type "text" :text "kept answer"}]})+ (let [{:keys [messages total_tokens message_count]} (fetch)+ [prompt & attempts] messages]+ (is (= ["first try" "second try" "kept answer"] (map :message attempts)))+ (is (every? #(= (:id prompt) (:parent_message_id %)) attempts))+ (is (= [62 4] [total_tokens message_count])))))))++(deftest get-conversation-detail-parent-pointers-test+ (testing "a follow-up prompt points at the kept (live) reply, not a regenerated-away one"+ (with-detail-conversation!+ (fn [{:keys [insert! day fetch]}]+ (insert! {:created-at (day 1) :role "user" :profile-id "p" :total-tokens 1+ :data [{:type "text" :text "q1"}]})+ (insert! {:created-at (day 2) :role "assistant" :profile-id "internal" :total-tokens 1+ :deleted-at (day 3) :data [{:type "text" :text "discarded"}]})+ (insert! {:created-at (day 3) :role "assistant" :profile-id "internal" :total-tokens 1+ :data [{:type "text" :text "kept"}]})+ (insert! {:created-at (day 4) :role "user" :profile-id "p" :total-tokens 1+ :data [{:type "text" :text "q2"}]})+ (insert! {:created-at (day 5) :role "assistant" :profile-id "internal" :total-tokens 1+ :data [{:type "text" :text "a2"}]})+ (let [messages (:messages (fetch))+ q1 (message-by-text messages "q1")+ kept (message-by-text messages "kept")+ q2 (message-by-text messages "q2")]+ (is (nil? (:parent_message_id q1)))+ (is (= (:id q1) (:parent_message_id kept)))+ (is (= (:id kept) (:parent_message_id q2))))))))++(deftest get-conversation-detail-turn-with-no-live-reply-test+ (testing "a turn whose only reply was soft-deleted still keeps the following turn on the path"+ (with-detail-conversation!+ (fn [{:keys [insert! day fetch]}]+ (insert! {:created-at (day 1) :role "user" :profile-id "p" :total-tokens 1+ :data [{:type "text" :text "q1"}]})+ (insert! {:created-at (day 2) :role "assistant" :profile-id "internal" :total-tokens 1+ :deleted-at (day 3) :data [{:type "text" :text "orphaned"}]})+ (insert! {:created-at (day 4) :role "user" :profile-id "p" :total-tokens 1+ :data [{:type "text" :text "q2"}]})+ (insert! {:created-at (day 5) :role "assistant" :profile-id "internal" :total-tokens 1+ :data [{:type "text" :text "a2"}]})+ (let [messages (:messages (fetch))+ q1 (message-by-text messages "q1")+ q2 (message-by-text messages "q2")]+ (is (= (:id q1) (:parent_message_id q2))))))))++(deftest get-conversation-detail-in-flight-attempt-test+ (testing "a still-streaming reply surfaces as an in-progress message"+ (with-detail-conversation!+ (fn [{:keys [insert! fetch]}]+ (insert! {:role "user" :profile-id "p" :total-tokens 3+ :data [{:type "text" :text "still thinking?"}]})+ (insert! {:role "assistant" :profile-id "internal" :total-tokens 0 :data [] :finished nil})+ (let [{:keys [messages message_count]} (fetch)]+ (is (= ["user" "agent"] (map :role messages)))+ (is (= "turn_in_progress" (:type (second messages))))+ (is (= 2 message_count)))))))++(deftest get-conversation-detail-feedback-on-discarded-attempt-test+ (testing "feedback on a regenerated-away attempt still resolves to that attempt's message"+ (with-detail-conversation!+ (fn [{:keys [insert! day user-id fetch]}]+ (let [discarded-ext (str (random-uuid))]+ (insert! {:created-at (day 1) :role "user" :profile-id "p" :total-tokens 2+ :data [{:type "text" :text "help"}]})+ (let [discarded-id (insert! {:created-at (day 2) :role "assistant" :profile-id "internal"+ :total-tokens 10 :deleted-at (day 3) :external-id discarded-ext+ :data [{:type "text" :text "thumbs-downed answer"}]})]+ (insert! {:created-at (day 3) :role "assistant" :profile-id "internal" :total-tokens 20+ :data [{:type "text" :text "kept answer"}]})+ (insert-feedback! {:message-id discarded-id :user-id user-id :positive false+ :issue-type "incorrect" :freeform "wrong table"+ :created-at (day 2) :updated-at (day 2)})+ (let [{:keys [feedback messages]} (fetch)+ attempt-exts (into #{} (keep :externalId) messages)]+ (is (= 1 (count feedback)))+ (is (= discarded-ext (:external_id (first feedback))))+ (is (contains? attempt-exts discarded-ext)))))))))+(deftest get-conversation-detail-queries-test(mt/with-premium-features #{:audit-app}(testing "GET /api/ee/metabot-analytics/conversations/:id returns generated queries"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_conversations_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_conversations_test.cljindex 5e2edabbda8..937cce72efb 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_conversations_test.clj+++ b/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_conversations_test.clj@@ -195,8 +195,8 @@:profile_id "nlq"}r3)))))))-(deftest deleted-messages-excluded-test- (testing "soft-deleted messages are excluded from counts"+(deftest deleted-messages-included-test+ (testing "soft-deleted messages are included in counts"(let [convo-id (str (random-uuid))now (java.time.OffsetDateTime/now)earlier (.minusHours now 1)]@@ -205,9 +205,9 @@:model/MetabotMessage _ {:conversation_id convo-id :role "user" :profile_id "nlq" :total_tokens 0 :data [] :created_at earlier}:model/MetabotMessage _ {:conversation_id convo-id :role "assistant" :profile_id "nlq" :total_tokens 0 :data [] :created_at now}:model/MetabotMessage _ {:conversation_id convo-id :role "assistant" :profile_id "nlq" :total_tokens 0 :data [] :deleted_at now}]- (is (=? {:message_count 2+ (is (=? {:message_count 3:user_message_count 1- :assistant_message_count 1}+ :assistant_message_count 2}(first (query-view [convo-id]))))))))(deftest user-display-name-test@@ -343,7 +343,7 @@(is (nil? (:last_message_at row))))))))(deftest last-message-at-test- (testing "last_message_at reflects the most recent non-deleted message"+ (testing "last_message_at reflects the most recent message"(let [convo-id (str (random-uuid))t1 (java.time.OffsetDateTime/parse "2026-01-01T12:00:00Z")t2-ts (java.time.OffsetDateTime/parse "2026-01-02T12:00:00Z")@@ -352,11 +352,10 @@:model/MetabotConversation _ {:id convo-id :user_id user-id}:model/MetabotMessage _ {:conversation_id convo-id :role "user" :profile_id "nlq" :total_tokens 0 :data [] :created_at t1}:model/MetabotMessage _ {:conversation_id convo-id :role "assistant" :profile_id "nlq" :total_tokens 0 :data [] :created_at t2-ts}- ;; newest message is deleted — should not count:model/MetabotMessage _ {:conversation_id convo-id :role "assistant" :profile_id "nlq" :total_tokens 0 :data [] :created_at t3 :deleted_at t3}](let [row (first (query-view [convo-id]))];; Compare instants to avoid DB-specific timestamp type differences- (is (= (t/instant t2-ts) (t/instant (:last_message_at row)))))))))+ (is (= (t/instant t3) (t/instant (:last_message_at row)))))))))(deftest multiple-conversations-independent-test(testing "multiple conversations aggregate independently"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_messages_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_messages_test.cljindex c84a14f3514..1f276677b4b 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_messages_test.clj+++ b/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_messages_test.clj@@ -43,8 +43,8 @@row))(is (some? (:created_at row))))))))-(deftest deleted-messages-excluded-test- (testing "soft-deleted messages (deleted_at IS NOT NULL) are filtered out of the view"+(deftest deleted-messages-included-test+ (testing "soft-deleted messages are returned by the view"(let [convo-id (str (random-uuid))now (java.time.OffsetDateTime/now)](mt/with-temp [:model/User {user-id :id} {}@@ -61,9 +61,9 @@:data []:deleted_at now}](let [rows (query-view [convo-id])]- (is (= 1 (count rows)))+ (is (= 2 (count rows)))(is (some? (find-row rows kept-id)))- (is (nil? (find-row rows deleted-id))))))))+ (is (some? (find-row rows deleted-id))))))))(deftest user-id-coalesces-to-conversation-owner-test(testing "user_id falls back to metabot_conversation.user_id when metabot_message.user_id is null"diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsxindex 976707e4b41..4fba7b48b4e 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx@@ -11,6 +11,7 @@ import {Messages,} from "metabase/metabot/components/MetabotChat/MetabotChatMessage";import { getIssueTypeLabel } from "metabase/metabot/components/MetabotChat/feedback-issue-types";+import { useBranchableMessages } from "metabase/metabot/hooks";import type {MetabotAgentTextChatMessage,MetabotChatMessage,@@ -56,13 +57,24 @@ export function ConversationDetailPage({ params }: WithRouterProps) {refetchOnMountOrArgChange: true,});- const chatMessages = useMemo(() => {- return normalizeFetchedChatMessages(conversation?.chat_messages ?? [], {- isSlack:- conversation?.profile_id === "slackbot" ||- conversation?.profile_id === "slack",- });- }, [conversation]);+ const isSlack =+ conversation?.profile_id === "slackbot" ||+ conversation?.profile_id === "slack";++ const conversationMessages = useMemo(+ () => conversation?.messages ?? [],+ [conversation?.messages],+ );++ const { messages, getExtraActions } = useBranchableMessages(+ conversationMessages,+ { isSlack },+ );++ const feedbackChatMessages = normalizeFetchedChatMessages(+ conversationMessages,+ { isSlack },+ );if (isLoading || error) {return (@@ -108,7 +120,7 @@ export function ConversationDetailPage({ params }: WithRouterProps) {<FeedbackCardkey={item.id}feedback={item}- chatMessages={chatMessages}+ chatMessages={feedbackChatMessages}/>))}</Stack>@@ -126,7 +138,8 @@ export function ConversationDetailPage({ params }: WithRouterProps) {</Flex><Card withBorder shadow="none" p="xl"><Messages- messages={chatMessages}+ messages={messages}+ getExtraActions={getExtraActions}isDoingScience={false}debugreadonly@@ -170,18 +183,14 @@ function FeedbackCard({feedback: ConversationFeedback;chatMessages: MetabotChatMessage[];}) {- const agentResponse = useMemo(- () =>- feedback.external_id- ? chatMessages.find(- (m): m is MetabotAgentTextChatMessage =>- m.role === "agent" &&- m.type === "text" &&- m.externalId === feedback.external_id,- )- : undefined,- [feedback.external_id, chatMessages],- );+ const agentResponse = feedback.external_id+ ? chatMessages.find(+ (message): message is MetabotAgentTextChatMessage =>+ message.role === "agent" &&+ message.type === "text" &&+ message.externalId === feedback.external_id,+ )+ : undefined;const submitterName = feedback.user? getUserName(feedback.user) || nulldiff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsxnew file mode 100644index 00000000000..b6e0fde58e4--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx@@ -0,0 +1,233 @@+import userEvent from "@testing-library/user-event";++import { setupMetabotConversationEndpoint } from "__support__/server-mocks";+import { renderWithProviders, screen, within } from "__support__/ui";+import { Route } from "metabase/router";+import { createMockUser } from "metabase-types/api/mocks";++import type { ConversationDetail, ConversationFeedback } from "../../types";++import { ConversationDetailPage } from "./ConversationDetailPage";++jest.mock("metabase/admin/ai/MetabotAdminLayout", () => ({+ MetabotAdminLayout: ({ children }: { children: React.ReactNode }) => children,+}));++// Avoid unrelated permission and tenant requests.+jest.mock("./ConversationHeader", () => ({+ ConversationHeader: () => null,+}));++type ConversationMessage = ConversationDetail["messages"][number];++function userMessage(+ id: string,+ parentId: string | null,+ message: string,+): ConversationMessage {+ return {+ id,+ parent_message_id: parentId,+ role: "user",+ type: "text",+ message,+ };+}++function agentMessage(+ id: string,+ parentId: string,+ message: string,+): ConversationMessage {+ return {+ id,+ parent_message_id: parentId,+ role: "agent",+ type: "text",+ message,+ externalId: id,+ };+}++function inProgressMessage(id: string, parentId: string): ConversationMessage {+ return {+ id,+ parent_message_id: parentId,+ role: "agent",+ type: "turn_in_progress",+ externalId: id,+ };+}++function createConversation(+ messages: ConversationMessage[],+ feedback: ConversationFeedback[] = [],+): ConversationDetail {+ return {+ conversation_id: "convo-1",+ created_at: "2026-01-01T00:00:00Z",+ summary: "A conversation",+ user: null,+ message_count: 2,+ total_tokens: 30,+ profile_id: "internal",+ slack_permalink: null,+ messages,+ queries: [],+ search_count: 0,+ query_count: 0,+ ip_address: null,+ embedding_hostname: null,+ embedding_path: null,+ user_agent: null,+ sanitized_user_agent: null,+ feedback,+ };+}++function setup(conversation: ConversationDetail) {+ setupMetabotConversationEndpoint(conversation);+ return renderWithProviders(+ <Route path="/conversations/:convoId" component={ConversationDetailPage} />,+ {+ withRouter: true,+ initialRoute: "/conversations/convo-1",+ storeInitialState: {+ currentUser: createMockUser({ is_superuser: true }),+ },+ },+ );+}++describe("ConversationDetailPage", () => {+ it("defaults a regenerated turn to the latest attempt and pages between attempts", async () => {+ setup(+ createConversation([+ userMessage("u1", null, "count orders"),+ agentMessage("a1", "u1", "first try"),+ agentMessage("a2", "u1", "kept answer"),+ ]),+ );++ expect(await screen.findByText("kept answer")).toBeInTheDocument();+ expect(screen.queryByText("first try")).not.toBeInTheDocument();+ expect(screen.getByText("2 / 2")).toBeInTheDocument();+ expect(screen.getByRole("button", { name: "Next version" })).toBeDisabled();+ expect(+ screen.getByRole("button", { name: "Previous version" }),+ ).toBeEnabled();++ await userEvent.click(+ screen.getByRole("button", { name: "Previous version" }),+ );++ expect(screen.getByText("first try")).toBeInTheDocument();+ expect(screen.queryByText("kept answer")).not.toBeInTheDocument();+ expect(screen.getByText("1 / 2")).toBeInTheDocument();+ expect(+ screen.getByRole("button", { name: "Previous version" }),+ ).toBeDisabled();+ expect(screen.getByRole("button", { name: "Next version" })).toBeEnabled();++ await userEvent.click(screen.getByRole("button", { name: "Next version" }));++ expect(screen.getByText("kept answer")).toBeInTheDocument();+ expect(screen.getByText("2 / 2")).toBeInTheDocument();+ });++ it("shows an in-progress row with a reachable pager while a regeneration streams", async () => {+ setup(+ createConversation([+ userMessage("u1", null, "count orders"),+ agentMessage("a1", "u1", "first try"),+ inProgressMessage("a2", "u1"),+ ]),+ );++ expect(+ await screen.findByTestId("metabot-response-in-progress"),+ ).toBeInTheDocument();+ expect(screen.getByText(/Response in progress/)).toBeInTheDocument();+ expect(screen.getByText("2 / 2")).toBeInTheDocument();+ expect(screen.queryByText("first try")).not.toBeInTheDocument();+ const [, inProgressElement] = screen.getAllByTestId("metabot-chat-message");+ expect(+ within(inProgressElement).queryByTestId("metabot-chat-message-copy"),+ ).not.toBeInTheDocument();++ await userEvent.click(+ screen.getByRole("button", { name: "Previous version" }),+ );++ expect(screen.getByText("first try")).toBeInTheDocument();+ expect(+ screen.queryByTestId("metabot-response-in-progress"),+ ).not.toBeInTheDocument();+ expect(screen.getByText("1 / 2")).toBeInTheDocument();+ });++ it("truncates the conversation after a superseded attempt", async () => {+ setup(+ createConversation([+ userMessage("u1", null, "count orders"),+ agentMessage("a1", "u1", "first try"),+ agentMessage("a2", "u1", "kept answer"),+ userMessage("u2", "a2", "and by month?"),+ agentMessage("b1", "u2", "monthly answer"),+ ]),+ );++ expect(await screen.findByText("kept answer")).toBeInTheDocument();+ expect(screen.getByText("monthly answer")).toBeInTheDocument();++ await userEvent.click(+ screen.getByRole("button", { name: "Previous version" }),+ );++ expect(screen.getByText("first try")).toBeInTheDocument();+ expect(screen.queryByText("and by month?")).not.toBeInTheDocument();+ expect(screen.queryByText("monthly answer")).not.toBeInTheDocument();+ });++ it("does not let admins submit feedback ratings from the transcript", async () => {+ setup(+ createConversation([+ userMessage("u1", null, "hi"),+ agentMessage("a1", "u1", "an answer"),+ ]),+ );++ expect(await screen.findByText("an answer")).toBeInTheDocument();+ expect(+ screen.queryByTestId("metabot-chat-message-thumbs-up"),+ ).not.toBeInTheDocument();+ expect(+ screen.queryByTestId("metabot-chat-message-thumbs-down"),+ ).not.toBeInTheDocument();+ });++ it("resolves feedback left on a regenerated-away attempt", async () => {+ const feedback: ConversationFeedback = {+ id: 1,+ metabot_id: 1,+ message_id: "10",+ user_id: 1,+ external_id: "a1",+ positive: false,+ issue_type: "not-factual",+ freeform_feedback: "wrong table",+ };+ setup(+ createConversation(+ [+ userMessage("u1", null, "count orders"),+ agentMessage("a1", "u1", "discarded answer"),+ agentMessage("a2", "u1", "kept answer"),+ ],+ [feedback],+ ),+ );++ expect(await screen.findByText("discarded answer")).toBeInTheDocument();+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/types.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/types.tsindex 5df8fc82e0c..9868d810b30 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/types.ts+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/types.ts@@ -1,5 +1,5 @@import type { MetabotProfileId } from "metabase/metabot/constants";-import type { FetchedChatMessage } from "metabase/metabot/utils/normalize-fetched-chat-messages";+import type { ParentedChatMessage } from "metabase/metabot/utils/message-tree";import type {DatasetQuery,MetabotFeedback,@@ -95,7 +95,7 @@ export type ConversationDetail = {total_tokens: number;profile_id: MetabotProfileId | null;slack_permalink: string | null;- chat_messages: FetchedChatMessage[];+ messages: ParentedChatMessage[];queries: GeneratedQuery[];search_count: number;query_count: number;diff --git a/frontend/src/metabase-types/api/metabot.ts b/frontend/src/metabase-types/api/metabot.tsindex 4527b1ce5b9..7a066fc5cc3 100644--- a/frontend/src/metabase-types/api/metabot.ts+++ b/frontend/src/metabase-types/api/metabot.ts@@ -56,31 +56,6 @@ export type MetabotTool = {parameters: Record<string, any>;};-export type MetabotHistoryUserMessageEntry = {- role: "user";- message: string;- context: MetabotChatContext;-};--export type MetabotHistoryToolEntry = {- role: "assistant";- assistant_response_type: "tools";- tools: MetabotTool[];-};--export type MetabotHistoryMessageEntry = {- role: "assistant";- assistant_response_type: "message";- message: string;-};--export type MetabotHistoryEntry =- | MetabotHistoryUserMessageEntry- | MetabotHistoryToolEntry- | MetabotHistoryMessageEntry;--export type MetabotHistory = any[];-export type MetabotStateContext = Record<string, any>;export type MetabotColumnType =@@ -173,17 +148,18 @@ export type MetabotCodeEdit = {export type MetabotAgentRequest = {message: string;context: MetabotChatContext;- history: MetabotHistory;- state: MetabotStateContext;conversation_id: string; // uuid+ parent_message_id?: string;+ retry_message_id?: string;+ user_message_id?: string; // uuid+ assistant_message_id?: string; // uuidmetabot_id?: string;profile_id?: string;};export type MetabotAgentResponse = {- history: MetabotHistory[];conversation_id: string;- state: any;+ state?: MetabotStateContext;};export type MetabotProvider =diff --git a/frontend/src/metabase/api/ai-streaming/__snapshots__/process-stream.unit.spec.ts.snap b/frontend/src/metabase/api/ai-streaming/__snapshots__/process-stream.unit.spec.ts.snapindex 77b00bcfc8a..e3472359c0a 100644--- a/frontend/src/metabase/api/ai-streaming/__snapshots__/process-stream.unit.spec.ts.snap+++ b/frontend/src/metabase/api/ai-streaming/__snapshots__/process-stream.unit.spec.ts.snap@@ -12,27 +12,6 @@ exports[`processChatResponse should be able to process a valid stream 1`] = `},],"finishReason": "stop",- "history": [- {- "content": "You, but don't tell anyone.",- "role": "assistant",- },- {- "role": "assistant",- "tool_calls": [- {- "arguments": "{}",- "id": "x",- "name": "x",- },- ],- },- {- "content": "",- "role": "tool",- "tool_call_id": "x",- },- ],"messageMetadata": {"usage": {"inputTokens": 4916,@@ -62,12 +41,6 @@ exports[`processChatResponse should resolve with partial response for aborted re"type": "data-state",},],- "history": [- {- "content": "Partial response",- "role": "assistant",- },- ],"toolCalls": [],}`;diff --git a/frontend/src/metabase/api/ai-streaming/__snapshots__/requests.unit.spec.ts.snap b/frontend/src/metabase/api/ai-streaming/__snapshots__/requests.unit.spec.ts.snapindex 376107f40be..3f4ca79fc63 100644--- a/frontend/src/metabase/api/ai-streaming/__snapshots__/requests.unit.spec.ts.snap+++ b/frontend/src/metabase/api/ai-streaming/__snapshots__/requests.unit.spec.ts.snap@@ -11,12 +11,6 @@ exports[`ai requests aiStreamingQuery should return full result of a successful"type": "data-state",},],- "history": [- {- "content": "You, but don't tell anyone.",- "role": "assistant",- },- ],"toolCalls": [],}`;diff --git a/frontend/src/metabase/api/ai-streaming/process-stream.ts b/frontend/src/metabase/api/ai-streaming/process-stream.tsindex 5c88165ef30..10fabcc5bf1 100644--- a/frontend/src/metabase/api/ai-streaming/process-stream.ts+++ b/frontend/src/metabase/api/ai-streaming/process-stream.ts@@ -1,7 +1,5 @@import { P, isMatching, match } from "ts-pattern";-import type { MetabotHistory } from "metabase-types/api";-import {type KnownDataPart,dataEventSchema,@@ -51,7 +49,6 @@ export type AIStreamingConfig = {export interface ProcessedChatResponse {aborted: boolean;toolCalls: ToolCall[];- history: MetabotHistory;data: DataPart[];messageMetadata?: MessageMetadata;finishReason?: FinishReason;@@ -81,28 +78,15 @@ export async function processChatResponse(const result: ProcessedChatResponse = {aborted: false,toolCalls: [],- history: [],data: [],};try {for await (const event of parseSSEStream(stream)) {match(event)- .with({ type: "start" }, (e) => {- config.onStart?.(e);- })- .with({ type: "text-delta" }, (e) => {- config.onTextPart?.(e.delta);- const lastEntry = result.history.at(-1);- if (lastEntry?.role === "assistant" && "content" in lastEntry) {- lastEntry.content += e.delta;- } else {- result.history.push({ role: "assistant", content: e.delta });- }- })- .with({ type: "tool-input-start" }, (e) => {- config.onToolInputStart?.(e);- })+ .with({ type: "start" }, (e) => config.onStart?.(e))+ .with({ type: "text-delta" }, (e) => config.onTextPart?.(e.delta))+ .with({ type: "tool-input-start" }, (e) => config.onToolInputStart?.(e)).with({ type: "tool-input-available" }, (e) => {toolInputAvailableSchema.validateSync(e, { strict: true });config.onToolInputAvailable?.(e);@@ -111,16 +95,6 @@ export async function processChatResponse(toolName: e.toolName,state: "call",});- result.history.push({- role: "assistant",- tool_calls: [- {- id: e.toolCallId,- name: e.toolName,- arguments: JSON.stringify(e.input),- },- ],- });}).with({ type: "tool-output-available" }, (e) => {toolOutputAvailableSchema.validateSync(e, { strict: true });@@ -131,11 +105,6 @@ export async function processChatResponse(state: "result",value: e.output,};- result.history.push({- role: "tool",- content: e.output,- tool_call_id: e.toolCallId,- });}).with({ type: "tool-output-error" }, (e) => {toolOutputErrorSchema.validateSync(e, { strict: true });@@ -147,11 +116,6 @@ export async function processChatResponse(value: undefined,error: e.errorText,};- result.history.push({- role: "tool",- content: e.errorText,- tool_call_id: e.toolCallId,- });}).with({ type: "error" }, (e) => {config.onError?.({ errorText: e.errorText });diff --git a/frontend/src/metabase/api/ai-streaming/process-stream.unit.spec.ts b/frontend/src/metabase/api/ai-streaming/process-stream.unit.spec.tsindex 351cd5f15d3..08f08399e9e 100644--- a/frontend/src/metabase/api/ai-streaming/process-stream.unit.spec.ts+++ b/frontend/src/metabase/api/ai-streaming/process-stream.unit.spec.ts@@ -144,11 +144,6 @@ describe("processChatResponse", () => {error: "boom",},]);- expect(result.history).toContainEqual({- role: "tool",- content: "boom",- tool_call_id: "x",- });});it("should call onToolInputStart for tool-input-start events", async () => {@@ -191,7 +186,8 @@ describe("processChatResponse", () => {).rejects.toBeTruthy();});- it("should stitch text deltas into a single history entry", async () => {+ it("should forward each text delta to onTextPart", async () => {+ const config = getMockedCallbacks();const mockStream = createMockSSEStream([{ type: "text-start", id: "t1" },{ type: "text-delta", id: "t1", delta: "You, but " },@@ -199,10 +195,9 @@ describe("processChatResponse", () => {{ type: "text-end", id: "t1" },]);- const result = await processChatResponse(mockStream, expectNoStreamedError);- expect(result.history).toEqual([- { content: "You, but don't tell anyone.", role: "assistant" },- ]);+ await processChatResponse(mockStream, config);+ expect(config.onTextPart).toHaveBeenNthCalledWith(1, "You, but ");+ expect(config.onTextPart).toHaveBeenNthCalledWith(2, "don't tell anyone.");});it("should resolve with partial response for aborted requests", async () => {diff --git a/frontend/src/metabase/api/ai-streaming/sse-types.ts b/frontend/src/metabase/api/ai-streaming/sse-types.tsindex 91c3c1c7487..c4b3575663f 100644--- a/frontend/src/metabase/api/ai-streaming/sse-types.ts+++ b/frontend/src/metabase/api/ai-streaming/sse-types.ts@@ -14,6 +14,9 @@ export type MessageMetadata = {// a typed error's code, ridden on the trailing `finish` event so the client// can branch on it (e.g. the usage-limit upgrade prompt)errorCode?: string;+ // the turn's user message row external_id, ridden on the `start` event so+ // the client can retry the prompt later+ userMessageId?: string;};export type ProviderMetadata = Record<string, Record<string, unknown>>;@@ -27,7 +30,11 @@ export type FinishReason =| "other";// lifecycle events-export type StartEvent = { type: "start"; messageId?: string };+export type StartEvent = {+ type: "start";+ messageId?: string;+ messageMetadata?: MessageMetadata;+};export type StartStepEvent = { type: "start-step" };export type FinishStepEvent = { type: "finish-step" };export type FinishEvent = {diff --git a/frontend/src/metabase/metabot/components/MetabotBranchPicker/MetabotBranchPicker.tsx b/frontend/src/metabase/metabot/components/MetabotBranchPicker/MetabotBranchPicker.tsxnew file mode 100644index 00000000000..22f35a05ad7--- /dev/null+++ b/frontend/src/metabase/metabot/components/MetabotBranchPicker/MetabotBranchPicker.tsx@@ -0,0 +1,39 @@+import { t } from "ttag";++import { ActionIcon, Flex, Icon, Text, Tooltip } from "metabase/ui";++export const MetabotBranchPicker = ({+ index,+ count,+ onChange,+}: {+ index: number;+ count: number;+ onChange: (index: number) => void;+}) => (+ <Flex align="center" gap={2}>+ <Tooltip label={t`Previous version`} disabled={index === 0}>+ <ActionIcon+ h="sm"+ aria-label={t`Previous version`}+ disabled={index === 0}+ onClick={() => onChange(index - 1)}+ >+ <Icon name="chevronleft" size="0.75rem" />+ </ActionIcon>+ </Tooltip>+ <Text size="sm" c="text-secondary">+ {index + 1} / {count}+ </Text>+ <Tooltip label={t`Next version`} disabled={index === count - 1}>+ <ActionIcon+ h="sm"+ aria-label={t`Next version`}+ disabled={index === count - 1}+ onClick={() => onChange(index + 1)}+ >+ <Icon name="chevronright" size="0.75rem" />+ </ActionIcon>+ </Tooltip>+ </Flex>+);diff --git a/frontend/src/metabase/metabot/components/MetabotBranchPicker/index.ts b/frontend/src/metabase/metabot/components/MetabotBranchPicker/index.tsnew file mode 100644index 00000000000..b360ae2fe7a--- /dev/null+++ b/frontend/src/metabase/metabot/components/MetabotBranchPicker/index.ts@@ -0,0 +1 @@+export { MetabotBranchPicker } from "./MetabotBranchPicker";diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsxindex a1929797349..0b054e8823b 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx@@ -27,6 +27,7 @@ import {Flex,type FlexProps,Icon,+ Loader,Text,Tooltip,} from "metabase/ui";@@ -68,6 +69,7 @@ const isUserVisibleMessage = (message: MetabotChatMessage): boolean =>.with({ type: "tool_call" }, () => false).with({ type: "turn_aborted" }, () => true).with({ type: "turn_errored" }, () => true)+ .with({ type: "turn_in_progress" }, () => true).exhaustive();interface BaseMessageProps extends Omit<FlexProps, "onCopy"> {@@ -98,12 +100,14 @@ export const MessageContainer = ({interface UserMessageProps extends Omit<BaseMessageProps, "message"> {message: MetabotUserChatMessage;+ extraActions?: ReactNode;}export const UserMessage = ({message,className,hideActions,+ extraActions,...props}: UserMessageProps) => {const clipboard = useClipboard({ timeout: 2000 });@@ -131,6 +135,7 @@ export const UserMessage = ({</ActionIcon></Tooltip>)}+ {extraActions}</Flex></MessageContainer>);@@ -175,6 +180,7 @@ interface AgentMessageProps extends Omit<BaseMessageProps, "message"> {setFeedbackMessage?: (data: { messageId: string; positive: boolean }) => void;submittedFeedback: "positive" | "negative" | undefined;onInternalLinkClick?: (link: string) => void;+ extraActions?: ReactNode;}export const AgentMessage = ({@@ -188,10 +194,13 @@ export const AgentMessage = ({submittedFeedback,onInternalLinkClick,hideActions,+ extraActions,...props}: AgentMessageProps) => {const messageId = "externalId" in message ? (message.externalId ?? "") : "";- const canGiveFeedback = !!(setFeedbackMessage && messageId);+ const isInProgress = message.type === "turn_in_progress";+ const canGiveFeedback =+ !readonly && !isInProgress && !!setFeedbackMessage && !!messageId;const clipboard = useClipboard({ timeout: 2000 });return (@@ -217,18 +226,30 @@ export const AgentMessage = ({.with({ type: "turn_errored" }, (m) => (<AgentErroredTurnAlert message={m} debug={debug} />))+ .with({ type: "turn_in_progress" }, () => (+ <Flex align="center" gap="sm" className={Styles.message}>+ <Loader+ type="dots"+ size="sm"+ data-testid="metabot-response-in-progress"+ />+ <Text c="text-secondary">{t`Response in progress…`}</Text>+ </Flex>+ )).exhaustive()}{!hideActions && (- <Flex className={Styles.messageActions}>- <Tooltip label={clipboard.copied ? t`Copied!` : t`Copy`}>- <ActionIcon- h="sm"- data-testid="metabot-chat-message-copy"- onClick={() => clipboard.copy(getCopyText())}- >- <Icon name="copy" size="1rem" />- </ActionIcon>- </Tooltip>+ <Flex className={Styles.messageActions} align="center">+ {!isInProgress && (+ <Tooltip label={clipboard.copied ? t`Copied!` : t`Copy`}>+ <ActionIcon+ h="sm"+ data-testid="metabot-chat-message-copy"+ onClick={() => clipboard.copy(getCopyText())}+ >+ <Icon name="copy" size="1rem" />+ </ActionIcon>+ </Tooltip>+ )}{canGiveFeedback && (<><Tooltip label={t`Give positive feedback`}>@@ -266,6 +287,7 @@ export const AgentMessage = ({</ActionIcon></Tooltip>)}+ {extraActions}</Flex>)}</MessageContainer>@@ -411,6 +433,7 @@ export const Messages = ({debug,readonly = false,onInternalLinkClick,+ getExtraActions,}: {messages: MetabotChatMessage[];onRetryMessage?: (messageId: string) => void;@@ -418,11 +441,16 @@ export const Messages = ({debug: boolean;readonly?: boolean;onInternalLinkClick?: (navigateToPath: string) => void;+ getExtraActions?: (messageId: string) => ReactNode;}) => {const visibleMessages = useMemo(() => (debug ? messages : messages.filter(isUserVisibleMessage)),[debug, messages],);+ const lastUserIndex = useMemo(+ () => visibleMessages.findLastIndex((m) => m.role === "user"),+ [visibleMessages],+ );const [sendToast] = useToast();const [feedbackState, setFeedbackState] = useState<{@@ -470,6 +498,8 @@ export const Messages = ({<>{visibleMessages.map((message, index) => {const next = visibleMessages[index + 1];+ const isLastUserMessage = index > lastUserIndex;+return message.role === "agent" ? (<AgentMessagekey={"msg-" + message.id}@@ -477,7 +507,7 @@ export const Messages = ({message={message}debug={debug}readonly={readonly}- onRetry={onRetryMessage}+ onRetry={isLastUserMessage ? onRetryMessage : undefined}getCopyText={() => getAgentReplyCopyText(message.id)}setFeedbackMessage={(data) =>setFeedbackState((prev) => ({ ...prev, modal: data }))@@ -488,6 +518,7 @@ export const Messages = ({: undefined}hideActions={next?.role === "agent" || (isDoingScience && !next)}+ extraActions={getExtraActions?.(message.id)}onInternalLinkClick={onInternalLinkClick}/>) : (@@ -496,6 +527,7 @@ export const Messages = ({data-testid="metabot-chat-message"message={message}hideActions={isDoingScience && visibleMessages.length === index + 1}+ extraActions={getExtraActions?.(message.id)}/>);})}diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.unit.spec.tsxindex 58909b5ebff..37a9201409b 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.unit.spec.tsx@@ -1,5 +1,9 @@import { renderWithProviders, screen, within } from "__support__/ui";-import type { MetabotAgentChatMessage } from "metabase/metabot/state";+import type {+ MetabotAgentChatMessage,+ MetabotChatMessage,+} from "metabase/metabot/state";+import { thumbsDown, thumbsUp } from "metabase/metabot/tests/utils";import { createMockUser } from "metabase-types/api/mocks";import { AgentMessage, Messages } from "./MetabotChatMessage";@@ -41,6 +45,51 @@ describe("AgentMessage", () => {).not.toBeInTheDocument();});+ describe("feedback controls", () => {+ const conversation: MetabotChatMessage[] = [+ { id: "u1", role: "user", type: "text", message: "hi" },+ {+ id: "a1",+ role: "agent",+ type: "text",+ message: "hello",+ externalId: "a1-ext",+ },+ ];++ it("shows feedback ratings in an interactive conversation", async () => {+ renderWithProviders(+ <Messages+ messages={conversation}+ isDoingScience={false}+ debug={false}+ />,+ );++ const [, agentMessage] = screen.getAllByTestId("metabot-chat-message");+ expect(await thumbsUp(agentMessage)).toBeInTheDocument();+ expect(await thumbsDown(agentMessage)).toBeInTheDocument();+ });++ it("hides feedback ratings in a read-only conversation", () => {+ renderWithProviders(+ <Messages+ messages={conversation}+ isDoingScience={false}+ debug={false}+ readonly+ />,+ );++ expect(+ screen.queryByTestId("metabot-chat-message-thumbs-up"),+ ).not.toBeInTheDocument();+ expect(+ screen.queryByTestId("metabot-chat-message-thumbs-down"),+ ).not.toBeInTheDocument();+ });+ });+describe("turn_errored", () => {it("shows locked message for metabase_ai_managed_locked errors", () => {setup({diff --git a/frontend/src/metabase/metabot/constants.ts b/frontend/src/metabase/metabot/constants.tsindex 057670e81e6..3ab1d23acad 100644--- a/frontend/src/metabase/metabot/constants.ts+++ b/frontend/src/metabase/metabot/constants.ts@@ -92,6 +92,9 @@ export const METABOT_ERR_MSG = {get locked() {return t`You've used all of your included AI service tokens. To keep using AI features you can either end your trial early and start your subscription, or stay in the trial and add your own AI provider API key.`;},+ get outOfSync() {+ return t`This conversation was updated elsewhere. Please refresh to see the latest messages.`;+ },format(msg: string) {return t`Sorry, an error occurred: ${msg}. If this persists, please contact your administrator.`;},diff --git a/frontend/src/metabase/metabot/hooks/index.ts b/frontend/src/metabase/metabot/hooks/index.tsindex 3e45fd9fcba..cf8b053086f 100644--- a/frontend/src/metabase/metabot/hooks/index.ts+++ b/frontend/src/metabase/metabot/hooks/index.ts@@ -1,5 +1,6 @@export { useIsAskPage } from "./use-is-ask-page";export { useMetabotEnabledEmbeddingAware } from "./use-metabot-embedding-aware-enabled";+export { useBranchableMessages } from "./use-branchable-messages";export { useMetabotAgent } from "./use-metabot-agent";export { useMetabotAgentsManager } from "./use-metabot-agents-manager";export { useMetabotName } from "./use-metabot-name";diff --git a/frontend/src/metabase/metabot/hooks/use-branchable-messages.tsx b/frontend/src/metabase/metabot/hooks/use-branchable-messages.tsxnew file mode 100644index 00000000000..36f6ca28a04--- /dev/null+++ b/frontend/src/metabase/metabot/hooks/use-branchable-messages.tsx@@ -0,0 +1,64 @@+import { type ReactNode, useMemo, useState } from "react";++import { MetabotBranchPicker } from "metabase/metabot/components/MetabotBranchPicker";+import type { MetabotChatMessage } from "metabase/metabot/state/types";+import {+ type ParentedChatMessage,+ activeResponses,+} from "metabase/metabot/utils/message-tree";++type ActiveResponse = ReturnType<typeof activeResponses>[number];++export function useBranchableMessages(+ sourceMessages: ParentedChatMessage[],+ { isSlack = false }: { isSlack?: boolean } = {},+): {+ messages: MetabotChatMessage[];+ getExtraActions: (messageId: string) => ReactNode;+} {+ const [selectedReplyByParentId, setSelectedReplyByParentId] = useState<+ Record<string, string>+ >({});++ return useMemo(() => {+ const selectBranch = (parentId: string, replyId: string) =>+ setSelectedReplyByParentId((selected) => ({+ ...selected,+ [parentId]: replyId,+ }));+ const responses = activeResponses(sourceMessages, selectedReplyByParentId, {+ isSlack,+ });+ const branchPickers = buildBranchPickers(responses, selectBranch);++ return {+ messages: responses.flatMap(({ messages }) => messages),+ getExtraActions: (messageId: string) => branchPickers[messageId],+ };+ }, [sourceMessages, selectedReplyByParentId, isSlack]);+}++function buildBranchPickers(+ responses: ActiveResponse[],+ selectBranch: (parentId: string, replyId: string) => void,+): Record<string, ReactNode> {+ const pickers: Record<string, ReactNode> = {};+ for (const { branch, messages } of responses) {+ const lastMessage = messages.at(-1);+ if (!branch || !lastMessage) {+ continue;+ }++ // Agent actions render on the final message in a response.+ pickers[lastMessage.id] = (+ <MetabotBranchPicker+ index={branch.currentIndex}+ count={branch.replyIds.length}+ onChange={(next) =>+ selectBranch(branch.parentId, branch.replyIds[next])+ }+ />+ );+ }+ return pickers;+}diff --git a/frontend/src/metabase/metabot/state/actions.ts b/frontend/src/metabase/metabot/state/actions.tsindex b4ca31e3f08..ca5313d101b 100644--- a/frontend/src/metabase/metabot/state/actions.ts+++ b/frontend/src/metabase/metabot/state/actions.ts@@ -17,12 +17,14 @@ import { createAsyncThunk } from "metabase/redux/utils";import { push } from "metabase/router";import { getSetting } from "metabase/selectors/settings";import { getUser } from "metabase/selectors/user";+import { uuid } from "metabase/utils/uuid";import type {JSONValue,MetabotAgentRequest,MetabotAgentResponse,MetabotChatContext,MetabotCodeEditorBufferContext,+ MetabotStateContext,MetabotTransformInfo,} from "metabase-types/api";@@ -33,7 +35,6 @@ import {getAgentRequestMetadata,getDebugMode,getDeveloperMessage,- getHistory,getIsProcessing,getMessageIdToRewind,getMetabotConversation,@@ -55,8 +56,8 @@ export const {addDeveloperMessage,addUserMessage,setIsProcessing,+ setMessageExternalIds,setNavigateToPath,- setPendingMessageExternalId,setProfileOverride,toolCallStart,toolCallArgs,@@ -116,6 +117,10 @@ const handleResponseError = (display: { type: "message" as const, message },}),)+ .with({ status: 409 }, () => ({+ error: { type: "conversation_out_of_sync" },+ display: { type: "message" as const, message: METABOT_ERR_MSG.outOfSync },+ })).with({ status: P.number, data: { message: P.string } },({ data: { message } }) => ({@@ -239,12 +244,19 @@ export const submitInput = createAsyncThunk<agentId: MetabotAgentId;metabot_id?: string;profile?: MetabotProfileId;+ retryMessageId?: string;}>("metabase/metabot/submitInput",async (payload, { dispatch, getState, signal }) => {const state = getState();- const { agentId, message: rawPrompt, profile, ...data } = payload;+ const {+ agentId,+ message: rawPrompt,+ profile,+ retryMessageId,+ ...data+ } = payload;const convo = getMetabotConversation(state, agentId);const prompt = rawPrompt.trim();@@ -284,8 +296,14 @@ export const submitInput = createAsyncThunk<// it's important that we get the current metadata containing the history before// altering it by adding the current message the user is wanting to send- const agentMetadata = getAgentRequestMetadata(getState(), agentId);+ const agentMetadata = getAgentRequestMetadata(+ getState(),+ agentId,+ retryMessageId,+ );const messageId = createMessageId();+ const userMessageId = retryMessageId ?? uuid();+ const assistantMessageId = uuid();const promptWithDevMessage = getDeveloperMessage(state, agentId) + prompt;dispatch(addUserMessage({@@ -303,6 +321,8 @@ export const submitInput = createAsyncThunk<agentId,conversation_id: convo.conversationId,...agentMetadata,+ user_message_id: userMessageId,+ assistant_message_id: assistantMessageId,...(profile ? { profile_id: profile } : {}),}),);@@ -381,7 +401,7 @@ export const sendAgentRequest = createAsyncThunk<) => {const { agentId, ...request } = payload;- let state = {};+ let state: MetabotStateContext | undefined;let response: ProcessedChatResponse | undefined;try {// store error object streamed across the wire@@ -468,14 +488,13 @@ export const sendAgentRequest = createAsyncThunk<.exhaustive();},onStart: function handleStart(event) {- if (event.messageId) {- dispatch(- setPendingMessageExternalId({- agentId,- externalId: event.messageId,- }),- );- }+ dispatch(+ setMessageExternalIds({+ agentId,+ agentMessageId: event.messageId,+ userMessageId: event.messageMetadata?.userMessageId,+ }),+ );},onTextPart: function handleTextPart(delta) {dispatch(addAgentTextDelta({ agentId, text: delta }));@@ -555,7 +574,6 @@ export const sendAgentRequest = createAsyncThunk<return fulfillWithValue({conversation_id: request.conversation_id,- history: [...getHistory(getState(), agentId), ...response.history],state,processedResponse: response,});@@ -566,12 +584,7 @@ export const sendAgentRequest = createAsyncThunk<conversation_id: request.conversation_id,unresolved_tool_calls:response?.toolCalls.filter((tc) => tc.state === "call") ?? [],- history: [- ...getHistory(getState(), agentId),- ...(response?.history ?? []),- ],- // reuse new state if we recieved it- state: Object.keys(state).length === 0 ? request.state : state,+ state,shouldRetry: false,});}@@ -672,6 +685,7 @@ export const retryPrompt = createAsyncThunk<message: prompt.message,context,metabot_id,+ retryMessageId: prompt.externalId,}),).unwrap();},diff --git a/frontend/src/metabase/metabot/state/reducer-utils.ts b/frontend/src/metabase/metabot/state/reducer-utils.tsindex bb317d50526..e39c14c2bb4 100644--- a/frontend/src/metabase/metabot/state/reducer-utils.ts+++ b/frontend/src/metabase/metabot/state/reducer-utils.ts@@ -102,7 +102,6 @@ export const createConversation = (isProcessing: false,messages: [],visible: false,- history: [],state: {},activeToolCalls: [],profileOverride: undefined,diff --git a/frontend/src/metabase/metabot/state/reducer.ts b/frontend/src/metabase/metabot/state/reducer.tsindex 02e363a8010..5bb246c9d21 100644--- a/frontend/src/metabase/metabot/state/reducer.ts+++ b/frontend/src/metabase/metabot/state/reducer.ts@@ -6,7 +6,6 @@ import { logout } from "metabase/redux/auth";import { uuid } from "metabase/utils/uuid";import type {MetabotCodeEdit,- MetabotHistory,MetabotSuggestedTransform,SuggestedTransform,} from "metabase-types/api";@@ -77,7 +76,6 @@ export const metabot = createSlice({const { id, message, agentId, ...rest } = action.payload;// Unjustified type cast. FIXMEconvo.messages.push({ id, role: "user", ...rest, message } as any);- convo.history.push({ id, role: "user", content: message });},),addAgentMessage: convoReducer(@@ -126,9 +124,24 @@ export const metabot = createSlice({convo.activeToolCalls = hasToolCalls ? [] : convo.activeToolCalls;},),- setPendingMessageExternalId: convoReducer(- (convo, action: ConvoPayloadAction<{ externalId: string }>) => {- convo.pendingMessageExternalId = action.payload.externalId;+ setMessageExternalIds: convoReducer(+ (+ convo,+ action: ConvoPayloadAction<{+ agentMessageId?: string;+ userMessageId?: string;+ }>,+ ) => {+ const { agentMessageId, userMessageId } = action.payload;+ if (agentMessageId) {+ convo.pendingMessageExternalId = agentMessageId;+ }+ const lastUserMessage = convo.messages.findLast(+ (m) => m.role === "user",+ );+ if (userMessageId && lastUserMessage) {+ lastUserMessage.externalId = userMessageId;+ }},),toolCallStart: convoReducer(@@ -196,11 +209,8 @@ export const metabot = createSlice({}},),- // NOTE: this reducer fn should be made smarter if/when we want to have- // metabot's `state` object be able to remove / forget values. currently- // we do not rewind the state to the point in time of the original prompt- // so if / when this becomes expected, we'll need to do some extra work here- // NOTE: this doesn't work in non-streaming contexts right now+ // only the last turn is rewindable (retry), so a single pre-turn snapshot+ // is enough to roll `state` back; the server reconstructs it independentlyrewindStateToMessageId: convoReducer((convo, action: ConvoPayloadAction<{ messageId: string }>) => {convo.isProcessing = false;@@ -211,9 +221,8 @@ export const metabot = createSlice({convo.messages = convo.messages.slice(0, messageIndex);}- const historyIndex = convo.history.findLastIndex((h) => id === h.id);- if (historyIndex > -1) {- convo.history = convo.history.slice(0, historyIndex);+ if (convo.stateBeforeTurn) {+ convo.state = convo.stateBeforeTurn;}},),@@ -314,7 +323,6 @@ export const metabot = createSlice({state,action: PayloadAction<{messages: MetabotChatMessage[];- history: MetabotHistory;state: any;suggestedTransforms: MetabotSuggestedTransform[];activeToolCalls: MetabotToolCall[];@@ -328,7 +336,6 @@ export const metabot = createSlice({const {messages,- history,state: snapshotState,suggestedTransforms,activeToolCalls,@@ -336,7 +343,6 @@ export const metabot = createSlice({} = action.payload;convo.messages = castDraft(messages ?? []);- convo.history = history ?? [];convo.state = snapshotState ?? {};convo.activeToolCalls = activeToolCalls ?? [];convo.conversationId = conversationId ?? uuid();@@ -354,13 +360,16 @@ export const metabot = createSlice({const convo = getRequestConversation(state, action);if (convo) {convo.isProcessing = true;+ convo.stateBeforeTurn = convo.state;+ convo.pendingMessageExternalId = action.meta.arg.assistant_message_id;}}).addCase(sendAgentRequest.fulfilled, (state, action) => {const convo = getRequestConversation(state, action);if (convo) {- convo.state = { ...(action.payload?.state ?? {}) };- convo.history = action.payload?.history?.slice() ?? [];+ if (action.payload?.state) {+ convo.state = { ...action.payload.state };+ }convo.activeToolCalls = [];convo.isProcessing = false;convo.experimental.developerMessage = "";@@ -372,20 +381,20 @@ export const metabot = createSlice({if (convo) {// aborted requests needs special state adjustmentsif (action.payload?.type === "abort") {- convo.state = { ...(action.payload?.state ?? {}) };- convo.history = action.payload?.history?.slice() ?? [];+ if (action.payload?.state) {+ convo.state = { ...action.payload.state };+ }+ // an abort means the request (almost certainly) reached the server,+ // so the turn's rows exist under the client-minted id even when the+ // start event never arrived — stamp it so retry can target the prompt+ const lastUserMessage = convo.messages.findLast(+ (m) => m.role === "user",+ );+ if (lastUserMessage && !lastUserMessage.externalId) {+ lastUserMessage.externalId = action.meta.arg.user_message_id;+ }appendAgentTurnAborted(convo);if (action.payload.unresolved_tool_calls.length > 0) {- // update history w/ synthetic tool_result entries for each unresolved tool call- // as having a tool_call without a matching tool_result is invalid- const syntheticToolResults =- action.payload.unresolved_tool_calls.map((tc) => ({- role: "tool" as const,- content: "Tool execution interrupted by user",- tool_call_id: tc.toolCallId,- }));- convo.history.push(...syntheticToolResults);-// update message state so that unresolved tools are marked as endedconvo.messages.forEach((msg) => {if (msg.type === "tool_call" && msg.status === "started") {diff --git a/frontend/src/metabase/metabot/state/selectors.ts b/frontend/src/metabase/metabot/state/selectors.tsindex f5891d8d2df..26220374694 100644--- a/frontend/src/metabase/metabot/state/selectors.ts+++ b/frontend/src/metabase/metabot/state/selectors.ts@@ -121,6 +121,18 @@ export const getLastMessage = createSelector(getMessages, (messages) =>_.last(messages),);+export const getLastAgentMessageExternalId = createSelector(+ getMessages,+ (messages) => {+ const lastAgentMessage = messages.findLast(+ (m) => m.role === "agent" && "externalId" in m,+ );+ return lastAgentMessage && "externalId" in lastAgentMessage+ ? lastAgentMessage.externalId+ : undefined;+ },+);+const splitByTurn = (messages: MetabotChatMessage[]): MetabotChatMessage[][] =>messages.reduce<MetabotChatMessage[][]>((turns, m) => {if (m.role === "user" || turns.length === 0) {@@ -182,11 +194,6 @@ export const getIsProcessing = createSelector((convo) => convo.isProcessing,);-export const getHistory = createSelector(- getMetabotConversation,- (convo) => convo.history,-);-export const getMetabotRequestState = createSelector(getMetabotConversation,(convo) => convo.state,@@ -239,15 +246,21 @@ export const getProfile = createSelector();export const getAgentRequestMetadata = createSelector(- getHistory,- getMetabotRequestState,- getProfile,- (history, state, profile) => ({- state,- // NOTE: need end to end support for ids on messages as BE will error if ids are present- history: history.map((h) =>- h.id && h.id.startsWith(`msg_`) ? _.omit(h, "id") : h,- ),+ [+ getProfile,+ getLastAgentMessageExternalId,+ (+ _state: State,+ _agentId: MetabotAgentId,+ retryMessageId: string | undefined,+ ) => retryMessageId,+ ],+ (profile, parentMessageId, retryMessageId) => ({+ // a retry regenerates the response to an existing message, so it carries+ // retry_message_id in place of parent_message_id — never both+ ...(retryMessageId+ ? { retry_message_id: retryMessageId }+ : { parent_message_id: parentMessageId }),...(profile ? { profile_id: profile } : {}),}),);diff --git a/frontend/src/metabase/metabot/state/selectors.unit.spec.ts b/frontend/src/metabase/metabot/state/selectors.unit.spec.tsindex 12925b0ce4a..ac2ca1c50f6 100644--- a/frontend/src/metabase/metabot/state/selectors.unit.spec.ts+++ b/frontend/src/metabase/metabot/state/selectors.unit.spec.ts@@ -6,7 +6,11 @@ import { createMockState } from "metabase/redux/store/mocks";import { getMetabotInitialState } from "./reducer-utils";-import { type MetabotChatMessage, getUserPromptForMessageId } from "./index";+import {+ type MetabotChatMessage,+ getLastAgentMessageExternalId,+ getUserPromptForMessageId,+} from "./index";function setup(messages: MetabotChatMessage[]): State {setupEnterprisePlugins();@@ -65,4 +69,27 @@ describe("metabot selectors", () => {});});});++ describe("getLastAgentMessageExternalId", () => {+ it("skips a trailing tool_call and returns the last agent message that carries an externalId", () => {+ const state = setup([+ { id: "1", role: "user", type: "text", message: "hi" },+ {+ id: "2",+ role: "agent",+ type: "text",+ message: "working on it",+ externalId: "ext-2",+ },+ {+ id: "3",+ role: "agent",+ type: "tool_call",+ name: "search",+ status: "ended",+ },+ ]);+ expect(getLastAgentMessageExternalId(state, "omnibot")).toBe("ext-2");+ });+ });});diff --git a/frontend/src/metabase/metabot/state/types.ts b/frontend/src/metabase/metabot/state/types.tsindex 7ad6877c456..9860bf96b17 100644--- a/frontend/src/metabase/metabot/state/types.ts+++ b/frontend/src/metabase/metabot/state/types.ts@@ -3,7 +3,7 @@ import type { MetabotProfileId } from "metabase/metabot/constants";import type {MetabotCodeEdit,MetabotCodeEditorBufferContext,- MetabotHistory,+ MetabotStateContext,MetabotSuggestedTransform,MetabotTransformInfo,} from "metabase-types/api";@@ -27,6 +27,7 @@ export type MetabotUserTextChatMessage = {role: "user";type: "text";message: string;+ externalId?: string;};export type MetabotAgentTextChatMessage = {@@ -78,12 +79,20 @@ export type MetabotAgentTurnErroredMessage = {externalId?: string;};+export type MetabotAgentTurnInProgressMessage = {+ id: string;+ role: "agent";+ type: "turn_in_progress";+ externalId?: string;+};+export type MetabotAgentChatMessage =| MetabotAgentTextChatMessage| MetabotAgentDataPartMessage| MetabotDebugToolCallMessage| MetabotAgentTurnAbortedMessage- | MetabotAgentTurnErroredMessage;+ | MetabotAgentTurnErroredMessage+ | MetabotAgentTurnInProgressMessage;export type MetabotUserChatMessage = MetabotUserTextChatMessage;@@ -114,8 +123,8 @@ export interface MetabotConverstationState {isProcessing: boolean;messages: MetabotChatMessage[];visible: boolean;- history: MetabotHistory;- state: any;+ state: MetabotStateContext;+ stateBeforeTurn?: MetabotStateContext;activeToolCalls: MetabotToolCall[];profileOverride: MetabotProfileId | undefined;pendingMessageExternalId: string | undefined;diff --git a/frontend/src/metabase/metabot/tests/convo-state.unit.spec.tsx b/frontend/src/metabase/metabot/tests/convo-state.unit.spec.tsxindex 38d08b3f410..8e27ec54ebf 100644--- a/frontend/src/metabase/metabot/tests/convo-state.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/convo-state.unit.spec.tsx@@ -1,6 +1,11 @@import userEvent from "@testing-library/user-event";+import _ from "underscore";-import { getMetabotRequestState } from "metabase/metabot/state";+import { waitFor } from "__support__/ui";+import {+ getMetabotConversation,+ getMetabotRequestState,+} from "metabase/metabot/state";import {assertConversation,@@ -8,9 +13,14 @@ import {createPauses,enterChatMessage,erroredResponse,+ hideMetabot,+ lastReqBody,mockAgentEndpoint,+ resetChatButton,setup,+ showMetabot,stopResponseButton,+ whoIsYourFavoriteResponse,} from "./utils";describe("metabot > convo state", () => {@@ -113,4 +123,55 @@ describe("metabot > convo state", () => {const reqState = getMetabotRequestState(store.getState(), "omnibot");expect(reqState).toEqual({ testing: 123 });});++ it("should keep the conversation thread when metabot is hidden or opened", async () => {+ const { store } = setup();+ const agentSpy = mockAgentEndpoint({+ events: whoIsYourFavoriteResponse,+ });++ await enterChatMessage("Who is your favorite?");+ await waitFor(() => expect(agentSpy).toHaveBeenCalledTimes(1));++ hideMetabot(store.dispatch);+ showMetabot(store.dispatch);+ await enterChatMessage("Hi!");+ const reqBody = await lastReqBody(agentSpy);+ // the thread survives hide/show: the next request still points at the prior turn+ expect(reqBody.parent_message_id).toBe("msg_test_favorite");+ });++ it("should reset the conversation when the reset button is clicked", async () => {+ const { store } = setup();+ const getState = () => getMetabotConversation(store.getState(), "omnibot");+ mockAgentEndpoint({ events: whoIsYourFavoriteResponse });++ await enterChatMessage("Who is your favorite?");+ await assertConversation([+ ["user", "Who is your favorite?"],+ ["agent", "You, but don't tell anyone."],+ ]);++ const beforeResetState = getState();+ expect(_.omit(beforeResetState.messages[0], ["id"])).toStrictEqual({+ role: "user",+ type: "text",+ message: "Who is your favorite?",+ });+ expect(+ _.omit(beforeResetState.messages[1], ["id", "externalId"]),+ ).toStrictEqual({+ role: "agent",+ type: "text",+ message: "You, but don't tell anyone.",+ });++ await userEvent.click(await resetChatButton());++ const afterResetState = getState();+ expect(afterResetState.conversationId).not.toBe(+ beforeResetState.conversationId,+ );+ expect(afterResetState.messages).toStrictEqual([]);+ });});diff --git a/frontend/src/metabase/metabot/tests/errors.unit.spec.tsx b/frontend/src/metabase/metabot/tests/errors.unit.spec.tsxindex de35e4b56f2..696d80fae3d 100644--- a/frontend/src/metabase/metabot/tests/errors.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/errors.unit.spec.tsx@@ -59,6 +59,19 @@ describe("metabot > errors", () => {expect(await input()).toHaveTextContent("Who is your favorite?");});+ it("should show a conversation-out-of-sync message for a stale parent_message_id (409)", async () => {+ setup();+ fetchMock.post(`path:/api/metabot/agent-streaming`, 409);++ await enterChatMessage("Who is your favorite?");++ await assertConversation([+ ["user", "Who is your favorite?"],+ ["agent", METABOT_ERR_MSG.outOfSync],+ ]);+ expect(await input()).toHaveTextContent("Who is your favorite?");+ });+it("should keep the prompt for locked requests so it can be retried", async () => {setup();fetchMock.post(`path:/api/metabot/agent-streaming`, {@@ -187,8 +200,8 @@ describe("metabot > errors", () => {const retryBody = await lastReqBody(retrySpy);expect(retryBody.message).toBe("new first prompt");- expect(retryBody.history).not.toContainEqual(- expect.objectContaining({ role: "user", content: "first prompt" }),- );+ expect(retryBody.retry_message_id).toBeUndefined();+ // the errored turn was rewound, so the resubmit doesn't point back at it+ expect(retryBody.parent_message_id).toBeUndefined();});});diff --git a/frontend/src/metabase/metabot/tests/history.unit.spec.tsx b/frontend/src/metabase/metabot/tests/history.unit.spec.tsxdeleted file mode 100644index f749aa36fc7..00000000000--- a/frontend/src/metabase/metabot/tests/history.unit.spec.tsx+++ /dev/null@@ -1,203 +0,0 @@-import userEvent from "@testing-library/user-event";-import _ from "underscore";--import { act, screen, waitFor } from "__support__/ui";-import { LONG_CONVO_MSG_LENGTH_THRESHOLD } from "metabase/metabot/constants";-import {- addUserMessage,- getHistory,- getMetabotConversation,-} from "metabase/metabot/state";--import {- assertConversation,- createMockSSEStream,- createPauses,- enterChatMessage,- hideMetabot,- lastReqBody,- mockAgentEndpoint,- resetChatButton,- setup,- showMetabot,- stopResponseButton,- whoIsYourFavoriteResponse,-} from "./utils";--describe("metabot > history", () => {- it("should send conversation history along with future messages", async () => {- setup();-- const { sendResponse } = mockAgentEndpoint({- events: whoIsYourFavoriteResponse,- waitForResponse: true,- });- await enterChatMessage("Who is your favorite?");- sendResponse();- expect(- await screen.findByText("You, but don't tell anyone."),- ).toBeInTheDocument();-- const agentSpy = mockAgentEndpoint({- events: [],- });- await enterChatMessage("Hi!");- const reqBody = await lastReqBody(agentSpy);- expect(reqBody?.history).toEqual([- { content: "Who is your favorite?", role: "user" },- { content: "You, but don't tell anyone.", role: "assistant" },- ]);- });-- it("should not clear history when metabot is hidden or opened", async () => {- const { store } = setup();- const agentSpy = mockAgentEndpoint({- events: whoIsYourFavoriteResponse,- });-- await enterChatMessage("Who is your favorite?");- await waitFor(() => expect(agentSpy).toHaveBeenCalledTimes(1));-- hideMetabot(store.dispatch);- showMetabot(store.dispatch);- await enterChatMessage("Hi!");- const reqBody = await lastReqBody(agentSpy);- const sentHistory = reqBody.history;- expect(sentHistory).not.toEqual([]);- });-- it("should merge text chunks in the history", async () => {- const { store } = setup();- mockAgentEndpoint({- events: [- { type: "text-start", id: "t1" },- { type: "text-delta", id: "t1", delta: "You, but " },- { type: "text-delta", id: "t1", delta: "don't tell anyone." },- { type: "text-end", id: "t1" },- { type: "finish", finishReason: "stop" },- ],- });-- const initialHistory = getHistory(store.getState(), "omnibot");- expect(initialHistory).toEqual([]);-- await enterChatMessage("Who is your favorite?");-- const finalHistory = getHistory(store.getState(), "omnibot");- expect(finalHistory).toHaveLength(2);- expect(finalHistory[0].role).toBe("user");- expect(finalHistory[0].content).toBe("Who is your favorite?");- expect(finalHistory[1].role).toBe("assistant");- expect(finalHistory[1].content).toBe("You, but don't tell anyone.");- });-- it("should clear history when the user hits the reset button", async () => {- const { store } = setup();- const getState = () => getMetabotConversation(store.getState(), "omnibot");- mockAgentEndpoint({ events: whoIsYourFavoriteResponse });-- await enterChatMessage("Who is your favorite?");- await assertConversation([- ["user", "Who is your favorite?"],- ["agent", "You, but don't tell anyone."],- ]);-- const beforeResetState = getState();- expect(_.omit(beforeResetState.messages[0], ["id"])).toStrictEqual({- role: "user",- type: "text",- message: "Who is your favorite?",- });- expect(- _.omit(beforeResetState.messages[1], ["id", "externalId"]),- ).toStrictEqual({- role: "agent",- type: "text",- message: "You, but don't tell anyone.",- });-- await userEvent.click(await resetChatButton());-- const afterResetState = getState();- expect(afterResetState.conversationId).not.toBe(- beforeResetState.conversationId,- );- expect(afterResetState.messages).toStrictEqual([]);- });-- it("should warn the chat is getting long if the conversation is long w/ ability to clear history", async () => {- const { store } = setup();- const longMsg = "x".repeat(LONG_CONVO_MSG_LENGTH_THRESHOLD / 2);-- act(() => {- store.dispatch(- addUserMessage({- id: "1",- type: "text",- message: longMsg,- agentId: "omnibot",- }),- );- });- expect(await screen.findByText(/xxxxxxx/)).toBeInTheDocument();- expect(- screen.queryByText(/This chat is getting long/),- ).not.toBeInTheDocument();-- act(() => {- store.dispatch(- addUserMessage({- id: "2",- type: "text",- message: longMsg,- agentId: "omnibot",- }),- );- });- expect(- await screen.findByText(/This chat is getting long/),- ).toBeInTheDocument();- await userEvent.click(await screen.findByTestId("metabot-reset-long-chat"));-- await waitFor(() => {- expect(- screen.queryByText(/This chat is getting long/),- ).not.toBeInTheDocument();- });- expect(screen.queryByText(/xxxxxxx/)).not.toBeInTheDocument();- });-- it("should manually insert synthetic tool results for aborted requests with unresolved tool calls", async () => {- const { store } = setup();-- const [pause1] = createPauses(1);- mockAgentEndpoint({- stream: createMockSSEStream(- (async function* () {- yield {- type: "tool-input-available",- toolCallId: "test",- toolName: "test",- input: {},- };- await pause1.promise;- })(),- ),- });- await enterChatMessage("hi");- await userEvent.click(await stopResponseButton());- pause1.resolve();- expect(getHistory(store.getState(), "omnibot")).toMatchObject([- { content: "hi", role: "user" },- {- role: "assistant",- tool_calls: [{ arguments: "{}", id: "test", name: "test" }],- },- {- content: "Tool execution interrupted by user",- role: "tool",- tool_call_id: "test",- },- ]);- });-});diff --git a/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx b/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsxindex b58f7c09500..e0b58a51933 100644--- a/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx@@ -94,7 +94,6 @@ describe("query builder code edits from omnibot", () => {aborted: false,toolCalls: [],data: [],- history: [],};});@@ -160,8 +159,6 @@ describe("query builder code edits from omnibot", () => {current_time_with_timezone: "2026-03-04T00:00:00Z",capabilities: [],},- history: [],- state: {},}),);});diff --git a/frontend/src/metabase/metabot/tests/retry.unit.spec.tsx b/frontend/src/metabase/metabot/tests/retry.unit.spec.tsxnew file mode 100644index 00000000000..556d2ad98af--- /dev/null+++ b/frontend/src/metabase/metabot/tests/retry.unit.spec.tsx@@ -0,0 +1,351 @@+import userEvent from "@testing-library/user-event";++import { screen, waitFor, within } from "__support__/ui";+import type { SSEEvent } from "metabase/api/ai-streaming/sse-types";+import {+ getMetabotConversation,+ getMetabotRequestState,+} from "metabase/metabot/state";+import { isUuid } from "metabase/utils/uuid";++import {+ chatMessages,+ createMockSSEStream,+ createPauses,+ enterChatMessage,+ lastChatMessage,+ lastReqBody,+ mockAgentEndpoint,+ setup,+ stopResponseButton,+ whoIsYourFavoriteResponse,+} from "./utils";++const turnEvents = (opts: {+ messageId: string;+ userMessageId?: string;+ text: string;+}): SSEEvent[] => [+ {+ type: "start",+ messageId: opts.messageId,+ ...(opts.userMessageId+ ? { messageMetadata: { userMessageId: opts.userMessageId } }+ : {}),+ },+ { type: "text-start", id: "t1" },+ { type: "text-delta", id: "t1", delta: opts.text },+ { type: "text-end", id: "t1" },+ { type: "finish", finishReason: "stop" },+];++describe("metabot > retry", () => {+ it("should present the user an option to retry a response", async () => {+ setup();+ mockAgentEndpoint({ events: whoIsYourFavoriteResponse });++ await enterChatMessage("Who is your favorite?");+ const lastMessage = await lastChatMessage();+ expect(lastMessage).toHaveTextContent(/You, but don't tell anyone./);+ expect(+ await within(lastMessage!).findByTestId("metabot-chat-message-retry"),+ ).toBeInTheDocument();+ });++ it("should show retry option for error messages", async () => {+ setup();++ mockAgentEndpoint({+ events: [+ { type: "error", errorText: "Anthropic API key expired or invalid" },+ ],+ });++ await enterChatMessage("Who is your favorite?");++ const lastMessage = await lastChatMessage();+ expect(lastMessage).toHaveTextContent(/Something went wrong/);+ expect(+ within(lastMessage!).getByTestId("metabot-chat-message-retry"),+ ).toBeInTheDocument();+ });++ it("should only offer retry on the last turn", async () => {+ setup();+ mockAgentEndpoint({ events: whoIsYourFavoriteResponse });+ await enterChatMessage("Who is your favorite?");+ expect(+ await screen.findByText("You, but don't tell anyone."),+ ).toBeInTheDocument();++ mockAgentEndpoint({+ events: [+ { type: "start", messageId: "msg_second" },+ { type: "text-start", id: "t9" },+ { type: "text-delta", id: "t9", delta: "Still you." },+ { type: "text-end", id: "t9" },+ { type: "finish", finishReason: "stop" },+ ],+ });+ await enterChatMessage("Are you sure?");+ expect(await screen.findByText("Still you.")).toBeInTheDocument();++ const [, firstTurnReply, , lastTurnReply] = await chatMessages();+ expect(+ within(lastTurnReply).getByTestId("metabot-chat-message-retry"),+ ).toBeInTheDocument();+ expect(+ within(firstTurnReply).queryByTestId("metabot-chat-message-retry"),+ ).not.toBeInTheDocument();+ });++ it("should successfully rewind a response", async () => {+ setup();+ mockAgentEndpoint({+ events: [+ { type: "text-start", id: "t0" },+ { type: "text-delta", id: "t0", delta: "Let me think..." },+ { type: "text-end", id: "t0" },+ ...whoIsYourFavoriteResponse,+ ],+ });+ await enterChatMessage("Who is your favorite?");++ const beforeMessages = await screen.findByTestId("metabot-chat-messages");+ expect(beforeMessages).toHaveTextContent(/Let me think.../);+ expect(beforeMessages).toHaveTextContent(/You, but don't tell anyone./);++ mockAgentEndpoint({+ events: [+ { type: "text-start", id: "t1" },+ { type: "text-delta", id: "t1", delta: "The answer is always you." },+ { type: "text-end", id: "t1" },+ { type: "data-state", data: { queries: {} } },+ { type: "finish", finishReason: "stop" },+ ],+ });+ await userEvent.click(+ await screen.findByTestId("metabot-chat-message-retry"),+ );++ const afterMessages = await screen.findByTestId("metabot-chat-messages");++ expect(afterMessages).not.toHaveTextContent(/Let me think.../);+ expect(afterMessages).not.toHaveTextContent(/You, but don't tell anyone./);+ expect(afterMessages).toHaveTextContent(/The answer is always you./);+ });++ it("should rewind convo state to before the retried turn", async () => {+ const { store } = setup();+ const getConvoReqState = () =>+ getMetabotRequestState(store.getState(), "omnibot");++ mockAgentEndpoint({+ events: [+ ...turnEvents({+ messageId: "msg_1",+ userMessageId: "user_msg_1",+ text: "first reply",+ }).slice(0, -1),+ { type: "data-state", data: { todos: [{ id: "a" }] } },+ { type: "finish", finishReason: "stop" },+ ],+ });+ await enterChatMessage("first prompt");+ expect(await screen.findByText("first reply")).toBeInTheDocument();+ expect(getConvoReqState()).toEqual({ todos: [{ id: "a" }] });++ mockAgentEndpoint({+ events: [+ ...turnEvents({+ messageId: "msg_2",+ userMessageId: "user_msg_2",+ text: "second reply",+ }).slice(0, -1),+ { type: "data-state", data: { todos: [{ id: "b" }] } },+ { type: "finish", finishReason: "stop" },+ ],+ });+ await enterChatMessage("second prompt");+ expect(await screen.findByText("second reply")).toBeInTheDocument();+ expect(getConvoReqState()).toEqual({ todos: [{ id: "b" }] });++ // the retried turn's response carries no state part, so the pre-turn+ // snapshot is what the convo is left with+ mockAgentEndpoint({+ events: turnEvents({+ messageId: "msg_3",+ userMessageId: "user_msg_2",+ text: "regenerated reply",+ }),+ });+ const messages = await chatMessages();+ await userEvent.click(+ await within(messages.at(-1)!).findByTestId("metabot-chat-message-retry"),+ );+ expect(await screen.findByText("regenerated reply")).toBeInTheDocument();+ expect(getConvoReqState()).toEqual({ todos: [{ id: "a" }] });+ });++ it("should stamp the user message with the start event's userMessageId", async () => {+ const { store } = setup();+ mockAgentEndpoint({+ events: turnEvents({+ messageId: "msg_1",+ userMessageId: "user_msg_1",+ text: "hello!",+ }),+ });++ await enterChatMessage("hi");+ expect(await screen.findByText("hello!")).toBeInTheDocument();++ const convo = getMetabotConversation(store.getState(), "omnibot");+ expect(convo.messages.find((m) => m.role === "user")).toMatchObject({+ externalId: "user_msg_1",+ });+ });++ it("should send retry_message_id and no parent_message_id when retrying the last turn", async () => {+ setup();+ mockAgentEndpoint({+ events: turnEvents({+ messageId: "msg_1",+ userMessageId: "user_msg_1",+ text: "first reply",+ }),+ });+ await enterChatMessage("first prompt");+ expect(await screen.findByText("first reply")).toBeInTheDocument();++ mockAgentEndpoint({+ events: turnEvents({+ messageId: "msg_2",+ userMessageId: "user_msg_2",+ text: "second reply",+ }),+ });+ await enterChatMessage("second prompt");+ expect(await screen.findByText("second reply")).toBeInTheDocument();++ const retrySpy = mockAgentEndpoint({ events: [] });+ const messages = await chatMessages();+ await userEvent.click(+ await within(messages.at(-1)!).findByTestId("metabot-chat-message-retry"),+ );++ const body = await lastReqBody(retrySpy);+ expect(body.retry_message_id).toBe("user_msg_2");+ expect(body.user_message_id).toBe("user_msg_2");+ expect(body.parent_message_id).toBeUndefined();+ expect(body.message).toBe("second prompt");+ });++ it("should send retry_message_id when retrying an errored turn", async () => {+ setup();+ mockAgentEndpoint({+ events: [+ {+ type: "start",+ messageId: "msg_err",+ messageMetadata: { userMessageId: "user_msg_err" },+ },+ { type: "error", errorText: "boom" },+ ],+ });+ await enterChatMessage("first prompt");+ expect(await screen.findByText(/Something went wrong/)).toBeInTheDocument();++ const retrySpy = mockAgentEndpoint({ events: [] });+ await userEvent.click(+ await screen.findByTestId("metabot-chat-message-retry"),+ );++ const body = await lastReqBody(retrySpy);+ expect(body.retry_message_id).toBe("user_msg_err");+ expect(body.parent_message_id).toBeUndefined();+ });++ it("should send retry_message_id when retrying an aborted turn", async () => {+ setup();+ const [pause] = createPauses(1);+ mockAgentEndpoint({+ stream: createMockSSEStream(+ (async function* () {+ yield {+ type: "start",+ messageId: "msg_aborted",+ messageMetadata: { userMessageId: "user_msg_aborted" },+ };+ yield { type: "text-start", id: "t1" };+ yield { type: "text-delta", id: "t1", delta: "Let me think" };+ await pause.promise;+ })(),+ ),+ });+ await enterChatMessage("first prompt");+ await userEvent.click(await stopResponseButton());+ pause.resolve();+ await waitFor(() => {+ expect(+ screen.queryByTestId("metabot-stop-response"),+ ).not.toBeInTheDocument();+ });++ const retrySpy = mockAgentEndpoint({ events: [] });+ await userEvent.click(+ (await screen.findAllByTestId("metabot-chat-message-retry"))[0],+ );++ const body = await lastReqBody(retrySpy);+ expect(body.retry_message_id).toBe("user_msg_aborted");+ });++ it("should retry with the minted user id when aborted before the start event", async () => {+ setup();+ const [pause] = createPauses(1);+ const firstSpy = mockAgentEndpoint({+ stream: createMockSSEStream(+ (async function* () {+ yield* [];+ await pause.promise;+ })(),+ ),+ });+ await enterChatMessage("first prompt");+ await userEvent.click(await stopResponseButton());+ pause.resolve();+ await waitFor(() => {+ expect(+ screen.queryByTestId("metabot-stop-response"),+ ).not.toBeInTheDocument();+ });+ const firstReqBody = await lastReqBody(firstSpy);++ const retrySpy = mockAgentEndpoint({ events: [] });+ await userEvent.click(+ (await screen.findAllByTestId("metabot-chat-message-retry"))[0],+ );++ const body = await lastReqBody(retrySpy);+ expect(isUuid(firstReqBody.user_message_id)).toBe(true);+ expect(body.retry_message_id).toBe(firstReqBody.user_message_id);+ });++ it("should fall back to a plain send when the failed turn has no userMessageId", async () => {+ setup();+ mockAgentEndpoint({+ events: [{ type: "error", errorText: "boom" }],+ });+ await enterChatMessage("first prompt");+ expect(await screen.findByText(/Something went wrong/)).toBeInTheDocument();++ const retrySpy = mockAgentEndpoint({ events: [] });+ await userEvent.click(+ await screen.findByTestId("metabot-chat-message-retry"),+ );++ const body = await lastReqBody(retrySpy);+ expect(body.retry_message_id).toBeUndefined();+ });+});diff --git a/frontend/src/metabase/metabot/tests/threading.unit.spec.tsx b/frontend/src/metabase/metabot/tests/threading.unit.spec.tsxnew file mode 100644index 00000000000..ab61c0e618e--- /dev/null+++ b/frontend/src/metabase/metabot/tests/threading.unit.spec.tsx@@ -0,0 +1,157 @@+import userEvent from "@testing-library/user-event";++import { screen, waitFor } from "__support__/ui";+import { isUuid } from "metabase/utils/uuid";++import {+ createMockSSEStream,+ createPauses,+ enterChatMessage,+ erroredResponse,+ lastReqBody,+ mockAgentEndpoint,+ setup,+ stopResponseButton,+ whoIsYourFavoriteResponse,+} from "./utils";++describe("metabot > threading", () => {+ it("should omit parent_message_id for the very first message of a new conversation", async () => {+ setup();++ const agentSpy = mockAgentEndpoint({ events: [] });+ await enterChatMessage("Who is your favorite?");+ const reqBody = await lastReqBody(agentSpy);+ expect(reqBody?.parent_message_id).toBeUndefined();+ });++ it("should mint uuid user_message_id and assistant_message_id on every request", async () => {+ setup();++ const agentSpy = mockAgentEndpoint({ events: [] });+ await enterChatMessage("Who is your favorite?");+ const reqBody = await lastReqBody(agentSpy);+ expect(isUuid(reqBody?.user_message_id)).toBe(true);+ expect(isUuid(reqBody?.assistant_message_id)).toBe(true);+ });++ it("should send the minted assistant id as parent_message_id when aborted before the start event", async () => {+ setup();++ const [pause] = createPauses(1);+ const firstSpy = mockAgentEndpoint({+ stream: createMockSSEStream(+ (async function* () {+ yield* [];+ await pause.promise;+ })(),+ ),+ });+ await enterChatMessage("Who is your favorite?");+ await userEvent.click(await stopResponseButton());+ pause.resolve();+ await waitFor(() => {+ expect(+ screen.queryByTestId("metabot-stop-response"),+ ).not.toBeInTheDocument();+ });+ const firstReqBody = await lastReqBody(firstSpy);++ const agentSpy = mockAgentEndpoint({ events: [] });+ await enterChatMessage("Nevermind, hi!");+ const reqBody = await lastReqBody(agentSpy);+ expect(isUuid(firstReqBody?.assistant_message_id)).toBe(true);+ expect(reqBody?.parent_message_id).toBe(firstReqBody?.assistant_message_id);+ });++ it("should send parent_message_id matching the previous turn's external id", async () => {+ setup();++ const first = mockAgentEndpoint({+ events: whoIsYourFavoriteResponse,+ waitForResponse: true,+ });+ await enterChatMessage("Who is your favorite?");+ first.sendResponse();+ expect(+ await screen.findByText("You, but don't tell anyone."),+ ).toBeInTheDocument();++ const second = mockAgentEndpoint({+ events: [+ { type: "start", messageId: "msg_second_turn" },+ { type: "text-start", id: "t1" },+ { type: "text-delta", id: "t1", delta: "Sure." },+ { type: "text-end", id: "t1" },+ { type: "finish", finishReason: "stop" },+ ],+ waitForResponse: true,+ });+ await enterChatMessage("Are you sure?");+ second.sendResponse();+ expect(await screen.findByText("Sure.")).toBeInTheDocument();++ const agentSpy = mockAgentEndpoint({ events: [] });+ await enterChatMessage("Hi again!");+ const reqBody = await lastReqBody(agentSpy);+ expect(reqBody?.parent_message_id).toBe("msg_second_turn");+ });++ it("should send the aborted turn's message id as parent_message_id on the next message", async () => {+ setup();++ const [pause] = createPauses(1);+ mockAgentEndpoint({+ stream: createMockSSEStream(+ (async function* () {+ yield { type: "start", messageId: "msg_aborted_turn" };+ yield { type: "text-start", id: "t1" };+ yield { type: "text-delta", id: "t1", delta: "Let me think" };+ await pause.promise;+ })(),+ ),+ });+ await enterChatMessage("Who is your favorite?");+ await userEvent.click(await stopResponseButton());+ pause.resolve();+ await waitFor(() => {+ expect(+ screen.queryByTestId("metabot-stop-response"),+ ).not.toBeInTheDocument();+ });++ const agentSpy = mockAgentEndpoint({ events: [] });+ await enterChatMessage("Nevermind, hi!");+ const reqBody = await lastReqBody(agentSpy);+ expect(reqBody?.parent_message_id).toBe("msg_aborted_turn");+ });++ it("should thread onto the prior successful turn after an errored turn is rewound", async () => {+ setup();++ // a first successful turn establishes the pointer to fall back to+ mockAgentEndpoint({+ events: [+ { type: "start", messageId: "msg_good_turn" },+ { type: "text-start", id: "t1" },+ { type: "text-delta", id: "t1", delta: "First answer." },+ { type: "text-end", id: "t1" },+ { type: "finish", finishReason: "stop" },+ ],+ });+ await enterChatMessage("first prompt");+ expect(await screen.findByText("First answer.")).toBeInTheDocument();++ // a second turn fails at the stream level+ mockAgentEndpoint({ events: erroredResponse });+ await enterChatMessage("second prompt");+ expect(await screen.findByText(/Something went wrong/)).toBeInTheDocument();++ // the next submit rewinds the errored turn, so the pointer lands back on+ // the good turn rather than being cleared+ const agentSpy = mockAgentEndpoint({ events: [] });+ await enterChatMessage("third prompt");+ const reqBody = await lastReqBody(agentSpy);+ expect(reqBody?.parent_message_id).toBe("msg_good_turn");+ });+});diff --git a/frontend/src/metabase/metabot/tests/tool-calls.unit.spec.tsx b/frontend/src/metabase/metabot/tests/tool-calls.unit.spec.tsxindex a889fef0a18..8fd615e2d25 100644--- a/frontend/src/metabase/metabot/tests/tool-calls.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/tool-calls.unit.spec.tsx@@ -1,6 +1,7 @@import userEvent from "@testing-library/user-event";import { screen, waitFor } from "__support__/ui";+import { getMetabotConversation } from "metabase/metabot/state";import {assertConversation,@@ -221,4 +222,37 @@ describe("metabot > tool calls", () => {["agent", "You, but don't tell anyone."],]);});++ it("should mark unresolved tool calls as ended when a request is aborted", async () => {+ const { store } = setup();++ const [pause1] = createPauses(1);+ mockAgentEndpoint({+ stream: createMockSSEStream(+ (async function* () {+ yield {+ type: "tool-input-available",+ toolCallId: "test",+ toolName: "test",+ input: {},+ };+ await pause1.promise;+ })(),+ ),+ });+ await enterChatMessage("hi");+ await userEvent.click(await stopResponseButton());+ pause1.resolve();+ await waitFor(() => {+ const { messages } = getMetabotConversation(store.getState(), "omnibot");+ expect(messages).toContainEqual(+ expect.objectContaining({+ type: "tool_call",+ status: "ended",+ is_error: true,+ result: "Tool execution interrupted by user",+ }),+ );+ });+ });});diff --git a/frontend/src/metabase/metabot/tests/ui.unit.spec.tsx b/frontend/src/metabase/metabot/tests/ui.unit.spec.tsxindex 449e7977bc0..2ce50ac997d 100644--- a/frontend/src/metabase/metabot/tests/ui.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/ui.unit.spec.tsx@@ -3,6 +3,7 @@ import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";import { act, screen, waitFor, within } from "__support__/ui";+import { LONG_CONVO_MSG_LENGTH_THRESHOLD } from "metabase/metabot/constants";import { useMetabotAgent } from "metabase/metabot/hooks";import { metabotActions } from "metabase/metabot/state";import { getMetabotInitialState } from "metabase/metabot/state/reducer-utils";@@ -21,7 +22,6 @@ import {enterChatMessage,hideMetabot,input,- lastChatMessage,mockAgentEndpoint,resetChatButton,setup,@@ -234,71 +234,46 @@ describe("metabot > ui", () => {expect(secondParagraph).toBeInTheDocument();});- it("should present the user an option to retry a response", async () => {- setup();- mockAgentEndpoint({ events: whoIsYourFavoriteResponse });-- await enterChatMessage("Who is your favorite?");- const lastMessage = await lastChatMessage();- expect(lastMessage).toHaveTextContent(/You, but don't tell anyone./);- expect(- await within(lastMessage!).findByTestId("metabot-chat-message-retry"),- ).toBeInTheDocument();- });-- it("should successfully rewind a response", async () => {- setup();- mockAgentEndpoint({- events: [- { type: "text-start", id: "t0" },- { type: "text-delta", id: "t0", delta: "Let me think..." },- { type: "text-end", id: "t0" },- ...whoIsYourFavoriteResponse,- ],- });- await enterChatMessage("Who is your favorite?");-- const beforeMessages = await screen.findByTestId("metabot-chat-messages");- expect(beforeMessages).toHaveTextContent(/Let me think.../);- expect(beforeMessages).toHaveTextContent(/You, but don't tell anyone./);-- mockAgentEndpoint({- events: [- { type: "text-start", id: "t1" },- { type: "text-delta", id: "t1", delta: "The answer is always you." },- { type: "text-end", id: "t1" },- { type: "data-state", data: { queries: {} } },- { type: "finish", finishReason: "stop" },- ],+ it("should warn the chat is getting long w/ ability to clear it", async () => {+ const { store } = setup();+ const longMsg = "x".repeat(LONG_CONVO_MSG_LENGTH_THRESHOLD / 2);++ act(() => {+ store.dispatch(+ metabotActions.addUserMessage({+ id: "1",+ type: "text",+ message: longMsg,+ agentId: "omnibot",+ }),+ );});- await userEvent.click(- await screen.findByTestId("metabot-chat-message-retry"),- );-- const afterMessages = await screen.findByTestId("metabot-chat-messages");-- expect(afterMessages).not.toHaveTextContent(/Let me think.../);- expect(afterMessages).not.toHaveTextContent(/You, but don't tell anyone./);-- expect(afterMessages).toHaveTextContent(/The answer is always you./);- });-- it("should show retry option for error messages", async () => {- setup();+ expect(await screen.findByText(/xxxxxxx/)).toBeInTheDocument();+ expect(+ screen.queryByText(/This chat is getting long/),+ ).not.toBeInTheDocument();- mockAgentEndpoint({- events: [- { type: "error", errorText: "Anthropic API key expired or invalid" },- ],+ act(() => {+ store.dispatch(+ metabotActions.addUserMessage({+ id: "2",+ type: "text",+ message: longMsg,+ agentId: "omnibot",+ }),+ );});-- await enterChatMessage("Who is your favorite?");-- const lastMessage = await lastChatMessage();- expect(lastMessage).toHaveTextContent(/Something went wrong/);expect(- within(lastMessage!).getByTestId("metabot-chat-message-retry"),+ await screen.findByText(/This chat is getting long/),).toBeInTheDocument();+ await userEvent.click(await screen.findByTestId("metabot-reset-long-chat"));++ await waitFor(() => {+ expect(+ screen.queryByText(/This chat is getting long/),+ ).not.toBeInTheDocument();+ });+ expect(screen.queryByText(/xxxxxxx/)).not.toBeInTheDocument();});it("should be able to set the prompt input's value from anywhere in the app", async () => {diff --git a/frontend/src/metabase/metabot/utils/message-tree.ts b/frontend/src/metabase/metabot/utils/message-tree.tsnew file mode 100644index 00000000000..1202bf41f3e--- /dev/null+++ b/frontend/src/metabase/metabot/utils/message-tree.ts@@ -0,0 +1,109 @@+import type { MetabotChatMessage } from "metabase/metabot/state/types";++import {+ type FetchedChatMessage,+ normalizeFetchedChatMessages,+} from "./normalize-fetched-chat-messages";++export type ParentedChatMessage = FetchedChatMessage & {+ parent_message_id: string | null;+};++type BranchIndex = Map<string | null, ParentedChatMessage[]>;++type SelectedReplyByParentId = Record<string, string>;++const ROOT_KEY = "__root__";++type ResponseBranch = {+ parentId: string;+ currentIndex: number;+ replyIds: string[];+};++type ActiveResponse = {+ messages: MetabotChatMessage[];+ branch: ResponseBranch | null;+};++function indexChildrenByParent(messages: ParentedChatMessage[]): BranchIndex {+ const index: BranchIndex = new Map();+ for (const message of messages) {+ const siblings = index.get(message.parent_message_id);+ if (siblings) {+ siblings.push(message);+ } else {+ index.set(message.parent_message_id, [message]);+ }+ }+ return index;+}++function activePath(+ index: BranchIndex,+ selectedReplyByParentId: SelectedReplyByParentId,+): ParentedChatMessage[] {+ const path: ParentedChatMessage[] = [];+ let parentId: string | null = null;++ while (true) {+ const siblings = index.get(parentId);+ if (!siblings?.length) {+ return path;+ }++ const selectedId: string | undefined =+ selectedReplyByParentId[parentId ?? ROOT_KEY];+ // Siblings arrive oldest first; default to the newest.+ const node: ParentedChatMessage =+ siblings.find(({ id }) => id === selectedId) ??+ siblings[siblings.length - 1];+ path.push(node);+ parentId = node.id;+ }+}++export function activeResponses(+ messages: ParentedChatMessage[],+ selectedReplyByParentId: SelectedReplyByParentId,+ { isSlack }: { isSlack: boolean },+): ActiveResponse[] {+ const index = indexChildrenByParent(messages);+ const path = activePath(index, selectedReplyByParentId);+ return groupIntoResponses(path).map((response) => ({+ messages: normalizeFetchedChatMessages(response, { isSlack }),+ branch: branchAt(index, response),+ }));+}++function groupIntoResponses(+ path: ParentedChatMessage[],+): ParentedChatMessage[][] {+ const responses: ParentedChatMessage[][] = [];+ for (const node of path) {+ const current = responses.at(-1);+ if (current?.[0].role === "agent" && node.role === "agent") {+ current.push(node);+ } else {+ responses.push([node]);+ }+ }+ return responses;+}++function branchAt(+ index: BranchIndex,+ response: ParentedChatMessage[],+): ResponseBranch | null {+ const head = response[0];+ const siblings = index.get(head.parent_message_id) ?? [];+ if (siblings.length < 2) {+ return null;+ }++ return {+ parentId: head.parent_message_id ?? ROOT_KEY,+ currentIndex: siblings.findIndex(({ id }) => id === head.id),+ replyIds: siblings.map(({ id }) => id),+ };+}diff --git a/frontend/src/metabase/metabot/utils/message-tree.unit.spec.ts b/frontend/src/metabase/metabot/utils/message-tree.unit.spec.tsnew file mode 100644index 00000000000..62e1f59ef20--- /dev/null+++ b/frontend/src/metabase/metabot/utils/message-tree.unit.spec.ts@@ -0,0 +1,170 @@+import { type ParentedChatMessage, activeResponses } from "./message-tree";++function user(id: string, parentId: string | null): ParentedChatMessage {+ return {+ id,+ parent_message_id: parentId,+ role: "user",+ type: "text",+ message: id,+ };+}++function agent(id: string, parentId: string | null): ParentedChatMessage {+ return {+ id,+ parent_message_id: parentId,+ role: "agent",+ type: "text",+ message: id,+ externalId: id,+ };+}++const regenerated: ParentedChatMessage[] = [+ user("u1", null),+ agent("a1", "u1"),+ agent("a2", "u1"),+ user("u2", "a2"),+ agent("b1", "u2"),+];++describe("activeResponses", () => {+ it("defaults each branch to its newest reply", () => {+ const responses = activeResponses(regenerated, {}, { isSlack: false });++ expect(+ responses.flatMap(({ messages }) => messages.map(({ id }) => id)),+ ).toEqual(["u1", "a2", "u2", "b1"]);+ });++ it("follows a selected older reply and truncates everything downstream", () => {+ const responses = activeResponses(+ regenerated,+ { u1: "a1" },+ { isSlack: false },+ );++ expect(+ responses.flatMap(({ messages }) => messages.map(({ id }) => id)),+ ).toEqual(["u1", "a1"]);+ });++ it("marks a regenerated reply with its branch and alternatives", () => {+ const [prompt, reply] = activeResponses(+ regenerated,+ {},+ {+ isSlack: false,+ },+ );++ expect(prompt.branch).toBeNull();+ expect(reply.branch).toEqual({+ parentId: "u1",+ currentIndex: 1,+ replyIds: ["a1", "a2"],+ });+ });++ it("leaves a single reply unbranched", () => {+ const [, reply] = activeResponses(+ [user("u1", null), agent("a1", "u1")],+ {},+ { isSlack: false },+ );++ expect(reply.branch).toBeNull();+ });++ it("groups a multi-message reply", () => {+ const messages = [+ user("u1", null),+ agent("a1", "u1"),+ agent("a2", "u1"),+ agent("a2-tool", "a2"),+ user("u2", "a2-tool"),+ ];+ const [, reply, followUp] = activeResponses(+ messages,+ {},+ { isSlack: false },+ );++ expect(reply.messages.map(({ id }) => id)).toEqual(["a2", "a2-tool"]);+ expect(reply.branch).toEqual({+ parentId: "u1",+ currentIndex: 1,+ replyIds: ["a1", "a2"],+ });+ expect(followUp.messages[0].id).toBe("u2");+ });++ describe("user-prompt branches (rewound errored turn)", () => {+ const rewoundAtRoot = [+ user("uErr", null),+ agent("aErr", "uErr"),+ user("uLive", null),+ agent("aLive", "uLive"),+ ];++ it("defaults to the newest root prompt and marks it with a branch on the prompt", () => {+ const [prompt, reply] = activeResponses(+ rewoundAtRoot,+ {},+ { isSlack: false },+ );++ expect(prompt.messages.map(({ id }) => id)).toEqual(["uLive"]);+ expect(prompt.branch).toEqual({+ parentId: "__root__",+ currentIndex: 1,+ replyIds: ["uErr", "uLive"],+ });+ expect(reply.messages.map(({ id }) => id)).toEqual(["aLive"]);+ });++ it("follows a selected older root prompt to reveal the rewound errored turn", () => {+ const responses = activeResponses(+ rewoundAtRoot,+ { __root__: "uErr" },+ { isSlack: false },+ );++ expect(+ responses.flatMap(({ messages }) => messages.map(({ id }) => id)),+ ).toEqual(["uErr", "aErr"]);+ });++ it("branches user prompts mid-thread too", () => {+ const messages = [+ user("u1", null),+ agent("a1", "u1"),+ user("uErr", "a1"),+ agent("aErr", "uErr"),+ user("uLive", "a1"),+ agent("aLive", "uLive"),+ ];++ const promptResponse = activeResponses(+ messages,+ {},+ { isSlack: false },+ ).find(({ messages }) => messages[0]?.id === "uLive");+ expect(promptResponse?.branch).toEqual({+ parentId: "a1",+ currentIndex: 1,+ replyIds: ["uErr", "uLive"],+ });++ const selected = activeResponses(+ messages,+ { a1: "uErr" },+ { isSlack: false },+ );+ expect(+ selected.flatMap(({ messages }) => messages.map(({ id }) => id)),+ ).toEqual(["u1", "a1", "uErr", "aErr"]);+ });+ });+});diff --git a/frontend/src/metabase/metabot/utils/slack-mrkdwn.ts b/frontend/src/metabase/metabot/utils/slack-mrkdwn.tsindex 1203263c8bf..36d74cc0a87 100644--- a/frontend/src/metabase/metabot/utils/slack-mrkdwn.ts+++ b/frontend/src/metabase/metabot/utils/slack-mrkdwn.ts@@ -37,5 +37,6 @@ export function convertSlackChatMessage(.with({ role: "agent", type: "tool_call" }, (m) => m).with({ role: "agent", type: "turn_aborted" }, (m) => m).with({ role: "agent", type: "turn_errored" }, (m) => m)+ .with({ role: "agent", type: "turn_in_progress" }, (m) => m).exhaustive();}diff --git a/frontend/src/metabase/query_builder/reducers.ts b/frontend/src/metabase/query_builder/reducers.tsindex 0fafa7c5f1f..9deff2c4795 100644--- a/frontend/src/metabase/query_builder/reducers.ts+++ b/frontend/src/metabase/query_builder/reducers.ts@@ -688,7 +688,11 @@ export const card = createReducer<Card | null>(null, (builder) => {visualization_settings: action.payload.card.visualization_settings,};},- )+ );++ // a separate builder statement keeps the expression shallow enough for+ // TypeScript's instantiation-depth limit (TS2589)+ builder.addMatcher(createCardPublicLink.matchFulfilled, (state, action) => {if (!state) {return state;diff --git a/frontend/test/__support__/server-mocks/index.ts b/frontend/test/__support__/server-mocks/index.tsindex 10267597e66..4877b0d5cc9 100644--- a/frontend/test/__support__/server-mocks/index.ts+++ b/frontend/test/__support__/server-mocks/index.ts@@ -33,6 +33,7 @@ export * from "./library";export * from "./logger";export * from "./measure";export * from "./metabot";+export * from "./metabot-analytics";export * from "./metric";export * from "./model-indexes";export * from "./multi-factor-auth";diff --git a/frontend/test/__support__/server-mocks/metabot-analytics.ts b/frontend/test/__support__/server-mocks/metabot-analytics.tsnew file mode 100644index 00000000000..8587dcd87e6--- /dev/null+++ b/frontend/test/__support__/server-mocks/metabot-analytics.ts@@ -0,0 +1,12 @@+import fetchMock from "fetch-mock";++import type { ConversationDetail } from "metabase-enterprise/audit_app/metabot-analytics/types";++export function setupMetabotConversationEndpoint(+ conversation: ConversationDetail,+) {+ fetchMock.get(+ `path:/api/ee/metabot-analytics/conversations/${conversation.conversation_id}`,+ conversation,+ );+}diff --git a/resources/migrations/064/20260706_metabot_message_state.yaml b/resources/migrations/064/20260706_metabot_message_state.yamlnew file mode 100644index 00000000000..deba574abcc--- /dev/null+++ b/resources/migrations/064/20260706_metabot_message_state.yaml@@ -0,0 +1,91 @@+# Per-message partial conversation state, merged across live rows to reconstruct+# the full state server-side (replaces the metabot_conversation.state blob).++databaseChangeLog:+ - changeSet:+ id: v64.2026-07-06T00:00:00+ author: sloansparger+ comment: Add state to metabot_message for per-turn partial conversation state+ changes:+ - addColumn:+ tableName: metabot_message+ columns:+ - column:+ name: state+ remarks: Partial conversation state produced by this assistant turn+ type: ${text.type}+ rollback:+ - dropColumn:+ tableName: metabot_message+ columnName: state++ - changeSet:+ id: v64.2026-07-06T00:00:01+ author: sloansparger+ comment: Move each conversation's legacy state blob onto its earliest replayable assistant message+ changes:+ - sql:+ # The blob is cumulative across every turn, so it belongs on the+ # earliest replayable assistant row: it merges first during reconstruction+ # and retrying a later turn cannot delete state it did not produce.+ sql: >-+ UPDATE metabot_message+ SET state = (SELECT c.state+ FROM metabot_conversation c+ WHERE c.id = metabot_message.conversation_id)+ WHERE metabot_message.state IS NULL+ AND metabot_message.id IN (SELECT first_id+ FROM (SELECT id AS first_id,+ ROW_NUMBER() OVER (PARTITION BY conversation_id ORDER BY created_at, id) AS row_num+ FROM metabot_message+ WHERE role = 'assistant'+ AND deleted_at IS NULL+ AND error IS NULL+ AND finished IS NOT NULL) AS firsts+ WHERE row_num = 1)+ AND metabot_message.conversation_id IN (SELECT id+ FROM metabot_conversation+ WHERE state IS NOT NULL);+ rollback: # restored when metabot_conversation.state is re-added below++ - changeSet:+ id: v64.2026-07-06T00:00:02+ author: sloansparger+ comment: Drop metabot_conversation.state now that state lives on metabot_message+ changes:+ - dropColumn:+ tableName: metabot_conversation+ columnName: state+ rollback:+ - addColumn:+ tableName: metabot_conversation+ columns:+ - column:+ name: state+ remarks: Metabot conversation state+ type: ${text.type}+ - sql:+ # Best-effort rollback: upgraded conversations have their full legacy+ # blob on the earliest replayable message. New post-upgrade per-turn+ # partials are not losslessly mergeable in portable SQL.+ sql: >-+ UPDATE metabot_conversation+ SET state = (SELECT m.state+ FROM metabot_message m+ WHERE m.conversation_id = metabot_conversation.id+ AND m.state IS NOT NULL+ AND m.role = 'assistant'+ AND m.deleted_at IS NULL+ AND m.error IS NULL+ AND m.finished IS NOT NULL+ ORDER BY m.created_at, m.id+ LIMIT 1)+ WHERE metabot_conversation.state IS NULL+ AND EXISTS (SELECT 1+ FROM metabot_message m+ WHERE m.conversation_id = metabot_conversation.id+ AND m.state IS NOT NULL+ AND m.role = 'assistant'+ AND m.deleted_at IS NULL+ AND m.error IS NULL+ AND m.finished IS NOT NULL);diff --git a/resources/migrations/064/20260713_metabot_analytics_views_include_deleted.yaml b/resources/migrations/064/20260713_metabot_analytics_views_include_deleted.yamlnew file mode 100644index 00000000000..929e9a8cfb5--- /dev/null+++ b/resources/migrations/064/20260713_metabot_analytics_views_include_deleted.yaml@@ -0,0 +1,76 @@+## Include soft-deleted (rewound / regenerated-away) metabot_message rows in the+## instance analytics views, matching the admin metabot-analytics API, which now+## surfaces deleted attempts so conversation branches are visible.+##+## v_metabot_conversations v4 drops the `deleted_at IS NULL` filters from its+## message join and profile subqueries, so message_count / assistant_message_count+## and profile now count every attempt. (Token totals already come from+## ai_usage_log and were unaffected by the filter.)+##+## v_metabot_messages v2 drops the `WHERE m.deleted_at IS NULL` filter so deleted+## message rows are returned.++databaseChangeLog:+ - changeSet:+ id: v64.2026-07-13T00:00:00+ author: sloansparger+ runOnChange: true+ comment: Update v_metabot_conversations to include soft-deleted messages+ changes:+ - sqlFile:+ dbms: postgresql+ path: ../instance_analytics_views/metabot_conversations/v4/postgres-metabot_conversations.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: mysql,mariadb+ path: ../instance_analytics_views/metabot_conversations/v4/mysql-metabot_conversations.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: h2+ path: ../instance_analytics_views/metabot_conversations/v4/h2-metabot_conversations.sql+ relativeToChangelogFile: true+ rollback:+ - sqlFile:+ dbms: postgresql+ path: ../instance_analytics_views/metabot_conversations/v3/postgres-metabot_conversations.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: mysql,mariadb+ path: ../instance_analytics_views/metabot_conversations/v3/mysql-metabot_conversations.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: h2+ path: ../instance_analytics_views/metabot_conversations/v3/h2-metabot_conversations.sql+ relativeToChangelogFile: true++ - changeSet:+ id: v64.2026-07-13T00:00:01+ author: sloansparger+ runOnChange: true+ comment: Update v_metabot_messages to include soft-deleted messages+ changes:+ - sqlFile:+ dbms: postgresql+ path: ../instance_analytics_views/metabot_messages/v2/postgres-metabot_messages.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: mysql,mariadb+ path: ../instance_analytics_views/metabot_messages/v2/mysql-metabot_messages.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: h2+ path: ../instance_analytics_views/metabot_messages/v2/h2-metabot_messages.sql+ relativeToChangelogFile: true+ rollback:+ - sqlFile:+ dbms: postgresql+ path: ../instance_analytics_views/metabot_messages/v1/postgres-metabot_messages.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: mysql,mariadb+ path: ../instance_analytics_views/metabot_messages/v1/mysql-metabot_messages.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: h2+ path: ../instance_analytics_views/metabot_messages/v1/h2-metabot_messages.sql+ relativeToChangelogFile: truediff --git a/resources/migrations/instance_analytics_views/metabot_conversations/v4/h2-metabot_conversations.sql b/resources/migrations/instance_analytics_views/metabot_conversations/v4/h2-metabot_conversations.sqlnew file mode 100644index 00000000000..1d9cebaf1b2--- /dev/null+++ b/resources/migrations/instance_analytics_views/metabot_conversations/v4/h2-metabot_conversations.sql@@ -0,0 +1,95 @@+DROP VIEW IF EXISTS v_metabot_conversations;++CREATE OR REPLACE VIEW v_metabot_conversations AS+SELECT+ c.id AS conversation_id,+ c.created_at,+ c.user_id,+ c.summary,+ COALESCE(u.first_name || ' ' || u.last_name, u.email) AS user_display_name,+ COUNT(m.id) AS message_count,+ COUNT(CASE WHEN m.role = 'user' THEN 1 END) AS user_message_count,+ COUNT(CASE WHEN m.role = 'assistant' THEN 1 END) AS assistant_message_count,+ COALESCE(MAX(a.total_tokens), 0) AS total_tokens,+ COALESCE(MAX(a.prompt_tokens), 0) AS prompt_tokens,+ COALESCE(MAX(a.completion_tokens), 0) AS completion_tokens,+ MAX(m.created_at) AS last_message_at,+ (SELECT mm.profile_id+ FROM metabot_message mm+ WHERE mm.conversation_id = c.id+ AND mm.role = 'assistant'+ ORDER BY mm.created_at, mm.id+ LIMIT 1) AS profile_id,+ (SELECT CASE mm.profile_id+ WHEN 'internal' THEN 'Internal'+ WHEN 'embedding_next' THEN 'Embedding'+ WHEN 'nlq' THEN 'NLQ'+ WHEN 'sql' THEN 'SQL'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'transforms_codegen' THEN 'Transforms codegen'+ WHEN 'document-generate-content' THEN 'Documents'+ ELSE mm.profile_id+ END+ FROM metabot_message mm+ WHERE mm.conversation_id = c.id+ AND mm.role = 'assistant'+ ORDER BY mm.created_at, mm.id+ LIMIT 1) AS profile_name,+ (SELECT pg.name+ FROM permissions_group_membership pgm+ JOIN permissions_group pg ON pg.id = pgm.group_id+ WHERE pgm.user_id = c.user_id+ AND pg.id != 1+ ORDER BY pg.name+ LIMIT 1) AS group_name,+ (SELECT aul.source+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS source,+ (SELECT CASE aul.source+ WHEN 'metabot_agent' THEN 'Metabot'+ WHEN 'agent' THEN 'Metabot'+ WHEN 'document_generate_content' THEN 'Documents'+ WHEN 'example_question_generation_batch' THEN 'Suggested Prompts'+ WHEN 'slack' THEN 'Slackbot'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'oss-sql-gen' THEN 'SQL'+ WHEN 'sql-gen' THEN 'SQL'+ WHEN 'unknown' THEN 'Unknown'+ ELSE aul.source+ END+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS source_name,+ c.ip_address AS ip_address,+ c.embedding_hostname AS embedding_hostname,+ c.embedding_path AS embedding_path,+ c.user_agent AS user_agent,+ c.sanitized_user_agent AS sanitized_user_agent,+ MAX(a.tenant_id) AS tenant_id,+ MAX(t.name) AS tenant_name,+ (SELECT aul.model+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS model+FROM metabot_conversation c+LEFT JOIN core_user u+ ON u.id = c.user_id+LEFT JOIN metabot_message m+ ON m.conversation_id = c.id+LEFT JOIN (+ SELECT+ conversation_id,+ COALESCE(SUM(prompt_tokens), 0) AS prompt_tokens,+ COALESCE(SUM(completion_tokens), 0) AS completion_tokens,+ COALESCE(SUM(total_tokens), 0) AS total_tokens,+ MIN(tenant_id) AS tenant_id+ FROM ai_usage_log+ WHERE conversation_id IS NOT NULL+ GROUP BY conversation_id+) a ON a.conversation_id = c.id+LEFT JOIN tenant t ON t.id = a.tenant_id+GROUP BY c.id, c.created_at, c.user_id, c.summary, u.first_name, u.last_name, u.email;diff --git a/resources/migrations/instance_analytics_views/metabot_conversations/v4/mysql-metabot_conversations.sql b/resources/migrations/instance_analytics_views/metabot_conversations/v4/mysql-metabot_conversations.sqlnew file mode 100644index 00000000000..2e626e4f9c8--- /dev/null+++ b/resources/migrations/instance_analytics_views/metabot_conversations/v4/mysql-metabot_conversations.sql@@ -0,0 +1,95 @@+DROP VIEW IF EXISTS v_metabot_conversations;++CREATE OR REPLACE VIEW v_metabot_conversations AS+SELECT+ c.id AS conversation_id,+ c.created_at,+ c.user_id,+ c.summary,+ COALESCE(CONCAT(u.first_name, ' ', u.last_name), u.email) AS user_display_name,+ COUNT(m.id) AS message_count,+ COUNT(CASE WHEN m.role = 'user' THEN 1 END) AS user_message_count,+ COUNT(CASE WHEN m.role = 'assistant' THEN 1 END) AS assistant_message_count,+ COALESCE(MAX(a.total_tokens), 0) AS total_tokens,+ COALESCE(MAX(a.prompt_tokens), 0) AS prompt_tokens,+ COALESCE(MAX(a.completion_tokens), 0) AS completion_tokens,+ MAX(m.created_at) AS last_message_at,+ (SELECT mm.profile_id+ FROM metabot_message mm+ WHERE mm.conversation_id = c.id+ AND mm.role = 'assistant'+ ORDER BY mm.created_at, mm.id+ LIMIT 1) AS profile_id,+ (SELECT CASE mm.profile_id+ WHEN 'internal' THEN 'Internal'+ WHEN 'embedding_next' THEN 'Embedding'+ WHEN 'nlq' THEN 'NLQ'+ WHEN 'sql' THEN 'SQL'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'transforms_codegen' THEN 'Transforms codegen'+ WHEN 'document-generate-content' THEN 'Documents'+ ELSE mm.profile_id+ END+ FROM metabot_message mm+ WHERE mm.conversation_id = c.id+ AND mm.role = 'assistant'+ ORDER BY mm.created_at, mm.id+ LIMIT 1) AS profile_name,+ (SELECT pg.name+ FROM permissions_group_membership pgm+ JOIN permissions_group pg ON pg.id = pgm.group_id+ WHERE pgm.user_id = c.user_id+ AND pg.id != 1+ ORDER BY pg.name+ LIMIT 1) AS group_name,+ (SELECT aul.source+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS source,+ (SELECT CASE aul.source+ WHEN 'metabot_agent' THEN 'Metabot'+ WHEN 'agent' THEN 'Metabot'+ WHEN 'document_generate_content' THEN 'Documents'+ WHEN 'example_question_generation_batch' THEN 'Suggested Prompts'+ WHEN 'slack' THEN 'Slackbot'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'oss-sql-gen' THEN 'SQL'+ WHEN 'sql-gen' THEN 'SQL'+ WHEN 'unknown' THEN 'Unknown'+ ELSE aul.source+ END+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS source_name,+ c.ip_address AS ip_address,+ c.embedding_hostname AS embedding_hostname,+ c.embedding_path AS embedding_path,+ c.user_agent AS user_agent,+ c.sanitized_user_agent AS sanitized_user_agent,+ MAX(a.tenant_id) AS tenant_id,+ MAX(t.name) AS tenant_name,+ (SELECT aul.model+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS model+FROM metabot_conversation c+LEFT JOIN core_user u+ ON u.id = c.user_id+LEFT JOIN metabot_message m+ ON m.conversation_id = c.id+LEFT JOIN (+ SELECT+ conversation_id,+ COALESCE(SUM(prompt_tokens), 0) AS prompt_tokens,+ COALESCE(SUM(completion_tokens), 0) AS completion_tokens,+ COALESCE(SUM(total_tokens), 0) AS total_tokens,+ MIN(tenant_id) AS tenant_id+ FROM ai_usage_log+ WHERE conversation_id IS NOT NULL+ GROUP BY conversation_id+) a ON a.conversation_id = c.id+LEFT JOIN tenant t ON t.id = a.tenant_id+GROUP BY c.id, c.created_at, c.user_id, c.summary, u.first_name, u.last_name, u.email;diff --git a/resources/migrations/instance_analytics_views/metabot_conversations/v4/postgres-metabot_conversations.sql b/resources/migrations/instance_analytics_views/metabot_conversations/v4/postgres-metabot_conversations.sqlnew file mode 100644index 00000000000..7db63e78cc3--- /dev/null+++ b/resources/migrations/instance_analytics_views/metabot_conversations/v4/postgres-metabot_conversations.sql@@ -0,0 +1,95 @@+DROP VIEW IF EXISTS v_metabot_conversations;++CREATE OR REPLACE VIEW v_metabot_conversations AS+SELECT+ c.id AS conversation_id,+ c.created_at,+ c.user_id,+ c.summary,+ COALESCE(u.first_name || ' ' || u.last_name, u.email) AS user_display_name,+ COUNT(m.id) AS message_count,+ COUNT(CASE WHEN m.role = 'user' THEN 1 END) AS user_message_count,+ COUNT(CASE WHEN m.role = 'assistant' THEN 1 END) AS assistant_message_count,+ COALESCE(MAX(a.total_tokens), 0) AS total_tokens,+ COALESCE(MAX(a.prompt_tokens), 0) AS prompt_tokens,+ COALESCE(MAX(a.completion_tokens), 0) AS completion_tokens,+ MAX(m.created_at) AS last_message_at,+ (SELECT mm.profile_id+ FROM metabot_message mm+ WHERE mm.conversation_id = c.id+ AND mm.role = 'assistant'+ ORDER BY mm.created_at, mm.id+ LIMIT 1) AS profile_id,+ (SELECT CASE mm.profile_id+ WHEN 'internal' THEN 'Internal'+ WHEN 'embedding_next' THEN 'Embedding'+ WHEN 'nlq' THEN 'NLQ'+ WHEN 'sql' THEN 'SQL'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'transforms_codegen' THEN 'Transforms codegen'+ WHEN 'document-generate-content' THEN 'Documents'+ ELSE mm.profile_id+ END+ FROM metabot_message mm+ WHERE mm.conversation_id = c.id+ AND mm.role = 'assistant'+ ORDER BY mm.created_at, mm.id+ LIMIT 1) AS profile_name,+ (SELECT pg.name+ FROM permissions_group_membership pgm+ JOIN permissions_group pg ON pg.id = pgm.group_id+ WHERE pgm.user_id = c.user_id+ AND pg.id != 1+ ORDER BY pg.name+ LIMIT 1) AS group_name,+ (SELECT aul.source+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS source,+ (SELECT CASE aul.source+ WHEN 'metabot_agent' THEN 'Metabot'+ WHEN 'agent' THEN 'Metabot'+ WHEN 'document_generate_content' THEN 'Documents'+ WHEN 'example_question_generation_batch' THEN 'Suggested Prompts'+ WHEN 'slack' THEN 'Slackbot'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'oss-sql-gen' THEN 'SQL'+ WHEN 'sql-gen' THEN 'SQL'+ WHEN 'unknown' THEN 'Unknown'+ ELSE aul.source+ END+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS source_name,+ c.ip_address AS ip_address,+ c.embedding_hostname AS embedding_hostname,+ c.embedding_path AS embedding_path,+ c.user_agent AS user_agent,+ c.sanitized_user_agent AS sanitized_user_agent,+ MAX(a.tenant_id) AS tenant_id,+ MAX(t.name) AS tenant_name,+ (SELECT aul.model+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS model+FROM metabot_conversation c+LEFT JOIN core_user u+ ON u.id = c.user_id+LEFT JOIN metabot_message m+ ON m.conversation_id = c.id+LEFT JOIN (+ SELECT+ conversation_id,+ COALESCE(SUM(prompt_tokens), 0) AS prompt_tokens,+ COALESCE(SUM(completion_tokens), 0) AS completion_tokens,+ COALESCE(SUM(total_tokens), 0) AS total_tokens,+ MIN(tenant_id) AS tenant_id+ FROM ai_usage_log+ WHERE conversation_id IS NOT NULL+ GROUP BY conversation_id+) a ON a.conversation_id = c.id+LEFT JOIN tenant t ON t.id = a.tenant_id+GROUP BY c.id, c.created_at, c.user_id, c.summary, u.first_name, u.last_name, u.email;diff --git a/resources/migrations/instance_analytics_views/metabot_messages/v2/h2-metabot_messages.sql b/resources/migrations/instance_analytics_views/metabot_messages/v2/h2-metabot_messages.sqlnew file mode 100644index 00000000000..7f85a20b926--- /dev/null+++ b/resources/migrations/instance_analytics_views/metabot_messages/v2/h2-metabot_messages.sql@@ -0,0 +1,16 @@+DROP VIEW IF EXISTS v_metabot_messages;++CREATE OR REPLACE VIEW v_metabot_messages AS+SELECT+ m.id AS message_id,+ m.conversation_id,+ m.created_at,+ m.role,+ m.profile_id,+ m.total_tokens,+ COALESCE(m.user_id, c.user_id) AS user_id,+ m.slack_msg_id,+ m.channel_id+FROM metabot_message m+JOIN metabot_conversation c+ ON c.id = m.conversation_id;diff --git a/resources/migrations/instance_analytics_views/metabot_messages/v2/mysql-metabot_messages.sql b/resources/migrations/instance_analytics_views/metabot_messages/v2/mysql-metabot_messages.sqlnew file mode 100644index 00000000000..7f85a20b926--- /dev/null+++ b/resources/migrations/instance_analytics_views/metabot_messages/v2/mysql-metabot_messages.sql@@ -0,0 +1,16 @@+DROP VIEW IF EXISTS v_metabot_messages;++CREATE OR REPLACE VIEW v_metabot_messages AS+SELECT+ m.id AS message_id,+ m.conversation_id,+ m.created_at,+ m.role,+ m.profile_id,+ m.total_tokens,+ COALESCE(m.user_id, c.user_id) AS user_id,+ m.slack_msg_id,+ m.channel_id+FROM metabot_message m+JOIN metabot_conversation c+ ON c.id = m.conversation_id;diff --git a/resources/migrations/instance_analytics_views/metabot_messages/v2/postgres-metabot_messages.sql b/resources/migrations/instance_analytics_views/metabot_messages/v2/postgres-metabot_messages.sqlnew file mode 100644index 00000000000..7f85a20b926--- /dev/null+++ b/resources/migrations/instance_analytics_views/metabot_messages/v2/postgres-metabot_messages.sql@@ -0,0 +1,16 @@+DROP VIEW IF EXISTS v_metabot_messages;++CREATE OR REPLACE VIEW v_metabot_messages AS+SELECT+ m.id AS message_id,+ m.conversation_id,+ m.created_at,+ m.role,+ m.profile_id,+ m.total_tokens,+ COALESCE(m.user_id, c.user_id) AS user_id,+ m.slack_msg_id,+ m.channel_id+FROM metabot_message m+JOIN metabot_conversation c+ ON c.id = m.conversation_id;diff --git a/src/metabase/metabot/agent/core.clj b/src/metabase/metabot/agent/core.cljindex 41973b304a6..b49842cbf6e 100644--- a/src/metabase/metabot/agent/core.clj+++ b/src/metabase/metabot/agent/core.clj@@ -14,6 +14,7 @@[metabase.metabot.agent.profiles :as profiles][metabase.metabot.agent.streaming :as streaming][metabase.metabot.provider-util :as provider-util]+ [metabase.metabot.schema :as metabot.schema][metabase.metabot.scope :as scope][metabase.metabot.self :as self][metabase.metabot.self.core :as self.core]@@ -145,16 +146,6 @@"Sequence of messages in the conversation."[:sequential ::message])-(mr/def ::state- "Agent state containing queries, charts, chart-configs, todos, transforms, and link-registry."- [:map- [:queries {:optional true} [:map-of [:or :string :keyword] :map]]- [:charts {:optional true} [:map-of [:or :string :keyword] :map]]- [:chart-configs {:optional true} [:map-of [:or :string :keyword] :map]]- [:todos {:optional true} [:sequential :map]]- [:transforms {:optional true} [:map-of [:or :string :keyword] :map]]- [:link-registry {:optional true} [:map-of [:or :string :keyword] :string]]])-(mr/def ::context"Context information for the agent."[:map-of :keyword :any])@@ -284,7 +275,7 @@(filter #(and (:query-id %) (:query %))))(completing(fn [mem {:keys [query-id query]}]- (memory/remember-query mem query-id query)))+ (memory/set-query mem query-id query)))memoryparts))@@ -297,12 +288,12 @@(filter #(and (:chart-id %) (:query-id %))))(completing(fn [mem {:keys [chart-id query-id chart-type query]}]- (memory/store-chart mem- chart-id- {:chart_id chart-id- :query_id query-id- :queries [query]- :visualization_settings {:chart_type chart-type}})))+ (memory/set-chart mem+ chart-id+ {:chart_id chart-id+ :query_id query-id+ :queries [query]+ :visualization_settings {:chart_type chart-type}})))memoryparts))@@ -423,7 +414,8 @@(defn- init-agent"Initialize agent state."- [{:keys [messages state metabot-id profile-id context tracking-opts]}]+ [{:keys [messages state metabot-id profile-id context tracking-opts]+ external-memory-atom :memory-atom}](let [context (assign-context-ids context);; Resolve the profile once (its nlq availability redirect probes the index): reuse it for both the;; prompt and the tools so they can't disagree about whether the curated library tool is offered.@@ -435,13 +427,8 @@(seed-state context)(seed-chart-configs context)(seed-charts context))- memory (-> (memory/initialize messages seeded context)- (memory/load-queries-from-state seeded)- (memory/load-charts-from-state seeded)- (memory/load-transforms-from-state seeded)- (memory/load-todos-from-state seeded)- (memory/load-link-registry-from-state seeded))- memory-atom (atom memory)+ memory (memory/initialize messages seeded context)+ memory-atom (doto (or external-memory-atom (atom nil)) (reset! memory))tools (tools/wrap-tools-with-state base-tools memory-atom metabot-id profile-id)](log/info "Starting agent" {:profile profile-id:tools (count tools)@@ -530,7 +517,7 @@reduced-result))parts @parts-atom];; Sync link registry back to memory after streaming completes- (swap! memory-atom assoc-in [:state :link-registry] @link-registry-atom)+ (swap! memory-atom memory/set-link-registry @link-registry-atom);; Capture response for debug log(when *debug-log*(debug-log! {:iteration iteration@@ -637,7 +624,7 @@[:messages ::messages][:profile-id ::profile-id][:metabot-id {:optional true} [:maybe :string]]- [:state {:optional true} [:maybe ::state]]+ [:state {:optional true} [:maybe ::metabot.schema/state]][:context {:optional true} [:maybe ::context]][:tracking-opts {:optional true} [:maybe ::tracking-opts]];; eval-only: when supplied (e.g. by the benchmark harness), names the per-session@@ -647,7 +634,8 @@;; and `ait/safe-session-id-re` are the single source of truth for the cap and the charset.[:eval-session-id {:optional true}[:maybe [:and [:string {:max ait/max-session-id-length}] [:re ait/safe-session-id-re]]]]- [:debug? {:optional true} [:maybe :boolean]]]]+ [:debug? {:optional true} [:maybe :boolean]]+ [:memory-atom {:optional true} [:maybe [:fn #(instance? clojure.lang.Atom %)]]]]](let [profile-id (:profile-id opts)debug? (:debug? opts)labels {:profile-id (name profile-id)}diff --git a/src/metabase/metabot/agent/memory.clj b/src/metabase/metabot/agent/memory.cljindex 3b9ee8c9102..02356c0ba1d 100644--- a/src/metabase/metabot/agent/memory.clj+++ b/src/metabase/metabot/agent/memory.clj@@ -1,23 +1,34 @@(ns metabase.metabot.agent.memory"Memory and state management for the agent loop.- Tracks conversation history, tool execution steps, and conversation state."+ Tracks conversation history, tool execution steps, and conversation state.++ `:state` is the live working state readers see — the incoming baseline (prior+ turns merged, plus seeded viewing context) with this turn's writes applied.+ `:turn-state` accumulates *only* what this turn wrote, and is what gets+ persisted to `metabot_message.state`; readers never touch it. Writers record+ into both."(:require- [clojure.string :as str]))+ [clojure.string :as str]+ [metabase.metabot.schema :as metabot.schema]))++(defn merge-states+ "Merge two partial states. Map entries (e.g. :queries) merge entry-wise;+ scalar/vector entries (e.g. :todos) take the later value."+ [a b]+ (merge-with (fn [x y] (if (every? map? [x y]) (merge x y) y)) a b))(defn initialize- "Initialize memory from input messages and initial state.- State structure:- {:queries {query-id query-map}- :charts {chart-id chart-map}- :todos [...]- :transforms {...}}"+ "Initialize memory from input messages and the incoming baseline `state` (prior+ turns merged, plus seeded viewing context)."([messages state](initialize messages state nil))([messages state context]{:input-messages messages- :steps-taken []- :context context- :state (or state {:queries {} :charts {} :todos [] :transforms {} :link-registry {}})}))+ :steps-taken []+ :context context+ :state (metabot.schema/normalize-state+ (or state {:queries {} :charts {} :todos [] :transforms {} :link-registry {}}))+ :turn-state {}}))(defn add-step"Add a completed agent step to memory.@@ -25,16 +36,25 @@[memory parts](update memory :steps-taken conj {:parts parts}))+(defn- record+ "Write `v` at `path` into both the live working `:state` and this turn's+ `:turn-state` delta. Readers see it via `:state`; persistence keeps `:turn-state`."+ [memory path v]+ (-> memory+ (assoc-in (into [:state] path) v)+ (assoc-in (into [:turn-state] path) v)))+(defn get-state- "Extract conversation state from memory.- State includes queries, charts, todos, transforms, etc."+ "The agent's current full working state."[memory](:state memory))-(defn update-state- "Update conversation state with new entities."- [memory state-updates]- (update memory :state merge state-updates))+(defn turn-state+ "Only this turn's state writes, or nil if the turn produced none. Persisted to+ `metabot_message.state`; [[metabase.metabot.persistence/conversation-state]]+ merges these across a conversation's rows to reconstruct the baseline."+ [memory]+ (not-empty (:turn-state memory)))(defn get-steps"Get all steps taken by the agent so far."@@ -53,15 +73,14 @@;;; Query Management-(defn remember-query- "Store a query in memory state by its query-id.+(defn set-query+ "Store a query in state by its query-id.Query should be an MBQL 4 (legacy) or MBQL 5 query map."[memory query-id query]- (update-in memory [:state :queries] assoc query-id query))+ (record memory [:queries query-id] query))(defn find-query- "Retrieve a query from memory state by its query-id.- Throws if query not found."+ "Retrieve a query by its query-id. Throws if not found."[memory query-id](let [queries (get-in memory [:state :queries] {})](if-let [query (get queries query-id)]@@ -73,21 +92,15 @@:query-id query-id:available-queries (keys queries)})))))-(defn get-queries- "Get all stored queries from memory state."- [memory]- (get-in memory [:state :queries] {}))-;;; Chart Management-(defn store-chart- "Store a chart configuration in memory state by its chart-id."+(defn set-chart+ "Store a chart configuration in state by its chart-id."[memory chart-id chart]- (update-in memory [:state :charts] assoc chart-id chart))+ (record memory [:charts chart-id] chart))(defn find-chart- "Retrieve a chart from memory state by its chart-id.- Throws if chart not found."+ "Retrieve a chart by its chart-id. Throws if not found."[memory chart-id](let [charts (get-in memory [:state :charts] {})](if-let [chart (get charts chart-id)]@@ -98,21 +111,15 @@:chart-id chart-id:available-charts (keys charts)})))))-(defn get-charts- "Get all stored charts from memory state."- [memory]- (get-in memory [:state :charts] {}))-;;; Transform Management-(defn remember-transform- "Store a transform in memory state by its ID."+(defn set-transform+ "Store a transform in state by its ID."[memory transform-id transform]- (update-in memory [:state :transforms] assoc (str transform-id) transform))+ (record memory [:transforms (str transform-id)] transform))(defn find-transform- "Retrieve a transform from memory by its ID.- Throws if transform not found."+ "Retrieve a transform by its ID. Throws if not found."[memory transform-id](let [transforms (get-in memory [:state :transforms] {})](if-let [transform (get transforms (str transform-id))]@@ -123,62 +130,16 @@:transform-id transform-id:available-transforms (keys transforms)})))))-(defn get-transforms- "Get all stored transforms from memory state."- [memory]- (get-in memory [:state :transforms] {}))--;;; Todo Management+;;; Todos & link registry (whole-value writes)(defn set-todos- "Set the todo list in memory state.- Todos should be a vector of todo item maps."+ "Set the todo list (a vector of todo item maps)."[memory todos]- (assoc-in memory [:state :todos] (vec todos)))--(defn get-todos- "Get the current todo list from memory state."- [memory]- (get-in memory [:state :todos] []))--;;; State Loading--(defn load-queries-from-state- "Load queries from incoming state into memory."- [memory state]- (if-let [queries (:queries state)]- (reduce-kv remember-query memory queries)- memory))--(defn load-charts-from-state- "Load charts from incoming state into memory."- [memory state]- (if-let [charts (:charts state)]- (reduce-kv store-chart memory charts)- memory))--(defn load-transforms-from-state- "Load transforms from incoming state into memory."- [memory state]- (if-let [transforms (:transforms state)]- (reduce-kv remember-transform memory transforms)- memory))--(defn load-todos-from-state- "Load todos from incoming state into memory."- [memory state]- (if-let [todos (:todos state)]- (set-todos memory todos)- memory))--(defn load-link-registry-from-state- "Load link registry from incoming state into memory.- Ensures keys are strings since JSON round-tripping may keywordize them."- [memory state]- (if-let [link-registry (not-empty (:link-registry state))]- (assoc-in memory [:state :link-registry]- ;; We don't use `name` in case the key is a relative url fragment like `:question/123`.- (update-keys link-registry #(if (keyword? %)- (subs (str %) 1)- %)))- memory))+ (record memory [:todos] (vec todos)))++(defn set-link-registry+ "Set the link registry (url → stable id mappings)."+ [memory link-registry]+ (if (= (get-in memory [:state :link-registry] {}) link-registry)+ memory+ (record memory [:link-registry] link-registry)))diff --git a/src/metabase/metabot/agent/streaming.clj b/src/metabase/metabot/agent/streaming.cljindex 46d73e86cf7..185bfe53944 100644--- a/src/metabase/metabot/agent/streaming.clj+++ b/src/metabase/metabot/agent/streaming.clj@@ -24,10 +24,10 @@(defn persistable-data-part?"True if `part` should be written to MetabotMessage.data. `state` parts are- skipped because their value is salvaged separately into MetabotConversation.state;- duplicating the blob in every message would bloat storage. Non-data parts are- always persistable here; the caller is responsible for filtering stream-level- metadata (`:start`, `:usage`, `:finish`) separately."+ skipped because their value is diffed separately into MetabotMessage.state;+ duplicating the full blob in the message data would bloat storage. Non-data+ parts are always persistable here; the caller is responsible for filtering+ stream-level metadata (`:start`, `:usage`, `:finish`) separately."[part](not (and (= :data (:type part))(= state-type (:data-type part)))))diff --git a/src/metabase/metabot/api.clj b/src/metabase/metabot/api.cljindex f9e13832398..830c6423f35 100644--- a/src/metabase/metabot/api.clj+++ b/src/metabase/metabot/api.clj@@ -15,6 +15,7 @@[metabase.lib.core :as lib][metabase.llm.settings :as llm.settings][metabase.metabot.agent.core :as agent]+ [metabase.metabot.agent.memory :as memory][metabase.metabot.api.conversations][metabase.metabot.api.document][metabase.metabot.api.metabot]@@ -25,7 +26,6 @@[metabase.metabot.feedback :as metabot.feedback][metabase.metabot.persistence :as metabot.persistence][metabase.metabot.provider-util :as provider-util]- [metabase.metabot.schema :as metabot.schema][metabase.metabot.self :as metabot.self][metabase.metabot.self.core :as self.core][metabase.metabot.settings :as metabot.settings]@@ -57,6 +57,87 @@(when-let [conversation (t2/select-one :model/MetabotConversation :id conversation-id)](api/check-403 (mi/can-read? conversation))))+(defn- make-out-of-sync-fn+ [conversation-id parent-message-id retry-message-id]+ (fn [reason & [cause]]+ (log/warn "Rejecting agent-streaming request"+ {:conversation-id conversation-id+ :parent-message-id parent-message-id+ :retry-message-id retry-message-id+ :reason reason})+ (throw (ex-info (tru "This conversation has changed. Reload to see the latest messages.")+ {:status-code 409 :reason reason}+ cause))))++(defn- external-id-conflict?+ ;; driver-specific violation messages all contain the constraint name; see the+ ;; opaque-exception caveat on [[metabase.app-db.query/with-conflict-retry]]+ [e]+ (boolean (some #(re-find #"(?i)uq_metabot_message_external_id" (str (ex-message %)))+ (u/full-exception-chain e))))++(defn- check-retry!+ [messages retry-message-id out-of-sync!]+ (let [retry-msg (u/seek #(= retry-message-id (:external_id %)) (rseq messages))+ last-user (u/seek #(= :user (:role %)) (rseq messages))]+ (cond+ (nil? retry-msg) (out-of-sync! :retry-message-not-found)+ (not= (:role retry-msg) :user) (out-of-sync! :retry-message-not-user-role)+ (not= (:id retry-msg) (:id last-user)) (out-of-sync! :retry-message-not-last)+ :else+ (let [delete-ids (->> messages+ (m/drop-upto #(= (:id %) (:id retry-msg)))+ (filter #(= :assistant (:role %)))+ (mapv :id))]+ (when (> (count delete-ids) 1)+ (log/warn "Retry found multiple live assistant rows for one prompt"+ {:conversation-id (:conversation_id retry-msg) :message-ids delete-ids}))+ {:action :retry :message-ids delete-ids}))))++(defn- check-parent-msg!+ [messages parent-message-id out-of-sync!]+ (let [parent-msg (when parent-message-id+ (u/seek #(= parent-message-id (:external_id %)) (rseq messages)))]+ (cond+ (and parent-message-id (nil? parent-msg)) (out-of-sync! :parent-message-not-found)+ (and parent-msg (not= (:role parent-msg) :assistant)) (out-of-sync! :parent-message-not-agent-role)+ :else+ (let [tail (if parent-msg+ (m/drop-upto #(= (:id %) (:id parent-msg)) messages)+ messages)+ assistants (filter #(= :assistant (:role %)) tail)]+ (cond+ (and (seq assistants) (every? #(some? (:error %)) assistants))+ {:action :replace-failed-turn :message-ids (mapv :id tail)}++ (nil? parent-message-id) (out-of-sync! :parent-message-missing)+ :else (out-of-sync! :parent-message-stale))))))++(defn- check-turn!+ "Decides how the incoming request continues the conversation, reading only from the+ conversation's live `messages` (reader order, from [[metabot.persistence/live-messages]]):+ {:action :start} — append a new turn+ {:action :retry :message-ids [pk...]} — regenerate `retry-message-id`'s response,+ soft-deleting the trailing live replies+ {:action :replace-failed-turn :message-ids [pk...]} — soft-delete trailing failed turns, then start+ Calls `out-of-sync!` (which throws 409) when the request does not line up with `messages`.++ A retry must target the last live user message. A plain request must either point+ `parent-message-id` at the leaf, or at the assistant message right before trailing+ turns that all failed (assistant rows with a recorded error) — the failed rows are+ then handed back for replacement."+ [messages parent-message-id retry-message-id out-of-sync!]+ (let [leaf-id (:external_id (u/seek #(= :assistant (:role %)) (rseq messages)))]+ (cond+ (some? retry-message-id)+ (check-retry! messages retry-message-id out-of-sync!)++ (= parent-message-id leaf-id)+ {:action :start}++ :else+ (check-parent-msg! messages parent-message-id out-of-sync!))))+(defn- streaming-writer-rf"Creates a reducing function that writes AI SDK lines to an OutputStream.@@ -101,15 +182,19 @@[[metabot.persistence/start-turn!]]; the finally block UPDATEs that row.`:external-id` is the assistant row's `external_id`, emitted as the SSE`start` event's `messageId` so the client can correlate streamed messages- with feedback."+ with feedback. `:user-external-id` is the turn's user row `external_id`,+ emitted as the `start` event's `messageMetadata.userMessageId`.+ `:state` is the reconstructed [[metabot.persistence/conversation-state]] —+ it seeds the agent loop as the immutable baseline for this turn's state."[{:keys [metabot-id profile-id message context history conversation-id state debug?- eval-session-id assistant-msg-id external-id]}]+ eval-session-id assistant-msg-id external-id user-external-id]}](let [enriched-context (metabot.context/create-context context {:metabot-id metabot-id:profile-id (keyword profile-id)})messages (concat history [message])](sr/streaming-response {:content-type "text/event-stream"} [^OutputStream os canceled-chan]- (let [parts-atom (atom [])- canceled? (volatile! false)+ (let [parts-atom (atom [])+ memory-atom (atom nil)+ canceled? (volatile! false);; Captures throwables that escape the agent loop's own `catch Exception`;; (e.g. setup-phase throws before the reducible is constructed, `Error`;; subclasses, or failures from the agent's recovery `rf` write). Without@@ -117,7 +202,9 @@;; from a clean success.thrown (volatile! nil)xf (comp (u/tee-xf parts-atom)- (self.core/parts->aisdk-sse-xf {:message-id external-id}))]+ (self.core/parts->aisdk-sse-xf+ (cond-> {:message-id external-id}+ user-external-id (assoc :message-metadata {:userMessageId user-external-id}))))](try(transduce xf(streaming-writer-rf os canceled-chan canceled?)@@ -128,6 +215,7 @@:profile-id (keyword profile-id):context enriched-context:eval-session-id eval-session-id+ :memory-atom memory-atom:tracking-opts {:session-id conversation-id}}debug? (assoc :debug? true))))(catch org.eclipse.jetty.io.EofException _@@ -171,10 +259,11 @@thrown-ex (metabot.persistence/throwable->error-payload thrown-ex):else (:error (u/seek #(= :error (:type %)) combined-parts)))](metabot.persistence/finalize-assistant-turn!- conversation-id assistant-msg-id combined-parts+ assistant-msg-id combined-parts:profile-id profile-id:finished? (not aborted?)- :error error-data))+ :error error-data+ :turn-state (some-> @memory-atom memory/turn-state)))(catch Exception e(log/error e "Failed to finalize assistant turn"{:conversation-id conversation-id@@ -188,7 +277,8 @@it into:- `hostname`: extracted from the origin URL, always recorded.- `pii-info`: gated by `analytics-pii-retention-enabled` — nil when off."- [{:keys [metabot_id profile_id message context history conversation_id state debug eval_session_id]} request-info]+ [{:keys [metabot_id profile_id message context conversation_id debug eval_session_id parent_message_id retry_message_id+ user_message_id assistant_message_id]} request-info](let [message (metabot.envelope/user-message message)metabot-id (metabot.config/resolve-dynamic-metabot-id metabot_id)_ (metabot.config/check-metabot-enabled! metabot-id)@@ -199,10 +289,32 @@hostname (analytics.core/extract-hostname (:origin request-info))pii-info (analytics.core/pii-fields-from request-info)](check-conversation-access! conversation_id)- (let [{:keys [assistant-msg-id assistant-external-id]}- (metabot.persistence/start-turn! conversation_id profile-id message- :hostname hostname- :pii-info pii-info)]+ (let [out-of-sync! (make-out-of-sync-fn conversation_id parent_message_id retry_message_id)+ {:keys [messages message-ids turn]}+ (metabot.persistence/with-conversation-lock conversation_id+ (let [messages (metabot.persistence/live-messages conversation_id)+ {:keys [action message-ids]} (check-turn! messages parent_message_id retry_message_id out-of-sync!)+ turn (try+ (if (= action :retry)+ (metabot.persistence/retry-turn! conversation_id profile-id retry_message_id+ :assistant-external-id assistant_message_id+ :delete-message-ids message-ids)+ (metabot.persistence/start-turn! conversation_id profile-id message+ :hostname hostname+ :pii-info pii-info+ :delete-message-ids message-ids+ :user-external-id user_message_id+ :assistant-external-id assistant_message_id))+ (catch Exception e+ (if (external-id-conflict? e)+ (out-of-sync! :external-id-taken e)+ (throw e))))]+ {:messages messages :message-ids message-ids :turn turn}))+ {:keys [assistant-msg-id assistant-external-id user-external-id]} turn+ deleted? (set message-ids)+ live (remove #(deleted? (:id %)) messages)+ history (metabot.persistence/history live)+ state (metabot.persistence/conversation-state live)](log/info "Using native Clojure agent" {:profile-id profile-id :debug? debug?})(native-agent-streaming-request{:metabot-id metabot-id@@ -215,7 +327,8 @@:debug? debug?:eval-session-id eval_session_id:assistant-msg-id assistant-msg-id- :external-id assistant-external-id}))))+ :external-id assistant-external-id+ :user-external-id user-external-id}))))(defn- legacy->modern-query[query]@@ -253,17 +366,16 @@[:message ms/NonBlankString][:context ::metabot.context/context][:conversation_id ms/UUIDString]- [:history [:maybe ::metabot.schema/messages]]- [:state [:map- [:queries {:optional true} [:map-of :string :any]]- [:charts {:optional true} [:map-of :string :any]]- [:chart-configs {:optional true} [:map-of :string :any]]]]+ [:parent_message_id {:optional true} [:maybe ms/UUIDString]]+ [:retry_message_id {:optional true} [:maybe ms/UUIDString]];; eval-only: lets the benchmark harness name the per-session trace file it will read back.;; Length + charset enforced at this HTTP boundary so a bad id 400s cleanly instead of;; throwing deep in `ait/checked-session-id` and surfacing as a generic agent error.;; `ait/max-session-id-length` / `ait/safe-session-id-re` are the single source of truth.[:eval_session_id {:optional true}[:maybe [:and [:string {:max ait/max-session-id-length}] [:re ait/safe-session-id-re]]]]+ [:user_message_id {:optional true} [:maybe ms/UUIDString]]+ [:assistant_message_id {:optional true} [:maybe ms/UUIDString]][:debug {:optional true} [:maybe :boolean]]]req](metabot.context/log body :llm.log/fe->be)diff --git a/src/metabase/metabot/api/conversations.clj b/src/metabase/metabot/api/conversations.cljindex fa2f9c2b902..436ccb35db1 100644--- a/src/metabase/metabot/api/conversations.clj+++ b/src/metabase/metabot/api/conversations.clj@@ -11,6 +11,7 @@[metabase.api.macros :as api.macros][metabase.api.routes.common :refer [+auth]][metabase.metabot.persistence :as metabot.persistence]+ [metabase.metabot.schema :as metabot.schema][metabase.request.core :as request][metabase.util.malli.schema :as ms][toucan2.core :as t2]))@@ -43,6 +44,7 @@[:created_at ms/TemporalInstant][:summary [:maybe :string]][:user_id [:maybe ms/PositiveInt]]+ [:state {:optional true} [:maybe ::metabot.schema/state]][:chat_messages [:sequential :map]]])(def ^:private ConversationIdParamsdiff --git a/src/metabase/metabot/models/metabot_conversation.clj b/src/metabase/metabot/models/metabot_conversation.cljindex d12061f4098..554c1b1a659 100644--- a/src/metabase/metabot/models/metabot_conversation.clj+++ b/src/metabase/metabot/models/metabot_conversation.clj@@ -12,9 +12,6 @@(doto :model/MetabotConversation(derive :metabase/model))-(t2/deftransforms :model/MetabotConversation- {:state mi/transform-json})-(defn participant?"True if `user-id` has sent at least one message in `conversation-id`."[conversation-id user-id]diff --git a/src/metabase/metabot/models/metabot_message.clj b/src/metabase/metabot/models/metabot_message.cljindex 73cde532392..de36d21750e 100644--- a/src/metabase/metabot/models/metabot_message.clj+++ b/src/metabase/metabot/models/metabot_message.clj@@ -18,6 +18,7 @@(t2/deftransforms :model/MetabotMessage{:usage mi/transform-json:data mi/transform-json+ :state mi/transform-json:role mi/transform-keyword})(defn- migrate-v1->v2-on-readdiff --git a/src/metabase/metabot/persistence.clj b/src/metabase/metabot/persistence.cljindex d3d83b7567d..a6e2a0786d9 100644--- a/src/metabase/metabot/persistence.clj+++ b/src/metabase/metabot/persistence.clj@@ -5,8 +5,10 @@[metabase.analytics-interface.core :as analytics][metabase.api.common :as api][metabase.app-db.core :as app-db]+ [metabase.metabot.agent.memory :as memory][metabase.metabot.agent.streaming :as streaming][metabase.metabot.provider-util :as provider-util]+ [metabase.metabot.schema :as metabot.schema][metabase.metabot.schema.migrate-v1-to-v2 :as migrate][metabase.metabot.schema.v2 :as schema.v2][metabase.metabot.settings :as metabot.settings]@@ -14,12 +16,23 @@[metabase.util :as u][metabase.util.json :as json][metabase.util.log :as log]+ [metabase.util.malli :as mu][toucan2.core :as t2])(:import(java.time Instant LocalDateTime OffsetDateTime ZoneOffset)))(set! *warn-on-reflection* true)+(defn user-row?+ "Is `row` a user message?"+ [row]+ (= :user (:role row)))++(defn assistant-row?+ "Is `row` an assistant message?"+ [row]+ (= :assistant (:role row)))+(def persisted-structured-output-keys"Subset of `:structured-output` that must survive persistence so`metabase-enterprise.metabot-analytics.queries` can surface generated@@ -89,7 +102,8 @@(defn parts->storable-content"Drop transient/lifecycle parts and convert what remains to the v2 at-restformat. Stream metadata (`:usage`/`:finish`/`:error`) and `state` data parts- (salvaged separately into `MetabotConversation.state`) carry no history value."+ (the turn's state is persisted separately into the row's `state` column) carry+ no history value."[parts](->> parts(remove #(#{:usage :finish :error} (:type %)))@@ -163,6 +177,49 @@(do (vreset! pending part)(if prev (rf result prev) result)))))))))+(defn live-messages+ "A conversation's non-deleted messages in reader order (created_at, id)."+ [conversation-id]+ (t2/select :model/MetabotMessage+ :conversation_id conversation-id+ :deleted_at nil+ {:order-by [[:created_at :asc] [:id :asc]]}))++(defmacro with-conversation-lock+ "Run `body` in a transaction holding a `FOR UPDATE` lock on the conversation row."+ [conversation-id & body]+ `(t2/with-transaction [_conn#]+ (t2/select-one :model/MetabotConversation :id ~conversation-id {:for :update})+ ~@body))++(defn soft-delete-messages!+ "Soft-delete the messages matching Toucan `conditions` in one statement,+ stamping who deleted them. Returns the number of rows updated. `conditions`+ must be non-empty — an empty map would match every message."+ [conditions deleted-by-user-id]+ {:pre [(seq conditions)]}+ (t2/update! :model/MetabotMessage conditions+ {:deleted_at [:now]+ :deleted_by_user_id deleted-by-user-id}))++(defn- insert-assistant-placeholder!+ "Insert a turn's in-flight assistant row (`:finished` nil until+ [[finalize-assistant-turn!]] resolves it); returns its pk."+ [conversation-id profile-id external-id ai-proxy? & {:keys [user-id channel-id]}]+ (t2/insert-returning-pk!+ :model/MetabotMessage+ (cond-> {:conversation_id conversation-id+ :data []+ :data_version schema.v2/current-data-version+ :role :assistant+ :profile_id profile-id+ :external_id external-id+ :total_tokens 0+ :ai_proxied (boolean ai-proxy?)+ :finished nil}+ user-id (assoc :user_id user-id)+ channel-id (assoc :channel_id channel-id))))+(defn start-turn!"Atomically begin a turn: upsert the conversation row, insert the user-message row,and insert a placeholder assistant row. The placeholder's `created_at` is pinned@@ -189,12 +246,18 @@it so the assistant row's `user_id` stays NULL. Falls back to`api/*current-user-id*` when omitted.- `:ai-proxy?` — override; otherwise derived from `llm-metabot-provider`.+ - `:delete-message-ids` — pks soft-deleted in the same transaction as the new+ rows; used when this turn replaces trailing failed turns.+ - `:user-external-id`, `:assistant-external-id` — client-minted `external_id`s+ for the turn's rows; minted server-side when omitted. An already-taken id+ surfaces as the unique-constraint violation from the insert.- Returns `{:assistant-msg-id <pk> :assistant-external-id <uuid-str>}`."+ Returns `{:assistant-msg-id <pk> :assistant-external-id <uuid-str> :user-external-id <uuid-str>}`."[conversation-id profile-id user-message& {:keys [hostname pii-infochannel-id slack-msg-id slack-team-id slack-thread-ts- user-id ai-proxy?]}]+ user-id ai-proxy? delete-message-ids+ user-external-id assistant-external-id]}](let [;; Originator: explicit `:user-id` wins; otherwise fall back to the;; auth-bound dynamic. Used for both the conversation `user_id` (on;; first insert) and the user-message row's `user_id`.@@ -202,13 +265,16 @@ai-proxy? (if (some? ai-proxy?)ai-proxy?(provider-util/metabase-provider? (metabot.settings/llm-metabot-provider)))- assistant-external-id (str (random-uuid))]+ user-external-id (or user-external-id (str (random-uuid)))+ assistant-external-id (or assistant-external-id (str (random-uuid)))](analytics/inc! :metabase-metabot/turn-started{:profile-id (or profile-id "unknown")});; The user-message and assistant-placeholder rows share `created_at` because;; the column default resolves to `transaction_timestamp()`. Readers ordering;; metabot_message rows for chat-detail rendering must tiebreak on `:id`(t2/with-transaction [_conn]+ (when (seq delete-message-ids)+ (soft-delete-messages! {:id [:in delete-message-ids]} originator-id))(app-db/update-or-insert! :model/MetabotConversation {:id conversation-id}(fn [existing];; `:user_id` is the originator — set on insert, never overwritten.@@ -238,34 +304,62 @@:data_version schema.v2/current-data-version:role :user:profile_id profile-id- :external_id (str (random-uuid))+ :external_id user-external-id:total_tokens 0:ai_proxied (boolean ai-proxy?)}originator-id (assoc :user_id originator-id)channel-id (assoc :channel_id channel-id)slack-msg-id (assoc :slack_msg_id slack-msg-id)))- ;; `:finished nil` is the in-flight marker; `finalize-assistant-turn!`- ;; UPDATEs to true (success/error) or false (aborted).- (let [pk (t2/insert-returning-pk!- :model/MetabotMessage- (cond-> {:conversation_id conversation-id- :data []- :data_version schema.v2/current-data-version- :role :assistant- :profile_id profile-id- :external_id assistant-external-id- :total_tokens 0- :ai_proxied (boolean ai-proxy?)- :finished nil}- user-id (assoc :user_id user-id)- channel-id (assoc :channel_id channel-id)))]+ (let [pk (insert-assistant-placeholder! conversation-id profile-id assistant-external-id ai-proxy?+ :user-id user-id+ :channel-id channel-id)]+ {:assistant-msg-id pk+ :assistant-external-id assistant-external-id+ :user-external-id user-external-id}))))++(defn retry-turn!+ "Regenerate the response for `retry-message-external-id`, the conversation's last live+ user message (validated by the caller): soft-deletes the caller-supplied+ `:delete-message-ids` — the live assistant rows trailing the prompt — and inserts a+ fresh placeholder. The prompt row is reused — no new user row is inserted, so each+ prompt keeps a single live response.++ `:assistant-external-id` is the client-minted `external_id` for the fresh+ placeholder; minted server-side when omitted.++ Returns `{:assistant-msg-id <pk> :assistant-external-id <uuid-str> :user-external-id <uuid-str>}`."+ [conversation-id profile-id retry-message-external-id & {:keys [assistant-external-id delete-message-ids]}]+ (let [ai-proxy? (provider-util/metabase-provider? (metabot.settings/llm-metabot-provider))+ assistant-external-id (or assistant-external-id (str (random-uuid)))]+ (analytics/inc! :metabase-metabot/turn-started+ {:profile-id (or profile-id "unknown")})+ (t2/with-transaction [_conn]+ (when (seq delete-message-ids)+ (soft-delete-messages! {:id [:in delete-message-ids]} api/*current-user-id*))+ (let [pk (insert-assistant-placeholder! conversation-id profile-id assistant-external-id ai-proxy?)]{:assistant-msg-id pk- :assistant-external-id assistant-external-id}))))+ :assistant-external-id assistant-external-id+ :user-external-id retry-message-external-id}))))++;;; ---------------------------------------- Conversation state ----------------------------------------++(defn- replayable-assistant-row?+ [{:keys [error finished] :as row}]+ (and (assistant-row? row)+ (nil? error)+ (some? finished)))++(defn conversation-state+ "Merge state values of all replayable messages"+ [messages]+ (->> messages+ (filter replayable-assistant-row?)+ (keep :state)+ (reduce memory/merge-states {})))(defn finalize-assistant-turn!"UPDATE the placeholder assistant row created by [[start-turn!]] with the final- streamed parts. Also writes a fresh `state` value to the conversation row when- a state data part is present in `parts`.+ streamed parts.`parts` should be the post-[[combine-text-parts-xf]] parts vector. Stream metadata(`:start`/`:usage`/`:finish`/`:error`) is filtered out and the rest is converted to@@ -281,44 +375,133 @@turns; either way the placeholder's `:finished` flips from NULL to aconcrete boolean so it stops being filtered as in-flight.- `:error` — JSON-serializable error payload; encoded into the `error` column.+ - `:turn-state` — the state this turn produced; stored in the `state` column+ when non-empty.- `:slack-msg-id`, `:channel-id` — backfill onto the assistant row when knownat completion (Slack response posts mid-stream)."- [conversation-id assistant-msg-id parts- & {:keys [profile-id finished? error slack-msg-id channel-id]+ [assistant-msg-id parts+ & {:keys [profile-id finished? error slack-msg-id channel-id turn-state]:or {finished? true}}]- (let [state-part (u/seek #(and (= :data (:type %))- (= "state" (:data-type %)))- parts)- usage (extract-usage parts)+ (let [turn-state (not-empty turn-state)+ usage (extract-usage parts);; used-table extraction needs the raw internal parts before conversion trims;; tool outputs, so it can see keys the stored format discards, e.g. `:transform`- kept-parts (->> parts- (remove #(#{:start :usage :finish :error} (:type %)))- (filter streaming/persistable-data-part?))- content (parts->storable-content parts)]+ kept-parts (->> parts+ (remove #(#{:start :usage :finish :error} (:type %)))+ (filter streaming/persistable-data-part?))+ content (parts->storable-content parts)](analytics/observe! :metabase-metabot/message-persist-bytes{:profile-id (or profile-id "unknown")}(u/string-byte-count (json/encode content)))- (t2/with-transaction [_conn]- (when state-part- (t2/update! :model/MetabotConversation conversation-id- {:state (:data state-part)}))- (t2/update! :model/MetabotMessage assistant-msg-id- (cond-> {:data content- :data_version schema.v2/current-data-version- :usage usage- :total_tokens (->> (vals usage)- (map #(+ (:prompt %) (:completion %)))- (reduce + 0))- :finished (boolean finished?)- :error (safe-encode-error error)}- slack-msg-id (assoc :slack_msg_id slack-msg-id)- channel-id (assoc :channel_id channel-id))))+ (t2/update! :model/MetabotMessage assistant-msg-id+ (cond-> {:data content+ :data_version schema.v2/current-data-version+ :usage usage+ :total_tokens (->> (vals usage)+ (map #(+ (:prompt %) (:completion %)))+ (reduce + 0))+ :finished (boolean finished?)+ :error (safe-encode-error error)}+ turn-state (assoc :state turn-state)+ slack-msg-id (assoc :slack_msg_id slack-msg-id)+ channel-id (assoc :channel_id channel-id)));; Hand the (potentially slow) used-table extraction + insert off to a background worker *after* the message- ;; UPDATE transaction commits, so it neither blocks nor fails the turn. The assistant row already exists, so its+ ;; UPDATE commits, so it neither blocks nor fails the turn. The assistant row already exists, so its;; `message_id` FK is valid even before the UPDATE completes.(used-tables/record-used-tables! assistant-msg-id kept-parts)))+(defn leaf-message+ "The conversation's most recent, non-deleted assistant message, or nil.+ Filters to :assistant so a deleted trailing reply doesn't fall back to a user row."+ [conversation-id]+ (t2/select-one :model/MetabotMessage+ {:where [:and+ [:= :conversation_id conversation-id]+ [:= :deleted_at nil]+ [:= :role "assistant"]]+ :order-by [[:created_at :desc] [:id :desc]]}))++(defn leaf-external-id+ "The [[leaf-message]]'s `external_id`, or nil."+ [conversation-id]+ (:external_id (leaf-message conversation-id)))++(defn tool-part->llm-messages+ "A stored v2 tool part → LLM history pair: the assistant tool call plus its+ tool result. An unresolved (`input-available`) call is paired with a+ synthetic interrupted result by default, so an aborted turn's partial content+ stays replayable rather than being silently dropped. Pass+ `:on-unresolved :skip` to drop it instead (Slack replays only completed tool+ calls and gets assistant text from its own thread copy)."+ ([part] (tool-part->llm-messages part nil))+ ([part {:keys [on-unresolved]}]+ (when (schema.v2/tool-part? part)+ (let [{:keys [state input output errorText toolCallId]} part+ content (case state+ "output-available" (str (if (map? output) (:output output) output))+ "output-error" (or errorText "Tool execution failed")+ "input-available" (when-not (= on-unresolved :skip)+ "Tool execution interrupted by user")+ nil)]+ (when content+ [{:role :assistant+ :tool_calls [{:id toolCallId+ :name (schema.v2/tool-part-name part)+ :arguments (if (string? input)+ input+ (json/encode (or input {})))}]}+ {:role :tool+ :tool_call_id toolCallId+ :content content}])))))++(defn- user-row->llm-message+ [{:keys [data]}]+ {:role :user+ :content (->> data+ (filter schema.v2/text-part?)+ (map :text)+ str/join)})++(defn- assistant-row->llm-messages+ [{:keys [data]}]+ (into []+ (mapcat (fn [part]+ (cond+ (schema.v2/text-part? part)+ (when-not (str/blank? (:text part))+ [{:role :assistant :content (:text part)}])++ (schema.v2/tool-part? part)+ (tool-part->llm-messages part))))+ data))++(defn- rows->turns+ [rows]+ (reduce (fn [turns row]+ (if (or (user-row? row) (empty? turns))+ (conj turns [row])+ (update turns (dec (count turns)) conj row)))+ []+ rows))++(defn- turn->llm-messages+ [turn-rows]+ (let [user-row (first (filter user-row? turn-rows))+ reply (last (filter assistant-row? turn-rows))]+ (when (and reply (replayable-assistant-row? reply))+ (concat (when user-row [(user-row->llm-message user-row)])+ (when reply (assistant-row->llm-messages reply))))))++(mu/defn history :- ::metabot.schema/messages+ "Reconstruct a conversation's LLM message history from its live+ `metabot_message` `messages` (in reader order, e.g. from [[live-messages]]):+ errored and in-flight turns are dropped, aborted turns replay their partial+ content."+ [messages :- [:sequential :map]]+ (into []+ (mapcat turn->llm-messages)+ (rows->turns messages)))+(defn set-response-slack-msg-id!"Backfill slack_msg_id on a MetabotMessage by primary key."[msg-id slack-msg-id]@@ -333,45 +516,45 @@`row-role` decides whether text parts render as user or agent messages — v2text parts carry no role of their own. `external-id` (the parent row's- `metabot_message.external_id`) is attached to agent text and data part chat- messages as `:externalId` — the stable key for feedback; the per-block `:id`- stays unique."+ `metabot_message.external_id`) is attached to text and data part chat+ messages as `:externalId` — the stable key for feedback and retry; the+ per-block `:id` stays unique."[row-role external-id part]- (let [part-type (:type part)]- (cond- (= "text" part-type)- (if (= :user row-role)- {:id (str (random-uuid)) :role "user" :type "text" :message (:text part)}- (cond-> {:id (str (random-uuid))- :role "agent"- :type "text"- :message (:text part)}- external-id (assoc :externalId external-id)))-- (schema.v2/tool-part? part)- (cond-> {:id (:toolCallId part)- :role "agent"- :type "tool_call"- :name (schema.v2/tool-part-name part)- :args (when-let [i (:input part)] (if (string? i) i (json/encode i)))- :status "ended"}- (= "output-available" (:state part))- (assoc :result (when (some? (:output part)) (json/encode (:output part))) :is_error false)-- ;; errored calls store no output — :result stays nil, matching the- ;; pre-v2 chat shape the FE renders- (= "output-error" (:state part))- (assoc :result nil :is_error true))-- (and (string? part-type) (str/starts-with? part-type "data-"))- (cond-> {:id (str (random-uuid))- :role "agent"- :type "data_part"- :part {:type part-type- :data (:data part)}}+ (cond+ (schema.v2/text-part? part)+ (if (= :user row-role)+ (cond-> {:id (str (random-uuid)) :role "user" :type "text" :message (:text part)}external-id (assoc :externalId external-id))-- :else nil)))+ (cond-> {:id (str (random-uuid))+ :role "agent"+ :type "text"+ :message (:text part)}+ external-id (assoc :externalId external-id)))++ (schema.v2/tool-part? part)+ (cond-> {:id (:toolCallId part)+ :role "agent"+ :type "tool_call"+ :name (schema.v2/tool-part-name part)+ :args (when-let [i (:input part)] (if (string? i) i (json/encode i)))+ :status "ended"}+ (= "output-available" (:state part))+ (assoc :result (when (some? (:output part)) (json/encode (:output part))) :is_error false)++ ;; errored calls store no output — :result stays nil, matching the+ ;; pre-v2 chat shape the FE renders+ (= "output-error" (:state part))+ (assoc :result nil :is_error true))++ (schema.v2/data-part? part)+ (cond-> {:id (str (random-uuid))+ :role "agent"+ :type "data_part"+ :part {:type (:type part)+ :data (:data part)}}+ external-id (assoc :externalId external-id))++ :else nil))(defn- decode-error"JSON-decode a row's `:error` column value (a string written by@@ -484,14 +667,10 @@nil)))(defn- placeholder-still-active?- "True if `row` is an in-flight placeholder created by [[start-turn!]] for a- stream that hasn't yet completed: assistant role, `:finished` IS NULL (the- schema-level placeholder marker), and `:created_at` within the grace window.- Used by [[messages->chat-messages]] to suppress live placeholders from chat- reads so a reload mid-stream does not render an empty `turn_aborted` stub."- [{:keys [role finished created_at]}]+ [{:keys [role finished created_at deleted_at]}](and (= :assistant role)(nil? finished)+ (nil? deleted_at)(some? created_at)(when-let [then (->instant created_at)](< (.toMillis (java.time.Duration/between then (Instant/now)))@@ -507,17 +686,55 @@(->> (if include-errored? active (drop-errored-pairs active))(into [] (mapcat message->chat-messages))))))+(defn- row->flat-messages+ [row parent-id]+ (let [messages (if (placeholder-still-active? row)+ [(cond-> {:id (or (:external_id row) (str (:id row)))+ :role "agent"+ :type "turn_in_progress"}+ (:external_id row) (assoc :externalId (:external_id row)))]+ (message->chat-messages row))]+ (reduce (fn [[messages parent-id] message]+ (let [message (assoc message :parent_message_id parent-id)]+ [(conj messages message) (:id message)]))+ [[] parent-id]+ messages)))++(defn messages->flat-messages+ "Convert ordered live and deleted rows to chat messages with parent pointers.+ With `:include-rewound-errors?`, a turn whose prompt was soft-deleted is also+ kept when it errored (a rewound failed turn), as a dead branch the main thread+ does not descend from; by default such turns are dropped."+ ([messages] (messages->flat-messages messages nil))+ ([messages {:keys [include-rewound-errors?]}]+ (loop [turns (rows->turns messages), parent-id nil, flat-messages []]+ (if-let [turn (first turns)]+ (let [prompt-row (u/seek #(= :user (:role %)) turn)+ prompt-live? (and prompt-row (nil? (:deleted_at prompt-row)))+ errored? (and include-rewound-errors?+ (some #(and (= :assistant (:role %)) (some? (:error %))) turn))]+ (if (and prompt-row (or prompt-live? errored?))+ (let [[prompt-messages prompt-last-id] (row->flat-messages prompt-row parent-id)+ assistant-rows (filterv #(= :assistant (:role %)) turn)+ attempts (mapv #(row->flat-messages % prompt-last-id) assistant-rows)+ kept-last-id (->> (map vector assistant-rows attempts)+ (keep (fn [[row [_ last-id]]]+ (when (nil? (:deleted_at row)) last-id)))+ last)]+ (recur (rest turns)+ (if prompt-live? (or kept-last-id prompt-last-id) parent-id)+ (into (into flat-messages prompt-messages) (mapcat first) attempts)))+ (recur (rest turns) parent-id flat-messages)))+ flat-messages))))+(defn conversation-detail"Conversation-with-chat-messages snapshot. Nil if not found."[conversation-id](when-let [conv (t2/select-one :model/MetabotConversation :id conversation-id)]- {:conversation_id (:id conv)- :created_at (:created_at conv)- :summary (:summary conv)- :user_id (:user_id conv)- :chat_messages (messages->chat-messages- (t2/select :model/MetabotMessage- {:where [:and- [:= :conversation_id conversation-id]- [:= :deleted_at nil]]- :order-by [[:created_at :asc] [:id :asc]]}))}))+ (let [messages (live-messages conversation-id)]+ {:conversation_id (:id conv)+ :created_at (:created_at conv)+ :summary (:summary conv)+ :user_id (:user_id conv)+ :state (conversation-state messages)+ :chat_messages (messages->chat-messages messages)})))diff --git a/src/metabase/metabot/schema.clj b/src/metabase/metabot/schema.cljindex f1e4199d2c0..1d6236ad1b3 100644--- a/src/metabase/metabot/schema.clj+++ b/src/metabase/metabot/schema.clj@@ -1,5 +1,8 @@(ns metabase.metabot.schema(:require+ [malli.core :as mc]+ [malli.transform :as mtx]+ [metabase.lib.schema.common :as lib.schema.common][metabase.util :as u][metabase.util.malli.registry :as mr]))@@ -21,3 +24,23 @@(mr/def ::messages[:sequential ::message])++(mr/def ::state-map-key+ "A dynamic state-map key, normalized to its canonical string representation."+ [:or {:decode/normalize lib.schema.common/normalize-string-key}+ :string+ :keyword])++(mr/def ::state+ [:map+ [:queries {:optional true} [:map-of ::state-map-key :map]]+ [:charts {:optional true} [:map-of ::state-map-key :map]]+ [:chart-configs {:optional true} [:map-of ::state-map-key :map]]+ [:todos {:optional true} [:sequential :map]]+ [:transforms {:optional true} [:map-of ::state-map-key :map]]+ [:link-registry {:optional true} [:map-of ::state-map-key :string]]])++(defn normalize-state+ "Normalize dynamic state-map keys to strings according to [[::state]]."+ [state]+ (mc/decode ::state state (mtx/transformer {:name :normalize})))diff --git a/src/metabase/metabot/schema/v2.clj b/src/metabase/metabot/schema/v2.cljindex 07528db91fe..4c580e6f28d 100644--- a/src/metabase/metabot/schema/v2.clj+++ b/src/metabase/metabot/schema/v2.clj@@ -44,6 +44,16 @@[part](tool-type? (:type part)))+(defn data-part?+ "True when `part` is a data part — its `:type` is `\"data-<name>\"`."+ [part]+ (data-type? (:type part)))++(defn text-part?+ "True when `part` is a text part — its `:type` is `\"text\"`."+ [part]+ (= "text" (:type part)))+(defn tool-part-name"The tool name encoded in a tool part's `:type`:`{:type \"tool-create_sql_query\" ...}` -> `\"create_sql_query\"`."diff --git a/src/metabase/metabot/self/core.clj b/src/metabase/metabot/self/core.cljindex 49a823ebad2..772abc4b80c 100644--- a/src/metabase/metabot/self/core.clj+++ b/src/metabase/metabot/self/core.clj@@ -305,8 +305,9 @@non-text part (or end of stream) closes the open block first.Options:- :message-id - When set, force this id into the `start` event so the client- sees the same id we persist as `metabot_message.external_id`.+ :message-id - When set, force this id into the `start` event so the client+ sees the same id we persist as `metabot_message.external_id`.+ :message-metadata - When set, emitted as the `start` event's `messageMetadata`.Input types and their SSE events::start (1st) -> start + start-step@@ -321,7 +322,7 @@:finish -> (ignored — the completion arity emits the finish)completion -> [text-end]? finish-step + finish + [DONE]"([] (parts->aisdk-sse-xf nil))- ([{:keys [message-id]}]+ ([{:keys [message-id message-metadata]}](fn [rf](let [error? (volatile! false)finish-error-code (volatile! nil)@@ -330,6 +331,10 @@;; non-nil while a text block is open; holds the block id so we can;; emit a matching text-end when the block closescurrent-text-id (volatile! nil)+ start-event (fn [id]+ (format-sse-event+ (cond-> {:type "start" :messageId id}+ message-metadata (assoc :messageMetadata message-metadata))))close-text-block (fn [result](if-let [id @current-text-id](do (vreset! current-text-id nil)@@ -340,8 +345,7 @@result(do (vreset! started? true)(-> result- (rf (format-sse-event {:type "start"- :messageId (or message-id (mkid))}))+ (rf (start-event (or message-id (mkid))))(rf (format-sse-event {:type "start-step"}))))))](fn([] (rf))@@ -373,8 +377,7 @@(do(vreset! started? true)(-> result- (rf (format-sse-event {:type "start"- :messageId (or message-id (:id part) (mkid))}))+ (rf (start-event (or message-id (:id part) (mkid))))(rf (format-sse-event {:type "start-step"}))))):textdiff --git a/src/metabase/metabot/tools/charts.clj b/src/metabase/metabot/tools/charts.cljindex a652ca43f4b..4172a72835e 100644--- a/src/metabase/metabot/tools/charts.clj+++ b/src/metabase/metabot/tools/charts.clj@@ -2,6 +2,7 @@"Chart tool wrappers."(:require[metabase.metabot.agent.links :as links]+ [metabase.metabot.agent.memory :as memory][metabase.metabot.agent.streaming :as streaming][metabase.metabot.scope :as scope][metabase.metabot.tools.charts.create :as create-chart-tools]@@ -93,8 +94,7 @@structured (assoc result :result-type :chart)];; Add the new chart to memory so it can be referenced in the conversation going forward.(when (and (:chart_id new-chart-data) shared/*memory-atom*)- (swap! shared/*memory-atom* assoc-in [:state :charts (:chart_id new-chart-data)]- new-chart-data))+ (swap! shared/*memory-atom* memory/set-chart (:chart_id new-chart-data) new-chart-data)){:output (format-chart-output structured):structured-output structured:data-parts [(streaming/viz-partdiff --git a/src/metabase/metabot/tools/todo.clj b/src/metabase/metabot/tools/todo.cljindex 28345f3a5a6..41165bd0452 100644--- a/src/metabase/metabot/tools/todo.clj+++ b/src/metabase/metabot/tools/todo.clj@@ -3,6 +3,7 @@Todos are stored in agent memory and streamed to the frontend via todo_list data parts."(:require[clojure.string :as str]+ [metabase.metabot.agent.memory :as memory][metabase.metabot.agent.streaming :as streaming][metabase.metabot.scope :as scope][metabase.metabot.tools.shared :as shared]@@ -59,7 +60,7 @@(log/info "Writing todo list" {:todo-count (count todos)})(let [validated-todos (validate-todos todos)];; Store in memory- (swap! memory-atom update :state assoc :todos validated-todos)+ (swap! memory-atom memory/set-todos validated-todos)(log/debug "Stored todos in memory" {:count (count validated-todos)}){:structured-output {:message "Todo list updated successfully.":todo_count (count validated-todos)}diff --git a/src/metabase/metabot/tools/transforms/write.clj b/src/metabase/metabot/tools/transforms/write.cljindex 454a6185e93..34097ca29e4 100644--- a/src/metabase/metabot/tools/transforms/write.clj+++ b/src/metabase/metabot/tools/transforms/write.clj@@ -5,6 +5,7 @@[clojure.string :as str][metabase.lib-be.core :as lib-be][metabase.lib.core :as lib]+ [metabase.metabot.agent.memory :as memory][metabase.metabot.agent.streaming :as streaming][metabase.util.log :as log]))@@ -159,7 +160,7 @@ def transform():database_id (assoc-in [:source :database] database_id))];; Store in memory if we have an ID(when (and transform_id memory-atom)- (swap! memory-atom assoc-in [:state :transforms (str transform_id)] suggested-transform))+ (swap! memory-atom memory/set-transform transform_id suggested-transform))(log/debug "SQL transform written" {:transform-id transform_id:sql-length (count new-sql)}){:structured-output {:transform suggested-transformdiff --git a/src/metabase/slackbot/persistence.clj b/src/metabase/slackbot/persistence.cljindex 85d96cdeff0..1e1af931ca0 100644--- a/src/metabase/slackbot/persistence.clj+++ b/src/metabase/slackbot/persistence.clj@@ -1,50 +1,21 @@(ns metabase.slackbot.persistence"Slack-specific persistence: reconstruct conversation history from stored messages."(:require+ [metabase.metabot.persistence :as metabot.persistence][metabase.metabot.schema.v2 :as schema.v2]- [metabase.util.json :as json][toucan2.core :as t2]))(set! *warn-on-reflection* true)-(defn- tool-part->history-messages- "A stored v2 tool part (`:type \"tool-<name>\"`, merged input/output) →- AI-SDK-message pair: an assistant message with a single `:tool_calls` entry,- plus a `tool` message when the call resolved. Parts still in- `input-available` state (tool never finished) are skipped — there is no- result to replay. Text and data parts are skipped — assistant text still- comes from Slack's copy of the thread."- [part]- (when (and (schema.v2/tool-part? part)- (not= "input-available" (:state part)))- (let [input (:input part)- state (:state part)- tool-call {:role :assistant- :tool_calls [{:id (:toolCallId part)- :name (schema.v2/tool-part-name part)- :arguments (if (string? input)- input- (json/encode (or input {})))}]}- tool-result (when (#{"output-available" "output-error"} state)- {:role :tool- :tool_call_id (:toolCallId part)- :content (if (= "output-error" state)- (or (:errorText part) "Tool execution failed")- ;; a map result stores the LLM text under- ;; `[:output :output]`; a non-map result (a- ;; bare string/scalar) is stored flat under `:output`- (let [output (:output part)]- (or (if (map? output) (:output output) output) "")))})]- (cond-> [tool-call]- tool-result (conj tool-result)))))-(defn- extract-history-messages"Walk `(:data message)` in insertion order and emit AI-SDK-message maps for- history replay. Preserves adjacency of tool calls and their tool results."+ history replay. Preserves adjacency of tool calls and their tool results.+ Unresolved tool calls, text parts, and data parts are skipped — assistant+ text comes from Slack's copy of the thread."[message](->> (or (:data message) [])(schema.v2/check-message-data "slack history replay metabot_message.data")- (into [] (mapcat tool-part->history-messages))))+ (into [] (mapcat #(metabot.persistence/tool-part->llm-messages % {:on-unresolved :skip})))))(defn message-history"Tool call history for Slack messages. Returns {slack-msg-id -> [messages...]}."@@ -85,9 +56,8 @@"Mark the stored assistant response for this Slack channel/message as soft-deleted."[channel-id slack-msg-id deleter-user-id](when (and channel-id slack-msg-id deleter-user-id)- (pos? (t2/update! :model/MetabotMessage- {:channel_id channel-id- :slack_msg_id slack-msg-id- :role "assistant"}- {:deleted_at (java.time.OffsetDateTime/now)- :deleted_by_user_id deleter-user-id}))))+ (pos? (metabot.persistence/soft-delete-messages!+ {:channel_id channel-id+ :slack_msg_id slack-msg-id+ :role "assistant"}+ deleter-user-id))))diff --git a/src/metabase/slackbot/streaming.clj b/src/metabase/slackbot/streaming.cljindex 71836cf5454..531a464e2cb 100644--- a/src/metabase/slackbot/streaming.clj+++ b/src/metabase/slackbot/streaming.clj@@ -7,6 +7,7 @@[metabase.api.common :as api][metabase.channel.slack :as channel.slack][metabase.metabot.agent.core :as agent]+ [metabase.metabot.agent.memory :as memory][metabase.metabot.config :as metabot.config][metabase.metabot.context :as metabot.context][metabase.metabot.core :as metabot]@@ -183,13 +184,14 @@;; `:user-id` stamps the author on both rows so participation-based;; conversation read permissions work for multi-user Slack threads.{:keys [assistant-msg-id assistant-external-id]}- (metabot.persistence/start-turn! conversation-id "slackbot" message- :channel-id channel-id- :slack-team-id team-id- :slack-thread-ts thread-ts- :slack-msg-id req-slack-msg-id- :user-id api/*current-user-id*- :ai-proxy? ai-proxy?)+ (metabot.persistence/with-conversation-lock conversation-id+ (metabot.persistence/start-turn! conversation-id "slackbot" message+ :channel-id channel-id+ :slack-team-id team-id+ :slack-thread-ts thread-ts+ :slack-msg-id req-slack-msg-id+ :user-id api/*current-user-id*+ :ai-proxy? ai-proxy?))data-idx (volatile! -1)request-message (metabot.envelope/user-message (or request-prompt prompt))capabilities (compute-capabilities)@@ -202,6 +204,7 @@{:metabot-id metabot.config/internal-metabot-id})messages (conj (vec history) request-message)parts-atom (atom [])+ memory-atom (atom nil);; Sibling capture for throwables that escape the agent loop's own;; `catch Exception`. The slack `send-dm-response` / `send-channel-response`;; wrappers already turn the rethrown error into a user-facing slack message;@@ -245,6 +248,7 @@:state {}:profile-id :slackbot:context context+ :memory-atom memory-atom:tracking-opts {:source "slackbot":session-id conversation-id}}))(catch Throwable t@@ -259,10 +263,11 @@;; pipeline threw. Raw native parts (not the lossy AI-SDK-message;; round-trip) preserve tool-output :structured-output for analytics.(metabot.persistence/finalize-assistant-turn!- conversation-id assistant-msg-id+ assistant-msg-id(into [] (metabot.persistence/combine-text-parts-xf) @parts-atom):profile-id "slackbot":slack-msg-id (when get-res-slack-msg-id (get-res-slack-msg-id))+ :turn-state (some-> @memory-atom memory/turn-state):error (some-> @thrown metabot.persistence/throwable->error-payload)))){:msg-id assistant-msg-id:external-id assistant-external-id}))diff --git a/test/metabase/app_db/schema_migrations_test.clj b/test/metabase/app_db/schema_migrations_test.cljindex 0ab9a2eab3b..c0f1ce2245a 100644--- a/test/metabase/app_db/schema_migrations_test.clj+++ b/test/metabase/app_db/schema_migrations_test.clj@@ -3355,3 +3355,45 @@(when (= :mysql (mdb/db-type))(testing "invalid JSON task_details is skipped by JSON_VALID, run stays null (GDGT-2680)"(is (nil? (nid invalid))))))))))))++(deftest move-metabot-conversation-state-to-messages-test+ (testing "v64.2026-07-06: the legacy conversation state blob moves to the earliest live assistant message, then the column drops"+ (impl/test-migrations ["v64.2026-07-06T00:00:01" "v64.2026-07-06T00:00:02"] [migrate!]+ (let [user-id (t2/insert-returning-pk! :core_user {:first_name "State"+ :last_name "Mover"+ :email "[email protected]"+ :date_joined :%now+ :password "password"+ :password_salt "salt"})+ blob "{\"queries\":{\"q1\":{\"database\":1}},\"todos\":[{\"id\":\"a\"}]}"+ conv-a (str (random-uuid))+ conv-b (str (random-uuid))+ new-message! (fn [conversation-id role & {:as extra}]+ (t2/insert-returning-pk! :metabot_message+ (merge {:conversation_id conversation-id+ :created_at :%now+ :profile_id "internal"+ :role role+ :data "[]"+ :total_tokens 0+ :data_version 2}+ extra)))+ _ (t2/insert! :metabot_conversation {:id conv-a :user_id user-id :state blob})+ _ (t2/insert! :metabot_conversation {:id conv-b :user_id user-id})+ a-user (new-message! conv-a "user")+ a-deleted (new-message! conv-a "assistant" :deleted_at :%now)+ a-earliest (new-message! conv-a "assistant")+ a-later (new-message! conv-a "assistant")+ b-assistant (new-message! conv-b "assistant")]+ (migrate!)+ (is (= blob (t2/select-one-fn :state :metabot_message :id a-earliest))+ "the blob lands on the earliest live assistant row")+ (is (nil? (t2/select-one-fn :state :metabot_message :id a-deleted))+ "soft-deleted rows are skipped")+ (is (nil? (t2/select-one-fn :state :metabot_message :id a-later)))+ (is (nil? (t2/select-one-fn :state :metabot_message :id a-user))+ "user rows are skipped")+ (is (nil? (t2/select-one-fn :state :metabot_message :id b-assistant))+ "conversations without a blob are untouched")+ (is (thrown? Exception (t2/query "SELECT state FROM metabot_conversation"))+ "metabot_conversation.state is gone")))))diff --git a/test/metabase/metabot/agent/memory_test.clj b/test/metabase/metabot/agent/memory_test.cljindex c96b5d7a1a8..49cc9b8773b 100644--- a/test/metabase/metabot/agent/memory_test.clj+++ b/test/metabase/metabot/agent/memory_test.clj@@ -1,23 +1,66 @@(ns metabase.metabot.agent.memory-test(:require+ [clojure.string :as str][clojure.test :refer :all]- [metabase.metabot.agent.memory :as memory]))+ [metabase.metabot.agent.links :as links]+ [metabase.metabot.agent.memory :as memory]+ [metabase.metabot.tools.shared :as shared]))-(deftest initialize-test- (testing "initializes memory with messages and state"+(deftest ^:parallel initialize-test+ (testing "seeds the working state and starts an empty turn-state"(let [messages [{:role :user :content "Hello"}]- state {:queries {} :charts {}}+ state {:queries {"q1" {:id "q1"}} :charts {}}mem (memory/initialize messages state)](is (= messages (:input-messages mem)))- (is (= state (:state mem)))+ (is (= state (memory/get-state mem)))+ (is (= {} (:turn-state mem)))(is (= [] (:steps-taken mem)))))- (testing "initializes with default state when nil"- (let [messages [{:role :user :content "Hello"}]- mem (memory/initialize messages nil)]+ (testing "defaults the working state when nil"+ (let [mem (memory/initialize [{:role :user :content "Hello"}] nil)](is (= {:queries {} :charts {} :todos [] :transforms {} :link-registry {}}- (:state mem))))))+ (memory/get-state mem))))))++(deftest ^:parallel initialize-normalizes-state-registry-keys-test+ (let [query {:database 1 :nested/value "preserved"}+ chart {:chart_id "c1"+ :queries [query]+ :visualization_settings {:chart_type :bar}}+ transform {:name "Transform"}+ chart-config {:display_type "bar"}+ current-query {:database 2}+ mem (memory/initialize+ []+ {:queries {:q1 query, :current current-query, "current" {:database 3}}+ :charts {:c1 chart}+ :transforms {:t1 transform}+ :chart-configs {:cc1 chart-config}+ :link-registry {(keyword "question/123") "metabase://question/123"}})+ state (memory/get-state mem)]+ (testing "keywordized entity IDs are restored to strings without changing nested payload keys"+ (is (= query (memory/find-query mem "q1")))+ (is (= chart (memory/find-chart mem "c1")))+ (is (= transform (memory/find-transform mem "t1")))+ (is (= {"cc1" chart-config} (:chart-configs state)))+ (is (= "preserved" (get-in state [:queries "q1" :nested/value]))))+ (testing "the string-keyed current-context entry wins if both key representations are present"+ (is (= {:database 3} (memory/find-query mem "current"))))+ (testing "link-registry path components retain their namespace"+ (is (= {"question/123" "metabase://question/123"}+ (:link-registry state))))+ (testing "shared tool state and link resolution use the normalized string keys"+ (binding [shared/*memory-atom* (atom mem)]+ (is (= query (get (shared/current-queries-state) "q1")))+ (is (= chart (get (shared/current-charts-state) "c1"))))+ (is (str/starts-with? (links/resolve-metabase-uri "metabase://query/q1"+ (:queries state)+ (:charts state))+ "/question#"))+ (is (str/starts-with? (links/resolve-metabase-uri "metabase://chart/c1"+ (:queries state)+ (:charts state))+ "/question#")))))-(deftest add-step-test+(deftest ^:parallel add-step-test(testing "adds step to memory"(let [mem (memory/initialize [] {})parts [{:type :text :text "Response"}@@ -36,25 +79,48 @@(is (= parts1 (-> mem' :steps-taken first :parts)))(is (= parts2 (-> mem' :steps-taken second :parts))))))-(deftest get-state-test- (testing "retrieves state from memory"- (let [state {:queries {"q1" {:id "q1"}} :charts {}}- mem (memory/initialize [] state)]- (is (= state (memory/get-state mem))))))+(deftest ^:parallel writers-update-state-and-turn-delta-test+ (testing "a writer applies to the working state and records the same into the turn delta"+ (let [mem (memory/initialize [] {:queries {"q1" {:id "q1"}}})+ mem' (-> mem+ (memory/set-query "q2" {:id "q2"})+ (memory/set-todos [{:id "b"}]))]+ (testing "working state carries the seeded baseline plus this turn's writes"+ (is (= {:queries {"q1" {:id "q1"} "q2" {:id "q2"}} :todos [{:id "b"}]}+ (memory/get-state mem'))))+ (testing "turn delta carries only this turn's writes — not the seeded baseline"+ (is (= {:queries {"q2" {:id "q2"}} :todos [{:id "b"}]}+ (memory/turn-state mem'))))))+ (testing "turn-state is nil until this turn writes something"+ (let [mem (memory/initialize [] {:queries {"q1" {:id "q1"}}})]+ (is (nil? (memory/turn-state mem))))))++(deftest ^:parallel set-link-registry-test+ (testing "an empty or unchanged registry is not written into the turn delta"+ (let [without-registry (memory/initialize [] {})+ registry {"/model/1" "metabase://model/1"}+ with-registry (memory/initialize [] {:link-registry registry})]+ (is (= without-registry (memory/set-link-registry without-registry {})))+ (is (= with-registry (memory/set-link-registry with-registry registry)))+ (is (nil? (memory/turn-state (memory/set-link-registry without-registry {}))))+ (is (nil? (memory/turn-state (memory/set-link-registry with-registry registry))))))+ (testing "a newly resolved link updates live state and the turn delta"+ (let [mem (memory/initialize [] {})+ registry (atom {})+ _ (links/resolve-links "[Model](metabase://model/1)" {} {} registry)+ mem' (memory/set-link-registry mem @registry)]+ (is (= {"/model/1" "metabase://model/1"}+ (get-in mem' [:state :link-registry])))+ (is (= {:link-registry {"/model/1" "metabase://model/1"}}+ (memory/turn-state mem'))))))-(deftest update-state-test- (testing "updates state with new values"- (let [mem (memory/initialize [] {:queries {}})- mem' (memory/update-state mem {:charts {"c1" {:id "c1"}}})]- (is (= {:queries {} :charts {"c1" {:id "c1"}}}- (memory/get-state mem')))))- (testing "merges state updates"- (let [mem (memory/initialize [] {:queries {"q1" {:id "q1"}}})- mem' (memory/update-state mem {:charts {"c1" {:id "c1"}}})]- (is (= {:queries {"q1" {:id "q1"}} :charts {"c1" {:id "c1"}}}- (memory/get-state mem'))))))+(deftest ^:parallel merge-states-test+ (testing "map entries merge; scalar/vector entries take the later value"+ (is (= {:queries {:q1 1 :q2 2} :todos [{:id "b"}]}+ (memory/merge-states {:queries {:q1 1} :todos [{:id "a"}]}+ {:queries {:q2 2} :todos [{:id "b"}]})))))-(deftest get-steps-test+(deftest ^:parallel get-steps-test(testing "retrieves all steps"(let [parts1 [{:type :tool-input}]parts2 [{:type :text}]@@ -65,14 +131,14 @@(is (= parts1 (-> mem memory/get-steps first :parts)))(is (= parts2 (-> mem memory/get-steps second :parts))))))-(deftest get-input-messages-test+(deftest ^:parallel get-input-messages-test(testing "retrieves input messages"(let [messages [{:role :user :content "Hello"}{:role :assistant :content "Hi"}]mem (memory/initialize messages {})](is (= messages (memory/get-input-messages mem))))))-(deftest iteration-count-test+(deftest ^:parallel iteration-count-test(testing "counts number of steps"(let [mem (-> (memory/initialize [] {})(memory/add-step [{:type :tool-input}])diff --git a/test/metabase/metabot/api/conversations_test.clj b/test/metabase/metabot/api/conversations_test.cljindex 21949f15f5d..d5600348dca 100644--- a/test/metabase/metabot/api/conversations_test.clj+++ b/test/metabase/metabot/api/conversations_test.clj@@ -1,6 +1,7 @@(ns metabase.metabot.api.conversations-test(:require[clojure.test :refer [deftest is testing]]+ [java-time.api :as t][metabase.api.common :as api][metabase.metabot.api :as metabot.api][metabase.metabot.persistence :as metabot.persistence]@@ -9,6 +10,9 @@(set! *warn-on-reflection* true)+(defn- seconds-ago [n]+ (t/minus (t/offset-date-time) (t/seconds n)))+(deftest list-conversations-authentication-test(testing "GET /api/metabot/conversations requires auth"(is (= "Unauthenticated"@@ -55,15 +59,28 @@(is (contains? ids convo-id))))))))(deftest list-conversations-includes-message-count-test- (testing "GET /api/metabot/conversations returns message_count"+ (testing "GET /api/metabot/conversations counts and timestamps live messages only"(let [user-id (mt/user->id :rasta)](mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id user-id :summary "hi"}- :model/MetabotMessage _ {:conversation_id convo-id :user_id user-id :role "user"}- :model/MetabotMessage _ {:conversation_id convo-id :user_id user-id :role "assistant"}]+ :model/MetabotMessage _ {:conversation_id convo-id+ :user_id user-id+ :role "user"+ :created_at (seconds-ago 30)}+ :model/MetabotMessage {live-id :id} {:conversation_id convo-id+ :user_id user-id+ :role "assistant"+ :created_at (seconds-ago 20)}+ :model/MetabotMessage _ {:conversation_id convo-id+ :user_id user-id+ :role "assistant"+ :created_at (seconds-ago 10)+ :deleted_at (t/offset-date-time)}](let [response (mt/user-http-request :rasta :get 200 "metabot/conversations")found (first (filter #(= convo-id (:conversation_id %)) (:data response)))](is (some? found))- (is (= 2 (:message_count found))))))))+ (is (= 2 (:message_count found)))+ (is (= (t/instant (t2/select-one-fn :created_at :model/MetabotMessage live-id))+ (t/instant (t/offset-date-time (:last_message_at found))))))))))(deftest get-conversation-participant-can-read-test(testing "GET /api/metabot/conversations/:id returns the conversation to any participant"@@ -132,6 +149,187 @@(binding [api/*current-user-id* other-id](is (nil? (check! (str (random-uuid)))))))))))+(def ^:private check-turn!* @#'metabot.api/check-turn!)+(def ^:private make-out-of-sync-fn @#'metabot.api/make-out-of-sync-fn)++(defn- check-turn!+ "Shim over the 4-arg impl: reads live messages and builds `out-of-sync!` from `conversation-id`."+ [conversation-id parent-message-id retry-message-id]+ (check-turn!* (metabot.persistence/live-messages conversation-id)+ parent-message-id retry-message-id+ (make-out-of-sync-fn conversation-id parent-message-id retry-message-id)))++(defn- rejection! [& args]+ (try (apply check-turn! args)+ (catch clojure.lang.ExceptionInfo e (ex-data e))))++(deftest check-turn-test+ (testing "check-turn! parent_message_id branches"+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id (mt/user->id :rasta)}+ :model/MetabotMessage _leaf {:conversation_id convo-id+ :role "assistant"+ :external_id "leaf-ext"}]+ (testing "nil parent_message_id starts a turn on a brand-new conversation"+ (is (= {:action :start} (check-turn! (str (random-uuid)) nil nil))))+ (testing "nil parent_message_id is rejected once the conversation has a leaf message"+ (is (= {:status-code 409 :reason :parent-message-missing}+ (rejection! convo-id nil nil))))+ (testing "a parent_message_id matching the current leaf starts a turn"+ (is (= {:action :start} (check-turn! convo-id "leaf-ext" nil))))+ (testing "a parent_message_id that does not exist at all is rejected"+ (is (=? {:reason :parent-message-not-found}+ (rejection! convo-id (str (random-uuid)) nil))))+ (mt/with-temp [:model/MetabotMessage _earlier+ {:conversation_id convo-id+ :role "assistant"+ :external_id "earlier-ext"+ :created_at (seconds-ago 60)}]+ (testing "a parent_message_id for an earlier (non-leaf) message with a clean tail is rejected"+ (is (=? {:reason :parent-message-stale}+ (rejection! convo-id "earlier-ext" nil)))))+ (mt/with-temp [:model/MetabotConversation {other-convo-id :id} {:user_id (mt/user->id :rasta)}+ :model/MetabotMessage _other {:conversation_id other-convo-id+ :role "assistant"+ :external_id "other-ext"}]+ (testing "a parent_message_id belonging to a different conversation is not found in these messages"+ (is (=? {:reason :parent-message-not-found}+ (rejection! convo-id "other-ext" nil)))))+ (mt/with-temp [:model/MetabotMessage _user-msg {:conversation_id convo-id+ :role "user"+ :external_id "user-ext"}]+ (testing "a parent_message_id pointing at a user message is rejected"+ (is (=? {:reason :parent-message-not-agent-role}+ (rejection! convo-id "user-ext" nil))))))))++(deftest check-turn-retry-test+ (testing "check-turn! retry_message_id branches"+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id (mt/user->id :rasta)}+ :model/MetabotMessage _u1 {:conversation_id convo-id+ :role "user"+ :external_id "u1"+ :created_at (seconds-ago 40)}+ :model/MetabotMessage _a1 {:conversation_id convo-id+ :role "assistant"+ :external_id "a1"+ :created_at (seconds-ago 30)}]+ (testing "retrying the last live user message is allowed"+ (is (=? {:action :retry} (check-turn! convo-id nil "u1"))))+ (testing "parent_message_id is ignored when retry_message_id is present"+ (is (=? {:action :retry} (check-turn! convo-id "stale-or-anything" "u1"))))+ (testing "a retry_message_id that does not exist is rejected"+ (is (=? {:reason :retry-message-not-found}+ (rejection! convo-id nil (str (random-uuid))))))+ (testing "a retry_message_id pointing at an assistant message is rejected"+ (is (=? {:reason :retry-message-not-user-role}+ (rejection! convo-id nil "a1"))))+ (mt/with-temp [:model/MetabotConversation {other-convo-id :id} {:user_id (mt/user->id :rasta)}+ :model/MetabotMessage _other-u {:conversation_id other-convo-id+ :role "user"+ :external_id "other-u"}]+ (testing "a retry_message_id belonging to a different conversation is not found in these messages"+ (is (=? {:reason :retry-message-not-found}+ (rejection! convo-id nil "other-u")))))+ (mt/with-temp [:model/MetabotMessage _u2 {:conversation_id convo-id+ :role "user"+ :external_id "u2"+ :created_at (seconds-ago 20)}+ :model/MetabotMessage _a2 {:conversation_id convo-id+ :role "assistant"+ :external_id "a2"+ :created_at (seconds-ago 10)}]+ (testing "retrying an earlier (non-last) user message is rejected"+ (is (=? {:reason :retry-message-not-last}+ (rejection! convo-id nil "u1"))))+ (testing "the last user message is still retryable"+ (is (=? {:action :retry} (check-turn! convo-id nil "u2"))))))))++(deftest check-turn-replace-failed-turn-test+ (testing "check-turn! replaces trailing failed turns when the parent points before them"+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id (mt/user->id :rasta)}+ :model/MetabotMessage _u1 {:conversation_id convo-id+ :role "user"+ :external_id "u1"+ :created_at (seconds-ago 60)}+ :model/MetabotMessage _a1 {:conversation_id convo-id+ :role "assistant"+ :external_id "a1"+ :created_at (seconds-ago 50)}+ :model/MetabotMessage {u2-id :id} {:conversation_id convo-id+ :role "user"+ :external_id "u2"+ :created_at (seconds-ago 40)}+ :model/MetabotMessage {a2-id :id} {:conversation_id convo-id+ :role "assistant"+ :external_id "a2"+ :error "{\"message\":\"boom\"}"+ :created_at (seconds-ago 30)}]+ (testing "one trailing errored pair after the claimed parent"+ (is (= {:action :replace-failed-turn :message-ids [u2-id a2-id]}+ (check-turn! convo-id "a1" nil))))+ (mt/with-temp [:model/MetabotMessage {u3-id :id} {:conversation_id convo-id+ :role "user"+ :external_id "u3"+ :created_at (seconds-ago 20)}+ :model/MetabotMessage {a3-id :id} {:conversation_id convo-id+ :role "assistant"+ :external_id "a3"+ :error "{\"message\":\"boom again\"}"+ :created_at (seconds-ago 10)}]+ (testing "two consecutive trailing errored turns are replaced together"+ (is (= {:action :replace-failed-turn :message-ids [u2-id a2-id u3-id a3-id]}+ (check-turn! convo-id "a1" nil))))))))++(deftest check-turn-replace-failed-first-turn-test+ (testing "a whole-conversation failed first turn is replaced on a nil-parent resubmit"+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id (mt/user->id :rasta)}+ :model/MetabotMessage {u1-id :id} {:conversation_id convo-id+ :role "user"+ :external_id "u1"+ :created_at (seconds-ago 20)}+ :model/MetabotMessage {a1-id :id} {:conversation_id convo-id+ :role "assistant"+ :external_id "a1"+ :error "{\"message\":\"boom\"}"+ :created_at (seconds-ago 10)}]+ (is (= {:action :replace-failed-turn :message-ids [u1-id a1-id]}+ (check-turn! convo-id nil nil))))))++(deftest check-turn-rejects-non-failed-tails-test+ (testing "tails that are not all-errored are still rejected"+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id (mt/user->id :rasta)}+ :model/MetabotMessage _a1 {:conversation_id convo-id+ :role "assistant"+ :external_id "a1"+ :created_at (seconds-ago 60)}+ :model/MetabotMessage _u2 {:conversation_id convo-id+ :role "user"+ :external_id "u2"+ :created_at (seconds-ago 50)}]+ (testing "an in-flight placeholder (finished nil, no error) in the tail"+ (mt/with-temp [:model/MetabotMessage _a2 {:conversation_id convo-id+ :role "assistant"+ :external_id "a2"+ :finished nil+ :created_at (seconds-ago 40)}]+ (is (=? {:reason :parent-message-stale}+ (rejection! convo-id "a1" nil)))))+ (testing "a mixed tail (errored turn followed by a clean turn)"+ (mt/with-temp [:model/MetabotMessage _a2 {:conversation_id convo-id+ :role "assistant"+ :external_id "a2"+ :error "{\"message\":\"boom\"}"+ :created_at (seconds-ago 40)}+ :model/MetabotMessage _u3 {:conversation_id convo-id+ :role "user"+ :external_id "u3"+ :created_at (seconds-ago 30)}+ :model/MetabotMessage _a3 {:conversation_id convo-id+ :role "assistant"+ :external_id "a3"+ :created_at (seconds-ago 20)}]+ (is (=? {:reason :parent-message-stale}+ (rejection! convo-id "a1" nil))))))))+(deftest originator-not-overwritten-by-second-writer-test(testing "metabot_conversation.user_id is set once on insert and never overwritten"(let [owner-id (mt/user->id :rasta)diff --git a/test/metabase/metabot/api_test.clj b/test/metabase/metabot/api_test.cljindex daf324a270f..2ebf9c988cc 100644--- a/test/metabase/metabot/api_test.clj+++ b/test/metabase/metabot/api_test.clj@@ -39,9 +39,8 @@(mt/with-temporary-setting-values [metabot.settings/llm-metabot-provider test-provider](binding [scope/*current-user-metabot-permissions* scope/all-yes-permissions](with-redefs [config/is-dev? true]- (let [conversation-id (str (random-uuid))- question {:role "user" :content "Test native streaming"}- historical-message {:role "user" :content "previous message"}]+ (let [conversation-id (str (random-uuid))+ question {:role "user" :content "Test native streaming"}](mt/with-dynamic-fn-redefs [openrouter/openrouter (fn [_](mut/mock-llm-response[{:type :start :id "msg-1"}@@ -55,7 +54,6 @@{:message (:content question):context {}:conversation_id conversation-id- :history [historical-message]:state {}})lines (->> (str/split-lines response)(filter #(str/starts-with? % "data: ")))@@ -173,7 +171,7 @@http/post (fn [url opts](real-http-post url (assoc opts :decompress-body false)))metabot.context/create-context (fn [ctx & _] ctx)- metabot.persistence/finalize-assistant-turn! (fn [_conv-id _pk parts & kwargs]+ metabot.persistence/finalize-assistant-turn! (fn [_pk parts & kwargs](reset! stored-parts parts)(reset! stored-kwargs (apply hash-map kwargs)))sr/async-cancellation-poll-interval-ms 5]@@ -191,7 +189,6 @@{:message "Test closure":context {}:conversation_id conversation-id- :history []:state {}})](.read ^java.io.InputStream (:body response)) ;; start the handler;; Close the underlying client, not the body stream: closing the body would@@ -231,7 +228,7 @@(throw (ex-info "agent setup exploded"{:status 503 :provider :test})))metabot.persistence/finalize-assistant-turn!- (fn [_conv-id _pk parts & kwargs]+ (fn [_pk parts & kwargs](reset! stored-parts parts)(reset! stored-kwargs (apply hash-map kwargs)))](mt/with-model-cleanup [:model/MetabotMessage@@ -240,7 +237,6 @@{:message "go":context {}:conversation_id (str (random-uuid))- :history []:state {}})](u/poll {:thunk #(deref stored-kwargs):done? some?@@ -757,7 +753,6 @@{:message "Test":context {}:conversation_id (str (random-uuid))- :history []:state {}}))))(testing "/feedback"(is (= "Unauthenticated"@@ -812,7 +807,6 @@(let [base-request {:message "Test":context {}:conversation_id (str (random-uuid))- :history []:state {}}](mt/with-dynamic-fn-redefs [openrouter/openrouter (fn [_](mut/mock-llm-response@@ -865,6 +859,374 @@:metabot_id metabot.config/embedded-metabot-id:conversation_id (str (random-uuid))))))))))))+(defn- streamed-start-event+ "Parse a raw agent-streaming SSE response body and return the `start` event."+ [response]+ (->> (str/split-lines response)+ (filter #(str/starts-with? % "data: "))+ (remove #(= "data: [DONE]" %))+ (map #(json/decode+kw (subs % 6)))+ (u/seek #(= "start" (:type %)))))++(defn- streamed-message-id+ [response]+ (:messageId (streamed-start-event response)))++(defn- streamed-user-message-id+ [response]+ (get-in (streamed-start-event response) [:messageMetadata :userMessageId]))++(def ^:private default-mock-parts+ [{:type :start :id "msg-1"}+ {:type :text :text "hi"}+ {:type :usage :usage {:promptTokens 1 :completionTokens 1}+ :model "test-model" :id "msg-1"}])++(def ^:private error-mock-parts+ [{:type :start :id "msg-1"}+ {:type :error :error {:message "boom"}}])++(defn- with-mock-streaming-provider!+ "Runs `thunk` with the LLM provider mocked. Each provider call consumes the next+ parts vector from `responses`, falling back to `default-mock-parts` once exhausted."+ ([thunk] (with-mock-streaming-provider! [] thunk))+ ([responses thunk]+ (let [queue (atom (vec responses))]+ (mt/with-temporary-setting-values [metabot.settings/llm-metabot-provider test-provider]+ (binding [scope/*current-user-metabot-permissions* scope/all-yes-permissions]+ (mt/with-dynamic-fn-redefs [openrouter/openrouter+ (fn [_]+ (let [[[parts]] (swap-vals! queue (comp vec rest))]+ (mut/mock-llm-response (or parts default-mock-parts))))]+ (mt/with-model-cleanup [:model/MetabotMessage [:model/MetabotConversation :created_at]]+ (thunk)+ (is (empty? @queue) "unconsumed mock LLM responses"))))))))++(deftest agent-streaming-rejects-stale-parent-message-id-test+ (testing "agent-streaming accepts nil/matching parent_message_id, rejects one that no longer matches the leaf"+ (with-mock-streaming-provider!+ (fn []+ (let [conversation-id (str (random-uuid))+ first-response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ {:message "first"+ :context {}+ :conversation_id conversation-id+ :state {}})+ stale-id (streamed-message-id first-response)]+ (is (string? stale-id))+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ {:message "second"+ :context {}+ :conversation_id conversation-id+ :state {}+ :parent_message_id stale-id})+ (mt/user-http-request :rasta :post 409 "metabot/agent-streaming"+ {:message "third"+ :context {}+ :conversation_id conversation-id+ :state {}+ :parent_message_id stale-id}))))))++(deftest agent-streaming-rejects-missing-parent-message-id-for-existing-conversation-test+ (testing "agent-streaming rejects an omitted parent_message_id once the conversation already has a leaf"+ (with-mock-streaming-provider!+ (fn []+ (let [conversation-id (str (random-uuid))]+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ {:message "first"+ :context {}+ :conversation_id conversation-id+ :state {}})+ (mt/user-http-request :rasta :post 409 "metabot/agent-streaming"+ {:message "second"+ :context {}+ :conversation_id conversation-id+ :state {}}))))))++(defn- agent-request+ [conversation-id message & {:as extra}]+ (merge {:message message+ :context {}+ :conversation_id conversation-id+ :state {}}+ extra))++(defn- conversation-rows+ [conversation-id]+ (t2/select [:model/MetabotMessage :id :external_id :role :deleted_at :deleted_by_user_id]+ :conversation_id conversation-id+ {:order-by [[:created_at :asc] [:id :asc]]}))++(deftest agent-streaming-start-event-carries-user-message-id-test+ (testing "the start event's messageMetadata.userMessageId is the persisted user row's external_id"+ (with-mock-streaming-provider!+ (fn []+ (let [conversation-id (str (random-uuid))+ response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "hello"))+ user-message-id (streamed-user-message-id response)]+ (is (string? user-message-id))+ (is (= user-message-id+ (t2/select-one-fn :external_id :model/MetabotMessage+ :conversation_id conversation-id :role "user"))))))))++(deftest agent-streaming-honors-client-minted-message-ids-test+ (testing "rows persist under client-sent ids, the start event echoes them, and a retry honors its fresh assistant id"+ (with-mock-streaming-provider!+ (fn []+ (let [conversation-id (str (random-uuid))+ user-id (str (random-uuid))+ assistant-id (str (random-uuid))+ response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "first"+ :user_message_id user-id+ :assistant_message_id assistant-id))]+ (is (= assistant-id (streamed-message-id response)))+ (is (= user-id (streamed-user-message-id response)))+ (is (= {:user user-id :assistant assistant-id}+ (t2/select-fn->fn :role :external_id :model/MetabotMessage+ :conversation_id conversation-id)))+ (let [retry-assistant-id (str (random-uuid))]+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "first"+ :retry_message_id user-id+ :assistant_message_id retry-assistant-id))+ (is (= retry-assistant-id+ (metabot.persistence/leaf-external-id conversation-id)))))))))++(deftest agent-streaming-rejects-taken-client-minted-id-test+ (testing "a client-sent id colliding with an existing message 409s"+ (with-mock-streaming-provider!+ (fn []+ (let [conversation-id (str (random-uuid))+ first-response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "first"))+ parent-id (streamed-message-id first-response)]+ (mt/user-http-request :rasta :post 409 "metabot/agent-streaming"+ (agent-request conversation-id "second"+ :parent_message_id parent-id+ :assistant_message_id parent-id)))))))++(deftest agent-streaming-rejects-malformed-client-minted-id-test+ (testing "a non-uuid client-sent id fails request validation"+ (mt/user-http-request :rasta :post 400 "metabot/agent-streaming"+ (agent-request (str (random-uuid)) "first"+ :assistant_message_id "not-a-uuid"))))++(deftest agent-streaming-replaces-trailing-failed-turn-test+ (testing "a resubmit whose parent points before a mid-stream-errored turn replaces the failed pair"+ (with-mock-streaming-provider!+ [default-mock-parts error-mock-parts default-mock-parts]+ (fn []+ (let [conversation-id (str (random-uuid))+ first-response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "first"))+ parent-1 (streamed-message-id first-response)]+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "second (fails)"+ :parent_message_id parent-1))+ (let [third-response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "third"+ :parent_message_id parent-1))+ rows (conversation-rows conversation-id)+ deleted (filter :deleted_at rows)+ live (remove :deleted_at rows)]+ (is (= [:user :assistant] (map :role deleted))+ "the failed turn's user + assistant rows are soft-deleted")+ (is (= #{(mt/user->id :rasta)} (into #{} (map :deleted_by_user_id) deleted)))+ (is (= [:user :assistant :user :assistant] (map :role live)))+ (is (= (streamed-message-id third-response)+ (metabot.persistence/leaf-external-id conversation-id)))))))))++(deftest agent-streaming-retry-test+ (testing "retry_message_id regenerates the response without inserting a new user row"+ (with-mock-streaming-provider!+ (fn []+ (let [conversation-id (str (random-uuid))+ first-response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "hello"))+ user-ext-id (streamed-user-message-id first-response)+ retry-response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "hello"+ :retry_message_id user-ext-id))+ rows (conversation-rows conversation-id)]+ (is (= 1 (count (remove :deleted_at (filter #(= :user (:role %)) rows))))+ "retry records no new user row")+ (is (= [:assistant] (map :role (filter :deleted_at rows)))+ "only the superseded response is soft-deleted")+ (is (= (streamed-message-id retry-response)+ (metabot.persistence/leaf-external-id conversation-id)))+ (testing "the same prompt can be retried again"+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "hello"+ :retry_message_id user-ext-id))+ (let [rows (conversation-rows conversation-id)]+ (is (= 1 (count (remove :deleted_at (filter #(= :user (:role %)) rows)))))+ (is (= 2 (count (filter :deleted_at rows)))))))))))++(deftest agent-streaming-rejects-non-user-retry-id-test+ (testing "retry_message_id pointing at an assistant (non-user) message 409s"+ (with-mock-streaming-provider!+ (fn []+ (let [conversation-id (str (random-uuid))+ first-response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "hello"))+ assistant-ext (streamed-message-id first-response)]+ (mt/user-http-request :rasta :post 409 "metabot/agent-streaming"+ (agent-request conversation-id "hello"+ :retry_message_id assistant-ext)))))))++(deftest agent-streaming-serializes-concurrent-retries-test+ (testing "two concurrent retries of the same prompt leave exactly one live reply"+ (with-mock-streaming-provider!+ (fn []+ (let [conversation-id (str (random-uuid))+ user-ext-id (streamed-user-message-id+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "hello")))+ start (java.util.concurrent.CountDownLatch. 1)+ retry! (fn []+ (.await start)+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "hello"+ :retry_message_id user-ext-id)))+ f1 (future (retry!))+ f2 (future (retry!))]+ (.countDown start)+ @f1+ @f2+ (is (= 1 (->> (conversation-rows conversation-id)+ (filter #(and (= :assistant (:role %)) (nil? (:deleted_at %))))+ count))+ "the conversation lock serializes the retries, so exactly one live reply survives"))))))++(defn- input-messages+ "The `[role text]` of each message-shaped part in an LLM request's `:input`,+ in order — skips tool and preload parts. Lets a test assert the exact+ reconstructed turn sequence (roles, order, content) rather than substrings."+ [request]+ (keep (fn [part]+ (cond+ (:role part) [(:role part) (:content part)]+ (= :text (:type part)) [:assistant (:text part)]))+ (:input request)))++(defn- with-captured-llm-requests!+ "Runs `thunk` with the provider mocked, appending each provider-call opts map+ to `requests` and replying with `reply-text`."+ [requests reply-text thunk]+ (mt/with-temporary-setting-values [metabot.settings/llm-metabot-provider test-provider]+ (binding [scope/*current-user-metabot-permissions* scope/all-yes-permissions]+ (mt/with-dynamic-fn-redefs [openrouter/openrouter+ (fn [opts]+ (swap! requests conj opts)+ (mut/mock-llm-response+ [{:type :start :id "msg-1"}+ {:type :text :text reply-text}+ {:type :usage :usage {:promptTokens 1 :completionTokens 1}+ :model "test-model" :id "msg-1"}]))]+ (mt/with-model-cleanup [:model/MetabotMessage [:model/MetabotConversation :created_at]]+ (thunk))))))++(deftest agent-streaming-reconstructs-prior-turn-for-the-llm-test+ (testing "a follow-up turn reconstructs the prior prompt + reply from the DB and sends them to the LLM"+ (let [requests (atom [])]+ (with-captured-llm-requests!+ requests "prior-assistant-reply"+ (fn []+ (let [conversation-id (str (random-uuid))+ first-response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "prior-user-prompt"))+ parent-id (streamed-message-id first-response)]+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "follow-up-prompt"+ :parent_message_id parent-id))+ (let [msgs (input-messages (last @requests))]+ (is (= 2 (count @requests)))+ (is (= [[:user "prior-user-prompt"]+ [:assistant "prior-assistant-reply"]]+ (take 2 msgs))+ "prior turn replayed with the right roles, order, and content")+ (is (= 3 (count msgs))+ "exactly prior user + prior assistant + new prompt — no duplicated turns")+ (is (= :user (first (nth msgs 2))))+ (is (str/includes? (second (nth msgs 2)) "follow-up-prompt")+ "the new prompt is the final user message"))))))))++(deftest agent-streaming-retry-excludes-superseded-reply-from-llm-test+ (testing "after a retry the regenerated call does not replay the superseded reply"+ (let [requests (atom [])]+ (with-captured-llm-requests!+ requests "superseded-reply"+ (fn []+ (let [conversation-id (str (random-uuid))+ first-response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "the-question"))+ user-ext-id (streamed-user-message-id first-response)]+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ (agent-request conversation-id "the-question"+ :retry_message_id user-ext-id))+ (let [msgs (input-messages (last @requests))]+ (is (= 2 (count @requests)))+ (is (= 1 (count msgs))+ "only the retried prompt is sent — the superseded reply is not replayed")+ (is (= :user (first (first msgs))))+ (is (str/includes? (second (first msgs)) "the-question")+ "the retried prompt is still sent")+ (is (not-any? (fn [[_ text]] (str/includes? (str text) "superseded-reply")) msgs)+ "the superseded reply is excluded from the reconstructed history"))))))))++(deftest agent-streaming-reconstructs-state-from-db-test+ (testing "the loop is seeded from DB-reconstructed state — no client echo — and a retry rewinds it"+ (mt/with-temporary-setting-values [metabot.settings/llm-metabot-provider test-provider]+ (binding [scope/*current-user-metabot-permissions* scope/all-yes-permissions]+ (let [seeded-states (atom [])+ turn-states (atom [{:queries {"q_1" {:database 1}} :todos [{:id "a" :status "pending"}]}+ {:queries {"q_1" {:database 1} "q_2" {:database 2}} :todos [{:id "b" :status "done"}]}+ nil])]+ (with-redefs [agent/run-agent-loop+ (fn [{:keys [state memory-atom]}]+ (swap! seeded-states conj state)+ (let [[turn-state] @turn-states]+ (swap! turn-states subvec 1)+ ;; mirror the real loop: populate the caller's atom so+ ;; finalize can persist this turn's state+ (some-> memory-atom+ (reset! {:turn-state (or turn-state {})}))+ (cond-> [{:type :start :id "msg-1"}+ {:type :text :text "ok"}]+ turn-state (conj {:type :data :data-type "state" :data turn-state}))))]+ (mt/with-model-cleanup [:model/MetabotMessage [:model/MetabotConversation :created_at]]+ (let [conversation-id (str (random-uuid))+ turn-1-state {:queries {:q_1 {:database 1}} :todos [{:id "a" :status "pending"}]}+ first-response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ {:message "make a query"+ :context {}+ :conversation_id conversation-id})+ parent-id (streamed-message-id first-response)+ user-ext-id (streamed-user-message-id first-response)+ second-response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ {:message "another"+ :context {}+ :conversation_id conversation-id+ :parent_message_id parent-id})+ second-user-id (streamed-user-message-id second-response)]+ (is (string? user-ext-id))+ (is (= {} (first @seeded-states))+ "a new conversation seeds the loop with empty state")+ (is (= turn-1-state (second @seeded-states))+ "the follow-up turn is seeded from the DB partial, keywordized — no client echo")+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ {:message "another"+ :context {}+ :conversation_id conversation-id+ :retry_message_id second-user-id})+ (is (= turn-1-state (nth @seeded-states 2))+ "retrying the last prompt rewinds state to before its superseded reply")+ (is (= turn-1-state (metabot.persistence/conversation-state+ (metabot.persistence/live-messages conversation-id)))+ "reconstruction excludes the soft-deleted turn's state")))))))))+(deftest extract-usage-test(testing "takes last cumulative usage per model"(is (= {"gpt-4" {:prompt 250 :completion 50}}@@ -926,7 +1288,7 @@conv-id "internal"{:role "user" :content "hi"})](metabot.persistence/finalize-assistant-turn!- conv-id assistant-msg-id+ assistant-msg-id[{:type :start :id "msg-1"}{:type :text :text "Hello"};; SSE usage parts carry bare model names (from provider API response)@@ -952,7 +1314,7 @@(:usage msg))))))(deftest finalize-assistant-turn-data-part-filtering-test- (testing "persistable data parts land in MetabotMessage.data; state is salvaged to conversation and excluded from data"+ (testing "persistable data parts land in MetabotMessage.data; the turn-state lands on the row and is excluded from data"(binding [mb.api/*current-user-id* (mt/user->id :crowberto)](let [conv-id (str (random-uuid))](try@@ -961,7 +1323,7 @@conv-id "internal"{:role "user" :content "hi"})](metabot.persistence/finalize-assistant-turn!- conv-id assistant-msg-id+ assistant-msg-id[{:type :start :id "msg-1"}{:type :text :text "Hi"}{:type :data :data-type "navigate_to" :data "/question/1"}@@ -972,9 +1334,9 @@{:type :data :data-type "static_viz" :version 1 :data {:entity_id 1}}{:type :data :data-type "state" :data {:step 1}}{:type :usage :model "claude-sonnet-4-6" :usage {:promptTokens 1 :completionTokens 1}}- {:type :finish}])+ {:type :finish}]+ :turn-state {:step 1})(let [msg (t2/select-one :model/MetabotMessage assistant-msg-id)- conv (t2/select-one :model/MetabotConversation :id conv-id)part-types (into #{} (map :type) (:data msg))data-types (into #{}(keep #(when (str/starts-with? % "data-") (subs % 5)))@@ -986,8 +1348,8 @@"text parts survive")(is (not-any? part-types #{"start" "usage" "finish"})"stream metadata is dropped")- (is (= {:step 1} (:state conv))- "state value is salvaged to MetabotConversation.state"))))+ (is (= {:step 1} (:state msg))+ "the turn's partial state lands on the message row"))))(finally(t2/delete! :model/MetabotMessage :conversation_id conv-id)(t2/delete! :model/MetabotConversation :id conv-id)))))))@@ -1139,21 +1501,24 @@(testing "streaming-request passes metabot-id to native-agent-streaming-request"(let [captured-args (atom nil)test-metabot-id metabot.config/embedded-metabot-id]- (mt/with-dynamic-fn-redefs [metabot.config/check-metabot-enabled! (constantly nil)- api/check-conversation-access! (constantly nil)- metabot.persistence/start-turn! (fn [& _]- {:assistant-msg-id 1- :assistant-external-id "ext-id"})- api/native-agent-streaming-request (fn [args]- (reset! captured-args args)- ;; Return a minimal streaming response- nil)]- (mt/with-test-user :rasta+ (mt/with-model-cleanup [:model/MetabotMessage+ [:model/MetabotConversation :created_at]]+ (mt/with-dynamic-fn-redefs [metabot.config/check-metabot-enabled! (constantly nil)+ api/check-conversation-access! (constantly nil)+ metabot.persistence/leaf-external-id (constantly nil)+ metabot.persistence/live-messages (constantly [])+ metabot.persistence/history (constantly [])+ metabot.persistence/start-turn! (fn [& _]+ {:assistant-msg-id 1+ :assistant-external-id "ext-id"})+ api/native-agent-streaming-request (fn [args]+ (reset! captured-args args)+ ;; Return a minimal streaming response+ nil)](api/streaming-request {:metabot_id test-metabot-id:profile_id nil:message "test message":context {}- :history []:conversation_id (str (random-uuid)):state {}:debug false}@@ -1167,15 +1532,15 @@(deftest streaming-request-ip-address-test(mt/with-model-cleanup [:model/MetabotMessage[:model/MetabotConversation :created_at]]- (let [request-body (fn [conversation-id]- {:metabot_id metabot.config/embedded-metabot-id- :profile_id nil- :message "hi"- :context {}- :history []- :conversation_id conversation-id- :state {}- :debug false})+ (let [request-body (fn [conversation-id & [parent-message-id]]+ (cond-> {:metabot_id metabot.config/embedded-metabot-id+ :profile_id nil+ :message "hi"+ :context {}+ :conversation_id conversation-id+ :state {}+ :debug false}+ parent-message-id (assoc :parent_message_id parent-message-id)))ip-for (fn [conversation-id](:ip_address (t2/select-one :model/MetabotConversation :id conversation-id)))info-with-ip (fn [ip] {:origin nil :referer nil :user-agent nil :ip-address ip})]@@ -1188,7 +1553,9 @@(let [conversation-id (str (random-uuid))](api/streaming-request (request-body conversation-id) (info-with-ip "1.2.3.4"))(is (= "1.2.3.4" (ip-for conversation-id)))- (api/streaming-request (request-body conversation-id) (info-with-ip "5.6.7.8"))+ (api/streaming-request (request-body conversation-id+ (metabot.persistence/leaf-external-id conversation-id))+ (info-with-ip "5.6.7.8"))(is (= "1.2.3.4" (ip-for conversation-id)))))(testing "null IP on pre-feature rows is backfilled on next call"(let [conversation-id (str (random-uuid))]@@ -1204,15 +1571,15 @@(deftest streaming-request-embedding-fields-test(mt/with-model-cleanup [:model/MetabotMessage[:model/MetabotConversation :created_at]]- (let [request-body (fn [conversation-id]- {:metabot_id metabot.config/embedded-metabot-id- :profile_id nil- :message "hi"- :context {}- :history []- :conversation_id conversation-id- :state {}- :debug false})+ (let [request-body (fn [conversation-id & [parent-message-id]]+ (cond-> {:metabot_id metabot.config/embedded-metabot-id+ :profile_id nil+ :message "hi"+ :context {}+ :conversation_id conversation-id+ :state {}+ :debug false}+ parent-message-id (assoc :parent_message_id parent-message-id)))info-with (fn [embed-referrer]{:origin embed-referrer:referer embed-referrer@@ -1236,7 +1603,8 @@(let [conversation-id (str (random-uuid))](api/streaming-request (request-body conversation-id)(info-with "https://host.example.com/page"))- (api/streaming-request (request-body conversation-id)+ (api/streaming-request (request-body conversation-id+ (metabot.persistence/leaf-external-id conversation-id))(info-with "https://other.example.com/other"))(let [convo (convo-for conversation-id)](is (= "host.example.com" (:embedding_hostname convo)))@@ -1278,7 +1646,6 @@{:message "hello":context {}:conversation_id conversation-id- :history []:state {}})(let [convo (t2/select-one :model/MetabotConversation :id conversation-id)](is (= "customer.example.com" (:embedding_hostname convo)))@@ -1292,7 +1659,6 @@{:message "hello":context {}:conversation_id conversation-id- :history []:state {}})(let [convo (t2/select-one :model/MetabotConversation :id conversation-id)](is (= "customer.example.com" (:embedding_hostname convo)))@@ -1305,7 +1671,6 @@{:message "hello":context {}:conversation_id conversation-id- :history []:state {}})(let [convo (t2/select-one :model/MetabotConversation :id conversation-id)](is (nil? (:embedding_hostname convo)))@@ -1318,7 +1683,6 @@{:message "hello":context {}:conversation_id conversation-id- :history []:state {}})(let [convo (t2/select-one :model/MetabotConversation :id conversation-id)](is (= "Mozilla/5.0 (TestAgent)" (:user_agent convo)))@@ -1330,7 +1694,6 @@{:message "hello":context {}:conversation_id conversation-id- :history []:state {}})(let [convo (t2/select-one :model/MetabotConversation :id conversation-id)](is (nil? (:user_agent convo)))@@ -1350,7 +1713,6 @@{:message "test message":context {}:conversation_id (str (random-uuid))- :history []:state {}}))));;; ------------------------------------------------ Bedrock settings ------------------------------------------------diff --git a/test/metabase/metabot/persistence_test.clj b/test/metabase/metabot/persistence_test.cljindex dc6c39f50b0..99253f67bff 100644--- a/test/metabase/metabot/persistence_test.clj+++ b/test/metabase/metabot/persistence_test.clj@@ -1,10 +1,12 @@(ns metabase.metabot.persistence-test(:require[clojure.test :refer [deftest is testing use-fixtures]]+ [java-time.api :as t][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata][metabase.metabot.persistence :as metabot-persistence][metabase.metabot.query-analyzer :as nqa]+ [metabase.metabot.schema :as metabot.schema][metabase.metabot.self.core :as self.core][metabase.metabot.used-tables :as used-tables][metabase.test :as mt]@@ -13,12 +15,21 @@[metabase.util :as u][metabase.util.json :as json][metabase.util.log.capture :as log.capture]+ [metabase.util.malli.registry :as mr][toucan2.core :as t2]))(set! *warn-on-reflection* true)(use-fixtures :once (fixtures/initialize :test-users))+(defmacro ^:private with-rasta-tx+ "Run `body` in a rollback-only transaction as rasta — the standard preamble for+ these DB-backed persistence tests."+ [& body]+ `(t2/with-transaction [_conn# nil {:rollback-only true}]+ (mt/with-current-user (mt/user->id :rasta)+ ~@body)))+(deftest ^:parallel message->chat-messages-test(testing "text part on a user row renders as a user message"(let [result (metabot-persistence/message->chat-messages@@ -118,6 +129,86 @@(is (= "hello!" (:message (nth result 1))))(is (= {:output "ok"} (json/decode+kw (:result (nth result 2)))))))+(deftest ^:parallel messages->flat-messages-test+ (let [deleted-at (t/offset-date-time)+ messages (metabot-persistence/messages->flat-messages+ [{:role :user :data [{:type "text" :text "q1"}]}+ {:role :assistant+ :deleted_at deleted-at+ :data [{:type "text" :text "discarded-1"}+ {:type "text" :text "discarded-2"}]}+ {:role :assistant :data [{:type "text" :text "older-live"}]}+ {:role :assistant :data [{:type "text" :text "kept-1"}+ {:type "text" :text "kept-2"}]}+ {:role :user :data [{:type "text" :text "q2"}]}])+ by-text #(u/seek (fn [message] (= % (:message message))) messages)+ q1 (by-text "q1")+ discarded-1 (by-text "discarded-1")+ discarded-2 (by-text "discarded-2")+ older-live (by-text "older-live")+ kept-1 (by-text "kept-1")+ kept-2 (by-text "kept-2")+ q2 (by-text "q2")]+ (is (= ["q1" "discarded-1" "discarded-2" "older-live" "kept-1" "kept-2" "q2"]+ (map :message messages)))+ (is (nil? (:parent_message_id q1)))+ (is (= (:id q1) (:parent_message_id discarded-1)))+ (is (= (:id discarded-1) (:parent_message_id discarded-2)))+ (is (= (:id q1) (:parent_message_id older-live)))+ (is (= (:id q1) (:parent_message_id kept-1)))+ (is (= (:id kept-1) (:parent_message_id kept-2)))+ (is (= (:id kept-2) (:parent_message_id q2)))))++(deftest ^:parallel messages->flat-messages-deleted-placeholder-test+ (let [now (t/offset-date-time)+ messages (metabot-persistence/messages->flat-messages+ [{:role :user :data [{:type "text" :text "q1"}]}+ {:id 1+ :role :assistant+ :external_id "a1"+ :created_at now+ :deleted_at now+ :finished nil+ :data []}])]+ (is (= ["text" "text"] (map :type messages)))+ (is (false? (:finished (second messages))))))++(deftest ^:parallel messages->flat-messages-keeps-rewound-errored-turn-test+ (let [deleted-at (t/offset-date-time)+ rows [{:id 1 :role :user :external_id "u1" :deleted_at deleted-at+ :data [{:type "text" :text "revenue"}]}+ {:id 2 :role :assistant :external_id "a1" :deleted_at deleted-at+ :finished true :error "{\"message\":\"boom\"}" :data []}+ {:id 3 :role :user :external_id "u2" :data [{:type "text" :text "orders"}]}+ {:id 4 :role :assistant :external_id "a2" :finished true+ :data [{:type "text" :text "here"}]}]]+ (testing "with :include-rewound-errors? the rewound errored turn shows its prompt and error,+ threaded as a dead branch the live follow-up does not descend from"+ (let [messages (metabot-persistence/messages->flat-messages rows {:include-rewound-errors? true})+ by-text #(u/seek (fn [m] (= % (:message m))) messages)]+ (is (= ["revenue" "" "orders" "here"] (map :message messages)))+ (is (some (fn [m] (and (= "agent" (:role m)) (some? (:error m)))) messages)+ "the errored reply's error survives")+ (is (nil? (:parent_message_id (by-text "orders")))+ "the live follow-up parents onto the root, not the rewound errored turn")))+ (testing "by default the rewound errored turn is dropped"+ (is (= ["orders" "here"]+ (map :message (metabot-persistence/messages->flat-messages rows)))))))++(deftest ^:parallel messages->flat-messages-drops-cleanly-superseded-turn-test+ (testing "even with :include-rewound-errors?, a soft-deleted prompt with no error is dropped"+ (let [deleted-at (t/offset-date-time)+ messages (metabot-persistence/messages->flat-messages+ [{:id 1 :role :user :external_id "u1" :deleted_at deleted-at+ :data [{:type "text" :text "stale-prompt"}]}+ {:id 2 :role :assistant :external_id "a1" :deleted_at deleted-at+ :finished true :data [{:type "text" :text "stale-reply"}]}+ {:id 3 :role :user :external_id "u2" :data [{:type "text" :text "orders"}]}+ {:id 4 :role :assistant :external_id "a2" :finished true+ :data [{:type "text" :text "here"}]}]+ {:include-rewound-errors? true})]+ (is (= ["orders" "here"] (map :message messages))))))+(deftest start-turn-persists-slack-conversation-metadata-test(t2/with-transaction [_conn nil {:rollback-only true}](let [conversation-id (str (random-uuid))@@ -297,7 +388,7 @@{:role "user" :content "hi"})created-at-before (:created_at (t2/select-one :model/MetabotMessage assistant-msg-id))_ (metabot-persistence/finalize-assistant-turn!- conversation-id assistant-msg-id+ assistant-msg-id[{:type :text :text "Hello"}{:type :usage:model "claude-sonnet-4-6"@@ -314,31 +405,30 @@(deftest finalize-assistant-turn-passes-through-aborted-and-errored-test(testing "finalize-assistant-turn! preserves :finished? false and JSON-encodes :error"- (t2/with-transaction [_conn nil {:rollback-only true}]- (mt/with-current-user (mt/user->id :rasta)- (testing "aborted: finished false flows through"- (let [conversation-id (str (random-uuid))- {:keys [assistant-msg-id]} (metabot-persistence/start-turn!- conversation-id "internal"- {:role "user" :content "go"})]- (metabot-persistence/finalize-assistant-turn!- conversation-id assistant-msg-id- [{:type :text :text "partial"}]- :finished? false)- (is (=? {:finished false :error nil}- (t2/select-one :model/MetabotMessage assistant-msg-id)))))- (testing "errored: error map JSON-encoded into the error column"- (let [conversation-id (str (random-uuid))- error-data {:message "boom" :type "RuntimeException"}- {:keys [assistant-msg-id]} (metabot-persistence/start-turn!- conversation-id "internal"- {:role "user" :content "go"})]- (metabot-persistence/finalize-assistant-turn!- conversation-id assistant-msg-id []- :error error-data)- (let [row (t2/select-one :model/MetabotMessage assistant-msg-id)]- (is (true? (:finished row)))- (is (= error-data (json/decode+kw (:error row)))))))))))+ (with-rasta-tx+ (testing "aborted: finished false flows through"+ (let [conversation-id (str (random-uuid))+ {:keys [assistant-msg-id]} (metabot-persistence/start-turn!+ conversation-id "internal"+ {:role "user" :content "go"})]+ (metabot-persistence/finalize-assistant-turn!+ assistant-msg-id+ [{:type :text :text "partial"}]+ :finished? false)+ (is (=? {:finished false :error nil}+ (t2/select-one :model/MetabotMessage assistant-msg-id)))))+ (testing "errored: error map JSON-encoded into the error column"+ (let [conversation-id (str (random-uuid))+ error-data {:message "boom" :type "RuntimeException"}+ {:keys [assistant-msg-id]} (metabot-persistence/start-turn!+ conversation-id "internal"+ {:role "user" :content "go"})]+ (metabot-persistence/finalize-assistant-turn!+ assistant-msg-id []+ :error error-data)+ (let [row (t2/select-one :model/MetabotMessage assistant-msg-id)]+ (is (true? (:finished row)))+ (is (= error-data (json/decode+kw (:error row))))))))))(deftest start-turn-pins-ordering-under-abort-then-retry-test(testing "an aborted turn whose finalize fires after a retry still sorts before the retry's rows"@@ -357,12 +447,12 @@;; Now Turn A's stream finally lands (abort): UPDATE on its placeholder(Thread/sleep 5)(metabot-persistence/finalize-assistant-turn!- conversation-id a-pk+ a-pk[{:type :text :text "partial-A"}]:finished? false);; Turn B completes normally(metabot-persistence/finalize-assistant-turn!- conversation-id b-pk+ b-pk[{:type :text :text "reply-B"}])(let [rows (t2/select :model/MetabotMessage :conversation_id conversation-id{:order-by [[:created_at :asc] [:id :asc]]})]@@ -397,14 +487,14 @@conversation-id "internal"{:role "user" :content "boom"})](metabot-persistence/finalize-assistant-turn!- conversation-id assistant-msg-id []+ assistant-msg-id []:error {:message "kaboom" :type "RuntimeException"}));; Healthy follow-up turn — its user-msg and asst-row also collide on created_at.(let [{:keys [assistant-msg-id]} (metabot-persistence/start-turn!conversation-id "internal"{:role "user" :content "retry"})](metabot-persistence/finalize-assistant-turn!- conversation-id assistant-msg-id+ assistant-msg-id[{:type :text :text "ok"}])));; conversation-detail uses production reader ordering — the errored pair drops,;; leaving just the retry turn.@@ -468,6 +558,246 @@(testing "conversation-detail returns nil when the conversation does not exist"(is (nil? (metabot-persistence/conversation-detail (str (random-uuid)))))))+(deftest leaf-external-id-nil-for-conversation-with-no-messages-test+ (testing "nil for a conversation with no messages yet"+ (is (nil? (metabot-persistence/leaf-external-id (str (random-uuid)))))))++(deftest leaf-external-id-returns-current-placeholder-after-start-turn-test+ (testing "returns the assistant placeholder's external_id right after start-turn!"+ (t2/with-transaction [_conn nil {:rollback-only true}]+ (let [conversation-id (str (random-uuid))]+ (mt/with-current-user (mt/user->id :rasta)+ (let [{:keys [assistant-external-id]} (metabot-persistence/start-turn!+ conversation-id "internal"+ {:role "user" :content "hi"})]+ (is (= assistant-external-id+ (metabot-persistence/leaf-external-id conversation-id)))))))))++(deftest leaf-external-id-advances-to-latest-turn-test+ (testing "advances to the second turn's external_id, not the first"+ (t2/with-transaction [_conn nil {:rollback-only true}]+ (let [conversation-id (str (random-uuid))]+ (mt/with-current-user (mt/user->id :rasta)+ (let [{a-pk :assistant-msg-id} (metabot-persistence/start-turn!+ conversation-id "internal"+ {:role "user" :content "A"})]+ (metabot-persistence/finalize-assistant-turn!+ a-pk [{:type :text :text "reply-A"}]))+ (let [{b-pk :assistant-msg-id b-ext :assistant-external-id}+ (metabot-persistence/start-turn!+ conversation-id "internal" {:role "user" :content "B"})]+ (metabot-persistence/finalize-assistant-turn!+ b-pk [{:type :text :text "reply-B"}])+ (is (= b-ext (metabot-persistence/leaf-external-id conversation-id)))))))))++(deftest leaf-external-id-unaffected-by-errored-finalize-test+ (testing "still returns the row's external_id when the turn finalizes as errored"+ (t2/with-transaction [_conn nil {:rollback-only true}]+ (let [conversation-id (str (random-uuid))]+ (mt/with-current-user (mt/user->id :rasta)+ (let [{:keys [assistant-msg-id assistant-external-id]}+ (metabot-persistence/start-turn!+ conversation-id "internal" {:role "user" :content "hi"})]+ (metabot-persistence/finalize-assistant-turn!+ assistant-msg-id []+ :error {:message "boom" :type "RuntimeException"})+ (is (= assistant-external-id+ (metabot-persistence/leaf-external-id conversation-id)))))))))++(deftest leaf-external-id-never-returns-a-user-row-even-when-the-trailing-assistant-reply-is-deleted-test+ (testing "returns the earlier turn's assistant external_id, not the later turn's undeleted user row"+ (t2/with-transaction [_conn nil {:rollback-only true}]+ (let [conversation-id (str (random-uuid))]+ (mt/with-current-user (mt/user->id :rasta)+ (let [{a-pk :assistant-msg-id a-ext :assistant-external-id}+ (metabot-persistence/start-turn!+ conversation-id "internal" {:role "user" :content "A"})]+ (metabot-persistence/finalize-assistant-turn!+ a-pk [{:type :text :text "reply-A"}])+ (let [{b-pk :assistant-msg-id} (metabot-persistence/start-turn!+ conversation-id "internal"+ {:role "user" :content "B"})]+ (metabot-persistence/finalize-assistant-turn!+ b-pk [{:type :text :text "reply-B"}])+ ;; soft-delete only turn B's assistant reply — its user row stays undeleted+ ;; and is now the most-recent non-deleted row overall.+ (t2/update! :model/MetabotMessage b-pk {:deleted_at (java.time.OffsetDateTime/now)})+ (is (= a-ext (metabot-persistence/leaf-external-id conversation-id))+ "must not fall through to turn B's undeleted user row"))))))))++(deftest start-turn-returns-user-external-id-test+ (testing "start-turn! returns the user row's external_id"+ (t2/with-transaction [_conn nil {:rollback-only true}]+ (let [conversation-id (str (random-uuid))]+ (mt/with-current-user (mt/user->id :rasta)+ (let [{:keys [user-external-id]} (metabot-persistence/start-turn!+ conversation-id "internal"+ {:role "user" :content "hi"})]+ (is (string? user-external-id))+ (is (= user-external-id+ (t2/select-one-fn :external_id :model/MetabotMessage+ :conversation_id conversation-id :role "user")))))))))++(deftest start-turn-honors-client-minted-external-ids-test+ (testing "start-turn! persists the turn's rows under client-supplied external ids"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))+ user-id (str (random-uuid))+ assistant-id (str (random-uuid))]+ (is (=? {:user-external-id user-id+ :assistant-external-id assistant-id}+ (metabot-persistence/start-turn!+ conversation-id "internal" {:role "user" :content "hi"}+ :user-external-id user-id+ :assistant-external-id assistant-id)))+ (is (= {:user user-id :assistant assistant-id}+ (t2/select-fn->fn :role :external_id :model/MetabotMessage+ :conversation_id conversation-id)))))))++(deftest retry-turn-honors-client-minted-external-id-test+ (testing "retry-turn! inserts the fresh placeholder under a client-supplied external id"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))+ {a-pk :assistant-msg-id} (metabot-persistence/start-turn!+ conversation-id "internal" {:role "user" :content "hi"})+ _ (metabot-persistence/finalize-assistant-turn!+ a-pk [{:type :text :text "reply"}])+ user-ext (t2/select-one-fn :external_id :model/MetabotMessage+ :conversation_id conversation-id :role "user")+ retry-id (str (random-uuid))]+ (is (= retry-id+ (:assistant-external-id+ (metabot-persistence/retry-turn! conversation-id "internal" user-ext+ :assistant-external-id retry-id))))+ (is (= retry-id (metabot-persistence/leaf-external-id conversation-id)))))))++(deftest start-turn-taken-external-id-trips-unique-constraint-test+ (testing "a taken client-supplied external id trips uq_metabot_message_external_id —+ the violation the API layer translates into a 409"+ (with-rasta-tx+ (letfn [(conflict? [thunk]+ (try+ (thunk)+ false+ (catch Exception e+ (boolean (some #(re-find #"(?i)uq_metabot_message_external_id" (str (ex-message %)))+ (u/full-exception-chain e))))))]+ (let [conversation-id (str (random-uuid))+ {:keys [assistant-msg-id assistant-external-id user-external-id]}+ (metabot-persistence/start-turn!+ conversation-id "internal" {:role "user" :content "hi"})]+ (is (true? (conflict? #(metabot-persistence/start-turn!+ conversation-id "internal" {:role "user" :content "again"}+ :user-external-id user-external-id))))+ (testing "soft-deleted rows keep their ids reserved"+ (metabot-persistence/soft-delete-messages! {:id assistant-msg-id} (mt/user->id :rasta))+ (is (true? (conflict? #(metabot-persistence/start-turn!+ conversation-id "internal" {:role "user" :content "again"}+ :assistant-external-id assistant-external-id))))))))))++(deftest retry-turn-test+ (testing "retry-turn! soft-deletes the old response, keeps the prompt, and inserts a fresh placeholder"+ (t2/with-transaction [_conn nil {:rollback-only true}]+ (let [conversation-id (str (random-uuid))]+ (mt/with-current-user (mt/user->id :rasta)+ (let [{a-pk :assistant-msg-id} (metabot-persistence/start-turn!+ conversation-id "internal"+ {:role "user" :content "hi"})+ _ (metabot-persistence/finalize-assistant-turn!+ a-pk [{:type :text :text "reply"}])+ user-ext (t2/select-one-fn :external_id :model/MetabotMessage+ :conversation_id conversation-id :role "user")+ {:keys [assistant-msg-id assistant-external-id user-external-id]}+ (metabot-persistence/retry-turn! conversation-id "internal" user-ext+ :delete-message-ids [a-pk])]+ (is (pos-int? assistant-msg-id))+ (is (string? assistant-external-id))+ (is (= user-ext user-external-id))+ (testing "old response is soft-deleted with the deleting user stamped"+ (is (=? {:deleted_at some? :deleted_by_user_id (mt/user->id :rasta)}+ (t2/select-one :model/MetabotMessage a-pk))))+ (testing "prompt row stays live"+ (is (=? {:deleted_at nil}+ (t2/select-one :model/MetabotMessage :external_id user-ext))))+ (testing "fresh placeholder is the new leaf"+ (is (=? {:finished nil :data [] :deleted_at nil}+ (t2/select-one :model/MetabotMessage assistant-msg-id)))+ (is (= assistant-external-id+ (metabot-persistence/leaf-external-id conversation-id))))+ (testing "conversation-detail shows the prompt exactly once"+ (metabot-persistence/finalize-assistant-turn!+ assistant-msg-id [{:type :text :text "retried reply"}])+ (let [messages (:chat_messages (metabot-persistence/conversation-detail conversation-id))]+ (is (= ["hi" "retried reply"] (map :message messages)))))))))))++(deftest retry-turn-deletes-all-trailing-assistant-rows-test+ (testing "retry-turn! soft-deletes every live assistant row after the retried prompt"+ (t2/with-transaction [_conn nil {:rollback-only true}]+ (let [conversation-id (str (random-uuid))]+ (mt/with-current-user (mt/user->id :rasta)+ (let [{a-pk :assistant-msg-id} (metabot-persistence/start-turn!+ conversation-id "internal"+ {:role "user" :content "hi"})+ _ (metabot-persistence/finalize-assistant-turn!+ a-pk [{:type :text :text "reply"}])+ extra-pk (t2/insert-returning-pk!+ :model/MetabotMessage+ {:conversation_id conversation-id+ :role "assistant"+ :profile_id "internal"+ :external_id (str (random-uuid))+ :total_tokens 0+ :data [{:type "text" :text "extra"}]+ :data_version 2+ :finished true+ :created_at (t/plus (t/offset-date-time) (t/seconds 60))})+ user-ext (t2/select-one-fn :external_id :model/MetabotMessage+ :conversation_id conversation-id :role "user")]+ (metabot-persistence/retry-turn! conversation-id "internal" user-ext+ :delete-message-ids [a-pk extra-pk])+ (is (some? (t2/select-one-fn :deleted_at :model/MetabotMessage a-pk)))+ (is (some? (t2/select-one-fn :deleted_at :model/MetabotMessage extra-pk)))))))))++(deftest start-turn-delete-message-ids-test+ (testing "start-turn! soft-deletes :delete-message-ids alongside inserting the replacement rows"+ (t2/with-transaction [_conn nil {:rollback-only true}]+ (let [conversation-id (str (random-uuid))]+ (mt/with-current-user (mt/user->id :rasta)+ (let [{a-pk :assistant-msg-id} (metabot-persistence/start-turn!+ conversation-id "internal"+ {:role "user" :content "fails"})+ _ (metabot-persistence/finalize-assistant-turn!+ a-pk []+ :error {:message "boom"})+ u-pk (t2/select-one-fn :id :model/MetabotMessage+ :conversation_id conversation-id :role "user")]+ (metabot-persistence/start-turn!+ conversation-id "internal" {:role "user" :content "replacement"}+ :delete-message-ids [u-pk a-pk])+ (let [rows (t2/select :model/MetabotMessage :conversation_id conversation-id+ {:order-by [[:created_at :asc] [:id :asc]]})+ live (remove :deleted_at rows)]+ (is (= [:user :assistant] (mapv :role live)))+ (is (= "replacement" (-> live first :data first :text)))+ (is (= [(mt/user->id :rasta) (mt/user->id :rasta)]+ (map :deleted_by_user_id (filter :deleted_at rows)))))))))))++(deftest retry-turn-without-live-response-test+ (testing "retry-turn! with no live trailing assistant only inserts a fresh placeholder"+ (t2/with-transaction [_conn nil {:rollback-only true}]+ (let [conversation-id (str (random-uuid))]+ (mt/with-current-user (mt/user->id :rasta)+ (let [{a-pk :assistant-msg-id user-ext :user-external-id}+ (metabot-persistence/start-turn! conversation-id "internal" {:role "user" :content "hi"})+ _ (metabot-persistence/soft-delete-messages! {:id a-pk} (mt/user->id :rasta))+ {:keys [assistant-external-id]}+ (metabot-persistence/retry-turn! conversation-id "internal" user-ext)+ rows (t2/select :model/MetabotMessage :conversation_id conversation-id)]+ (is (= [a-pk] (map :id (filter :deleted_at rows)))+ "retry soft-deleted nothing new")+ (is (= assistant-external-id+ (metabot-persistence/leaf-external-id conversation-id)))))))))+(deftest message->chat-messages-annotates-agent-row-test(testing "empty :data on errored row emits a stub agent message so the FE can render the alert"(is (=? [{:id "ext-1" :role "agent" :type "text" :message ""@@ -553,7 +883,7 @@conversation-id "metabot-1"{:role "user" :content "go"})](apply metabot-persistence/finalize-assistant-turn!- conversation-id assistant-msg-id+ assistant-msg-id[{:type :text :text "x"}]finalize-opts)(let [row (t2/select-one :model/MetabotMessage assistant-msg-id)]@@ -638,30 +968,29 @@;; part carried `:errorText` (not `:error`); api.clj's `(:error (u/seek ...))` extraction then returned nil;; and the error column silently stayed NULL — an errored turn looked like a success in the appdb.(testing "a streamed AI SDK v5 :errorText part lands in the assistant row's error column as a {:message ...} map"- (t2/with-transaction [_conn nil {:rollback-only true}]- (mt/with-current-user (mt/user->id :rasta)- (let [conversation-id (str (random-uuid))- {:keys [assistant-msg-id]} (metabot-persistence/start-turn!- conversation-id "internal"- {:role "user" :content "go"})- ;; Provider adapters emit AI SDK v5 chunks; `aisdk-xf` collects them into the parts- ;; vector that feeds finalize in `metabase.metabot.api`.- parts (into [] (self.core/aisdk-xf)- [{:type :start :messageId "m1"}- {:type :error- :errorText "The model provider failed to complete the response"}])- error-data (:error (u/seek #(= :error (:type %)) parts))]- (is (= {:message "The model provider failed to complete the response"} error-data)- "the error part carries an :error map (not a passed-through :errorText), so api.clj's extraction is non-nil")- (metabot-persistence/finalize-assistant-turn!- conversation-id assistant-msg-id parts- :error error-data)- (let [row (t2/select-one :model/MetabotMessage assistant-msg-id)]- (is (= {:message "The model provider failed to complete the response"}- (json/decode+kw (:error row)))- "the streamed errorText is persisted into the error column as a {:message ...} map")- (is (true? (:finished row))- "an errored turn still finalizes as finished")))))))+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))+ {:keys [assistant-msg-id]} (metabot-persistence/start-turn!+ conversation-id "internal"+ {:role "user" :content "go"})+ ;; Provider adapters emit AI SDK v5 chunks; `aisdk-xf` collects them into the parts+ ;; vector that feeds finalize in `metabase.metabot.api`.+ parts (into [] (self.core/aisdk-xf)+ [{:type :start :messageId "m1"}+ {:type :error+ :errorText "The model provider failed to complete the response"}])+ error-data (:error (u/seek #(= :error (:type %)) parts))]+ (is (= {:message "The model provider failed to complete the response"} error-data)+ "the error part carries an :error map (not a passed-through :errorText), so api.clj's extraction is non-nil")+ (metabot-persistence/finalize-assistant-turn!+ assistant-msg-id parts+ :error error-data)+ (let [row (t2/select-one :model/MetabotMessage assistant-msg-id)]+ (is (= {:message "The model provider failed to complete the response"}+ (json/decode+kw (:error row)))+ "the streamed errorText is persisted into the error column as a {:message ...} map")+ (is (true? (:finished row))+ "an errored turn still finalizes as finished"))))))(deftest messages-chat-messages-skips-in-flight-placeholders-test(testing "in-flight placeholders (assistant role, finished=nil, recent created_at)@@ -714,22 +1043,20 @@(deftest finalize-records-used-tables-test(testing "finalize-assistant-turn! inserts metabot_used_table rows for successful query-generating tool calls"- (t2/with-transaction [_conn nil {:rollback-only true}]- (mt/with-current-user (mt/user->id :rasta)- (let [table-id (mt/id :orders)- conversation-id (str (random-uuid))- {:keys [assistant-msg-id]} (metabot-persistence/start-turn!- conversation-id- "internal"- {:role "user" :content "go"})]- (binding [used-tables/*run-synchronously?* true]- (metabot-persistence/finalize-assistant-turn!- conversation-id- assistant-msg-id- (into [{:type :text :text "ok"}] (->notebook-parts "c1" table-id))))- (is (=? [{:message_id assistant-msg-id- :table_id table-id}]- (t2/select :model/MetabotUsedTable :message_id assistant-msg-id))))))))+ (with-rasta-tx+ (let [table-id (mt/id :orders)+ conversation-id (str (random-uuid))+ {:keys [assistant-msg-id]} (metabot-persistence/start-turn!+ conversation-id+ "internal"+ {:role "user" :content "go"})]+ (binding [used-tables/*run-synchronously?* true]+ (metabot-persistence/finalize-assistant-turn!+ assistant-msg-id+ (into [{:type :text :text "ok"}] (->notebook-parts "c1" table-id))))+ (is (=? [{:message_id assistant-msg-id+ :table_id table-id}]+ (t2/select :model/MetabotUsedTable :message_id assistant-msg-id)))))))(deftest finalize-records-used-tables-in-background-test(testing "with the default (non-synchronous) path, finalize-assistant-turn! eventually records used tables on the background worker"@@ -744,7 +1071,6 @@{:role "user" :content "go"})](try(metabot-persistence/finalize-assistant-turn!- conversation-idassistant-msg-id(into [{:type :text :text "ok"}] (->notebook-parts "c1" table-id)))(is (=? [{:message_id assistant-msg-id@@ -803,89 +1129,300 @@(deftest finalize-records-used-tables-for-python-transform-test(testing "finalize-assistant-turn! records `metabot_used_table` rows for a write_transform_python tool call."- (t2/with-transaction [_conn nil {:rollback-only true}]- (mt/with-current-user (mt/user->id :rasta)- (let [table-id (mt/id :orders)- conversation-id (str (random-uuid))- {:keys [assistant-msg-id]} (metabot-persistence/start-turn!- conversation-id- "transforms_codegen"- {:role "user" :content "make a transform"})]- (binding [used-tables/*run-synchronously?* true]- (metabot-persistence/finalize-assistant-turn!- conversation-id- assistant-msg-id- (into [{:type :text :text "ok"}] (->transform-python-parts "t1" table-id))))- (is (=? [{:message_id assistant-msg-id- :table_id table-id}]- (t2/select :model/MetabotUsedTable :message_id assistant-msg-id))))))))+ (with-rasta-tx+ (let [table-id (mt/id :orders)+ conversation-id (str (random-uuid))+ {:keys [assistant-msg-id]} (metabot-persistence/start-turn!+ conversation-id+ "transforms_codegen"+ {:role "user" :content "make a transform"})]+ (binding [used-tables/*run-synchronously?* true]+ (metabot-persistence/finalize-assistant-turn!+ assistant-msg-id+ (into [{:type :text :text "ok"}] (->transform-python-parts "t1" table-id))))+ (is (=? [{:message_id assistant-msg-id+ :table_id table-id}]+ (t2/select :model/MetabotUsedTable :message_id assistant-msg-id)))))))(deftest finalize-records-used-tables-for-sql-transform-test(testing "finalize-assistant-turn! parses the SQL transform's native query."- (t2/with-transaction [_conn nil {:rollback-only true}]- (mt/with-current-user (mt/user->id :rasta)- (let [orders-id (mt/id :orders)- conversation-id (str (random-uuid))- {:keys [assistant-msg-id]} (metabot-persistence/start-turn!- conversation-id- "transforms_codegen"- {:role "user" :content "make a SQL transform"})]- (binding [used-tables/*run-synchronously?* true]- (mt/with-dynamic-fn-redefs [nqa/tables-for-native (fn [_ & _] {:tables [{:table-id orders-id}]})]- (metabot-persistence/finalize-assistant-turn!- conversation-id- assistant-msg-id- (into [{:type :text :text "ok"}]- (->transform-sql-parts "t1" (mt/id) "SELECT * FROM orders")))))- (is (=? [{:message_id assistant-msg-id :table_id orders-id}]- (t2/select :model/MetabotUsedTable :message_id assistant-msg-id))))))))+ (with-rasta-tx+ (let [orders-id (mt/id :orders)+ conversation-id (str (random-uuid))+ {:keys [assistant-msg-id]} (metabot-persistence/start-turn!+ conversation-id+ "transforms_codegen"+ {:role "user" :content "make a SQL transform"})]+ (binding [used-tables/*run-synchronously?* true]+ (mt/with-dynamic-fn-redefs [nqa/tables-for-native (fn [_ & _] {:tables [{:table-id orders-id}]})]+ (metabot-persistence/finalize-assistant-turn!+ assistant-msg-id+ (into [{:type :text :text "ok"}]+ (->transform-sql-parts "t1" (mt/id) "SELECT * FROM orders")))))+ (is (=? [{:message_id assistant-msg-id :table_id orders-id}]+ (t2/select :model/MetabotUsedTable :message_id assistant-msg-id)))))))(deftest finalize-records-nothing-without-query-tools-test(testing "finalize-assistant-turn! inserts no used-table rows for text-only or non-query tool turns"- (t2/with-transaction [_conn nil {:rollback-only true}]- (mt/with-current-user (mt/user->id :rasta)- (let [conversation-id (str (random-uuid))- {:keys [assistant-msg-id]} (metabot-persistence/start-turn!- conversation-id- "internal"- {:role "user" :content "go"})]- (binding [used-tables/*run-synchronously?* true]- (metabot-persistence/finalize-assistant-turn!- conversation-id- assistant-msg-id- [{:type :text- :text "just text"}- {:type :tool-input- :id "n1"- :function "navigate_user"- :arguments {}}- {:type :tool-output- :id "n1"- :result {:output "ok"}}]))- (is (zero? (t2/count :model/MetabotUsedTable :message_id assistant-msg-id))))))))+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))+ {:keys [assistant-msg-id]} (metabot-persistence/start-turn!+ conversation-id+ "internal"+ {:role "user" :content "go"})]+ (binding [used-tables/*run-synchronously?* true]+ (metabot-persistence/finalize-assistant-turn!+ assistant-msg-id+ [{:type :text+ :text "just text"}+ {:type :tool-input+ :id "n1"+ :function "navigate_user"+ :arguments {}}+ {:type :tool-output+ :id "n1"+ :result {:output "ok"}}]))+ (is (zero? (t2/count :model/MetabotUsedTable :message_id assistant-msg-id)))))))(deftest insert-failure-does-not-fail-finalize-test(testing "a failed used-table INSERT is logged and finalize still completes"- (t2/with-transaction [_conn nil {:rollback-only true}]- (mt/with-current-user (mt/user->id :rasta)- (let [conversation-id (str (random-uuid))- {:keys [assistant-msg-id]} (metabot-persistence/start-turn!- conversation-id- "internal"- {:role "user" :content "go"})]- (with-redefs [used-tables/extract-used-tables-with-timing! (fn [_ _]- [{:message_id assistant-msg-id :table_id 1}])- t2/insert! (fn [& _]- (throw (ex-info "boom" {})))]- (log.capture/with-log-messages-for-level [logs [metabase.metabot.used-tables :warn]]- (binding [used-tables/*run-synchronously?* true]- (metabot-persistence/finalize-assistant-turn!- conversation-id- assistant-msg-id- [{:type :text :text "ok"}]))- (is (=? {:finished true- :data [{:type "text" :text "ok"}]}- (t2/select-one :model/MetabotMessage assistant-msg-id))- "message UPDATE still landed")- (is (some #(re-find #"Failed to record metabot used tables" (:message %)) (logs))- "warn line captured"))))))))+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))+ {:keys [assistant-msg-id]} (metabot-persistence/start-turn!+ conversation-id+ "internal"+ {:role "user" :content "go"})]+ (with-redefs [used-tables/extract-used-tables-with-timing! (fn [_ _]+ [{:message_id assistant-msg-id :table_id 1}])+ t2/insert! (fn [& _]+ (throw (ex-info "boom" {})))]+ (log.capture/with-log-messages-for-level [logs [metabase.metabot.used-tables :warn]]+ (binding [used-tables/*run-synchronously?* true]+ (metabot-persistence/finalize-assistant-turn!+ assistant-msg-id+ [{:type :text :text "ok"}]))+ (is (=? {:finished true+ :data [{:type "text" :text "ok"}]}+ (t2/select-one :model/MetabotMessage assistant-msg-id))+ "message UPDATE still landed")+ (is (some #(re-find #"Failed to record metabot used tables" (:message %)) (logs))+ "warn line captured")))))))++(defn- seed-turn!+ "Start a user turn and finalize its assistant reply with `parts`. Returns the+ assistant placeholder pk."+ [conversation-id prompt parts & finalize-opts]+ (let [{:keys [assistant-msg-id]} (metabot-persistence/start-turn!+ conversation-id "internal" {:role "user" :content prompt})]+ (apply metabot-persistence/finalize-assistant-turn!+ assistant-msg-id parts finalize-opts)+ assistant-msg-id))++(deftest history-empty-conversation-test+ (testing "a conversation with no live messages reconstructs to an empty history"+ (is (= [] (metabot-persistence/history (metabot-persistence/live-messages (str (random-uuid))))))))++(deftest history-multi-turn-ordering-test+ (testing "successful turns reconstruct as alternating user/assistant messages in order"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))]+ (seed-turn! conversation-id "first" [{:type :text :text "reply one"}])+ (seed-turn! conversation-id "second" [{:type :text :text "reply two"}])+ (is (= [{:role :user :content "first"}+ {:role :assistant :content "reply one"}+ {:role :user :content "second"}+ {:role :assistant :content "reply two"}]+ (metabot-persistence/history (metabot-persistence/live-messages conversation-id))))))))++(deftest history-tool-call-conversion-test+ (testing "text and tool parts interleave; tool calls become an assistant call + tool result pair"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))]+ (seed-turn! conversation-id "look it up"+ [{:type :text :text "on it"}+ {:type :tool-input :id "c1" :function "search" :arguments {:q "x"}}+ {:type :tool-output :id "c1" :result {:output "rows" :structured-output {:query-id "q"}}}])+ (let [history (metabot-persistence/history (metabot-persistence/live-messages conversation-id))]+ (is (mr/validate ::metabot.schema/messages history)+ "reconstructed history validates against the LLM message schema")+ (is (= [{:role :user :content "look it up"}+ {:role :assistant :content "on it"}+ {:role :assistant :tool_calls [{:id "c1" :name "search" :arguments (json/encode {:q "x"})}]}+ {:role :tool :tool_call_id "c1" :content "rows"}]+ history)))))))++(deftest history-tool-output-shapes-test+ (testing "bare-scalar, nil, and errored tool outputs each coerce to a string tool result"+ (with-rasta-tx+ (let [tool-content (fn [parts]+ (let [conversation-id (str (random-uuid))]+ (seed-turn! conversation-id "go" parts)+ (->> (metabot-persistence/history (metabot-persistence/live-messages conversation-id))+ (filter #(= :tool (:role %)))+ first+ :content)))]+ (testing "bare scalar output is stringified"+ (is (= "just a string"+ (tool-content [{:type :tool-input :id "c1" :function "search" :arguments {}}+ {:type :tool-output :id "c1" :result "just a string"}]))))+ (testing "nil output becomes an empty string"+ (is (= ""+ (tool-content [{:type :tool-input :id "c1" :function "search" :arguments {}}+ {:type :tool-output :id "c1" :result nil}]))))+ (testing "errored tool output uses the error text"+ (is (= "kaboom"+ (tool-content [{:type :tool-input :id "c1" :function "search" :arguments {}}+ {:type :tool-output :id "c1" :error {:message "kaboom"}}]))))))))++(deftest history-drops-errored-turn-test+ (testing "a turn whose reply errored is dropped whole; surrounding turns survive"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))]+ (seed-turn! conversation-id "before" [{:type :text :text "ok before"}])+ (seed-turn! conversation-id "boom" [] :error {:message "kaboom"})+ (seed-turn! conversation-id "after" [{:type :text :text "ok after"}])+ (is (= [{:role :user :content "before"}+ {:role :assistant :content "ok before"}+ {:role :user :content "after"}+ {:role :assistant :content "ok after"}]+ (metabot-persistence/history (metabot-persistence/live-messages conversation-id))))))))++(deftest history-drops-unfinished-turn-test+ (testing "an in-flight placeholder (finished nil) drops its whole turn — this is how the current turn is excluded"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))]+ (seed-turn! conversation-id "done" [{:type :text :text "answered"}])+ ;; start-turn! leaves a nil-finished placeholder, like the in-flight turn+ (metabot-persistence/start-turn! conversation-id "internal" {:role "user" :content "pending"})+ (is (= [{:role :user :content "done"}+ {:role :assistant :content "answered"}]+ (metabot-persistence/history (metabot-persistence/live-messages conversation-id))))))))++(deftest history-keeps-aborted-turn-with-synthetic-interrupt-test+ (testing "an aborted turn replays its partial text and pairs an unresolved tool call with a synthetic interrupt"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))]+ (seed-turn! conversation-id "start something"+ [{:type :text :text "let me check"}+ {:type :tool-input :id "c1" :function "search" :arguments {:q "x"}}]+ :finished? false)+ (is (= [{:role :user :content "start something"}+ {:role :assistant :content "let me check"}+ {:role :assistant :tool_calls [{:id "c1" :name "search" :arguments (json/encode {:q "x"})}]}+ {:role :tool :tool_call_id "c1" :content "Tool execution interrupted by user"}]+ (metabot-persistence/history (metabot-persistence/live-messages conversation-id))))))))++(deftest history-excludes-superseded-retry-response-test+ (testing "after a retry the soft-deleted old reply is excluded; the prompt appears once with the new reply"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))]+ (seed-turn! conversation-id "question" [{:type :text :text "old answer"}])+ (let [user-ext (t2/select-one-fn :external_id :model/MetabotMessage+ :conversation_id conversation-id :role "user")+ {:keys [assistant-msg-id]} (metabot-persistence/retry-turn!+ conversation-id "internal" user-ext)]+ (testing "before finalize, only prior (pre-retry-prompt) turns are present"+ (is (= [] (metabot-persistence/history (metabot-persistence/live-messages conversation-id)))))+ (metabot-persistence/finalize-assistant-turn!+ assistant-msg-id [{:type :text :text "new answer"}])+ (is (= [{:role :user :content "question"}+ {:role :assistant :content "new answer"}]+ (metabot-persistence/history (metabot-persistence/live-messages conversation-id)))))))))++(deftest history-last-live-assistant-row-wins-test+ (testing "when a turn has multiple live assistant rows, only the last is replayed"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))]+ (seed-turn! conversation-id "hi" [{:type :text :text "first reply"}])+ (t2/insert! :model/MetabotMessage+ {:conversation_id conversation-id+ :role "assistant"+ :profile_id "internal"+ :external_id (str (random-uuid))+ :total_tokens 0+ :data [{:type "text" :text "second reply"}]+ :data_version 2+ :finished true+ :created_at (t/plus (t/offset-date-time) (t/seconds 60))})+ (is (= [{:role :user :content "hi"}+ {:role :assistant :content "second reply"}]+ (metabot-persistence/history (metabot-persistence/live-messages conversation-id))))))))++(deftest history-skips-data-parts-test+ (testing "data parts in an assistant reply are not leaked into LLM history"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))]+ (seed-turn! conversation-id "hi"+ [{:type :text :text "before"}+ {:type :data :data-type "navigate_to" :data "/question/1"}+ {:type :text :text "after"}])+ (is (= [{:role :user :content "hi"}+ {:role :assistant :content "before"}+ {:role :assistant :content "after"}]+ (metabot-persistence/history (metabot-persistence/live-messages conversation-id))))))))++(deftest ^:parallel conversation-state-merges-message-states-test+ (testing "merges live assistant rows' :state in order — maps merge, other values take the latest"+ (is (= {:queries {:q1 {:database 1} :q2 {:database 2}}+ :todos [{:id "b"}]}+ (metabot-persistence/conversation-state+ [{:role :assistant :finished true :state {:queries {:q1 {:database 1}} :todos [{:id "a"}]}}+ {:role :user}+ {:role :assistant :finished true :state {:queries {:q2 {:database 2}} :todos [{:id "b"}]}}]))))+ (testing "user rows and rows without state are ignored; empty input reconstructs to {}"+ (is (= {} (metabot-persistence/conversation-state [])))+ (is (= {} (metabot-persistence/conversation-state+ [{:role :user :state {:queries {:q1 {:database 1}}}}+ {:role :assistant :finished true}]))))+ (testing "errored and in-flight turns are skipped, so their state never leaks into the baseline"+ (is (= {:todos [{:id "keep"}]}+ (metabot-persistence/conversation-state+ [{:role :assistant :finished true :error "boom" :state {:todos [{:id "errored"}]}}+ {:role :assistant :finished nil :state {:todos [{:id "in-flight"}]}}+ {:role :assistant :finished true :state {:todos [{:id "keep"}]}}])))))++(deftest finalize-writes-turn-state-test+ (testing "finalize records the turn-state on the row; nothing writes to the conversation"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))+ msg-id (seed-turn! conversation-id "hi"+ [{:type :text :text "reply"}]+ :turn-state {:queries {"q2" {:database 2}}})]+ (is (= {:queries {:q2 {:database 2}}}+ (t2/select-one-fn :state :model/MetabotMessage msg-id)))+ (is (nil? (t2/select-one-fn :state :model/MetabotConversation :id conversation-id)))))))++(deftest finalize-skips-empty-turn-state-test+ (testing "a turn that produced no state leaves the row's state NULL"+ (with-rasta-tx+ (doseq [turn-opts [[] [:turn-state {}]]]+ (let [conversation-id (str (random-uuid))+ msg-id (apply seed-turn! conversation-id "hi" [{:type :text :text "reply"}] turn-opts)]+ (is (nil? (t2/select-one-fn :state :model/MetabotMessage msg-id))))))))++(deftest conversation-state-rewinds-on-retry-test+ (testing "a retried turn's soft-deleted state drops out of the reconstruction"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))+ cstate #(metabot-persistence/conversation-state+ (metabot-persistence/live-messages conversation-id))]+ (seed-turn! conversation-id "one" [] :turn-state {:todos [{:id "a"}]})+ (let [two-pk (seed-turn! conversation-id "two" [] :turn-state {:todos [{:id "b"}]})]+ (is (= {:todos [{:id "b"}]} (cstate)))+ (let [user-ext (t2/select-one-fn :external_id :model/MetabotMessage+ :conversation_id conversation-id+ :role "user"+ {:order-by [[:created_at :desc] [:id :desc]]})]+ (metabot-persistence/retry-turn! conversation-id "internal" user-ext+ :delete-message-ids [two-pk])+ (is (= {:todos [{:id "a"}]} (cstate))+ "the in-flight retry placeholder contributes nothing and the superseded turn is gone")))))))++(deftest conversation-detail-includes-state-test+ (testing "conversation-detail returns the reconstructed state"+ (with-rasta-tx+ (let [conversation-id (str (random-uuid))]+ (seed-turn! conversation-id "one" [{:type :text :text "reply"}]+ :turn-state {:todos [{:id "a"}]})+ (is (= {:todos [{:id "a"}]}+ (:state (metabot-persistence/conversation-detail conversation-id))))))))