Skip to content

fix(fork): merge upstream 15702a9 into patch/bots - #96

Merged
fireboltdude1357 merged 15 commits into
patch/botsfrom
fix/bots-upstream-15702a9
Oct 25, 2026
Merged

fireboltdude1357 merged 15 commits into
patch/botsfrom
fix/bots-upstream-15702a9

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because this patch conflicts with upstream commit 15702a9.

Upstream's pingdotgg#24760 stops threads from flashing in the inbox before they settle. Shelf placement now reads a working observer, and completion notifications now fire from a timer.

  • packages/client-runtime/src/state/threadInbox.ts and its test: kept upstream's diagnostics comment and test imports, plus this patch's bot imports.
  • apps/mobile/src/features/threads/threadListV2.ts and useThreadListV2.ts: kept upstream's new isWorking input next to botShelfExpanded. Bot threads still go to the Bots shelf before the working check.
  • apps/web/src/components/Sidebar.tsx: bot threads go to the Bots shelf before upstream's working check, which now uses the observer.
  • apps/web/src/components/ThreadNotificationCoordinator.tsx: took upstream's timer-based flow. This patch's rule that bot threads only notify while they need the user moved into present(), where upstream now shows notifications. The rule checks the thread at the moment the notification would show.

Verification:

  • vp run typecheck in apps/web, apps/mobile and packages/client-runtime: 0 errors.
  • vp test run: threadInbox.test.ts 25 passed, mobile threadListV2.test.ts 65 passed, web Sidebar.logic.test.ts 60 passed.
  • vp lint on the resolved files: no errors.
  • In a scratch worktree detached at 15702a9, patch/release, this branch, patch/cache-expiry-compaction, patch/mobile-launch-crash and patch/mobile-fork-identity merge with no conflicts. The repo-wide vp run typecheck the build runs passes all 34 tasks.
  • Not checked in a browser or on a device.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

maria-rcks and others added 15 commits October 25, 2026 04:03
…he list (pingdotgg#24749)

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

With the Working shelf on, a thread that stops working stays there for 2s. A server auto-settle in that window sends it straight to Settled, so threads no longer flash in the inbox and vanish. "Thread completed" waits the same 2s and fires once.

The server now settles fast enough to land inside the window: it reads a pull request when a shell merge or close command ends, sweeps a thread when its background work ends, and runs per-thread settle checks in parallel, one per thread at a time.

Takes over pingdotgg#22458.

Co-authored-by: Omar <76748259+omar9848492@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…mbers drafts (pingdotgg#24750)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Upstream pingdotgg#24760 stops threads flashing in the inbox before they settle:
shelf placement now reads a working observer, and completion
notifications fire from a timer.
- threadInbox.ts and its test: keep upstream's diagnostics comment and
  imports, plus this patch's bot imports.
- threadListV2.ts, useThreadListV2.ts: keep upstream's isWorking input next
  to botShelfExpanded, and the Bots shelf branch before the working check.
- Sidebar.tsx: bot threads go to the Bots shelf before upstream's
  observed-working check.
- ThreadNotificationCoordinator.tsx: take upstream's timer-based flow and
  move the bot skip into present(), where notifications are now shown.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@fireboltdude1357
fireboltdude1357 merged commit 3fb177c into patch/bots Oct 25, 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.

4 participants