Skip to content

Upstream sync 2026-10-31: 401 upstream commits #265

Closed

Description

@tannerpolley

Sync main (da7da71) with upstream nightly v0.1.7-nightly.20261031.3991 (commit 15fe283). It includes upstream's v0.1.6 release: side chats beside the main thread, pinned favorite projects and archived projects, reviewing local commits in the Diff pane, 1Password secret providers, a combined model and effort picker, a context meter, and desktop back/forward navigation.

Run early (owner asked to get the newly announced upstream features live); tomorrow's scheduled run will skip if this is merged.

Conflicts (git merge-tree --write-tree --name-only --no-messages main <target>): 61 files, 99 conflict blocks.

Activity

  1. tannerpolley commented on Oct 31, 2026

    @tannerpolley
    OwnerAuthor

    T3 Code status: Unavailable

    Issue: #265 Upstream sync 2026-10-31: 401 upstream commits

    Thread: thread:delegated-task:command%3Amcp%3A66d39c35-d3cf-4d02-bb35-a21c95b55dac%3Adelegate-task%3Async-2026-10-31-merge

    Model: gpt-6.1-sol

    Branch: issue-265-upstream-sync-2026-10-31-401-upstream

    Updated: 2026-11-13T05:10:30.806Z

  2. tannerpolley commented on Oct 31, 2026

    @tannerpolley
    OwnerAuthor

    T3 Code closeout: done

    Issue: #265 Upstream sync 2026-10-31: 401 upstream commits
    Thread: thread:delegated-task:command%3Amcp%3A66d39c35-d3cf-4d02-bb35-a21c95b55dac%3Adelegate-task%3Async-2026-10-31-merge
    Model: gpt-6.1-sol
    Branch: issue-265-upstream-sync-2026-10-31-401-upstream
    Completed: 2026-10-31T22:10:03.171Z

    Completed the local merge in commit 3db991c2d6cc8671fc762dca5620812d4d47e5ce on issue-265-upstream-sync-2026-10-31-401-upstream.

    The commit has the requested base and pinned upstream commit as its two parents. Resolved 61 conflicted files / 99 blocks. The working tree is clean. No push, PR, or modification of main.

    Verification completed:

    • 27 affected packages type-checked individually, including desktop.
    • 512 non-browser test files ran; every initial failure passed in focused reruns.
    • 83 browser files / 475 tests passed in the final single run, after type checks and non-browser checks passed.
    • Every adjacent *.fork.test.ts beside the conflicted files was included.
    • Fixture-database migration tests, MCP core tests, and the context-budget test passed. The measured budget is 5938 / 7668 / 72558 bytes.
    • The commit hook passed formatting and lint. Its sole failure was the known Commit hook fails on every TypeScript change: 74 unused exports on main #256 baseline of 74 unused exports, so I used the authorized --no-verify exception.

    The exact lost-code audit ran against committed HEAD: 24 flagged hunks across 209 jointly changed files — 18 retained with changed structure, six replaced by upstream, zero unresolved drops, zero deleted fork files, and zero unimported fork files. Every judgment and each initially failing test’s cause is recorded in the implementation report. The raw final audit is retained alongside it.

    Restorations and merge fixes:

    • Restored lineage detail rows and model, effort, and workspace metadata.
    • Restored previous-agent clearing and automatic clearing.
    • Restored per-row and expand/collapse-all controls.
    • Restored draggable thread references and missing-shell detail guards.
    • Restored background command and monitor rows.
    • Restored repository identity on the relocated thread details panel.
    • Restored prompt-injected effort filtering.
    • Restored signed-file-URL refresh on workspace and reveal changes.
    • Restored project identity for fork appearance overrides.
    • Restored environment-only project lending when opening pull requests.
    • Retained notification observations across reconnects.
    • Prevented process-parent scans when listener discovery is disabled.
    • Restored owner-visible routed child questions while excluding side chats.
    • Restored upstream’s final recovery-settings check before worktree cleanup.
    • Restored upstream navigation for idle children omitted from the shell.

    Fork code dropped or replaced has these upstream owners:

    Removed fork behavior Upstream replacement
    Generic listener probing and unidentified-listener handling — three audit flags PortScanner.probeWebServers: probe configured URLs and list owned listeners.
    Duplicate .git and special-file filtering WorkspaceEntries: entry-kind filtering and symlink resolution.
    Fork remote-relationship headings and provider lookup RemoteSubagentRow and DelegatedFromRow.
    Duplicate provider-stack markup SidebarThreadRow.titleLineIcons.
    Three-tab eviction and its two tests ServerBrowser capacity reservations: eight tabs per agent and 32 per server. The fork setting now controls stalled-tab recovery.
    Missing-shell navigation restrictions Upstream openThread and workflow member navigation.
    Automatic favicon subscription wiring AutomaticProjectFavicon; fork custom icons remain.

    Remaining limits: one Windows-only uninstall test was skipped on Linux. Integrated real-client UI verification, desktop packaging, and paid model evals remain unverified; mobile was out of scope. git diff --check reports nine blank-context whitespace notices inside two patch files that match upstream exactly; it passes with those patch files excluded. No live userdata was accessed or copied, and no dev server or seeding command ran.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions