Skip to content

Commit 18b1991

Browse files
maria-rckssaphid
andcommitted
chore: merge main into approval answer fix
Co-authored-by: Alex Southwell <[email protected]>
2 parents 3e6b4fe + 44df336 commit 18b1991

157 files changed

Lines changed: 8991 additions & 1512 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.

‎.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/

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ For authorized mobile verification, a missing or outdated native client is an in
139139
## Pull requests
140140

141141
- Never make a PR unless the developer explicitly asks you to do so.
142-
- If `origin` is git.cafe, follow [GitCafe mirror](docs/operations/development.md#gitcafe-mirror-optional): use `cafe` for existing PRs, issues, comments and labels, but push and open PRs on GitHub, where CI runs.
142+
- If `origin` is git.cafe, follow [GitCafe mirror](docs/operations/development.md#gitcafe-mirror-optional): push to `origin`, open and track PRs with `cafe` and their git.cafe URLs, and keep `gh` for CI logs and merging.
143143
- Conventional commit titles, plain language: `fix(web): new threads no longer spike CPU`.
144144
- Body: the problem in a sentence or two, then how you fixed it. End with the model and harness that did the work.
145145
- UI changes need before/after images. Motion or timing needs a short video.

‎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/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
"react-native-enriched-markdown": "file:deps/react-native-enriched-markdown-1.2.0-t3.16-558767d9.tgz",
130130
"react-native-gesture-handler": "~3.3.0",
131131
"react-native-image-viewing": "^0.2.2",
132-
"react-native-keyboard-controller": "1.22.7",
132+
"react-native-keyboard-controller": "1.22.8",
133133
"react-native-nitro-modules": "0.37.1",
134134
"react-native-pdf-jsi": "5.0.0",
135135
"react-native-reanimated": "4.7.1",

‎apps/mobile/src/Stack.tsx‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ import { ThreadPullRequestsSheet } from "./features/threads/ThreadPullRequestsSh
6565
import { ThreadAgentsSheet } from "./features/threads/ThreadAgentsSheet";
6666
import { ThreadBackgroundWorkSheet } from "./features/threads/ThreadBackgroundWorkSheet";
6767
import { ThreadQueueSheet } from "./features/threads/ThreadQueueControl";
68-
import { ThreadRouteScreen } from "./features/threads/ThreadRouteScreen";
68+
import {
69+
FullscreenThreadRouteScreen,
70+
ThreadRouteScreen,
71+
} from "./features/threads/ThreadRouteScreen";
6972
import { McpAppFullscreenScreen } from "./features/threads/McpAppFullscreenScreen";
7073
import { ConnectionsRouteScreen } from "./features/connection/ConnectionsRouteScreen";
7174
import { ConnectionsNewRouteScreen } from "./features/connection/ConnectionsNewRouteScreen";
@@ -813,6 +816,13 @@ const RootStackConfig = createWorkspaceStackNavigator({
813816
linking: `${THREAD_LINKING_PREFIX}/terminal`,
814817
options: SOLID_HEADER_OPTIONS,
815818
}),
819+
ThreadInspectorFullscreen: createNativeStackScreen({
820+
screen: FullscreenThreadRouteScreen,
821+
options: {
822+
...THREAD_HEADER_OPTIONS,
823+
presentation: "fullScreenModal",
824+
},
825+
}),
816826
ThreadDevicePreview: createNativeStackScreen({
817827
screen: DevicePreviewRouteScreen,
818828
linking: `${THREAD_LINKING_PREFIX}/devices`,

‎apps/mobile/src/components/ui/Toast.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ function ToastContent(props: ToastProps & { readonly glassReady?: boolean }) {
9393
</AppText>
9494
) : null}
9595
</View>
96-
{inlineAction ? action : null}
96+
{inlineAction && action ? <View className="self-center">{action}</View> : null}
9797
{props.onDismiss && props.dismissMode !== "swipe" ? (
9898
<IconButton accessibilityLabel="Dismiss message" icon="xmark" onPress={props.onDismiss} />
9999
) : null}

0 commit comments

Comments
 (0)