Skip to content

Commit dfee4d6

Browse files
authored
Merge branch 'main' into fix/usage-skip-disabled-environments
2 parents 8c4c1d1 + 680152e commit dfee4d6

46 files changed

Lines changed: 1429 additions & 106 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
import { assert, describe, it } from "@effect/vitest";
2+
3+
import { createClerkOAuthCancel } from "./clerkOAuthCancel.ts";
4+
5+
const deferredOpen = () => {
6+
const resolvers: Array<(value: { callbackUrl: string }) => void> = [];
7+
const opened: Array<Promise<{ callbackUrl: string }>> = [];
8+
const open = (_url: string) => {
9+
const promise = new Promise<{ callbackUrl: string }>((resolve) => {
10+
resolvers.push(resolve);
11+
});
12+
opened.push(promise);
13+
return promise;
14+
};
15+
return { open, resolvers, opened };
16+
};
17+
18+
const outcome = (promise: Promise<{ callbackUrl: string }>) =>
19+
promise.then(
20+
({ callbackUrl }) => `resolved ${callbackUrl}`,
21+
(error: Error) => `rejected ${error.message}`,
22+
);
23+
24+
describe("createClerkOAuthCancel", () => {
25+
it("cancel rejects the pending flow and reports it is no longer pending", async () => {
26+
const oauth = createClerkOAuthCancel();
27+
const changes: boolean[] = [];
28+
oauth.onPendingChange((pending) => changes.push(pending));
29+
const { open } = deferredOpen();
30+
31+
const flow = outcome(oauth.wrapOpen(open)("https://accounts.example/a"));
32+
assert.isTrue(oauth.isPending());
33+
oauth.cancel();
34+
35+
assert.strictEqual(await flow, "rejected Clerk: OAuth flow was cancelled.");
36+
assert.isFalse(oauth.isPending());
37+
assert.deepStrictEqual(changes, [true, false]);
38+
});
39+
40+
it("a new attempt replaces the pending one, and the old result cannot clear it", async () => {
41+
const oauth = createClerkOAuthCancel();
42+
const { open, resolvers, opened } = deferredOpen();
43+
const wrapped = oauth.wrapOpen(open);
44+
45+
const first = outcome(wrapped("https://accounts.example/a"));
46+
const second = outcome(wrapped("https://accounts.example/b"));
47+
assert.strictEqual(await first, "rejected Clerk: OAuth flow was cancelled.");
48+
49+
resolvers[0]?.({ callbackUrl: "t3code://app/?a" });
50+
// Two hops, so the wrapper's own `.then().finally()` on this result has run.
51+
await opened[0]?.then(() => undefined).then(() => undefined);
52+
assert.isTrue(oauth.isPending());
53+
54+
resolvers[1]?.({ callbackUrl: "t3code://app/?b" });
55+
assert.strictEqual(await second, "resolved t3code://app/?b");
56+
assert.isFalse(oauth.isPending());
57+
});
58+
});
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
type OAuthOpen = (url: string) => Promise<{ callbackUrl: string }>;
2+
3+
/**
4+
* Lets the app cancel the Clerk OAuth flow the renderer is waiting on. The
5+
* system browser never reports a closed tab, so an abandoned sign-in would
6+
* otherwise keep Clerk's sheet spinning until Clerk's 180s timeout.
7+
*
8+
* Pass `wrapOpen` to `exposeClerkBridge` as `wrapOAuthOpen`. Cancelling only
9+
* rejects the renderer's promise; the patched main process replaces the stale
10+
* flow when the next attempt starts.
11+
*/
12+
export function createClerkOAuthCancel() {
13+
let cancelPending: (() => void) | null = null;
14+
const listeners = new Set<(pending: boolean) => void>();
15+
const setCancelPending = (cancel: (() => void) | null) => {
16+
cancelPending = cancel;
17+
for (const listener of listeners) listener(cancel !== null);
18+
};
19+
20+
return {
21+
wrapOpen:
22+
(open: OAuthOpen): OAuthOpen =>
23+
(url) => {
24+
cancelPending?.();
25+
return new Promise((resolve, reject) => {
26+
const settle = () => {
27+
if (cancelPending === cancel) setCancelPending(null);
28+
};
29+
const cancel = () => {
30+
settle();
31+
reject(new Error("Clerk: OAuth flow was cancelled."));
32+
};
33+
setCancelPending(cancel);
34+
open(url).then(resolve, reject).finally(settle);
35+
});
36+
},
37+
isPending: () => cancelPending !== null,
38+
onPendingChange: (listener: (pending: boolean) => void) => {
39+
listeners.add(listener);
40+
return () => {
41+
listeners.delete(listener);
42+
};
43+
},
44+
cancel: () => cancelPending?.(),
45+
};
46+
}

‎apps/desktop/src/preload.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import type {
1010
import { exposeClerkBridge } from "@clerk/electron/preload";
1111
import { contextBridge, ipcRenderer, webFrame, webUtils } from "electron";
1212

13+
import { createClerkOAuthCancel } from "./clerkOAuthCancel.ts";
1314
import * as IpcChannels from "./ipc/channels.ts";
1415
import { mergeLegacyLocalStorage } from "./legacyLocalStorageMerge.ts";
1516

@@ -30,7 +31,8 @@ function isSnapShotEvent(value: unknown): value is DesktopSnapShotEvent {
3031
);
3132
}
3233

33-
exposeClerkBridge({ passkeys: true });
34+
const clerkOAuthCancel = createClerkOAuthCancel();
35+
exposeClerkBridge({ passkeys: true, wrapOAuthOpen: clerkOAuthCancel.wrapOpen });
3436

3537
// Runs before any app script reads localStorage. See DesktopLegacyLocalStorage.
3638
try {
@@ -251,6 +253,9 @@ contextBridge.exposeInMainWorld("desktopBridge", {
251253
ipcRenderer.removeListener(IpcChannels.QUIT_SHORTCUT_CHANNEL, wrappedListener);
252254
};
253255
},
256+
isClerkOAuthPending: clerkOAuthCancel.isPending,
257+
onClerkOAuthPendingChange: clerkOAuthCancel.onPendingChange,
258+
cancelClerkOAuth: clerkOAuthCancel.cancel,
254259
getWindowFullscreenState: () =>
255260
ipcRenderer.sendSync(IpcChannels.GET_WINDOW_FULLSCREEN_STATE_CHANNEL) === true,
256261
getWindowZoomFactor: () => webFrame.getZoomFactor(),

‎apps/server/src/cli/pair.test.ts‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { AuthStandardClientScopes } from "@t3tools/contracts";
99
import * as NetService from "@t3tools/shared/Net";
1010
import * as HostProcess from "@t3tools/shared/HostProcess";
1111
import { assert, describe, expect, it } from "@effect/vitest";
12+
import * as ConfigProvider from "effect/ConfigProvider";
1213
import * as Effect from "effect/Effect";
1314
import * as Layer from "effect/Layer";
1415
import * as Sink from "effect/Sink";
@@ -287,6 +288,46 @@ describe("t3 pair", () => {
287288
).pipe(Effect.provide(NodeServices.layer)),
288289
);
289290

291+
// regression: #10516 minting opens the target database with this checkout's
292+
// migrations, so a worktree must never fall back to the live install.
293+
it.effect("does not fall back to the shared home from a linked worktree", () =>
294+
withDescriptorServer((origin) =>
295+
Effect.gen(function* () {
296+
const root = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-pair-worktree-test-"));
297+
const worktree = NodePath.join(root, "worktree");
298+
NodeFS.mkdirSync(worktree);
299+
NodeFS.writeFileSync(
300+
NodePath.join(worktree, ".git"),
301+
`gitdir: ${NodePath.join(root, "repo", ".git", "worktrees", "worktree")}\n`,
302+
);
303+
const sharedHome = NodePath.join(root, "shared");
304+
yield* persistServerRuntimeState({
305+
path: NodePath.join(sharedHome, "userdata", "server-runtime.json"),
306+
state: yield* makePersistedServerRuntimeState({
307+
config: { host: "127.0.0.1", devUrl: undefined },
308+
port: Number(new URL(origin).port),
309+
}),
310+
});
311+
312+
const error = yield* provideCliTestLayers(
313+
runCli(["pair"]).pipe(
314+
Effect.provideService(HostProcess.WorkingDirectory, worktree),
315+
Effect.provide(
316+
ConfigProvider.layer(ConfigProvider.fromEnv({ env: { T3CODE_HOME: sharedHome } })),
317+
),
318+
Effect.flip,
319+
),
320+
);
321+
322+
assert.include(String(error), "No running T3 Code server found.");
323+
assert.notInclude(String(error), sharedHome);
324+
assert.deepEqual(NodeFS.readdirSync(NodePath.join(sharedHome, "userdata")), [
325+
"server-runtime.json",
326+
]);
327+
}),
328+
).pipe(Effect.provide(NodeServices.layer)),
329+
);
330+
290331
// Without the capability `tailscale serve` blocks on an enablement URL, so
291332
// pairing must stop at status instead of spawning it.
292333
it.effect("explains a tailnet without HTTPS serve instead of running tailscale serve", () =>

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

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
PortSchema,
66
} from "@t3tools/contracts";
77
import { resolveWorktreeT3Home } from "@t3tools/shared/devHome";
8+
import * as HostProcess from "@t3tools/shared/HostProcess";
89
import { DEFAULT_SIGNAL_EXPORT } from "@t3tools/shared/observability";
910
import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
1011
import {
@@ -61,12 +62,16 @@ export class NoRunningServerError extends Schema.TaggedError<NoRunningServerErro
6162
"NoRunningServerError",
6263
{
6364
checkedStatePaths: Schema.Array(Schema.String),
65+
inLinkedWorktree: Schema.Boolean,
6466
},
6567
) {
6668
override get message(): string {
6769
return [
6870
"No running T3 Code server found.",
6971
...this.checkedStatePaths.map((statePath) => ` checked ${statePath}`),
72+
...(this.inLinkedWorktree
73+
? ["In a linked worktree, pass --base-dir to pair with a server outside it."]
74+
: []),
7075
"Start one with `npx t3 serve`, or connect this machine with T3 Connect: `npx t3 connect`.",
7176
].join("\n");
7277
}
@@ -228,18 +233,22 @@ const discoverPairTarget = Effect.fn("pair.discoverPairTarget")(function* (
228233
explicitBaseDir: string | undefined,
229234
) {
230235
const bases: Array<string> = [];
236+
let inLinkedWorktree = false;
231237
if (explicitBaseDir !== undefined && explicitBaseDir.trim().length > 0) {
232238
bases.push(yield* resolveBaseDir(explicitBaseDir));
233239
} else {
234-
// Same precedence as dev-runner: inside a linked worktree its own `.t3`
235-
// outranks the shared home, so `t3 pair` in a worktree pairs with the dev
236-
// server under test rather than the daily-driver install.
237-
const worktreeHome = yield* resolveWorktreeT3Home(process.cwd());
240+
// Same precedence as dev-runner: inside a linked worktree only its own
241+
// `.t3` counts. Minting opens the target database with this checkout's
242+
// migrations, so falling back to the shared home could migrate the live
243+
// install with unreleased schema.
244+
const worktreeHome = yield* resolveWorktreeT3Home(yield* HostProcess.WorkingDirectory);
238245
if (worktreeHome !== undefined) {
239246
bases.push(worktreeHome);
247+
inLinkedWorktree = true;
248+
} else {
249+
const envHome = yield* Config.String("T3CODE_HOME").pipe(Config.option);
250+
bases.push(yield* resolveBaseDir(Option.getOrUndefined(envHome)));
240251
}
241-
const envHome = yield* Config.String("T3CODE_HOME").pipe(Config.option);
242-
bases.push(yield* resolveBaseDir(Option.getOrUndefined(envHome)));
243252
}
244253

245254
const checkedStatePaths: Array<string> = [];
@@ -274,7 +283,7 @@ const discoverPairTarget = Effect.fn("pair.discoverPairTarget")(function* (
274283
} satisfies DiscoveredPairTarget;
275284
}
276285
}
277-
return yield* new NoRunningServerError({ checkedStatePaths });
286+
return yield* new NoRunningServerError({ checkedStatePaths, inLinkedWorktree });
278287
});
279288

280289
/**

‎apps/server/src/git/GitManager.test.ts‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2557,6 +2557,42 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
25572557
}),
25582558
);
25592559

2560+
it.effect("includes CLAUDE.md for Claude writers only when it differs from AGENTS.md", () =>
2561+
Effect.gen(function* () {
2562+
const repoDir = yield* makeTempDir("t3code-git-manager-");
2563+
yield* initRepo(repoDir);
2564+
NodeFS.writeFileSync(NodePath.join(repoDir, "AGENTS.md"), "Use imperative subjects.\n");
2565+
NodeFS.copyFileSync(NodePath.join(repoDir, "AGENTS.md"), NodePath.join(repoDir, "CLAUDE.md"));
2566+
NodeFS.writeFileSync(NodePath.join(repoDir, "README.md"), "hello\n");
2567+
const commitInstructions: Array<string | undefined> = [];
2568+
2569+
const { manager } = yield* makeManager({
2570+
serverSettings: {
2571+
textGenerationModelSelection: {
2572+
instanceId: ProviderInstanceId.make("claudeAgent"),
2573+
model: "claude-sonnet-4-5",
2574+
},
2575+
},
2576+
textGeneration: {
2577+
generateCommitMessage: (input) => {
2578+
commitInstructions.push(input.policy?.commitInstructions);
2579+
return Effect.succeed({ subject: "Update readme", body: "" });
2580+
},
2581+
},
2582+
});
2583+
2584+
yield* runStackedAction(manager, { cwd: repoDir, action: "commit" });
2585+
2586+
NodeFS.writeFileSync(NodePath.join(repoDir, "CLAUDE.md"), "Mention the Claude provider.\n");
2587+
NodeFS.writeFileSync(NodePath.join(repoDir, "README.md"), "hello again\n");
2588+
yield* runStackedAction(manager, { cwd: repoDir, action: "commit" });
2589+
2590+
expect(commitInstructions[0]).toContain("Local AGENTS.md:\nUse imperative subjects.");
2591+
expect(commitInstructions[0]).not.toContain("Local CLAUDE.md:");
2592+
expect(commitInstructions[1]).toContain("Local CLAUDE.md:\nMention the Claude provider.");
2593+
}),
2594+
);
2595+
25602596
it.effect("falls back when the dedicated source control writer is unavailable", () =>
25612597
Effect.gen(function* () {
25622598
const repoDir = yield* makeTempDir("t3code-git-manager-");

‎apps/server/src/git/GitManager.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,10 @@ export const make = Effect.gen(function* () {
863863
? [["Recent commit subjects from this repository:", ...subjects].join("\n")]
864864
: []),
865865
...(agentInstructions ? [`Local AGENTS.md:\n${agentInstructions}`] : []),
866-
...(claudeInstructions ? [`Local CLAUDE.md:\n${claudeInstructions}`] : []),
866+
// CLAUDE.md is often a symlink or copy of AGENTS.md; skip the duplicate.
867+
...(claudeInstructions && claudeInstructions !== agentInstructions
868+
? [`Local CLAUDE.md:\n${claudeInstructions}`]
869+
: []),
867870
].join("\n\n");
868871
if (!examples) {
869872
return repositoryConventionsTextGenerationPolicy;

0 commit comments

Comments
 (0)