fix(issues): address review — chat claim race, soft-deleted chats, collab flag gate, replay-safe migration, Sim review handoff

Author: TheodoreSpeaks

apps/sim/app/api/mothership/chats/[chatId]/route.ts

@@ -11,6 +11,7 @@ import {
 } from '@/lib/api/contracts/mothership-chats'
 import { parseRequest } from '@/lib/api/server'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
+import { detachChatFromIssuesInTx } from '@/lib/issues/repository'
 import { buildEffectiveChatTranscript } from '@/lib/mothership/chat/effective-transcript'
 import {
   getAccessibleCopilotChatAuth,
@@ -239,21 +240,25 @@ export const DELETE = withRouteHandler(
         return NextResponse.json({ success: true })
       }
 
-      const [deletedChat] = await db
-        .update(copilotChats)
-        .set({ deletedAt: new Date() })
-        .where(
-          and(
-            eq(copilotChats.id, chatId),
-            eq(copilotChats.userId, userId),
-            eq(copilotChats.type, 'mothership'),
-            isNull(copilotChats.deletedAt)
+      const deletedChat = await db.transaction(async (tx) => {
+        const [row] = await tx
+          .update(copilotChats)
+          .set({ deletedAt: new Date() })
+          .where(
+            and(
+              eq(copilotChats.id, chatId),
+              eq(copilotChats.userId, userId),
+              eq(copilotChats.type, 'mothership'),
+              isNull(copilotChats.deletedAt)
+            )
           )
-        )
-        .returning({
-          workspaceId: copilotChats.workspaceId,
-          organizationId: copilotChats.organizationId,
-        })
+          .returning({
+            workspaceId: copilotChats.workspaceId,
+            organizationId: copilotChats.organizationId,
+          })
+        if (row) await detachChatFromIssuesInTx(tx, chatId)
+        return row
+      })
 
       if (!deletedChat) {
         return NextResponse.json({ success: false, error: 'Chat not found' }, { status: 404 })

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/rich-markdown-editor.tsx

@@ -248,14 +248,24 @@ interface RichMarkdownEditorProps {
 /** Source fallback unmounts the rich surface so only one editing engine owns the local draft. */
 export const RichMarkdownEditor = memo(function RichMarkdownEditor(props: RichMarkdownEditorProps) {
   const [sourceFileId, setSourceFileId] = useState<string | null>(null)
-  if (sourceFileId === props.file.id)
-    return (
+  if (sourceFileId === props.file.id) {
+    const source = (
       <TextEditor
         {...props}
         previewMode='editor'
         disableStreamingAutoScroll={props.disableStreamingAutoScroll ?? false}
       />
     )
+    if (!props.header && !props.footer) return source
+    // The source editor scrolls itself, so the surrounding chrome scrolls around a fixed-height editor.
+    return (
+      <div className='flex min-h-0 flex-1 flex-col overflow-y-auto'>
+        {props.header}
+        <div className='flex h-[60vh] min-h-[320px] shrink-0 flex-col'>{source}</div>
+        {props.footer}
+      </div>
+    )
+  }
   return <RichMarkdownSurface {...props} onEditSource={() => setSourceFileId(props.file.id)} />
 })
 

apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/constants.ts

@@ -133,7 +133,7 @@ const RESOURCE_TO_CONTEXT: Record<
     ...(r.viewId ? { viewId: r.viewId } : {}),
   }),
   dashboard: (r) => ({ kind: 'dashboard', dashboardId: r.id, label: r.title }),
-  /** Sim reads an issue through its document path, `issues/<KEY>.md`, not a chat context. */
+  /** No chat context: Sim reads an issue by key or as `issues/<KEY>.md`, so the attach menu omits issues. */
   issue: () => null,
   file: (r) => ({ kind: 'file', fileId: r.id, label: r.title }),
   folder: (r) => ({ kind: 'folder', folderId: r.id, label: r.title }),

apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx

@@ -49,6 +49,9 @@ import { useSettledTerminalCommands } from '@/hooks/use-settled-terminal-command
 import { useBrowserSessionStore } from '@/stores/browser-session/store'
 import { useCopilotTerminalStore } from '@/stores/copilot-terminal/store'
 
+/** Resource types with no chat context to attach (see `mapResourceToContext`). */
+const CHAT_CONTEXTLESS_RESOURCE_TYPES: readonly MothershipResourceType[] = ['issue']
+
 /**
  * The `@` list is shorter than the emcn menu default (420px, sized for right-click
  * action menus). This one floats directly over the chat input, so a menu tall enough
@@ -154,6 +157,7 @@ export const PlusMenuDropdown = React.memo(
     const workspaceInventory = useAvailableResources(organizationId ? '' : workspaceId, {
       enabled: inventoryEnabled,
       includeFolderMentions: true,
+      excludeTypes: CHAT_CONTEXTLESS_RESOURCE_TYPES,
     })
     const { data: allWorkspaces, isPending: workspacesPending } = useOrderedWorkspacesQuery(
       Boolean(organizationId) && inventoryEnabled

apps/sim/app/workspace/[workspaceId]/issues/[key]/page.tsx

@@ -9,5 +9,5 @@ interface IssuePageProps {
 
 export default async function IssuePage({ params }: IssuePageProps) {
   const { workspaceId, key } = await params
-  return <IssueDetail workspaceId={workspaceId} issueKey={decodeURIComponent(key)} />
+  return <IssueDetail workspaceId={workspaceId} issueKey={key} />
 }

apps/sim/app/workspace/[workspaceId]/issues/components/index.ts

@@ -1,3 +1,3 @@
-export { IssueStatusIcon } from './issue-status'
+export { IssueStatusIcon, issueStatusLabel } from './issue-status'
 export { IssuesFeatureGate } from './issues-feature-gate'
 export { NewIssueModal } from './new-issue-modal'

apps/sim/app/workspace/[workspaceId]/issues/components/issue-activity.tsx

@@ -114,7 +114,12 @@ export function IssueActivity({
   )
 }
 
-function IssueChange({ event, names }: { event: IssueEvent; names: Map<string, string> }) {
+interface IssueChangeProps {
+  event: IssueEvent
+  names: Map<string, string>
+}
+
+function IssueChange({ event, names }: IssueChangeProps) {
   const { what, detail } = describe(event)
   return (
     <li className='flex flex-col py-1 text-caption'>
@@ -170,7 +175,12 @@ function IssueComment({ workspaceId, issueKey, event, author }: IssueCommentProp
   )
 }
 
-function CommentComposer({ workspaceId, issueKey }: { workspaceId: string; issueKey: string }) {
+interface CommentComposerProps {
+  workspaceId: string
+  issueKey: string
+}
+
+function CommentComposer({ workspaceId, issueKey }: CommentComposerProps) {
   const [body, setBody] = useState('')
   const addComment = useAddIssueComment()
   const submit = () => {

apps/sim/app/workspace/[workspaceId]/issues/components/issue-detail.tsx

@@ -164,7 +164,11 @@ export function IssueView({ workspaceId, issueKey }: IssueDetailProps) {
 }
 
 /** Key, who filed it, and when, above the title. */
-function IssueEyebrow({ issue }: { issue: IssueRecord }) {
+interface IssueEyebrowProps {
+  issue: IssueRecord
+}
+
+function IssueEyebrow({ issue }: IssueEyebrowProps) {
   return (
     <p className='text-[var(--text-muted)] text-caption'>
       {[issue.key, filedBy(issue), dateFormat.format(new Date(issue.createdAt))].join(' · ')}
@@ -332,12 +336,16 @@ function IssueActions({ workspaceId, issue, canEdit, chatHref }: IssueActionsPro
    */
   async function startChat(followUp: boolean) {
     setOpening(true)
+    let started = false
     try {
       const chat = await requestJson(createMothershipChatContract, { body: { workspaceId } })
-      if (!followUp) await startIssue.mutateAsync({ workspaceId, key: issue.key, chatId: chat.id })
       await requestJson(addMothershipChatResourceContract, {
         body: { chatId: chat.id, resource: { type: 'issue', id: issue.key, title: issue.title } },
       })
+      if (!followUp) {
+        await startIssue.mutateAsync({ workspaceId, key: issue.key, chatId: chat.id })
+        started = true
+      }
       // boundary-raw-fetch: the chat send responds with an SSE stream; only its acceptance matters here, the run continues server-side once the reader is cancelled
       const response = await fetch(MOTHERSHIP_CHAT_API_PATH, {
         method: 'POST',
@@ -359,7 +367,11 @@ function IssueActions({ workspaceId, issue, canEdit, chatHref }: IssueActionsPro
         followUp ? `Started a follow-up on ${issue.key}` : `Sim is working on ${issue.key}`
       )
     } catch (error) {
-      toast.error(getErrorMessage(error, 'Sim could not start on this issue'))
+      toast.error(
+        started
+          ? 'The chat is ready but its first message did not send. Open the chat to send it again.'
+          : getErrorMessage(error, 'Sim could not start on this issue')
+      )
     } finally {
       setOpening(false)
     }

apps/sim/app/workspace/[workspaceId]/issues/components/issue-properties.tsx

@@ -187,7 +187,7 @@ function LinkedResources({ workspaceId, detail, canEdit }: LinkedResourcesProps)
           key: detail.issue.key,
           type: changed.slice(0, separator) as IssueResourceType,
           resourceId: changed.slice(separator + 1),
-          linked: Boolean(removed && !added),
+          unlink: Boolean(removed && !added),
         })
       }}
       aria-label='Linked resources'
@@ -196,7 +196,11 @@ function LinkedResources({ workspaceId, detail, canEdit }: LinkedResourcesProps)
 }
 
 /** Tickets in Linear or Jira; picking one opens it. */
-function LinkedTickets({ tickets }: { tickets: IssueDetail['tickets'] }) {
+interface LinkedTicketsProps {
+  tickets: IssueDetail['tickets']
+}
+
+function LinkedTickets({ tickets }: LinkedTicketsProps) {
   return (
     <ChipDropdown
       variant='ghost'

apps/sim/app/workspace/[workspaceId]/issues/components/issue-status.tsx

@@ -7,7 +7,11 @@ import type { IssueRecord } from '@/lib/api/contracts/issues'
  * thinking loader while its chat is running (paused when the chat stopped), and a check or cross
  * once closed.
  */
-export function IssueStatusIcon({ issue }: { issue: IssueRecord }) {
+interface IssueStatusIconProps {
+  issue: IssueRecord
+}
+
+export function IssueStatusIcon({ issue }: IssueStatusIconProps) {
   if (issue.status === 'in_progress')
     return issue.workingChat?.running ? (
       <ThinkingLoader size={14} />
@@ -22,3 +26,18 @@ export function IssueStatusIcon({ issue }: { issue: IssueRecord }) {
     return <span aria-hidden='true' className='size-[8px] rounded-full bg-[var(--caution)]' />
   return <Circle className='size-[14px] text-[var(--text-icon)]' />
 }
+
+const CLOSE_REASON_LABELS = {
+  completed: 'Completed',
+  dismissed: 'Dismissed',
+  duplicate: 'Duplicate',
+} as const
+
+/** The state {@link IssueStatusIcon} draws, in words, for assistive technology. */
+export function issueStatusLabel(issue: IssueRecord): string {
+  if (issue.status === 'in_progress')
+    return issue.workingChat?.running ? 'Sim is working' : 'In progress'
+  if (issue.status === 'done')
+    return issue.closeReason ? CLOSE_REASON_LABELS[issue.closeReason] : 'Done'
+  return issue.inboxKind === 'review' ? 'Needs review' : 'New'
+}