# fix: reconcile main updates with orchestration v2 · pingdotgg/t3code

[View on GitCafe](https://git.cafe/pingdotgg/t3code/commit/71dfb8e551b227fdb2e332fc96c552062f6598c1)

Repository: [pingdotgg/t3code](https://git.cafe/pingdotgg/t3code)

Visibility: public

Requested revision: 71dfb8e551b227fdb2e332fc96c552062f6598c1

Requested commit: 71dfb8e551b227fdb2e332fc96c552062f6598c1

Commit: 71dfb8e551b227fdb2e332fc96c552062f6598c1

Tree: 9cb06c77ec47b1a1fd03b136707b3954e1969c68

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
fix: reconcile main updates with orchestration v2

Retain main's changes while preserving v2 orchestration, queue/steer controls,
composer-only tasks, timeline timers, and mobile scrolling fixes.

Port opt-in restart continuation through durable v2 effects, with shutdown
race guards, activation gating, retry deduplication, and native Codex resume.
Use narrow projection reads for control effects and runtime-request replies.
Surface Claude fallback notices without failing the turn or hiding the notice.
Report missing workspace folders before provider startup.

Carry over custom models and prices, bounded client caches and stream cleanup,
lazy image loading, persistent changed-file trees and sidebar filters, Safari
cookie import, theme fixes, POSIX file-link case, private-host favicon filtering,
native provider update paths, and platform portability updates.
Migration ids remain unchanged.

Validated scoped typechecks and focused server, web, mobile, client-runtime,
contracts, desktop, shared, SSH, script, and resource-monitor tests. Preserved
all 347 original commits and checked the final tree against both saved tips.

Model: GPT-6. Harness: Codex.

```

## Parents

- [7fe7d32e413ef832567d2d76b2cba6e3155c9b51](https://git.cafe/pingdotgg/t3code/commit/7fe7d32e413ef832567d2d76b2cba6e3155c9b51?format=markdown)

[Source at this commit](https://git.cafe/pingdotgg/t3code/tree/71dfb8e551b227fdb2e332fc96c552062f6598c1?format=markdown)