[juliusmarminge]

Problem

On mobile, a composer draft is keyed ${environmentId}:${threadId}. Queued-message edits add ~queued-edit~${runId}. composerDraftEnvironmentId treated everything before the last colon as the environment, but real thread and run IDs contain colons: delegated threads are thread:mcp:<ns>:<key>:<i>, MCP forks are <commandId>:fork, launched threads are mcp:launch:<hash>, and runs are run:thread:…:ordinal:<n>. For drafts on those threads the function returned an environment that does not exist. composerAttachmentUploadRequests dropped them, so attachments were not uploaded early. The same lookup also missed those drafts in the clipboard-attachment lookup and in the cloud sign-out draft archive.

Reproduction: a draft with one image on environment-1:thread:mcp:namespace:key:0, environment-1:command-1:fork, or environment-1:thread-1~queued-edit~run:1, with environment-1 connected and operable, produces no upload request. The ordinary environment-1:thread-1 draft does produce one.

Change

composerDraftEnvironmentId now takes the environment IDs the client knows. It returns the longest one that the key starts with, followed by :. Environment IDs that contain colons keep resolving. The pending-task: and new-task: branches are unchanged.

Every caller resolves against every known environment, whatever its connection state. Only then does it apply its own filter, so a draft never resolves to a shorter environment ID that happens to be a prefix of its own:

• upload requests and persisting an accepted upload: all entries of the workspace environments list, then connected and operable
• clipboard lookup: the same list, then the queried environment
• cloud sign-out archive: all registry entries (read before the cloud environments are removed), then the archived ones

Draft keys and persisted data are unchanged, so drafts already saved on devices resolve without migration.

Scope and approval

Fixes #29701

Verification

• Red first: uploads draft attachments for threads whose ids contain colons in apps/mobile/src/state/composer-attachment-uploads.test.ts failed on main (only the ordinary-thread control produced a request):

  AssertionError: expected [ [ 'environment-1:thread-1', …(1) ] ] to deeply equal [ …(4) ]
    [ "environment-1:thread-1", "environment-1" ],
  - [ "environment-1:thread:mcp:namespace:key:0", "environment-1" ],
  - [ "environment-1:command-1:fork", "environment-1" ],
  - [ "environment-1:thread-1~queued-edit~run:1", "environment-1" ],
  

• does not upload a disconnected colon environment's draft to its connected prefix: with a connected and a:vcs-status:b known but disconnected, the a:vcs-status:b:thread-1 draft produces no request. It failed when callers resolved against connected environments only, and passes now.
• vp test run on the five changed test files (composer-attachment-uploads, composerAttachmentUploadQueue, use-composer-drafts, composerContextClipboard, threadOutboxDelivery) passes 127/127. The existing a:vcs-status:b case resolves against ["a", "a:vcs-status:b"] to exercise longest-match.
• vp run check:changed passes: format, lint, knip, typecheck, tests, React compiler.
• No captures. This is a state bug proved by the tests above. No render code changed; drafts on these threads now reach the existing upload-progress and Send branches.
• Not checked: a run on a physical device or simulator.

Model and harness: Claude Opus 5.5 (lead, test, implementation, review) and GPT-6.1 Sol (review, proof audit) via Claude Code and Codex in T3 Code.

🤖 Generated with Claude Code

[macroscopeapp]

Approvability

Verdict: Approved at 3f8086c

Macroscope's review found this PR approvable — Fixes mobile draft ownership resolution for IDs containing colons across attachment uploads, clipboard lookup, and sign-out archival. Existing upload authorization and draft-preservation safeguards remain unchanged.

No code changes detected at 9b5c476. Prior analysis still applies.

^{You can add or adjust custom eligibility rules. Learn more.}

[shivamhwp]

[GPT-6.1 Sol][Codex] on behalf of shivam.

I reproduced the missing early upload on a physical POCO F4 running Android 14 on corex, against an isolated backend with synthetic data. The server's normal thread start CLI created mcp:2e0900fd-756c-44a3-a72e-5c031c44715f; I selected a PNG through the native Choose Files picker without tapping Send.

With the parser from main a03648901640216a154d387cfb2cdec268e6527e, accessibility reported Queue and the backend received zero attachment files. With my unpublished fix 88ac9fd046f5a869c12be122301b7e5c3166712b, the saved draft uploaded after reload. A fresh selection also uploaded before Send; accessibility reported Send with no Queue. The received 174-byte PNG matched the source SHA-256. The native client fingerprint was 971743703b097b8870b39ff842d130f50b115eeb.

These results cover my local change to use the shared first-colon parser, not this PR's implementation or head. For the before comparison, I substituted the main version of the parser file into the same checkout; afterward I restored the committed fix and confirmed a clean working tree.

The added parser regression failed before the fix with expected 'environment-1:delegated' to be 'environment-1'. On my commit, the focused upload queue, upload worker, and queued-edit suites passed 29 tests, and vp run check:changed passed format, lint, knip, affected typechecks, tests, and React compiler checks. The regression uses the real thread-key and queued-edit-key producers with colon-containing thread/run IDs.

Android before: native picker selection leaves the draft awaiting early upload.

android-before.mp4

Android after: a fresh native picker selection uploads before Send.

android-after.mp4

Not checked: this PR's head, native delegated/queued-edit screens, or iOS. The iOS job had not started and was cancelled on takeover. I did not establish that sending failed before the fix. The Android test connection, files, and servers have been cleaned up; no branch was pushed.

[coderabbitai]

Important

Review skipped

Review was skipped as selected files did not have any reviewable changes.

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: fix/issue-29701
• File: .coderabbit.config.ts
• Commit: 9b5c476
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Team
• Run ID: 2bbd7e20-d940-4f70-b101-0ed4b11b841a

Commits

Reviewing files that changed from the base of the PR and between 3f8086c and 9b5c476.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• Trigger review

No actionable comments were generated in the recent review.

Walkthrough

The mobile composer now resolves draft keys containing colons against known environment IDs. Upload selection and persistence, clipboard attachment lookup, and cloud-draft archiving pass known environment IDs to the resolver.

Changes: Composer attachment uploads

Layer / File(s)	Summary
Resolve draft environments from known IDs apps/mobile/src/lib/composerAttachmentUploadQueue.ts, apps/mobile/src/lib/composerAttachmentUploadQueue.test.ts	composerDraftEnvironmentId now selects the longest known environment ID prefix for keys outside its existing pending-task: and new-task: branches. Tests cover the updated inputs, queued-task lookup, and colon-containing environment IDs.
Resolve environments for attachment uploads apps/mobile/src/state/composer-attachment-uploads.ts, apps/mobile/src/state/composer-attachment-uploads.test.ts	Upload request selection and persistence pass all known environment IDs to the resolver. Tests cover colon-containing draft keys and a disconnected environment whose ID starts with a connected environment ID.
Resolve environments for draft lookup and archiving apps/mobile/src/state/use-composer-drafts.ts, apps/mobile/src/state/use-composer-drafts.test.ts, apps/mobile/src/lib/composerContextClipboard.ts, apps/mobile/src/lib/composerContextClipboard.test.ts, apps/mobile/src/features/cloud/cloud-drafts.ts, apps/mobile/src/state/threadOutboxDelivery.test.ts, apps/mobile/src/state/queued-edit-draft-key.ts	Clipboard lookup and cloud-draft archiving pass known environment IDs to the resolver. Cloud-environment removal supplies IDs from all registry entries. Tests update archive calls, and the queued-edit key comment no longer rules out colons.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Change: Bug fix · Severity of issue fixed: Low

Suggested reviewers: t3dotgg, maria-rcks

Merge Risk: Minimal · previous review 3f808

Drafts whose thread IDs contain colons now resolve to the right environment, so their attachments upload before Send as intended. Nothing in the supplied evidence points to a regression. The author-reported tests pass, though no device or simulator run was done.

Pre-merge checks: 3 · 1

Failed checks: 1 warning

Check name	Status	Explanation	Resolution
Description check		The description follows the repository template and is substantive. It has a clear Problem section with a reproduction, a Change section that explains the longest-prefix environment resolution and why…	Complete the 'Scope and approval' section. Link the triaged bug issue #29701 and state whether a maintainer approved the direction and scope, with the approval comment or discussion link. If no prior approval exists, explain why this small,…

Passed checks: 3 passed

Check name	Status	Explanation
Title check		The title clearly identifies the mobile fix and the affected behavior: attachment uploads for drafts on threads with colon-containing IDs.
Linked Issues check		Issue #29701 requires valid drafts with colon-containing thread or run IDs to resolve to the connected environment and create an early attachment-upload request. composerDraftEnvironmentId now selec…
Out of Scope Changes check		The changes remain within issue #29701. Production changes update draft-environment resolution and its upload, persistence, clipboard, and cloud-archive callers. Tests cover the corrected resolution a…

Full details: Linked Issues check

Explanation

Issue #29701 requires valid drafts with colon-containing thread or run IDs to resolve to the connected environment and create an early attachment-upload request. composerDraftEnvironmentId now selects the longest known environment ID followed by :. Upload request selection passes known environment IDs and filters by connected and operable environments. The added tests cover ordinary threads, delegated threads, MCP forks, queued-message edits, and a longer environment-ID match. Related clipboard lookup, upload persistence, and cloud archive callers also pass environment context. No coding requirement from the active issue remains unmet.

Full details: Out of Scope Changes check

Explanation

The changes remain within issue #29701. Production changes update draft-environment resolution and its upload, persistence, clipboard, and cloud-archive callers. Tests cover the corrected resolution and caller behavior. The comment-only change documents the same key-format correction. No unrelated product behavior is shown.

Full details: Description check

Explanation

The description follows the repository template and is substantive. It has a clear Problem section with a reproduction, a Change section that explains the longest-prefix environment resolution and why each caller resolves against all known environments, and a Verification section with a red-first failing test, a control case, and a passing run of five changed test files plus check:changed. The model and harness are named. Two gaps remain. The Scope and approval section links only 'Fixes #29701' and does not show a maintainer-approved triage or discussion, and the template asks for an explicit approval reference or an explanation of why the fix qualifies without one. The description also says the reproduction cites the same test that the objectives say was 'failed on main', which is consistent, so no conflict there. The Verification section reports 127/127 for five files, while the objectives report 93/93 for three files, which is a different scope and not a contradiction.

Resolution

Complete the 'Scope and approval' section. Link the triaged bug issue #29701 and state whether a maintainer approved the direction and scope, with the approval comment or discussion link. If no prior approval exists, explain why this small, focused fix of an obvious bug qualifies without one. Keep the existing verification details.

Finishing Touches

Generate docstrings

• Commit to this branch
• Create a new PR

Generate unit tests (beta)

• Commit to this branch
• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

CodeRabbit Verify

• Run CodeRabbit Verify to test the changes in this pull request.

Recent review info

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: fix/issue-29701
• File: .coderabbit.config.ts
• Commit: 3f8086c
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Team
• Run ID: abd3afa8-a893-4672-abb6-9272f287fd01

Commits

Reviewing files that changed from the base of the PR and between 7ea169e and 3f8086c.

Files selected for processing: 8

• apps/mobile/src/features/cloud/cloud-drafts.ts
• apps/mobile/src/lib/composerContextClipboard.test.ts
• apps/mobile/src/lib/composerContextClipboard.ts
• apps/mobile/src/state/composer-attachment-uploads.test.ts
• apps/mobile/src/state/composer-attachment-uploads.ts
• apps/mobile/src/state/threadOutboxDelivery.test.ts
• apps/mobile/src/state/use-composer-drafts.test.ts
• apps/mobile/src/state/use-composer-drafts.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 8 remain after this review.

[coderabbitai]

Additional comments: 1

apps/mobile/src/state/composer-attachment-uploads.ts-80-80: 1

80-80: Major · Security & Privacy · Heavy lift

Unverified finding
Verification ran but could not confirm this finding. It is shown for review, not as a verified issue.

Resolve draft ownership before filtering by connection.

If a:b is disconnected and a is connected, the draft key a:b:thread resolves to a. The worker then uploads the attachment to the wrong environment. Previously, the last-colon parser resolved this key to a:b and skipped the upload.

Using all environment IDs alone is not sufficient: a:b:thread:child can also belong to environment a and thread b:thread:child. Both IDs permit colons, and scoped keys concatenate them without escaping. (raw.githubusercontent.com)

Use authoritative draft ownership before filtering by connection. Do not guess when a legacy key is ambiguous.

---

Review info

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: fix/issue-29701
• File: .coderabbit.config.ts
• Commit: 7ea169e
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Team
• Run ID: be433ba1-35b0-4863-999e-ea7b3088f829

Commits

Reviewing files that changed from the base of the PR and between 71646e0 and 7ea169e.

Files selected for processing: 6

• apps/mobile/src/lib/composerAttachmentUploadQueue.test.ts
• apps/mobile/src/lib/composerAttachmentUploadQueue.ts
• apps/mobile/src/state/composer-attachment-uploads.test.ts
• apps/mobile/src/state/composer-attachment-uploads.ts
• apps/mobile/src/state/queued-edit-draft-key.ts
• apps/mobile/src/state/use-composer-drafts.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 5 remain after this review.