[github-actions]

The daily sync resolved a merge conflict with upstream. It lands by itself when CI passes.

Run: https://github.com/HYRMedia-LLC/t3code/actions/runs/41511835984

Agent summary

I resolved the one conflict and the registry tests pass. But I couldn't finish vp run typecheck: the sandbox stops it before it reaches the server, web, desktop and mobile packages, so they haven't been typechecked.

Decision:

• apps/server/src/provider/ProviderInstanceRegistry.ts: kept the fork's launcher-aware create(...) call, which LiteLLM needs, and used upstream's new way of merging config secrets: secrets.config.length === 0 ? typedConfig : withSettingsSecrets(typedConfig, secrets.config). The old fork line spread secrets.config as an object, but upstream's feat(server): read source control host tokens from a secret provider pingdotgg/t3code#27756 made it an array, so that line would have been wrong. The fork's diff against upstream/main is now just the launcher lookup and its "cannot run through the launcher" fallback.

Checks:

• Markers: none left, and git diff --check is clean. Nothing is staged, so git still lists the file as UU.
• Other code: no other code uses the old object shape of secrets.config. The secret re-read path at line ~502 already uses the array type.
• Hardened patch: hardened.patch doesn't touch this file, so the resolution can't stop it applying. I couldn't run git apply --check because it needed approval.
• Lockfile: pnpm-lock.yaml wasn't conflicted, so I didn't run vp i.
• Tests: vp test run on ProviderInstanceRegistry.test.ts and ProviderInstanceRegistryHydration.test.ts passed, 2 files and 29 tests. The EROFS error printed after them is the GitHub summary writer hitting a read-only path, not a test failure. I ran them from the repo root because I couldn't change into apps/server.
• Typecheck: I ran vp run typecheck three times. Each run failed in scripts because it couldn't write scripts/tsconfig.tsbuildinfo on the read-only filesystem, which isn't a code error. That failure stops the run early. 16 of 20 packages passed, including contracts, provider-core, source-control-core and source-control-github. The sandbox also blocked running typecheck for one package and vp run --last-details.

Before committing, someone should run vp run typecheck (or vp run check:changed) and git apply --check .github/hardened/hardened.patch on a writable checkout. I expect the server to typecheck, since upstream already passes the same config type into driver.create, but that hasn't been confirmed.

Files that differ from the automatic merge

• apps/server/src/provider/ProviderInstanceRegistry.ts

Claude Opus 5.5 via Claude Code.

---

^{Open in [code]smith · Need help on this PR? Tag @codesmith-bot with what you need.}