Add default new-thread worktree mode with draft defaults#1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
notkainoa wants to merge 2 commits into from
Closed

Add default new-thread worktree mode with draft defaults #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c55c17b
Add default new-thread worktree mode with draft defaults
notkainoa Mar 13, 2026
b145a27
Preserve existing draft thread state when reopening new thread
notkainoa Mar 13, 2026
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
68 changes: 67 additions & 1 deletion apps/web/src/appSettings.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,78 @@
import { describe, expect, it } from "vitest";
import { beforeEach, describe, expect, it, vi } from "vitest";

import {
APP_SETTINGS_STORAGE_KEY,
getAppSettingsSnapshot,
getAppModelOptions,
getSlashModelOptions,
normalizeCustomModelSlugs,
resolveAppModelSelection,
} from "./appSettings";

function getWindowForTest(): Window & typeof globalThis {
const testGlobal = globalThis as typeof globalThis & {
window?: Window & typeof globalThis;
};
if (!testGlobal.window) {
testGlobal.window = {} as Window & typeof globalThis;
}
return testGlobal.window;
}

function createStorage(): Storage {
const values = new Map<string, string>();
return {
get length() {
return values.size;
},
clear() {
values.clear();
},
getItem(key) {
return values.get(key) ?? null;
},
key(index) {
return [...values.keys()][index] ?? null;
},
removeItem(key) {
values.delete(key);
},
setItem(key, value) {
values.set(key, value);
},
};
}

beforeEach(() => {
const testWindow = getWindowForTest();
Object.defineProperty(testWindow, "localStorage", {
configurable: true,
value: createStorage(),
});
testWindow.addEventListener = vi.fn();
testWindow.removeEventListener = vi.fn();
});

describe("getAppSettingsSnapshot", () => {
it("includes newThreadUsesNewWorktree in the default settings", () => {
expect(getAppSettingsSnapshot().newThreadUsesNewWorktree).toBe(false);
});

it("applies schema defaults when older persisted payloads omit new settings", () => {
getWindowForTest().localStorage.setItem(
APP_SETTINGS_STORAGE_KEY,
JSON.stringify({
confirmThreadDelete: false,
}),
);

expect(getAppSettingsSnapshot()).toMatchObject({
confirmThreadDelete: false,
newThreadUsesNewWorktree: false,
});
});
});

describe("normalizeCustomModelSlugs", () => {
it("normalizes aliases, removes built-ins, and deduplicates values", () => {
expect(
Expand Down
15 changes: 13 additions & 2 deletions apps/web/src/appSettings.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { Option, Schema } from "effect";
import { type ProviderKind } from "@t3tools/contracts";
import { getDefaultModel, getModelOptions, normalizeModelSlug } from "@t3tools/shared/model";

const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
export const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
const MAX_CUSTOM_MODEL_COUNT = 32;
export const MAX_CUSTOM_MODEL_LENGTH = 256;
const BUILT_IN_MODEL_SLUGS_BY_PROVIDER: Record<ProviderKind, ReadonlySet<string>> = {
Expand All@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
enableAssistantStreaming: Schema.Boolean.pipe(
Schema.withConstructorDefault(() => Option.some(false)),
),
newThreadUsesNewWorktree: Schema.Boolean.pipe(
Schema.withConstructorDefault(() => Option.some(false)),
),
customCodexModels: Schema.Array(Schema.String).pipe(
Schema.withConstructorDefault(() => Option.some([])),
),
Expand DownExpand Up@@ -174,7 +177,15 @@ function parsePersistedSettings(value: string | null): AppSettings {
}

try {
return normalizeAppSettings(Schema.decodeSync(Schema.fromJsonString(AppSettingsSchema))(value));
const parsed = JSON.parse(value);
const persistedSettings =
parsed && typeof parsed === "object"
? Schema.decodeSync(AppSettingsSchema)({
...DEFAULT_APP_SETTINGS,
...parsed,
})
: DEFAULT_APP_SETTINGS;
return normalizeAppSettings(persistedSettings);
} catch {
return DEFAULT_APP_SETTINGS;
}
Expand Down
170 changes: 161 additions & 9 deletions apps/web/src/components/ChatView.browser.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -353,14 +353,14 @@ function createSnapshotWithLongProposedPlan(): OrchestrationReadModel {
};
}

function resolveWsRpc(tag: string): unknown {
if (tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
function resolveWsRpc(request: WsRequestEnvelope["body"]): unknown {
if (request._tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
return fixture.snapshot;
}
if (tag === WS_METHODS.serverGetConfig) {
if (request._tag === WS_METHODS.serverGetConfig) {
return fixture.serverConfig;
}
if (tag === WS_METHODS.gitListBranches) {
if (request._tag === WS_METHODS.gitListBranches) {
return {
isRepo: true,
hasOriginRemote: true,
Expand All@@ -374,7 +374,7 @@ function resolveWsRpc(tag: string): unknown {
],
};
}
if (tag === WS_METHODS.gitStatus) {
if (request._tag === WS_METHODS.gitStatus) {
return {
branch: "main",
hasWorkingTreeChanges: false,
Expand All@@ -389,7 +389,18 @@ function resolveWsRpc(tag: string): unknown {
pr: null,
};
}
if (tag === WS_METHODS.projectsSearchEntries) {
if (request._tag === WS_METHODS.gitCreateWorktree) {
return {
worktree: {
branch: typeof request.newBranch === "string" ? request.newBranch : "t3code/browser-test",
path:
typeof request.path === "string"
? request.path
: "/repo/project/.t3/worktrees/browser-test",
},
};
}
if (request._tag === WS_METHODS.projectsSearchEntries) {
return {
entries: [],
truncated: false,
Expand DownExpand Up@@ -417,13 +428,12 @@ const worker = setupWorker(
} catch {
return;
}
const method = request.body?._tag;
if (typeof method !== "string") return;
if (typeof request.body?._tag !== "string") return;
wsRequests.push(request.body);
client.send(
JSON.stringify({
id: request.id,
result: resolveWsRpc(method),
result: resolveWsRpc(request.body),
}),
);
});
Expand DownExpand Up@@ -526,6 +536,17 @@ async function waitForInteractionModeButton(
);
}

function findDispatchCommandRequest(commandType: string) {
return wsRequests.find(
(request) =>
request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
typeof request.command === "object" &&
request.command !== null &&
"type" in request.command &&
request.command.type === commandType,
);
}

async function waitForImagesToLoad(scope: ParentNode): Promise<void> {
const images = Array.from(scope.querySelectorAll("img"));
if (images.length === 0) {
Expand DownExpand Up@@ -1048,6 +1069,137 @@ describe("ChatView timeline estimator parity (full app)", () => {
}
});

it("reopens an existing draft thread without resetting its branch or mode", async () => {
useComposerDraftStore.setState({
draftThreadsByThreadId: {
[THREAD_ID]: {
projectId: PROJECT_ID,
createdAt: NOW_ISO,
runtimeMode: "full-access",
interactionMode: "default",
branch: "feature/existing-draft",
worktreePath: null,
envMode: "worktree",
},
},
projectDraftThreadIdByProjectId: {
[PROJECT_ID]: THREAD_ID,
},
});
const mounted = await mountChatView({
viewport: DEFAULT_VIEWPORT,
snapshot: createDraftOnlySnapshot(),
});

try {
const newThreadButton = page.getByTestId("new-thread-button");
await expect.element(newThreadButton).toBeInTheDocument();
await newThreadButton.click();

await waitForURL(
mounted.router,
(path) => path === `/${THREAD_ID}`,
"Existing draft thread should remain selected when reopening it.",
);

expect(useComposerDraftStore.getState().getDraftThread(THREAD_ID)).toMatchObject({
projectId: PROJECT_ID,
branch: "feature/existing-draft",
worktreePath: null,
envMode: "worktree",
});
} finally {
await mounted.cleanup();
}
});

it("creates the worktree on first send for a pending worktree draft", async () => {
useComposerDraftStore.setState({
draftThreadsByThreadId: {
[THREAD_ID]: {
projectId: PROJECT_ID,
createdAt: NOW_ISO,
runtimeMode: "full-access",
interactionMode: "default",
branch: "main",
worktreePath: null,
envMode: "worktree",
},
},
projectDraftThreadIdByProjectId: {
[PROJECT_ID]: THREAD_ID,
},
});
const mounted = await mountChatView({
viewport: DEFAULT_VIEWPORT,
snapshot: createDraftOnlySnapshot(),
});

try {
const composerEditor = page.getByTestId("composer-editor");
await composerEditor.fill("Ship the change");
await page.getByRole("button", { name: "Send message" }).click();

let worktreeNewBranch: string | null = null;
await vi.waitFor(
() => {
const worktreeRequest = wsRequests.find(
(request) => request._tag === WS_METHODS.gitCreateWorktree,
);
expect(worktreeRequest).toMatchObject({
_tag: WS_METHODS.gitCreateWorktree,
cwd: "/repo/project",
branch: "main",
});
worktreeNewBranch =
worktreeRequest && typeof worktreeRequest.newBranch === "string"
? worktreeRequest.newBranch
: null;
},
{ timeout: 8_000, interval: 16 },
);

await vi.waitFor(
() => {
const threadCreateRequest = findDispatchCommandRequest("thread.create");
expect(threadCreateRequest).toMatchObject({
_tag: ORCHESTRATION_WS_METHODS.dispatchCommand,
command: {
type: "thread.create",
threadId: THREAD_ID,
projectId: PROJECT_ID,
worktreePath: "/repo/project/.t3/worktrees/browser-test",
},
});
expect(
threadCreateRequest &&
typeof threadCreateRequest.command === "object" &&
threadCreateRequest.command !== null &&
"branch" in threadCreateRequest.command
? threadCreateRequest.command.branch
: null,
).toBe(worktreeNewBranch ?? "t3code/browser-test");
},
{ timeout: 8_000, interval: 16 },
);

expect(
wsRequests.findIndex((request) => request._tag === WS_METHODS.gitCreateWorktree),
).toBeLessThan(
wsRequests.findIndex(
(request) =>
request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
typeof request.command === "object" &&
request.command !== null &&
"type" in request.command &&
request.command.type === "thread.create",
),
);
} finally {
await mounted.cleanup();
}
});

it("keeps long proposed plans lightweight until the user expands them", async () => {
const mounted = await mountChatView({
viewport: DEFAULT_VIEWPORT,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add default new-thread worktree mode with draft defaults#1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

notkainoa
wants to merge
2
commits into

from

 Closed


Add default new-thread worktree mode with draft defaults
#1007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c55c17b

Add default new-thread worktree mode with draft defaults


notkainoa Mar 13, 2026
b145a27

Preserve existing draft thread state when reopening new thread


notkainoa Mar 13, 2026

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


68 changes: 67 additions & 1 deletion
apps/web/src/appSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,78 @@
import { describe, expect, it } from "vitest";
import { beforeEach, describe, expect, it, vi } from "vitest";

import {
 APP_SETTINGS_STORAGE_KEY,
 getAppSettingsSnapshot,
 getAppModelOptions,
 getSlashModelOptions,
 normalizeCustomModelSlugs,
 resolveAppModelSelection,
} from "./appSettings";

function getWindowForTest(): Window & typeof globalThis {
 const testGlobal = globalThis as typeof globalThis & {
 window?: Window & typeof globalThis;
 };
 if (!testGlobal.window) {
 testGlobal.window = {} as Window & typeof globalThis;
 }
 return testGlobal.window;
}

function createStorage(): Storage {
 const values = new Map<string, string>();
 return {
 get length() {
 return values.size;
 },
 clear() {
 values.clear();
 },
 getItem(key) {
 return values.get(key) ?? null;
 },
 key(index) {
 return [...values.keys()][index] ?? null;
 },
 removeItem(key) {
 values.delete(key);
 },
 setItem(key, value) {
 values.set(key, value);
 },
 };
}

beforeEach(() => {
 const testWindow = getWindowForTest();
 Object.defineProperty(testWindow, "localStorage", {
 configurable: true,
 value: createStorage(),
 });
 testWindow.addEventListener = vi.fn();
 testWindow.removeEventListener = vi.fn();
});

describe("getAppSettingsSnapshot", () => {
 it("includes newThreadUsesNewWorktree in the default settings", () => {
 expect(getAppSettingsSnapshot().newThreadUsesNewWorktree).toBe(false);
 });

 it("applies schema defaults when older persisted payloads omit new settings", () => {
 getWindowForTest().localStorage.setItem(
 APP_SETTINGS_STORAGE_KEY,
 JSON.stringify({
 confirmThreadDelete: false,
 }),
 );

 expect(getAppSettingsSnapshot()).toMatchObject({
 confirmThreadDelete: false,
 newThreadUsesNewWorktree: false,
 });
 });
});

describe("normalizeCustomModelSlugs", () => {
 it("normalizes aliases, removes built-ins, and deduplicates values", () => {
 expect(
Expand Down

15 changes: 13 additions & 2 deletions
apps/web/src/appSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { Option, Schema } from "effect";
import { type ProviderKind } from "@t3tools/contracts";
import { getDefaultModel, getModelOptions, normalizeModelSlug } from "@t3tools/shared/model";

const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
export const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
const MAX_CUSTOM_MODEL_COUNT = 32;
export const MAX_CUSTOM_MODEL_LENGTH = 256;
const BUILT_IN_MODEL_SLUGS_BY_PROVIDER: Record<ProviderKind, ReadonlySet<string>> = {
Expand All@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
 enableAssistantStreaming: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 newThreadUsesNewWorktree: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 customCodexModels: Schema.Array(Schema.String).pipe(
 Schema.withConstructorDefault(() => Option.some([])),
 ),
Expand DownExpand Up@@ -174,7 +177,15 @@ function parsePersistedSettings(value: string | null): AppSettings {
 }

 try {
 return normalizeAppSettings(Schema.decodeSync(Schema.fromJsonString(AppSettingsSchema))(value));
 const parsed = JSON.parse(value);
 const persistedSettings =
 parsed && typeof parsed === "object"
 ? Schema.decodeSync(AppSettingsSchema)({
 ...DEFAULT_APP_SETTINGS,
 ...parsed,
 })
 : DEFAULT_APP_SETTINGS;
 return normalizeAppSettings(persistedSettings);
 } catch {
 return DEFAULT_APP_SETTINGS;
 }
Expand Down

170 changes: 161 additions & 9 deletions
apps/web/src/components/ChatView.browser.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,14 +353,14 @@ function createSnapshotWithLongProposedPlan(): OrchestrationReadModel {
 };
}

function resolveWsRpc(tag: string): unknown {
 if (tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
function resolveWsRpc(request: WsRequestEnvelope["body"]): unknown {
 if (request._tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
 return fixture.snapshot;
 }
 if (tag === WS_METHODS.serverGetConfig) {
 if (request._tag === WS_METHODS.serverGetConfig) {
 return fixture.serverConfig;
 }
 if (tag === WS_METHODS.gitListBranches) {
 if (request._tag === WS_METHODS.gitListBranches) {
 return {
 isRepo: true,
 hasOriginRemote: true,
Expand All@@ -374,7 +374,7 @@ function resolveWsRpc(tag: string): unknown {
 ],
 };
 }
 if (tag === WS_METHODS.gitStatus) {
 if (request._tag === WS_METHODS.gitStatus) {
 return {
 branch: "main",
 hasWorkingTreeChanges: false,
Expand All@@ -389,7 +389,18 @@ function resolveWsRpc(tag: string): unknown {
 pr: null,
 };
 }
 if (tag === WS_METHODS.projectsSearchEntries) {
 if (request._tag === WS_METHODS.gitCreateWorktree) {
 return {
 worktree: {
 branch: typeof request.newBranch === "string" ? request.newBranch : "t3code/browser-test",
 path:
 typeof request.path === "string"
 ? request.path
 : "/repo/project/.t3/worktrees/browser-test",
 },
 };
 }
 if (request._tag === WS_METHODS.projectsSearchEntries) {
 return {
 entries: [],
 truncated: false,
Expand DownExpand Up@@ -417,13 +428,12 @@ const worker = setupWorker(
 } catch {
 return;
 }
 const method = request.body?._tag;
 if (typeof method !== "string") return;
 if (typeof request.body?._tag !== "string") return;
 wsRequests.push(request.body);
 client.send(
 JSON.stringify({
 id: request.id,
 result: resolveWsRpc(method),
 result: resolveWsRpc(request.body),
 }),
 );
 });
Expand DownExpand Up@@ -526,6 +536,17 @@ async function waitForInteractionModeButton(
 );
}

function findDispatchCommandRequest(commandType: string) {
 return wsRequests.find(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === commandType,
 );
}

async function waitForImagesToLoad(scope: ParentNode): Promise<void> {
 const images = Array.from(scope.querySelectorAll("img"));
 if (images.length === 0) {
Expand DownExpand Up@@ -1048,6 +1069,137 @@ describe("ChatView timeline estimator parity (full app)", () => {
 }
 });

 it("reopens an existing draft thread without resetting its branch or mode", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const newThreadButton = page.getByTestId("new-thread-button");
 await expect.element(newThreadButton).toBeInTheDocument();
 await newThreadButton.click();

 await waitForURL(
 mounted.router,
 (path) => path === `/${THREAD_ID}`,
 "Existing draft thread should remain selected when reopening it.",
 );

 expect(useComposerDraftStore.getState().getDraftThread(THREAD_ID)).toMatchObject({
 projectId: PROJECT_ID,
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 });
 } finally {
 await mounted.cleanup();
 }
 });

 it("creates the worktree on first send for a pending worktree draft", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "main",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const composerEditor = page.getByTestId("composer-editor");
 await composerEditor.fill("Ship the change");
 await page.getByRole("button", { name: "Send message" }).click();

 let worktreeNewBranch: string | null = null;
 await vi.waitFor(
 () => {
 const worktreeRequest = wsRequests.find(
 (request) => request._tag === WS_METHODS.gitCreateWorktree,
 );
 expect(worktreeRequest).toMatchObject({
 _tag: WS_METHODS.gitCreateWorktree,
 cwd: "/repo/project",
 branch: "main",
 });
 worktreeNewBranch =
 worktreeRequest && typeof worktreeRequest.newBranch === "string"
 ? worktreeRequest.newBranch
 : null;
 },
 { timeout: 8_000, interval: 16 },
 );

 await vi.waitFor(
 () => {
 const threadCreateRequest = findDispatchCommandRequest("thread.create");
 expect(threadCreateRequest).toMatchObject({
 _tag: ORCHESTRATION_WS_METHODS.dispatchCommand,
 command: {
 type: "thread.create",
 threadId: THREAD_ID,
 projectId: PROJECT_ID,
 worktreePath: "/repo/project/.t3/worktrees/browser-test",
 },
 });
 expect(
 threadCreateRequest &&
 typeof threadCreateRequest.command === "object" &&
 threadCreateRequest.command !== null &&
 "branch" in threadCreateRequest.command
 ? threadCreateRequest.command.branch
 : null,
 ).toBe(worktreeNewBranch ?? "t3code/browser-test");
 },
 { timeout: 8_000, interval: 16 },
 );

 expect(
 wsRequests.findIndex((request) => request._tag === WS_METHODS.gitCreateWorktree),
 ).toBeLessThan(
 wsRequests.findIndex(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === "thread.create",
 ),
 );
 } finally {
 await mounted.cleanup();
 }
 });

 it("keeps long proposed plans lightweight until the user expands them", async () => {
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add default new-thread worktree mode with draft defaults#1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

notkainoa
wants to merge
2
commits into

from

 Closed


Add default new-thread worktree mode with draft defaults
#1007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c55c17b

Add default new-thread worktree mode with draft defaults


notkainoa Mar 13, 2026
b145a27

Preserve existing draft thread state when reopening new thread


notkainoa Mar 13, 2026

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


68 changes: 67 additions & 1 deletion
apps/web/src/appSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,78 @@
import { describe, expect, it } from "vitest";
import { beforeEach, describe, expect, it, vi } from "vitest";

import {
 APP_SETTINGS_STORAGE_KEY,
 getAppSettingsSnapshot,
 getAppModelOptions,
 getSlashModelOptions,
 normalizeCustomModelSlugs,
 resolveAppModelSelection,
} from "./appSettings";

function getWindowForTest(): Window & typeof globalThis {
 const testGlobal = globalThis as typeof globalThis & {
 window?: Window & typeof globalThis;
 };
 if (!testGlobal.window) {
 testGlobal.window = {} as Window & typeof globalThis;
 }
 return testGlobal.window;
}

function createStorage(): Storage {
 const values = new Map<string, string>();
 return {
 get length() {
 return values.size;
 },
 clear() {
 values.clear();
 },
 getItem(key) {
 return values.get(key) ?? null;
 },
 key(index) {
 return [...values.keys()][index] ?? null;
 },
 removeItem(key) {
 values.delete(key);
 },
 setItem(key, value) {
 values.set(key, value);
 },
 };
}

beforeEach(() => {
 const testWindow = getWindowForTest();
 Object.defineProperty(testWindow, "localStorage", {
 configurable: true,
 value: createStorage(),
 });
 testWindow.addEventListener = vi.fn();
 testWindow.removeEventListener = vi.fn();
});

describe("getAppSettingsSnapshot", () => {
 it("includes newThreadUsesNewWorktree in the default settings", () => {
 expect(getAppSettingsSnapshot().newThreadUsesNewWorktree).toBe(false);
 });

 it("applies schema defaults when older persisted payloads omit new settings", () => {
 getWindowForTest().localStorage.setItem(
 APP_SETTINGS_STORAGE_KEY,
 JSON.stringify({
 confirmThreadDelete: false,
 }),
 );

 expect(getAppSettingsSnapshot()).toMatchObject({
 confirmThreadDelete: false,
 newThreadUsesNewWorktree: false,
 });
 });
});

describe("normalizeCustomModelSlugs", () => {
 it("normalizes aliases, removes built-ins, and deduplicates values", () => {
 expect(
Expand Down

15 changes: 13 additions & 2 deletions
apps/web/src/appSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { Option, Schema } from "effect";
import { type ProviderKind } from "@t3tools/contracts";
import { getDefaultModel, getModelOptions, normalizeModelSlug } from "@t3tools/shared/model";

const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
export const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
const MAX_CUSTOM_MODEL_COUNT = 32;
export const MAX_CUSTOM_MODEL_LENGTH = 256;
const BUILT_IN_MODEL_SLUGS_BY_PROVIDER: Record<ProviderKind, ReadonlySet<string>> = {
Expand All@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
 enableAssistantStreaming: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 newThreadUsesNewWorktree: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 customCodexModels: Schema.Array(Schema.String).pipe(
 Schema.withConstructorDefault(() => Option.some([])),
 ),
Expand DownExpand Up@@ -174,7 +177,15 @@ function parsePersistedSettings(value: string | null): AppSettings {
 }

 try {
 return normalizeAppSettings(Schema.decodeSync(Schema.fromJsonString(AppSettingsSchema))(value));
 const parsed = JSON.parse(value);
 const persistedSettings =
 parsed && typeof parsed === "object"
 ? Schema.decodeSync(AppSettingsSchema)({
 ...DEFAULT_APP_SETTINGS,
 ...parsed,
 })
 : DEFAULT_APP_SETTINGS;
 return normalizeAppSettings(persistedSettings);
 } catch {
 return DEFAULT_APP_SETTINGS;
 }
Expand Down

170 changes: 161 additions & 9 deletions
apps/web/src/components/ChatView.browser.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,14 +353,14 @@ function createSnapshotWithLongProposedPlan(): OrchestrationReadModel {
 };
}

function resolveWsRpc(tag: string): unknown {
 if (tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
function resolveWsRpc(request: WsRequestEnvelope["body"]): unknown {
 if (request._tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
 return fixture.snapshot;
 }
 if (tag === WS_METHODS.serverGetConfig) {
 if (request._tag === WS_METHODS.serverGetConfig) {
 return fixture.serverConfig;
 }
 if (tag === WS_METHODS.gitListBranches) {
 if (request._tag === WS_METHODS.gitListBranches) {
 return {
 isRepo: true,
 hasOriginRemote: true,
Expand All@@ -374,7 +374,7 @@ function resolveWsRpc(tag: string): unknown {
 ],
 };
 }
 if (tag === WS_METHODS.gitStatus) {
 if (request._tag === WS_METHODS.gitStatus) {
 return {
 branch: "main",
 hasWorkingTreeChanges: false,
Expand All@@ -389,7 +389,18 @@ function resolveWsRpc(tag: string): unknown {
 pr: null,
 };
 }
 if (tag === WS_METHODS.projectsSearchEntries) {
 if (request._tag === WS_METHODS.gitCreateWorktree) {
 return {
 worktree: {
 branch: typeof request.newBranch === "string" ? request.newBranch : "t3code/browser-test",
 path:
 typeof request.path === "string"
 ? request.path
 : "/repo/project/.t3/worktrees/browser-test",
 },
 };
 }
 if (request._tag === WS_METHODS.projectsSearchEntries) {
 return {
 entries: [],
 truncated: false,
Expand DownExpand Up@@ -417,13 +428,12 @@ const worker = setupWorker(
 } catch {
 return;
 }
 const method = request.body?._tag;
 if (typeof method !== "string") return;
 if (typeof request.body?._tag !== "string") return;
 wsRequests.push(request.body);
 client.send(
 JSON.stringify({
 id: request.id,
 result: resolveWsRpc(method),
 result: resolveWsRpc(request.body),
 }),
 );
 });
Expand DownExpand Up@@ -526,6 +536,17 @@ async function waitForInteractionModeButton(
 );
}

function findDispatchCommandRequest(commandType: string) {
 return wsRequests.find(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === commandType,
 );
}

async function waitForImagesToLoad(scope: ParentNode): Promise<void> {
 const images = Array.from(scope.querySelectorAll("img"));
 if (images.length === 0) {
Expand DownExpand Up@@ -1048,6 +1069,137 @@ describe("ChatView timeline estimator parity (full app)", () => {
 }
 });

 it("reopens an existing draft thread without resetting its branch or mode", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const newThreadButton = page.getByTestId("new-thread-button");
 await expect.element(newThreadButton).toBeInTheDocument();
 await newThreadButton.click();

 await waitForURL(
 mounted.router,
 (path) => path === `/${THREAD_ID}`,
 "Existing draft thread should remain selected when reopening it.",
 );

 expect(useComposerDraftStore.getState().getDraftThread(THREAD_ID)).toMatchObject({
 projectId: PROJECT_ID,
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 });
 } finally {
 await mounted.cleanup();
 }
 });

 it("creates the worktree on first send for a pending worktree draft", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "main",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const composerEditor = page.getByTestId("composer-editor");
 await composerEditor.fill("Ship the change");
 await page.getByRole("button", { name: "Send message" }).click();

 let worktreeNewBranch: string | null = null;
 await vi.waitFor(
 () => {
 const worktreeRequest = wsRequests.find(
 (request) => request._tag === WS_METHODS.gitCreateWorktree,
 );
 expect(worktreeRequest).toMatchObject({
 _tag: WS_METHODS.gitCreateWorktree,
 cwd: "/repo/project",
 branch: "main",
 });
 worktreeNewBranch =
 worktreeRequest && typeof worktreeRequest.newBranch === "string"
 ? worktreeRequest.newBranch
 : null;
 },
 { timeout: 8_000, interval: 16 },
 );

 await vi.waitFor(
 () => {
 const threadCreateRequest = findDispatchCommandRequest("thread.create");
 expect(threadCreateRequest).toMatchObject({
 _tag: ORCHESTRATION_WS_METHODS.dispatchCommand,
 command: {
 type: "thread.create",
 threadId: THREAD_ID,
 projectId: PROJECT_ID,
 worktreePath: "/repo/project/.t3/worktrees/browser-test",
 },
 });
 expect(
 threadCreateRequest &&
 typeof threadCreateRequest.command === "object" &&
 threadCreateRequest.command !== null &&
 "branch" in threadCreateRequest.command
 ? threadCreateRequest.command.branch
 : null,
 ).toBe(worktreeNewBranch ?? "t3code/browser-test");
 },
 { timeout: 8_000, interval: 16 },
 );

 expect(
 wsRequests.findIndex((request) => request._tag === WS_METHODS.gitCreateWorktree),
 ).toBeLessThan(
 wsRequests.findIndex(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === "thread.create",
 ),
 );
 } finally {
 await mounted.cleanup();
 }
 });

 it("keeps long proposed plans lightweight until the user expands them", async () => {
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add default new-thread worktree mode with draft defaults#1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

notkainoa
wants to merge
2
commits into

from

 Closed


Add default new-thread worktree mode with draft defaults
#1007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c55c17b

Add default new-thread worktree mode with draft defaults


notkainoa Mar 13, 2026
b145a27

Preserve existing draft thread state when reopening new thread


notkainoa Mar 13, 2026

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


68 changes: 67 additions & 1 deletion
apps/web/src/appSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,78 @@
import { describe, expect, it } from "vitest";
import { beforeEach, describe, expect, it, vi } from "vitest";

import {
 APP_SETTINGS_STORAGE_KEY,
 getAppSettingsSnapshot,
 getAppModelOptions,
 getSlashModelOptions,
 normalizeCustomModelSlugs,
 resolveAppModelSelection,
} from "./appSettings";

function getWindowForTest(): Window & typeof globalThis {
 const testGlobal = globalThis as typeof globalThis & {
 window?: Window & typeof globalThis;
 };
 if (!testGlobal.window) {
 testGlobal.window = {} as Window & typeof globalThis;
 }
 return testGlobal.window;
}

function createStorage(): Storage {
 const values = new Map<string, string>();
 return {
 get length() {
 return values.size;
 },
 clear() {
 values.clear();
 },
 getItem(key) {
 return values.get(key) ?? null;
 },
 key(index) {
 return [...values.keys()][index] ?? null;
 },
 removeItem(key) {
 values.delete(key);
 },
 setItem(key, value) {
 values.set(key, value);
 },
 };
}

beforeEach(() => {
 const testWindow = getWindowForTest();
 Object.defineProperty(testWindow, "localStorage", {
 configurable: true,
 value: createStorage(),
 });
 testWindow.addEventListener = vi.fn();
 testWindow.removeEventListener = vi.fn();
});

describe("getAppSettingsSnapshot", () => {
 it("includes newThreadUsesNewWorktree in the default settings", () => {
 expect(getAppSettingsSnapshot().newThreadUsesNewWorktree).toBe(false);
 });

 it("applies schema defaults when older persisted payloads omit new settings", () => {
 getWindowForTest().localStorage.setItem(
 APP_SETTINGS_STORAGE_KEY,
 JSON.stringify({
 confirmThreadDelete: false,
 }),
 );

 expect(getAppSettingsSnapshot()).toMatchObject({
 confirmThreadDelete: false,
 newThreadUsesNewWorktree: false,
 });
 });
});

describe("normalizeCustomModelSlugs", () => {
 it("normalizes aliases, removes built-ins, and deduplicates values", () => {
 expect(
Expand Down

15 changes: 13 additions & 2 deletions
apps/web/src/appSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { Option, Schema } from "effect";
import { type ProviderKind } from "@t3tools/contracts";
import { getDefaultModel, getModelOptions, normalizeModelSlug } from "@t3tools/shared/model";

const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
export const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
const MAX_CUSTOM_MODEL_COUNT = 32;
export const MAX_CUSTOM_MODEL_LENGTH = 256;
const BUILT_IN_MODEL_SLUGS_BY_PROVIDER: Record<ProviderKind, ReadonlySet<string>> = {
Expand All@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
 enableAssistantStreaming: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 newThreadUsesNewWorktree: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 customCodexModels: Schema.Array(Schema.String).pipe(
 Schema.withConstructorDefault(() => Option.some([])),
 ),
Expand DownExpand Up@@ -174,7 +177,15 @@ function parsePersistedSettings(value: string | null): AppSettings {
 }

 try {
 return normalizeAppSettings(Schema.decodeSync(Schema.fromJsonString(AppSettingsSchema))(value));
 const parsed = JSON.parse(value);
 const persistedSettings =
 parsed && typeof parsed === "object"
 ? Schema.decodeSync(AppSettingsSchema)({
 ...DEFAULT_APP_SETTINGS,
 ...parsed,
 })
 : DEFAULT_APP_SETTINGS;
 return normalizeAppSettings(persistedSettings);
 } catch {
 return DEFAULT_APP_SETTINGS;
 }
Expand Down

170 changes: 161 additions & 9 deletions
apps/web/src/components/ChatView.browser.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,14 +353,14 @@ function createSnapshotWithLongProposedPlan(): OrchestrationReadModel {
 };
}

function resolveWsRpc(tag: string): unknown {
 if (tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
function resolveWsRpc(request: WsRequestEnvelope["body"]): unknown {
 if (request._tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
 return fixture.snapshot;
 }
 if (tag === WS_METHODS.serverGetConfig) {
 if (request._tag === WS_METHODS.serverGetConfig) {
 return fixture.serverConfig;
 }
 if (tag === WS_METHODS.gitListBranches) {
 if (request._tag === WS_METHODS.gitListBranches) {
 return {
 isRepo: true,
 hasOriginRemote: true,
Expand All@@ -374,7 +374,7 @@ function resolveWsRpc(tag: string): unknown {
 ],
 };
 }
 if (tag === WS_METHODS.gitStatus) {
 if (request._tag === WS_METHODS.gitStatus) {
 return {
 branch: "main",
 hasWorkingTreeChanges: false,
Expand All@@ -389,7 +389,18 @@ function resolveWsRpc(tag: string): unknown {
 pr: null,
 };
 }
 if (tag === WS_METHODS.projectsSearchEntries) {
 if (request._tag === WS_METHODS.gitCreateWorktree) {
 return {
 worktree: {
 branch: typeof request.newBranch === "string" ? request.newBranch : "t3code/browser-test",
 path:
 typeof request.path === "string"
 ? request.path
 : "/repo/project/.t3/worktrees/browser-test",
 },
 };
 }
 if (request._tag === WS_METHODS.projectsSearchEntries) {
 return {
 entries: [],
 truncated: false,
Expand DownExpand Up@@ -417,13 +428,12 @@ const worker = setupWorker(
 } catch {
 return;
 }
 const method = request.body?._tag;
 if (typeof method !== "string") return;
 if (typeof request.body?._tag !== "string") return;
 wsRequests.push(request.body);
 client.send(
 JSON.stringify({
 id: request.id,
 result: resolveWsRpc(method),
 result: resolveWsRpc(request.body),
 }),
 );
 });
Expand DownExpand Up@@ -526,6 +536,17 @@ async function waitForInteractionModeButton(
 );
}

function findDispatchCommandRequest(commandType: string) {
 return wsRequests.find(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === commandType,
 );
}

async function waitForImagesToLoad(scope: ParentNode): Promise<void> {
 const images = Array.from(scope.querySelectorAll("img"));
 if (images.length === 0) {
Expand DownExpand Up@@ -1048,6 +1069,137 @@ describe("ChatView timeline estimator parity (full app)", () => {
 }
 });

 it("reopens an existing draft thread without resetting its branch or mode", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const newThreadButton = page.getByTestId("new-thread-button");
 await expect.element(newThreadButton).toBeInTheDocument();
 await newThreadButton.click();

 await waitForURL(
 mounted.router,
 (path) => path === `/${THREAD_ID}`,
 "Existing draft thread should remain selected when reopening it.",
 );

 expect(useComposerDraftStore.getState().getDraftThread(THREAD_ID)).toMatchObject({
 projectId: PROJECT_ID,
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 });
 } finally {
 await mounted.cleanup();
 }
 });

 it("creates the worktree on first send for a pending worktree draft", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "main",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const composerEditor = page.getByTestId("composer-editor");
 await composerEditor.fill("Ship the change");
 await page.getByRole("button", { name: "Send message" }).click();

 let worktreeNewBranch: string | null = null;
 await vi.waitFor(
 () => {
 const worktreeRequest = wsRequests.find(
 (request) => request._tag === WS_METHODS.gitCreateWorktree,
 );
 expect(worktreeRequest).toMatchObject({
 _tag: WS_METHODS.gitCreateWorktree,
 cwd: "/repo/project",
 branch: "main",
 });
 worktreeNewBranch =
 worktreeRequest && typeof worktreeRequest.newBranch === "string"
 ? worktreeRequest.newBranch
 : null;
 },
 { timeout: 8_000, interval: 16 },
 );

 await vi.waitFor(
 () => {
 const threadCreateRequest = findDispatchCommandRequest("thread.create");
 expect(threadCreateRequest).toMatchObject({
 _tag: ORCHESTRATION_WS_METHODS.dispatchCommand,
 command: {
 type: "thread.create",
 threadId: THREAD_ID,
 projectId: PROJECT_ID,
 worktreePath: "/repo/project/.t3/worktrees/browser-test",
 },
 });
 expect(
 threadCreateRequest &&
 typeof threadCreateRequest.command === "object" &&
 threadCreateRequest.command !== null &&
 "branch" in threadCreateRequest.command
 ? threadCreateRequest.command.branch
 : null,
 ).toBe(worktreeNewBranch ?? "t3code/browser-test");
 },
 { timeout: 8_000, interval: 16 },
 );

 expect(
 wsRequests.findIndex((request) => request._tag === WS_METHODS.gitCreateWorktree),
 ).toBeLessThan(
 wsRequests.findIndex(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === "thread.create",
 ),
 );
 } finally {
 await mounted.cleanup();
 }
 });

 it("keeps long proposed plans lightweight until the user expands them", async () => {
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add default new-thread worktree mode with draft defaults#1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

notkainoa
wants to merge
2
commits into

from

 Closed


Add default new-thread worktree mode with draft defaults
#1007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c55c17b

Add default new-thread worktree mode with draft defaults


notkainoa Mar 13, 2026
b145a27

Preserve existing draft thread state when reopening new thread


notkainoa Mar 13, 2026

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


68 changes: 67 additions & 1 deletion
apps/web/src/appSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,78 @@
import { describe, expect, it } from "vitest";
import { beforeEach, describe, expect, it, vi } from "vitest";

import {
 APP_SETTINGS_STORAGE_KEY,
 getAppSettingsSnapshot,
 getAppModelOptions,
 getSlashModelOptions,
 normalizeCustomModelSlugs,
 resolveAppModelSelection,
} from "./appSettings";

function getWindowForTest(): Window & typeof globalThis {
 const testGlobal = globalThis as typeof globalThis & {
 window?: Window & typeof globalThis;
 };
 if (!testGlobal.window) {
 testGlobal.window = {} as Window & typeof globalThis;
 }
 return testGlobal.window;
}

function createStorage(): Storage {
 const values = new Map<string, string>();
 return {
 get length() {
 return values.size;
 },
 clear() {
 values.clear();
 },
 getItem(key) {
 return values.get(key) ?? null;
 },
 key(index) {
 return [...values.keys()][index] ?? null;
 },
 removeItem(key) {
 values.delete(key);
 },
 setItem(key, value) {
 values.set(key, value);
 },
 };
}

beforeEach(() => {
 const testWindow = getWindowForTest();
 Object.defineProperty(testWindow, "localStorage", {
 configurable: true,
 value: createStorage(),
 });
 testWindow.addEventListener = vi.fn();
 testWindow.removeEventListener = vi.fn();
});

describe("getAppSettingsSnapshot", () => {
 it("includes newThreadUsesNewWorktree in the default settings", () => {
 expect(getAppSettingsSnapshot().newThreadUsesNewWorktree).toBe(false);
 });

 it("applies schema defaults when older persisted payloads omit new settings", () => {
 getWindowForTest().localStorage.setItem(
 APP_SETTINGS_STORAGE_KEY,
 JSON.stringify({
 confirmThreadDelete: false,
 }),
 );

 expect(getAppSettingsSnapshot()).toMatchObject({
 confirmThreadDelete: false,
 newThreadUsesNewWorktree: false,
 });
 });
});

describe("normalizeCustomModelSlugs", () => {
 it("normalizes aliases, removes built-ins, and deduplicates values", () => {
 expect(
Expand Down

15 changes: 13 additions & 2 deletions
apps/web/src/appSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { Option, Schema } from "effect";
import { type ProviderKind } from "@t3tools/contracts";
import { getDefaultModel, getModelOptions, normalizeModelSlug } from "@t3tools/shared/model";

const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
export const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
const MAX_CUSTOM_MODEL_COUNT = 32;
export const MAX_CUSTOM_MODEL_LENGTH = 256;
const BUILT_IN_MODEL_SLUGS_BY_PROVIDER: Record<ProviderKind, ReadonlySet<string>> = {
Expand All@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
 enableAssistantStreaming: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 newThreadUsesNewWorktree: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 customCodexModels: Schema.Array(Schema.String).pipe(
 Schema.withConstructorDefault(() => Option.some([])),
 ),
Expand DownExpand Up@@ -174,7 +177,15 @@ function parsePersistedSettings(value: string | null): AppSettings {
 }

 try {
 return normalizeAppSettings(Schema.decodeSync(Schema.fromJsonString(AppSettingsSchema))(value));
 const parsed = JSON.parse(value);
 const persistedSettings =
 parsed && typeof parsed === "object"
 ? Schema.decodeSync(AppSettingsSchema)({
 ...DEFAULT_APP_SETTINGS,
 ...parsed,
 })
 : DEFAULT_APP_SETTINGS;
 return normalizeAppSettings(persistedSettings);
 } catch {
 return DEFAULT_APP_SETTINGS;
 }
Expand Down

170 changes: 161 additions & 9 deletions
apps/web/src/components/ChatView.browser.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,14 +353,14 @@ function createSnapshotWithLongProposedPlan(): OrchestrationReadModel {
 };
}

function resolveWsRpc(tag: string): unknown {
 if (tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
function resolveWsRpc(request: WsRequestEnvelope["body"]): unknown {
 if (request._tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
 return fixture.snapshot;
 }
 if (tag === WS_METHODS.serverGetConfig) {
 if (request._tag === WS_METHODS.serverGetConfig) {
 return fixture.serverConfig;
 }
 if (tag === WS_METHODS.gitListBranches) {
 if (request._tag === WS_METHODS.gitListBranches) {
 return {
 isRepo: true,
 hasOriginRemote: true,
Expand All@@ -374,7 +374,7 @@ function resolveWsRpc(tag: string): unknown {
 ],
 };
 }
 if (tag === WS_METHODS.gitStatus) {
 if (request._tag === WS_METHODS.gitStatus) {
 return {
 branch: "main",
 hasWorkingTreeChanges: false,
Expand All@@ -389,7 +389,18 @@ function resolveWsRpc(tag: string): unknown {
 pr: null,
 };
 }
 if (tag === WS_METHODS.projectsSearchEntries) {
 if (request._tag === WS_METHODS.gitCreateWorktree) {
 return {
 worktree: {
 branch: typeof request.newBranch === "string" ? request.newBranch : "t3code/browser-test",
 path:
 typeof request.path === "string"
 ? request.path
 : "/repo/project/.t3/worktrees/browser-test",
 },
 };
 }
 if (request._tag === WS_METHODS.projectsSearchEntries) {
 return {
 entries: [],
 truncated: false,
Expand DownExpand Up@@ -417,13 +428,12 @@ const worker = setupWorker(
 } catch {
 return;
 }
 const method = request.body?._tag;
 if (typeof method !== "string") return;
 if (typeof request.body?._tag !== "string") return;
 wsRequests.push(request.body);
 client.send(
 JSON.stringify({
 id: request.id,
 result: resolveWsRpc(method),
 result: resolveWsRpc(request.body),
 }),
 );
 });
Expand DownExpand Up@@ -526,6 +536,17 @@ async function waitForInteractionModeButton(
 );
}

function findDispatchCommandRequest(commandType: string) {
 return wsRequests.find(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === commandType,
 );
}

async function waitForImagesToLoad(scope: ParentNode): Promise<void> {
 const images = Array.from(scope.querySelectorAll("img"));
 if (images.length === 0) {
Expand DownExpand Up@@ -1048,6 +1069,137 @@ describe("ChatView timeline estimator parity (full app)", () => {
 }
 });

 it("reopens an existing draft thread without resetting its branch or mode", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const newThreadButton = page.getByTestId("new-thread-button");
 await expect.element(newThreadButton).toBeInTheDocument();
 await newThreadButton.click();

 await waitForURL(
 mounted.router,
 (path) => path === `/${THREAD_ID}`,
 "Existing draft thread should remain selected when reopening it.",
 );

 expect(useComposerDraftStore.getState().getDraftThread(THREAD_ID)).toMatchObject({
 projectId: PROJECT_ID,
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 });
 } finally {
 await mounted.cleanup();
 }
 });

 it("creates the worktree on first send for a pending worktree draft", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "main",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const composerEditor = page.getByTestId("composer-editor");
 await composerEditor.fill("Ship the change");
 await page.getByRole("button", { name: "Send message" }).click();

 let worktreeNewBranch: string | null = null;
 await vi.waitFor(
 () => {
 const worktreeRequest = wsRequests.find(
 (request) => request._tag === WS_METHODS.gitCreateWorktree,
 );
 expect(worktreeRequest).toMatchObject({
 _tag: WS_METHODS.gitCreateWorktree,
 cwd: "/repo/project",
 branch: "main",
 });
 worktreeNewBranch =
 worktreeRequest && typeof worktreeRequest.newBranch === "string"
 ? worktreeRequest.newBranch
 : null;
 },
 { timeout: 8_000, interval: 16 },
 );

 await vi.waitFor(
 () => {
 const threadCreateRequest = findDispatchCommandRequest("thread.create");
 expect(threadCreateRequest).toMatchObject({
 _tag: ORCHESTRATION_WS_METHODS.dispatchCommand,
 command: {
 type: "thread.create",
 threadId: THREAD_ID,
 projectId: PROJECT_ID,
 worktreePath: "/repo/project/.t3/worktrees/browser-test",
 },
 });
 expect(
 threadCreateRequest &&
 typeof threadCreateRequest.command === "object" &&
 threadCreateRequest.command !== null &&
 "branch" in threadCreateRequest.command
 ? threadCreateRequest.command.branch
 : null,
 ).toBe(worktreeNewBranch ?? "t3code/browser-test");
 },
 { timeout: 8_000, interval: 16 },
 );

 expect(
 wsRequests.findIndex((request) => request._tag === WS_METHODS.gitCreateWorktree),
 ).toBeLessThan(
 wsRequests.findIndex(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === "thread.create",
 ),
 );
 } finally {
 await mounted.cleanup();
 }
 });

 it("keeps long proposed plans lightweight until the user expands them", async () => {
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add default new-thread worktree mode with draft defaults#1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

notkainoa
wants to merge
2
commits into

from

 Closed


Add default new-thread worktree mode with draft defaults
#1007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c55c17b

Add default new-thread worktree mode with draft defaults


notkainoa Mar 13, 2026
b145a27

Preserve existing draft thread state when reopening new thread


notkainoa Mar 13, 2026

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


68 changes: 67 additions & 1 deletion
apps/web/src/appSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,78 @@
import { describe, expect, it } from "vitest";
import { beforeEach, describe, expect, it, vi } from "vitest";

import {
 APP_SETTINGS_STORAGE_KEY,
 getAppSettingsSnapshot,
 getAppModelOptions,
 getSlashModelOptions,
 normalizeCustomModelSlugs,
 resolveAppModelSelection,
} from "./appSettings";

function getWindowForTest(): Window & typeof globalThis {
 const testGlobal = globalThis as typeof globalThis & {
 window?: Window & typeof globalThis;
 };
 if (!testGlobal.window) {
 testGlobal.window = {} as Window & typeof globalThis;
 }
 return testGlobal.window;
}

function createStorage(): Storage {
 const values = new Map<string, string>();
 return {
 get length() {
 return values.size;
 },
 clear() {
 values.clear();
 },
 getItem(key) {
 return values.get(key) ?? null;
 },
 key(index) {
 return [...values.keys()][index] ?? null;
 },
 removeItem(key) {
 values.delete(key);
 },
 setItem(key, value) {
 values.set(key, value);
 },
 };
}

beforeEach(() => {
 const testWindow = getWindowForTest();
 Object.defineProperty(testWindow, "localStorage", {
 configurable: true,
 value: createStorage(),
 });
 testWindow.addEventListener = vi.fn();
 testWindow.removeEventListener = vi.fn();
});

describe("getAppSettingsSnapshot", () => {
 it("includes newThreadUsesNewWorktree in the default settings", () => {
 expect(getAppSettingsSnapshot().newThreadUsesNewWorktree).toBe(false);
 });

 it("applies schema defaults when older persisted payloads omit new settings", () => {
 getWindowForTest().localStorage.setItem(
 APP_SETTINGS_STORAGE_KEY,
 JSON.stringify({
 confirmThreadDelete: false,
 }),
 );

 expect(getAppSettingsSnapshot()).toMatchObject({
 confirmThreadDelete: false,
 newThreadUsesNewWorktree: false,
 });
 });
});

describe("normalizeCustomModelSlugs", () => {
 it("normalizes aliases, removes built-ins, and deduplicates values", () => {
 expect(
Expand Down

15 changes: 13 additions & 2 deletions
apps/web/src/appSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { Option, Schema } from "effect";
import { type ProviderKind } from "@t3tools/contracts";
import { getDefaultModel, getModelOptions, normalizeModelSlug } from "@t3tools/shared/model";

const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
export const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
const MAX_CUSTOM_MODEL_COUNT = 32;
export const MAX_CUSTOM_MODEL_LENGTH = 256;
const BUILT_IN_MODEL_SLUGS_BY_PROVIDER: Record<ProviderKind, ReadonlySet<string>> = {
Expand All@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
 enableAssistantStreaming: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 newThreadUsesNewWorktree: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 customCodexModels: Schema.Array(Schema.String).pipe(
 Schema.withConstructorDefault(() => Option.some([])),
 ),
Expand DownExpand Up@@ -174,7 +177,15 @@ function parsePersistedSettings(value: string | null): AppSettings {
 }

 try {
 return normalizeAppSettings(Schema.decodeSync(Schema.fromJsonString(AppSettingsSchema))(value));
 const parsed = JSON.parse(value);
 const persistedSettings =
 parsed && typeof parsed === "object"
 ? Schema.decodeSync(AppSettingsSchema)({
 ...DEFAULT_APP_SETTINGS,
 ...parsed,
 })
 : DEFAULT_APP_SETTINGS;
 return normalizeAppSettings(persistedSettings);
 } catch {
 return DEFAULT_APP_SETTINGS;
 }
Expand Down

170 changes: 161 additions & 9 deletions
apps/web/src/components/ChatView.browser.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,14 +353,14 @@ function createSnapshotWithLongProposedPlan(): OrchestrationReadModel {
 };
}

function resolveWsRpc(tag: string): unknown {
 if (tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
function resolveWsRpc(request: WsRequestEnvelope["body"]): unknown {
 if (request._tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
 return fixture.snapshot;
 }
 if (tag === WS_METHODS.serverGetConfig) {
 if (request._tag === WS_METHODS.serverGetConfig) {
 return fixture.serverConfig;
 }
 if (tag === WS_METHODS.gitListBranches) {
 if (request._tag === WS_METHODS.gitListBranches) {
 return {
 isRepo: true,
 hasOriginRemote: true,
Expand All@@ -374,7 +374,7 @@ function resolveWsRpc(tag: string): unknown {
 ],
 };
 }
 if (tag === WS_METHODS.gitStatus) {
 if (request._tag === WS_METHODS.gitStatus) {
 return {
 branch: "main",
 hasWorkingTreeChanges: false,
Expand All@@ -389,7 +389,18 @@ function resolveWsRpc(tag: string): unknown {
 pr: null,
 };
 }
 if (tag === WS_METHODS.projectsSearchEntries) {
 if (request._tag === WS_METHODS.gitCreateWorktree) {
 return {
 worktree: {
 branch: typeof request.newBranch === "string" ? request.newBranch : "t3code/browser-test",
 path:
 typeof request.path === "string"
 ? request.path
 : "/repo/project/.t3/worktrees/browser-test",
 },
 };
 }
 if (request._tag === WS_METHODS.projectsSearchEntries) {
 return {
 entries: [],
 truncated: false,
Expand DownExpand Up@@ -417,13 +428,12 @@ const worker = setupWorker(
 } catch {
 return;
 }
 const method = request.body?._tag;
 if (typeof method !== "string") return;
 if (typeof request.body?._tag !== "string") return;
 wsRequests.push(request.body);
 client.send(
 JSON.stringify({
 id: request.id,
 result: resolveWsRpc(method),
 result: resolveWsRpc(request.body),
 }),
 );
 });
Expand DownExpand Up@@ -526,6 +536,17 @@ async function waitForInteractionModeButton(
 );
}

function findDispatchCommandRequest(commandType: string) {
 return wsRequests.find(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === commandType,
 );
}

async function waitForImagesToLoad(scope: ParentNode): Promise<void> {
 const images = Array.from(scope.querySelectorAll("img"));
 if (images.length === 0) {
Expand DownExpand Up@@ -1048,6 +1069,137 @@ describe("ChatView timeline estimator parity (full app)", () => {
 }
 });

 it("reopens an existing draft thread without resetting its branch or mode", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const newThreadButton = page.getByTestId("new-thread-button");
 await expect.element(newThreadButton).toBeInTheDocument();
 await newThreadButton.click();

 await waitForURL(
 mounted.router,
 (path) => path === `/${THREAD_ID}`,
 "Existing draft thread should remain selected when reopening it.",
 );

 expect(useComposerDraftStore.getState().getDraftThread(THREAD_ID)).toMatchObject({
 projectId: PROJECT_ID,
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 });
 } finally {
 await mounted.cleanup();
 }
 });

 it("creates the worktree on first send for a pending worktree draft", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "main",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const composerEditor = page.getByTestId("composer-editor");
 await composerEditor.fill("Ship the change");
 await page.getByRole("button", { name: "Send message" }).click();

 let worktreeNewBranch: string | null = null;
 await vi.waitFor(
 () => {
 const worktreeRequest = wsRequests.find(
 (request) => request._tag === WS_METHODS.gitCreateWorktree,
 );
 expect(worktreeRequest).toMatchObject({
 _tag: WS_METHODS.gitCreateWorktree,
 cwd: "/repo/project",
 branch: "main",
 });
 worktreeNewBranch =
 worktreeRequest && typeof worktreeRequest.newBranch === "string"
 ? worktreeRequest.newBranch
 : null;
 },
 { timeout: 8_000, interval: 16 },
 );

 await vi.waitFor(
 () => {
 const threadCreateRequest = findDispatchCommandRequest("thread.create");
 expect(threadCreateRequest).toMatchObject({
 _tag: ORCHESTRATION_WS_METHODS.dispatchCommand,
 command: {
 type: "thread.create",
 threadId: THREAD_ID,
 projectId: PROJECT_ID,
 worktreePath: "/repo/project/.t3/worktrees/browser-test",
 },
 });
 expect(
 threadCreateRequest &&
 typeof threadCreateRequest.command === "object" &&
 threadCreateRequest.command !== null &&
 "branch" in threadCreateRequest.command
 ? threadCreateRequest.command.branch
 : null,
 ).toBe(worktreeNewBranch ?? "t3code/browser-test");
 },
 { timeout: 8_000, interval: 16 },
 );

 expect(
 wsRequests.findIndex((request) => request._tag === WS_METHODS.gitCreateWorktree),
 ).toBeLessThan(
 wsRequests.findIndex(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === "thread.create",
 ),
 );
 } finally {
 await mounted.cleanup();
 }
 });

 it("keeps long proposed plans lightweight until the user expands them", async () => {
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add default new-thread worktree mode with draft defaults#1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

notkainoa
wants to merge
2
commits into

from

 Closed


Add default new-thread worktree mode with draft defaults
#1007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c55c17b

Add default new-thread worktree mode with draft defaults


notkainoa Mar 13, 2026
b145a27

Preserve existing draft thread state when reopening new thread


notkainoa Mar 13, 2026

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


68 changes: 67 additions & 1 deletion
apps/web/src/appSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,78 @@
import { describe, expect, it } from "vitest";
import { beforeEach, describe, expect, it, vi } from "vitest";

import {
 APP_SETTINGS_STORAGE_KEY,
 getAppSettingsSnapshot,
 getAppModelOptions,
 getSlashModelOptions,
 normalizeCustomModelSlugs,
 resolveAppModelSelection,
} from "./appSettings";

function getWindowForTest(): Window & typeof globalThis {
 const testGlobal = globalThis as typeof globalThis & {
 window?: Window & typeof globalThis;
 };
 if (!testGlobal.window) {
 testGlobal.window = {} as Window & typeof globalThis;
 }
 return testGlobal.window;
}

function createStorage(): Storage {
 const values = new Map<string, string>();
 return {
 get length() {
 return values.size;
 },
 clear() {
 values.clear();
 },
 getItem(key) {
 return values.get(key) ?? null;
 },
 key(index) {
 return [...values.keys()][index] ?? null;
 },
 removeItem(key) {
 values.delete(key);
 },
 setItem(key, value) {
 values.set(key, value);
 },
 };
}

beforeEach(() => {
 const testWindow = getWindowForTest();
 Object.defineProperty(testWindow, "localStorage", {
 configurable: true,
 value: createStorage(),
 });
 testWindow.addEventListener = vi.fn();
 testWindow.removeEventListener = vi.fn();
});

describe("getAppSettingsSnapshot", () => {
 it("includes newThreadUsesNewWorktree in the default settings", () => {
 expect(getAppSettingsSnapshot().newThreadUsesNewWorktree).toBe(false);
 });

 it("applies schema defaults when older persisted payloads omit new settings", () => {
 getWindowForTest().localStorage.setItem(
 APP_SETTINGS_STORAGE_KEY,
 JSON.stringify({
 confirmThreadDelete: false,
 }),
 );

 expect(getAppSettingsSnapshot()).toMatchObject({
 confirmThreadDelete: false,
 newThreadUsesNewWorktree: false,
 });
 });
});

describe("normalizeCustomModelSlugs", () => {
 it("normalizes aliases, removes built-ins, and deduplicates values", () => {
 expect(
Expand Down

15 changes: 13 additions & 2 deletions
apps/web/src/appSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { Option, Schema } from "effect";
import { type ProviderKind } from "@t3tools/contracts";
import { getDefaultModel, getModelOptions, normalizeModelSlug } from "@t3tools/shared/model";

const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
export const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
const MAX_CUSTOM_MODEL_COUNT = 32;
export const MAX_CUSTOM_MODEL_LENGTH = 256;
const BUILT_IN_MODEL_SLUGS_BY_PROVIDER: Record<ProviderKind, ReadonlySet<string>> = {
Expand All@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
 enableAssistantStreaming: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 newThreadUsesNewWorktree: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 customCodexModels: Schema.Array(Schema.String).pipe(
 Schema.withConstructorDefault(() => Option.some([])),
 ),
Expand DownExpand Up@@ -174,7 +177,15 @@ function parsePersistedSettings(value: string | null): AppSettings {
 }

 try {
 return normalizeAppSettings(Schema.decodeSync(Schema.fromJsonString(AppSettingsSchema))(value));
 const parsed = JSON.parse(value);
 const persistedSettings =
 parsed && typeof parsed === "object"
 ? Schema.decodeSync(AppSettingsSchema)({
 ...DEFAULT_APP_SETTINGS,
 ...parsed,
 })
 : DEFAULT_APP_SETTINGS;
 return normalizeAppSettings(persistedSettings);
 } catch {
 return DEFAULT_APP_SETTINGS;
 }
Expand Down

170 changes: 161 additions & 9 deletions
apps/web/src/components/ChatView.browser.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,14 +353,14 @@ function createSnapshotWithLongProposedPlan(): OrchestrationReadModel {
 };
}

function resolveWsRpc(tag: string): unknown {
 if (tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
function resolveWsRpc(request: WsRequestEnvelope["body"]): unknown {
 if (request._tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
 return fixture.snapshot;
 }
 if (tag === WS_METHODS.serverGetConfig) {
 if (request._tag === WS_METHODS.serverGetConfig) {
 return fixture.serverConfig;
 }
 if (tag === WS_METHODS.gitListBranches) {
 if (request._tag === WS_METHODS.gitListBranches) {
 return {
 isRepo: true,
 hasOriginRemote: true,
Expand All@@ -374,7 +374,7 @@ function resolveWsRpc(tag: string): unknown {
 ],
 };
 }
 if (tag === WS_METHODS.gitStatus) {
 if (request._tag === WS_METHODS.gitStatus) {
 return {
 branch: "main",
 hasWorkingTreeChanges: false,
Expand All@@ -389,7 +389,18 @@ function resolveWsRpc(tag: string): unknown {
 pr: null,
 };
 }
 if (tag === WS_METHODS.projectsSearchEntries) {
 if (request._tag === WS_METHODS.gitCreateWorktree) {
 return {
 worktree: {
 branch: typeof request.newBranch === "string" ? request.newBranch : "t3code/browser-test",
 path:
 typeof request.path === "string"
 ? request.path
 : "/repo/project/.t3/worktrees/browser-test",
 },
 };
 }
 if (request._tag === WS_METHODS.projectsSearchEntries) {
 return {
 entries: [],
 truncated: false,
Expand DownExpand Up@@ -417,13 +428,12 @@ const worker = setupWorker(
 } catch {
 return;
 }
 const method = request.body?._tag;
 if (typeof method !== "string") return;
 if (typeof request.body?._tag !== "string") return;
 wsRequests.push(request.body);
 client.send(
 JSON.stringify({
 id: request.id,
 result: resolveWsRpc(method),
 result: resolveWsRpc(request.body),
 }),
 );
 });
Expand DownExpand Up@@ -526,6 +536,17 @@ async function waitForInteractionModeButton(
 );
}

function findDispatchCommandRequest(commandType: string) {
 return wsRequests.find(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === commandType,
 );
}

async function waitForImagesToLoad(scope: ParentNode): Promise<void> {
 const images = Array.from(scope.querySelectorAll("img"));
 if (images.length === 0) {
Expand DownExpand Up@@ -1048,6 +1069,137 @@ describe("ChatView timeline estimator parity (full app)", () => {
 }
 });

 it("reopens an existing draft thread without resetting its branch or mode", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const newThreadButton = page.getByTestId("new-thread-button");
 await expect.element(newThreadButton).toBeInTheDocument();
 await newThreadButton.click();

 await waitForURL(
 mounted.router,
 (path) => path === `/${THREAD_ID}`,
 "Existing draft thread should remain selected when reopening it.",
 );

 expect(useComposerDraftStore.getState().getDraftThread(THREAD_ID)).toMatchObject({
 projectId: PROJECT_ID,
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 });
 } finally {
 await mounted.cleanup();
 }
 });

 it("creates the worktree on first send for a pending worktree draft", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "main",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const composerEditor = page.getByTestId("composer-editor");
 await composerEditor.fill("Ship the change");
 await page.getByRole("button", { name: "Send message" }).click();

 let worktreeNewBranch: string | null = null;
 await vi.waitFor(
 () => {
 const worktreeRequest = wsRequests.find(
 (request) => request._tag === WS_METHODS.gitCreateWorktree,
 );
 expect(worktreeRequest).toMatchObject({
 _tag: WS_METHODS.gitCreateWorktree,
 cwd: "/repo/project",
 branch: "main",
 });
 worktreeNewBranch =
 worktreeRequest && typeof worktreeRequest.newBranch === "string"
 ? worktreeRequest.newBranch
 : null;
 },
 { timeout: 8_000, interval: 16 },
 );

 await vi.waitFor(
 () => {
 const threadCreateRequest = findDispatchCommandRequest("thread.create");
 expect(threadCreateRequest).toMatchObject({
 _tag: ORCHESTRATION_WS_METHODS.dispatchCommand,
 command: {
 type: "thread.create",
 threadId: THREAD_ID,
 projectId: PROJECT_ID,
 worktreePath: "/repo/project/.t3/worktrees/browser-test",
 },
 });
 expect(
 threadCreateRequest &&
 typeof threadCreateRequest.command === "object" &&
 threadCreateRequest.command !== null &&
 "branch" in threadCreateRequest.command
 ? threadCreateRequest.command.branch
 : null,
 ).toBe(worktreeNewBranch ?? "t3code/browser-test");
 },
 { timeout: 8_000, interval: 16 },
 );

 expect(
 wsRequests.findIndex((request) => request._tag === WS_METHODS.gitCreateWorktree),
 ).toBeLessThan(
 wsRequests.findIndex(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === "thread.create",
 ),
 );
 } finally {
 await mounted.cleanup();
 }
 });

 it("keeps long proposed plans lightweight until the user expands them", async () => {
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add default new-thread worktree mode with draft defaults#1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

notkainoa
wants to merge
2
commits into

from

 Closed


Add default new-thread worktree mode with draft defaults
#1007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c55c17b

Add default new-thread worktree mode with draft defaults


notkainoa Mar 13, 2026
b145a27

Preserve existing draft thread state when reopening new thread


notkainoa Mar 13, 2026

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


68 changes: 67 additions & 1 deletion
apps/web/src/appSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,78 @@
import { describe, expect, it } from "vitest";
import { beforeEach, describe, expect, it, vi } from "vitest";

import {
 APP_SETTINGS_STORAGE_KEY,
 getAppSettingsSnapshot,
 getAppModelOptions,
 getSlashModelOptions,
 normalizeCustomModelSlugs,
 resolveAppModelSelection,
} from "./appSettings";

function getWindowForTest(): Window & typeof globalThis {
 const testGlobal = globalThis as typeof globalThis & {
 window?: Window & typeof globalThis;
 };
 if (!testGlobal.window) {
 testGlobal.window = {} as Window & typeof globalThis;
 }
 return testGlobal.window;
}

function createStorage(): Storage {
 const values = new Map<string, string>();
 return {
 get length() {
 return values.size;
 },
 clear() {
 values.clear();
 },
 getItem(key) {
 return values.get(key) ?? null;
 },
 key(index) {
 return [...values.keys()][index] ?? null;
 },
 removeItem(key) {
 values.delete(key);
 },
 setItem(key, value) {
 values.set(key, value);
 },
 };
}

beforeEach(() => {
 const testWindow = getWindowForTest();
 Object.defineProperty(testWindow, "localStorage", {
 configurable: true,
 value: createStorage(),
 });
 testWindow.addEventListener = vi.fn();
 testWindow.removeEventListener = vi.fn();
});

describe("getAppSettingsSnapshot", () => {
 it("includes newThreadUsesNewWorktree in the default settings", () => {
 expect(getAppSettingsSnapshot().newThreadUsesNewWorktree).toBe(false);
 });

 it("applies schema defaults when older persisted payloads omit new settings", () => {
 getWindowForTest().localStorage.setItem(
 APP_SETTINGS_STORAGE_KEY,
 JSON.stringify({
 confirmThreadDelete: false,
 }),
 );

 expect(getAppSettingsSnapshot()).toMatchObject({
 confirmThreadDelete: false,
 newThreadUsesNewWorktree: false,
 });
 });
});

describe("normalizeCustomModelSlugs", () => {
 it("normalizes aliases, removes built-ins, and deduplicates values", () => {
 expect(
Expand Down

15 changes: 13 additions & 2 deletions
apps/web/src/appSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { Option, Schema } from "effect";
import { type ProviderKind } from "@t3tools/contracts";
import { getDefaultModel, getModelOptions, normalizeModelSlug } from "@t3tools/shared/model";

const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
export const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
const MAX_CUSTOM_MODEL_COUNT = 32;
export const MAX_CUSTOM_MODEL_LENGTH = 256;
const BUILT_IN_MODEL_SLUGS_BY_PROVIDER: Record<ProviderKind, ReadonlySet<string>> = {
Expand All@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
 enableAssistantStreaming: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 newThreadUsesNewWorktree: Schema.Boolean.pipe(
 Schema.withConstructorDefault(() => Option.some(false)),
 ),
 customCodexModels: Schema.Array(Schema.String).pipe(
 Schema.withConstructorDefault(() => Option.some([])),
 ),
Expand DownExpand Up@@ -174,7 +177,15 @@ function parsePersistedSettings(value: string | null): AppSettings {
 }

 try {
 return normalizeAppSettings(Schema.decodeSync(Schema.fromJsonString(AppSettingsSchema))(value));
 const parsed = JSON.parse(value);
 const persistedSettings =
 parsed && typeof parsed === "object"
 ? Schema.decodeSync(AppSettingsSchema)({
 ...DEFAULT_APP_SETTINGS,
 ...parsed,
 })
 : DEFAULT_APP_SETTINGS;
 return normalizeAppSettings(persistedSettings);
 } catch {
 return DEFAULT_APP_SETTINGS;
 }
Expand Down

170 changes: 161 additions & 9 deletions
apps/web/src/components/ChatView.browser.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,14 +353,14 @@ function createSnapshotWithLongProposedPlan(): OrchestrationReadModel {
 };
}

function resolveWsRpc(tag: string): unknown {
 if (tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
function resolveWsRpc(request: WsRequestEnvelope["body"]): unknown {
 if (request._tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
 return fixture.snapshot;
 }
 if (tag === WS_METHODS.serverGetConfig) {
 if (request._tag === WS_METHODS.serverGetConfig) {
 return fixture.serverConfig;
 }
 if (tag === WS_METHODS.gitListBranches) {
 if (request._tag === WS_METHODS.gitListBranches) {
 return {
 isRepo: true,
 hasOriginRemote: true,
Expand All@@ -374,7 +374,7 @@ function resolveWsRpc(tag: string): unknown {
 ],
 };
 }
 if (tag === WS_METHODS.gitStatus) {
 if (request._tag === WS_METHODS.gitStatus) {
 return {
 branch: "main",
 hasWorkingTreeChanges: false,
Expand All@@ -389,7 +389,18 @@ function resolveWsRpc(tag: string): unknown {
 pr: null,
 };
 }
 if (tag === WS_METHODS.projectsSearchEntries) {
 if (request._tag === WS_METHODS.gitCreateWorktree) {
 return {
 worktree: {
 branch: typeof request.newBranch === "string" ? request.newBranch : "t3code/browser-test",
 path:
 typeof request.path === "string"
 ? request.path
 : "/repo/project/.t3/worktrees/browser-test",
 },
 };
 }
 if (request._tag === WS_METHODS.projectsSearchEntries) {
 return {
 entries: [],
 truncated: false,
Expand DownExpand Up@@ -417,13 +428,12 @@ const worker = setupWorker(
 } catch {
 return;
 }
 const method = request.body?._tag;
 if (typeof method !== "string") return;
 if (typeof request.body?._tag !== "string") return;
 wsRequests.push(request.body);
 client.send(
 JSON.stringify({
 id: request.id,
 result: resolveWsRpc(method),
 result: resolveWsRpc(request.body),
 }),
 );
 });
Expand DownExpand Up@@ -526,6 +536,17 @@ async function waitForInteractionModeButton(
 );
}

function findDispatchCommandRequest(commandType: string) {
 return wsRequests.find(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === commandType,
 );
}

async function waitForImagesToLoad(scope: ParentNode): Promise<void> {
 const images = Array.from(scope.querySelectorAll("img"));
 if (images.length === 0) {
Expand DownExpand Up@@ -1048,6 +1069,137 @@ describe("ChatView timeline estimator parity (full app)", () => {
 }
 });

 it("reopens an existing draft thread without resetting its branch or mode", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const newThreadButton = page.getByTestId("new-thread-button");
 await expect.element(newThreadButton).toBeInTheDocument();
 await newThreadButton.click();

 await waitForURL(
 mounted.router,
 (path) => path === `/${THREAD_ID}`,
 "Existing draft thread should remain selected when reopening it.",
 );

 expect(useComposerDraftStore.getState().getDraftThread(THREAD_ID)).toMatchObject({
 projectId: PROJECT_ID,
 branch: "feature/existing-draft",
 worktreePath: null,
 envMode: "worktree",
 });
 } finally {
 await mounted.cleanup();
 }
 });

 it("creates the worktree on first send for a pending worktree draft", async () => {
 useComposerDraftStore.setState({
 draftThreadsByThreadId: {
 [THREAD_ID]: {
 projectId: PROJECT_ID,
 createdAt: NOW_ISO,
 runtimeMode: "full-access",
 interactionMode: "default",
 branch: "main",
 worktreePath: null,
 envMode: "worktree",
 },
 },
 projectDraftThreadIdByProjectId: {
 [PROJECT_ID]: THREAD_ID,
 },
 });
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
 snapshot: createDraftOnlySnapshot(),
 });

 try {
 const composerEditor = page.getByTestId("composer-editor");
 await composerEditor.fill("Ship the change");
 await page.getByRole("button", { name: "Send message" }).click();

 let worktreeNewBranch: string | null = null;
 await vi.waitFor(
 () => {
 const worktreeRequest = wsRequests.find(
 (request) => request._tag === WS_METHODS.gitCreateWorktree,
 );
 expect(worktreeRequest).toMatchObject({
 _tag: WS_METHODS.gitCreateWorktree,
 cwd: "/repo/project",
 branch: "main",
 });
 worktreeNewBranch =
 worktreeRequest && typeof worktreeRequest.newBranch === "string"
 ? worktreeRequest.newBranch
 : null;
 },
 { timeout: 8_000, interval: 16 },
 );

 await vi.waitFor(
 () => {
 const threadCreateRequest = findDispatchCommandRequest("thread.create");
 expect(threadCreateRequest).toMatchObject({
 _tag: ORCHESTRATION_WS_METHODS.dispatchCommand,
 command: {
 type: "thread.create",
 threadId: THREAD_ID,
 projectId: PROJECT_ID,
 worktreePath: "/repo/project/.t3/worktrees/browser-test",
 },
 });
 expect(
 threadCreateRequest &&
 typeof threadCreateRequest.command === "object" &&
 threadCreateRequest.command !== null &&
 "branch" in threadCreateRequest.command
 ? threadCreateRequest.command.branch
 : null,
 ).toBe(worktreeNewBranch ?? "t3code/browser-test");
 },
 { timeout: 8_000, interval: 16 },
 );

 expect(
 wsRequests.findIndex((request) => request._tag === WS_METHODS.gitCreateWorktree),
 ).toBeLessThan(
 wsRequests.findIndex(
 (request) =>
 request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
 typeof request.command === "object" &&
 request.command !== null &&
 "type" in request.command &&
 request.command.type === "thread.create",
 ),
 );
 } finally {
 await mounted.cleanup();
 }
 });

 it("keeps long proposed plans lightweight until the user expands them", async () => {
 const mounted = await mountChatView({
 viewport: DEFAULT_VIEWPORT,
Expand Down
Loading