Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion apps/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"smoke-test": "node scripts/smoke-test.mjs"
},
"dependencies": {
"@clerk/electron": "catalog:",
"@clerk/electron-passkeys": "catalog:",
"@effect/platform-node": "catalog:",
"@t3tools/client-runtime": "workspace:*",
"@t3tools/contracts": "workspace:*",
Expand All @@ -20,13 +22,17 @@
"@t3tools/tailscale": "workspace:*",
"effect": "catalog:",
"electron": "41.5.0",
"electron-updater": "^6.6.2"
"electron-store": "^8.2.0",
"electron-updater": "^6.6.2",
"playwright-core": "1.60.0",
"react-grab": "^0.1.32"
},
"devDependencies": {
"@effect/vitest": "catalog:",
"@types/node": "catalog:",
"cross-env": "^10.1.0",
"electron-builder": "26.8.1",
"tailwindcss": "^4.0.0",
"vite-plus": "catalog:"
},
"productName": "T3 Code (Alpha)"
Expand Down
18 changes: 11 additions & 7 deletions apps/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"dependencies": {
"@callstack/liquid-glass": "^0.7.1",
"@clerk/expo": "^3.3.0",
"@clerk/expo": "catalog:",
"@effect/atom-react": "catalog:",
"@expo-google-fonts/dm-sans": "^0.4.2",
"@expo/ui": "~56.0.8",
Expand All @@ -48,10 +48,10 @@
"@noble/hashes": "catalog:",
"@pierre/diffs": "catalog:",
"@react-native-menu/menu": "^2.0.0",
"@shikijs/core": "3.23.0",
"@shikijs/engine-javascript": "3.23.0",
"@shikijs/langs": "3.23.0",
"@shikijs/themes": "3.23.0",
"@shikijs/core": "4.2.0",
"@shikijs/engine-javascript": "4.2.0",
"@shikijs/langs": "4.2.0",
"@shikijs/themes": "4.2.0",
"@t3tools/client-runtime": "workspace:*",
"@t3tools/contracts": "workspace:*",
"@t3tools/mobile-review-diff-native": "file:./modules/t3-review-diff",
Expand All @@ -61,6 +61,7 @@
"diff": "8.0.3",
"effect": "catalog:",
"expo": "^56.0.0",
"expo-asset": "~56.0.15",
"expo-auth-session": "~56.0.12",
"expo-build-properties": "~56.0.15",
"expo-camera": "~56.0.7",
Expand All @@ -74,6 +75,7 @@
"expo-haptics": "~56.0.3",
"expo-image-picker": "~56.0.14",
"expo-linking": "~56.0.12",
"expo-network": "~56.0.5",
"expo-notifications": "~56.0.14",
"expo-paste-input": "^0.1.15",
"expo-router": "~56.2.7",
Expand All @@ -95,15 +97,17 @@
"react-native-reanimated": "4.3.1",
"react-native-safe-area-context": "~5.7.0",
"react-native-screens": "4.25.2",
"react-native-shiki-engine": "^0.3.9",
"react-native-shiki-engine": "^0.3.12",
"react-native-svg": "15.15.4",
"react-native-webview": "^13.16.1",
"react-native-worklets": "0.8.3",
"shiki": "3.23.0",
"shiki": "4.2.0",
"tailwind-merge": "^3.5.0",
"uniwind": "^1.6.2"
},
"devDependencies": {
"@effect/vitest": "catalog:",
"@pierre/trees": "1.0.0-beta.4",
"@types/react": "~19.2.0",
"babel-preset-expo": "~56.0.0",
"tailwindcss": "^4.0.0",
Expand Down
1 change: 1 addition & 0 deletions apps/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"@effect/platform-node-shared": "catalog:",
"@effect/sql-sqlite-bun": "catalog:",
"@factory/droid-sdk": "^0.2.0",
"@ff-labs/fff-node": "0.9.4",
"@github/copilot": "1.0.2",
"@github/copilot-sdk": "^0.1.32",
"@opencode-ai/sdk": "^1.3.15",
Expand Down
6 changes: 4 additions & 2 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
},
"dependencies": {
"@base-ui/react": "^1.4.1",
"@clerk/clerk-js": "^6.13.0",
"@clerk/react": "^6.7.2",
"@clerk/clerk-js": "catalog:",
"@clerk/electron": "catalog:",
"@clerk/react": "catalog:",
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/modifiers": "^9.0.0",
"@dnd-kit/sortable": "^10.0.0",
Expand All @@ -27,6 +28,7 @@
"@legendapp/list": "3.0.0-beta.44",
"@lexical/react": "^0.41.0",
"@pierre/diffs": "catalog:",
"@pierre/trees": "1.0.0-beta.4",
"@t3tools/client-runtime": "workspace:*",
"@t3tools/contracts": "workspace:*",
"@t3tools/shared": "workspace:*",
Expand Down
92 changes: 92 additions & 0 deletions packages/client-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,98 @@
"import": "./src/index.ts",
"require": "./src/index.ts",
"default": "./src/index.ts"
},
"./connection": {
"types": "./src/connection/index.ts",
"default": "./src/connection/index.ts"
},
"./authorization": {
"types": "./src/authorization/index.ts",
"default": "./src/authorization/index.ts"
},
"./environment": {
"types": "./src/environment/index.ts",
"default": "./src/environment/index.ts"
},
"./errors": {
"types": "./src/errors/index.ts",
"default": "./src/errors/index.ts"
},
"./rpc": {
"types": "./src/rpc/index.ts",
"default": "./src/rpc/index.ts"
},
"./operations": {
"types": "./src/operations/index.ts",
"default": "./src/operations/index.ts"
},
"./operations/projects": {
"types": "./src/operations/projects.ts",
"default": "./src/operations/projects.ts"
},
"./platform": {
"types": "./src/platform/index.ts",
"default": "./src/platform/index.ts"
},
"./relay": {
"types": "./src/relay/index.ts",
"default": "./src/relay/index.ts"
},
"./state/archived-threads": {
"types": "./src/state/archivedThreads.ts",
"default": "./src/state/archivedThreads.ts"
},
"./state/checkpoint-diff": {
"types": "./src/state/checkpointDiff.ts",
"default": "./src/state/checkpointDiff.ts"
},
"./state/composer-path-search": {
"types": "./src/state/composerPathSearch.ts",
"default": "./src/state/composerPathSearch.ts"
},
"./state/filesystem": {
"types": "./src/state/filesystem.ts",
"default": "./src/state/filesystem.ts"
},
"./state/git": {
"types": "./src/state/git.ts",
"default": "./src/state/git.ts"
},
"./state/models": {
"types": "./src/state/models.ts",
"default": "./src/state/models.ts"
},
"./state/projects": {
"types": "./src/state/projects.ts",
"default": "./src/state/projects.ts"
},
"./state/relay": {
"types": "./src/state/relayDiscovery.ts",
"default": "./src/state/relayDiscovery.ts"
},
"./state/runtime": {
"types": "./src/state/runtime.ts",
"default": "./src/state/runtime.ts"
},
"./state/shell": {
"types": "./src/state/shell.ts",
"default": "./src/state/shell.ts"
},
"./state/source-control": {
"types": "./src/state/sourceControl.ts",
"default": "./src/state/sourceControl.ts"
},
"./state/terminal": {
"types": "./src/state/terminal.ts",
"default": "./src/state/terminal.ts"
},
"./state/threads": {
"types": "./src/state/threads.ts",
"default": "./src/state/threads.ts"
},
"./state/vcs": {
"types": "./src/state/vcs.ts",
"default": "./src/state/vcs.ts"
}
},
"scripts": {
Expand Down
2 changes: 2 additions & 0 deletions packages/client-runtime/src/authorization/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "../remote.ts";
export * from "../managedRelay.ts";
2 changes: 2 additions & 0 deletions packages/client-runtime/src/connection/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "../environmentConnection.ts";
export * from "../knownEnvironment.ts";
3 changes: 3 additions & 0 deletions packages/client-runtime/src/environment/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export * from "../advertisedEndpoint.ts";
export * from "../knownEnvironment.ts";
export * from "../scoped.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/errors/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../transportError.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/operations/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "./projects.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/operations/projects.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../addProject.ts";
2 changes: 2 additions & 0 deletions packages/client-runtime/src/platform/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "../projectPaths.ts";
export * from "../scoped.ts";
2 changes: 2 additions & 0 deletions packages/client-runtime/src/relay/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "../managedRelay.ts";
export * from "../managedRelayState.ts";
3 changes: 3 additions & 0 deletions packages/client-runtime/src/rpc/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export * from "../wsRpcClient.ts";
export * from "../wsRpcProtocol.ts";
export * from "../wsTransport.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/state/archivedThreads.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../archivedThreadsState.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/state/checkpointDiff.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../checkpointDiffState.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/state/composerPathSearch.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../composerPathSearchState.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/state/filesystem.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../filesystemBrowseState.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/state/git.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../gitActions.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/state/models.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../shellTypes.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/state/projects.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../projectPaths.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/state/relayDiscovery.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../managedRelayState.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/state/runtime.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../environmentRuntimeState.ts";
3 changes: 3 additions & 0 deletions packages/client-runtime/src/state/shell.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export * from "../shellSnapshotReducer.ts";
export * from "../shellSnapshotState.ts";
export * from "../shellTypes.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/state/sourceControl.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../sourceControlDiscoveryState.ts";
1 change: 1 addition & 0 deletions packages/client-runtime/src/state/terminal.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../terminalSessionState.ts";
2 changes: 2 additions & 0 deletions packages/client-runtime/src/state/threads.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "../threadDetailReducer.ts";
export * from "../threadDetailState.ts";
3 changes: 3 additions & 0 deletions packages/client-runtime/src/state/vcs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export * from "../vcsActionState.ts";
export * from "../vcsRefState.ts";
export * from "../vcsStatusState.ts";
16 changes: 16 additions & 0 deletions packages/contracts/src/provider.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import * as Schema from "effect/Schema";

import {
ProviderEvent,
ProviderGetUsageInput,
ProviderListModelsInput,
ProviderSendTurnInput,
ProviderSession,
ProviderSessionStartInput,
Expand All @@ -12,6 +14,8 @@ const decodeProviderSessionStartInput = Schema.decodeUnknownSync(ProviderSession
const decodeProviderSendTurnInput = Schema.decodeUnknownSync(ProviderSendTurnInput);
const decodeProviderSession = Schema.decodeUnknownSync(ProviderSession);
const decodeProviderEvent = Schema.decodeUnknownSync(ProviderEvent);
const decodeProviderListModelsInput = Schema.decodeUnknownSync(ProviderListModelsInput);
const decodeProviderGetUsageInput = Schema.decodeUnknownSync(ProviderGetUsageInput);

function getOptionValue(
options: ReadonlyArray<{ id: string; value: unknown }> | undefined,
Expand Down Expand Up @@ -153,6 +157,18 @@ describe("ProviderSendTurnInput", () => {
});
});

describe("provider model and usage contracts", () => {
it("keeps model discovery keyed by open provider driver slugs", () => {
const parsed = decodeProviderListModelsInput({ provider: "cursor" });
expect(parsed.provider).toBe("cursor");
});

it("keeps usage lookup keyed by open provider driver slugs", () => {
const parsed = decodeProviderGetUsageInput({ provider: "codex" });
expect(parsed.provider).toBe("codex");
});
});

describe("providerInstanceId routing key (slice-2 invariant)", () => {
it("decodes a ProviderSessionStartInput without providerInstanceId (legacy producer)", () => {
const parsed = decodeProviderSessionStartInput({
Expand Down
21 changes: 20 additions & 1 deletion packages/contracts/src/providerRuntime.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,30 @@
import { describe, expect, it } from "vite-plus/test";
import * as Schema from "effect/Schema";

import { ProviderRuntimeEvent } from "./providerRuntime.ts";
import { ProviderRuntimeEvent, RuntimeEventRaw } from "./providerRuntime.ts";

const decodeRuntimeEvent = Schema.decodeUnknownSync(ProviderRuntimeEvent);
const decodeRuntimeEventRaw = Schema.decodeUnknownSync(RuntimeEventRaw);

describe("ProviderRuntimeEvent", () => {
it("keeps fork provider raw runtime sources decodable", () => {
for (const source of [
"copilot.sdk.session-event",
"copilot.sdk.synthetic",
"droid.sdk.message",
"droid.sdk.permission",
"cursor.sdk.message",
"cursor.acp.notification",
"opencode.server.event",
"kilo.server.event",
"amp.cli.result",
"gemini.cli.event",
]) {
const parsed = decodeRuntimeEventRaw({ source, payload: {} });
expect(parsed.source).toBe(source);
}
});

it("accepts fork-provided driver kinds as branded slugs", () => {
const parsed = decodeRuntimeEvent({
type: "session.started",
Expand Down
37 changes: 37 additions & 0 deletions patches/@ff-labs__fff-node@0.9.4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
diff --git a/dist/src/binary.js b/dist/src/binary.js
index ee181aef5007e4bf34a49479c089ca30f73a320b..327e2c55c83cc4c50d396a3109190ef10af75ca7 100644
--- a/dist/src/binary.js
+++ b/dist/src/binary.js
@@ -7,7 +7,7 @@
*/
import { existsSync, readFileSync } from "node:fs";
import { createRequire } from "node:module";
-import { dirname, join } from "node:path";
+import { dirname, join, sep } from "node:path";
import { fileURLToPath } from "node:url";
import { getLibFilename, getNpmPackageName } from "./platform.js";
/**
@@ -46,6 +46,14 @@ function getPackageDir() {
// Fallback: assume we're one level deep in src/
return dirname(currentDir);
}
+function resolveUnpackedAsarPath(binaryPath) {
+ const asarSegment = `${sep}app.asar${sep}`;
+ if (!binaryPath.includes(asarSegment)) {
+ return binaryPath;
+ }
+ const unpackedPath = binaryPath.replace(asarSegment, `${sep}app.asar.unpacked${sep}`);
+ return existsSync(unpackedPath) ? unpackedPath : binaryPath;
+}
/**
* Check if the binary exists in any known location
*/
@@ -69,7 +77,7 @@ function resolveFromNpmPackage() {
const packageDir = dirname(packageJsonPath);
const binaryPath = join(packageDir, getLibFilename());
if (existsSync(binaryPath)) {
- return binaryPath;
+ return resolveUnpackedAsarPath(binaryPath);
}
}
catch {
Loading
Loading