Skip to content

Commit 03e45ab

Browse files
committed
Merge upstream main to refresh PR 17547
2 parents a24706d + 17e1087 commit 03e45ab

115 files changed

Lines changed: 7597 additions & 4694 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.

‎apps/desktop/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
"tailwindcss": "^4.0.0",
4343
"vite-plus": "catalog:"
4444
},
45-
"productName": "T3 Code (Alpha)"
45+
"productName": "T3 Code (Beta)"
4646
}

‎apps/desktop/scripts/electron-launcher.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const repoRoot = NodePath.resolve(desktopDir, "..", "..");
1515
const devBundleIdSuffix = NodePath.basename(repoRoot)
1616
.toLowerCase()
1717
.replaceAll(/[^a-z0-9]+/g, "");
18-
const APP_DISPLAY_NAME = isDevelopment ? "T3 Code (Dev)" : "T3 Code (Alpha)";
18+
const APP_DISPLAY_NAME = isDevelopment ? "T3 Code (Dev)" : "T3 Code (Beta)";
1919
const APP_BUNDLE_ID = isDevelopment
2020
? `com.t3tools.t3code.dev.${devBundleIdSuffix || "local"}`
2121
: "com.t3tools.t3code";

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ describe("DesktopAppIdentity", () => {
217217
const identity = yield* DesktopAppIdentity.DesktopAppIdentity;
218218
yield* identity.configure;
219219

220-
assert.deepEqual(calls.setName, ["T3 Code Alpha"]);
221-
assert.equal(calls.setAboutPanelOptions[0]?.applicationName, "T3 Code (Alpha)");
220+
assert.deepEqual(calls.setName, ["T3 Code Beta"]);
221+
assert.equal(calls.setAboutPanelOptions[0]?.applicationName, "T3 Code (Beta)");
222222
assert.equal(calls.setAboutPanelOptions[0]?.applicationVersion, "1.2.3");
223223
assert.equal(calls.setAboutPanelOptions[0]?.version, "0123456789ab");
224224
// Packaged: the bundle's own icon stands, so a custom one the user
@@ -238,7 +238,7 @@ describe("DesktopAppIdentity", () => {
238238
});
239239

240240
it.effect.each([
241-
{ stage: "Alpha", environment: {} },
241+
{ stage: "Beta", environment: {} },
242242
{
243243
stage: "Nightly",
244244
environment: { appVersion: "0.0.43-nightly.20260929.2428" },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function resolveDesktopAppStageLabel(input: {
103103
return "Dev";
104104
}
105105

106-
return isNightlyDesktopVersion(input.appVersion) ? "Nightly" : "Alpha";
106+
return isNightlyDesktopVersion(input.appVersion) ? "Nightly" : "Beta";
107107
}
108108

109109
export function resolveDesktopAppBranding(input: {

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
makeTraceSink,
55
type SignalExport,
66
} from "@t3tools/shared/observability";
7+
import * as HostProcess from "@t3tools/shared/HostProcess";
78
import * as SharedObservability from "@t3tools/shared/observability";
89
import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
910
import {
@@ -625,12 +626,16 @@ const layerTelemetry = Layer.unwrap(
625626
Effect.gen(function* () {
626627
const environment = yield* DesktopEnvironment.DesktopEnvironment;
627628
const endpoints = yield* resolveOtlpEndpoints;
629+
// `host.name` keeps machines apart on a shared collector; one set in
630+
// `OTEL_RESOURCE_ATTRIBUTES` wins, since explicit attributes override it.
628631
const resource = {
629632
serviceName: "t3code-desktop",
633+
serviceVersion: environment.appVersion,
630634
attributes: {
631635
"service.namespace": "t3code",
632636
"service.runtime": "desktop",
633637
"service.mode": environment.isDevelopment ? "development" : "packaged",
638+
"host.name": endpoints.resourceAttributes["host.name"] || (yield* HostProcess.Hostname),
634639
},
635640
};
636641

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ describe("DesktopPreReadyPlatform", () => {
175175
const identity = yield* Effect.promise(() => portalIdentity);
176176
assert.equal(identity.desktopName, "com.t3tools.T3Code.desktop");
177177
assert.include(identity.desktopEntry ?? "", 'Exec="/Applications/current.AppImage" %U');
178-
assert.include(identity.desktopEntry ?? "", "Name=T3 Code (Alpha)");
178+
assert.include(identity.desktopEntry ?? "", "Name=T3 Code (Beta)");
179179
assert.include(identity.desktopEntry ?? "", "MimeType=x-scheme-handler/t3code;");
180180
assert.include(
181181
identity.desktopEntry ?? "",
-1.04 MB
Binary file not shown.
1.05 MB
Binary file not shown.

‎apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swift‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import AVFoundation
12
import ExpoModulesCore
23
import Security
34
import UIKit
@@ -97,6 +98,18 @@ public final class T3NativeControlsModule: Module {
9798
dismissVideoPresentation(identifier: identifier)
9899
}
99100

101+
// expo-video activates the session for inline playback but never deactivates
102+
// it. Any other category or mode means another feature (recording) owns it.
103+
@JS
104+
@MainActor
105+
func releaseVideoAudioSession() async {
106+
// The fullscreen presentation releases the session in its own teardown.
107+
guard videoPresentation == nil else { return }
108+
let session = AVAudioSession.sharedInstance()
109+
guard session.category == .playback, session.mode == .moviePlayback else { return }
110+
try? session.setActive(false, options: [.notifyOthersOnDeactivation])
111+
}
112+
100113
@JS
101114
@MainActor
102115
func dismissFile(identifier: String) async {

‎apps/mobile/modules/t3-native-controls/ios/T3NativeVideoPresentation.swift‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,19 @@ final class T3NativeVideoPresentation: NSObject, AVPlayerViewControllerDelegate,
152152
if let backgroundObserver { NotificationCenter.default.removeObserver(backgroundObserver) }
153153
backgroundObserver = nil
154154
let audioSession = AVAudioSession.sharedInstance()
155+
// Still what present() set, allowing the .mixWithOthers flip expo-video
156+
// makes when the inline players pause under this preview. A recorder that
157+
// claimed the session since owns it.
155158
if let previousAudioSession, audioSession.category == .playback,
156-
audioSession.mode == .moviePlayback, audioSession.categoryOptions.isEmpty {
157-
// AVPlayer owns activation. Deactivating the shared session here could
158-
// stop another player or recorder that was active before this preview.
159+
audioSession.mode == .moviePlayback,
160+
audioSession.categoryOptions.isSubset(of: [.mixWithOthers]) {
159161
try? audioSession.setCategory(
160162
previousAudioSession.category,
161163
mode: previousAudioSession.mode,
162164
options: previousAudioSession.options
163165
)
166+
// Deactivating with notification lets interrupted apps resume.
167+
try? audioSession.setActive(false, options: [.notifyOthersOnDeactivation])
164168
}
165169
completion(playbackError)
166170
}

0 commit comments

Comments
 (0)