Skip to content

chore(upstream): align Scient with T3 through f34ba437a5 - #607

Merged
yaacovcorcos merged 92 commits into
mainfrom
codex/t3-sync-f34ba437a5-20261019
Oct 20, 2026
Merged

yaacovcorcos merged 92 commits into
mainfrom
codex/t3-sync-f34ba437a5-20261019

Conversation

@yaacovcorcos

@yaacovcorcos yaacovcorcos commented Oct 19, 2026 •

Copy link
Copy Markdown
Contributor

Problem

Scient's prior official boundary is d8e9fd267e26b7680f035edc0b40db09d2685dbb. This integrates all 84 official commits through frozen f34ba437a5dec23a205ef5f670f7b10439ae98eb with literal ancestry, without enabling upstream publication or changing Scient product policy.

Result

  • Native V2 queue, Stop/Steer, delegated-child and provider updates composed with Scient's sole queue-release and result authorities.
  • Current-execution Stop matching excludes historical interrupts. Failed delegated roots wait for surviving native children, including older untagged runs, and settle through the existing parent-locked finalizer.
  • Incoming PDF/browser navigation retained. HTML-to-PDF export cannot publish the client-PDF fallback placeholder. Workspace/environment PDF.js readers, attachment previews, and browser tabs remain separate contexts.
  • Adopted upstream palette/navigation, model-identity settings merge, large-tree virtualization, browser/terminal/remote/provider fixes, React catalog and native PDF dependencies.
  • Standalone Scient image cards and inline assets now share workspace-edit refresh/coalescing. File-preview pixels survive capability refresh but cannot remain pinned across an explicit revision.
  • Retained Scient identity, authorization, FULL SQLite durability, immutable migration history (incoming migration becomes 068), analytics allowlist/consent, cloud/mobile/release holds.
  • Thin-host composition retains existing Scient modules and narrow mounts. Against the same official snapshot, added non-test host lines fall from 52,115/918 hosts to 50,794/857 hosts at the final source revision. The declared three policy hosts fall from 2,534 to 2,420 lines. These are structural measures, not behavioral proof or total product size.

History

Verification

Second catch-up (head 68919d6ec3, local Windows 11):

  • Hosted CI at f39e52c9a9 failed five server tests. All were incoming upstream expectations; none came from a catch-up interaction or a flake. Upstream #21473's "any client send releases a held queue" rule appears in SteeringCompletion (plain send after Stop) and ThreadLaunchService (direct send after failed worktree setup). Both are now marked Scient divergences under QueuedRunSend.ts's direct-send rule and noted in UPSTREAM.md. The OrchestratorMcpToolkit held-follow-up check called t3_thread_send instead of scient_thread_send. server.test.ts now expects upstream's feature.used call site, which the Scient analytics contract drops; a new conformance assertion covers that.
  • All package typechecks passed (49 tasks, 0 syntax-gate or type errors). vp fmt --check passed on 9,040 files. Diff check, upstream provenance and all five seam checks passed against 17f7bfb2f4.
  • Focused server runs: ThreadLaunchService, SteeringCompletion, QueuedRunSend, ThreadStop, QueuedStartRecovery and QueuedRunOrder passed completely. The MCP delegation test and the analytics test passed. Analytics conformance passed 4 tests. Pre-existing Windows-only failures, from fixtures and code unchanged from main: 16/50 NativeQueueHoldPolicy cases (: in temp-dir names), 13/249 server.test.ts cases (symlinks, POSIX MATLAB fixtures, directory fsync), and the Codex transcript fixture path. The MCP delegation test needs more than its 120 s budget on this host.
  • Local browser tests could not start Chromium. Hosted CI must qualify the pushed head.

Earlier qualification on 479dfd46d1/f39e52c9a9:
Local source qualification is complete, with the failed aggregate and bounded rerun recorded separately:

  • Independent queue/PDF follow-up review: no remaining findings in inspected repairs.
  • Focused: 195 queue tests, 366 repaired mixed tests, 83 browser tests, 34 live Mermaid Chromium tests. Latest tagged/untagged settlement + SQLite run: 53 passed; Linux icon fixtures: 17 passed.
  • Exact image-source review: no actionable findings. Focused follow-up: 1,892 tests across nine files passed, web types and scoped lint passed.
  • Serial gates on 479dfd46d1: formatting, lint, knip, all package typechecks, build, desktop smoke, brand and both diff checks passed.
  • The aggregate test run failed only in web: 14,696 passed, three dynamic-import timeouts. The affected files passed unchanged in isolation, 13 tests in 994 ms. The complete web workspace then passed with a synthetic home and pnpm --filter @t3tools/web test --maxWorkers=4: 14,699 tests / 1,087 files / 166.34s, without changing source, assertions or timeouts. Other workspace results are from the same-source aggregate run.
  • Five alignment seams, mobile static checks, synthetic release smoke and ancestry/provenance check passed.
  • Native Windows/Linux/mobile, real-provider and visual acceptance are not established by these checks.
  • Final isolated candidate launched at f39e52c9a9 with worktree-local synthetic state. Managed runner/app/backend ownership and loopback listeners were checked; renderer and backend environment endpoints returned HTTP 200. The app remains available for owner review. Interactive UI verification is blocked by absent built-in Browser tools; no alternate automation was substituted. Startup checks do not establish visual or feature acceptance. Any tested in-app agent turn must use Codex with Luna 6.
  • Hosted CI must qualify the final pushed revision separately. Earlier CI at 0ad0b7dde6 is not final-head evidence; its Windows Python 3.10 job failed during runner setup before checkout. No main merge or release is requested.

Documentation impact

Updated: docs/user/pdf-reader.md, docs/user/terminal.md, incoming user/provider guides, UPSTREAM.md, upstream-state.json, docs/internals/scient-fork-divergence.md and the exact alignment receipt.

Review and publication boundary

Draft only. No merge, merge queue, auto-merge, desktop release, publishing, cloud/mobile activation, telemetry-contract widening, or live-profile/credential operations authorized.

Harness: Factory Droid. Model identifier: not exposed in this session. Second owned-main catch-up and CI repairs: Claude Code, Claude Opus 5.5.

🤖 Generated with Claude Code

t3dotgg and others added 30 commits October 18, 2026 15:18
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…319)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… subagents (#21366)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… default app instead of revealing it (#16955)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…18340)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…he window (#14534)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ared against the cask (#18772)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… searching (#17943)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
flamboh and others added 15 commits October 19, 2026 10:29
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: kurisu <kurisu@nerv.no>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…022)

Co-authored-by: saphid <saphid@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…r (#11933)

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…f a generic error (#11340)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… there (#15940)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…options (#16581)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Compose native queue and child settlement updates, PDF browser fallback,
settings, model selection, and dependency changes with Scient-owned policy.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
Carry the landed runtime reconnect, replay workspace safety, and approved
release-note work without replaying the literal official merge.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
Use native SQLite blob views, parameterized Effect regression registration,
and filesystem case-sensitivity when checking Linux icon aliases.
Keep Linux's distinct-icon assertions on case-sensitive filesystems.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
@github-actions github-actions Bot added size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Oct 19, 2026
yaacovcorcos and others added 2 commits October 19, 2026 21:53
Reuse one pending-edit refresh policy for inline media and standalone image
cards. Keep retained file pixels across capability refreshes, but invalidate
the retained revision on workspace edits without pinning a pending URL.

Adapt browser fixtures to native platform modifiers, complete navigation
snapshots and real image decoding.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
Record literal merge and owned-main catch-up boundaries, protected policy,
independent reviews, separation measurements and exact local qualification.
Preserve failed aggregate attempts and the complete bounded web rerun.

Advance the upstream cursor to the reviewed frozen target without changing
release or publication authority.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
@github-actions

github-actions Bot commented Oct 19, 2026 •

Copy link
Copy Markdown
Contributor

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire 5.6 KiB 5.6 KiB 0 B (0.0%) 6.8 KiB ✅
Codex Thread snapshot wire 4.3 KiB 4.3 KiB 0 B (0.0%) 4.9 KiB ✅
Codex Live turn WebSocket wire 1.3 KiB 1.3 KiB 0 B (0.0%) 2.0 KiB ✅
Codex Live turn WebSocket decoded 26.2 KiB 26.2 KiB 0 B (0.0%) 29.3 KiB ✅
Codex Live turn messages 2 2 0 (0.0%) 8 ✅
Claude Total thread wire 5.6 KiB 5.6 KiB 0 B (0.0%) 6.8 KiB ✅
Claude Thread snapshot wire 4.3 KiB 4.3 KiB 0 B (0.0%) 4.9 KiB ✅
Claude Live turn WebSocket wire 1.3 KiB 1.3 KiB 0 B (0.0%) 2.0 KiB ✅
Claude Live turn WebSocket decoded 26.6 KiB 26.6 KiB 0 B (0.0%) 29.3 KiB ✅
Claude Live turn messages 2 2 0 (0.0%) 8 ✅

Baseline: 17f7bfb · PR result: 68919d6 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.
Full compact HTTP snapshot with live cursor.

  • Codex decoded thread snapshot: 133.1 KiB
  • Claude decoded thread snapshot: 133.4 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

Yaacov and others added 3 commits October 20, 2026 07:43
Carry the landed web and server flake fixes, CI queue reuse, Antigravity
console and ACP prompt-teardown seams, OMP late tool updates and bigint
workspace stats without replaying the literal official merge.

Compose the anchor-measurement test with main's longer wait while keeping
the alignment's tolerance for repeat measurements after real image decoding.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…olicy

Upstream's held-queue release tests assert its rule that any client send
releases a held queue. Scient's QueuedRunSend releases only for an ordinary
direct send that starts its own run, so a plain send Stop turns into a
queued message joins the held queue, and a direct send after failed
worktree setup still releases it. Mark both expectations as divergences
and record the rule in UPSTREAM.md.

Call Scient's scient_thread_send tool in the incoming held-follow-up
check, and expect the inherited feature.used call site, which Scient's
analytics contract drops.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Record catch-up merge a0e936c of main 17f7bfb beside the earlier
7d6bd58 catch-up, its single test conflict, the classified hosted
failures and the local qualification. The official cursor, owned base
and lastRefreshMerge are unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@yaacovcorcos
yaacovcorcos marked this pull request as ready for review October 20, 2026 06:00
@yaacovcorcos
yaacovcorcos added this pull request to the merge queue Oct 20, 2026
Merged via the queue into main with commit acd9e14 Oct 20, 2026
83 of 85 checks passed
@yaacovcorcos
yaacovcorcos deleted the codex/t3-sync-f34ba437a5-20261019 branch October 20, 2026 06:49
yaacovcorcos pushed a commit to nattikahana/scient-desktop that referenced this pull request Oct 20, 2026
Bring ScientFactory#353 up to current main, including the T3 alignments ScientFactory#593 and ScientFactory#607
(React Compiler migration, browser test project), ScientFactory#596, ScientFactory#601, ScientFactory#603-ScientFactory#606,
ScientFactory#608-ScientFactory#610 and ScientFactory#567.

Composition:
- Workspace writes: ScientFactory#353's mutation service keeps main's known-workspace
  boundary and Git-folder write denial. Every write path (write, create,
  binary write, delete, rename, retained replace/remove, inspect) is
  authorized first, and the mutation lock re-checks protected paths on
  each non-history resolution. Test layers provide KnownWorkspaces.
- Web: conflicted files follow main's React Compiler patterns (no manual
  memo, refs synced in layout effects, render-phase resets, effect
  events, try/finally in module helpers) with ScientFactory#353's behaviour on top,
  including ScientLatexSurface, the PDF reader, the file preview panel,
  save coordinator, workspace refresh, Pandoc tool and source PDF preview.
- Tests moved to main's browser project are ported (createRoot, async
  act); ScientFactory#353's deletions of the Markdown rename button and its seam test
  are kept.
- pnpm-lock.yaml regenerated with pnpm install.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.