Skip to content

Commit 6e2c0a8

Browse files
Merge origin/main into v2/oc2-7-continuation-wake-identity
# Conflicts: # apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts # packages/provider-opencode/src/server/v2/adapter.ts
2 parents a7034aa + cb7d073 commit 6e2c0a8

118 files changed

Lines changed: 9130 additions & 813 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.

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ You can think of T3 Code as an open source "bring-your-own-subscription" alterna
66

77
## What makes T3 Code special?
88

9-
We have over 400,000 users who love T3 Code. It's important we maintain the things they love as we continue to iterate on the product. Here's a brief list of the things we can never compromise on.
9+
We have over 500,000 users who love T3 Code. It's important we maintain the things they love as we continue to iterate on the product. Here's a brief list of the things we can never compromise on.
1010

1111
### 1. Open at the core
1212

‎apps/desktop/src/preview/PickPreload.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,7 @@ function startAnnotation(sendEnabled: boolean): void {
554554
let finished = false;
555555
const host = document.createElement("div");
556556
host.setAttribute(OVERLAY_ATTRIBUTE, "");
557+
host.setAttribute("dir", "ltr");
557558
host.style.cssText = `position:fixed;inset:0;z-index:${Z_INDEX_OVERLAY};pointer-events:none`;
558559
applyAnnotationTheme(host, annotationTheme);
559560
const shadowRoot = host.attachShadow({ mode: "closed" });
@@ -563,6 +564,7 @@ function startAnnotation(sendEnabled: boolean): void {
563564

564565
const root = document.createElement("div");
565566
root.setAttribute(OVERLAY_ATTRIBUTE, "");
567+
root.setAttribute("dir", "ltr");
566568
root.className = "fixed inset-0 font-sans text-foreground";
567569
root.style.cssText = "pointer-events:none";
568570
const cursorStyle = document.createElement("style");
@@ -612,6 +614,7 @@ function startAnnotation(sendEnabled: boolean): void {
612614

613615
const comment = document.createElement("textarea");
614616
comment.placeholder = "Describe the change…";
617+
comment.setAttribute("dir", "auto");
615618
comment.rows = 1;
616619
comment.className =
617620
"min-h-8 max-h-24 min-w-0 flex-1 resize-none overflow-y-hidden border-0 border-b border-b-transparent bg-transparent px-0 py-1.5 font-sans text-sm leading-5 text-foreground outline-none ring-0 placeholder:text-muted-foreground focus:border-b-primary focus:outline-none focus:ring-0";

‎apps/marketing/src/lib/site.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ export const ANDROID_PLAY_STORE_URL =
88

99
export const MARKETING_STATS = {
1010
githubStars: "24k+",
11-
users: "400,000",
11+
users: "500,000",
1212
} as const;

‎apps/mobile/src/Stack.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,10 @@ const RootStackConfig = createWorkspaceStackNavigator({
905905
screen: ConnectionsNewRouteScreen,
906906
linking: "connections/new",
907907
options: {
908+
// Keep the iOS header visible from the first render so the sheet's
909+
// native header stack mounts without remounting the pairing form.
910+
...(Platform.OS === "ios" ? SHEET_GLASS_HEADER_OPTIONS : undefined),
911+
title: "Add Environment",
908912
...FORM_SHEET_PRESENTATION_OPTIONS,
909913
sheetAllowedDetents: [0.55, 0.7],
910914
sheetGrabberVisible: true,

‎apps/mobile/src/features/threads/ThreadAgentsSheet.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ import { AndroidSheetHeader } from "../../components/AndroidScreenHeader";
1919
import { AppText as Text } from "../../components/AppText";
2020
import { useUniwindTheme } from "../../lib/useUniwindTheme";
2121
import { environmentThreadDetails } from "../../state/threads";
22-
import { nativeHeaderScrollEdgeEffects } from "../../native/StackHeader";
22+
import { NativeStackScreenOptions, nativeHeaderScrollEdgeEffects } from "../../native/StackHeader";
2323
import { SubagentRow } from "./SubagentRow";
24+
import { MaterialScreenContent } from "../../components/MaterialScreenContent";
25+
import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
2426

2527
const HEADER_SCROLL_EDGE_EFFECTS = nativeHeaderScrollEdgeEffects(Platform.OS, Platform.Version);
2628

@@ -31,6 +33,7 @@ export function useThreadTurnSubagents(target: AgentsTarget): ThreadTurnSubagent
3133
}
3234

3335
export function ThreadAgentsSheet({ route }: StaticScreenProps<AgentsTarget>) {
36+
const { layout } = useAdaptiveWorkspaceLayout();
3437
const target = route.params;
3538
const navigation = useNavigation();
3639
const insets = useSafeAreaInsets();
@@ -112,8 +115,11 @@ export function ThreadAgentsSheet({ route }: StaticScreenProps<AgentsTarget>) {
112115

113116
return (
114117
<View collapsable={false} className="flex-1 bg-sheet">
118+
<NativeStackScreenOptions options={{ sheetCornerRadius: 28 }} />
115119
<AndroidSheetHeader title="Agents" onBack={() => navigation.goBack()} />
116-
{content}
120+
<MaterialScreenContent insetHorizontal={layout.usesSplitView}>
121+
{content}
122+
</MaterialScreenContent>
117123
</View>
118124
);
119125
}

‎apps/mobile/src/features/threads/ThreadQueueControl.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ import { AndroidSheetHeader } from "../../components/AndroidScreenHeader";
1818
import { AppText as Text } from "../../components/AppText";
1919
import { SymbolView } from "../../components/AppSymbol";
2020
import { ControlPillMenu } from "../../components/ControlPill";
21+
import { MaterialScreenContent } from "../../components/MaterialScreenContent";
2122
import { scopedThreadKey } from "../../lib/scopedEntities";
2223
import { useUniwindTheme } from "../../lib/useUniwindTheme";
23-
import { nativeHeaderScrollEdgeEffects } from "../../native/StackHeader";
24+
import { NativeStackScreenOptions, nativeHeaderScrollEdgeEffects } from "../../native/StackHeader";
2425
import { useAssetUrl } from "../../state/assets";
2526
import { beginQueuedRunEdit, useQueuedRunEdit } from "../../state/queued-run-edit";
2627
import { environmentThreadDetails, threadEnvironment } from "../../state/threads";
2728
import { useAtomCommand } from "../../state/use-atom-command";
29+
import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
2830
import {
2931
REMOVE_QUEUED_MESSAGE_ACCESSIBILITY_LABEL,
3032
buildCancelQueuedRunCommand,
@@ -51,6 +53,7 @@ export function useThreadQueuedCount(target: QueueTarget) {
5153
}
5254

5355
export function ThreadQueueSheet({ route }: StaticScreenProps<QueueTarget>) {
56+
const { layout } = useAdaptiveWorkspaceLayout();
5457
const target = route.params;
5558
const navigation = useNavigation();
5659
const insets = useSafeAreaInsets();
@@ -446,8 +449,11 @@ export function ThreadQueueSheet({ route }: StaticScreenProps<QueueTarget>) {
446449
return (
447450
<GestureHandlerRootView style={{ flex: 1 }}>
448451
<View collapsable={false} className="flex-1 bg-sheet">
452+
<NativeStackScreenOptions options={{ sheetCornerRadius: 28 }} />
449453
<AndroidSheetHeader title="Queued" onBack={() => navigation.goBack()} />
450-
{content}
454+
<MaterialScreenContent insetHorizontal={layout.usesSplitView}>
455+
{content}
456+
</MaterialScreenContent>
451457
</View>
452458
</GestureHandlerRootView>
453459
);

‎apps/mobile/src/features/threads/floating-working-control.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ const CONTROL_TIMING = {
4646
easing: Easing.out(Easing.cubic),
4747
reduceMotion: ReduceMotion.System,
4848
} as const;
49-
const CONTROL_SEPARATION = (16 + CONTROL_HEIGHT) / 2;
49+
const CONTROL_ROW_GAP = 14;
50+
const CONTROL_SEPARATION = (CONTROL_ROW_GAP + CONTROL_HEIGHT) / 2;
5051
// Both rows share the same centered anchor, so the outgoing one clears fast and
5152
// the incoming one waits for it to be mostly gone before it starts to show.
5253
const LABEL_ENTERING = FadeIn.duration(160).delay(80).reduceMotion(ReduceMotion.System);
@@ -274,7 +275,7 @@ export function FloatingWorkingControl(props: {
274275

275276
<AnimatedGlassView
276277
colorScheme={props.colorScheme}
277-
glassEffectStyle="regular"
278+
glassEffectStyle={{ style: props.showScrollToEnd ? "regular" : "none", animate: true }}
278279
isInteractive
279280
pointerEvents={props.showScrollToEnd ? "auto" : "none"}
280281
accessibilityElementsHidden={!props.showScrollToEnd}

‎apps/server/src/auth/RpcAuthorization.test.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
ProviderInstanceId,
99
ThreadId,
1010
AuthOrchestrationOperateScope,
11+
ORCHESTRATION_V2_WS_METHODS,
1112
AuthOrchestrationReadScope,
1213
AuthSourceControlWriteScope,
1314
AuthPreviewOperateScope,
@@ -35,6 +36,12 @@ describe("RPC authorization scopes", () => {
3536
expect(new Set(Object.keys(RPC_REQUIRED_SCOPES))).toEqual(new Set(WsRpcGroup.requests.keys()));
3637
});
3738

39+
it("requires operate access to stop a workflow", () => {
40+
expect(requiredScopeForRpcMethod(ORCHESTRATION_V2_WS_METHODS.stopWorkflow)).toBe(
41+
AuthOrchestrationOperateScope,
42+
);
43+
});
44+
3845
it("authorizes background policy reporting and observation deliberately", () => {
3946
expect(requiredScopeForRpcMethod(WS_METHODS.serverReportClientActivity)).toBe(
4047
AuthOrchestrationReadScope,

‎apps/server/src/auth/RpcAuthorization.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export const RPC_REQUIRED_SCOPES = {
4646
...CLIENT_GUARDED_RPC_SCOPES,
4747
[ORCHESTRATION_V2_WS_METHODS.dispatchCommand]: AuthOrchestrationOperateScope,
4848
[ORCHESTRATION_V2_WS_METHODS.getWorkflowScript]: AuthOrchestrationReadScope,
49+
[ORCHESTRATION_V2_WS_METHODS.stopWorkflow]: AuthOrchestrationOperateScope,
4950
[ORCHESTRATION_V2_WS_METHODS.getTurnDiff]: AuthOrchestrationReadScope,
5051
[ORCHESTRATION_V2_WS_METHODS.getFullThreadDiff]: AuthOrchestrationReadScope,
5152
[ORCHESTRATION_V2_WS_METHODS.searchThreads]: AuthOrchestrationReadScope,

‎apps/server/src/device/DeviceToolchain.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import * as ProcessRunner from "../processRunner.ts";
2828
const DEVICE_HUB_PACKAGE = "expo-device-hub";
2929
export const DEVICE_HUB_VERSION = "0.15.3";
3030
const AGENT_DEVICE_PACKAGE = "agent-device";
31-
export const AGENT_DEVICE_VERSION = "0.21.23";
31+
export const AGENT_DEVICE_VERSION = "0.21.24";
3232

3333
const INSTALL_TIMEOUT = Duration.minutes(10);
3434
const installLock = Semaphore.makeUnsafe(1);

0 commit comments

Comments
 (0)