Merge remote-tracking branch 'origin/improvement/platform-core-chat' into wip/platform-org-wiring

# Conflicts:
#	apps/sim/app/o/[organizationId]/components/organization-conversation-queued-edit.test.tsx
#	apps/sim/platform/app/(shell)/_components/chat/live/live-chat.tsx
#	apps/sim/platform/docs/org-parity.md
#	apps/sim/platform/lib/data/chat.ts

Author: waleedlatif1

.github/scripts/http-e2e.sh

@@ -382,7 +382,7 @@ case "$group" in
     export BROWSER_EXTENSION_IDS=abcdefghijklmnopabcdefghijklmnop
     bun --no-env-file scripts/org-redesign-seed.ts
     start_browser_install org-redesign --only-shell chromium
-    bun --no-env-file scripts/org-redesign-e2e/scripted-agent.ts 3031 \
+    bun --no-env-file platform/checks/live/support/scripted-agent.ts 3031 \
       > "$report_dir/org-redesign-agent.log" 2>&1 &
     agent_pid=$!
     wait_ready "$agent_pid" http://127.0.0.1:3031/health 'scripted agent'

apps/sim/app/_organization-conversation/composer/use-composer.ts

@@ -39,8 +39,6 @@ export interface ConversationComposerProps {
     text: string,
     contexts?: ChatContext[]
   ) => undefined | false | PendingComposerSubmission
-  onSendQueuedHead: () => void
-  onEditQueuedTail: () => boolean
   messages: readonly ChatMessage[]
   onStop: () => void
 }
@@ -83,11 +81,8 @@ export function useComposer({
   draftKeys,
   files,
   submission,
-  isSending,
   restoredContexts,
   onSubmit,
-  onSendQueuedHead,
-  onEditQueuedTail,
   messages,
   waitsForFullLists,
   hasAdditionalAttachments = false,
@@ -148,7 +143,7 @@ export function useComposer({
   const { textareaRef, setValue, setContexts, getValue, getPlainValue, restorePrompt } = editor
   /**
    * The editor holds chips, the draft holds plain text, so neither can be the other's value. A write
-   * from outside, a queued message restored or a chat cleared, reaches the editor here.
+   * from outside, a chat cleared, reaches the editor here.
    */
   useEffect(() => {
     if (value === getPlainValue()) return
@@ -185,10 +180,7 @@ export function useComposer({
   const send = () => {
     const filesAtSend = files.getAttachedFiles()
     if (filesAtSend.some((file) => file.uploading)) return
-    if (!hasPayload(getValue(), filesAtSend)) {
-      if (isSending) onSendQueuedHead()
-      return
-    }
+    if (!hasPayload(getValue(), filesAtSend)) return
     const contexts = imagesOnly
       ? filterContextsPresentInMessage(
           editor.contexts.filter((context) => context.kind === 'browser_page'),
@@ -268,10 +260,6 @@ export function useComposer({
     const rect = event.currentTarget.getBoundingClientRect()
     editor.openResourceMenu({ left: rect.left, top: rect.top })
   }
-  const recallQueuedTail = () => {
-    if (hasAdditionalAttachments || files.getAttachedFiles().length > 0) return false
-    return onEditQueuedTail()
-  }
 
   return {
     editor,
@@ -284,7 +272,6 @@ export function useComposer({
     /** Enter and the arrow keys' policy, shared by the prompt editor and the plain Assistant field. */
     keyPolicy: {
       onNavigateHistory: hasAdditionalAttachments ? undefined : history.navigate,
-      onArrowUpOnEmpty: recallQueuedTail,
     },
     frameProps: {
       'aria-busy': preparingSubmission || Boolean(heldSend) || undefined,

apps/sim/app/_organization-conversation/use-organization-conversation.ts

@@ -11,10 +11,6 @@ import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
 import { getWorkspaceHostContextContract } from '@/lib/api/contracts/workspaces'
 import { useFeatureFlag } from '@/lib/core/config/feature-flags-context'
 import { BrowserStorage } from '@/lib/core/utils/browser-storage'
-import {
-  getMothershipAttachmentPreviewUrl,
-  getMothershipAttachmentUrl,
-} from '@/lib/mothership/chat/attachment-preview'
 import { organizationRoutes } from '@/lib/navigation/paths'
 import { organizationDraftKey, SEARCH_ASSISTANT_DRAFT_SLOT } from '@/lib/organizations/draft-key'
 import { useOrganization } from '@/lib/organizations/provider'
@@ -373,35 +369,6 @@ export function useOrganizationConversation({
       : commit({ message: text.trim(), contexts })
   }
 
-  const editQueuedMessage = (id: string) => {
-    const queued = chat.editQueuedMessage(id)
-    if (queued) {
-      const store = useMothershipDraftsStore.getState()
-      store.setDraft(draftKey, {
-        ...store.drafts[draftKey],
-        text: queued.content,
-        contexts: queued.contexts,
-      })
-      setRestoredContexts(queued.contexts ?? [])
-      files.restoreAttachedFiles(
-        (queued.fileAttachments ?? []).map((file) => ({
-          id: file.id,
-          key: file.key,
-          name: file.filename,
-          type: file.media_type,
-          size: file.size,
-          path:
-            file.path ||
-            getMothershipAttachmentPreviewUrl(file) ||
-            getMothershipAttachmentUrl(file),
-          previewUrl: getMothershipAttachmentPreviewUrl(file),
-          uploading: false,
-        }))
-      )
-    }
-    return queued
-  }
-
   const allowBuildControls = requestMode !== 'assistant' && canBuild
   const stopGeneration = () => {
     void chat.stopGeneration()
@@ -416,17 +383,10 @@ export function useOrganizationConversation({
     draftKeys,
     restoredContexts,
     messages: chat.messages,
-    onEditQueuedTail: () => {
-      const tail = chat.messageQueue.at(-1)
-      return tail ? Boolean(editQueuedMessage(tail.id)) : false
-    },
     files,
     isInitialView: !hasChat,
     isSending: chat.isSending || chat.isReconnecting,
     onSubmit: submit,
-    onSendQueuedHead: () => {
-      void chat.sendNow()
-    },
     onStop: stopGeneration,
   }
   /** What both views' threads take; each adds its own layout around them. */
@@ -444,13 +404,8 @@ export function useOrganizationConversation({
     isLoading: Boolean(chatId) && !chat.messages.length && chat.isChatHistoryPending,
     onSubmit: send,
     onStopGeneration: stopGeneration,
-    messageQueue: chat.messageQueue,
-    editingQueuedId: chat.editingQueuedId,
-    dispatchingHeadId: chat.dispatchingHeadId,
-    onRemoveQueuedMessage: chat.removeFromQueue,
-    onSendQueuedMessage: chat.sendNow,
-    onEditQueuedMessage: editQueuedMessage,
-    onCancelQueueEdit: chat.cancelQueueEdit,
+    onRetryMessage: chat.retryMessage,
+    onDismissMessage: chat.dismissMessage,
     userId,
     chatId: chat.resolvedChatId,
     onWorkspaceResourceSelect: requestMode !== 'assistant' ? selectResource : undefined,

apps/sim/app/api/copilot/chat/steer/dismiss/route.ts

@@ -0,0 +1,21 @@
+import { copilotChatDismissSteeringContract } from '@/lib/api/contracts/copilot'
+import {
+  defineInternalJsonRoute,
+  internalOrchestrationErrorPolicy,
+  internalRateLimits,
+  internalSessionAuth,
+} from '@/lib/api/server/routes'
+import { dismissSteeringMessage } from '@/lib/mothership/chat/application/steering-fallback'
+
+/** Drops a steering message the user gave up on, under the chat owner's current access. */
+export const POST = defineInternalJsonRoute({
+  contract: copilotChatDismissSteeringContract,
+  auth: internalSessionAuth,
+  operation: dismissSteeringMessage.operation,
+  rateLimit: internalRateLimits.none({
+    reason: 'Authenticated cleanup of one message the user already sent; it starts no work.',
+  }),
+  errorPolicy: internalOrchestrationErrorPolicy,
+  mapInput: ({ body }) => ({ chatId: body.chatId, messageId: body.steeringId }),
+  useCase: dismissSteeringMessage,
+})