[5/5] fix(mobile): enable environments from the composer

[DominicVonk]

Problem

The composer status pill is already tappable, but it always dispatches a retry. In the red environment is not connected state shown for an available environment, the supervisor's desired state is false. Retrying cannot activate that environment, so tapping the pill appears to do nothing.

Solution

Choose the action from the typed connection phase and authoritative activation state:

• disabled environments dispatch setEnabled(environmentId, true);
• enabled offline, connecting, reconnecting, connected-syncing, and error states keep the existing retry behavior;
• a missing route environment remains a no-op.

Activation is projected from the supervisor's desired flag rather than inferred from transient connection phase. The decision remains isolated in a small typed helper, and activation still flows through the shared environment registry and supervisor.

User impact

Tapping the red status pill directly enables and reconnects a disabled environment for the open thread. Users no longer need to leave the conversation and find the environment toggle in Settings.

Stack

This PR is 5/5. Depends on layers 1–4, ending with 4/5, #5596.

Please review and merge the upstream PRs in order from 1 through 5. Because this repository does not have native stacked PRs enabled and cross-fork branches cannot be upstream base refs, the upstream diffs are cumulative. The corresponding fork PRs use the true dependent bases and provide the clean per-layer diffs.

Layer	Upstream PR	Clean stacked diff
1	#5597 — network-status recovery	fork #1
2	#5600 — persistent environment activation	fork #2
3	#5598 — environment-management UI	fork #3
4	#5596 — pasted pairing-link parsing	fork #4
5	#5599 — composer-pill activation	fork #5

Validation

apps/mobile
Test Files 1 passed (1)
Tests 2 passed (2)
tsc --noEmit: passed
Physical iPhone
Signed development app installed: passed
Application launch through devicectl: passed
Updated Metro bundle loaded: passed

The focused test verifies that a disabled environment enables while enabled connection states retry. Integrated stack validation after rebasing onto latest upstream main: 14 test files passed with 124 tests; client-runtime, web, and mobile typechecks passed.

UI evidence

Before: disabled environment	After: tap enables and reconnects

The after screenshot was captured on an iOS Simulator against disposable state. Tapping the red composer status pill enabled the saved environment; the disconnected placeholder and pill disappeared, and the thread became available without leaving the conversation.

Latest review pass

The underlying activation runtime now survives transient startup reconciliation failures, serializes registration with startup, clears stale disabled state on re-pair/platform restoration, and initializes presentation from authoritative desired state. Cloud switches disable without deleting registrations, and editing a disabled bearer environment preserves its activation state. The composer intentionally remains a no-op when its route environment no longer exists.

Latest integrated verification: client-runtime 47 test files / 598 tests passed; mobile 100 test files / 622 tests passed; client-runtime, web, and mobile typechecks passed.

Final review pass

The dependent runtime now updates registrations atomically while preserving activation, avoids transient connections for disabled edits, serializes activation controls with Save, and presents disabled environments without stale failures. The composer intentionally remains a no-op when its route environment no longer exists.

Latest verification: client-runtime 47 test files / 599 tests passed; mobile 100 test files / 622 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed. The Fallow new-only audit gate passed.

Rebased onto upstream main at 5661c6116 on 2026-08-07. Post-rebase verification: client-runtime 47 test files / 603 tests passed; mobile 100 test files / 624 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed.

Model: GPT-5; harness: Codex.

---

Note

Medium Risk
Changes connection catalog persistence, registry startup/reconciliation, and supervisor desired-state behavior across mobile, web, and desktop; incorrect activation handling could leave environments disconnected or fail startup until retry.

Overview
Adds persistent enable/disable for saved environments via disabledEnvironmentIds in the connection catalog and a ConnectionActivationStore on mobile, web, and desktop. Toggling off disconnects without removing the registration; presentation and workspace models now expose enabled separately from connection phase.

Mobile & web UI wire activation through EnvironmentActivationSwitch / settings edit dialogs (including bearer label/URL updates on web). Cloud rows use enable + retry instead of connect/disconnect semantics, with disabled environments shown as "Disabled" without stale error UI.

Thread composer (mobile): the status pill calls setEnabled(true) when the route environment is disabled (threadEnvironmentActivationAction), and keeps retry when already enabled—fixing taps that previously no-op’d because the supervisor had desired: false.

Runtime: registry startup retries on init failure; bearer profile updates go through updateRegistration; Connectivity.followNetworkStatus refreshes status on app wake with revision-safe application. Pairing forms gain parsePairingFields for pasted full URLs on blur/submit.

^{Reviewed by Cursor Bugbot for commit 3708623. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Enable environment activation toggling from the composer and settings UI

• Adds a disabledEnvironmentIds field to the connection catalog document and a new ConnectionActivationStore persistence service to list, set, and reconcile per-environment enabled state across web, mobile, and desktop.
• Extends EnvironmentRegistry with setEnabled and updateRegistration APIs; toggling enabled state connects or disconnects the supervisor immediately and is persisted atomically under an activation lock.
• Startup now reconciles persisted activation state against known environments and retries with exponential backoff on failure.
• Adds UI controls on mobile (ConnectionEnvironmentRow, CloudEnvironmentRowShell, EnvironmentActivationSwitch) and web (ConnectionsSettings) to enable/disable environments; disabled environments show an 'Enable' button and suppress connection errors.
• Replaces direct connectivity.changes subscriptions with followNetworkStatus, which serializes wakeup-driven refreshes and deduplicates redundant status applications in RelayEnvironmentDiscovery, EnvironmentSupervisor, and the registry.
• Risk: start on EnvironmentRegistry can now fail with a ConnectionPersistenceError due to activation store operations; callers that previously assumed a non-failing start will need to handle this.

^{Macroscope summarized 3708623.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: ccd4ff46-8269-43eb-94eb-0c0425948e15

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

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[DominicVonk]

Clean per-layer diff in the native fork stack: DominicVonk#5 (fork stack #6). This upstream draft remains the contribution discussion and review target.

[macroscopeapp]

Effect service conventions review: one issue found. In apps/mobile/src/connection/storage.ts the ConnectionPersistenceErroroperation labels were shifted when the new activation operations were introduced, so each store now reports a failure under the wrong operation. The equivalent code in apps/web/src/connection/storage.ts labels these correctly, which makes the mobile mapping the outlier. Everything else (the new ConnectionActivationStore tag, the registry setEnabled operation, the new environment-catalog:set-enabled command, and the followNetworkStatus helper whose dependencies are still acquired via yield* in each caller's make) matches the conventions.

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

Approvability

Verdict: Needs human review

2 blocking correctness issues found. This PR introduces a new feature allowing users to enable/disable environments from the mobile composer and settings UI. New user-facing capabilities with new components and state management warrant human review. Additionally, open review comments identify bugs in the activation switch (pending state not cleared on success) and edit dialog (silently enables disabled environments).

^{You can customize Macroscope's approvability policy. Learn more.}

[macroscopeapp]

🟡 Mediumsettings/ConnectionsSettings.tsx:1437

handleSave calls onUpdate to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches EnvironmentRegistry.register, which unconditionally calls activation.setEnabled(environmentId, true) and installs the entry with initiallyDesired: true, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/web/src/components/settings/ConnectionsSettings.tsx around line 1437:
`handleSave` calls `onUpdate` to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches `EnvironmentRegistry.register`, which unconditionally calls `activation.setEnabled(environmentId, true)` and installs the entry with `initiallyDesired: true`, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[macroscopeapp]

Effect service conventions: one issue found — newly added Effect.catchTag usages in packages/client-runtime/src/connection/onboarding.ts should use Effect.catchTags({ ... }).

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

🟡 Mediumconnection/EnvironmentActivationSwitch.tsx:27

A successful toggle leaves pending set indefinitely, so if props.enabled later cycles back to the request's previous value, the switch re-enters a phantom pending state: isPending becomes true, the switch displays the stale requested value, and disables itself even though no request is in flight. The success path only clears pending on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

 const result = await props.onValueChange(enabled);
- if (!AsyncResult.isSuccess(result)) {+ if (AsyncResult.isSuccess(result)) {+ setPending((current) => (current === request ? null : current));+ } else {
setPending((current) => (current === request ? null : current));
}

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/mobile/src/features/connection/EnvironmentActivationSwitch.tsx around lines 27-30:
A successful toggle leaves `pending` set indefinitely, so if `props.enabled` later cycles back to the request's `previous` value, the switch re-enters a phantom pending state: `isPending` becomes `true`, the switch displays the stale `requested` value, and disables itself even though no request is in flight. The success path only clears `pending` on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

[DominicVonk]

Superseded by #5598. The composer enable action now ships with the durable activation model and management UI in one independently mergeable PR based directly on main.

[DominicVonk]

Problem

The composer status pill is already tappable, but it always dispatches a retry. In the red environment is not connected state shown for an available environment, the supervisor's desired state is false. Retrying cannot activate that environment, so tapping the pill appears to do nothing.

Solution

Choose the action from the typed connection phase and authoritative activation state:

• disabled environments dispatch setEnabled(environmentId, true);
• enabled offline, connecting, reconnecting, connected-syncing, and error states keep the existing retry behavior;
• a missing route environment remains a no-op.

Activation is projected from the supervisor's desired flag rather than inferred from transient connection phase. The decision remains isolated in a small typed helper, and activation still flows through the shared environment registry and supervisor.

User impact

Tapping the red status pill directly enables and reconnects a disabled environment for the open thread. Users no longer need to leave the conversation and find the environment toggle in Settings.

Stack

This PR is 5/5. Depends on layers 1–4, ending with 4/5, #5596.

Please review and merge the upstream PRs in order from 1 through 5. Because this repository does not have native stacked PRs enabled and cross-fork branches cannot be upstream base refs, the upstream diffs are cumulative. The corresponding fork PRs use the true dependent bases and provide the clean per-layer diffs.

Layer	Upstream PR	Clean stacked diff
1	#5597 — network-status recovery	fork #1
2	#5600 — persistent environment activation	fork #2
3	#5598 — environment-management UI	fork #3
4	#5596 — pasted pairing-link parsing	fork #4
5	#5599 — composer-pill activation	fork #5

Validation

apps/mobile
Test Files 1 passed (1)
Tests 2 passed (2)
tsc --noEmit: passed
Physical iPhone
Signed development app installed: passed
Application launch through devicectl: passed
Updated Metro bundle loaded: passed

The focused test verifies that a disabled environment enables while enabled connection states retry. Integrated stack validation after rebasing onto latest upstream main: 14 test files passed with 124 tests; client-runtime, web, and mobile typechecks passed.

UI evidence

Before: disabled environment	After: tap enables and reconnects

The after screenshot was captured on an iOS Simulator against disposable state. Tapping the red composer status pill enabled the saved environment; the disconnected placeholder and pill disappeared, and the thread became available without leaving the conversation.

Latest review pass

The underlying activation runtime now survives transient startup reconciliation failures, serializes registration with startup, clears stale disabled state on re-pair/platform restoration, and initializes presentation from authoritative desired state. Cloud switches disable without deleting registrations, and editing a disabled bearer environment preserves its activation state. The composer intentionally remains a no-op when its route environment no longer exists.

Latest integrated verification: client-runtime 47 test files / 598 tests passed; mobile 100 test files / 622 tests passed; client-runtime, web, and mobile typechecks passed.

Final review pass

The dependent runtime now updates registrations atomically while preserving activation, avoids transient connections for disabled edits, serializes activation controls with Save, and presents disabled environments without stale failures. The composer intentionally remains a no-op when its route environment no longer exists.

Latest verification: client-runtime 47 test files / 599 tests passed; mobile 100 test files / 622 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed. The Fallow new-only audit gate passed.

Rebased onto upstream main at 5661c6116 on 2026-08-07. Post-rebase verification: client-runtime 47 test files / 603 tests passed; mobile 100 test files / 624 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed.

Model: GPT-5; harness: Codex.

---

Note

Medium Risk
Changes connection catalog persistence, registry startup/reconciliation, and supervisor desired-state behavior across mobile, web, and desktop; incorrect activation handling could leave environments disconnected or fail startup until retry.

Overview
Adds persistent enable/disable for saved environments via disabledEnvironmentIds in the connection catalog and a ConnectionActivationStore on mobile, web, and desktop. Toggling off disconnects without removing the registration; presentation and workspace models now expose enabled separately from connection phase.

Mobile & web UI wire activation through EnvironmentActivationSwitch / settings edit dialogs (including bearer label/URL updates on web). Cloud rows use enable + retry instead of connect/disconnect semantics, with disabled environments shown as "Disabled" without stale error UI.

Thread composer (mobile): the status pill calls setEnabled(true) when the route environment is disabled (threadEnvironmentActivationAction), and keeps retry when already enabled—fixing taps that previously no-op’d because the supervisor had desired: false.

Runtime: registry startup retries on init failure; bearer profile updates go through updateRegistration; Connectivity.followNetworkStatus refreshes status on app wake with revision-safe application. Pairing forms gain parsePairingFields for pasted full URLs on blur/submit.

^{Reviewed by Cursor Bugbot for commit 3708623. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Enable environment activation toggling from the composer and settings UI

• Adds a disabledEnvironmentIds field to the connection catalog document and a new ConnectionActivationStore persistence service to list, set, and reconcile per-environment enabled state across web, mobile, and desktop.
• Extends EnvironmentRegistry with setEnabled and updateRegistration APIs; toggling enabled state connects or disconnects the supervisor immediately and is persisted atomically under an activation lock.
• Startup now reconciles persisted activation state against known environments and retries with exponential backoff on failure.
• Adds UI controls on mobile (ConnectionEnvironmentRow, CloudEnvironmentRowShell, EnvironmentActivationSwitch) and web (ConnectionsSettings) to enable/disable environments; disabled environments show an 'Enable' button and suppress connection errors.
• Replaces direct connectivity.changes subscriptions with followNetworkStatus, which serializes wakeup-driven refreshes and deduplicates redundant status applications in RelayEnvironmentDiscovery, EnvironmentSupervisor, and the registry.
• Risk: start on EnvironmentRegistry can now fail with a ConnectionPersistenceError due to activation store operations; callers that previously assumed a non-failing start will need to handle this.

^{Macroscope summarized 3708623.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: ccd4ff46-8269-43eb-94eb-0c0425948e15

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

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[DominicVonk]

Clean per-layer diff in the native fork stack: DominicVonk#5 (fork stack #6). This upstream draft remains the contribution discussion and review target.

[macroscopeapp]

Effect service conventions review: one issue found. In apps/mobile/src/connection/storage.ts the ConnectionPersistenceErroroperation labels were shifted when the new activation operations were introduced, so each store now reports a failure under the wrong operation. The equivalent code in apps/web/src/connection/storage.ts labels these correctly, which makes the mobile mapping the outlier. Everything else (the new ConnectionActivationStore tag, the registry setEnabled operation, the new environment-catalog:set-enabled command, and the followNetworkStatus helper whose dependencies are still acquired via yield* in each caller's make) matches the conventions.

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

Approvability

Verdict: Needs human review

2 blocking correctness issues found. This PR introduces a new feature allowing users to enable/disable environments from the mobile composer and settings UI. New user-facing capabilities with new components and state management warrant human review. Additionally, open review comments identify bugs in the activation switch (pending state not cleared on success) and edit dialog (silently enables disabled environments).

^{You can customize Macroscope's approvability policy. Learn more.}

[macroscopeapp]

🟡 Mediumsettings/ConnectionsSettings.tsx:1437

handleSave calls onUpdate to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches EnvironmentRegistry.register, which unconditionally calls activation.setEnabled(environmentId, true) and installs the entry with initiallyDesired: true, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/web/src/components/settings/ConnectionsSettings.tsx around line 1437:
`handleSave` calls `onUpdate` to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches `EnvironmentRegistry.register`, which unconditionally calls `activation.setEnabled(environmentId, true)` and installs the entry with `initiallyDesired: true`, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[macroscopeapp]

Effect service conventions: one issue found — newly added Effect.catchTag usages in packages/client-runtime/src/connection/onboarding.ts should use Effect.catchTags({ ... }).

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

🟡 Mediumconnection/EnvironmentActivationSwitch.tsx:27

A successful toggle leaves pending set indefinitely, so if props.enabled later cycles back to the request's previous value, the switch re-enters a phantom pending state: isPending becomes true, the switch displays the stale requested value, and disables itself even though no request is in flight. The success path only clears pending on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

 const result = await props.onValueChange(enabled);
- if (!AsyncResult.isSuccess(result)) {+ if (AsyncResult.isSuccess(result)) {+ setPending((current) => (current === request ? null : current));+ } else {
setPending((current) => (current === request ? null : current));
}

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/mobile/src/features/connection/EnvironmentActivationSwitch.tsx around lines 27-30:
A successful toggle leaves `pending` set indefinitely, so if `props.enabled` later cycles back to the request's `previous` value, the switch re-enters a phantom pending state: `isPending` becomes `true`, the switch displays the stale `requested` value, and disables itself even though no request is in flight. The success path only clears `pending` on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

[DominicVonk]

Superseded by #5598. The composer enable action now ships with the durable activation model and management UI in one independently mergeable PR based directly on main.

[DominicVonk]

Problem

The composer status pill is already tappable, but it always dispatches a retry. In the red environment is not connected state shown for an available environment, the supervisor's desired state is false. Retrying cannot activate that environment, so tapping the pill appears to do nothing.

Solution

Choose the action from the typed connection phase and authoritative activation state:

• disabled environments dispatch setEnabled(environmentId, true);
• enabled offline, connecting, reconnecting, connected-syncing, and error states keep the existing retry behavior;
• a missing route environment remains a no-op.

Activation is projected from the supervisor's desired flag rather than inferred from transient connection phase. The decision remains isolated in a small typed helper, and activation still flows through the shared environment registry and supervisor.

User impact

Tapping the red status pill directly enables and reconnects a disabled environment for the open thread. Users no longer need to leave the conversation and find the environment toggle in Settings.

Stack

This PR is 5/5. Depends on layers 1–4, ending with 4/5, #5596.

Please review and merge the upstream PRs in order from 1 through 5. Because this repository does not have native stacked PRs enabled and cross-fork branches cannot be upstream base refs, the upstream diffs are cumulative. The corresponding fork PRs use the true dependent bases and provide the clean per-layer diffs.

Layer	Upstream PR	Clean stacked diff
1	#5597 — network-status recovery	fork #1
2	#5600 — persistent environment activation	fork #2
3	#5598 — environment-management UI	fork #3
4	#5596 — pasted pairing-link parsing	fork #4
5	#5599 — composer-pill activation	fork #5

Validation

apps/mobile
Test Files 1 passed (1)
Tests 2 passed (2)
tsc --noEmit: passed
Physical iPhone
Signed development app installed: passed
Application launch through devicectl: passed
Updated Metro bundle loaded: passed

The focused test verifies that a disabled environment enables while enabled connection states retry. Integrated stack validation after rebasing onto latest upstream main: 14 test files passed with 124 tests; client-runtime, web, and mobile typechecks passed.

UI evidence

Before: disabled environment	After: tap enables and reconnects

The after screenshot was captured on an iOS Simulator against disposable state. Tapping the red composer status pill enabled the saved environment; the disconnected placeholder and pill disappeared, and the thread became available without leaving the conversation.

Latest review pass

The underlying activation runtime now survives transient startup reconciliation failures, serializes registration with startup, clears stale disabled state on re-pair/platform restoration, and initializes presentation from authoritative desired state. Cloud switches disable without deleting registrations, and editing a disabled bearer environment preserves its activation state. The composer intentionally remains a no-op when its route environment no longer exists.

Latest integrated verification: client-runtime 47 test files / 598 tests passed; mobile 100 test files / 622 tests passed; client-runtime, web, and mobile typechecks passed.

Final review pass

The dependent runtime now updates registrations atomically while preserving activation, avoids transient connections for disabled edits, serializes activation controls with Save, and presents disabled environments without stale failures. The composer intentionally remains a no-op when its route environment no longer exists.

Latest verification: client-runtime 47 test files / 599 tests passed; mobile 100 test files / 622 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed. The Fallow new-only audit gate passed.

Rebased onto upstream main at 5661c6116 on 2026-08-07. Post-rebase verification: client-runtime 47 test files / 603 tests passed; mobile 100 test files / 624 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed.

Model: GPT-5; harness: Codex.

---

Note

Medium Risk
Changes connection catalog persistence, registry startup/reconciliation, and supervisor desired-state behavior across mobile, web, and desktop; incorrect activation handling could leave environments disconnected or fail startup until retry.

Overview
Adds persistent enable/disable for saved environments via disabledEnvironmentIds in the connection catalog and a ConnectionActivationStore on mobile, web, and desktop. Toggling off disconnects without removing the registration; presentation and workspace models now expose enabled separately from connection phase.

Mobile & web UI wire activation through EnvironmentActivationSwitch / settings edit dialogs (including bearer label/URL updates on web). Cloud rows use enable + retry instead of connect/disconnect semantics, with disabled environments shown as "Disabled" without stale error UI.

Thread composer (mobile): the status pill calls setEnabled(true) when the route environment is disabled (threadEnvironmentActivationAction), and keeps retry when already enabled—fixing taps that previously no-op’d because the supervisor had desired: false.

Runtime: registry startup retries on init failure; bearer profile updates go through updateRegistration; Connectivity.followNetworkStatus refreshes status on app wake with revision-safe application. Pairing forms gain parsePairingFields for pasted full URLs on blur/submit.

^{Reviewed by Cursor Bugbot for commit 3708623. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Enable environment activation toggling from the composer and settings UI

• Adds a disabledEnvironmentIds field to the connection catalog document and a new ConnectionActivationStore persistence service to list, set, and reconcile per-environment enabled state across web, mobile, and desktop.
• Extends EnvironmentRegistry with setEnabled and updateRegistration APIs; toggling enabled state connects or disconnects the supervisor immediately and is persisted atomically under an activation lock.
• Startup now reconciles persisted activation state against known environments and retries with exponential backoff on failure.
• Adds UI controls on mobile (ConnectionEnvironmentRow, CloudEnvironmentRowShell, EnvironmentActivationSwitch) and web (ConnectionsSettings) to enable/disable environments; disabled environments show an 'Enable' button and suppress connection errors.
• Replaces direct connectivity.changes subscriptions with followNetworkStatus, which serializes wakeup-driven refreshes and deduplicates redundant status applications in RelayEnvironmentDiscovery, EnvironmentSupervisor, and the registry.
• Risk: start on EnvironmentRegistry can now fail with a ConnectionPersistenceError due to activation store operations; callers that previously assumed a non-failing start will need to handle this.

^{Macroscope summarized 3708623.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: ccd4ff46-8269-43eb-94eb-0c0425948e15

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

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[DominicVonk]

Clean per-layer diff in the native fork stack: DominicVonk#5 (fork stack #6). This upstream draft remains the contribution discussion and review target.

[macroscopeapp]

Effect service conventions review: one issue found. In apps/mobile/src/connection/storage.ts the ConnectionPersistenceErroroperation labels were shifted when the new activation operations were introduced, so each store now reports a failure under the wrong operation. The equivalent code in apps/web/src/connection/storage.ts labels these correctly, which makes the mobile mapping the outlier. Everything else (the new ConnectionActivationStore tag, the registry setEnabled operation, the new environment-catalog:set-enabled command, and the followNetworkStatus helper whose dependencies are still acquired via yield* in each caller's make) matches the conventions.

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

Approvability

Verdict: Needs human review

2 blocking correctness issues found. This PR introduces a new feature allowing users to enable/disable environments from the mobile composer and settings UI. New user-facing capabilities with new components and state management warrant human review. Additionally, open review comments identify bugs in the activation switch (pending state not cleared on success) and edit dialog (silently enables disabled environments).

^{You can customize Macroscope's approvability policy. Learn more.}

[macroscopeapp]

🟡 Mediumsettings/ConnectionsSettings.tsx:1437

handleSave calls onUpdate to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches EnvironmentRegistry.register, which unconditionally calls activation.setEnabled(environmentId, true) and installs the entry with initiallyDesired: true, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/web/src/components/settings/ConnectionsSettings.tsx around line 1437:
`handleSave` calls `onUpdate` to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches `EnvironmentRegistry.register`, which unconditionally calls `activation.setEnabled(environmentId, true)` and installs the entry with `initiallyDesired: true`, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[macroscopeapp]

Effect service conventions: one issue found — newly added Effect.catchTag usages in packages/client-runtime/src/connection/onboarding.ts should use Effect.catchTags({ ... }).

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

🟡 Mediumconnection/EnvironmentActivationSwitch.tsx:27

A successful toggle leaves pending set indefinitely, so if props.enabled later cycles back to the request's previous value, the switch re-enters a phantom pending state: isPending becomes true, the switch displays the stale requested value, and disables itself even though no request is in flight. The success path only clears pending on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

 const result = await props.onValueChange(enabled);
- if (!AsyncResult.isSuccess(result)) {+ if (AsyncResult.isSuccess(result)) {+ setPending((current) => (current === request ? null : current));+ } else {
setPending((current) => (current === request ? null : current));
}

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/mobile/src/features/connection/EnvironmentActivationSwitch.tsx around lines 27-30:
A successful toggle leaves `pending` set indefinitely, so if `props.enabled` later cycles back to the request's `previous` value, the switch re-enters a phantom pending state: `isPending` becomes `true`, the switch displays the stale `requested` value, and disables itself even though no request is in flight. The success path only clears `pending` on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

[DominicVonk]

Superseded by #5598. The composer enable action now ships with the durable activation model and management UI in one independently mergeable PR based directly on main.

[DominicVonk]

Problem

The composer status pill is already tappable, but it always dispatches a retry. In the red environment is not connected state shown for an available environment, the supervisor's desired state is false. Retrying cannot activate that environment, so tapping the pill appears to do nothing.

Solution

Choose the action from the typed connection phase and authoritative activation state:

• disabled environments dispatch setEnabled(environmentId, true);
• enabled offline, connecting, reconnecting, connected-syncing, and error states keep the existing retry behavior;
• a missing route environment remains a no-op.

Activation is projected from the supervisor's desired flag rather than inferred from transient connection phase. The decision remains isolated in a small typed helper, and activation still flows through the shared environment registry and supervisor.

User impact

Tapping the red status pill directly enables and reconnects a disabled environment for the open thread. Users no longer need to leave the conversation and find the environment toggle in Settings.

Stack

This PR is 5/5. Depends on layers 1–4, ending with 4/5, #5596.

Please review and merge the upstream PRs in order from 1 through 5. Because this repository does not have native stacked PRs enabled and cross-fork branches cannot be upstream base refs, the upstream diffs are cumulative. The corresponding fork PRs use the true dependent bases and provide the clean per-layer diffs.

Layer	Upstream PR	Clean stacked diff
1	#5597 — network-status recovery	fork #1
2	#5600 — persistent environment activation	fork #2
3	#5598 — environment-management UI	fork #3
4	#5596 — pasted pairing-link parsing	fork #4
5	#5599 — composer-pill activation	fork #5

Validation

apps/mobile
Test Files 1 passed (1)
Tests 2 passed (2)
tsc --noEmit: passed
Physical iPhone
Signed development app installed: passed
Application launch through devicectl: passed
Updated Metro bundle loaded: passed

The focused test verifies that a disabled environment enables while enabled connection states retry. Integrated stack validation after rebasing onto latest upstream main: 14 test files passed with 124 tests; client-runtime, web, and mobile typechecks passed.

UI evidence

Before: disabled environment	After: tap enables and reconnects

The after screenshot was captured on an iOS Simulator against disposable state. Tapping the red composer status pill enabled the saved environment; the disconnected placeholder and pill disappeared, and the thread became available without leaving the conversation.

Latest review pass

The underlying activation runtime now survives transient startup reconciliation failures, serializes registration with startup, clears stale disabled state on re-pair/platform restoration, and initializes presentation from authoritative desired state. Cloud switches disable without deleting registrations, and editing a disabled bearer environment preserves its activation state. The composer intentionally remains a no-op when its route environment no longer exists.

Latest integrated verification: client-runtime 47 test files / 598 tests passed; mobile 100 test files / 622 tests passed; client-runtime, web, and mobile typechecks passed.

Final review pass

The dependent runtime now updates registrations atomically while preserving activation, avoids transient connections for disabled edits, serializes activation controls with Save, and presents disabled environments without stale failures. The composer intentionally remains a no-op when its route environment no longer exists.

Latest verification: client-runtime 47 test files / 599 tests passed; mobile 100 test files / 622 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed. The Fallow new-only audit gate passed.

Rebased onto upstream main at 5661c6116 on 2026-08-07. Post-rebase verification: client-runtime 47 test files / 603 tests passed; mobile 100 test files / 624 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed.

Model: GPT-5; harness: Codex.

---

Note

Medium Risk
Changes connection catalog persistence, registry startup/reconciliation, and supervisor desired-state behavior across mobile, web, and desktop; incorrect activation handling could leave environments disconnected or fail startup until retry.

Overview
Adds persistent enable/disable for saved environments via disabledEnvironmentIds in the connection catalog and a ConnectionActivationStore on mobile, web, and desktop. Toggling off disconnects without removing the registration; presentation and workspace models now expose enabled separately from connection phase.

Mobile & web UI wire activation through EnvironmentActivationSwitch / settings edit dialogs (including bearer label/URL updates on web). Cloud rows use enable + retry instead of connect/disconnect semantics, with disabled environments shown as "Disabled" without stale error UI.

Thread composer (mobile): the status pill calls setEnabled(true) when the route environment is disabled (threadEnvironmentActivationAction), and keeps retry when already enabled—fixing taps that previously no-op’d because the supervisor had desired: false.

Runtime: registry startup retries on init failure; bearer profile updates go through updateRegistration; Connectivity.followNetworkStatus refreshes status on app wake with revision-safe application. Pairing forms gain parsePairingFields for pasted full URLs on blur/submit.

^{Reviewed by Cursor Bugbot for commit 3708623. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Enable environment activation toggling from the composer and settings UI

• Adds a disabledEnvironmentIds field to the connection catalog document and a new ConnectionActivationStore persistence service to list, set, and reconcile per-environment enabled state across web, mobile, and desktop.
• Extends EnvironmentRegistry with setEnabled and updateRegistration APIs; toggling enabled state connects or disconnects the supervisor immediately and is persisted atomically under an activation lock.
• Startup now reconciles persisted activation state against known environments and retries with exponential backoff on failure.
• Adds UI controls on mobile (ConnectionEnvironmentRow, CloudEnvironmentRowShell, EnvironmentActivationSwitch) and web (ConnectionsSettings) to enable/disable environments; disabled environments show an 'Enable' button and suppress connection errors.
• Replaces direct connectivity.changes subscriptions with followNetworkStatus, which serializes wakeup-driven refreshes and deduplicates redundant status applications in RelayEnvironmentDiscovery, EnvironmentSupervisor, and the registry.
• Risk: start on EnvironmentRegistry can now fail with a ConnectionPersistenceError due to activation store operations; callers that previously assumed a non-failing start will need to handle this.

^{Macroscope summarized 3708623.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: ccd4ff46-8269-43eb-94eb-0c0425948e15

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

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[DominicVonk]

Clean per-layer diff in the native fork stack: DominicVonk#5 (fork stack #6). This upstream draft remains the contribution discussion and review target.

[macroscopeapp]

Effect service conventions review: one issue found. In apps/mobile/src/connection/storage.ts the ConnectionPersistenceErroroperation labels were shifted when the new activation operations were introduced, so each store now reports a failure under the wrong operation. The equivalent code in apps/web/src/connection/storage.ts labels these correctly, which makes the mobile mapping the outlier. Everything else (the new ConnectionActivationStore tag, the registry setEnabled operation, the new environment-catalog:set-enabled command, and the followNetworkStatus helper whose dependencies are still acquired via yield* in each caller's make) matches the conventions.

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

Approvability

Verdict: Needs human review

2 blocking correctness issues found. This PR introduces a new feature allowing users to enable/disable environments from the mobile composer and settings UI. New user-facing capabilities with new components and state management warrant human review. Additionally, open review comments identify bugs in the activation switch (pending state not cleared on success) and edit dialog (silently enables disabled environments).

^{You can customize Macroscope's approvability policy. Learn more.}

[macroscopeapp]

🟡 Mediumsettings/ConnectionsSettings.tsx:1437

handleSave calls onUpdate to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches EnvironmentRegistry.register, which unconditionally calls activation.setEnabled(environmentId, true) and installs the entry with initiallyDesired: true, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/web/src/components/settings/ConnectionsSettings.tsx around line 1437:
`handleSave` calls `onUpdate` to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches `EnvironmentRegistry.register`, which unconditionally calls `activation.setEnabled(environmentId, true)` and installs the entry with `initiallyDesired: true`, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[macroscopeapp]

Effect service conventions: one issue found — newly added Effect.catchTag usages in packages/client-runtime/src/connection/onboarding.ts should use Effect.catchTags({ ... }).

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

🟡 Mediumconnection/EnvironmentActivationSwitch.tsx:27

A successful toggle leaves pending set indefinitely, so if props.enabled later cycles back to the request's previous value, the switch re-enters a phantom pending state: isPending becomes true, the switch displays the stale requested value, and disables itself even though no request is in flight. The success path only clears pending on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

 const result = await props.onValueChange(enabled);
- if (!AsyncResult.isSuccess(result)) {+ if (AsyncResult.isSuccess(result)) {+ setPending((current) => (current === request ? null : current));+ } else {
setPending((current) => (current === request ? null : current));
}

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/mobile/src/features/connection/EnvironmentActivationSwitch.tsx around lines 27-30:
A successful toggle leaves `pending` set indefinitely, so if `props.enabled` later cycles back to the request's `previous` value, the switch re-enters a phantom pending state: `isPending` becomes `true`, the switch displays the stale `requested` value, and disables itself even though no request is in flight. The success path only clears `pending` on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

[DominicVonk]

Superseded by #5598. The composer enable action now ships with the durable activation model and management UI in one independently mergeable PR based directly on main.

[DominicVonk]

Problem

The composer status pill is already tappable, but it always dispatches a retry. In the red environment is not connected state shown for an available environment, the supervisor's desired state is false. Retrying cannot activate that environment, so tapping the pill appears to do nothing.

Solution

Choose the action from the typed connection phase and authoritative activation state:

• disabled environments dispatch setEnabled(environmentId, true);
• enabled offline, connecting, reconnecting, connected-syncing, and error states keep the existing retry behavior;
• a missing route environment remains a no-op.

Activation is projected from the supervisor's desired flag rather than inferred from transient connection phase. The decision remains isolated in a small typed helper, and activation still flows through the shared environment registry and supervisor.

User impact

Tapping the red status pill directly enables and reconnects a disabled environment for the open thread. Users no longer need to leave the conversation and find the environment toggle in Settings.

Stack

This PR is 5/5. Depends on layers 1–4, ending with 4/5, #5596.

Please review and merge the upstream PRs in order from 1 through 5. Because this repository does not have native stacked PRs enabled and cross-fork branches cannot be upstream base refs, the upstream diffs are cumulative. The corresponding fork PRs use the true dependent bases and provide the clean per-layer diffs.

Layer	Upstream PR	Clean stacked diff
1	#5597 — network-status recovery	fork #1
2	#5600 — persistent environment activation	fork #2
3	#5598 — environment-management UI	fork #3
4	#5596 — pasted pairing-link parsing	fork #4
5	#5599 — composer-pill activation	fork #5

Validation

apps/mobile
Test Files 1 passed (1)
Tests 2 passed (2)
tsc --noEmit: passed
Physical iPhone
Signed development app installed: passed
Application launch through devicectl: passed
Updated Metro bundle loaded: passed

The focused test verifies that a disabled environment enables while enabled connection states retry. Integrated stack validation after rebasing onto latest upstream main: 14 test files passed with 124 tests; client-runtime, web, and mobile typechecks passed.

UI evidence

Before: disabled environment	After: tap enables and reconnects

The after screenshot was captured on an iOS Simulator against disposable state. Tapping the red composer status pill enabled the saved environment; the disconnected placeholder and pill disappeared, and the thread became available without leaving the conversation.

Latest review pass

The underlying activation runtime now survives transient startup reconciliation failures, serializes registration with startup, clears stale disabled state on re-pair/platform restoration, and initializes presentation from authoritative desired state. Cloud switches disable without deleting registrations, and editing a disabled bearer environment preserves its activation state. The composer intentionally remains a no-op when its route environment no longer exists.

Latest integrated verification: client-runtime 47 test files / 598 tests passed; mobile 100 test files / 622 tests passed; client-runtime, web, and mobile typechecks passed.

Final review pass

The dependent runtime now updates registrations atomically while preserving activation, avoids transient connections for disabled edits, serializes activation controls with Save, and presents disabled environments without stale failures. The composer intentionally remains a no-op when its route environment no longer exists.

Latest verification: client-runtime 47 test files / 599 tests passed; mobile 100 test files / 622 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed. The Fallow new-only audit gate passed.

Rebased onto upstream main at 5661c6116 on 2026-08-07. Post-rebase verification: client-runtime 47 test files / 603 tests passed; mobile 100 test files / 624 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed.

Model: GPT-5; harness: Codex.

---

Note

Medium Risk
Changes connection catalog persistence, registry startup/reconciliation, and supervisor desired-state behavior across mobile, web, and desktop; incorrect activation handling could leave environments disconnected or fail startup until retry.

Overview
Adds persistent enable/disable for saved environments via disabledEnvironmentIds in the connection catalog and a ConnectionActivationStore on mobile, web, and desktop. Toggling off disconnects without removing the registration; presentation and workspace models now expose enabled separately from connection phase.

Mobile & web UI wire activation through EnvironmentActivationSwitch / settings edit dialogs (including bearer label/URL updates on web). Cloud rows use enable + retry instead of connect/disconnect semantics, with disabled environments shown as "Disabled" without stale error UI.

Thread composer (mobile): the status pill calls setEnabled(true) when the route environment is disabled (threadEnvironmentActivationAction), and keeps retry when already enabled—fixing taps that previously no-op’d because the supervisor had desired: false.

Runtime: registry startup retries on init failure; bearer profile updates go through updateRegistration; Connectivity.followNetworkStatus refreshes status on app wake with revision-safe application. Pairing forms gain parsePairingFields for pasted full URLs on blur/submit.

^{Reviewed by Cursor Bugbot for commit 3708623. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Enable environment activation toggling from the composer and settings UI

• Adds a disabledEnvironmentIds field to the connection catalog document and a new ConnectionActivationStore persistence service to list, set, and reconcile per-environment enabled state across web, mobile, and desktop.
• Extends EnvironmentRegistry with setEnabled and updateRegistration APIs; toggling enabled state connects or disconnects the supervisor immediately and is persisted atomically under an activation lock.
• Startup now reconciles persisted activation state against known environments and retries with exponential backoff on failure.
• Adds UI controls on mobile (ConnectionEnvironmentRow, CloudEnvironmentRowShell, EnvironmentActivationSwitch) and web (ConnectionsSettings) to enable/disable environments; disabled environments show an 'Enable' button and suppress connection errors.
• Replaces direct connectivity.changes subscriptions with followNetworkStatus, which serializes wakeup-driven refreshes and deduplicates redundant status applications in RelayEnvironmentDiscovery, EnvironmentSupervisor, and the registry.
• Risk: start on EnvironmentRegistry can now fail with a ConnectionPersistenceError due to activation store operations; callers that previously assumed a non-failing start will need to handle this.

^{Macroscope summarized 3708623.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: ccd4ff46-8269-43eb-94eb-0c0425948e15

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

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[DominicVonk]

Clean per-layer diff in the native fork stack: DominicVonk#5 (fork stack #6). This upstream draft remains the contribution discussion and review target.

[macroscopeapp]

Effect service conventions review: one issue found. In apps/mobile/src/connection/storage.ts the ConnectionPersistenceErroroperation labels were shifted when the new activation operations were introduced, so each store now reports a failure under the wrong operation. The equivalent code in apps/web/src/connection/storage.ts labels these correctly, which makes the mobile mapping the outlier. Everything else (the new ConnectionActivationStore tag, the registry setEnabled operation, the new environment-catalog:set-enabled command, and the followNetworkStatus helper whose dependencies are still acquired via yield* in each caller's make) matches the conventions.

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

Approvability

Verdict: Needs human review

2 blocking correctness issues found. This PR introduces a new feature allowing users to enable/disable environments from the mobile composer and settings UI. New user-facing capabilities with new components and state management warrant human review. Additionally, open review comments identify bugs in the activation switch (pending state not cleared on success) and edit dialog (silently enables disabled environments).

^{You can customize Macroscope's approvability policy. Learn more.}

[macroscopeapp]

🟡 Mediumsettings/ConnectionsSettings.tsx:1437

handleSave calls onUpdate to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches EnvironmentRegistry.register, which unconditionally calls activation.setEnabled(environmentId, true) and installs the entry with initiallyDesired: true, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/web/src/components/settings/ConnectionsSettings.tsx around line 1437:
`handleSave` calls `onUpdate` to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches `EnvironmentRegistry.register`, which unconditionally calls `activation.setEnabled(environmentId, true)` and installs the entry with `initiallyDesired: true`, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[macroscopeapp]

Effect service conventions: one issue found — newly added Effect.catchTag usages in packages/client-runtime/src/connection/onboarding.ts should use Effect.catchTags({ ... }).

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

🟡 Mediumconnection/EnvironmentActivationSwitch.tsx:27

A successful toggle leaves pending set indefinitely, so if props.enabled later cycles back to the request's previous value, the switch re-enters a phantom pending state: isPending becomes true, the switch displays the stale requested value, and disables itself even though no request is in flight. The success path only clears pending on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

 const result = await props.onValueChange(enabled);
- if (!AsyncResult.isSuccess(result)) {+ if (AsyncResult.isSuccess(result)) {+ setPending((current) => (current === request ? null : current));+ } else {
setPending((current) => (current === request ? null : current));
}

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/mobile/src/features/connection/EnvironmentActivationSwitch.tsx around lines 27-30:
A successful toggle leaves `pending` set indefinitely, so if `props.enabled` later cycles back to the request's `previous` value, the switch re-enters a phantom pending state: `isPending` becomes `true`, the switch displays the stale `requested` value, and disables itself even though no request is in flight. The success path only clears `pending` on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

[DominicVonk]

Superseded by #5598. The composer enable action now ships with the durable activation model and management UI in one independently mergeable PR based directly on main.

[DominicVonk]

Problem

The composer status pill is already tappable, but it always dispatches a retry. In the red environment is not connected state shown for an available environment, the supervisor's desired state is false. Retrying cannot activate that environment, so tapping the pill appears to do nothing.

Solution

Choose the action from the typed connection phase and authoritative activation state:

• disabled environments dispatch setEnabled(environmentId, true);
• enabled offline, connecting, reconnecting, connected-syncing, and error states keep the existing retry behavior;
• a missing route environment remains a no-op.

Activation is projected from the supervisor's desired flag rather than inferred from transient connection phase. The decision remains isolated in a small typed helper, and activation still flows through the shared environment registry and supervisor.

User impact

Tapping the red status pill directly enables and reconnects a disabled environment for the open thread. Users no longer need to leave the conversation and find the environment toggle in Settings.

Stack

This PR is 5/5. Depends on layers 1–4, ending with 4/5, #5596.

Please review and merge the upstream PRs in order from 1 through 5. Because this repository does not have native stacked PRs enabled and cross-fork branches cannot be upstream base refs, the upstream diffs are cumulative. The corresponding fork PRs use the true dependent bases and provide the clean per-layer diffs.

Layer	Upstream PR	Clean stacked diff
1	#5597 — network-status recovery	fork #1
2	#5600 — persistent environment activation	fork #2
3	#5598 — environment-management UI	fork #3
4	#5596 — pasted pairing-link parsing	fork #4
5	#5599 — composer-pill activation	fork #5

Validation

apps/mobile
Test Files 1 passed (1)
Tests 2 passed (2)
tsc --noEmit: passed
Physical iPhone
Signed development app installed: passed
Application launch through devicectl: passed
Updated Metro bundle loaded: passed

The focused test verifies that a disabled environment enables while enabled connection states retry. Integrated stack validation after rebasing onto latest upstream main: 14 test files passed with 124 tests; client-runtime, web, and mobile typechecks passed.

UI evidence

Before: disabled environment	After: tap enables and reconnects

The after screenshot was captured on an iOS Simulator against disposable state. Tapping the red composer status pill enabled the saved environment; the disconnected placeholder and pill disappeared, and the thread became available without leaving the conversation.

Latest review pass

The underlying activation runtime now survives transient startup reconciliation failures, serializes registration with startup, clears stale disabled state on re-pair/platform restoration, and initializes presentation from authoritative desired state. Cloud switches disable without deleting registrations, and editing a disabled bearer environment preserves its activation state. The composer intentionally remains a no-op when its route environment no longer exists.

Latest integrated verification: client-runtime 47 test files / 598 tests passed; mobile 100 test files / 622 tests passed; client-runtime, web, and mobile typechecks passed.

Final review pass

The dependent runtime now updates registrations atomically while preserving activation, avoids transient connections for disabled edits, serializes activation controls with Save, and presents disabled environments without stale failures. The composer intentionally remains a no-op when its route environment no longer exists.

Latest verification: client-runtime 47 test files / 599 tests passed; mobile 100 test files / 622 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed. The Fallow new-only audit gate passed.

Rebased onto upstream main at 5661c6116 on 2026-08-07. Post-rebase verification: client-runtime 47 test files / 603 tests passed; mobile 100 test files / 624 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed.

Model: GPT-5; harness: Codex.

---

Note

Medium Risk
Changes connection catalog persistence, registry startup/reconciliation, and supervisor desired-state behavior across mobile, web, and desktop; incorrect activation handling could leave environments disconnected or fail startup until retry.

Overview
Adds persistent enable/disable for saved environments via disabledEnvironmentIds in the connection catalog and a ConnectionActivationStore on mobile, web, and desktop. Toggling off disconnects without removing the registration; presentation and workspace models now expose enabled separately from connection phase.

Mobile & web UI wire activation through EnvironmentActivationSwitch / settings edit dialogs (including bearer label/URL updates on web). Cloud rows use enable + retry instead of connect/disconnect semantics, with disabled environments shown as "Disabled" without stale error UI.

Thread composer (mobile): the status pill calls setEnabled(true) when the route environment is disabled (threadEnvironmentActivationAction), and keeps retry when already enabled—fixing taps that previously no-op’d because the supervisor had desired: false.

Runtime: registry startup retries on init failure; bearer profile updates go through updateRegistration; Connectivity.followNetworkStatus refreshes status on app wake with revision-safe application. Pairing forms gain parsePairingFields for pasted full URLs on blur/submit.

^{Reviewed by Cursor Bugbot for commit 3708623. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Enable environment activation toggling from the composer and settings UI

• Adds a disabledEnvironmentIds field to the connection catalog document and a new ConnectionActivationStore persistence service to list, set, and reconcile per-environment enabled state across web, mobile, and desktop.
• Extends EnvironmentRegistry with setEnabled and updateRegistration APIs; toggling enabled state connects or disconnects the supervisor immediately and is persisted atomically under an activation lock.
• Startup now reconciles persisted activation state against known environments and retries with exponential backoff on failure.
• Adds UI controls on mobile (ConnectionEnvironmentRow, CloudEnvironmentRowShell, EnvironmentActivationSwitch) and web (ConnectionsSettings) to enable/disable environments; disabled environments show an 'Enable' button and suppress connection errors.
• Replaces direct connectivity.changes subscriptions with followNetworkStatus, which serializes wakeup-driven refreshes and deduplicates redundant status applications in RelayEnvironmentDiscovery, EnvironmentSupervisor, and the registry.
• Risk: start on EnvironmentRegistry can now fail with a ConnectionPersistenceError due to activation store operations; callers that previously assumed a non-failing start will need to handle this.

^{Macroscope summarized 3708623.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: ccd4ff46-8269-43eb-94eb-0c0425948e15

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

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[DominicVonk]

Clean per-layer diff in the native fork stack: DominicVonk#5 (fork stack #6). This upstream draft remains the contribution discussion and review target.

[macroscopeapp]

Effect service conventions review: one issue found. In apps/mobile/src/connection/storage.ts the ConnectionPersistenceErroroperation labels were shifted when the new activation operations were introduced, so each store now reports a failure under the wrong operation. The equivalent code in apps/web/src/connection/storage.ts labels these correctly, which makes the mobile mapping the outlier. Everything else (the new ConnectionActivationStore tag, the registry setEnabled operation, the new environment-catalog:set-enabled command, and the followNetworkStatus helper whose dependencies are still acquired via yield* in each caller's make) matches the conventions.

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

Approvability

Verdict: Needs human review

2 blocking correctness issues found. This PR introduces a new feature allowing users to enable/disable environments from the mobile composer and settings UI. New user-facing capabilities with new components and state management warrant human review. Additionally, open review comments identify bugs in the activation switch (pending state not cleared on success) and edit dialog (silently enables disabled environments).

^{You can customize Macroscope's approvability policy. Learn more.}

[macroscopeapp]

🟡 Mediumsettings/ConnectionsSettings.tsx:1437

handleSave calls onUpdate to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches EnvironmentRegistry.register, which unconditionally calls activation.setEnabled(environmentId, true) and installs the entry with initiallyDesired: true, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/web/src/components/settings/ConnectionsSettings.tsx around line 1437:
`handleSave` calls `onUpdate` to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches `EnvironmentRegistry.register`, which unconditionally calls `activation.setEnabled(environmentId, true)` and installs the entry with `initiallyDesired: true`, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[macroscopeapp]

Effect service conventions: one issue found — newly added Effect.catchTag usages in packages/client-runtime/src/connection/onboarding.ts should use Effect.catchTags({ ... }).

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

🟡 Mediumconnection/EnvironmentActivationSwitch.tsx:27

A successful toggle leaves pending set indefinitely, so if props.enabled later cycles back to the request's previous value, the switch re-enters a phantom pending state: isPending becomes true, the switch displays the stale requested value, and disables itself even though no request is in flight. The success path only clears pending on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

 const result = await props.onValueChange(enabled);
- if (!AsyncResult.isSuccess(result)) {+ if (AsyncResult.isSuccess(result)) {+ setPending((current) => (current === request ? null : current));+ } else {
setPending((current) => (current === request ? null : current));
}

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/mobile/src/features/connection/EnvironmentActivationSwitch.tsx around lines 27-30:
A successful toggle leaves `pending` set indefinitely, so if `props.enabled` later cycles back to the request's `previous` value, the switch re-enters a phantom pending state: `isPending` becomes `true`, the switch displays the stale `requested` value, and disables itself even though no request is in flight. The success path only clears `pending` on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

[DominicVonk]

Superseded by #5598. The composer enable action now ships with the durable activation model and management UI in one independently mergeable PR based directly on main.

[DominicVonk]

Problem

The composer status pill is already tappable, but it always dispatches a retry. In the red environment is not connected state shown for an available environment, the supervisor's desired state is false. Retrying cannot activate that environment, so tapping the pill appears to do nothing.

Solution

Choose the action from the typed connection phase and authoritative activation state:

• disabled environments dispatch setEnabled(environmentId, true);
• enabled offline, connecting, reconnecting, connected-syncing, and error states keep the existing retry behavior;
• a missing route environment remains a no-op.

Activation is projected from the supervisor's desired flag rather than inferred from transient connection phase. The decision remains isolated in a small typed helper, and activation still flows through the shared environment registry and supervisor.

User impact

Tapping the red status pill directly enables and reconnects a disabled environment for the open thread. Users no longer need to leave the conversation and find the environment toggle in Settings.

Stack

This PR is 5/5. Depends on layers 1–4, ending with 4/5, #5596.

Please review and merge the upstream PRs in order from 1 through 5. Because this repository does not have native stacked PRs enabled and cross-fork branches cannot be upstream base refs, the upstream diffs are cumulative. The corresponding fork PRs use the true dependent bases and provide the clean per-layer diffs.

Layer	Upstream PR	Clean stacked diff
1	#5597 — network-status recovery	fork #1
2	#5600 — persistent environment activation	fork #2
3	#5598 — environment-management UI	fork #3
4	#5596 — pasted pairing-link parsing	fork #4
5	#5599 — composer-pill activation	fork #5

Validation

apps/mobile
Test Files 1 passed (1)
Tests 2 passed (2)
tsc --noEmit: passed
Physical iPhone
Signed development app installed: passed
Application launch through devicectl: passed
Updated Metro bundle loaded: passed

The focused test verifies that a disabled environment enables while enabled connection states retry. Integrated stack validation after rebasing onto latest upstream main: 14 test files passed with 124 tests; client-runtime, web, and mobile typechecks passed.

UI evidence

Before: disabled environment	After: tap enables and reconnects

The after screenshot was captured on an iOS Simulator against disposable state. Tapping the red composer status pill enabled the saved environment; the disconnected placeholder and pill disappeared, and the thread became available without leaving the conversation.

Latest review pass

The underlying activation runtime now survives transient startup reconciliation failures, serializes registration with startup, clears stale disabled state on re-pair/platform restoration, and initializes presentation from authoritative desired state. Cloud switches disable without deleting registrations, and editing a disabled bearer environment preserves its activation state. The composer intentionally remains a no-op when its route environment no longer exists.

Latest integrated verification: client-runtime 47 test files / 598 tests passed; mobile 100 test files / 622 tests passed; client-runtime, web, and mobile typechecks passed.

Final review pass

The dependent runtime now updates registrations atomically while preserving activation, avoids transient connections for disabled edits, serializes activation controls with Save, and presents disabled environments without stale failures. The composer intentionally remains a no-op when its route environment no longer exists.

Latest verification: client-runtime 47 test files / 599 tests passed; mobile 100 test files / 622 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed. The Fallow new-only audit gate passed.

Rebased onto upstream main at 5661c6116 on 2026-08-07. Post-rebase verification: client-runtime 47 test files / 603 tests passed; mobile 100 test files / 624 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed.

Model: GPT-5; harness: Codex.

---

Note

Medium Risk
Changes connection catalog persistence, registry startup/reconciliation, and supervisor desired-state behavior across mobile, web, and desktop; incorrect activation handling could leave environments disconnected or fail startup until retry.

Overview
Adds persistent enable/disable for saved environments via disabledEnvironmentIds in the connection catalog and a ConnectionActivationStore on mobile, web, and desktop. Toggling off disconnects without removing the registration; presentation and workspace models now expose enabled separately from connection phase.

Mobile & web UI wire activation through EnvironmentActivationSwitch / settings edit dialogs (including bearer label/URL updates on web). Cloud rows use enable + retry instead of connect/disconnect semantics, with disabled environments shown as "Disabled" without stale error UI.

Thread composer (mobile): the status pill calls setEnabled(true) when the route environment is disabled (threadEnvironmentActivationAction), and keeps retry when already enabled—fixing taps that previously no-op’d because the supervisor had desired: false.

Runtime: registry startup retries on init failure; bearer profile updates go through updateRegistration; Connectivity.followNetworkStatus refreshes status on app wake with revision-safe application. Pairing forms gain parsePairingFields for pasted full URLs on blur/submit.

^{Reviewed by Cursor Bugbot for commit 3708623. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Enable environment activation toggling from the composer and settings UI

• Adds a disabledEnvironmentIds field to the connection catalog document and a new ConnectionActivationStore persistence service to list, set, and reconcile per-environment enabled state across web, mobile, and desktop.
• Extends EnvironmentRegistry with setEnabled and updateRegistration APIs; toggling enabled state connects or disconnects the supervisor immediately and is persisted atomically under an activation lock.
• Startup now reconciles persisted activation state against known environments and retries with exponential backoff on failure.
• Adds UI controls on mobile (ConnectionEnvironmentRow, CloudEnvironmentRowShell, EnvironmentActivationSwitch) and web (ConnectionsSettings) to enable/disable environments; disabled environments show an 'Enable' button and suppress connection errors.
• Replaces direct connectivity.changes subscriptions with followNetworkStatus, which serializes wakeup-driven refreshes and deduplicates redundant status applications in RelayEnvironmentDiscovery, EnvironmentSupervisor, and the registry.
• Risk: start on EnvironmentRegistry can now fail with a ConnectionPersistenceError due to activation store operations; callers that previously assumed a non-failing start will need to handle this.

^{Macroscope summarized 3708623.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: ccd4ff46-8269-43eb-94eb-0c0425948e15

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

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[DominicVonk]

Clean per-layer diff in the native fork stack: DominicVonk#5 (fork stack #6). This upstream draft remains the contribution discussion and review target.

[macroscopeapp]

Effect service conventions review: one issue found. In apps/mobile/src/connection/storage.ts the ConnectionPersistenceErroroperation labels were shifted when the new activation operations were introduced, so each store now reports a failure under the wrong operation. The equivalent code in apps/web/src/connection/storage.ts labels these correctly, which makes the mobile mapping the outlier. Everything else (the new ConnectionActivationStore tag, the registry setEnabled operation, the new environment-catalog:set-enabled command, and the followNetworkStatus helper whose dependencies are still acquired via yield* in each caller's make) matches the conventions.

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

Approvability

Verdict: Needs human review

2 blocking correctness issues found. This PR introduces a new feature allowing users to enable/disable environments from the mobile composer and settings UI. New user-facing capabilities with new components and state management warrant human review. Additionally, open review comments identify bugs in the activation switch (pending state not cleared on success) and edit dialog (silently enables disabled environments).

^{You can customize Macroscope's approvability policy. Learn more.}

[macroscopeapp]

🟡 Mediumsettings/ConnectionsSettings.tsx:1437

handleSave calls onUpdate to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches EnvironmentRegistry.register, which unconditionally calls activation.setEnabled(environmentId, true) and installs the entry with initiallyDesired: true, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/web/src/components/settings/ConnectionsSettings.tsx around line 1437:
`handleSave` calls `onUpdate` to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches `EnvironmentRegistry.register`, which unconditionally calls `activation.setEnabled(environmentId, true)` and installs the entry with `initiallyDesired: true`, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[macroscopeapp]

Effect service conventions: one issue found — newly added Effect.catchTag usages in packages/client-runtime/src/connection/onboarding.ts should use Effect.catchTags({ ... }).

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

🟡 Mediumconnection/EnvironmentActivationSwitch.tsx:27

A successful toggle leaves pending set indefinitely, so if props.enabled later cycles back to the request's previous value, the switch re-enters a phantom pending state: isPending becomes true, the switch displays the stale requested value, and disables itself even though no request is in flight. The success path only clears pending on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

 const result = await props.onValueChange(enabled);
- if (!AsyncResult.isSuccess(result)) {+ if (AsyncResult.isSuccess(result)) {+ setPending((current) => (current === request ? null : current));+ } else {
setPending((current) => (current === request ? null : current));
}

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/mobile/src/features/connection/EnvironmentActivationSwitch.tsx around lines 27-30:
A successful toggle leaves `pending` set indefinitely, so if `props.enabled` later cycles back to the request's `previous` value, the switch re-enters a phantom pending state: `isPending` becomes `true`, the switch displays the stale `requested` value, and disables itself even though no request is in flight. The success path only clears `pending` on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

[DominicVonk]

Superseded by #5598. The composer enable action now ships with the durable activation model and management UI in one independently mergeable PR based directly on main.

[DominicVonk]

Problem

The composer status pill is already tappable, but it always dispatches a retry. In the red environment is not connected state shown for an available environment, the supervisor's desired state is false. Retrying cannot activate that environment, so tapping the pill appears to do nothing.

Solution

Choose the action from the typed connection phase and authoritative activation state:

• disabled environments dispatch setEnabled(environmentId, true);
• enabled offline, connecting, reconnecting, connected-syncing, and error states keep the existing retry behavior;
• a missing route environment remains a no-op.

Activation is projected from the supervisor's desired flag rather than inferred from transient connection phase. The decision remains isolated in a small typed helper, and activation still flows through the shared environment registry and supervisor.

User impact

Tapping the red status pill directly enables and reconnects a disabled environment for the open thread. Users no longer need to leave the conversation and find the environment toggle in Settings.

Stack

This PR is 5/5. Depends on layers 1–4, ending with 4/5, #5596.

Please review and merge the upstream PRs in order from 1 through 5. Because this repository does not have native stacked PRs enabled and cross-fork branches cannot be upstream base refs, the upstream diffs are cumulative. The corresponding fork PRs use the true dependent bases and provide the clean per-layer diffs.

Layer	Upstream PR	Clean stacked diff
1	#5597 — network-status recovery	fork #1
2	#5600 — persistent environment activation	fork #2
3	#5598 — environment-management UI	fork #3
4	#5596 — pasted pairing-link parsing	fork #4
5	#5599 — composer-pill activation	fork #5

Validation

apps/mobile
Test Files 1 passed (1)
Tests 2 passed (2)
tsc --noEmit: passed
Physical iPhone
Signed development app installed: passed
Application launch through devicectl: passed
Updated Metro bundle loaded: passed

The focused test verifies that a disabled environment enables while enabled connection states retry. Integrated stack validation after rebasing onto latest upstream main: 14 test files passed with 124 tests; client-runtime, web, and mobile typechecks passed.

UI evidence

Before: disabled environment	After: tap enables and reconnects

The after screenshot was captured on an iOS Simulator against disposable state. Tapping the red composer status pill enabled the saved environment; the disconnected placeholder and pill disappeared, and the thread became available without leaving the conversation.

Latest review pass

The underlying activation runtime now survives transient startup reconciliation failures, serializes registration with startup, clears stale disabled state on re-pair/platform restoration, and initializes presentation from authoritative desired state. Cloud switches disable without deleting registrations, and editing a disabled bearer environment preserves its activation state. The composer intentionally remains a no-op when its route environment no longer exists.

Latest integrated verification: client-runtime 47 test files / 598 tests passed; mobile 100 test files / 622 tests passed; client-runtime, web, and mobile typechecks passed.

Final review pass

The dependent runtime now updates registrations atomically while preserving activation, avoids transient connections for disabled edits, serializes activation controls with Save, and presents disabled environments without stale failures. The composer intentionally remains a no-op when its route environment no longer exists.

Latest verification: client-runtime 47 test files / 599 tests passed; mobile 100 test files / 622 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed. The Fallow new-only audit gate passed.

Rebased onto upstream main at 5661c6116 on 2026-08-07. Post-rebase verification: client-runtime 47 test files / 603 tests passed; mobile 100 test files / 624 tests passed; desktop 58 test files / 447 tests passed; client-runtime, web, mobile, and desktop typechecks passed.

Model: GPT-5; harness: Codex.

---

Note

Medium Risk
Changes connection catalog persistence, registry startup/reconciliation, and supervisor desired-state behavior across mobile, web, and desktop; incorrect activation handling could leave environments disconnected or fail startup until retry.

Overview
Adds persistent enable/disable for saved environments via disabledEnvironmentIds in the connection catalog and a ConnectionActivationStore on mobile, web, and desktop. Toggling off disconnects without removing the registration; presentation and workspace models now expose enabled separately from connection phase.

Mobile & web UI wire activation through EnvironmentActivationSwitch / settings edit dialogs (including bearer label/URL updates on web). Cloud rows use enable + retry instead of connect/disconnect semantics, with disabled environments shown as "Disabled" without stale error UI.

Thread composer (mobile): the status pill calls setEnabled(true) when the route environment is disabled (threadEnvironmentActivationAction), and keeps retry when already enabled—fixing taps that previously no-op’d because the supervisor had desired: false.

Runtime: registry startup retries on init failure; bearer profile updates go through updateRegistration; Connectivity.followNetworkStatus refreshes status on app wake with revision-safe application. Pairing forms gain parsePairingFields for pasted full URLs on blur/submit.

^{Reviewed by Cursor Bugbot for commit 3708623. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Enable environment activation toggling from the composer and settings UI

• Adds a disabledEnvironmentIds field to the connection catalog document and a new ConnectionActivationStore persistence service to list, set, and reconcile per-environment enabled state across web, mobile, and desktop.
• Extends EnvironmentRegistry with setEnabled and updateRegistration APIs; toggling enabled state connects or disconnects the supervisor immediately and is persisted atomically under an activation lock.
• Startup now reconciles persisted activation state against known environments and retries with exponential backoff on failure.
• Adds UI controls on mobile (ConnectionEnvironmentRow, CloudEnvironmentRowShell, EnvironmentActivationSwitch) and web (ConnectionsSettings) to enable/disable environments; disabled environments show an 'Enable' button and suppress connection errors.
• Replaces direct connectivity.changes subscriptions with followNetworkStatus, which serializes wakeup-driven refreshes and deduplicates redundant status applications in RelayEnvironmentDiscovery, EnvironmentSupervisor, and the registry.
• Risk: start on EnvironmentRegistry can now fail with a ConnectionPersistenceError due to activation store operations; callers that previously assumed a non-failing start will need to handle this.

^{Macroscope summarized 3708623.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: ccd4ff46-8269-43eb-94eb-0c0425948e15

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

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[DominicVonk]

Clean per-layer diff in the native fork stack: DominicVonk#5 (fork stack #6). This upstream draft remains the contribution discussion and review target.

[macroscopeapp]

Effect service conventions review: one issue found. In apps/mobile/src/connection/storage.ts the ConnectionPersistenceErroroperation labels were shifted when the new activation operations were introduced, so each store now reports a failure under the wrong operation. The equivalent code in apps/web/src/connection/storage.ts labels these correctly, which makes the mobile mapping the outlier. Everything else (the new ConnectionActivationStore tag, the registry setEnabled operation, the new environment-catalog:set-enabled command, and the followNetworkStatus helper whose dependencies are still acquired via yield* in each caller's make) matches the conventions.

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

Approvability

Verdict: Needs human review

2 blocking correctness issues found. This PR introduces a new feature allowing users to enable/disable environments from the mobile composer and settings UI. New user-facing capabilities with new components and state management warrant human review. Additionally, open review comments identify bugs in the activation switch (pending state not cleared on success) and edit dialog (silently enables disabled environments).

^{You can customize Macroscope's approvability policy. Learn more.}

[macroscopeapp]

🟡 Mediumsettings/ConnectionsSettings.tsx:1437

handleSave calls onUpdate to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches EnvironmentRegistry.register, which unconditionally calls activation.setEnabled(environmentId, true) and installs the entry with initiallyDesired: true, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/web/src/components/settings/ConnectionsSettings.tsx around line 1437:
`handleSave` calls `onUpdate` to update the label or URL of a disabled environment, which causes the environment to become enabled and start connecting. When the edit dialog is open on a disabled bearer environment with the Enabled switch left off, saving the form silently enables it and triggers a connection. The underlying update path reaches `EnvironmentRegistry.register`, which unconditionally calls `activation.setEnabled(environmentId, true)` and installs the entry with `initiallyDesired: true`, so any edit is treated as a new enabled registration instead of preserving the existing activation state. The update path should preserve the environment's current enabled state rather than forcing it on.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[macroscopeapp]

Effect service conventions: one issue found — newly added Effect.catchTag usages in packages/client-runtime/src/connection/onboarding.ts should use Effect.catchTags({ ... }).

^{Posted via Macroscope — Effect Service Conventions}

[macroscopeapp]

🟡 Mediumconnection/EnvironmentActivationSwitch.tsx:27

A successful toggle leaves pending set indefinitely, so if props.enabled later cycles back to the request's previous value, the switch re-enters a phantom pending state: isPending becomes true, the switch displays the stale requested value, and disables itself even though no request is in flight. The success path only clears pending on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

 const result = await props.onValueChange(enabled);
- if (!AsyncResult.isSuccess(result)) {+ if (AsyncResult.isSuccess(result)) {+ setPending((current) => (current === request ? null : current));+ } else {
setPending((current) => (current === request ? null : current));
}

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/mobile/src/features/connection/EnvironmentActivationSwitch.tsx around lines 27-30:
A successful toggle leaves `pending` set indefinitely, so if `props.enabled` later cycles back to the request's `previous` value, the switch re-enters a phantom pending state: `isPending` becomes `true`, the switch displays the stale `requested` value, and disables itself even though no request is in flight. The success path only clears `pending` on failure, never on success. Clear the matching request after success as well, while still guarding against replacing a newer request.

[DominicVonk]

Superseded by #5598. The composer enable action now ships with the durable activation model and management UI in one independently mergeable PR based directly on main.