Skip to content

chore: merge upstream v0.1.7-nightly.20261101.4035 - #208

Merged
chamaquita-d3[bot] merged 16 commits into
custom-nightlyfrom
chamaquita/upstream-v0.1.7-nightly.20261101.4035
Nov 1, 2026
Merged

chore: merge upstream v0.1.7-nightly.20261101.4035#208
chamaquita-d3[bot] merged 16 commits into
custom-nightlyfrom
chamaquita/upstream-v0.1.7-nightly.20261101.4035

Conversation

@chamaquita-d3

@chamaquita-d3 chamaquita-d3 Bot commented Nov 1, 2026

Copy link
Copy Markdown

Closes #207

Merges upstream v0.1.7-nightly.20261101.4035 into custom-nightly.

File:lines Class custom-nightly Upstream Kept Why
apps/web/src/components/ChatView.tsx:1-5 (imports) disjoint imports CustomBackground imports ChildThreadApprovals (pingdotgg#28516) both imports The sides added different imports at the same spot, and both components are used further down the file.
pnpm-lock.yaml lockfile fork dependency additions upstream lockfile upstream's file, then pnpm install --ignore-scripts Reconciled with the merged manifests. The result matches custom-nightly's lockfile, so the fork's dependencies are intact.

No other fixes were needed. CI will run the typecheck and desktop build.

🤖 Generated with Claude Code

maria-rcks and others added 16 commits November 1, 2026 06:52
@maria-rcks
feat(mcp): preview_open goes straight to a dev-server port (pingdotgg…
6328c84 
…#28027)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@t3dotgg @claude
fix(server): interrupted scheduled task runs no longer stay busy (pin…
ce9e016 
…gdotgg#28474)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@Yash-Singh1
fix(desktop): preserve host focus on preview pointer presses (pingdot…
37d7615 
…gg#28549)
@Yash-Singh1
fix(web): add spacing above PR detail metadata (pingdotgg#28573)
b50d8a1
@Yash-Singh1
feat(dev): add startup profiling for cold-start diagnosis (pingdotgg#…
0bc95fc 
…28566)
@Yash-Singh1
feat(clients): surface child approvals in parent threads (pingdotgg#2…
70f475f 
…8516)
@t3dotgg @claude
feat(release): update notes lead with up to 7 highlights (pingdotgg#2…
460b88b 
…8593)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
test(server): pin clock in saved-usage window test (pingdotgg#28603)
1280ccd 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
fix(web): sidebar project filter no longer refocuses after a pick (pi…
da21606 
…ngdotgg#28605)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@Yash-Singh1
feat(desktop): prepare server bytecode cache in native builds (pingdo…
58a407c 
…tgg#28572)
@Yash-Singh1
fix(desktop): discover shell environment without blocking startup (pi…
8b4de61 
…ngdotgg#28556)
@Yash-Singh1
fix(server): refresh Changes totals after remote polls (pingdotgg#28600)
8760d06
@Yash-Singh1
perf(codex): trace app server request latency (pingdotgg#28666)
2b1021c
@Yash-Singh1
fix(web): align pull request file viewed checkboxes (pingdotgg#28665)
82b10d5
@Yash-Singh1
fix(desktop): skip prepared server bytecode on Linux (pingdotgg#28700)
80120b1
@chamaquita-d3
Merge tag 'v0.1.7-nightly.20261101.4035' into chamaquita/upstream-v0.…
8b22b76 
…1.7-nightly.20261101.4035

# Conflicts:
#	apps/web/src/components/ChatView.tsx
@chamaquita-d3 chamaquita-d3 Bot mentioned this pull request Nov 1, 2026
Closed
@chamaquita-d3
chamaquita-d3 Bot merged commit cddd416 into custom-nightly Nov 1, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Upstream nightly v0.1.7-nightly.20261101.4035: make it merge and build on custom-nightly

3 participants

@maria-rcks @t3dotgg @Yash-Singh1