fix(mothership): drop queued tab adds the server already removed by waleedlatif1 · Pull Request #9050 · simstudioai/sim

waleedlatif1 · 2026-10-14T23:07:33Z

Summary

A server-applied remove effect (e.g. the agent deleting a file) cleared the tab locally but left the client's queued or failed add for that resource in the persistence queue. The next flush re-posted it and hydration re-projected the tab, so the deleted resource went out as an open tab on every later message
A server remove effect now discards that queued or failed add, both live and when it arrives through a reconnect replay. The server already removed the resource, so no client delete is sent
Active-tab resolution logs a missing resource at info and a revoked one at warn instead of error. Other failures still log at error, and the model receives the same context as before
Known residual: an add whose POST is already in flight when the remove effect arrives keeps today's behavior (narrow, pre-existing window). Closing it client-side would add new client/server ordering hazards, so it's left out of this change

Type of Change

Bug fix

Testing

use-chat DOM regression tests: a failed add followed by a server remove effect, delivered live and via a reconnect replay. Before the fix the add is re-posted, the tab comes back and the deleted id is sent as an attachment; after the fix none of that happens
process-contents test covering info/warn/error per failure class

Checklist

Code follows project style guidelines
Self-reviewed my changes
Tests added/updated and passing
No new warnings introduced
I confirm that I have read and agree to the terms outlined in the Contributor License Agreement (CLA)

A server-applied remove effect cleared the tab locally but left the client's queued add for the same resource in the persistence queue, so the next flush re-posted it and hydration re-projected the tab. The deleted resource then went out as an open tab on every later message. The remove effect now discards that pending add (the server already removed it, so no client delete is sent). Active-tab resolution now logs a missing resource at info and a revoked one at warn instead of error; other failures still log at error.

vercel · 2026-10-14T23:07:39Z

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment

Project	Deployment	Actions	Updated
docs	Skipped		Oct 15, 2026 12:08am UTC

cubic-dev-ai

All reported issues were addressed across 8 files

_{Reply with feedback, questions, or to request a fix.

Turn on auto-fix | Re-trigger cubic}

greptile-apps · 2026-10-14T23:12:27Z

Confidence Score: 5/5

[Medium impact] The PR appears safe to merge within its stated scope.

Summary

The PR drops queued or failed resource adds when a server removal arrives, live or through reconnect replay.

Server removals clear queued tab adds before they can restore a resource.
Active-tab lookup failures log at a level that matches the failure.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart TD
  A[Server removal arrives live or through replay] --> B[Find queued writes in chat and provisional scopes]
  B --> C{User removal or write already running?}
  C -->|Yes| D[Leave existing bookkeeping unchanged]
  C -->|No| E[Drop queued or failed add]
  E --> F[Later flush cannot retry that add]

_{Reviews (4) · Last reviewed commit: "fix(mothership): scope stale-tab fix to ..." · Reviewed by Greptile}

… tabs An add already in flight when the server's removal arrives can commit after it, so the queue now schedules a compensating delete ordered after that write settles. Queued or failed adds are still dropped with no delete. Recovered remove effects (replay or deferred batch) now discard the queued add too; previously the recovery path returned before the discard ran.

…not the clock

waleedlatif1 · 2026-10-14T23:38:18Z

@greptileai review

waleedlatif1 · 2026-10-14T23:38:19Z

@cubic-dev-ai review

cubic-dev-ai · 2026-10-14T23:38:23Z

@cubic-dev-ai review

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

All reported issues were addressed across 8 files

_{Reply with feedback, questions, or to request a fix.

Turn on auto-fix | Re-trigger cubic}

waleedlatif1 · 2026-10-14T23:41:47Z

@greptileai review

An upsert effect means the server stored the resource again, so a client delete still waiting behind an in-flight add must not run. The queue drops that removal the same way a newer add does; nothing is written since the server already holds the resource.

waleedlatif1 · 2026-10-14T23:58:41Z

@greptileai review

waleedlatif1 · 2026-10-14T23:58:42Z

@cubic-dev-ai review

cubic-dev-ai · 2026-10-14T23:58:49Z

@cubic-dev-ai review

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

waleedlatif1 · 2026-10-15T00:00:41Z

@greptileai review

waleedlatif1 · 2026-10-15T00:00:42Z

@cubic-dev-ai review

cubic-dev-ai · 2026-10-15T00:00:47Z

@cubic-dev-ai review

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

All reported issues were addressed across 8 files

_{Reply with feedback, questions, or to request a fix.

Turn on auto-fix | Re-trigger cubic}

Drops the in-flight compensating delete and the restore cancel path: each added a new client/server ordering hazard. A server remove effect, live or on recovery, now only discards a queued or failed client add for that resource; a write already in flight is left untouched.

waleedlatif1 · 2026-10-15T00:18:53Z

@greptileai review

waleedlatif1 · 2026-10-15T00:18:54Z

@cubic-dev-ai review

cubic-dev-ai · 2026-10-15T00:19:01Z

@cubic-dev-ai review

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

waleedlatif1 · 2026-10-15T00:19:28Z

@greptileai review

waleedlatif1 · 2026-10-15T00:19:29Z

@cubic-dev-ai review

cubic-dev-ai · 2026-10-15T00:19:34Z

@cubic-dev-ai review

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

No issues found across 8 files

Confidence score: 5/5

Automated review surfaced no issues in the provided summaries.
No files require special attention.

_{Turn on auto-fix | Re-trigger cubic}

waleedlatif1 mentioned this pull request Oct 14, 2026

v0.9.22: docs overhaul, geo and mcp improvements #9040

Merged

cubic-dev-ai Bot reviewed Oct 14, 2026

View reviewed changes

Comment thread apps/sim/lib/mothership/resources/client-persistence-queue.ts

fix(mothership): type the stale-tab regression test's stream events

7e3ce08

vercel Bot temporarily deployed to Preview October 14, 2026 23:11 Inactive

greptile-apps Bot reviewed Oct 14, 2026

View reviewed changes

Comment thread apps/sim/lib/mothership/resources/client-persistence-queue.ts

Comment thread apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts Outdated

vercel Bot temporarily deployed to Preview October 14, 2026 23:18 Inactive

fix(mothership): gate the stale-tab test stream on the client's add, …

e7f4fdd

…not the clock

vercel Bot temporarily deployed to Preview October 14, 2026 23:24 Inactive

fix(mothership): use the shared deferred helper in stale-tab tests

be11be5

vercel Bot temporarily deployed to Preview October 14, 2026 23:29 Inactive

cubic-dev-ai Bot reviewed Oct 14, 2026

View reviewed changes

Comment thread apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts

greptile-apps Bot reviewed Oct 14, 2026

View reviewed changes

Comment thread apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts Outdated

vercel Bot temporarily deployed to Preview October 14, 2026 23:49 Inactive

cubic-dev-ai Bot reviewed Oct 15, 2026

View reviewed changes

Comment thread apps/sim/lib/mothership/resources/client-persistence-queue.ts Outdated

greptile-apps Bot reviewed Oct 15, 2026

View reviewed changes

Comment thread apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts Outdated

vercel Bot temporarily deployed to Preview October 15, 2026 00:08 Inactive

cubic-dev-ai Bot reviewed Oct 15, 2026

View reviewed changes

waleedlatif1 merged commit 29158c6 into staging Oct 15, 2026
54 checks passed

waleedlatif1 deleted the fix/stale-resource-tabs branch October 15, 2026 00:28

Conversation

waleedlatif1 commented Oct 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Type of Change

Testing

Checklist

Uh oh!

vercel Bot commented Oct 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cubic-dev-ai Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

greptile-apps Bot commented Oct 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Confidence Score: 5/5

Summary

Diagram

Uh oh!

Uh oh!

Uh oh!

waleedlatif1 commented Oct 14, 2026

Uh oh!

waleedlatif1 commented Oct 14, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 14, 2026

Uh oh!

cubic-dev-ai Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

waleedlatif1 commented Oct 14, 2026

Uh oh!

Uh oh!

waleedlatif1 commented Oct 14, 2026

Uh oh!

waleedlatif1 commented Oct 14, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 14, 2026

Uh oh!

waleedlatif1 commented Oct 15, 2026

Uh oh!

waleedlatif1 commented Oct 15, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 15, 2026

Uh oh!

cubic-dev-ai Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

waleedlatif1 commented Oct 15, 2026

Uh oh!

waleedlatif1 commented Oct 15, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 15, 2026

Uh oh!

waleedlatif1 commented Oct 15, 2026

Uh oh!

waleedlatif1 commented Oct 15, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 15, 2026

Uh oh!

cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This branch was previously deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

waleedlatif1 commented Oct 14, 2026 •

edited

Loading

vercel Bot commented Oct 14, 2026 •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading

greptile-apps Bot commented Oct 14, 2026 •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading