Skip to content

fix(fork): merge upstream 680152e into patch/home - #71

Merged
fireboltdude1357 merged 18 commits into
patch/homefrom
fix/home-upstream-680152e
Oct 21, 2026
Merged

fireboltdude1357 merged 18 commits into
patch/homefrom
fix/home-upstream-680152e

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because this patch conflicts with upstream commit 680152e.

Upstream's pingdotgg#22889 replaced the orchestrator's full model catalog with a short list: pinned models, a search input and an omittedModels count. Home lists models on other environments through the same code.

  • apps/server/src/mcp/OrchestratorMcpService.ts: took upstream's short list and its bare-uuid thread_not_found hint (fix(mcp): point a bare thread uuid at its mcp: thread in thread_not_found pingdotgg/t3code#22452). Home's exported providerCapabilities helper now wraps upstream's listing, so it takes the favorites, the caller's model and search that upstream's listing needs. Home's other exports, projectId on list items and readThreadPage are kept.
  • toolkits/orchestrator/tools.ts and handlers.ts: upstream's description and input, plus Home's environmentId and its routing to other environments.
  • packages/contracts/src/orchestratorMcp.ts: OrchestratorMcpCapabilitiesInput gains Home's environmentId, replacing the patch's inline struct.
  • packages/contracts/src/home.ts and apps/server/src/home/FleetService.ts: the fleet capabilities call takes the same input, so search reaches the remote environment. Home's own model isn't pinned in another environment's list, because that model lives on the hub, but search still finds any model. One new test covers search on a remote catalog.

Verification:

  • pnpm install --no-frozen-lockfile --fix-lockfile: done. The committed lockfile matches upstream's.
  • pnpm run typecheck in packages/contracts and apps/server, and vp run typecheck in apps/web and apps/mobile: 0 errors.
  • vp test run in apps/server on the patch's test files plus OrchestratorMcpService.test.ts: 197 passed.
  • vp lint on the resolved files reports 14 errors. 13 already exist on patch/home: prefer-effect-fn on FleetService's handlers and two section dividers in home.ts. The new one is on FleetService's capabilities handler, which now takes input the same way as its sibling handlers.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

t3dotgg and others added 18 commits October 21, 2026 03:36
… setting (pingdotgg#22841)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nstall (pingdotgg#22855)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
…s AGENTS.md (pingdotgg#22848)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… shell (pingdotgg#22856)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t found" (pingdotgg#22850)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t for 3 minutes (pingdotgg#22903)

On desktop, an abandoned browser sign-in blocked every T3 Connect sign-in for 3 minutes. A new attempt now replaces the stale Clerk flow, and a Cancel bar resets the sheet. Takeover of pingdotgg#22708.

Co-authored-by: steve-ai-vibe <steve.ai.vibe@gmail.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…character catalog dump (pingdotgg#22889)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
- OrchestratorMcpService.ts: take upstream's short model list and bare-uuid
  thread_not_found hint; providerCapabilities is again the shared exported
  helper, now wrapping upstream's listing (pins, search, omittedModels).
- toolkits/orchestrator/tools.ts: upstream's description and
  OrchestratorMcpCapabilitiesInput, plus Home's environmentId sentence.
- toolkits/orchestrator/handlers.ts: Home's remote routing, passing input
  to the local capabilities call.
- contracts orchestratorMcp.ts: OrchestratorMcpCapabilitiesInput gains
  Home's environmentId; contracts home.ts: the fleet capabilities op takes
  that input, so search reaches the other environment.
- home/FleetService.ts: capabilities uses the new helper and forwards
  search; FleetService.test.ts covers it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@fireboltdude1357
fireboltdude1357 merged commit ed42bb6 into patch/home Oct 21, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants