Repository navigation
fix(fork): merge upstream 5b2ee39 and the home fix into patch/bots - #66
Merged
Merged
Conversation
fix(fork): merge upstream 67c0fc0 into patch/home
…ter (pingdotgg#19964) (pingdotgg#22395) Co-authored-by: Julius Marminge <julius@marminge.se>
…tgg#22253) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t fields (pingdotgg#22203) Co-authored-by: Claude Code <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22187) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…22390) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22427) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…vent in act (pingdotgg#22424) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ap (pingdotgg#22408) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…; fixture README (pingdotgg#22453) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#20812) Co-authored-by: Pixel Perfect <me@pixp.cc> Co-authored-by: Theo Browne <me@t3.gg> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
…g#22194) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…erShell (pingdotgg#22494) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…sts over REST (pingdotgg#22495) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22521) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ction (pingdotgg#22526) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tes (pingdotgg#22524) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#22533) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#22570) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22557) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22575) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#22561) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…event-driven (pingdotgg#22565) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ing parent (pingdotgg#22581) Co-authored-by: syberia <n.kuhtin@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#22588) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#22589) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#22591) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#22592) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#22593) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#22599) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#22556) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rts (pingdotgg#22602) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Upstream pruned low-value tests. I kept upstream's versions and added back only Home's own tests and setup: - OrchestratorMcpToolkit.integration.test.ts: took upstream's pruned file and re-added notHomeLayer to the remaining replay test's layer. - toolkits/project/handlers.test.ts: took upstream's file, re-added the "makes Home name a project" test and its imports, and notHomeLayer in clientLaunchHarness. - ManagedProjectFolders.test.ts: took upstream's file and re-added the isInHomeFolder and refreshHomeAgents tests. - Sidebar.logic.test.ts: took upstream's file and re-added the "hides only the current Home thread" test and its import. - chatThreadActions.test.ts: took upstream's file and re-added the three Home project-ref tests with the createContext helper and ids they use. - toolkits/orchestrator/tools.test.ts, toolkits/worktree/registration.test.ts: accepted upstream's deletion. Home only adjusted upstream tests there. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Resolved files that Home owns the same way fix/home-upstream-5b2ee39 does, and re-added the bot tests and code on top. The next commit describes each file. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The previous commit merged upstream 5b2ee39. This one merges fix/home-upstream-5b2ee39 and fixes what typecheck found. - Files Home owns (OrchestratorMcpToolkit.integration.test.ts, ManagedProjectFolders.test.ts, chatThreadActions.test.ts, and the deleted orchestrator/tools.test.ts and worktree/registration.test.ts): same as the home fix. Bots made no changes of its own there. - toolkits/project/handlers.test.ts: the home fix's file, plus the bot launch test, the threadBotName import, and the "Home never launches as a bot" check in Home's test. The callers that needed lineage were in tests upstream deleted. - Sidebar.logic.test.ts: the home fix's file, plus the Bots shelf rows and the "never drops into the Bots shelf" test. - OrchestratorMcpService.ts: kept upstream's new isOrchestrationV2WorkActive import next to the bot imports. Bots' create-thread id change merged cleanly. - OrchestratorMcpService.test.ts: upstream's file, plus the bot create-threads test, its import, and lineage on parentProjection. - AgentAwarenessRelay.test.ts: upstream's file, plus the two bot thread publishing tests. Dropped the plan.updated predicate test because upstream made shouldPublishAgentAwarenessEvent private. - mobile storage.test.ts: accepted upstream's pruning. Bots only added the bot shelf flag to a test upstream deleted. - mobile threadListV2.ts: Bots shelf rows now set wokeAt like the other card rows, because upstream made it required (pingdotgg#21394). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The fork's nightly build fails because this patch conflicts with upstream commit 5b2ee39. This branch merges 5b2ee39, then the home fix (
fix/home-upstream-5b2ee39), since bots builds on home.toolkits/project/handlers.test.ts: the home fix's file plus the bot launch test and the "Home never launches as a bot" check. Thelineagelines bots had added were in tests upstream deleted.Sidebar.logic.test.ts: the home fix's file plus the Bots shelf rows and the "never drops into the Bots shelf" test.OrchestratorMcpService.ts: kept upstream's newisOrchestrationV2WorkActiveimport next to the patch'sbotThreadIdandthreadOwnerBotName. Upstream's fix(server): idle orphaned follow-ups can be cancelled without a running parent pingdotgg/t3code#22581 change and the patch's create-thread ID change merged cleanly.OrchestratorMcpService.test.tsandAgentAwarenessRelay.test.ts: upstream's files plus the patch's bot tests. Upstream madeshouldPublishAgentAwarenessEventprivate in test: delete 11k low-signal tests so CI runs faster and flakes less pingdotgg/t3code#22557, so the patch's test that called it directly is gone. The patch'splan.updatedchange in the relay stays, but no test covers it now.storage.test.ts: accepted upstream's prune. Bots had only added a shelf flag to a test upstream deleted.threadListV2.ts: no conflict, but upstream fix(mobile): thread rows show wake status and elapsed time pingdotgg/t3code#21394 madewokeAtrequired on thread rows. Bots shelf rows now set it withresolveThreadListV2WokeAt, as the other card rows do.Verification:
pnpm install --no-frozen-lockfile: done.pnpm run typecheckinapps/server,apps/web,apps/mobile,apps/desktop,packages/contracts,packages/client-runtimeandpackages/shared: 0 errors.vp test runon the patch's test files:apps/server202 passed,apps/web74,apps/mobile60,packages/client-runtime5,packages/contracts4,packages/shared18.patch/mobile-launch-crashmerge with no conflicts.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code