Repository navigation
Merge upstream v2 (54bfc1a59) into the fork - #57
Merged
Merged
Conversation
Conflicts, resolved keeping both sides: - apps/hosted/cloud/src/infrastructure/mcp-auth.ts: keep the fork's connection-key endpoints (#36/#53) and the connection argument to bearer checks, plus upstream's getSession and v1-forward authentication. - packages/sdk/src/contracts/executor.ts: keep the Caller import and searchableKept (#51); take upstream's SourceFiles import and the apps.build omission. - packages/sdk/src/implementation/apps.ts: take upstream's buildSource refactor and re-add the fork's sharedRuntime requirement (#44), which buildSource dropped. bun.lock is regenerated (the apps workspace now records 0.0.1-beta.100.shuv.3).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brings in upstream
v2up to54bfc1a59(8 "Export" commits, Oct 21–23; 85 files, +10,677 / −3,415). Authorized by Kyle. This is a fork-only PR toshuv1337/executorv2; nothing goes upstream.What upstream brings
Mostly Cloud: v1 import runs and checks, Cloud onboarding and sign-in, product analytics, and the edge contract. Plus an SDK refactor that moves the deploy-time build into
apps.build/buildSource,workerd-clientandresource-lifecyclechanges, dashboard UI updates, and app-template skill updates.Conflicts (3 files), resolved keeping both sides
apps/hosted/cloud/src/infrastructure/mcp-auth.ts: keep the fork's connection-key endpoints (mint,revokeMcpConnectionKeys,listMcpConnectionKeys,revokeMcpConnectionKey; Connection keys: API keys bound to one scoped MCP connection #36/List a connection's keys and revoke one without revoking the connection #53) and theconnectionargument to bearer checks. Add upstream'sgetSessionand v1-forward authentication. A v1-forwarded request takes upstream's path, and bearer requests keep the connection binding.packages/sdk/src/contracts/executor.ts: keep theCallerimport and thesearchableKeptomission (Batch MCP search discovery into a few product operations #51). Take upstream'sSourceFilesimport and theapps.buildomission.packages/sdk/src/implementation/apps.ts: take upstream'sbuildSourcerefactor and re-add the fork'ssharedRuntimerequirement (Let an app share one warm runtime across callers with sharedRuntime (opt-in) #44), which upstream'sbuildSourcedoesn't carry. Without it, sharedRuntime apps would deploy as per-selection runtimes.Fork features preserved. I compared marker counts before and after the merge; every one is unchanged:
sharedRuntime,sharesRuntime,callerIdentity,approvedBy,approvalStatus,AppDataVersionSuperseded,searchableKept,listAccountsEach, connection-key list/revoke,ConnectionIdTaken,ScheduleScopeRequired,refreshAtMostEvery,recycleIdleFacets, trace sampling,self-host-native.config.ts,EXECUTOR_NPM_REGISTRY(custom registry),appsResolving.bun.lockis regenerated: theappsworkspace now records0.0.1-beta.100.shuv.3, which was the stale-lockfile item in the sync plan.Checks
bun run checkpasses: patches, versions, format, lint, typecheck, apps protocols (no protocol change), telemetry, API errors, auth rate limit, v1-import access, and the boundary checks.buildSourcepath), MCP search statements, tool-call overhead, the CLI call (device code), schedule scope, live-query batching, trace sampling and PAT MCP.cloud-v1-import*,cloud-onboarding-experiment,cloud-v1-sign-in,product-analytics). Cloud isn't deployed by this fork; they run in the managed local Cloud job.