chore(upstream): sync marcode through e60821f0e0d8

[github-actions]

Automatic upstream detection produced a clean merge of pingdotgg/t3code@e60821f0e0d8.

field	value
target main	dc6a1ad283556386e9df1dbd19d0cdf06397d4cb
source main	e60821f0e0d82a5d671ca3b94719c49d333921c8
merge base	5192f777fe54c2a2a359f6c25ecf5fbde46d49b0
merge commit	e7c4cae99f00de6ca4c94f6748f147afe3b6873c
changed paths	19

Upstream commits

• e60821f0e0d8 feat: fold legacy models into separate menus (feat: fold legacy models into separate menus pingdotgg/t3code#5190) — Theo Browne (2026-08-02T00:45:05-07:00)
• 64bf0161919e fix(server): stop npx service updates from silently leaving the old server running (fix(server): stop npx service updates from silently leaving the old server running pingdotgg/t3code#5217) — Theo Browne (2026-08-01T22:42:39-07:00)

Hotspot matches by owner

• mobile (4)
  • apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
  • apps/mobile/src/features/threads/ThreadComposer.tsx
  • apps/mobile/src/lib/modelOptions.test.ts
  • apps/mobile/src/lib/modelOptions.ts
• server-runtime (2)
  • apps/server/src/cloud/bootService.test.ts
  • apps/server/src/cloud/bootService.ts
• provider-runtime (4)
  • apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
  • apps/server/src/provider/Layers/ClaudeProvider.ts
  • apps/server/src/provider/Layers/CodexProvider.test.ts
  • apps/server/src/provider/Layers/CodexProvider.ts

Coupled vendored-repo findings

• ok effect-version-subtree — source changed: false, companion changed: false
• ok alchemy-version-subtree — source changed: false, companion changed: false

Required checks on this pull request

• Check
• Test
• Mobile Native Static Analysis
• Release Smoke

Safety statement

No conflicts were auto-resolved. The bot never uses --force, reset, checkout --ours/--theirs,
or auto-merge. This is a normal two-parent merge commit whose tree was verified against a
non-mutating merge probe before it was pushed.

Manual verification checklist

• Hotspot paths reviewed: upstream intent and Marcode intent are both preserved.
• Coupled vendored subtrees reviewed when flagged.
• Web/mobile/desktop UI surfaces checked at 390px and 820px when UI hotspots changed.
• Provider-focused tests run when apps/server/src/provider/** changed.
• Branding asset checks run when asset paths changed.
• All required checks green before this leaves draft.

[maarco]

Verification update for PR #9

• Updated chore/upstream-e60821f0e0d8 onto current main; head is 09fab6acd928bd457874786be8187bb543ab05c9, with a clean two-parent merge of the current base.
• The PR diff remains the intended 19 files: legacy model metadata/contracts, provider/server handling, and web/mobile model-picker grouping.
• Marcode identity and compatibility identifiers remain unchanged. The affected fork hotspots are provider runtime, server boot runtime, mobile model options, and web model selection.
• Coupled Effect/Alchemy checks are clean; no vendored companion changes are required.
• Local verification passed: focused package typechecks for contracts/server/web/mobile, targeted lint, targeted formatting, and git diff --check.
• GitHub Actions run 31296492334 passed: Check, Test, Mobile Native Static Analysis, and Release Smoke. PR Size and PR Vouch also passed.
• Isolated web verification passed: the picker showed current models, exposed Legacy models (4 models) behind an explicit expansion, and successfully selected GPT-5.5.
• The local focused Vitest invocation still fails before collection with the existing vite-plus harness errors; CI Test is green.
• Mobile runtime verification is the remaining gate: this host has no available iOS Simulator device and no adb binary. Native static analysis passed, but a real mobile interaction was not claimed.
• PR chore(upstream): sync marcode through e60821f0e0d8 #9 is therefore intentionally left as draft. The later upstream source at ba9c9ae81dce4e554b4dd52abfd28d0c01b5c651 is a separate 41-conflict integration and is not being folded into this PR.

[github-actions]

Automatic upstream detection produced a clean merge of pingdotgg/t3code@e60821f0e0d8.

field	value
target main	dc6a1ad283556386e9df1dbd19d0cdf06397d4cb
source main	e60821f0e0d82a5d671ca3b94719c49d333921c8
merge base	5192f777fe54c2a2a359f6c25ecf5fbde46d49b0
merge commit	e7c4cae99f00de6ca4c94f6748f147afe3b6873c
changed paths	19

Upstream commits

• e60821f0e0d8 feat: fold legacy models into separate menus (feat: fold legacy models into separate menus pingdotgg/t3code#5190) — Theo Browne (2026-08-02T00:45:05-07:00)
• 64bf0161919e fix(server): stop npx service updates from silently leaving the old server running (fix(server): stop npx service updates from silently leaving the old server running pingdotgg/t3code#5217) — Theo Browne (2026-08-01T22:42:39-07:00)

Hotspot matches by owner

• mobile (4)
  • apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
  • apps/mobile/src/features/threads/ThreadComposer.tsx
  • apps/mobile/src/lib/modelOptions.test.ts
  • apps/mobile/src/lib/modelOptions.ts
• server-runtime (2)
  • apps/server/src/cloud/bootService.test.ts
  • apps/server/src/cloud/bootService.ts
• provider-runtime (4)
  • apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
  • apps/server/src/provider/Layers/ClaudeProvider.ts
  • apps/server/src/provider/Layers/CodexProvider.test.ts
  • apps/server/src/provider/Layers/CodexProvider.ts

Coupled vendored-repo findings

• ok effect-version-subtree — source changed: false, companion changed: false
• ok alchemy-version-subtree — source changed: false, companion changed: false

Required checks on this pull request

• Check
• Test
• Mobile Native Static Analysis
• Release Smoke

Safety statement

No conflicts were auto-resolved. The bot never uses --force, reset, checkout --ours/--theirs,
or auto-merge. This is a normal two-parent merge commit whose tree was verified against a
non-mutating merge probe before it was pushed.

Manual verification checklist

• Hotspot paths reviewed: upstream intent and Marcode intent are both preserved.
• Coupled vendored subtrees reviewed when flagged.
• Web/mobile/desktop UI surfaces checked at 390px and 820px when UI hotspots changed.
• Provider-focused tests run when apps/server/src/provider/** changed.
• Branding asset checks run when asset paths changed.
• All required checks green before this leaves draft.

[maarco]

Verification update for PR #9

• Updated chore/upstream-e60821f0e0d8 onto current main; head is 09fab6acd928bd457874786be8187bb543ab05c9, with a clean two-parent merge of the current base.
• The PR diff remains the intended 19 files: legacy model metadata/contracts, provider/server handling, and web/mobile model-picker grouping.
• Marcode identity and compatibility identifiers remain unchanged. The affected fork hotspots are provider runtime, server boot runtime, mobile model options, and web model selection.
• Coupled Effect/Alchemy checks are clean; no vendored companion changes are required.
• Local verification passed: focused package typechecks for contracts/server/web/mobile, targeted lint, targeted formatting, and git diff --check.
• GitHub Actions run 31296492334 passed: Check, Test, Mobile Native Static Analysis, and Release Smoke. PR Size and PR Vouch also passed.
• Isolated web verification passed: the picker showed current models, exposed Legacy models (4 models) behind an explicit expansion, and successfully selected GPT-5.5.
• The local focused Vitest invocation still fails before collection with the existing vite-plus harness errors; CI Test is green.
• Mobile runtime verification is the remaining gate: this host has no available iOS Simulator device and no adb binary. Native static analysis passed, but a real mobile interaction was not claimed.
• PR chore(upstream): sync marcode through e60821f0e0d8 #9 is therefore intentionally left as draft. The later upstream source at ba9c9ae81dce4e554b4dd52abfd28d0c01b5c651 is a separate 41-conflict integration and is not being folded into this PR.

[github-actions]

Automatic upstream detection produced a clean merge of pingdotgg/t3code@e60821f0e0d8.

field	value
target main	dc6a1ad283556386e9df1dbd19d0cdf06397d4cb
source main	e60821f0e0d82a5d671ca3b94719c49d333921c8
merge base	5192f777fe54c2a2a359f6c25ecf5fbde46d49b0
merge commit	e7c4cae99f00de6ca4c94f6748f147afe3b6873c
changed paths	19

Upstream commits

• e60821f0e0d8 feat: fold legacy models into separate menus (feat: fold legacy models into separate menus pingdotgg/t3code#5190) — Theo Browne (2026-08-02T00:45:05-07:00)
• 64bf0161919e fix(server): stop npx service updates from silently leaving the old server running (fix(server): stop npx service updates from silently leaving the old server running pingdotgg/t3code#5217) — Theo Browne (2026-08-01T22:42:39-07:00)

Hotspot matches by owner

• mobile (4)
  • apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
  • apps/mobile/src/features/threads/ThreadComposer.tsx
  • apps/mobile/src/lib/modelOptions.test.ts
  • apps/mobile/src/lib/modelOptions.ts
• server-runtime (2)
  • apps/server/src/cloud/bootService.test.ts
  • apps/server/src/cloud/bootService.ts
• provider-runtime (4)
  • apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
  • apps/server/src/provider/Layers/ClaudeProvider.ts
  • apps/server/src/provider/Layers/CodexProvider.test.ts
  • apps/server/src/provider/Layers/CodexProvider.ts

Coupled vendored-repo findings

• ok effect-version-subtree — source changed: false, companion changed: false
• ok alchemy-version-subtree — source changed: false, companion changed: false

Required checks on this pull request

• Check
• Test
• Mobile Native Static Analysis
• Release Smoke

Safety statement

No conflicts were auto-resolved. The bot never uses --force, reset, checkout --ours/--theirs,
or auto-merge. This is a normal two-parent merge commit whose tree was verified against a
non-mutating merge probe before it was pushed.

Manual verification checklist

• Hotspot paths reviewed: upstream intent and Marcode intent are both preserved.
• Coupled vendored subtrees reviewed when flagged.
• Web/mobile/desktop UI surfaces checked at 390px and 820px when UI hotspots changed.
• Provider-focused tests run when apps/server/src/provider/** changed.
• Branding asset checks run when asset paths changed.
• All required checks green before this leaves draft.

[maarco]

Verification update for PR #9

• Updated chore/upstream-e60821f0e0d8 onto current main; head is 09fab6acd928bd457874786be8187bb543ab05c9, with a clean two-parent merge of the current base.
• The PR diff remains the intended 19 files: legacy model metadata/contracts, provider/server handling, and web/mobile model-picker grouping.
• Marcode identity and compatibility identifiers remain unchanged. The affected fork hotspots are provider runtime, server boot runtime, mobile model options, and web model selection.
• Coupled Effect/Alchemy checks are clean; no vendored companion changes are required.
• Local verification passed: focused package typechecks for contracts/server/web/mobile, targeted lint, targeted formatting, and git diff --check.
• GitHub Actions run 31296492334 passed: Check, Test, Mobile Native Static Analysis, and Release Smoke. PR Size and PR Vouch also passed.
• Isolated web verification passed: the picker showed current models, exposed Legacy models (4 models) behind an explicit expansion, and successfully selected GPT-5.5.
• The local focused Vitest invocation still fails before collection with the existing vite-plus harness errors; CI Test is green.
• Mobile runtime verification is the remaining gate: this host has no available iOS Simulator device and no adb binary. Native static analysis passed, but a real mobile interaction was not claimed.
• PR chore(upstream): sync marcode through e60821f0e0d8 #9 is therefore intentionally left as draft. The later upstream source at ba9c9ae81dce4e554b4dd52abfd28d0c01b5c651 is a separate 41-conflict integration and is not being folded into this PR.

[github-actions]

Automatic upstream detection produced a clean merge of pingdotgg/t3code@e60821f0e0d8.

field	value
target main	dc6a1ad283556386e9df1dbd19d0cdf06397d4cb
source main	e60821f0e0d82a5d671ca3b94719c49d333921c8
merge base	5192f777fe54c2a2a359f6c25ecf5fbde46d49b0
merge commit	e7c4cae99f00de6ca4c94f6748f147afe3b6873c
changed paths	19

Upstream commits

• e60821f0e0d8 feat: fold legacy models into separate menus (feat: fold legacy models into separate menus pingdotgg/t3code#5190) — Theo Browne (2026-08-02T00:45:05-07:00)
• 64bf0161919e fix(server): stop npx service updates from silently leaving the old server running (fix(server): stop npx service updates from silently leaving the old server running pingdotgg/t3code#5217) — Theo Browne (2026-08-01T22:42:39-07:00)

Hotspot matches by owner

• mobile (4)
  • apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
  • apps/mobile/src/features/threads/ThreadComposer.tsx
  • apps/mobile/src/lib/modelOptions.test.ts
  • apps/mobile/src/lib/modelOptions.ts
• server-runtime (2)
  • apps/server/src/cloud/bootService.test.ts
  • apps/server/src/cloud/bootService.ts
• provider-runtime (4)
  • apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
  • apps/server/src/provider/Layers/ClaudeProvider.ts
  • apps/server/src/provider/Layers/CodexProvider.test.ts
  • apps/server/src/provider/Layers/CodexProvider.ts

Coupled vendored-repo findings

• ok effect-version-subtree — source changed: false, companion changed: false
• ok alchemy-version-subtree — source changed: false, companion changed: false

Required checks on this pull request

• Check
• Test
• Mobile Native Static Analysis
• Release Smoke

Safety statement

No conflicts were auto-resolved. The bot never uses --force, reset, checkout --ours/--theirs,
or auto-merge. This is a normal two-parent merge commit whose tree was verified against a
non-mutating merge probe before it was pushed.

Manual verification checklist

• Hotspot paths reviewed: upstream intent and Marcode intent are both preserved.
• Coupled vendored subtrees reviewed when flagged.
• Web/mobile/desktop UI surfaces checked at 390px and 820px when UI hotspots changed.
• Provider-focused tests run when apps/server/src/provider/** changed.
• Branding asset checks run when asset paths changed.
• All required checks green before this leaves draft.

[maarco]

Verification update for PR #9

• Updated chore/upstream-e60821f0e0d8 onto current main; head is 09fab6acd928bd457874786be8187bb543ab05c9, with a clean two-parent merge of the current base.
• The PR diff remains the intended 19 files: legacy model metadata/contracts, provider/server handling, and web/mobile model-picker grouping.
• Marcode identity and compatibility identifiers remain unchanged. The affected fork hotspots are provider runtime, server boot runtime, mobile model options, and web model selection.
• Coupled Effect/Alchemy checks are clean; no vendored companion changes are required.
• Local verification passed: focused package typechecks for contracts/server/web/mobile, targeted lint, targeted formatting, and git diff --check.
• GitHub Actions run 31296492334 passed: Check, Test, Mobile Native Static Analysis, and Release Smoke. PR Size and PR Vouch also passed.
• Isolated web verification passed: the picker showed current models, exposed Legacy models (4 models) behind an explicit expansion, and successfully selected GPT-5.5.
• The local focused Vitest invocation still fails before collection with the existing vite-plus harness errors; CI Test is green.
• Mobile runtime verification is the remaining gate: this host has no available iOS Simulator device and no adb binary. Native static analysis passed, but a real mobile interaction was not claimed.
• PR chore(upstream): sync marcode through e60821f0e0d8 #9 is therefore intentionally left as draft. The later upstream source at ba9c9ae81dce4e554b4dd52abfd28d0c01b5c651 is a separate 41-conflict integration and is not being folded into this PR.

[github-actions]

Automatic upstream detection produced a clean merge of pingdotgg/t3code@e60821f0e0d8.

field	value
target main	dc6a1ad283556386e9df1dbd19d0cdf06397d4cb
source main	e60821f0e0d82a5d671ca3b94719c49d333921c8
merge base	5192f777fe54c2a2a359f6c25ecf5fbde46d49b0
merge commit	e7c4cae99f00de6ca4c94f6748f147afe3b6873c
changed paths	19

Upstream commits

• e60821f0e0d8 feat: fold legacy models into separate menus (feat: fold legacy models into separate menus pingdotgg/t3code#5190) — Theo Browne (2026-08-02T00:45:05-07:00)
• 64bf0161919e fix(server): stop npx service updates from silently leaving the old server running (fix(server): stop npx service updates from silently leaving the old server running pingdotgg/t3code#5217) — Theo Browne (2026-08-01T22:42:39-07:00)

Hotspot matches by owner

• mobile (4)
  • apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
  • apps/mobile/src/features/threads/ThreadComposer.tsx
  • apps/mobile/src/lib/modelOptions.test.ts
  • apps/mobile/src/lib/modelOptions.ts
• server-runtime (2)
  • apps/server/src/cloud/bootService.test.ts
  • apps/server/src/cloud/bootService.ts
• provider-runtime (4)
  • apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
  • apps/server/src/provider/Layers/ClaudeProvider.ts
  • apps/server/src/provider/Layers/CodexProvider.test.ts
  • apps/server/src/provider/Layers/CodexProvider.ts

Coupled vendored-repo findings

• ok effect-version-subtree — source changed: false, companion changed: false
• ok alchemy-version-subtree — source changed: false, companion changed: false

Required checks on this pull request

• Check
• Test
• Mobile Native Static Analysis
• Release Smoke

Safety statement

No conflicts were auto-resolved. The bot never uses --force, reset, checkout --ours/--theirs,
or auto-merge. This is a normal two-parent merge commit whose tree was verified against a
non-mutating merge probe before it was pushed.

Manual verification checklist

• Hotspot paths reviewed: upstream intent and Marcode intent are both preserved.
• Coupled vendored subtrees reviewed when flagged.
• Web/mobile/desktop UI surfaces checked at 390px and 820px when UI hotspots changed.
• Provider-focused tests run when apps/server/src/provider/** changed.
• Branding asset checks run when asset paths changed.
• All required checks green before this leaves draft.

[maarco]

Verification update for PR #9

• Updated chore/upstream-e60821f0e0d8 onto current main; head is 09fab6acd928bd457874786be8187bb543ab05c9, with a clean two-parent merge of the current base.
• The PR diff remains the intended 19 files: legacy model metadata/contracts, provider/server handling, and web/mobile model-picker grouping.
• Marcode identity and compatibility identifiers remain unchanged. The affected fork hotspots are provider runtime, server boot runtime, mobile model options, and web model selection.
• Coupled Effect/Alchemy checks are clean; no vendored companion changes are required.
• Local verification passed: focused package typechecks for contracts/server/web/mobile, targeted lint, targeted formatting, and git diff --check.
• GitHub Actions run 31296492334 passed: Check, Test, Mobile Native Static Analysis, and Release Smoke. PR Size and PR Vouch also passed.
• Isolated web verification passed: the picker showed current models, exposed Legacy models (4 models) behind an explicit expansion, and successfully selected GPT-5.5.
• The local focused Vitest invocation still fails before collection with the existing vite-plus harness errors; CI Test is green.
• Mobile runtime verification is the remaining gate: this host has no available iOS Simulator device and no adb binary. Native static analysis passed, but a real mobile interaction was not claimed.
• PR chore(upstream): sync marcode through e60821f0e0d8 #9 is therefore intentionally left as draft. The later upstream source at ba9c9ae81dce4e554b4dd52abfd28d0c01b5c651 is a separate 41-conflict integration and is not being folded into this PR.

[github-actions]

Automatic upstream detection produced a clean merge of pingdotgg/t3code@e60821f0e0d8.

field	value
target main	dc6a1ad283556386e9df1dbd19d0cdf06397d4cb
source main	e60821f0e0d82a5d671ca3b94719c49d333921c8
merge base	5192f777fe54c2a2a359f6c25ecf5fbde46d49b0
merge commit	e7c4cae99f00de6ca4c94f6748f147afe3b6873c
changed paths	19

Upstream commits

• e60821f0e0d8 feat: fold legacy models into separate menus (feat: fold legacy models into separate menus pingdotgg/t3code#5190) — Theo Browne (2026-08-02T00:45:05-07:00)
• 64bf0161919e fix(server): stop npx service updates from silently leaving the old server running (fix(server): stop npx service updates from silently leaving the old server running pingdotgg/t3code#5217) — Theo Browne (2026-08-01T22:42:39-07:00)

Hotspot matches by owner

• mobile (4)
  • apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
  • apps/mobile/src/features/threads/ThreadComposer.tsx
  • apps/mobile/src/lib/modelOptions.test.ts
  • apps/mobile/src/lib/modelOptions.ts
• server-runtime (2)
  • apps/server/src/cloud/bootService.test.ts
  • apps/server/src/cloud/bootService.ts
• provider-runtime (4)
  • apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
  • apps/server/src/provider/Layers/ClaudeProvider.ts
  • apps/server/src/provider/Layers/CodexProvider.test.ts
  • apps/server/src/provider/Layers/CodexProvider.ts

Coupled vendored-repo findings

• ok effect-version-subtree — source changed: false, companion changed: false
• ok alchemy-version-subtree — source changed: false, companion changed: false

Required checks on this pull request

• Check
• Test
• Mobile Native Static Analysis
• Release Smoke

Safety statement

No conflicts were auto-resolved. The bot never uses --force, reset, checkout --ours/--theirs,
or auto-merge. This is a normal two-parent merge commit whose tree was verified against a
non-mutating merge probe before it was pushed.

Manual verification checklist

• Hotspot paths reviewed: upstream intent and Marcode intent are both preserved.
• Coupled vendored subtrees reviewed when flagged.
• Web/mobile/desktop UI surfaces checked at 390px and 820px when UI hotspots changed.
• Provider-focused tests run when apps/server/src/provider/** changed.
• Branding asset checks run when asset paths changed.
• All required checks green before this leaves draft.

[maarco]

Verification update for PR #9

• Updated chore/upstream-e60821f0e0d8 onto current main; head is 09fab6acd928bd457874786be8187bb543ab05c9, with a clean two-parent merge of the current base.
• The PR diff remains the intended 19 files: legacy model metadata/contracts, provider/server handling, and web/mobile model-picker grouping.
• Marcode identity and compatibility identifiers remain unchanged. The affected fork hotspots are provider runtime, server boot runtime, mobile model options, and web model selection.
• Coupled Effect/Alchemy checks are clean; no vendored companion changes are required.
• Local verification passed: focused package typechecks for contracts/server/web/mobile, targeted lint, targeted formatting, and git diff --check.
• GitHub Actions run 31296492334 passed: Check, Test, Mobile Native Static Analysis, and Release Smoke. PR Size and PR Vouch also passed.
• Isolated web verification passed: the picker showed current models, exposed Legacy models (4 models) behind an explicit expansion, and successfully selected GPT-5.5.
• The local focused Vitest invocation still fails before collection with the existing vite-plus harness errors; CI Test is green.
• Mobile runtime verification is the remaining gate: this host has no available iOS Simulator device and no adb binary. Native static analysis passed, but a real mobile interaction was not claimed.
• PR chore(upstream): sync marcode through e60821f0e0d8 #9 is therefore intentionally left as draft. The later upstream source at ba9c9ae81dce4e554b4dd52abfd28d0c01b5c651 is a separate 41-conflict integration and is not being folded into this PR.

[github-actions]

Automatic upstream detection produced a clean merge of pingdotgg/t3code@e60821f0e0d8.

field	value
target main	dc6a1ad283556386e9df1dbd19d0cdf06397d4cb
source main	e60821f0e0d82a5d671ca3b94719c49d333921c8
merge base	5192f777fe54c2a2a359f6c25ecf5fbde46d49b0
merge commit	e7c4cae99f00de6ca4c94f6748f147afe3b6873c
changed paths	19

Upstream commits

• e60821f0e0d8 feat: fold legacy models into separate menus (feat: fold legacy models into separate menus pingdotgg/t3code#5190) — Theo Browne (2026-08-02T00:45:05-07:00)
• 64bf0161919e fix(server): stop npx service updates from silently leaving the old server running (fix(server): stop npx service updates from silently leaving the old server running pingdotgg/t3code#5217) — Theo Browne (2026-08-01T22:42:39-07:00)

Hotspot matches by owner

• mobile (4)
  • apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
  • apps/mobile/src/features/threads/ThreadComposer.tsx
  • apps/mobile/src/lib/modelOptions.test.ts
  • apps/mobile/src/lib/modelOptions.ts
• server-runtime (2)
  • apps/server/src/cloud/bootService.test.ts
  • apps/server/src/cloud/bootService.ts
• provider-runtime (4)
  • apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
  • apps/server/src/provider/Layers/ClaudeProvider.ts
  • apps/server/src/provider/Layers/CodexProvider.test.ts
  • apps/server/src/provider/Layers/CodexProvider.ts

Coupled vendored-repo findings

• ok effect-version-subtree — source changed: false, companion changed: false
• ok alchemy-version-subtree — source changed: false, companion changed: false

Required checks on this pull request

• Check
• Test
• Mobile Native Static Analysis
• Release Smoke

Safety statement

No conflicts were auto-resolved. The bot never uses --force, reset, checkout --ours/--theirs,
or auto-merge. This is a normal two-parent merge commit whose tree was verified against a
non-mutating merge probe before it was pushed.

Manual verification checklist

• Hotspot paths reviewed: upstream intent and Marcode intent are both preserved.
• Coupled vendored subtrees reviewed when flagged.
• Web/mobile/desktop UI surfaces checked at 390px and 820px when UI hotspots changed.
• Provider-focused tests run when apps/server/src/provider/** changed.
• Branding asset checks run when asset paths changed.
• All required checks green before this leaves draft.

[maarco]

Verification update for PR #9

• Updated chore/upstream-e60821f0e0d8 onto current main; head is 09fab6acd928bd457874786be8187bb543ab05c9, with a clean two-parent merge of the current base.
• The PR diff remains the intended 19 files: legacy model metadata/contracts, provider/server handling, and web/mobile model-picker grouping.
• Marcode identity and compatibility identifiers remain unchanged. The affected fork hotspots are provider runtime, server boot runtime, mobile model options, and web model selection.
• Coupled Effect/Alchemy checks are clean; no vendored companion changes are required.
• Local verification passed: focused package typechecks for contracts/server/web/mobile, targeted lint, targeted formatting, and git diff --check.
• GitHub Actions run 31296492334 passed: Check, Test, Mobile Native Static Analysis, and Release Smoke. PR Size and PR Vouch also passed.
• Isolated web verification passed: the picker showed current models, exposed Legacy models (4 models) behind an explicit expansion, and successfully selected GPT-5.5.
• The local focused Vitest invocation still fails before collection with the existing vite-plus harness errors; CI Test is green.
• Mobile runtime verification is the remaining gate: this host has no available iOS Simulator device and no adb binary. Native static analysis passed, but a real mobile interaction was not claimed.
• PR chore(upstream): sync marcode through e60821f0e0d8 #9 is therefore intentionally left as draft. The later upstream source at ba9c9ae81dce4e554b4dd52abfd28d0c01b5c651 is a separate 41-conflict integration and is not being folded into this PR.

[github-actions]

Automatic upstream detection produced a clean merge of pingdotgg/t3code@e60821f0e0d8.

field	value
target main	dc6a1ad283556386e9df1dbd19d0cdf06397d4cb
source main	e60821f0e0d82a5d671ca3b94719c49d333921c8
merge base	5192f777fe54c2a2a359f6c25ecf5fbde46d49b0
merge commit	e7c4cae99f00de6ca4c94f6748f147afe3b6873c
changed paths	19

Upstream commits

• e60821f0e0d8 feat: fold legacy models into separate menus (feat: fold legacy models into separate menus pingdotgg/t3code#5190) — Theo Browne (2026-08-02T00:45:05-07:00)
• 64bf0161919e fix(server): stop npx service updates from silently leaving the old server running (fix(server): stop npx service updates from silently leaving the old server running pingdotgg/t3code#5217) — Theo Browne (2026-08-01T22:42:39-07:00)

Hotspot matches by owner

• mobile (4)
  • apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
  • apps/mobile/src/features/threads/ThreadComposer.tsx
  • apps/mobile/src/lib/modelOptions.test.ts
  • apps/mobile/src/lib/modelOptions.ts
• server-runtime (2)
  • apps/server/src/cloud/bootService.test.ts
  • apps/server/src/cloud/bootService.ts
• provider-runtime (4)
  • apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
  • apps/server/src/provider/Layers/ClaudeProvider.ts
  • apps/server/src/provider/Layers/CodexProvider.test.ts
  • apps/server/src/provider/Layers/CodexProvider.ts

Coupled vendored-repo findings

• ok effect-version-subtree — source changed: false, companion changed: false
• ok alchemy-version-subtree — source changed: false, companion changed: false

Required checks on this pull request

• Check
• Test
• Mobile Native Static Analysis
• Release Smoke

Safety statement

No conflicts were auto-resolved. The bot never uses --force, reset, checkout --ours/--theirs,
or auto-merge. This is a normal two-parent merge commit whose tree was verified against a
non-mutating merge probe before it was pushed.

Manual verification checklist

• Hotspot paths reviewed: upstream intent and Marcode intent are both preserved.
• Coupled vendored subtrees reviewed when flagged.
• Web/mobile/desktop UI surfaces checked at 390px and 820px when UI hotspots changed.
• Provider-focused tests run when apps/server/src/provider/** changed.
• Branding asset checks run when asset paths changed.
• All required checks green before this leaves draft.

[maarco]

Verification update for PR #9

• Updated chore/upstream-e60821f0e0d8 onto current main; head is 09fab6acd928bd457874786be8187bb543ab05c9, with a clean two-parent merge of the current base.
• The PR diff remains the intended 19 files: legacy model metadata/contracts, provider/server handling, and web/mobile model-picker grouping.
• Marcode identity and compatibility identifiers remain unchanged. The affected fork hotspots are provider runtime, server boot runtime, mobile model options, and web model selection.
• Coupled Effect/Alchemy checks are clean; no vendored companion changes are required.
• Local verification passed: focused package typechecks for contracts/server/web/mobile, targeted lint, targeted formatting, and git diff --check.
• GitHub Actions run 31296492334 passed: Check, Test, Mobile Native Static Analysis, and Release Smoke. PR Size and PR Vouch also passed.
• Isolated web verification passed: the picker showed current models, exposed Legacy models (4 models) behind an explicit expansion, and successfully selected GPT-5.5.
• The local focused Vitest invocation still fails before collection with the existing vite-plus harness errors; CI Test is green.
• Mobile runtime verification is the remaining gate: this host has no available iOS Simulator device and no adb binary. Native static analysis passed, but a real mobile interaction was not claimed.
• PR chore(upstream): sync marcode through e60821f0e0d8 #9 is therefore intentionally left as draft. The later upstream source at ba9c9ae81dce4e554b4dd52abfd28d0c01b5c651 is a separate 41-conflict integration and is not being folded into this PR.