Skip to content

Commit c8a239c

Browse files
committed
fix(cursor): resolve model discovery conflicts with main
2 parents c9a8d57 + 6349a0e commit c8a239c

378 files changed

Lines changed: 21817 additions & 5839 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ jobs:
4545
- name: Ensure Electron runtime is installed
4646
run: vp run --filter @t3tools/desktop ensure:electron
4747

48+
# Files/dependencies are repo-wide; export checks cover clean workspaces only.
49+
- name: Check unused code
50+
run: vp run knip:check
51+
4852
- name: Check
4953
run: vp check
5054

‎apps/desktop/src/app/DesktopApp.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,10 @@ const bootstrap = Effect.gen(function* () {
194194
yield* logBootstrapInfo("bootstrap enabled network access", {
195195
endpointUrl: serverExposureState.endpointUrl,
196196
});
197-
} else if (settings.serverExposureMode === "network-accessible") {
197+
} else if (
198+
settings.serverExposureMode === "network-accessible" &&
199+
serverExposureState.mode === "local-only"
200+
) {
198201
yield* logBootstrapWarning(
199202
"bootstrap fell back to local-only because no advertised network host was available",
200203
);

‎apps/desktop/src/backend/DesktopServerExposure.test.ts‎

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,6 @@ describe("DesktopServerExposure", () => {
272272
modeError,
273273
DesktopServerExposure.DesktopServerExposureModePersistenceError,
274274
);
275-
assert.isTrue(DesktopServerExposure.isDesktopServerExposureSetModeError(modeError));
276-
assert.isTrue(DesktopServerExposure.isDesktopServerExposureError(modeError));
277275
assert.equal(modeError.mode, "network-accessible");
278276
assert.strictEqual(modeError.cause, settingsFailure);
279277
assert.strictEqual(modeError.cause.cause, diskFailure);
@@ -290,7 +288,6 @@ describe("DesktopServerExposure", () => {
290288
tailscaleError,
291289
DesktopServerExposure.DesktopTailscaleServePersistenceError,
292290
);
293-
assert.isTrue(DesktopServerExposure.isDesktopServerExposureError(tailscaleError));
294291
assert.equal(tailscaleError.enabled, true);
295292
assert.equal(tailscaleError.port, 8443);
296293
assert.strictEqual(tailscaleError.cause, settingsFailure);
@@ -307,9 +304,9 @@ describe("DesktopServerExposure", () => {
307304
);
308305
});
309306

310-
it.effect("resolves advertised endpoints from the scoped runtime state", () =>
307+
it.effect("keeps LAN and Tailscale endpoints distinct when Tailscale is enumerated first", () =>
311308
withHarness(
312-
{ ...lanNetworkInterfaces, ...tailnetNetworkInterfaces },
309+
{ ...tailnetNetworkInterfaces, ...lanNetworkInterfaces },
313310
Effect.gen(function* () {
314311
const serverExposure = yield* DesktopServerExposure.DesktopServerExposure;
315312
yield* serverExposure.configureFromSettings({ port: 4173 });
@@ -324,6 +321,32 @@ describe("DesktopServerExposure", () => {
324321
),
325322
);
326323

324+
it.effect("keeps Tailscale-only hosts network-accessible", () =>
325+
withHarness(
326+
tailnetNetworkInterfaces,
327+
Effect.gen(function* () {
328+
const serverExposure = yield* DesktopServerExposure.DesktopServerExposure;
329+
const settings = yield* DesktopAppSettings.DesktopAppSettings;
330+
yield* settings.setServerExposureMode("network-accessible");
331+
332+
const state = yield* serverExposure.configureFromSettings({ port: 4173 });
333+
assert.equal(state.mode, "network-accessible");
334+
assert.equal(state.advertisedHost, null);
335+
assert.equal(state.endpointUrl, null);
336+
assert.equal((yield* serverExposure.backendConfig).bindHost, "0.0.0.0");
337+
338+
const endpoints = yield* serverExposure.getAdvertisedEndpoints;
339+
assert.deepEqual(
340+
endpoints.map((endpoint) => [endpoint.reachability, endpoint.httpBaseUrl]),
341+
[
342+
["loopback", "http://127.0.0.1:4173/"],
343+
["private-network", "http://100.90.1.2:4173/"],
344+
],
345+
);
346+
}),
347+
),
348+
);
349+
327350
it.effect("does not spawn the tailscale CLI while server exposure is local-only", () =>
328351
withHarness(
329352
lanNetworkInterfaces,
@@ -345,25 +368,25 @@ describe("DesktopServerExposure", () => {
345368
),
346369
);
347370

348-
it.effect("uses ConfigProvider desktop exposure overrides", () =>
371+
it.effect("preserves explicit Tailscale exposure overrides", () =>
349372
withHarness(
350373
lanNetworkInterfaces,
351374
Effect.gen(function* () {
352375
const serverExposure = yield* DesktopServerExposure.DesktopServerExposure;
353376
yield* serverExposure.configureFromSettings({ port: 4173 });
354377
const change = yield* serverExposure.setMode("network-accessible");
355378

356-
assert.equal(change.state.advertisedHost, "10.0.0.7");
357-
assert.equal(change.state.endpointUrl, "http://10.0.0.7:4173");
379+
assert.equal(change.state.advertisedHost, "100.90.1.2");
380+
assert.equal(change.state.endpointUrl, "http://100.90.1.2:4173");
358381

359382
const endpoints = yield* serverExposure.getAdvertisedEndpoints;
360383
assert.deepEqual(
361384
endpoints.map((endpoint) => endpoint.httpBaseUrl),
362-
["http://127.0.0.1:4173/", "http://10.0.0.7:4173/", "https://public.example.test/"],
385+
["http://127.0.0.1:4173/", "http://100.90.1.2:4173/", "https://public.example.test/"],
363386
);
364387
}),
365388
{
366-
T3CODE_DESKTOP_LAN_HOST: "10.0.0.7",
389+
T3CODE_DESKTOP_LAN_HOST: "100.90.1.2",
367390
T3CODE_DESKTOP_HTTPS_ENDPOINTS: "https://public.example.test",
368391
},
369392
),

‎apps/desktop/src/backend/DesktopServerExposure.ts‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
type DesktopServerExposureMode,
1010
type DesktopServerExposureState,
1111
} from "@t3tools/contracts";
12-
import { readTailscaleStatus } from "@t3tools/tailscale";
12+
import { isTailscaleIpv4Address, readTailscaleStatus } from "@t3tools/tailscale";
1313
import * as Context from "effect/Context";
1414
import * as Duration from "effect/Duration";
1515
import * as Effect from "effect/Effect";
@@ -65,7 +65,9 @@ const normalizeOptionalHost = (value: string | undefined): string | undefined =>
6565
};
6666

6767
const isUsableLanIpv4Address = (address: string): boolean =>
68-
!address.startsWith("127.") && !address.startsWith("169.254.");
68+
!address.startsWith("127.") &&
69+
!address.startsWith("169.254.") &&
70+
!isTailscaleIpv4Address(address);
6971

7072
const isHttpsEndpointUrl = (value: string): boolean => {
7173
try {
@@ -244,15 +246,13 @@ export const DesktopServerExposureSetModeError = Schema.Union([
244246
DesktopServerExposureModePersistenceError,
245247
]);
246248
export type DesktopServerExposureSetModeError = typeof DesktopServerExposureSetModeError.Type;
247-
export const isDesktopServerExposureSetModeError = Schema.is(DesktopServerExposureSetModeError);
248249

249250
export const DesktopServerExposureError = Schema.Union([
250251
DesktopServerExposureNoNetworkAddressError,
251252
DesktopServerExposureModePersistenceError,
252253
DesktopTailscaleServePersistenceError,
253254
]);
254255
export type DesktopServerExposureError = typeof DesktopServerExposureError.Type;
255-
export const isDesktopServerExposureError = Schema.is(DesktopServerExposureError);
256256

257257
export interface DesktopServerExposureBackendConfig {
258258
readonly port: number;
@@ -378,7 +378,14 @@ function resolveRuntimeState(input: {
378378
...(advertisedHostOverride ? { advertisedHostOverride } : {}),
379379
});
380380
const unavailable =
381-
input.requestedMode === "network-accessible" && requestedExposure.endpointUrl === null;
381+
input.requestedMode === "network-accessible" &&
382+
requestedExposure.endpointUrl === null &&
383+
!Object.values(input.networkInterfaces).some((addresses) =>
384+
addresses?.some(
385+
(address) =>
386+
!address.internal && address.family === "IPv4" && isTailscaleIpv4Address(address.address),
387+
),
388+
);
382389
const exposure = unavailable
383390
? resolveDesktopServerExposure({
384391
mode: "local-only",

‎apps/desktop/src/electron/ElectronDialog.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ describe("ElectronDialog", () => {
4343
);
4444

4545
assert.instanceOf(error, ElectronDialog.ElectronDialogPickFolderError);
46-
assert.isTrue(ElectronDialog.isElectronDialogError(error));
4746
assert.strictEqual(error.ownerWindowId, 7);
4847
assert.strictEqual(error.defaultPath, "/workspace");
4948
assert.strictEqual(error.cause, cause);

‎apps/desktop/src/electron/ElectronDialog.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ export const ElectronDialogError = Schema.Union([
7373
ElectronDialogShowErrorBoxError,
7474
]);
7575
export type ElectronDialogError = typeof ElectronDialogError.Type;
76-
export const isElectronDialogError = Schema.is(ElectronDialogError);
7776

7877
export interface ElectronDialogPickFolderInput {
7978
readonly owner: Option.Option<Electron.BrowserWindow>;

‎apps/desktop/src/electron/ElectronTheme.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ describe("ElectronTheme", () => {
6464
const error = yield* Effect.flip(electronTheme.setSource("dark"));
6565

6666
assert.instanceOf(error, ElectronTheme.ElectronThemeSetSourceError);
67-
assert.isTrue(ElectronTheme.isElectronThemeSetSourceError(error));
6867
assert.strictEqual(error.source, "dark");
6968
assert.strictEqual(error.cause, cause);
7069
assert.include(error.message, "dark");

‎apps/desktop/src/electron/ElectronTheme.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ export class ElectronThemeSetSourceError extends Schema.TaggedErrorClass<Electro
1919
}
2020
}
2121

22-
export const isElectronThemeSetSourceError = Schema.is(ElectronThemeSetSourceError);
23-
2422
export class ElectronTheme extends Context.Service<
2523
ElectronTheme,
2624
{

‎apps/desktop/src/electron/ElectronUpdater.test.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ describe("ElectronUpdater", () => {
7171
const error = yield* updater.checkForUpdates.pipe(Effect.flip);
7272

7373
assert.instanceOf(error, ElectronUpdater.ElectronUpdaterCheckForUpdatesError);
74-
assert.isTrue(ElectronUpdater.isElectronUpdaterError(error));
7574
assert.equal(error.channel, "beta");
7675
assert.strictEqual(error.cause, cause);
7776
assert.equal(error.message, "Electron updater failed to check for updates on channel beta.");
@@ -89,7 +88,6 @@ describe("ElectronUpdater", () => {
8988
const error = yield* updater.downloadUpdate.pipe(Effect.flip);
9089

9190
assert.instanceOf(error, ElectronUpdater.ElectronUpdaterDownloadUpdateError);
92-
assert.isTrue(ElectronUpdater.isElectronUpdaterError(error));
9391
assert.equal(error.channel, "nightly");
9492
assert.strictEqual(error.cause, cause);
9593
assert.equal(
@@ -126,7 +124,6 @@ describe("ElectronUpdater", () => {
126124
.pipe(Effect.flip);
127125

128126
assert.instanceOf(error, ElectronUpdater.ElectronUpdaterQuitAndInstallError);
129-
assert.isTrue(ElectronUpdater.isElectronUpdaterError(error));
130127
assert.equal(error.channel, "alpha");
131128
assert.equal(error.isSilent, true);
132129
assert.equal(error.isForceRunAfter, false);

‎apps/desktop/src/electron/ElectronUpdater.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ export const ElectronUpdaterError = Schema.Union([
5454
ElectronUpdaterQuitAndInstallError,
5555
]);
5656
export type ElectronUpdaterError = typeof ElectronUpdaterError.Type;
57-
export const isElectronUpdaterError = Schema.is(ElectronUpdaterError);
5857

5958
export class ElectronUpdater extends Context.Service<
6059
ElectronUpdater,

0 commit comments

Comments
 (0)