Skip to content

fix(fork): merge upstream c6ca605 into patch/bots - #215

Merged
fireboltdude1357 merged 5 commits into
patch/botsfrom
fix/bots-upstream-c6ca605
Nov 9, 2026
Merged

fireboltdude1357 merged 5 commits into
patch/botsfrom
fix/bots-upstream-c6ca605

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/bots conflicts with upstream c6ca605 in packages/shared/src/agentAwareness.ts.

Upstream pingdotgg#24079 sends phones the approval push when a subagent waits. It adds isProviderNativeSubagentThread and RuntimeRequestId to the @t3tools/contracts import, next to the patch's threadBotName. I kept all of them.

On a scratch stack of upstream c6ca605 with all 23 patches and this branch, pnpm install --no-frozen-lockfile, vp run typecheck (41 of 41) and vp test run on the 47 test files the patches touch (1172 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

shivamhwp and others added 5 commits November 9, 2026 12:35
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… on iPhone Duo (pingdotgg#33213)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#24079)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
# Conflicts:
#	packages/shared/src/agentAwareness.ts
@fireboltdude1357
fireboltdude1357 merged commit e8530b0 into patch/bots Nov 9, 2026
2 checks 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.

3 participants