fix(chat): scope troubleshoot handoff to its workspace by waleedlatif1 · Pull Request #5344 · simstudioai/sim

waleedlatif1 · 2026-07-02T00:28:05Z

Summary

Follow-up to feat(logs): add Troubleshoot in Chat button for errored runs #5341 (merged), addressing a Cursor Bugbot Medium that landed after that PR was merged, so it shipped to staging.
MothershipHandoffStorage (the one-shot "Troubleshoot in Chat" handoff) used a single global localStorage key with no workspace scoping. If a workspace-A handoff was consumed by a different workspace's /home within the TTL (e.g. a navigation race, or a /chat/[id] mount skipping consume then landing on another workspace's new chat), the prompt auto-sent with workspace A's executionId — which doesn't resolve in workspace B, so the logs context is dropped server-side and Sim can't see the failure.

Fix

store(handoff, workspaceId) now records the target workspaceId.
consume(workspaceId) only consumes (and clears) a handoff whose workspaceId matches; a handoff owned by a different workspace is left untouched for its owner rather than misfired. Legacy/corrupt entries (no workspaceId) are still tombstoned so nothing lingers.
Callers updated: the log-details Troubleshoot action passes its workspaceId to store; the home surface passes its workspaceId to consume.

Type of Change

Bug fix

Testing

Unit tests extended: cross-workspace handoff is left for its owner (not consumed, not cleared) and the owning workspace still consumes it; store rejects an empty workspace; corrupt/expired entries still tombstone. type-check and biome pass.

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)

MothershipHandoffStorage now records the target workspaceId and only the matching workspace consumes (and clears) it; a different workspace leaves it untouched for its owner. Prevents a workspace-A handoff from firing in workspace B, where A's executionId can't resolve and the run context is dropped.

vercel · 2026-07-02T00:28:12Z

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

1 Skipped Deployment

Project	Deployment	Actions	Updated (UTC)
docs	Skipped		Jul 2, 2026 12:33am

cursor · 2026-07-02T00:28:16Z

PR Summary

Low Risk
Small, localized client-side storage and call-site change with expanded unit tests; no auth or server behavior changes.

Overview
Troubleshoot in Chat one-shot localStorage handoffs are now tied to a workspace ID, so another workspace’s /home mount cannot auto-send a prompt with the wrong run’s executionId (where logs context would fail to resolve).

MothershipHandoffStorage.store persists workspaceId and rejects empty workspace; consume(workspaceId) only clears and returns a matching handoff—foreign workspaces leave the entry intact for the owner. Pre-scoping legacy entries (message + timestamp, no workspaceId) are tombstoned on consume instead of firing in the current workspace. Home and log-details pass their route workspaceId; unit tests cover cross-workspace isolation, empty workspace, legacy discard, and existing expiry/corruption behavior.

^{Reviewed by Cursor Bugbot for commit 59e881e. Configure here.}

greptile-apps · 2026-07-02T00:32:06Z

Greptile Summary

This PR scopes MothershipHandoffStorage ("Troubleshoot in Chat") to its originating workspace, preventing a cross-workspace misfire where a navigation race could cause workspace B to consume workspace A's handoff and auto-send a message with an unresolvable executionId.

browser-storage.ts: store() now records workspaceId in the stored payload and rejects an empty workspace; consume() takes workspaceId as its first parameter, skips (preserves) entries owned by a different workspace, and tombstones legacy/corrupt entries.
Callers updated: log-details.tsx passes its workspaceId to store(); home.tsx passes its workspaceId to consume() and adds workspaceId to the effect's dependency array.
Tests extended: new cases cover cross-workspace isolation, empty-workspace rejection, and legacy-format tombstoning.

Confidence Score: 5/5

The change is safe to merge — it tightens an existing one-shot localStorage mechanism to prevent cross-workspace misfires without touching any data-persistence, API, or rendering paths.

All callers (store and consume) are updated, the guard logic correctly preserves a mismatched entry for its owner while tombstoning corrupt/legacy entries, the 60-second TTL is unchanged, and the new test suite locks in every relevant path including the legacy-format and cross-workspace isolation scenarios.

No files require special attention.

Important Files Changed

Filename	Overview
apps/sim/lib/core/utils/browser-storage.ts	Core fix: store() now records workspaceId and rejects empty values; consume() guards against cross-workspace reads while tombstoning legacy/corrupt entries. Logic is correct and well-documented.
apps/sim/lib/core/utils/browser-storage.test.ts	Tests updated to cover workspace scoping, cross-workspace isolation, empty-workspace rejection, and legacy-format tombstoning. All key paths are exercised.
apps/sim/app/workspace/[workspaceId]/home/home.tsx	Passes workspaceId (from useParams) to consume() and correctly adds it to the effect's dependency array.
apps/sim/app/workspace/[workspaceId]/logs/components/log-details/log-details.tsx	Passes workspaceId to store() so the stored handoff is correctly scoped to the originating workspace.

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A["User clicks 'Troubleshoot in Chat'\n(log-details.tsx)"] --> B["sendMothershipMessage(message, context)"]
    B -->|"Mothership already\nmounted (success)"| C["Message sent directly — done"]
    B -->|"Mothership not mounted\n(returns false)"| D["MothershipHandoffStorage.store(\n{ message, contexts }, workspaceId\n)"]
    D -->|"empty message or\nempty workspaceId"| E["return false — no navigation"]
    D -->|"valid → writes\n{ message, contexts, workspaceId, timestamp }\nto localStorage"| F["router.push workspace/home"]
    F --> G["Home mounts\n(home.tsx — chatId is null)"]
    G --> H["MothershipHandoffStorage.consume(workspaceId)"]
    H --> I{{"Entry in\nlocalStorage?"}}
    I -->|"No"| J["return null — nothing fires"]
    I -->|"Yes"| K{{"data.workspaceId\nmatches?"}}
    K -->|"Different workspace\n(mismatch)"| L["return null\nentry PRESERVED\nfor its owner"]
    K -->|"Matches OR\nlegacy (no workspaceId)"| M["clear() — tombstone"]
    M --> N{{"Valid?\n(workspaceId present,\nmessage, timestamp,\nwithin 60s TTL)"}}
    N -->|"No — legacy / corrupt / expired"| O["return null"]
    N -->|"Yes"| P["return { message, contexts }"]
    P --> Q["sendMessage auto-fires\nwith correct workspace context"]

%%{init: {'theme': 'base', 'themeVariables': {"darkMode": true, "background": "#0d1117", "primaryColor": "#21262d", "primaryTextColor": "#e6edf3", "primaryBorderColor": "#8b949e", "lineColor": "#8b949e", "textColor": "#e6edf3", "edgeLabelBackground": "#161b22", "actorBkg": "#21262d", "actorBorder": "#8b949e", "actorTextColor": "#e6edf3", "actorLineColor": "#8b949e", "signalColor": "#8b949e", "signalTextColor": "#e6edf3", "noteBkgColor": "#373320", "noteBorderColor": "#d4a72c", "noteTextColor": "#f0e6c0", "labelBoxBkgColor": "#21262d", "labelBoxBorderColor": "#8b949e", "labelTextColor": "#e6edf3", "loopTextColor": "#e6edf3", "activationBkgColor": "#30363d", "activationBorderColor": "#8b949e"}}}%%
flowchart TD
    A["User clicks 'Troubleshoot in Chat'\n(log-details.tsx)"] --> B["sendMothershipMessage(message, context)"]
    B -->|"Mothership already\nmounted (success)"| C["Message sent directly — done"]
    B -->|"Mothership not mounted\n(returns false)"| D["MothershipHandoffStorage.store(\n{ message, contexts }, workspaceId\n)"]
    D -->|"empty message or\nempty workspaceId"| E["return false — no navigation"]
    D -->|"valid → writes\n{ message, contexts, workspaceId, timestamp }\nto localStorage"| F["router.push workspace/home"]
    F --> G["Home mounts\n(home.tsx — chatId is null)"]
    G --> H["MothershipHandoffStorage.consume(workspaceId)"]
    H --> I{{"Entry in\nlocalStorage?"}}
    I -->|"No"| J["return null — nothing fires"]
    I -->|"Yes"| K{{"data.workspaceId\nmatches?"}}
    K -->|"Different workspace\n(mismatch)"| L["return null\nentry PRESERVED\nfor its owner"]
    K -->|"Matches OR\nlegacy (no workspaceId)"| M["clear() — tombstone"]
    M --> N{{"Valid?\n(workspaceId present,\nmessage, timestamp,\nwithin 60s TTL)"}}
    N -->|"No — legacy / corrupt / expired"| O["return null"]
    N -->|"Yes"| P["return { message, contexts }"]
    P --> Q["sendMessage auto-fires\nwith correct workspace context"]

_{Reviews (2): Last reviewed commit: "test(chat): cover legacy no-workspaceId ..." | Re-trigger Greptile}

waleedlatif1 · 2026-07-02T00:53:06Z

@greptile

waleedlatif1 · 2026-07-02T00:53:07Z

@cursor review

cursor

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

^{Reviewed by Cursor Bugbot for commit 59e881e. Configure here.}

greptile-apps Bot reviewed Jul 2, 2026

View reviewed changes

Comment thread apps/sim/lib/core/utils/browser-storage.test.ts

test(chat): cover legacy no-workspaceId handoff tombstoning

59e881e

vercel Bot temporarily deployed to Preview July 2, 2026 00:33 Inactive

cursor Bot reviewed Jul 2, 2026

View reviewed changes

waleedlatif1 merged commit 577b402 into staging Jul 2, 2026
17 checks passed

waleedlatif1 deleted the fix/mothership-handoff-workspace-scope branch July 2, 2026 00:57

waleedlatif1 mentioned this pull request Jul 2, 2026

v0.7.20: perf, ui improvements, fable 5, tables row size bump, blogs #5337

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(chat): scope troubleshoot handoff to its workspace#5344

fix(chat): scope troubleshoot handoff to its workspace#5344
waleedlatif1 merged 2 commits into
stagingfrom
fix/mothership-handoff-workspace-scope

waleedlatif1 commented Jul 2, 2026

Uh oh!

vercel Bot commented Jul 2, 2026 •

edited

Loading

Uh oh!

cursor Bot commented Jul 2, 2026 •

edited

Loading

Uh oh!

greptile-apps Bot commented Jul 2, 2026 •

edited

Loading

Uh oh!

Uh oh!

waleedlatif1 commented Jul 2, 2026

Uh oh!

waleedlatif1 commented Jul 2, 2026

Uh oh!

cursor Bot left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

waleedlatif1 commented Jul 2, 2026

Summary

Fix

Type of Change

Testing

Checklist

Uh oh!

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

Uh oh!

Uh oh!

cursor Bot commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Summary

Uh oh!

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

Uh oh!

Greptile Summary

Confidence Score: 5/5

Important Files Changed

Flowchart

Uh oh!

Uh oh!

waleedlatif1 commented Jul 2, 2026

Uh oh!

waleedlatif1 commented Jul 2, 2026

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

vercel Bot commented Jul 2, 2026 •

edited

Loading

cursor Bot commented Jul 2, 2026 •

edited

Loading

greptile-apps Bot commented Jul 2, 2026 •

edited

Loading