Skip to content

chore(sync): merge 97 upstream commits through 2026-11-15 (0.1.10 line) - #445

Merged
shuv1337 merged 101 commits into
mainfrom
t3/upstream-sync-0-1-10
Nov 16, 2026
Merged

shuv1337 merged 101 commits into
mainfrom
t3/upstream-sync-0-1-10

Conversation

@shuv1337

@shuv1337 shuv1337 commented Nov 16, 2026 •

Copy link
Copy Markdown
Owner

Problem

Catch the fork up to upstream's 0.1.10 source line, preserving fork behavior rather than changing a version label. This merges the pinned upstream main ad1b1365999c92c3fc7a054e7f3af84623f74fee: 97 commits past our last sync (50a2f5b9) and nine beyond the published upstream nightly at investigation time. No later upstream commits are included.

  • Fork base: 8c7a3e5865a20a2dbf959a10ad5822c560f55fbe
  • Final reviewed head: 1f639fecde326021f54fa426e5a9b1b47b288242
  • Merge commit e26bba26294dcb8cc6108a0ebb3306bf7e4d0072 has exactly the fork base and upstream pin as parents. No rebase, squash or cherry-picking.
  • 295 files, +10830/−1707.

Integration

Only four files conflicted:

  • Mobile usage: retain upstream's centered/wide/header-only layout and the fork's Cursor Keychain prompts and refresh wiring.
  • CLI service: combine upstream memory-controller availability with fork command/channel identity and messages.
  • Same-host delegation: return upstream's { text, executedModel } shape, selecting the actual model from the active run attempt, not an unrelated later provider turn.
  • Context budget: measured MCP tool-list ceiling 51812, down from 51814; Claude 5930 and Codex 7324 unchanged. No budget override or tool-text trimming.

Follow-ups supply the fork-only mobile header field and voice-service mocks required by new upstream code, and use the existing owned-home fixture in the new Tailscale pairing test. Sol's test-only follow-up extends the existing local shared/worktree cases with real projected provider turns and an unrelated-attempt sentinel; no production mutation remains.

Fork orchestration/delegation, pools and named seats, spent-instance continuation, shared MCP, per-thread autoSettle, Cursor integration, Ocean-dark/no-star defaults, branding/channel homes, Windows payload guards, formatter hoist and startup recovery are preserved. #444's issued parent-thread credentials and native-child/sibling isolation remain intact alongside upstream discovery filtering. Migration 096 is appended; the independent fork ledger 1–7 and receipt/principal/replay semantics are unchanged.

Verification

Both independent final-head reviews approve: Astra covers production integration and all authored conflicts; DeepSeek covers client/native/CI and cross-family review of Sol's follow-up. No unresolved review findings.

  • Primary final check:changed: every gate green; 42-package typecheck, 135 files / 4770 passed / eight existing skips, 84-file React Compiler and additional 89-test selection.
  • Builder's frozen install, budget 2/2 and nine changed browser files / 72 real-Chromium tests passed.
  • CI Full 43815724656: 18/18 successful on this exact head.
  • Windows shim/archive 43815727827: both successful on this exact head.
  • Required CI, Agent context budget and both Socket checks passed.
  • Merged main 18d7ab9d28baf550c6bb39a949729735024dbbde: automatic CI 43820605278 passed. Its tree is identical to the reviewed head and contains the pinned upstream commit.
  • Attempt-scoped model mutation: both existing cases fail with global-last-turn selection and pass after restoration. Assertions also cover the persisted result and summary note; the mutation specifically targets model selection.
  • Primary isolated Browser-panel pass: only free Replay enabled, completed sandbox run, Unicode composer/Enter submission, rich replay/activity/code/table, persisted-thread reload, Ocean/dark defaults and restore, and 390px responsive web without document overflow. Owned processes/tab closed and ports verified clear.

Full validation and GitHub-hosted before/after, Appearance and responsive captures. The before capture is a retained #442 baseline reference whose web/client-runtime source is unchanged through this PR's base, not a fresh baseline build.

Limits

No native iOS/Android device run, macOS packaging, full Windows Electron installer/payload verification, live-provider turn, installed native MCP identity/wakeup proof, or live scheduling/delegation test. Paid mcp-tool-use and thread-titles evals were not run. CI native static analysis is not native-device proof.

No live s2/shuvcode state/config change, app installation/update, manual release, hook/sandbox bypass, extra application copy or full local app build. One implementation checkout; disk remained above the 20 GiB floor (latest 105.4 GB free).

Implementation: DeepSeek V4.1 Flash / OpenCode (shuvcode). Review: GPT-6 Astra / Pi and DeepSeek / OpenCode. Primary proof/integration: GPT-6.1 Sol / Pi (shuvpi).

juliusmarminge and others added 30 commits November 15, 2026 01:08
…es (pingdotgg#37117)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…er launch (pingdotgg#29734)

Co-authored-by: maria-rcks <maria@kuuro.net>
pingdotgg#32764)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#33288)

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…37113)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#37116)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…7103)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#37104)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#37133)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#37121)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…37139)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…names (pingdotgg#37152)

Co-authored-by: lowlyleon <183293296+lowlyleon@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ory has none (pingdotgg#37161)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…w 413 HTML (pingdotgg#37156)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ker in the same session (pingdotgg#37165)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#37193)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#37179)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
ahatzz11 and others added 27 commits November 15, 2026 14:27
…ds (pingdotgg#37364)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ode's hand-back frame (pingdotgg#37355)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#37395)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#37083)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nator's busy lock (pingdotgg#37470)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Upstream pin ad1b136 (latest nightly
v0.1.10-nightly.20261116.4761 line). Previous sync 50a2f5b.

# Conflicts:
#	apps/mobile/src/features/usage/UsageRouteScreen.tsx
#	apps/server/src/cli/service.ts
#	apps/server/src/peer/RemoteDelegation.ts
#	apps/server/src/provider/agentContextBudget.json
…with fork services

- ws.test.ts: mock the fork's VoiceTools/VoiceProvider/VoiceAuditLog for upstream's new
  WebSocket compression negotiation test, which builds Ws.layer directly.
- mobile usage.ts: the new no-load environments atom needs the fork's
  needsCursorKeychainAccess field.
- agentContextBudget.json: measured MCP tool list is 51812 bytes, two under the fork
  ceiling; lowering to the measured value, no ceiling raised.
The fork's ensureProductHome refuses a non-empty home without .product-identity,
so the upstream pair test that pre-seeds userdata must claim the home the way every
other test in the file does. Assertions unchanged.
@shuv1337

Copy link
Copy Markdown
Owner Author

Final validation — 1f639fecde326021f54fa426e5a9b1b47b288242

  • Astra approves the production merge/conflicts; DeepSeek approves the client/native/CI slice and cross-family review of Sol's test follow-up. Both reviewed this exact head; no unresolved findings.
  • Primary final check:changed: all gates green, 42-package types, 135 files / 4770 passed / eight existing skips, 84-file React Compiler, additional 89-test selection passed.
  • CI Full 43815724656: 18/18 successful. Windows shim + built CLI archive 43815727827: both successful. Required CI, context budget and Socket checks passed.
  • Same-host shared/worktree cases now seed real active-attempt provider turns plus a newer unrelated-attempt sentinel. Assertions cover result, summary note and task_status.executedModel. Replacing attempt-scoped model selection with the last global provider turn fails both cases; restored code passes both. The mutation specifically proves model selection, not an independently mutated summary-note path.

Primary isolated client pass

Fresh owned home, no live database/settings/secrets copied, no seed or automatic project import. All eleven real provider entries disabled before startup; only the free Replay provider enabled. A read-only sandbox query confirmed the sole run was devReplay, completed.

Verified onboarding, Unicode composer/Enter submission, streamed rich replay and expanded activity, syntax-highlighted code/table, persisted-thread reload, Ocean + dark defaults, Light/Iris → confirmed Restore device defaults → Ocean/dark, and responsive web at 390 CSS px without document overflow. No app console errors observed. This is browser verification, not native mobile/Electron or real-provider verification.

Owned preview tab, captured development process tree and Plannotator process are closed; ports 16123, 8083 and 43139 verified clear. No live s2/shuvcode change, install, manual release, paid turn or live scheduling/delegation test.

Visual evidence

The before image is the retained #442 candidate capture, not a fresh baseline build. apps/web and packages/client-runtime are unchanged from that reviewed candidate (c9af87a6) through this PR's base (8c7a3e5); the old fixture and capture scale differ. The remaining images are fresh captures of this exact final head.

Before — prior baseline web capture

Before: prior baseline rich replay

After — final-head rich replay

After: final-head rich replay

Final-head Appearance defaults

Ocean and dark selected

Final-head responsive web, 390 CSS px

Responsive web rich replay

Implementation: DeepSeek V4.1 Flash / OpenCode (shuvcode). Reviews: GPT-6 Astra / Pi and DeepSeek / OpenCode. Primary proof and integration: GPT-6.1 Sol / Pi (shuvpi).

@shuv1337
shuv1337 merged commit 18d7ab9 into main Nov 16, 2026
26 checks passed
@shuv1337

Copy link
Copy Markdown
Owner Author

Merged as 18d7ab9 (November 15, 22:59:33 PST). Automatic merged-main CI 43820605278 passed. The merge tree equals the exact independently reviewed/validated head, with pinned upstream ad1b136 intact. Local main is clean; owned UI processes/tab are closed and test ports clear; PR watch is off. No manual release or installation performed. — GPT-6.1 Sol / Pi (shuvpi)

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.