Skip to content

🤖 refactor: convert codex/governor/copilot OAuth services to Effect and adopt handlerGen for OAuth procedures #4034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasK33 merged 4 commits into from
Sep 1, 2026
+1,478 −736
Merged

🤖 refactor: convert codex/governor/copilot OAuth services to Effect and adopt handlerGen for OAuth procedures #4034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8333882
refactor: convert codex/governor/copilot OAuth services to Effect and…
ThomasK33 Sep 1, 2026
4f78d9a
fix: make OAuth cancel/finish teardown uninterruptible and guard null…
ThomasK33 Sep 1, 2026
968d21d
fix: keep Copilot models fetch best-effort under malformed payloads (…
ThomasK33 Sep 1, 2026
7bdb52d
fix: fold refresh persistence defects into the wire error (Codex revi…
ThomasK33 Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 82 additions & 41 deletions src/node/orpc/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,11 +575,14 @@ export const router = (authToken?: string) => {
),
},

// OAuth procedures (gateway/copilot/governor/codex) run Effect generators
// via handlerGen; the wire contracts are unchanged. Flow-starting
// mutations are uninterruptible in the services (see the respective
// startDesktopFlowEffect/startDeviceFlowEffect), so a client abort cannot
// leak a loopback server or strand a flow record; waits are interruptible
// (abandoning a wait leaves the flow's own lifecycle intact) and cancels
// run guaranteed-finalizer cleanup.
muxGatewayOauth: {
// startDesktopFlow rides handlerGen; its service pipeline is
// uninterruptible (see startDesktopFlowEffect) so a client abort cannot
// leak the loopback server. waitFor/cancel stay plain handlers until the
// batch OAuth-service conversion migrates the remaining procedures.
startDesktopFlow: t
.input(schemas.muxGatewayOauth.startDesktopFlow.input)
.output(schemas.muxGatewayOauth.startDesktopFlow.output)
Expand All @@ -591,103 +594,141 @@ export const router = (authToken?: string) => {
waitForDesktopFlow: t
.input(schemas.muxGatewayOauth.waitForDesktopFlow.input)
.output(schemas.muxGatewayOauth.waitForDesktopFlow.output)
.handler(({ context, input }) =>
context.muxGatewayOauthService.waitForDesktopFlow(input.flowId, {
timeoutMs: input.timeoutMs,
.handler(
handlerGen(function* ({ context }, input) {
return yield* context.muxGatewayOauthService.waitForDesktopFlowEffect(input.flowId, {
timeoutMs: input.timeoutMs,
});
})
),
cancelDesktopFlow: t
.input(schemas.muxGatewayOauth.cancelDesktopFlow.input)
.output(schemas.muxGatewayOauth.cancelDesktopFlow.output)
.handler(async ({ context, input }) => {
await context.muxGatewayOauthService.cancelDesktopFlow(input.flowId);
}),
.handler(
handlerGen(function* ({ context }, input) {
yield* context.muxGatewayOauthService.cancelDesktopFlowEffect(input.flowId);
})
Comment thread
ThomasK33 marked this conversation as resolved.
),
},
copilotOauth: {
startDeviceFlow: t
.input(schemas.copilotOauth.startDeviceFlow.input)
.output(schemas.copilotOauth.startDeviceFlow.output)
.handler(({ context }) => context.copilotOauthService.startDeviceFlow()),
.handler(
handlerGen(function* ({ context }) {
return yield* context.copilotOauthService.startDeviceFlowEffect();
})
),
waitForDeviceFlow: t
.input(schemas.copilotOauth.waitForDeviceFlow.input)
.output(schemas.copilotOauth.waitForDeviceFlow.output)
.handler(({ context, input }) =>
context.copilotOauthService.waitForDeviceFlow(input.flowId, {
timeoutMs: input.timeoutMs,
.handler(
handlerGen(function* ({ context }, input) {
return yield* context.copilotOauthService.waitForDeviceFlowEffect(input.flowId, {
timeoutMs: input.timeoutMs,
});
})
),
cancelDeviceFlow: t
.input(schemas.copilotOauth.cancelDeviceFlow.input)
.output(schemas.copilotOauth.cancelDeviceFlow.output)
.handler(({ context, input }) => {
context.copilotOauthService.cancelDeviceFlow(input.flowId);
}),
.handler(
handlerGen(function* ({ context }, input) {
yield* context.copilotOauthService.cancelDeviceFlowEffect(input.flowId);
})
),
},
muxGovernorOauth: {
startDesktopFlow: t
.input(schemas.muxGovernorOauth.startDesktopFlow.input)
.output(schemas.muxGovernorOauth.startDesktopFlow.output)
.handler(({ context, input }) =>
context.muxGovernorOauthService.startDesktopFlow({
governorOrigin: input.governorOrigin,
.handler(
handlerGen(function* ({ context }, input) {
return yield* context.muxGovernorOauthService.startDesktopFlowEffect({
governorOrigin: input.governorOrigin,
});
})
),
waitForDesktopFlow: t
.input(schemas.muxGovernorOauth.waitForDesktopFlow.input)
.output(schemas.muxGovernorOauth.waitForDesktopFlow.output)
.handler(({ context, input }) =>
context.muxGovernorOauthService.waitForDesktopFlow(input.flowId, {
timeoutMs: input.timeoutMs,
.handler(
handlerGen(function* ({ context }, input) {
return yield* context.muxGovernorOauthService.waitForDesktopFlowEffect(input.flowId, {
timeoutMs: input.timeoutMs,
});
})
),
cancelDesktopFlow: t
.input(schemas.muxGovernorOauth.cancelDesktopFlow.input)
.output(schemas.muxGovernorOauth.cancelDesktopFlow.output)
.handler(async ({ context, input }) => {
await context.muxGovernorOauthService.cancelDesktopFlow(input.flowId);
}),
.handler(
handlerGen(function* ({ context }, input) {
yield* context.muxGovernorOauthService.cancelDesktopFlowEffect(input.flowId);
})
),
},
codexOauth: {
startDesktopFlow: t
.input(schemas.codexOauth.startDesktopFlow.input)
.output(schemas.codexOauth.startDesktopFlow.output)
.handler(({ context }) => context.codexOauthService.startDesktopFlow()),
.handler(
handlerGen(function* ({ context }) {
return yield* context.codexOauthService.startDesktopFlowEffect();
})
),
waitForDesktopFlow: t
.input(schemas.codexOauth.waitForDesktopFlow.input)
.output(schemas.codexOauth.waitForDesktopFlow.output)
.handler(({ context, input }) =>
context.codexOauthService.waitForDesktopFlow(input.flowId, {
timeoutMs: input.timeoutMs,
.handler(
handlerGen(function* ({ context }, input) {
return yield* context.codexOauthService.waitForDesktopFlowEffect(input.flowId, {
timeoutMs: input.timeoutMs,
});
})
),
cancelDesktopFlow: t
.input(schemas.codexOauth.cancelDesktopFlow.input)
.output(schemas.codexOauth.cancelDesktopFlow.output)
.handler(async ({ context, input }) => {
await context.codexOauthService.cancelDesktopFlow(input.flowId);
}),
.handler(
handlerGen(function* ({ context }, input) {
yield* context.codexOauthService.cancelDesktopFlowEffect(input.flowId);
})
),
startDeviceFlow: t
.input(schemas.codexOauth.startDeviceFlow.input)
.output(schemas.codexOauth.startDeviceFlow.output)
.handler(({ context }) => context.codexOauthService.startDeviceFlow()),
.handler(
handlerGen(function* ({ context }) {
return yield* context.codexOauthService.startDeviceFlowEffect();
})
),
waitForDeviceFlow: t
.input(schemas.codexOauth.waitForDeviceFlow.input)
.output(schemas.codexOauth.waitForDeviceFlow.output)
.handler(({ context, input }) =>
context.codexOauthService.waitForDeviceFlow(input.flowId, {
timeoutMs: input.timeoutMs,
.handler(
handlerGen(function* ({ context }, input) {
return yield* context.codexOauthService.waitForDeviceFlowEffect(input.flowId, {
timeoutMs: input.timeoutMs,
});
})
),
cancelDeviceFlow: t
.input(schemas.codexOauth.cancelDeviceFlow.input)
.output(schemas.codexOauth.cancelDeviceFlow.output)
.handler(async ({ context, input }) => {
await context.codexOauthService.cancelDeviceFlow(input.flowId);
}),
.handler(
handlerGen(function* ({ context }, input) {
yield* context.codexOauthService.cancelDeviceFlowEffect(input.flowId);
})
),
disconnect: t
.input(schemas.codexOauth.disconnect.input)
.output(schemas.codexOauth.disconnect.output)
.handler(({ context }) => context.codexOauthService.disconnect()),
.handler(
handlerGen(function* ({ context }) {
return yield* context.codexOauthService.disconnectEffect();
})
),
},
coderOauth: {
startDesktopFlow: t
Expand Down
Loading
Loading