Skip to content

Archive/fork integration 2026 09 29 - #6

Closed
ra-co88 wants to merge 15 commits into
mainfrom
archive/fork-integration-2026-09-29
Closed

ra-co88 wants to merge 15 commits into
mainfrom
archive/fork-integration-2026-09-29

Conversation

@ra-co88

@ra-co88 ra-co88 commented Sep 29, 2026

Copy link
Copy Markdown
Owner

Summary

Linked issue

Fixes #

Verification

  • bun run format:check
  • bun run lint
  • bun run typecheck
  • bun run test
  • e2e — name the scenario, and link the recording or trace:

Checklist

  • Added a changeset (bun run changeset), or this change needs none.
  • Added or updated tests for the new behaviour.
  • No secrets, credentials, or private data in the diff.

pt-act and others added 15 commits September 2, 2026 09:14
…CP by default, surface approval-record failures
The scenario opened cap+10 sessions at concurrency 8, and every open is a
cold Durable Object start (sqlite open plus runtime construction inside
the agents SDK blockConcurrencyWhile). The burst regularly made those
blocks outlive the runtime wall-clock budget, so workerd reset the object
mid-initialize and the client received the 503 restart envelope instead
of an mcp-session-id header - the scenario then failed on the very first
reset. Fails on main today.

Two changes, root cause first:

- Open at concurrency 2. Cold starts no longer overlap into reset
  territory; the scenario passes in ~5s locally, 4/4 consecutive runs.
- openSession now honors the restart envelope it can receive: on the
  documented 503 "MCP session is restarting, please retry" response it
  retries the same initialize after a short delay (bounded, 8 attempts)
  instead of treating a retryable platform blip as a setup failure -
  the same contract a real streamable-http client follows.
- delete policy-transactional-visibility.test.ts (passed with main's
  executor.ts swapped in - not discriminating; sequential awaits are no
  concurrency proof)
- add a real concurrent-creates case to policies.test.ts (verified to
  fail on main, pass here)
- changeset to one sentence per repo norm
- shorten the two executor.ts comment blocks to one line each
Per review: the concurrency half is superseded by UsefulSoftwareCo#1907 (already on
main, stricter). Rebased onto current main and kept only the retry
loop on the documented 503 restart envelope.
# Conflicts:
#	e2e/cloud/mcp-session-cap-eviction.test.ts
Brings the fork up to upstream 2dc399e (Version Packages UsefulSoftwareCo#1906):
UsefulSoftwareCo#1949 workspace-write release patch, UsefulSoftwareCo#1834 selfhost Google SSO,
UsefulSoftwareCo#1947 Google OAuth listing gate, UsefulSoftwareCo#1934/UsefulSoftwareCo#1931/UsefulSoftwareCo#1933 rate-limit and
pricing, UsefulSoftwareCo#1932 pricing nav, UsefulSoftwareCo#1919 admin-restricted workspace writes,
plus release tooling and package bumps.

Conflict resolution (packages/core/sdk/src/executor.ts, policy paths):
upstream UsefulSoftwareCo#1919 landed its own transaction wrap of policiesCreate/
policiesUpdate — kept upstream's wrap verbatim and kept the fork's
discriminating it.live concurrent-creates regression test in
policies.test.ts. The fork's 8 security/hardening fixes (PRs
UsefulSoftwareCo#1886-UsefulSoftwareCo#1893) remain the fork's delta; each has a posted verdict.

Housekeeping in the same merge: .oxlintrc.jsonc ignorePatterns gains
".agents/" (local workflow files, gitignored, previously linted as
stray errors during gates). executor.ts re-run through oxfmt after
hand-resolution.

Gates: format:check, lint, typecheck green; test — package suites
green (sdk, openapi, keychain, deno-subprocess verified; full
parallel turbo run shows rotating SIGINT contention failures on this
loaded machine, each "failed" package passes in isolation).
@ra-co88

ra-co88 commented Sep 29, 2026

Copy link
Copy Markdown
Owner Author

Closing: this PR was opened by accident. archive/fork-integration-2026-09-29 is a read-only safety-net ref preserving the fork's pre-sync integration history (before main was reset to track upstream). It is not a change intended to merge, so the conflicts here are expected and need no resolution.

The history it points at is fully accounted for: the four merged PRs' content is upstream (UsefulSoftwareCo#1886, UsefulSoftwareCo#1892, UsefulSoftwareCo#1893, UsefulSoftwareCo#1895), the five open PRs' content lives in their own branches (UsefulSoftwareCo#1887-UsefulSoftwareCo#1891), and nothing upstream-needed exists only in this ref.

@ra-co88 ra-co88 closed this Sep 29, 2026
@ra-co88
ra-co88 deleted the archive/fork-integration-2026-09-29 branch September 29, 2026 06:08

This branch was successfully deployed

No deployments
production — 78fbb0cd Deployed Sep 13, 2026 by ra-co88 via Migrate database #11
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.

2 participants