Skip to content

Commit e10cab0

Browse files
Merge branch 'main' into fix/settings-restore-defaults-button
2 parents 301c2c0 + cadd708 commit e10cab0

23 files changed

Lines changed: 626 additions & 39 deletions

‎README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ Observability guide: [docs/observability.md](./docs/observability.md)
4949

5050
## If you REALLY want to contribute still.... read this first
5151

52+
Before local development, prepare the environment and install dependencies:
53+
54+
```bash
55+
# Optional: only needed if you use mise for dev tool management.
56+
mise install
57+
bun install .
58+
```
59+
5260
Read [CONTRIBUTING.md](./CONTRIBUTING.md) before opening an issue or PR.
5361

5462
Need support? Join the [Discord](https://discord.gg/jn4EGJjrvv).

‎apps/server/src/open.test.ts‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ it.layer(NodeServices.layer)("resolveEditorLaunch", (it) => {
4242
args: ["/tmp/workspace"],
4343
});
4444

45+
const kiroLaunch = yield* resolveEditorLaunch(
46+
{ cwd: "/tmp/workspace", editor: "kiro" },
47+
"darwin",
48+
{ PATH: "" },
49+
);
50+
assert.deepEqual(kiroLaunch, {
51+
command: "kiro",
52+
args: ["ide", "/tmp/workspace"],
53+
});
54+
4555
const vscodeLaunch = yield* resolveEditorLaunch(
4656
{ cwd: "/tmp/workspace", editor: "vscode" },
4757
"darwin",
@@ -122,6 +132,16 @@ it.layer(NodeServices.layer)("resolveEditorLaunch", (it) => {
122132
args: ["--goto", "/tmp/workspace/src/open.ts:71:5"],
123133
});
124134

135+
const kiroLineAndColumn = yield* resolveEditorLaunch(
136+
{ cwd: "/tmp/workspace/src/open.ts:71:5", editor: "kiro" },
137+
"darwin",
138+
{ PATH: "" },
139+
);
140+
assert.deepEqual(kiroLineAndColumn, {
141+
command: "kiro",
142+
args: ["ide", "--goto", "/tmp/workspace/src/open.ts:71:5"],
143+
});
144+
125145
const vscodeLineAndColumn = yield* resolveEditorLaunch(
126146
{ cwd: "/tmp/workspace/src/open.ts:71:5", editor: "vscode" },
127147
"darwin",
@@ -354,14 +374,15 @@ it.layer(NodeServices.layer)("resolveAvailableEditors", (it) => {
354374
const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-editors-" });
355375

356376
yield* fs.writeFileString(path.join(dir, "trae.CMD"), "@echo off\r\n");
377+
yield* fs.writeFileString(path.join(dir, "kiro.CMD"), "@echo off\r\n");
357378
yield* fs.writeFileString(path.join(dir, "code-insiders.CMD"), "@echo off\r\n");
358379
yield* fs.writeFileString(path.join(dir, "codium.CMD"), "@echo off\r\n");
359380
yield* fs.writeFileString(path.join(dir, "explorer.CMD"), "MZ");
360381
const editors = resolveAvailableEditors("win32", {
361382
PATH: dir,
362383
PATHEXT: ".COM;.EXE;.BAT;.CMD",
363384
});
364-
assert.deepEqual(editors, ["trae", "vscode-insiders", "vscodium", "file-manager"]);
385+
assert.deepEqual(editors, ["trae", "kiro", "vscode-insiders", "vscodium", "file-manager"]);
365386
}),
366387
);
367388

‎apps/server/src/open.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,14 @@ function resolveCommandEditorArgs(
7575
}
7676
}
7777

78+
function resolveEditorArgs(
79+
editor: (typeof EDITORS)[number],
80+
target: string,
81+
): ReadonlyArray<string> {
82+
const baseArgs = "baseArgs" in editor ? editor.baseArgs : [];
83+
return [...baseArgs, ...resolveCommandEditorArgs(editor, target)];
84+
}
85+
7886
function resolveAvailableCommand(
7987
commands: ReadonlyArray<string>,
8088
options: CommandAvailabilityOptions = {},
@@ -273,7 +281,7 @@ export const resolveEditorLaunch = Effect.fn("resolveEditorLaunch")(function* (
273281
resolveAvailableCommand(editorDef.commands, { platform, env }) ?? editorDef.commands[0];
274282
return {
275283
command,
276-
args: resolveCommandEditorArgs(editorDef, input.cwd),
284+
args: resolveEditorArgs(editorDef, input.cwd),
277285
};
278286
}
279287

‎apps/server/src/orchestration/Layers/ProviderCommandReactor.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
type RuntimeMode,
1212
type TurnId,
1313
} from "@t3tools/contracts";
14+
import { isTemporaryWorktreeBranch, WORKTREE_BRANCH_PREFIX } from "@t3tools/shared/git";
1415
import { Cache, Cause, Duration, Effect, Equal, Layer, Option, Schema, Stream } from "effect";
1516
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
1617

@@ -72,8 +73,6 @@ const serverCommandId = (tag: string): CommandId =>
7273
const HANDLED_TURN_START_KEY_MAX = 10_000;
7374
const HANDLED_TURN_START_KEY_TTL = Duration.minutes(30);
7475
const DEFAULT_RUNTIME_MODE: RuntimeMode = "full-access";
75-
const WORKTREE_BRANCH_PREFIX = "t3code";
76-
const TEMP_WORKTREE_BRANCH_PATTERN = new RegExp(`^${WORKTREE_BRANCH_PREFIX}\\/[0-9a-f]{8}$`);
7776
const DEFAULT_THREAD_TITLE = "New thread";
7877

7978
function canReplaceThreadTitle(currentTitle: string, titleSeed?: string): boolean {
@@ -119,10 +118,6 @@ function stalePendingRequestDetail(
119118
return `Stale pending ${requestKind} request: ${requestId}. Provider callback state does not survive app restarts or recovered sessions. Restart the turn to continue.`;
120119
}
121120

122-
function isTemporaryWorktreeBranch(branch: string): boolean {
123-
return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());
124-
}
125-
126121
function buildGeneratedWorktreeBranchName(raw: string): string {
127122
const normalized = raw
128123
.trim()

‎apps/web/src/components/BranchToolbar.logic.test.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
resolveEffectiveEnvMode,
1111
resolveEnvModeLabel,
1212
resolveBranchToolbarValue,
13+
resolveLockedWorkspaceLabel,
1314
shouldIncludeBranchPickerItem,
1415
} from "./BranchToolbar.logic";
1516

@@ -157,6 +158,16 @@ describe("resolveCurrentWorkspaceLabel", () => {
157158
});
158159
});
159160

161+
describe("resolveLockedWorkspaceLabel", () => {
162+
it("uses a shorter label for the main repo checkout", () => {
163+
expect(resolveLockedWorkspaceLabel(null)).toBe("Local checkout");
164+
});
165+
166+
it("uses a shorter label for an attached worktree", () => {
167+
expect(resolveLockedWorkspaceLabel("/repo/.t3/worktrees/feature-a")).toBe("Worktree");
168+
});
169+
});
170+
160171
describe("deriveLocalBranchNameFromRemoteRef", () => {
161172
it("strips the remote prefix from a remote ref", () => {
162173
expect(deriveLocalBranchNameFromRemoteRef("origin/feature/demo")).toBe("feature/demo");

‎apps/web/src/components/BranchToolbar.logic.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ export function resolveCurrentWorkspaceLabel(activeWorktreePath: string | null):
5050
return activeWorktreePath ? "Current worktree" : resolveEnvModeLabel("local");
5151
}
5252

53+
export function resolveLockedWorkspaceLabel(activeWorktreePath: string | null): string {
54+
return activeWorktreePath ? "Worktree" : "Local checkout";
55+
}
56+
5357
export function resolveEffectiveEnvMode(input: {
5458
activeWorktreePath: string | null;
5559
hasServerThread: boolean;

‎apps/web/src/components/BranchToolbar.tsx‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ interface BranchToolbarProps {
2020
threadId: ThreadId;
2121
draftId?: DraftId;
2222
onEnvModeChange: (mode: EnvMode) => void;
23+
effectiveEnvModeOverride?: EnvMode;
24+
activeThreadBranchOverride?: string | null;
25+
onActiveThreadBranchOverrideChange?: (branch: string | null) => void;
2326
envLocked: boolean;
2427
onCheckoutPullRequestRequest?: (reference: string) => void;
2528
onComposerFocusRequest?: () => void;
@@ -32,6 +35,9 @@ export const BranchToolbar = memo(function BranchToolbar({
3235
threadId,
3336
draftId,
3437
onEnvModeChange,
38+
effectiveEnvModeOverride,
39+
activeThreadBranchOverride,
40+
onActiveThreadBranchOverrideChange,
3541
envLocked,
3642
onCheckoutPullRequestRequest,
3743
onComposerFocusRequest,
@@ -59,11 +65,13 @@ export const BranchToolbar = memo(function BranchToolbar({
5965
const activeProject = useStore(activeProjectSelector);
6066
const hasActiveThread = serverThread !== undefined || draftThread !== null;
6167
const activeWorktreePath = serverThread?.worktreePath ?? draftThread?.worktreePath ?? null;
62-
const effectiveEnvMode = resolveEffectiveEnvMode({
63-
activeWorktreePath,
64-
hasServerThread: serverThread !== undefined,
65-
draftThreadEnvMode: draftThread?.envMode,
66-
});
68+
const effectiveEnvMode =
69+
effectiveEnvModeOverride ??
70+
resolveEffectiveEnvMode({
71+
activeWorktreePath,
72+
hasServerThread: serverThread !== undefined,
73+
draftThreadEnvMode: draftThread?.envMode,
74+
});
6775
const envModeLocked = envLocked || (serverThread !== undefined && activeWorktreePath !== null);
6876

6977
const showEnvironmentPicker =
@@ -98,6 +106,9 @@ export const BranchToolbar = memo(function BranchToolbar({
98106
threadId={threadId}
99107
{...(draftId ? { draftId } : {})}
100108
envLocked={envLocked}
109+
{...(effectiveEnvModeOverride ? { effectiveEnvModeOverride } : {})}
110+
{...(activeThreadBranchOverride !== undefined ? { activeThreadBranchOverride } : {})}
111+
{...(onActiveThreadBranchOverrideChange ? { onActiveThreadBranchOverrideChange } : {})}
101112
{...(onCheckoutPullRequestRequest ? { onCheckoutPullRequestRequest } : {})}
102113
{...(onComposerFocusRequest ? { onComposerFocusRequest } : {})}
103114
/>

‎apps/web/src/components/BranchToolbarBranchSelector.tsx‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ interface BranchToolbarBranchSelectorProps {
4949
threadId: ThreadId;
5050
draftId?: DraftId;
5151
envLocked: boolean;
52+
effectiveEnvModeOverride?: "local" | "worktree";
53+
activeThreadBranchOverride?: string | null;
54+
onActiveThreadBranchOverrideChange?: (branch: string | null) => void;
5255
onCheckoutPullRequestRequest?: (reference: string) => void;
5356
onComposerFocusRequest?: () => void;
5457
}
@@ -77,6 +80,9 @@ export function BranchToolbarBranchSelector({
7780
threadId,
7881
draftId,
7982
envLocked,
83+
effectiveEnvModeOverride,
84+
activeThreadBranchOverride,
85+
onActiveThreadBranchOverrideChange,
8086
onCheckoutPullRequestRequest,
8187
onComposerFocusRequest,
8288
}: BranchToolbarBranchSelectorProps) {
@@ -108,16 +114,21 @@ export function BranchToolbarBranchSelector({
108114
const activeProject = useStore(activeProjectSelector);
109115

110116
const activeThreadId = serverThread?.id ?? (draftThread ? threadId : undefined);
111-
const activeThreadBranch = serverThread?.branch ?? draftThread?.branch ?? null;
117+
const activeThreadBranch =
118+
activeThreadBranchOverride !== undefined
119+
? activeThreadBranchOverride
120+
: (serverThread?.branch ?? draftThread?.branch ?? null);
112121
const activeWorktreePath = serverThread?.worktreePath ?? draftThread?.worktreePath ?? null;
113122
const activeProjectCwd = activeProject?.cwd ?? null;
114123
const branchCwd = activeWorktreePath ?? activeProjectCwd;
115124
const hasServerThread = serverThread !== undefined;
116-
const effectiveEnvMode = resolveEffectiveEnvMode({
117-
activeWorktreePath,
118-
hasServerThread,
119-
draftThreadEnvMode: draftThread?.envMode,
120-
});
125+
const effectiveEnvMode =
126+
effectiveEnvModeOverride ??
127+
resolveEffectiveEnvMode({
128+
activeWorktreePath,
129+
hasServerThread,
130+
draftThreadEnvMode: draftThread?.envMode,
131+
});
121132

122133
// ---------------------------------------------------------------------------
123134
// Thread branch mutation (colocated — only this component calls it)
@@ -146,6 +157,7 @@ export function BranchToolbarBranchSelector({
146157
});
147158
}
148159
if (hasServerThread) {
160+
onActiveThreadBranchOverrideChange?.(branch);
149161
setThreadBranchAction(threadRef, branch, worktreePath);
150162
return;
151163
}
@@ -167,6 +179,7 @@ export function BranchToolbarBranchSelector({
167179
serverSession,
168180
activeWorktreePath,
169181
hasServerThread,
182+
onActiveThreadBranchOverrideChange,
170183
setThreadBranchAction,
171184
setDraftThreadContext,
172185
draftId,

‎apps/web/src/components/BranchToolbarEnvModeSelector.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { memo, useMemo } from "react";
44
import {
55
resolveCurrentWorkspaceLabel,
66
resolveEnvModeLabel,
7+
resolveLockedWorkspaceLabel,
78
type EnvMode,
89
} from "./BranchToolbar.logic";
910
import {
@@ -43,12 +44,12 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
4344
{activeWorktreePath ? (
4445
<>
4546
<FolderGitIcon className="size-3" />
46-
{resolveCurrentWorkspaceLabel(activeWorktreePath)}
47+
{resolveLockedWorkspaceLabel(activeWorktreePath)}
4748
</>
4849
) : (
4950
<>
5051
<FolderIcon className="size-3" />
51-
{resolveCurrentWorkspaceLabel(activeWorktreePath)}
52+
{resolveLockedWorkspaceLabel(activeWorktreePath)}
5253
</>
5354
)}
5455
</span>

0 commit comments

Comments
 (0)