Skip to content

Commit 870852e

Browse files
Merge main into fix/issue-24935
2 parents 9573ae6 + 725ada6 commit 870852e

37 files changed

Lines changed: 1680 additions & 98 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ apps/mobile/.generated/
3636
apps/mobile/.android-cache/
3737
/.generated/
3838
artifacts/app-store/screenshots/
39+
artifacts/mobile-e2e/
3940
.github/pr-assets/
4041
native/**/target/
4142
node_modules/

‎apps/desktop/src/app/DesktopObservability.test.ts‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,4 +342,36 @@ describe("DesktopObservability", () => {
342342
Effect.provide(Layer.mergeAll(NodeServices.layer, layerCollector(requests), layerEmptyEnv)),
343343
);
344344
});
345+
346+
it.effect("describes the Node runtime and the desktop mode under semantic or t3code keys", () => {
347+
const requests: Array<ExportedRequest> = [];
348+
return Effect.gen(function* () {
349+
const fileSystem = yield* FileSystem.FileSystem;
350+
const baseDir = yield* fileSystem.makeTempDirectoryScoped({
351+
prefix: "t3-desktop-observability-test-",
352+
});
353+
const layerEnvironment = layerEnvironmentFor(baseDir);
354+
yield* writeObservabilitySettings(layerEnvironment, {
355+
otlpLogsUrl: "https://settings.example.com/v1/logs",
356+
});
357+
358+
yield* Effect.scoped(
359+
Effect.logInfo("desktop resource under test").pipe(
360+
Effect.provide(DesktopObservability.layer.pipe(Layer.provideMerge(layerEnvironment))),
361+
),
362+
);
363+
364+
const body = requests.map((request) => request.body).join("\n");
365+
assert.include(body, '"key":"process.runtime.name","value":{"stringValue":"nodejs"}');
366+
assert.include(
367+
body,
368+
`"key":"process.runtime.version","value":{"stringValue":"${process.versions.node}"}`,
369+
);
370+
assert.include(body, '"key":"t3code.desktop.mode","value":{"stringValue":"development"}');
371+
assert.notInclude(body, "service.mode");
372+
}).pipe(
373+
Effect.scoped,
374+
Effect.provide(Layer.mergeAll(NodeServices.layer, layerCollector(requests), layerEmptyEnv)),
375+
);
376+
});
345377
});

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { PRIMARY_LOCAL_ENVIRONMENT_ID } from "@t3tools/contracts";
22
import {
33
makeLocalFileTracer,
44
makeTraceSink,
5+
nodeProcessRuntimeAttributes,
56
processServiceInstanceId,
67
type SignalExport,
78
} from "@t3tools/shared/observability";
@@ -607,13 +608,14 @@ const layerTelemetry = Layer.unwrap(
607608
attributes: {
608609
"service.namespace": "t3code",
609610
"service.runtime": "desktop",
610-
"service.mode": environment.isDevelopment ? "development" : "packaged",
611+
"t3code.desktop.mode": environment.isDevelopment ? "development" : "packaged",
611612
"service.instance.id": processServiceInstanceId(endpoints.resourceAttributes),
612613
...releaseResourceAttributes(
613614
environment.isDevelopment ? "dev" : releaseChannelOf(serviceVersion),
614615
endpoints.resourceAttributes,
615616
),
616617
"host.name": endpoints.resourceAttributes["host.name"] || (yield* HostProcess.Hostname),
618+
...nodeProcessRuntimeAttributes(),
617619
},
618620
};
619621

‎apps/mobile/src/features/pull-requests/pullRequestEnvironmentFallback.test.ts‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import { describe, expect, it } from "vite-plus/test";
22
import type { EnvironmentProject } from "@t3tools/client-runtime/state/models";
3+
import type { EnvironmentConnectionPhase } from "@t3tools/client-runtime/connection";
4+
import { EnvironmentId } from "@t3tools/contracts";
35
import { pullRequestFallbackEnvironment } from "./pullRequestEnvironmentFallback";
46

57
const project = (environmentId: string, id: string, canonicalKey: string) =>
@@ -20,24 +22,35 @@ const target = {
2022
repository: "pingdotgg/t3code",
2123
host: "github.com",
2224
};
25+
const environment = (
26+
environmentId: string,
27+
connectionState: EnvironmentConnectionPhase = "connected",
28+
isEnabled = true,
29+
) => ({ environmentId: EnvironmentId.make(environmentId), connectionState, isEnabled });
2330

2431
describe("pullRequestFallbackEnvironment", () => {
2532
it("moves to a connected copy of the repository when the original is down", () => {
2633
expect(
27-
pullRequestFallbackEnvironment(target, projects, new Set(["desktop", "server"])),
34+
pullRequestFallbackEnvironment(target, projects, [
35+
environment("desktop"),
36+
environment("server"),
37+
]),
2838
).toEqual({ environmentId: "server", projectId: "t3-copy" });
2939
});
3040

3141
it("stays put while the original is connected or nothing else holds the repository", () => {
32-
expect(pullRequestFallbackEnvironment(target, projects, new Set(["laptop", "server"]))).toBe(
33-
null,
34-
);
35-
expect(pullRequestFallbackEnvironment(target, projects, new Set(["desktop"]))).toBe(null);
42+
expect(
43+
pullRequestFallbackEnvironment(target, projects, [
44+
environment("laptop"),
45+
environment("server"),
46+
]),
47+
).toBe(null);
48+
expect(pullRequestFallbackEnvironment(target, projects, [environment("desktop")])).toBe(null);
3649
});
3750

3851
it("derives the host from the original project when the route has none", () => {
3952
const { host: _host, ...hostless } = target;
40-
expect(pullRequestFallbackEnvironment(hostless, projects, new Set(["server"]))).toEqual({
53+
expect(pullRequestFallbackEnvironment(hostless, projects, [environment("server")])).toEqual({
4154
environmentId: "server",
4255
projectId: "t3-copy",
4356
});

‎apps/mobile/src/features/pull-requests/pullRequestEnvironmentFallback.ts‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { EnvironmentProject } from "@t3tools/client-runtime/state/models";
2+
import type { EnvironmentConnectionSummary } from "@t3tools/client-runtime/state/presentation";
23

34
export type PullRequestEnvironmentTarget = {
45
readonly environmentId: string;
@@ -10,9 +11,28 @@ export type PullRequestEnvironmentTarget = {
1011
export function pullRequestFallbackEnvironment(
1112
target: PullRequestEnvironmentTarget,
1213
projects: ReadonlyArray<EnvironmentProject>,
13-
connectedEnvironmentIds: ReadonlySet<string>,
14+
environments: ReadonlyArray<
15+
Pick<EnvironmentConnectionSummary, "environmentId" | "connectionState" | "isEnabled">
16+
>,
1417
) {
15-
if (connectedEnvironmentIds.has(target.environmentId)) return null;
18+
const requested = environments.find(
19+
(environment) => environment.environmentId === target.environmentId,
20+
);
21+
// Pending connections retain the requested target until an explicit failure, even before
22+
// its project hydrates. Available includes the period before connection startup.
23+
if (
24+
requested?.isEnabled &&
25+
(requested.connectionState === "connected" ||
26+
requested.connectionState === "available" ||
27+
requested.connectionState === "connecting" ||
28+
requested.connectionState === "reconnecting")
29+
)
30+
return null;
31+
const connectedEnvironmentIds = new Set<string>(
32+
environments
33+
.filter((environment) => environment.isEnabled && environment.connectionState === "connected")
34+
.map((environment) => environment.environmentId),
35+
);
1636
const own = projects.find(
1737
(project) => project.environmentId === target.environmentId && project.id === target.projectId,
1838
);
Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
import type { EnvironmentConnectionPhase } from "@t3tools/client-runtime/connection";
2+
import type { EnvironmentProject } from "@t3tools/client-runtime/state/models";
3+
import { EnvironmentId } from "@t3tools/contracts";
4+
import { act, useEffect, useState } from "react";
5+
import { createRoot } from "react-dom/client";
6+
import { expect, it, vi } from "vite-plus/test";
7+
8+
import type { WorkspaceEnvironment } from "../../state/workspaceModel";
9+
import type { PullRequestEnvironmentTarget } from "./pullRequestEnvironmentFallback";
10+
11+
const mocks = vi.hoisted(() => ({
12+
environments: [] as ReadonlyArray<WorkspaceEnvironment>,
13+
isReady: true,
14+
projects: [] as ReadonlyArray<EnvironmentProject>,
15+
navigation: { setParams: vi.fn<(params: Partial<PullRequestEnvironmentTarget>) => void>() },
16+
}));
17+
18+
vi.mock("@react-navigation/native", () => ({ useNavigation: () => mocks.navigation }));
19+
vi.mock("../../state/entities", () => ({ useProjects: () => mocks.projects }));
20+
vi.mock("../../state/workspace", () => ({
21+
useWorkspaceEnvironments: () => mocks.environments,
22+
useConnectionsReady: () => mocks.isReady,
23+
}));
24+
25+
import { usePullRequestEnvironmentFallback } from "./usePullRequestEnvironmentFallback";
26+
27+
function environment(
28+
environmentId: string,
29+
connectionState: EnvironmentConnectionPhase,
30+
isEnabled = true,
31+
): WorkspaceEnvironment {
32+
return {
33+
environmentId: EnvironmentId.make(environmentId),
34+
environmentLabel: environmentId,
35+
displayUrl: "",
36+
isRelayManaged: false,
37+
isEnabled,
38+
connectionState,
39+
connectionError: null,
40+
connectionErrorTraceId: null,
41+
};
42+
}
43+
44+
function setup() {
45+
(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
46+
mocks.isReady = true;
47+
mocks.environments = [environment("requested", "connecting"), environment("copy", "connected")];
48+
mocks.projects = [
49+
{ environmentId: "requested", id: "original" },
50+
{ environmentId: "copy", id: "copy-project" },
51+
].map(
52+
(project) =>
53+
({
54+
...project,
55+
repositoryIdentity: { canonicalKey: "github.com/owner/repo" },
56+
}) as unknown as EnvironmentProject,
57+
);
58+
const container = document.createElement("div");
59+
const root = createRoot(container);
60+
mocks.navigation.setParams = vi.fn();
61+
function Probe() {
62+
const [params, updateParams] = useState({
63+
environmentId: "requested",
64+
projectId: "original",
65+
repository: "owner/repo",
66+
host: "github.com",
67+
});
68+
useEffect(() => {
69+
mocks.navigation.setParams.mockImplementation((next) =>
70+
updateParams((previous) => ({ ...previous, ...next })),
71+
);
72+
}, []);
73+
usePullRequestEnvironmentFallback(params);
74+
return <span>{`${params.environmentId}/${params.projectId}`}</span>;
75+
}
76+
return {
77+
render() {
78+
act(() => root.render(<Probe />));
79+
},
80+
get target() {
81+
return container.textContent;
82+
},
83+
[Symbol.dispose]() {
84+
act(() => root.unmount());
85+
},
86+
};
87+
}
88+
89+
it("keeps the requested target while the catalog initializes or its enabled connection is pending", () => {
90+
using screen = setup();
91+
mocks.isReady = false;
92+
mocks.environments = [environment("copy", "connected")];
93+
screen.render();
94+
expect(screen.target).toBe("requested/original");
95+
expect(mocks.navigation.setParams).not.toHaveBeenCalled();
96+
97+
mocks.isReady = true;
98+
for (const phase of ["available", "connecting", "reconnecting", "connected"] as const) {
99+
mocks.environments = [environment("requested", phase), environment("copy", "connected")];
100+
screen.render();
101+
expect(screen.target).toBe("requested/original");
102+
expect(mocks.navigation.setParams).not.toHaveBeenCalled();
103+
}
104+
});
105+
106+
it("falls back to a connected repository copy when the requested environment cannot connect", () => {
107+
for (const state of ["missing", "disabled", "offline", "error", "unsupported"] as const) {
108+
using screen = setup();
109+
mocks.environments = [
110+
...(state === "missing"
111+
? []
112+
: [
113+
environment(
114+
"requested",
115+
state === "disabled" ? "available" : state,
116+
state !== "disabled",
117+
),
118+
]),
119+
environment("copy", "connected"),
120+
];
121+
screen.render();
122+
expect(screen.target).toBe("copy/copy-project");
123+
expect(mocks.navigation.setParams).toHaveBeenCalledExactlyOnceWith({
124+
environmentId: "copy",
125+
projectId: "copy-project",
126+
});
127+
}
128+
});
129+
130+
it("does not replace a connecting target with a connected repository copy before its project hydrates", () => {
131+
using screen = setup();
132+
const projects = mocks.projects;
133+
mocks.projects = projects.filter((project) => project.environmentId !== "requested");
134+
screen.render();
135+
expect(screen.target).toBe("requested/original");
136+
expect(mocks.navigation.setParams).not.toHaveBeenCalled();
137+
138+
mocks.projects = projects;
139+
mocks.environments = [environment("requested", "connected"), environment("copy", "connected")];
140+
screen.render();
141+
expect(screen.target).toBe("requested/original");
142+
expect(mocks.navigation.setParams).not.toHaveBeenCalled();
143+
});

‎apps/mobile/src/features/pull-requests/usePullRequestEnvironmentFallback.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useNavigation } from "@react-navigation/native";
22
import { useEffect, useMemo } from "react";
33

44
import { useProjects } from "../../state/entities";
5-
import { useWorkspaceEnvironments } from "../../state/workspace";
5+
import { useConnectionsReady, useWorkspaceEnvironments } from "../../state/workspace";
66
import {
77
pullRequestFallbackEnvironment,
88
type PullRequestEnvironmentTarget,
@@ -11,13 +11,11 @@ import {
1111
export function usePullRequestEnvironmentFallback(params: PullRequestEnvironmentTarget) {
1212
const navigation = useNavigation();
1313
const projects = useProjects();
14-
const connected = useWorkspaceEnvironments()
15-
.filter((environment) => environment.connectionState === "connected")
16-
.map((environment) => String(environment.environmentId))
17-
.join("\n");
14+
const isReady = useConnectionsReady();
15+
const environments = useWorkspaceEnvironments();
1816
const fallback = useMemo(
19-
() => pullRequestFallbackEnvironment(params, projects, new Set(connected.split("\n"))),
20-
[params, projects, connected],
17+
() => (isReady ? pullRequestFallbackEnvironment(params, projects, environments) : null),
18+
[params, projects, environments, isReady],
2119
);
2220
useEffect(() => {
2321
if (fallback) navigation.setParams(fallback);

‎apps/mobile/vite.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { defineConfig } from "vite-plus";
22
import "vite-plus/test/config";
33

44
const reactTests = [
5+
"src/features/pull-requests/usePullRequestEnvironmentFallback.test.tsx",
56
"src/lib/filePreview.test.ts",
67
"src/features/diffs/nativeReviewDiffSurface.test.tsx",
78
"src/features/pull-requests/usePullRequestDiff.test.tsx",

‎apps/server/src/cloud/relayTracing.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { processServiceInstanceId } from "@t3tools/shared/observability";
1+
import {
2+
nodeProcessRuntimeAttributes,
3+
processServiceInstanceId,
4+
} from "@t3tools/shared/observability";
25
import * as RelayTracing from "@t3tools/shared/relayTracing";
36
import * as Effect from "effect/Effect";
47
import * as Layer from "effect/Layer";
@@ -21,12 +24,14 @@ const relayLayer = (resource: Omit<RelayTracing.RelayClientTracingResource, "ser
2124
export const layerHeadlessRelayClient = relayLayer({
2225
serviceName: "t3code-server",
2326
runtime: "node",
27+
attributes: nodeProcessRuntimeAttributes(),
2428
client: "headless-cli",
2529
});
2630

2731
export const layerServerRelayBroker = relayLayer({
2832
serviceName: "t3code-server",
2933
runtime: "node",
34+
attributes: nodeProcessRuntimeAttributes(),
3035
client: "environment-server",
3136
component: "relay-broker",
3237
});

‎apps/server/src/config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type { OtlpEndpointSource } from "@t3tools/contracts";
1212
import { sweepStalePendingAttachments } from "./attachmentStore.ts";
1313
import {
1414
DEFAULT_SIGNAL_EXPORT,
15+
nodeProcessRuntimeAttributes,
1516
processServiceInstanceId,
1617
type SignalExport,
1718
} from "@t3tools/shared/observability";
@@ -128,6 +129,7 @@ export const otlpResource = (
128129
"service.instance.id": processServiceInstanceId(config.otelEnvironment.resourceAttributes),
129130
...releaseResourceAttributes(telemetryChannel, config.otelEnvironment.resourceAttributes),
130131
"host.name": config.otelEnvironment.resourceAttributes["host.name"] || hostName,
132+
...nodeProcessRuntimeAttributes(),
131133
},
132134
});
133135

0 commit comments

Comments
 (0)