Skip to content

Commit a893ef2

Browse files
authored
Merge branch 'main' into feat/explicit-chat-latex
2 parents e3a76d6 + ec80933 commit a893ef2

318 files changed

Lines changed: 5206 additions & 3298 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/mobile/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,12 @@
6969
"@t3tools/mobile-markdown-text": "file:./modules/t3-markdown-text",
7070
"@t3tools/mobile-review-diff-native": "file:./modules/t3-review-diff",
7171
"@t3tools/mobile-terminal-native": "file:./modules/t3-terminal",
72+
"@t3tools/provider-acp-registry": "workspace:*",
7273
"@t3tools/provider-core": "workspace:*",
74+
"@t3tools/provider-cursor": "workspace:*",
75+
"@t3tools/provider-grok": "workspace:*",
7376
"@t3tools/provider-muse": "workspace:*",
77+
"@t3tools/provider-opencode": "workspace:*",
7478
"@t3tools/provider-pi": "workspace:*",
7579
"@t3tools/shared": "workspace:*",
7680
"@tabler/icons-react-native": "^3.44.0",

‎apps/mobile/src/components/ProviderIcon.tsx‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -93,33 +93,6 @@ export function ProviderIcon(props: ProviderIconProps) {
9393
);
9494
}
9595

96-
if (props.provider === "grok") {
97-
const fill = isDarkMode ? "#F5F5F5" : "#0F0F0F";
98-
return (
99-
<Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
100-
<Path
101-
fill={fill}
102-
d="M9.26905 15.284L17.2479 9.36086C17.6391 9.07047 18.1981 9.18374 18.3845 9.63478C19.3655 12.0135 18.9272 14.8721 16.9755 16.8349C15.0238 18.7976 12.3082 19.228 9.8261 18.2477L7.1146 19.5102C11.0037 22.1834 15.7263 21.5223 18.6774 18.5525C21.0182 16.1985 21.7432 12.9897 21.0653 10.0961L21.0714 10.1023C20.0884 5.85143 21.3131 4.15233 23.8218 0.677913C23.8812 0.595532 23.9406 0.513151 24 0.428711L20.6987 3.74866V3.73836L9.267 15.2861"
103-
/>
104-
<Path
105-
fill={fill}
106-
d="M7.62249 16.7237C4.83113 14.0422 5.3124 9.89222 7.69417 7.49905C9.45541 5.72786 12.341 5.00497 14.86 6.06768L17.5653 4.81138C17.0779 4.45714 16.4533 4.07613 15.7365 3.80839C12.4966 2.46764 8.6178 3.13492 5.98413 5.78141C3.45081 8.32904 2.65415 12.2463 4.02219 15.5889C5.04412 18.0871 3.36889 19.8541 1.68137 21.6377C1.08337 22.2699 0.483318 22.9022 0 23.5716L7.62045 16.7257"
107-
/>
108-
</Svg>
109-
);
110-
}
111-
112-
if (props.provider === "cursor") {
113-
return (
114-
<Svg width={size} height={size} viewBox="0 0 466.73 532.09" fill="none">
115-
<Path
116-
fill={isDarkMode ? "#EDECEC" : "#26251E"}
117-
d="M457.43,125.94L244.42,2.96c-6.84-3.95-15.28-3.95-22.12,0L9.3,125.94c-5.75,3.32-9.3,9.46-9.3,16.11v247.99c0,6.65,3.55,12.79,9.3,16.11l213.01,122.98c6.84,3.95,15.28,3.95,22.12,0l213.01-122.98c5.75-3.32,9.3-9.46,9.3-16.11v-247.99c0-6.65-3.55-12.79-9.3-16.11h-.01ZM444.05,151.99l-205.63,356.16c-1.39,2.4-5.06,1.42-5.06-1.36v-233.21c0-4.66-2.49-8.97-6.53-11.31L24.87,145.67c-2.4-1.39-1.42-5.06,1.36-5.06h411.26c5.84,0,9.49,6.33,6.57,11.39h-.01Z"
118-
/>
119-
</Svg>
120-
);
121-
}
122-
12396
const packageIcon = getProviderClient(props.provider)?.icon;
12497
if (packageIcon) {
12598
const themeFill = (fill: { readonly light: string; readonly dark: string }) =>
@@ -138,15 +111,6 @@ export function ProviderIcon(props: ProviderIconProps) {
138111
);
139112
}
140113

141-
if (props.provider === "opencode") {
142-
return (
143-
<Svg width={size} height={size} viewBox="0 0 32 40" fill="none">
144-
<Path d="M24 32H8V16H24V32Z" fill={isDarkMode ? "#4B4646" : "#CFCECD"} />
145-
<Path d="M24 8H8V32H24V8ZM32 40H0V0H32V40Z" fill={isDarkMode ? "#F1ECEC" : "#211E1E"} />
146-
</Svg>
147-
);
148-
}
149-
150114
// codex (and unknown drivers)
151115
return (
152116
<Svg width={size} height={size} viewBox="100 100 411 411" fill="none">

‎apps/mobile/src/features/settings/EnvironmentRoutesSection.tsx‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ import {
99
connectionRoutes,
1010
isLearned,
1111
} from "@t3tools/client-runtime/connection";
12-
import type { EnvironmentId } from "@t3tools/contracts";
12+
import { type EnvironmentId, sessionGrantsScope } from "@t3tools/contracts";
13+
import { AUTH_SCOPE_OPTIONS } from "@t3tools/shared/authScopeOptions";
14+
import { AsyncResult } from "effect/reactivity";
1315
import * as Option from "effect/Option";
1416
import { useEffect, useMemo, useRef, useState } from "react";
1517
import { Alert, Platform, Pressable, View } from "react-native";
@@ -35,6 +37,7 @@ const ROUTE_ICONS: Record<ConnectionRouteKind, AppSymbolName> = {
3537
loopback: "desktopcomputer",
3638
lan: "wifi",
3739
tailnet: "point.3.connected.trianglepath.dotted",
40+
vpn: { ios: "lock.shield", android: "lock" },
3841
public: "globe",
3942
ssh: "terminal",
4043
};
@@ -56,6 +59,9 @@ export function EnvironmentRoutesSection({
5659
}) {
5760
const entry = useAtomValue(environmentCatalog.catalogValueAtom).entries.get(environmentId);
5861
const prepared = useAtomValue(environmentSession.preparedConnectionValueAtom(environmentId));
62+
const sessionResult = useAtomValue(environmentSession.sessionStateAtom(environmentId));
63+
const session = Option.getOrNull(AsyncResult.value(sessionResult));
64+
const [permissionsOpen, setPermissionsOpen] = useState(false);
5965
const reorder = useAtomCommand(environmentCatalog.reorderRoutes, "route reorder");
6066
const removeRoute = useAtomCommand(environmentCatalog.removeRoute, "route removal");
6167
const [editing, setEditing] = useState(false);
@@ -146,6 +152,36 @@ export function EnvironmentRoutesSection({
146152
) : undefined
147153
}
148154
>
155+
<SettingsActionRow
156+
icon="checkmark.circle"
157+
label="Your permissions"
158+
onPress={() => setPermissionsOpen((open) => !open)}
159+
/>
160+
{permissionsOpen ? (
161+
<View className="gap-2 px-4 py-3">
162+
{activeRouteId !== null &&
163+
sessionResult._tag !== "Failure" &&
164+
!sessionResult.waiting &&
165+
session?.authenticated ? (
166+
<>
167+
<Text className="text-sm text-foreground-muted">
168+
Applies to the route marked In use. Other routes may have different permissions and
169+
have not been checked.
170+
</Text>
171+
{AUTH_SCOPE_OPTIONS.map(({ scope, title }) => (
172+
<Text key={scope} className="text-sm text-foreground">
173+
{title}: {sessionGrantsScope(session, scope) ? "Allowed" : "Not granted"}
174+
</Text>
175+
))}
176+
</>
177+
) : (
178+
<Text className="text-sm text-foreground-muted">
179+
Permissions not checked. Connect to this environment to view this session’s
180+
permissions.
181+
</Text>
182+
)}
183+
</View>
184+
) : null}
149185
{routes.map((route, index) => {
150186
const id = connectionRouteId(route.target);
151187
// Rows between the lifted row and its drop slot shift to make room.

‎apps/mobile/src/lib/providerClients.ts‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
import { isProviderDriverKind } from "@t3tools/contracts";
2+
import { acpRegistryClient } from "@t3tools/provider-acp-registry/client";
23
import { makeProviderClientRegistry } from "@t3tools/provider-core/client";
4+
import { cursorClient } from "@t3tools/provider-cursor/client";
5+
import { grokClient } from "@t3tools/provider-grok/client";
36
import { museClient } from "@t3tools/provider-muse/client";
7+
import { openCodeClient } from "@t3tools/provider-opencode/client";
48
import { piClient } from "@t3tools/provider-pi/client";
59

610
/** The provider client definitions this mobile build ships. */
7-
const providerClients = makeProviderClientRegistry([museClient, piClient]);
11+
const providerClients = makeProviderClientRegistry([
12+
cursorClient,
13+
grokClient,
14+
museClient,
15+
openCodeClient,
16+
piClient,
17+
acpRegistryClient,
18+
]);
819

920
/** The client definition for a driver kind, or `undefined` for drivers drawn by hand. */
1021
export function getProviderClient(driver: string | null | undefined) {

‎apps/server/package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,14 @@
3636
"@ff-labs/fff-node": "0.9.4",
3737
"@muse-code/sdk": "1.4.2",
3838
"@napi-rs/keyring": "^1.3.0",
39-
"@noble/hashes": "catalog:",
4039
"@opencode-ai/sdk": "^1.3.15",
41-
"@opencode/client": "2.0.23",
42-
"@opencode/protocol": "2.0.23",
43-
"@opencode/schema": "2.0.23",
40+
"@t3tools/provider-acp": "workspace:*",
41+
"@t3tools/provider-acp-registry": "workspace:*",
4442
"@t3tools/provider-core": "workspace:*",
43+
"@t3tools/provider-cursor": "workspace:*",
44+
"@t3tools/provider-grok": "workspace:*",
4545
"@t3tools/provider-muse": "workspace:*",
46+
"@t3tools/provider-opencode": "workspace:*",
4647
"@t3tools/provider-pi": "workspace:*",
4748
"diff": "8.0.3",
4849
"effect": "catalog:",

‎apps/server/scripts/record-grok-acp-replay-fixture.ts‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
* node scripts/record-grok-acp-replay-fixture.ts --scenario simple
1111
*/
1212
import * as NodeServices from "@effect/platform-node/NodeServices";
13-
import { GrokSettings, type ProviderReplayEntry } from "@t3tools/contracts";
13+
import { type ProviderReplayEntry } from "@t3tools/contracts";
14+
import { GrokSettings } from "@t3tools/provider-grok/settings";
1415
import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess";
1516
import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime";
1617
import * as Clock from "effect/Clock";
1718
import * as Console from "effect/Console";
18-
import * as Crypto from "effect/Crypto";
1919
import * as Effect from "effect/Effect";
2020
import * as FileSystem from "effect/FileSystem";
2121
import * as Layer from "effect/Layer";
@@ -24,14 +24,14 @@ import * as Schema from "effect/Schema";
2424
import { ChildProcessSpawner } from "effect/process";
2525
import type * as EffectAcpProtocol from "effect-acp/protocol";
2626

27-
import * as ServerConfig from "../src/config.ts";
27+
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
2828
import {
2929
GROK_DEFAULT_INSTANCE_ID,
3030
GROK_PROVIDER,
3131
grokLaunchRuntimeMode,
3232
makeGrokAdapterV2,
33-
} from "../src/orchestration-v2/Adapters/GrokAdapterV2.ts";
34-
import { ACP_PROTOCOL } from "../src/orchestration-v2/Adapters/AcpAdapterV2.ts";
33+
} from "@t3tools/provider-grok/testing";
34+
import { ACP_PROTOCOL } from "@t3tools/provider-acp/server/adapter";
3535
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
3636
import type { ProviderAdapterV2SessionRuntime } from "@t3tools/provider-core/server/ProviderAdapter";
3737
import * as ProviderContinuationRequests from "@t3tools/provider-core/server/continuationRequests";
@@ -40,10 +40,9 @@ import { provideDeterministicTestRuntime } from "../src/orchestration-v2/testkit
4040
import { ORCHESTRATOR_REPLAY_FIXTURES } from "../src/orchestration-v2/testkit/fixtures/index.ts";
4141
import { materializeFixtureInput } from "../src/orchestration-v2/testkit/fixtures/shared.ts";
4242
import { runOrchestratorV2Scenario } from "../src/orchestration-v2/testkit/OrchestratorScenario.ts";
43-
import { makeReplayServerConfig } from "../src/orchestration-v2/testkit/ProviderReplayHarness.ts";
4443
import * as ProviderReplayHarness from "../src/orchestration-v2/testkit/ProviderReplayHarness.ts";
4544
import { checkpointWorkspace } from "@t3tools/provider-testing/replayWorkspace";
46-
import { makeGrokAcpRuntime } from "../src/provider/acp/GrokAcpSupport.ts";
45+
import { makeGrokAcpRuntime } from "@t3tools/provider-grok/testing";
4746
import { buildRuntimeInstructions } from "@t3tools/provider-core/server/runtimeInstructions";
4847

4948
const wallClock = Clock.Clock.defaultValue();
@@ -446,16 +445,11 @@ const recordScenario = Effect.fn("recordGrokScenario")(function* (fixtureName: s
446445
Effect.gen(function* () {
447446
const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
448447
const environment = yield* HostProcessEnvironment;
449-
const adapter = makeGrokAdapterV2({
448+
const adapter = yield* makeGrokAdapterV2({
450449
instanceId: GROK_DEFAULT_INSTANCE_ID,
451450
settings,
452451
environment,
453452
hostPlatform: yield* HostProcessPlatform,
454-
childProcessSpawner,
455-
crypto: yield* Crypto.Crypto,
456-
fileSystem: yield* FileSystem.FileSystem,
457-
idAllocator: yield* IdAllocator.IdAllocatorV2,
458-
serverConfig: yield* ServerConfig.ServerConfig,
459453
selfInvocation: yield* resolveSelfInvocation(),
460454
continuationRequests: yield* ProviderContinuationRequests.ProviderContinuationRequests,
461455
// Production's runtime factory, with the protocol logger teeing raw lines.
@@ -496,10 +490,7 @@ const recordScenario = Effect.fn("recordGrokScenario")(function* (fixtureName: s
496490
).pipe(
497491
Layer.provide(
498492
Layer.mergeAll(
499-
Layer.effect(
500-
ServerConfig.ServerConfig,
501-
makeReplayServerConfig(`grok-record-${fixtureName}`),
502-
).pipe(Layer.provide(NodeServices.layer)),
493+
layerTestProviderHost().pipe(Layer.provide(NodeServices.layer)),
503494
NodeServices.layer,
504495
IdAllocator.layer,
505496
),

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { AuthStandardClientScopes, EnvironmentId } from "@t3tools/contracts";
33
import { expect, it } from "@effect/vitest";
44
import * as Duration from "effect/Duration";
55
import * as Effect from "effect/Effect";
6+
import * as Fiber from "effect/Fiber";
7+
import * as Deferred from "effect/Deferred";
68
import * as FileSystem from "effect/FileSystem";
79
import * as Layer from "effect/Layer";
810
import * as Option from "effect/Option";
@@ -113,6 +115,57 @@ const layerFailingSessionLookupCredential = Layer.effect(
113115
);
114116

115117
it.layer(NodeServices.layer)("SessionStore.layer", (it) => {
118+
it.effect.each(["revoke", "revokeAllExcept", "replace"] as const)(
119+
"invalidates every connection for a session on %s and leaves other sessions active",
120+
(operation) =>
121+
Effect.gen(function* () {
122+
const sessions = yield* SessionStore.SessionStore;
123+
const owner = yield* sessions.issue({ subject: "owner" });
124+
const client = yield* sessions.issue(relaySessionInput);
125+
const ownerInvalidated = yield* Deferred.make<void>();
126+
yield* sessions
127+
.awaitInvalidation(owner.sessionId)
128+
.pipe(
129+
Effect.andThen(Deferred.succeed(ownerInvalidated, undefined)),
130+
Effect.forkScoped({ startImmediately: true }),
131+
);
132+
const first = yield* sessions
133+
.awaitInvalidation(client.sessionId)
134+
.pipe(Effect.forkScoped({ startImmediately: true }));
135+
const second = yield* sessions
136+
.awaitInvalidation(client.sessionId)
137+
.pipe(Effect.forkScoped({ startImmediately: true }));
138+
if (operation === "revoke") yield* sessions.revoke(client.sessionId);
139+
else if (operation === "revokeAllExcept") yield* sessions.revokeAllExcept(owner.sessionId);
140+
else yield* sessions.issue({ ...relaySessionInput, replaceSessionId: client.sessionId });
141+
yield* Fiber.join(first);
142+
yield* Fiber.join(second);
143+
expect(yield* Deferred.isDone(ownerInvalidated)).toBe(false);
144+
// A connection whose upgrade authenticated just before revocation must also stop.
145+
yield* sessions.awaitInvalidation(client.sessionId);
146+
}).pipe(Effect.scoped, Effect.provide(Layer.merge(layerSessionStore(), TestClock.layer()))),
147+
);
148+
149+
it.effect("expires a connected session at its credential deadline", () =>
150+
Effect.gen(function* () {
151+
const sessions = yield* SessionStore.SessionStore;
152+
const client = yield* sessions.issue(relaySessionInput);
153+
yield* sessions.markConnected(client.sessionId);
154+
const invalidated = yield* Deferred.make<void>();
155+
const watcher = yield* sessions
156+
.awaitInvalidation(client.sessionId)
157+
.pipe(
158+
Effect.andThen(Deferred.succeed(invalidated, undefined)),
159+
Effect.forkScoped({ startImmediately: true }),
160+
);
161+
yield* TestClock.adjust(Duration.minutes(59));
162+
expect(yield* Deferred.isDone(invalidated)).toBe(false);
163+
yield* TestClock.adjust(Duration.minutes(1));
164+
yield* Fiber.join(watcher);
165+
yield* sessions.awaitInvalidation(client.sessionId);
166+
}).pipe(Effect.scoped, Effect.provide(Layer.merge(layerSessionStore(), TestClock.layer()))),
167+
);
168+
116169
it.effect("keys remote cookies by environment identity instead of state directory", () =>
117170
Effect.gen(function* () {
118171
const cookieName = (stateDir: string, environmentId: EnvironmentId) =>

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,9 @@ export class SessionStore extends Context.Service<
407407
SessionCredentialInternalError
408408
>;
409409
readonly streamChanges: Stream.Stream<SessionCredentialChange>;
410+
readonly awaitInvalidation: (
411+
sessionId: AuthSessionId,
412+
) => Effect.Effect<void, SessionCredentialVerificationError>;
410413
readonly revoke: (
411414
sessionId: AuthSessionId,
412415
) => Effect.Effect<boolean, SessionCredentialInternalError>;
@@ -1047,6 +1050,35 @@ export const make = Effect.gen(function* () {
10471050
return revokedSessionIds.length;
10481051
});
10491052

1053+
const awaitInvalidation = Effect.fn(function* (sessionId: AuthSessionId) {
1054+
return yield* Effect.scoped(
1055+
Effect.gen(function* () {
1056+
// Subscribe before reading: revocation can race with the WebSocket upgrade.
1057+
const subscription = yield* PubSub.subscribe(changesPubSub);
1058+
const row = yield* authSessions
1059+
.getById({ sessionId })
1060+
.pipe(
1061+
Effect.mapError(
1062+
(cause) => new SessionCredentialVerificationError({ sessionId, cause }),
1063+
),
1064+
);
1065+
if (Option.isNone(row) || row.value.revokedAt !== null) return;
1066+
const now = yield* DateTime.now;
1067+
const remaining = row.value.expiresAt.epochMilliseconds - now.epochMilliseconds;
1068+
if (remaining <= 0) return;
1069+
yield* Effect.raceFirst(
1070+
Stream.fromSubscription(subscription).pipe(
1071+
Stream.filter(
1072+
(change) => change.type === "clientRemoved" && change.sessionId === sessionId,
1073+
),
1074+
Stream.runHead,
1075+
),
1076+
Effect.sleep(Duration.millis(remaining)),
1077+
);
1078+
}),
1079+
);
1080+
});
1081+
10501082
return SessionStore.of({
10511083
cookieName,
10521084
legacyCookieName,
@@ -1055,6 +1087,7 @@ export const make = Effect.gen(function* () {
10551087
issueWebSocketToken,
10561088
verifyWebSocketToken,
10571089
listActive,
1090+
awaitInvalidation,
10581091
get streamChanges() {
10591092
return Stream.fromPubSub(changesPubSub);
10601093
},

‎apps/server/src/cli/theme.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import * as Path from "effect/Path";
3535
import * as Schema from "effect/Schema";
3636
import { Argument, Command, Flag } from "effect/cli";
3737

38-
import { writeFileStringAtomically } from "../atomicWrite.ts";
38+
import { writeFileStringAtomically } from "@t3tools/shared/atomicWrite";
3939
import * as ServerConfig from "../config.ts";
4040
import {
4141
MAX_THEME_FILE_BYTES,

0 commit comments

Comments
 (0)