Skip to content

Commit e8343ba

Browse files
Merge remote-tracking branch 'origin/main' into fix/issue-29458
2 parents 87b2e0a + 8657eec commit e8343ba

22 files changed

Lines changed: 439 additions & 152 deletions

‎apps/mobile/src/features/pull-requests/PullRequestMergeControls.tsx‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ export function PullRequestMergeControls(props: {
8282
? `${MERGE_METHODS[method].title} stack (${scope.layers.length})`
8383
: MERGE_METHODS[method].title
8484
: "Merge unavailable";
85+
const autoMergeArmed = pr.state === "open" && pr.autoMergeEnabled === true;
86+
const armedLabel = `Auto-merge pending${pr.autoMergeMethod ? ` (${pr.autoMergeMethod})` : ""}`;
8587
const autoAction = pr.autoMergeEnabled ? "disable-auto-merge" : "enable-auto-merge";
8688
const canAutoMerge =
8789
!busy &&
@@ -167,13 +169,25 @@ export function PullRequestMergeControls(props: {
167169
return (
168170
<View className="gap-2 border-t border-border-subtle p-3">
169171
<SplitButton
170-
label={busy ? "Working…" : !permissions.connected ? "Reconnect to merge" : label}
172+
label={
173+
busy
174+
? "Working…"
175+
: !permissions.connected
176+
? "Reconnect to merge"
177+
: autoMergeArmed
178+
? armedLabel
179+
: label
180+
}
171181
accessibilityLabel={
172-
scope ? `${label}, ${scope.layers.length} stack layers through #${pr.number}` : label
182+
autoMergeArmed
183+
? `${armedLabel}, merges once its requirements are met`
184+
: scope
185+
? `${label}, ${scope.layers.length} stack layers through #${pr.number}`
186+
: label
173187
}
174-
icon={PullRequestGlyph.merged}
175-
disabled={!canMerge}
176-
loading={busy || checkingStack}
188+
icon={autoMergeArmed ? "clock" : PullRequestGlyph.merged}
189+
disabled={!canMerge || autoMergeArmed}
190+
loading={busy || (!autoMergeArmed && checkingStack)}
177191
onPress={() => confirm("merge")}
178192
menuTitle="Merge options"
179193
actions={[
@@ -202,17 +216,13 @@ export function PullRequestMergeControls(props: {
202216
}}
203217
/>
204218
{permissions.connected &&
219+
!autoMergeArmed &&
205220
reason &&
206221
reason !== MERGE_CONFLICT_REASON &&
207222
reason !== "Checking stack membership…" &&
208223
!(checkingStack && reason === "Refresh the stack before merging.") ? (
209224
<Text className="px-1 text-xs text-foreground-muted">{reason}</Text>
210225
) : null}
211-
{pr.autoMergeEnabled ? (
212-
<Text className="px-1 text-xs text-foreground-muted">
213-
Auto-merge is enabled{pr.autoMergeMethod ? ` · ${pr.autoMergeMethod}` : ""}
214-
</Text>
215-
) : null}
216226
{stack.error && stack.supportsStackActions ? (
217227
<Button label="Retry stack lookup" tone="text" onPress={stack.refresh} />
218228
) : null}

‎apps/server/src/environment/DirectEndpoints.test.ts‎

Lines changed: 75 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
22
import { it as effectIt } from "@effect/vitest";
33
import type * as NodeOS from "node:os";
44
import * as Effect from "effect/Effect";
5+
import * as Deferred from "effect/Deferred";
6+
import * as Fiber from "effect/Fiber";
7+
import * as Ref from "effect/Ref";
58
import * as Layer from "effect/Layer";
69
import * as Sink from "effect/Sink";
710
import * as Stream from "effect/Stream";
@@ -255,25 +258,27 @@ const layerServeProbe = (status: number) =>
255258
),
256259
);
257260

258-
const layerServeConfig = Layer.effect(
259-
ServerConfig.ServerConfig,
260-
Effect.map(ServerConfig.ServerConfig, (config) => ({
261-
...config,
262-
host: "127.0.0.1",
263-
tailscaleServeEnabled: true,
264-
tailscaleServePort: 443,
265-
})),
266-
).pipe(
267-
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-direct-" })),
268-
Layer.provide(NodeServices.layer),
269-
);
261+
const layerServeConfig = (host = "127.0.0.1") =>
262+
Layer.effect(
263+
ServerConfig.ServerConfig,
264+
Effect.map(ServerConfig.ServerConfig, (config) => ({
265+
...config,
266+
host,
267+
port: 3773,
268+
tailscaleServeEnabled: true,
269+
tailscaleServePort: 443,
270+
})),
271+
).pipe(
272+
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-direct-" })),
273+
Layer.provide(NodeServices.layer),
274+
);
270275

271276
const resolveWithServe = (probeStatus: number) =>
272277
Effect.flatMap(DirectEndpoints.DirectEndpoints, (service) => service.resolve()).pipe(
273278
Effect.provide(
274279
DirectEndpoints.layer.pipe(
275280
Layer.provide(
276-
Layer.mergeAll(layerServeConfig, layerTailscaleUp, layerServeProbe(probeStatus)),
281+
Layer.mergeAll(layerServeConfig(), layerTailscaleUp, layerServeProbe(probeStatus)),
277282
),
278283
),
279284
),
@@ -288,6 +293,63 @@ describe("DirectEndpoints Tailscale Serve", () => {
288293
}),
289294
);
290295

296+
effectIt.effect(
297+
"returns bound endpoints during validation and reuses only a completed Serve result",
298+
() =>
299+
Effect.gen(function* () {
300+
const status = yield* Ref.make(200);
301+
const finishProbe = yield* Deferred.make<void>();
302+
const probeStarted = yield* Deferred.make<void>();
303+
const revalidationStarted = yield* Deferred.make<void>();
304+
const finishRevalidation = yield* Deferred.make<void>();
305+
const service = yield* DirectEndpoints.make.pipe(
306+
Effect.provide(
307+
Layer.mergeAll(
308+
layerServeConfig("192.168.1.10"),
309+
layerTailscaleUp,
310+
Layer.succeed(
311+
HttpClient.HttpClient,
312+
HttpClient.make((request) =>
313+
Deferred.succeed(probeStarted, undefined).pipe(
314+
Effect.andThen(Deferred.await(finishProbe)),
315+
Effect.andThen(Ref.get(status)),
316+
Effect.tap((status) =>
317+
status === 502
318+
? Deferred.succeed(revalidationStarted, undefined).pipe(
319+
Effect.andThen(Deferred.await(finishRevalidation)),
320+
)
321+
: Effect.void,
322+
),
323+
Effect.map((status) =>
324+
HttpClientResponse.fromWeb(request, new Response(null, { status })),
325+
),
326+
),
327+
),
328+
),
329+
),
330+
),
331+
);
332+
const resolving = yield* Effect.forkScoped(service.resolve());
333+
yield* Deferred.await(probeStarted);
334+
const bound = { kind: "lan", httpBaseUrl: "http://192.168.1.10:3773/" };
335+
expect(yield* service.resolveAvailable()).toEqual([bound]);
336+
yield* Deferred.succeed(finishProbe, undefined);
337+
const validated = yield* Fiber.join(resolving);
338+
expect(validated).toEqual([
339+
bound,
340+
{ kind: "tailnet", httpBaseUrl: "https://bb-1.tail1234.ts.net/" },
341+
]);
342+
expect(yield* service.resolveAvailable()).toEqual(validated);
343+
yield* Ref.set(status, 502);
344+
const revalidating = yield* Effect.forkScoped(service.resolve());
345+
yield* Deferred.await(revalidationStarted);
346+
expect(yield* service.resolveAvailable()).toEqual(validated);
347+
yield* Deferred.succeed(finishRevalidation, undefined);
348+
expect(yield* Fiber.join(revalidating)).toEqual([bound]);
349+
expect(yield* service.resolveAvailable()).toEqual([bound]);
350+
}).pipe(Effect.scoped),
351+
);
352+
291353
effectIt.effect("leaves the tailnet name out when Serve is not forwarding", () =>
292354
Effect.gen(function* () {
293355
expect(yield* resolveWithServe(502)).toEqual([]);

‎apps/server/src/environment/DirectEndpoints.ts‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import * as Duration from "effect/Duration";
99
import * as Effect from "effect/Effect";
1010
import * as Layer from "effect/Layer";
1111
import * as Option from "effect/Option";
12+
import * as Ref from "effect/Ref";
1213
import { HttpClient } from "effect/http";
1314
import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
1415
import * as NodeNet from "node:net";
@@ -34,6 +35,7 @@ const TAILSCALE_ENDPOINT_TIMEOUT = Duration.seconds(3);
3435
export class DirectEndpoints extends Context.Service<
3536
DirectEndpoints,
3637
{
38+
readonly resolveAvailable: () => Effect.Effect<ReadonlyArray<ServerDirectEndpoint>>;
3739
readonly resolve: () => Effect.Effect<ReadonlyArray<ServerDirectEndpoint>>;
3840
}
3941
>()("t3/environment/DirectEndpoints") {}
@@ -128,7 +130,8 @@ export const make = Effect.gen(function* () {
128130
: Effect.succeed(false);
129131
yield* Effect.forkDetach(onCloudVm);
130132

131-
const resolve = Effect.gen(function* () {
133+
const servedEndpoint = yield* Ref.make<Option.Option<string>>(Option.none());
134+
const resolveAvailable = Effect.fn("DirectEndpoints.resolveAvailable")(function* () {
132135
const endpoints = [
133136
...resolveBoundEndpoints({
134137
platform,
@@ -138,6 +141,12 @@ export const make = Effect.gen(function* () {
138141
onCloudVm: yield* onCloudVm,
139142
}),
140143
];
144+
const servedUrl = yield* Ref.get(servedEndpoint);
145+
if (Option.isSome(servedUrl)) endpoints.push({ kind: "tailnet", httpBaseUrl: servedUrl.value });
146+
return endpoints;
147+
});
148+
149+
const resolve = Effect.gen(function* () {
141150
// Serve setup can fail without stopping startup; advertise only after it answers as this server.
142151
if (config.tailscaleServeEnabled) {
143152
const servedUrl = yield* readTailscaleStatus.pipe(
@@ -158,14 +167,13 @@ export const make = Effect.gen(function* () {
158167
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
159168
Effect.provideService(HttpClient.HttpClient, httpClient),
160169
);
161-
if (Option.isSome(servedUrl)) {
162-
endpoints.push({ kind: "tailnet", httpBaseUrl: servedUrl.value });
163-
}
170+
yield* Ref.set(servedEndpoint, servedUrl);
164171
}
165-
return endpoints;
172+
return yield* resolveAvailable();
166173
});
167174

168175
return DirectEndpoints.of({
176+
resolveAvailable,
169177
resolve: Effect.fn("DirectEndpoints.resolve")(function () {
170178
return resolve;
171179
}),

‎apps/server/src/ws.test.ts‎

Lines changed: 76 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ it.effect("resends late editors without rolling back updates already sent", () =
154154
Deferred.await(settingsSent).pipe(Effect.as("file-explorer" as const)),
155155
},
156156
{ resolveTargets: () => Effect.succeed([]) },
157+
{ resolve: () => Effect.succeed([]) },
157158
).pipe(
158159
Stream.tap((event) =>
159160
event.type === "settingsUpdated" ? Deferred.succeed(settingsSent, undefined) : Effect.void,
@@ -185,6 +186,7 @@ it.effect("resends a reveal kind and remote targets that outlast the snapshot ti
185186
resolveFileManagerRevealKind: () => Effect.succeed("file-explorer"),
186187
},
187188
{ resolveTargets: () => Deferred.await(finishDiscovery) },
189+
{ resolve: () => Effect.succeed([]) },
188190
).pipe(Stream.runCollect, Effect.forkScoped({ startImmediately: true }));
189191
yield* TestClock.adjust("6 seconds");
190192
yield* Deferred.succeed(finishDiscovery, targets);
@@ -618,8 +620,15 @@ const layerConfigSources = Layer.mergeAll(
618620
Layer.provideMerge(NodeServices.layer),
619621
);
620622

621-
it.effect.each(["pending", "cached"] as const)(
622-
"%s remote discovery preserves initial config and updates through discovery and ACK",
623+
it.effect.each([
624+
"pending",
625+
"cached",
626+
"direct-pending",
627+
"direct-cached",
628+
"direct-failed",
629+
"direct-interrupted",
630+
] as const)(
631+
"%s endpoint discovery preserves initial config and updates through discovery and ACK",
623632
(discovery) =>
624633
Effect.gen(function* () {
625634
const keybindings = yield* Keybindings.Keybindings;
@@ -638,6 +647,15 @@ it.effect.each(["pending", "cached"] as const)(
638647
const remoteDiscoveryStarted = yield* Deferred.make<void>();
639648
const finishRemoteDiscovery = yield* Deferred.make<void>();
640649
const targets = [{ kind: "mdns" as const, host: "test.local" }];
650+
const direct = discovery.startsWith("direct-");
651+
const bound = [{ kind: "lan" as const, httpBaseUrl: "http://192.168.1.10:3773/" }];
652+
const endpoints = [
653+
...bound,
654+
{ kind: "tailnet" as const, httpBaseUrl: "https://test.ts.net/" },
655+
];
656+
const directStarted = yield* Deferred.make<void>();
657+
const finishDirect = yield* Deferred.make<void>();
658+
const directStopped = yield* Deferred.make<void>();
641659
const responses = yield* Queue.unbounded<ServerConfigStreamEvent>();
642660
const configRpcServices = Layer.mergeAll(
643661
layerUnusedConfigRpcServices,
@@ -659,12 +677,30 @@ it.effect.each(["pending", "cached"] as const)(
659677
resolveTargets: () =>
660678
Deferred.succeed(remoteDiscoveryStarted, undefined).pipe(
661679
Effect.andThen(
662-
discovery === "cached" ? Effect.void : Deferred.await(finishRemoteDiscovery),
680+
discovery === "cached" || direct
681+
? Effect.void
682+
: Deferred.await(finishRemoteDiscovery),
663683
),
664684
Effect.as(targets),
665685
),
666686
}),
667-
Layer.mock(DirectEndpoints.DirectEndpoints)({ resolve: () => Effect.succeed([]) }),
687+
Layer.mock(DirectEndpoints.DirectEndpoints)({
688+
resolveAvailable: () => Effect.succeed(discovery === "direct-cached" ? endpoints : bound),
689+
resolve: () =>
690+
direct
691+
? Deferred.succeed(directStarted, undefined).pipe(
692+
Effect.andThen(
693+
discovery === "direct-cached" ? Effect.void : Deferred.await(finishDirect),
694+
),
695+
Effect.andThen(
696+
discovery === "direct-failed"
697+
? Effect.die("probe failed")
698+
: Effect.succeed(endpoints),
699+
),
700+
Effect.onExit(() => Deferred.succeed(directStopped, undefined)),
701+
)
702+
: Effect.succeed(bound),
703+
}),
668704
Layer.mock(ManagedProjectFolders.ManagedProjectFolders)({
669705
scratchRoot: Effect.succeedNone,
670706
namedProjectsRoot: process.cwd(),
@@ -744,7 +780,14 @@ it.effect.each(["pending", "cached"] as const)(
744780
const snapshot = yield* Queue.take(responses);
745781
assert.equal(snapshot.type, "snapshot");
746782
if (snapshot.type !== "snapshot") return yield* Effect.die("Missing initial snapshot");
747-
assert.deepEqual(snapshot.config.remoteOpenTargets, discovery === "cached" ? targets : []);
783+
assert.deepEqual(
784+
snapshot.config.remoteOpenTargets,
785+
discovery === "cached" || direct ? targets : [],
786+
);
787+
assert.deepEqual(
788+
snapshot.config.directEndpoints,
789+
discovery === "direct-cached" ? endpoints : bound,
790+
);
748791
assert.isFalse(snapshot.config.settings.defaultAutoPull);
749792
assert.deepEqual(snapshot.config.keybindings, initialKeybindings);
750793
const duringAck = yield* keybindings.upsertKeybindingRule({
@@ -795,7 +838,31 @@ it.effect.each(["pending", "cached"] as const)(
795838
assert.deepEqual(resolved.config.keybindings, latestKeybindings.keybindings);
796839
yield* acknowledge;
797840
}
841+
if (direct) {
842+
yield* Deferred.await(directStarted);
843+
if (discovery === "direct-pending") {
844+
yield* Deferred.succeed(finishDirect, undefined);
845+
const resolved = yield* Queue.take(responses);
846+
assert.equal(resolved.type, "snapshot");
847+
if (resolved.type !== "snapshot") return yield* Effect.die("Missing direct endpoints");
848+
assert.deepEqual(resolved.config.directEndpoints, endpoints);
849+
assert.deepEqual(
850+
resolved.config.settings,
851+
ServerSettings.redactServerSettingsForClient(latestSettings),
852+
);
853+
assert.deepEqual(resolved.config.keybindings, latestKeybindings.keybindings);
854+
yield* acknowledge;
855+
} else if (discovery === "direct-failed") {
856+
yield* Deferred.succeed(finishDirect, undefined);
857+
yield* Deferred.await(directStopped);
858+
yield* settings.updateSettings({ defaultAutoPull: false });
859+
const event = yield* Queue.take(responses);
860+
assert.equal(event.type, "settingsUpdated");
861+
yield* acknowledge;
862+
}
863+
}
798864
yield* server.write(0, { _tag: "Interrupt", requestId, interruptors: [] });
865+
if (direct) yield* Deferred.await(directStopped);
799866
}).pipe(
800867
Effect.provide(
801868
Layer.mergeAll(
@@ -858,7 +925,10 @@ it.effect("on-demand clients get provider config without workspace snapshots", (
858925
Layer.mock(RemoteOpenTargets.RemoteOpenTargets)({
859926
resolveTargets: () => Effect.succeed([]),
860927
}),
861-
Layer.mock(DirectEndpoints.DirectEndpoints)({ resolve: () => Effect.succeed([]) }),
928+
Layer.mock(DirectEndpoints.DirectEndpoints)({
929+
resolve: () => Effect.succeed([]),
930+
resolveAvailable: () => Effect.succeed([]),
931+
}),
862932
Layer.mock(ManagedProjectFolders.ManagedProjectFolders)({
863933
scratchRoot: Effect.succeedNone,
864934
namedProjectsRoot: process.cwd(),

0 commit comments

Comments
 (0)