fix(web): separate run success from result delivery (#5525)

* fix(web): distinguish run success from result delivery

Persist delivery outcomes separately so successful design runs cannot report completion before a usable artifact is available.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(web): recover missing design delivery after reload

* chore(ci): rerun pull request checks

* fix(web): avoid reattaching local delivery finalization

* fix(web): retry delivery failures

* chore(ci): rerun pull request checks

* chore(ci): retrigger managed checks

---------

Co-authored-by: xiaoche-hub <298951296+xiaoche-hub@users.noreply.github.com>
Co-authored-by: Cursor <cursoragent@cursor.com>

Author: 3 people

apps/daemon/src/db.ts

@@ -115,6 +115,7 @@ function migrate(db: SqliteDb): void {
       content TEXT NOT NULL,
       agent_id TEXT,
       agent_name TEXT,
+      result_delivery_state TEXT,
       events_json TEXT,
       attachments_json TEXT,
       produced_files_json TEXT,
@@ -278,6 +279,9 @@ function migrate(db: SqliteDb): void {
   if (!messageCols.some((c: DbRow) => c.name === 'run_status')) {
     db.exec(`ALTER TABLE messages ADD COLUMN run_status TEXT`);
   }
+  if (!messageCols.some((c: DbRow) => c.name === 'result_delivery_state')) {
+    db.exec(`ALTER TABLE messages ADD COLUMN result_delivery_state TEXT`);
+  }
   if (!messageCols.some((c: DbRow) => c.name === 'last_run_event_id')) {
     db.exec(`ALTER TABLE messages ADD COLUMN last_run_event_id TEXT`);
   }
@@ -1390,6 +1394,7 @@ export function listMessages(db: SqliteDb, conversationId: string) {
     .prepare(
       `SELECT id, role, content, agent_id AS agentId, agent_name AS agentName,
               run_id AS runId, run_status AS runStatus,
+              result_delivery_state AS resultDeliveryState,
               last_run_event_id AS lastRunEventId,
               events_json AS eventsJson,
               attachments_json AS attachmentsJson,
@@ -1420,7 +1425,7 @@ export function upsertMessage(db: SqliteDb, conversationId: string, m: DbRow) {
     db.prepare(
       `UPDATE messages
           SET role = ?, content = ?, agent_id = ?, agent_name = ?,
-              run_id = ?, run_status = ?, last_run_event_id = ?,
+              run_id = ?, run_status = ?, result_delivery_state = ?, last_run_event_id = ?,
               events_json = ?, attachments_json = ?, comment_attachments_json = ?,
               produced_files_json = ?, trace_object_files_json = ?, feedback_json = ?,
               pre_turn_file_names_json = ?,
@@ -1438,6 +1443,7 @@ export function upsertMessage(db: SqliteDb, conversationId: string, m: DbRow) {
       m.agentName ?? null,
       m.runId ?? null,
       m.runStatus ?? null,
+      normalizeResultDeliveryStateForStorage(m.resultDeliveryState),
       m.lastRunEventId ?? null,
       m.events ? JSON.stringify(m.events) : null,
       m.attachments ? JSON.stringify(m.attachments) : null,
@@ -1465,21 +1471,21 @@ export function upsertMessage(db: SqliteDb, conversationId: string, m: DbRow) {
     const createdAt = typeof m.createdAt === 'number' && Number.isFinite(m.createdAt)
       ? m.createdAt
       : now;
-    // 24 values: id, conversation_id, role, content, agent_id, agent_name,
-    // run_id, run_status, last_run_event_id, events_json, attachments_json,
+    // 25 values: id, conversation_id, role, content, agent_id, agent_name,
+    // run_id, run_status, result_delivery_state, last_run_event_id, events_json, attachments_json,
     // comment_attachments_json, produced_files_json, trace_object_files_json,
     // feedback_json, pre_turn_file_names_json, session_mode, run_context_json,
     // applied_plugin_snapshot_json, telemetry_finalized_at, started_at,
     // ended_at, position, created_at.
     db.prepare(
       `INSERT INTO messages
          (id, conversation_id, role, content, agent_id, agent_name,
-          run_id, run_status, last_run_event_id, events_json,
+          run_id, run_status, result_delivery_state, last_run_event_id, events_json,
           attachments_json, comment_attachments_json, produced_files_json,
           trace_object_files_json, feedback_json, pre_turn_file_names_json,
           session_mode, run_context_json, applied_plugin_snapshot_json,
           telemetry_finalized_at, started_at, ended_at, position, created_at)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
     ).run(
       m.id,
       conversationId,
@@ -1489,6 +1495,7 @@ export function upsertMessage(db: SqliteDb, conversationId: string, m: DbRow) {
       m.agentName ?? null,
       m.runId ?? null,
       m.runStatus ?? null,
+      normalizeResultDeliveryStateForStorage(m.resultDeliveryState),
       m.lastRunEventId ?? null,
       m.events ? JSON.stringify(m.events) : null,
       m.attachments ? JSON.stringify(m.attachments) : null,
@@ -1516,6 +1523,7 @@ export function upsertMessage(db: SqliteDb, conversationId: string, m: DbRow) {
     .prepare(
       `SELECT id, role, content, agent_id AS agentId, agent_name AS agentName,
               run_id AS runId, run_status AS runStatus,
+              result_delivery_state AS resultDeliveryState,
               last_run_event_id AS lastRunEventId,
               events_json AS eventsJson,
               attachments_json AS attachmentsJson,
@@ -1895,6 +1903,7 @@ function normalizeMessage(row: DbRow) {
     agentName: row.agentName ?? undefined,
     runId: row.runId ?? undefined,
     runStatus: row.runStatus ?? undefined,
+    resultDeliveryState: normalizeResultDeliveryState(row.resultDeliveryState),
     lastRunEventId: row.lastRunEventId ?? undefined,
     events: parseJsonOrUndef(row.eventsJson),
     attachments: parseJsonOrUndef(row.attachmentsJson),
@@ -1916,6 +1925,20 @@ function normalizeMessageSessionMode(value: unknown): ChatSessionMode | undefine
   return value === 'chat' || value === 'design' || value === 'plan' ? value : undefined;
 }
 
+function normalizeResultDeliveryState(
+  value: unknown,
+): 'delivered' | 'no_result' | 'delivery_failed' | undefined {
+  return value === 'delivered' || value === 'no_result' || value === 'delivery_failed'
+    ? value
+    : undefined;
+}
+
+function normalizeResultDeliveryStateForStorage(
+  value: unknown,
+): 'delivered' | 'no_result' | 'delivery_failed' | null {
+  return normalizeResultDeliveryState(value) ?? null;
+}
+
 function normalizeMessageSessionModeForStorage(value: unknown): ChatSessionMode | null {
   return value === 'chat' || value === 'design' || value === 'plan' ? value : null;
 }

apps/daemon/tests/db-message-events.test.ts

@@ -48,6 +48,7 @@ describe('message event persistence', () => {
       content: '',
       runId: 'agent-run-1',
       runStatus: 'running',
+      resultDeliveryState: 'delivery_failed',
       events: [{ kind: 'status', label: 'starting', detail: 'Codex' }],
       startedAt: now,
     });
@@ -69,6 +70,7 @@ describe('message event persistence', () => {
         detail: 'Agent stalled without emitting any new output for 1s.',
       },
     ]);
+    expect(listMessages(db, 'conv-1')[0]?.resultDeliveryState).toBe('delivery_failed');
   });
 
   it('persists explicit message createdAt values on insert', () => {

apps/web/src/components/AssistantMessage.tsx

@@ -664,6 +664,9 @@ function AssistantMessageImpl({
   const hasEmptyResponse = events.some(
     (e) => e.kind === "status" && e.label === "empty_response"
   );
+  const hasResultDeliveryFailure =
+    message.resultDeliveryState === "no_result" ||
+    message.resultDeliveryState === "delivery_failed";
   const isBrandBrowserAssistMessage =
     isBrandExtractionNextStepVariant(nextStepVariant) &&
     (message.content.includes('<od-card type="brand-browser-assist"') ||
@@ -682,6 +685,7 @@ function AssistantMessageImpl({
   const unfinishedTodos = streaming ? [] : unfinishedTodosFromEvents(events);
   const runSucceeded =
     !streaming &&
+    !hasResultDeliveryFailure &&
     (
       message.runStatus === "succeeded" ||
       (!message.runStatus && !!message.endedAt) ||
@@ -1320,7 +1324,13 @@ function isFeedbackEligible({
   hasEmptyResponse: boolean;
   hasUnfinishedTodos: boolean;
 }): boolean {
-  if (streaming || hasEmptyResponse || hasUnfinishedTodos) return false;
+  if (
+    streaming ||
+    hasEmptyResponse ||
+    hasUnfinishedTodos ||
+    message.resultDeliveryState === "no_result" ||
+    message.resultDeliveryState === "delivery_failed"
+  ) return false;
   if (message.runStatus) return isTerminalRunStatus(message.runStatus);
   return !!message.endedAt;
 }

apps/web/src/components/ChatPane.tsx

@@ -28,6 +28,7 @@ import {
   getDesignToolboxAction,
   type DesignToolboxActionId,
 } from '../runtime/design-toolbox';
+import { isRetryableAssistantTerminalFailure } from '../runtime/design-delivery';
 import type { Dict } from '../i18n/types';
 import { copyToClipboard } from '../lib/copy-to-clipboard';
 import { projectRawUrl } from '../providers/registry';
@@ -3708,7 +3709,7 @@ export function retryableAssistantMessage(
   const last = messages[messages.length - 1];
   if (!last || last.role !== 'assistant') return null;
   if (last.id !== lastAssistantId) return null;
-  return last.runStatus === 'failed' ? last : null;
+  return isRetryableAssistantTerminalFailure(last) ? last : null;
 }
 
 export function isAssistantMessageStreaming(