lael-labs/t3code

apps/mobile/src/features/threads/ThreadComposer.tsx+8−3

     ? undefined
     : LinearTransition.duration(COMPOSER_TRANSITION_DURATION_MS).reduceMotion(ReduceMotion.System);
+const COMPOSER_ATTACHMENT_ENTERING =
+  Platform.OS === "android"
+    ? FadeIn.duration(160)
+    : FadeIn.delay(COMPOSER_TRANSITION_DURATION_MS).duration(160).reduceMotion(ReduceMotion.System);
 const AnimatedGlassSurface = Animated.createAnimatedComponent(GlassSurface);
 export function ComposerSurface(props: {
                 onPickFiles={props.onPickDraftFiles}
               />
             ) : null}
-            {isExpanded ? (
+            {isExpanded && props.draftAttachments.length > 0 ? (
               <Animated.View
-                className={props.draftAttachments.length > 0 ? "px-[14px] pb-2.5" : undefined}
+                className="px-[14px] pb-2.5"
-                entering={FadeIn.duration(160)}
+                entering={COMPOSER_ATTACHMENT_ENTERING}
                 exiting={FadeOut.duration(120)}
               >
                 <ComposerAttachmentStrip

apps/server/src/cli/project.ts+0−2

 import * as RepositoryIdentityResolver from "../project/RepositoryIdentityResolver.ts";
 import * as ProjectService from "../project/ProjectService.ts";
 import * as T3ProjectFileLoader from "../project/T3ProjectFileLoader.ts";
-import * as ServerRuntimeStartup from "../serverRuntimeStartup.ts";
 import {
   clearPersistedServerRuntimeState,
   readPersistedServerRuntimeState,
           projectId,
           title,
           workspaceRoot,
-          defaultModelSelection: ServerRuntimeStartup.getAutoBootstrapDefaultModelSelection(),
         });
         return `Added project ${projectId} (${title}) at ${workspaceRoot}.`;
       }),

apps/server/src/environment/ServerEnvironment.test.ts+3−1

       expect(withFd.capabilities.serverSelfUpdate).toBe("desktop-managed");
       expect(withFd.capabilities.desktopAppUpdate).toBe(true);
       expect(withFd.capabilities.serverSelfUpdateProgress).toBe(true);
-      expect(withFd.capabilities.serverUpdateThreadContinuation).toBe(true);
+      // v2 recovery terminalizes running runs on restart, so continuation
+      // stays unadvertised until the v2 runtime carries the markers.
+      expect(withFd.capabilities.serverUpdateThreadContinuation).toBeUndefined();
       const withoutFd = yield* describeWith({ mode: "desktop" });
       expect(withoutFd.capabilities.serverSelfUpdate).toBe("desktop-managed");

apps/server/src/environment/ServerEnvironment.ts+5−4

       threadVisitedTracking: true,
       threadPullRequestLinking: true,
       ...(serverSelfUpdate === null ? {} : { serverSelfUpdate }),
+      // Running-thread continuation across a self-update (#9167) marks v1
+      // provider session bindings; the v2 recovery path terminalizes running
+      // runs on restart instead, so the capability stays unadvertised until
+      // ProviderRuntimeRecoveryService grows an equivalent.
       ...(serverSelfUpdate === "boot-service" || desktopAppUpdate
-        ? {
+        ? { serverSelfUpdateProgress: true }
-            serverSelfUpdateProgress: true,
-            serverUpdateThreadContinuation: true,
-          }
         : {}),
       ...(desktopAppUpdate ? { desktopAppUpdate: true } : {}),
     },

apps/server/src/orchestration-v2/ThreadLaunchService.ts+24−8

           .pipe(Effect.mapError(mapError(input, "update-thread", threadId)));
       }
       let startRef = input.workspaceStrategy.baseRef;
-      if (input.workspaceStrategy.startFromOrigin === true) {
+      // "Start from origin" is a stored default; repos without the requested
+      // remote branch fall back to the local base branch.
+      const startFromOrigin =
+        input.workspaceStrategy.startFromOrigin === true &&
+        (yield* git
+          .remoteExists({ cwd: project.workspaceRoot, remoteName: "origin" })
+          .pipe(Effect.mapError(mapError(input, "provision-worktree", threadId))));
+      if (startFromOrigin) {
         yield* git
           .fetchRemote({ cwd: project.workspaceRoot, remoteName: "origin" })
           .pipe(Effect.mapError(mapError(input, "provision-worktree", threadId)));
-        startRef = yield* git
+        const remoteBaseExists = yield* git
-          .resolveRemoteTrackingCommit({
+          .remoteBranchExists({
             cwd: project.workspaceRoot,
             refName: input.workspaceStrategy.baseRef,
-            fallbackRemoteName: "origin",
+            remoteName: "origin",
           })
-          .pipe(
+          .pipe(Effect.mapError(mapError(input, "provision-worktree", threadId)));
-            Effect.map((resolved) => resolved.commitSha),
+        if (remoteBaseExists) {
-            Effect.mapError(mapError(input, "provision-worktree", threadId)),
+          startRef = yield* git
-          );
+            .resolveRemoteTrackingCommit({
+              cwd: project.workspaceRoot,
+              refName: input.workspaceStrategy.baseRef,
+              fallbackRemoteName: "origin",
+            })
+            .pipe(
+              Effect.map((resolved) => resolved.commitSha),
+              Effect.mapError(mapError(input, "provision-worktree", threadId)),
+            );
+        }
       }
       const worktree = yield* git
         .createWorktree({

apps/server/src/orchestration-v2/ThreadSettlementService.ts+12−6

       thread: (typeof candidates)[number],
     ) {
       if (thread.linkedPullRequest != null) {
-        const detail = yield* pullRequests.detail({
+        const summary = yield* pullRequests.summary(
-          projectId: thread.linkedPullRequest.projectId,
+          {
-          repository: thread.linkedPullRequest.repository,
+            projectId: thread.linkedPullRequest.projectId,
-          number: thread.linkedPullRequest.number,
+            repository: thread.linkedPullRequest.repository,
-        });
+            number: thread.linkedPullRequest.number,
-        return { state: detail.state, updatedAt: detail.updatedAt } satisfies SettlementPullRequest;
+          },
+          { recoverTransientFailure: false },
+        );
+        return {
+          state: summary.state,
+          updatedAt: summary.updatedAt,
+        } satisfies SettlementPullRequest;
       }
       if (thread.branch === null) return null;
       const workspaceRoot = workspaceRootByProjectId.get(thread.projectId);

apps/server/src/orchestration/decider.ts+4−1

           projectId: command.projectId,
           title: command.title,
           workspaceRoot: command.workspaceRoot,
-          defaultModelSelection: command.defaultModelSelection ?? null,
+          // Project creation has no user model choice. Older clients sent an
+          // automatic seed here, but only a metadata update records an
+          // explicit project default.
+          defaultModelSelection: null,
           faviconPath: null,
           scripts: command.scripts ?? [],
           createdAt: command.createdAt,

apps/server/src/persistence/Migrations.ts+20−18

@@ -55,15 +55,16 @@ import Migration0040 from "./Migrations/040_ProjectionProjectFaviconPath.ts"; · 54 unmodified lines
55	import Migration0041 from "./Migrations/041_AuthSessionClientConnection.ts";	55	import Migration0041 from "./Migrations/041_AuthSessionClientConnection.ts";
56	import Migration0042 from "./Migrations/042_ProjectionThreadLinkedPullRequest.ts";	56	import Migration0042 from "./Migrations/042_ProjectionThreadLinkedPullRequest.ts";
57	import Migration0043 from "./Migrations/043_ProjectionThreadsUnsettledAt.ts";	57	import Migration0043 from "./Migrations/043_ProjectionThreadsUnsettledAt.ts";
58	import Migration0044 from "./Migrations/044_OrchestrationV2.ts";	58	import Migration0044 from "./Migrations/044_ClearAutomaticProjectModelDefaults.ts";
59	import Migration0045 from "./Migrations/045_OrchestrationV2Subagents.ts";	59	import Migration0045 from "./Migrations/045_OrchestrationV2.ts";
60	import Migration0046 from "./Migrations/046_OrchestrationV2Foundation.ts";	60	import Migration0046 from "./Migrations/046_OrchestrationV2Subagents.ts";
61	import Migration0047 from "./Migrations/047_OrchestrationV2ProviderSessionBindings.ts";	61	import Migration0047 from "./Migrations/047_OrchestrationV2Foundation.ts";
62	import Migration0048 from "./Migrations/048_OrchestrationV2ThreadLaunchWorkflows.ts";	62	import Migration0048 from "./Migrations/048_OrchestrationV2ProviderSessionBindings.ts";
63	import Migration0049 from "./Migrations/049_ApplicationEventSource.ts";	63	import Migration0049 from "./Migrations/049_OrchestrationV2ThreadLaunchWorkflows.ts";
64	import Migration0050 from "./Migrations/050_OrchestrationV2EffectCancellation.ts";	64	import Migration0050 from "./Migrations/050_ApplicationEventSource.ts";
65	import Migration0051 from "./Migrations/051_ScheduledTasks.ts";	65	import Migration0051 from "./Migrations/051_OrchestrationV2EffectCancellation.ts";
66	import Migration0052 from "./Migrations/052_LegacyV1ImportState.ts";	66	import Migration0052 from "./Migrations/052_ScheduledTasks.ts";
		67	import Migration0053 from "./Migrations/053_LegacyV1ImportState.ts";
67		68
68	/**	69	/**
69	* Migration loader with all migrations defined inline.	70	* Migration loader with all migrations defined inline.
@@ -119,15 +120,16 @@ export const migrationEntries = [ · 49 unmodified lines
119	[41, "AuthSessionClientConnection", Migration0041],	120	[41, "AuthSessionClientConnection", Migration0041],
120	[42, "ProjectionThreadLinkedPullRequest", Migration0042],	121	[42, "ProjectionThreadLinkedPullRequest", Migration0042],
121	[43, "ProjectionThreadsUnsettledAt", Migration0043],	122	[43, "ProjectionThreadsUnsettledAt", Migration0043],
122	[44, "OrchestrationV2", Migration0044],	123	[44, "ClearAutomaticProjectModelDefaults", Migration0044],
123	[45, "OrchestrationV2Subagents", Migration0045],	124	[45, "OrchestrationV2", Migration0045],
124	[46, "OrchestrationV2Foundation", Migration0046],	125	[46, "OrchestrationV2Subagents", Migration0046],
125	[47, "OrchestrationV2ProviderSessionBindings", Migration0047],	126	[47, "OrchestrationV2Foundation", Migration0047],
126	[48, "OrchestrationV2ThreadLaunchWorkflows", Migration0048],	127	[48, "OrchestrationV2ProviderSessionBindings", Migration0048],
127	[49, "ApplicationEventSource", Migration0049],	128	[49, "OrchestrationV2ThreadLaunchWorkflows", Migration0049],
128	[50, "OrchestrationV2EffectCancellation", Migration0050],	129	[50, "ApplicationEventSource", Migration0050],
129	[51, "ScheduledTasks", Migration0051],	130	[51, "OrchestrationV2EffectCancellation", Migration0051],
130	[52, "LegacyV1ImportState", Migration0052],	131	[52, "ScheduledTasks", Migration0052],
		132	[53, "LegacyV1ImportState", Migration0053],
131	] as const;	133	] as const;
132		134
133	export const migrationManifest = migrationEntries.map(([id, name]) => [id, name] as const);	135	export const migrationManifest = migrationEntries.map(([id, name]) => [id, name] as const);

apps/server/src/persistence/Migrations/045_046_OrchestrationV2.test.tsrenamed from apps/server/src/persistence/Migrations/044_045_OrchestrationV2.test.ts+27−26

 const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
-layer("038_039_OrchestrationV2", (it) => {
+layer("045_046_OrchestrationV2", (it) => {
   it.effect("keeps released and private migration ids contiguous", () =>
     Effect.sync(() => {
       assert.deepStrictEqual(
         migrationEntries.map(([id]) => id),
-        Array.from({ length: 52 }, (_, index) => index + 1),
+        Array.from({ length: 53 }, (_, index) => index + 1),
       );
     }),
   );
     Effect.gen(function* () {
       const sql = yield* SqlClient.SqlClient;
-      yield* runMigrations({ toMigrationInclusive: 45 });
+      yield* runMigrations({ toMigrationInclusive: 46 });
       const migrations = yield* sql<{
         readonly migration_id: number;
       }>`
         SELECT migration_id, name
         FROM effect_sql_migrations
-        WHERE migration_id IN (42, 43, 44, 45)
+        WHERE migration_id IN (43, 44, 45, 46)
         ORDER BY migration_id
       `;
       assert.deepStrictEqual(migrations, [
-        {
-          migration_id: 42,
-          name: "ProjectionThreadLinkedPullRequest",
-        },
         {
           migration_id: 43,
           name: "ProjectionThreadsUnsettledAt",
         },
         {
           migration_id: 44,
-          name: "OrchestrationV2",
+          name: "ClearAutomaticProjectModelDefaults",
         },
         {
           migration_id: 45,
+          name: "OrchestrationV2",
+        },
+        {
+          migration_id: 46,
           name: "OrchestrationV2Subagents",
         },
       ]);
     }),
   );
-  it.effect("backfills provider-session thread bindings in migration 047", () =>
+  it.effect("backfills provider-session thread bindings in migration 048", () =>
     Effect.gen(function* () {
       const sql = yield* SqlClient.SqlClient;
-      yield* runMigrations({ toMigrationInclusive: 46 });
+      yield* runMigrations({ toMigrationInclusive: 47 });
       yield* sql`
         INSERT INTO orchestration_v2_projection_provider_sessions (
           provider_session_id,
         )
       `;
-      yield* runMigrations({ toMigrationInclusive: 47 });
+      yield* runMigrations({ toMigrationInclusive: 48 });
       const bindings = yield* sql<{
         readonly provider_session_id: string;
     }),
   );
-  it.effect("preserves turn items with colliding ordinals in migration 046", () =>
+  it.effect("preserves turn items with colliding ordinals in migration 047", () =>
     Effect.gen(function* () {
       const sql = yield* SqlClient.SqlClient;
-      yield* runMigrations({ toMigrationInclusive: 45 });
+      yield* runMigrations({ toMigrationInclusive: 46 });
       yield* sql`
         INSERT INTO orchestration_v2_projection_runs (
           run_id,
           ('turn-item:d', 'thread:two', NULL, 42, 'assistant_message', 'completed', '2026-01-01T00:00:00.000Z', '{}')
       `;
-      yield* runMigrations({ toMigrationInclusive: 46 });
+      yield* runMigrations({ toMigrationInclusive: 47 });
       const positions = yield* sql<{
         readonly thread_id: string;
     assert.ok(snoozeColumns.some((column) => column.name === "snoozed_until"));
     assert.ok(snoozeColumns.some((column) => column.name === "snoozed_at"));
-    yield* runMigrations({ toMigrationInclusive: 52 });
+    yield* runMigrations({ toMigrationInclusive: 53 });
     const migrations = yield* sql<{
       readonly migration_id: number;
     }>`
       SELECT migration_id, name
       FROM effect_sql_migrations
-      WHERE migration_id BETWEEN 39 AND 52
+      WHERE migration_id BETWEEN 39 AND 53
       ORDER BY migration_id
     `;
     assert.deepStrictEqual(
         [41, "AuthSessionClientConnection"],
         [42, "ProjectionThreadLinkedPullRequest"],
         [43, "ProjectionThreadsUnsettledAt"],
-        [44, "OrchestrationV2"],
+        [44, "ClearAutomaticProjectModelDefaults"],
-        [45, "OrchestrationV2Subagents"],
+        [45, "OrchestrationV2"],
-        [46, "OrchestrationV2Foundation"],
+        [46, "OrchestrationV2Subagents"],
-        [47, "OrchestrationV2ProviderSessionBindings"],
+        [47, "OrchestrationV2Foundation"],
-        [48, "OrchestrationV2ThreadLaunchWorkflows"],
+        [48, "OrchestrationV2ProviderSessionBindings"],
-        [49, "ApplicationEventSource"],
+        [49, "OrchestrationV2ThreadLaunchWorkflows"],
-        [50, "OrchestrationV2EffectCancellation"],
+        [50, "ApplicationEventSource"],
-        [51, "ScheduledTasks"],
+        [51, "OrchestrationV2EffectCancellation"],
-        [52, "LegacyV1ImportState"],
+        [52, "ScheduledTasks"],
+        [53, "LegacyV1ImportState"],
       ],
     );

apps/server/src/persistence/Migrations/045_OrchestrationV2.tsrenamed from apps/server/src/persistence/Migrations/044_OrchestrationV2.ts+0−0

File renamed without changes.

apps/server/src/persistence/Migrations/046_OrchestrationV2Subagents.tsrenamed from apps/server/src/persistence/Migrations/045_OrchestrationV2Subagents.ts+0−0

File renamed without changes.

apps/server/src/persistence/Migrations/047_OrchestrationV2Foundation.test.tsrenamed from apps/server/src/persistence/Migrations/046_OrchestrationV2Foundation.test.ts+2−2

@@ -8,7 +8,7 @@ import * as NodeSqliteClient from "../NodeSqliteClient.ts"; · 7 unmodified lines
8	it.effect("backfills the V2 event driver from payload before the legacy provider column", () =>	8	it.effect("backfills the V2 event driver from payload before the legacy provider column", () =>
9	Effect.gen(function* () {	9	Effect.gen(function* () {
10	const sql = yield* SqlClient.SqlClient;	10	const sql = yield* SqlClient.SqlClient;
11	yield* runMigrations({ toMigrationInclusive: 45 });	11	yield* runMigrations({ toMigrationInclusive: 46 });
12		12
13	yield* sql`	13	yield* sql`
14	INSERT INTO orchestration_v2_events (	14	INSERT INTO orchestration_v2_events (
@@ -37,7 +37,7 @@ it.effect("backfills the V2 event driver from payload before the legacy provider · 22 unmodified lines
37	)	37	)
38	`;	38	`;
39		39
40	yield* runMigrations({ toMigrationInclusive: 46 });	40	yield* runMigrations({ toMigrationInclusive: 47 });
41		41
42	const events = yield* sql<{	42	const events = yield* sql<{
43	readonly event_id: string;	43	readonly event_id: string;

apps/server/src/persistence/Migrations/047_OrchestrationV2Foundation.tsrenamed from apps/server/src/persistence/Migrations/046_OrchestrationV2Foundation.ts+0−0

File renamed without changes.

apps/server/src/persistence/Migrations/048_OrchestrationV2ProviderSessionBindings.tsrenamed from apps/server/src/persistence/Migrations/047_OrchestrationV2ProviderSessionBindings.ts+0−0

File renamed without changes.

apps/server/src/persistence/Migrations/049_OrchestrationV2ThreadLaunchWorkflows.tsrenamed from apps/server/src/persistence/Migrations/048_OrchestrationV2ThreadLaunchWorkflows.ts+0−0

File renamed without changes.

apps/server/src/persistence/Migrations/050_ApplicationEventSource.test.tsrenamed from apps/server/src/persistence/Migrations/049_ApplicationEventSource.test.ts+3−3

@@ -8,11 +8,11 @@ import * as NodeSqliteClient from "../NodeSqliteClient.ts"; · 7 unmodified lines
8		8
9	const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));	9	const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
10		10
11	layer("043_ApplicationEventSource", (it) => {	11	layer("050_ApplicationEventSource", (it) => {
12	it.effect("moves V2 events and current project state behind one global sequence", () =>	12	it.effect("moves V2 events and current project state behind one global sequence", () =>
13	Effect.gen(function* () {	13	Effect.gen(function* () {
14	const sql = yield* SqlClient.SqlClient;	14	const sql = yield* SqlClient.SqlClient;
15	yield* runMigrations({ toMigrationInclusive: 48 });	15	yield* runMigrations({ toMigrationInclusive: 49 });
16		16
17	yield* sql`	17	yield* sql`
18	INSERT INTO orchestration_v2_events (	18	INSERT INTO orchestration_v2_events (
@@ -84,7 +84,7 @@ layer("043_ApplicationEventSource", (it) => { · 65 unmodified lines
84	)	84	)
85	`;	85	`;
86		86
87	yield* runMigrations({ toMigrationInclusive: 49 });	87	yield* runMigrations({ toMigrationInclusive: 50 });
88		88
89	const events = yield* sql<{	89	const events = yield* sql<{
90	readonly sequence: number;	90	readonly sequence: number;

apps/server/src/persistence/Migrations/050_ApplicationEventSource.tsrenamed from apps/server/src/persistence/Migrations/049_ApplicationEventSource.ts+0−0

File renamed without changes.

apps/server/src/persistence/Migrations/051_OrchestrationV2EffectCancellation.test.tsrenamed from apps/server/src/persistence/Migrations/050_OrchestrationV2EffectCancellation.test.ts+3−3

@@ -8,11 +8,11 @@ import * as NodeSqliteClient from "../NodeSqliteClient.ts"; · 7 unmodified lines
8		8
9	const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));	9	const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
10		10
11	layer("050_OrchestrationV2EffectCancellation", (it) => {	11	layer("051_OrchestrationV2EffectCancellation", (it) => {
12	it.effect("preserves existing effects and adds the cancelled terminal status", () =>	12	it.effect("preserves existing effects and adds the cancelled terminal status", () =>
13	Effect.gen(function* () {	13	Effect.gen(function* () {
14	const sql = yield* SqlClient.SqlClient;	14	const sql = yield* SqlClient.SqlClient;
15	yield* runMigrations({ toMigrationInclusive: 49 });	15	yield* runMigrations({ toMigrationInclusive: 50 });
16	yield* sql`	16	yield* sql`
17	INSERT INTO orchestration_v2_effect_outbox (	17	INSERT INTO orchestration_v2_effect_outbox (
18	effect_id,	18	effect_id,
@@ -47,7 +47,7 @@ layer("050_OrchestrationV2EffectCancellation", (it) => { · 28 unmodified lines
47	)	47	)
48	`;	48	`;
49		49
50	yield* runMigrations({ toMigrationInclusive: 50 });	50	yield* runMigrations({ toMigrationInclusive: 51 });
51	yield* sql`	51	yield* sql`
52	UPDATE orchestration_v2_effect_outbox	52	UPDATE orchestration_v2_effect_outbox
53	SET	53	SET

apps/server/src/persistence/Migrations/051_OrchestrationV2EffectCancellation.tsrenamed from apps/server/src/persistence/Migrations/050_OrchestrationV2EffectCancellation.ts+0−0

File renamed without changes.

apps/server/src/persistence/Migrations/052_ScheduledTasks.tsrenamed from apps/server/src/persistence/Migrations/051_ScheduledTasks.ts+0−0

File renamed without changes.

apps/server/src/persistence/Migrations/053_LegacyV1ImportState.tsrenamed from apps/server/src/persistence/Migrations/052_LegacyV1ImportState.ts+0−0

File renamed without changes.

apps/server/src/provider/Drivers/ClaudeDriver.ts+12−0

   type ProviderSnapshotSettings,
 } from "../providerUpdateSettings.ts";
 import { makeClaudeCapabilitiesCacheKey, makeClaudeContinuationGroupKey } from "./ClaudeHome.ts";
+import { discoverClaudeSkills } from "./ClaudeSkills.ts";
 const decodeClaudeSettings = Schema.decodeSync(ClaudeSettings);
 const DRIVER_KIND = ProviderDriverKind.make("claudeAgent");
         accentColor,
         enabled,
         snapshot,
+        snapshotForCwd: (cwd: string) =>
+          !effectiveConfig.enabled
+            ? snapshot.getSnapshot
+            : Effect.all([
+                snapshot.getSnapshot,
+                discoverClaudeSkills(effectiveConfig, cwd, processEnv),
+              ]).pipe(
+                Effect.map(([machineSnapshot, skills]) => ({ ...machineSnapshot, skills })),
+                Effect.provideService(FileSystem.FileSystem, fileSystem),
+                Effect.provideService(Path.Path, path),
+              ),
         orchestrationAdapter,
         textGeneration,
       } satisfies ProviderInstance;

apps/server/src/serverRuntimeStartup.test.ts+1−1

@@ -10,7 +10,7 @@ import * as ServerConfig from "./config.ts"; · 9 unmodified lines
10	import * as ServerRuntimeStartup from "./serverRuntimeStartup.ts";	10	import * as ServerRuntimeStartup from "./serverRuntimeStartup.ts";
11		11
12	it("uses the canonical Codex model for auto-bootstrap", () => {	12	it("uses the canonical Codex model for auto-bootstrap", () => {
13	assert.deepEqual(ServerRuntimeStartup.getAutoBootstrapDefaultModelSelection(), {	13	assert.deepEqual(ServerRuntimeStartup.getAutoBootstrapThreadModelSelection(), {
14	instanceId: ProviderInstanceId.make("codex"),	14	instanceId: ProviderInstanceId.make("codex"),
15	model: DEFAULT_MODEL,	15	model: DEFAULT_MODEL,
16	});	16	});

apps/server/src/serverRuntimeStartup.ts+5−4

   Effect.asVoid,
 );
-export const getAutoBootstrapDefaultModelSelection = (): ModelSelection => ({
+export const getAutoBootstrapThreadModelSelection = (): ModelSelection => ({
   instanceId: ProviderInstanceId.make("codex"),
   model: DEFAULT_MODEL,
 });
   let bootstrapThreadId: ThreadId | undefined;
   if (serverConfig.autoBootstrapProjectFromCwd) {
-    const defaultModelSelection = getAutoBootstrapDefaultModelSelection();
+    // Project creation has no user model choice; only the bootstrap thread
+    // gets an automatic selection, and an explicit project default wins.
+    const threadModelSelection = getAutoBootstrapThreadModelSelection();
     const { project } = yield* projects.bootstrap({
       commandId: CommandId.make(yield* randomUUID),
       projectId: ProjectId.make(yield* randomUUID),
       title: path.basename(serverConfig.cwd) || "project",
       workspaceRoot: serverConfig.cwd,
-      defaultModelSelection,
     });
     const shell = yield* threads.getShellSnapshot();
     const existingThread = shell.threads.find(
         commandId: CommandId.make(yield* randomUUID),
         projectId: project.id,
         title: "New thread",
-        modelSelection: project.defaultModelSelection ?? defaultModelSelection,
+        modelSelection: project.defaultModelSelection ?? threadModelSelection,
         interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
         runtimeMode: "full-access",
         workspaceStrategy: { type: "root" },

apps/server/src/ws.ts+4−2

 import * as GitVcsDriver from "./vcs/GitVcsDriver.ts";
 import * as VcsDriverRegistry from "./vcs/VcsDriverRegistry.ts";
 import * as VcsProjectConfig from "./vcs/VcsProjectConfig.ts";
-import * as VcsProcess from "./vcs/VcsProcess.ts";
 import * as PairingGrantStore from "./auth/PairingGrantStore.ts";
 import * as SessionStore from "./auth/SessionStore.ts";
 import { failEnvironmentAuthInvalid, failEnvironmentInternal } from "./auth/http.ts";
           observeRpcEffect(WS_METHODS.pullRequestsListStats, pullRequests.listStats(input), {
             "rpc.aggregate": "pull-requests",
           }),
+        [WS_METHODS.pullRequestsSummary]: (input) =>
+          observeRpcEffect(WS_METHODS.pullRequestsSummary, pullRequests.summary(input), {
+            "rpc.aggregate": "pull-requests",
+          }),
         [WS_METHODS.pullRequestsDetail]: (input) =>
           observeRpcEffect(WS_METHODS.pullRequestsDetail, pullRequests.detail(input), {
             "rpc.aggregate": "pull-requests",
                       ),
                     ),
                   ),
-                  Layer.provide(VcsProcess.layer),
                 ),
               ),
             ),

apps/web/src/components/ChatView.tsx+4−0

   resolveServerSelfUpdateCapability,
   serverUpdateGuidance,
   supportsDesktopAppUpdate,
+  supportsServerUpdateThreadContinuation,
 } from "../versionSkew";
 import { useAssetUrls } from "../assets/assetUrls";
 import type { CodexArtifactTemplate } from "@t3tools/client-runtime/codex-artifact-templates";
   const serverUpdateEnvironmentId = activeThread?.environmentId ?? null;
   const versionMismatchSelfUpdate = resolveServerSelfUpdateCapability(serverConfig);
   const versionMismatchDesktopAppUpdate = supportsDesktopAppUpdate(serverConfig);
+  const versionMismatchThreadContinuation = supportsServerUpdateThreadContinuation(serverConfig);
   const serverUpdateState = useAtomValue(
     serverEnvironment.updateStateAtom(serverUpdateEnvironmentId),
   );
               serverLabel={versionMismatchServerLabel}
               selfUpdate={versionMismatchSelfUpdate}
               desktopAppUpdate={versionMismatchDesktopAppUpdate}
+              threadContinuation={versionMismatchThreadContinuation}
               targetVersion={versionMismatch.clientVersion}
               label={updateFailed ? "Retry" : "Update"}
               variant="ghost"
     serverUpdateEnvironmentId,
     versionMismatchSelfUpdate,
     versionMismatchDesktopAppUpdate,
+    versionMismatchThreadContinuation,
     versionMismatchServerLabel,
   ]);
   const providerStatuses = serverConfig?.providers ?? EMPTY_PROVIDERS;

apps/web/src/components/chat/ChatComposer.tsx+3−1

                   ) : null}
                   <ComposerFooterPrimaryActions
                     compact={isComposerPrimaryActionsCompact}
-                    activeContextWindow={activeContextWindow}
+                    activeContextWindow={
+                      settings.contextWindowMeterEnabled ? activeContextWindow : null
+                    }
                     activeThreadModelDisplayName={activeThreadModelDisplayName}
                     pendingAction={pendingPrimaryAction}
                     isRunning={phase === "running"}

apps/web/src/components/settings/ProviderInstanceCard.tsx+280−288

@@ -5,6 +5,8 @@ import { · 4 unmodified lines
5	CopyIcon,	5	CopyIcon,
6	DownloadIcon,	6	DownloadIcon,
7	LoaderIcon,	7	LoaderIcon,
		8	LockIcon,
		9	LockOpenIcon,
8	PlusIcon,	10	PlusIcon,
9	Trash2Icon,	11	Trash2Icon,
10	XIcon,	12	XIcon,
@@ -33,12 +35,10 @@ import { useCopyToClipboard } from "../../hooks/useCopyToClipboard"; · 22 unmodified lines
33	import { normalizeProviderAccentColor } from "../../providerInstances";	35	import { normalizeProviderAccentColor } from "../../providerInstances";
34	import { Badge } from "../ui/badge";	36	import { Badge } from "../ui/badge";
35	import { Button } from "../ui/button";	37	import { Button } from "../ui/button";
36	import { Checkbox } from "../ui/checkbox";
37	import { DraftInput } from "../ui/draft-input";	38	import { DraftInput } from "../ui/draft-input";
38	import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";	39	import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";
39	import { ScrollArea } from "../ui/scroll-area";	40	import { ScrollArea } from "../ui/scroll-area";
40	import { Switch } from "../ui/switch";	41	import { Switch } from "../ui/switch";
41	import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "../ui/table";
42	import { stackedThreadToast, toastManager } from "../ui/toast";	42	import { stackedThreadToast, toastManager } from "../ui/toast";
43	import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";	43	import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
44	import type { DriverOption, ProviderEnvironmentFieldDefinition } from "./providerDriverMeta";	44	import type { DriverOption, ProviderEnvironmentFieldDefinition } from "./providerDriverMeta";
@@ -58,6 +58,13 @@ import { · 13 unmodified lines
58		58
59	const ENVIRONMENT_VARIABLE_NAME_PATTERN = /^[a-zA-Z_][a-zA-Z0-9_]*$/;	59	const ENVIRONMENT_VARIABLE_NAME_PATTERN = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
60		60
		61	/** Label-left field grid for the Configuration tab: one row per field. */
		62	const PROVIDER_FIELD_GRID_CLASS_NAME =
		63	"grid gap-x-4 gap-y-2.5 sm:grid-cols-[8rem_minmax(0,1fr)] sm:items-start";
		64	/** Full-width divider row that names the group of fields below it. */
		65	const PROVIDER_FIELD_GROUP_LABEL_CLASS_NAME =
		66	"col-span-full mt-1 border-t border-border/60 pt-2.5 text-[11px] text-muted-foreground";
		67
61	let environmentVariableDraftId = 0;	68	let environmentVariableDraftId = 0;
62	const nextEnvironmentVariableDraftId = () => `provider-env-${environmentVariableDraftId++}`;	69	const nextEnvironmentVariableDraftId = () => `provider-env-${environmentVariableDraftId++}`;
63		70
@@ -130,6 +137,43 @@ function nextConfigBlobWithValue( · 66 unmodified lines
130	return base;	137	return base;
131	}	138	}
132		139
		140	export function deriveProviderModelsForDisplay(input: {
		141	readonly liveModels: ReadonlyArray<ServerProviderModel> \| undefined;
		142	readonly customModels: ReadonlyArray<string>;
		143	}): ReadonlyArray<ServerProviderModel> {
		144	const liveCustomModelsBySlug = new Map(
		145	Arr.filterMap(input.liveModels ?? [], (model) =>
		146	model.isCustom ? Result.succeed([model.slug, model] as const) : Result.failVoid,
		147	),
		148	);
		149	const serverModels = input.liveModels?.filter((model) => !model.isCustom) ?? [];
		150	const customModels = input.customModels.map(
		151	(slug) =>
		152	liveCustomModelsBySlug.get(slug) ?? {
		153	slug,
		154	name: slug,
		155	isCustom: true,
		156	capabilities: null,
		157	},
		158	);
		159	return [...serverModels, ...customModels];
		160	}
		161
		162	function ProviderAuthEmail(props: { readonly email: string \| undefined }) {
		163	const email = props.email?.trim();
		164	if (!email) return null;
		165
		166	return (
		167	<RedactedSensitiveText
		168	value={email}
		169	ariaLabel="Toggle account email visibility"
		170	revealTooltip="Click to reveal email"
		171	hideTooltip="Click to hide email"
		172	className="max-w-full truncate"
		173	/>
		174	);
		175	}
		176
133	export function readProviderEnvironmentVariable(	177	export function readProviderEnvironmentVariable(
134	environment: ReadonlyArray<ProviderInstanceEnvironmentVariable> \| undefined,	178	environment: ReadonlyArray<ProviderInstanceEnvironmentVariable> \| undefined,
135	name: string,	179	name: string,
@@ -179,38 +223,50 @@ export function nextProviderEnvironmentWithFieldValue( · 43 unmodified lines
179	return next;	223	return next;
180	}	224	}
181		225
182	export function deriveProviderModelsForDisplay(input: {	226	function ProviderEnvironmentFieldRow(props: {
183	readonly liveModels: ReadonlyArray<ServerProviderModel> \| undefined;	227	readonly field: ProviderEnvironmentFieldDefinition;
184	readonly customModels: ReadonlyArray<CustomModelDefinition>;	228	readonly variable: ProviderInstanceEnvironmentVariable \| undefined;
185	}): ReadonlyArray<ServerProviderModel> {	229	readonly idPrefix: string;
186	const liveCustomModelsBySlug = new Map(	230	readonly onCommit: (field: ProviderEnvironmentFieldDefinition, value: string) => void;
187	Arr.filterMap(input.liveModels ?? [], (model) =>	231	readonly onRemove: (field: ProviderEnvironmentFieldDefinition) => void;
188	model.isCustom ? Result.succeed([model.slug, model] as const) : Result.failVoid,	232	}) {
189	),	233	const inputId = `${props.idPrefix}-environment-${props.field.name}`;
190	);	234	const value = props.variable?.valueRedacted ? "" : (props.variable?.value ?? "");
191	const serverModels = input.liveModels?.filter((model) => !model.isCustom) ?? [];	235	const placeholder = props.variable?.valueRedacted
192	const customModels = input.customModels.map((entry) => ({	236	? "Stored secret - enter a new value to replace"
193	slug: entry.slug,	237	: props.field.placeholder;
194	name: entry.name,
195	isCustom: true,
196	capabilities:
197	entry.capabilities ?? liveCustomModelsBySlug.get(entry.slug)?.capabilities ?? null,
198	}));
199	return [...serverModels, ...customModels];
200	}
201
202	function ProviderAuthEmail(props: { readonly email: string \| undefined }) {
203	const email = props.email?.trim();
204	if (!email) return null;
205		238
206	return (	239	return (
207	<RedactedSensitiveText	240	<label htmlFor={inputId} className="block">
208	value={email}	241	<span className="text-xs font-medium text-foreground">{props.field.label}</span>
209	ariaLabel="Toggle account email visibility"	242	<div className="mt-1.5 flex min-w-0 items-center gap-2">
210	revealTooltip="Click to reveal email"	243	<DraftInput
211	hideTooltip="Click to hide email"	244	id={inputId}
212	className="max-w-full truncate"	245	className="min-w-0 flex-1"
213	/>	246	type={props.field.sensitive === false ? undefined : "password"}
		247	autoComplete="off"
		248	value={value}
		249	onCommit={(next) => props.onCommit(props.field, next)}
		250	placeholder={placeholder}
		251	spellCheck={false}
		252	/>
		253	{props.variable ? (
		254	<Button
		255	type="button"
		256	size="icon-sm"
		257	variant="ghost"
		258	className="size-8 shrink-0 text-muted-foreground hover:text-destructive"
		259	onClick={() => props.onRemove(props.field)}
		260	aria-label={`Clear ${props.field.label}`}
		261	>
		262	<XIcon className="size-3.5" />
		263	</Button>
		264	) : null}
		265	</div>
		266	{props.field.description ? (
		267	<span className="mt-1 block text-xs text-muted-foreground">{props.field.description}</span>
		268	) : null}
		269	</label>
214	);	270	);
215	}	271	}
216		272
@@ -284,166 +340,105 @@ function ProviderEnvironmentSection(props: { · 67 unmodified lines
284	publishRows(nextRows);	340	publishRows(nextRows);
285	};	341	};
286		342
287	return (	343	const addVariable = () =>
288	<div className="grid gap-2">	344	setRows([
289	<div className="flex items-center justify-between gap-3">	345	...rows,
290	<span className="text-xs font-medium text-foreground">Environment variables</span>	346	{
291	<Button	347	id: nextEnvironmentVariableDraftId(),
292	type="button"	348	name: "",
293	size="sm"	349	value: "",
294	variant="outline"	350	sensitive: true,
295	className="h-7 gap-1.5 px-2 text-xs"	351	},
296	onClick={() =>	352	]);
297	setRows([
298	...rows,
299	{
300	id: nextEnvironmentVariableDraftId(),
301	name: "",
302	value: "",
303	sensitive: true,
304	},
305	])
306	}
307	>
308	<PlusIcon className="size-3" />
309	Add
310	</Button>
311	</div>
312	{rows.length === 0 ? (
313	<p className="text-xs text-muted-foreground">
314	Add variables to pass API keys, base URLs, or other per-instance CLI settings.
315	</p>
316	) : (
317	<div className="overflow-hidden rounded-md border border-border/70">
318	<Table>
319	<TableHeader className="bg-muted/25 text-[11px] text-muted-foreground">
320	<TableRow className="hover:bg-transparent">
321	<TableHead>Variable</TableHead>
322	<TableHead>Value</TableHead>
323	<TableHead className="w-20">Sensitive</TableHead>
324	<TableHead className="w-12 text-right">
325	<span className="sr-only">Options</span>
326	</TableHead>
327	</TableRow>
328	</TableHeader>
329	<TableBody>
330	{rows.map((variable, index) => (
331	<TableRow
332	key={variable.id}
333	className="border-border/60 odd:bg-muted/20 even:bg-background/20"
334	>
335	<TableCell>
336	<DraftInput
337	value={variable.name}
338	onCommit={(name) => updateVariable(variable.id, { name: name.trim() })}
339	placeholder="VARIABLE_NAME"
340	spellCheck={false}
341	aria-label={`Environment variable name ${index + 1}`}
342	/>
343	</TableCell>
344	<TableCell>
345	<DraftInput
346	value={variable.valueRedacted ? "" : variable.value}
347	onCommit={(value) => updateVariable(variable.id, { value })}
348	type={variable.sensitive ? "password" : undefined}
349	autoComplete="off"
350	placeholder={
351	variable.valueRedacted
352	? "Stored secret - enter a new value to replace"
353	: "Value"
354	}
355	spellCheck={false}
356	aria-label={`Environment variable value ${index + 1}`}
357	/>
358	</TableCell>
359	<TableCell className="w-20">
360	<div className="flex h-8 items-center justify-center">
361	<Checkbox
362	checked={variable.sensitive}
363	onCheckedChange={(checked) => {
364	const sensitive = Boolean(checked);
365	updateVariable(variable.id, {
366	sensitive,
367	...(sensitive && variable.valueRedacted === undefined
368	? {}
369	: { valueRedacted: sensitive ? variable.valueRedacted : false }),
370	});
371	}}
372	aria-label={`Mark environment variable ${variable.name \|\| index + 1} as sensitive`}
373	/>
374	</div>
375	</TableCell>
376	<TableCell className="w-12">
377	<div className="flex justify-end">
378	<Button
379	type="button"
380	size="icon-sm"
381	variant="ghost"
382	className="size-8 text-muted-foreground hover:text-destructive"
383	onClick={() => removeVariable(variable.id)}
384	aria-label={`Remove environment variable ${variable.name \|\| index + 1}`}
385	>
386	<XIcon className="size-3.5" />
387	</Button>
388	</div>
389	</TableCell>
390	</TableRow>
391	))}
392	</TableBody>
393	</Table>
394	</div>
395	)}
396	<span className="text-xs text-muted-foreground">
397	Sensitive values are stored separately and are not returned to the app after saving.
398	</span>
399	</div>
400	);
401	}
402
403	function ProviderEnvironmentFieldRow(props: {
404	readonly field: ProviderEnvironmentFieldDefinition;
405	readonly variable: ProviderInstanceEnvironmentVariable \| undefined;
406	readonly idPrefix: string;
407	readonly onCommit: (field: ProviderEnvironmentFieldDefinition, value: string) => void;
408	readonly onRemove: (field: ProviderEnvironmentFieldDefinition) => void;
409	}) {
410	const inputId = `${props.idPrefix}-environment-${props.field.name}`;
411	const value = props.variable?.valueRedacted ? "" : (props.variable?.value ?? "");
412	const placeholder = props.variable?.valueRedacted
413	? "Stored secret - enter a new value to replace"
414	: props.field.placeholder;
415		353
416	return (	354	return (
417	<label htmlFor={inputId} className="block">	355	<div className="min-w-0 space-y-1.5">
418	<span className="text-xs font-medium text-foreground">{props.field.label}</span>	356	{rows.map((variable, index) => (
419	<div className="mt-1.5 flex min-w-0 items-center gap-2">	357	<div key={variable.id} className="flex min-w-0 items-center gap-1.5">
420	<DraftInput	358	<DraftInput
421	id={inputId}	359	size="compact"
422	className="min-w-0 flex-1"	360	className="w-44 shrink-0 font-mono"
423	type={props.field.sensitive === false ? undefined : "password"}	361	value={variable.name}
424	autoComplete="off"	362	onCommit={(name) => updateVariable(variable.id, { name: name.trim() })}
425	value={value}	363	placeholder="VARIABLE_NAME"
426	onCommit={(next) => props.onCommit(props.field, next)}	364	spellCheck={false}
427	placeholder={placeholder}	365	aria-label={`Environment variable name ${index + 1}`}
428	spellCheck={false}	366	/>
429	/>	367	<span className="text-xs text-muted-foreground" aria-hidden>
430	{props.variable ? (	368	=
		369	</span>
		370	<DraftInput
		371	size="compact"
		372	className="min-w-0 flex-1 font-mono"
		373	value={variable.valueRedacted ? "" : variable.value}
		374	onCommit={(value) => updateVariable(variable.id, { value })}
		375	type={variable.sensitive ? "password" : undefined}
		376	autoComplete="off"
		377	placeholder={
		378	variable.valueRedacted ? "Stored secret, enter a new value to replace" : "value"
		379	}
		380	spellCheck={false}
		381	aria-label={`Environment variable value ${index + 1}`}
		382	/>
		383	<Tooltip>
		384	<TooltipTrigger
		385	render={
		386	<Button
		387	type="button"
		388	size="icon-micro"
		389	variant="ghost-muted"
		390	className={cn(
		391	"[--control-icon-color:currentColor]",
		392	variable.sensitive && "text-foreground",
		393	)}
		394	onClick={() => {
		395	const sensitive = !variable.sensitive;
		396	updateVariable(variable.id, {
		397	sensitive,
		398	...(sensitive && variable.valueRedacted === undefined
		399	? {}
		400	: { valueRedacted: sensitive ? variable.valueRedacted : false }),
		401	});
		402	}}
		403	aria-pressed={variable.sensitive}
		404	aria-label={`Mark environment variable ${variable.name \|\| index + 1} as sensitive`}
		405	>
		406	{variable.sensitive ? (
		407	<LockIcon className="size-3" />
		408	) : (
		409	<LockOpenIcon className="size-3" />
		410	)}
		411	</Button>
		412	}
		413	/>
		414	<TooltipPopup side="top">
		415	{variable.sensitive ? "Sensitive, stored separately" : "Plain text"}
		416	</TooltipPopup>
		417	</Tooltip>
431	<Button	418	<Button
432	type="button"	419	type="button"
433	size="icon-sm"	420	size="icon-micro"
434	variant="ghost"	421	variant="ghost-muted"
435	className="size-8 shrink-0 text-muted-foreground hover:text-destructive"	422	className="[--control-icon-color:currentColor] hover:text-destructive"
436	onClick={() => props.onRemove(props.field)}	423	onClick={() => removeVariable(variable.id)}
437	aria-label={`Clear ${props.field.label}`}	424	aria-label={`Remove environment variable ${variable.name \|\| index + 1}`}
438	>	425	>
439	<XIcon className="size-3.5" />	426	<XIcon className="size-3" />
440	</Button>	427	</Button>
441	) : null}	428	</div>
		429	))}
		430	<div className="flex min-h-[1.875rem] flex-wrap items-center gap-x-3 gap-y-1">
		431	<Button type="button" size="xs" variant="ghost-muted" onClick={addVariable}>
		432	<PlusIcon className="size-3" />
		433	Add variable
		434	</Button>
		435	<span className="text-xs text-muted-foreground">
		436	{rows.length === 0
		437	? "API keys, base URLs, or other per-instance CLI settings."
		438	: "Sensitive values are stored separately and never returned to the app."}
		439	</span>
442	</div>	440	</div>
443	{props.field.description ? (	441	</div>
444	<span className="mt-1 block text-xs text-muted-foreground">{props.field.description}</span>
445	) : null}
446	</label>
447	);	442	);
448	}	443	}
449		444
@@ -458,7 +453,7 @@ interface ProviderInstanceCardProps { · 8 unmodified lines
458	readonly readOnly?: boolean \| undefined;	453	readonly readOnly?: boolean \| undefined;
459	readonly onUpdate: (nextInstance: ProviderInstanceConfig) => void;	454	readonly onUpdate: (nextInstance: ProviderInstanceConfig) => void;
460	/**	455	/**
461	* Pass `undefined` to hide the delete button entirely. Built-in default	456	* Pass `undefined` to hide the delete footer entirely. Built-in default
462	* instance slots use `undefined` — they can't be deleted without losing	457	* instance slots use `undefined` — they can't be deleted without losing
463	* the slot, and their "reset to defaults" affordance lives on an outer	458	* the slot, and their "reset to defaults" affordance lives on an outer
464	* reset button instead. Explicit `\| undefined` in the type accommodates	459	* reset button instead. Explicit `\| undefined` in the type accommodates
@@ -578,12 +573,6 @@ export function ProviderInstanceCard({ · 113 unmodified lines
578	const visibleTab = driverOption === undefined ? "configuration" : activeTab;	573	const visibleTab = driverOption === undefined ? "configuration" : activeTab;
579		574
580	const customModels = readConfigStringArray(instance.config, "customModels");	575	const customModels = readConfigStringArray(instance.config, "customModels");
581	const environmentFields = driverOption?.environmentFields ?? [];
582	const environmentFieldNames = new Set(environmentFields.map((field) => field.name));
583	const genericEnvironment = providerEnvironmentWithoutNames(
584	instance.environment,
585	environmentFieldNames,
586	);
587	// Server-returned models may lag behind settings writes. Treat probe	576	// Server-returned models may lag behind settings writes. Treat probe
588	// models as the source for built-ins only; custom rows come directly	577	// models as the source for built-ins only; custom rows come directly
589	// from the current instance config so add/remove reflects immediately.	578	// from the current instance config so add/remove reflects immediately.
@@ -591,6 +580,9 @@ export function ProviderInstanceCard({ · 1 unmodified line
591	liveModels: liveProvider?.models,	580	liveModels: liveProvider?.models,
592	customModels,	581	customModels,
593	});	582	});
		583	const hiddenModelCount = modelsForDisplay.filter(
		584	(model) => !model.isCustom && hiddenModels.includes(model.slug),
		585	).length;
594		586
595	const updateDisplayName = (value: string) => {	587	const updateDisplayName = (value: string) => {
596	const trimmed = value.trim();	588	const trimmed = value.trim();
@@ -644,7 +636,14 @@ export function ProviderInstanceCard({ · 47 unmodified lines
644	: (rest as ProviderInstanceConfig),	636	: (rest as ProviderInstanceConfig),
645	);	637	);
646	};	638	};
647		639	// Drivers that need a named secret (Cursor's API key) get a dedicated field;
		640	// the generic editor only shows the remaining variables.
		641	const environmentFields = driverOption?.environmentFields ?? [];
		642	const environmentFieldNames = new Set(environmentFields.map((field) => field.name));
		643	const genericEnvironment = providerEnvironmentWithoutNames(
		644	instance.environment,
		645	environmentFieldNames,
		646	);
648	const updateGenericEnvironment = (	647	const updateGenericEnvironment = (
649	environment: ReadonlyArray<ProviderInstanceEnvironmentVariable>,	648	environment: ReadonlyArray<ProviderInstanceEnvironmentVariable>,
650	) => {	649	) => {
@@ -653,11 +652,9 @@ export function ProviderInstanceCard({ · 2 unmodified lines
653	);	652	);
654	updateEnvironment([...dedicatedEnvironment, ...environment]);	653	updateEnvironment([...dedicatedEnvironment, ...environment]);
655	};	654	};
656
657	const updateEnvironmentField = (field: ProviderEnvironmentFieldDefinition, value: string) => {	655	const updateEnvironmentField = (field: ProviderEnvironmentFieldDefinition, value: string) => {
658	updateEnvironment(nextProviderEnvironmentWithFieldValue(instance.environment, field, value));	656	updateEnvironment(nextProviderEnvironmentWithFieldValue(instance.environment, field, value));
659	};	657	};
660
661	const removeEnvironmentField = (field: ProviderEnvironmentFieldDefinition) => {	658	const removeEnvironmentField = (field: ProviderEnvironmentFieldDefinition) => {
662	updateEnvironment(providerEnvironmentWithoutNames(instance.environment, new Set([field.name])));	659	updateEnvironment(providerEnvironmentWithoutNames(instance.environment, new Set([field.name])));
663	};	660	};
@@ -704,35 +701,9 @@ export function ProviderInstanceCard({ · 40 unmodified lines
704	</>	701	</>
705	);	702	);
706		703
707	const titleTailNode = (	704	const titleTailNode = headerAction ? (
708	<>	705	<span className="inline-flex h-5 w-5 shrink-0 items-center justify-center">{headerAction}</span>
709	{headerAction ? (	706	) : null;
710	<span className="inline-flex h-5 w-5 shrink-0 items-center justify-center">
711	{headerAction}
712	</span>
713	) : null}
714	{onDelete ? (
715	<span className="inline-flex h-5 w-5 shrink-0 items-center justify-center">
716	<Tooltip>
717	<TooltipTrigger
718	render={
719	<Button
720	size="icon-micro"
721	variant="ghost"
722	className="text-muted-foreground hover:text-destructive"
723	onClick={onDelete}
724	aria-label={`Delete provider instance ${instanceId}`}
725	>
726	<Trash2Icon className="size-3" />
727	</Button>
728	}
729	/>
730	<TooltipPopup side="top">Delete instance</TooltipPopup>
731	</Tooltip>
732	</span>
733	) : null}
734	</>
735	);
736		707
737	const versionCodeNode = versionLabel ? (	708	const versionCodeNode = versionLabel ? (
738	<code className="text-xs text-muted-foreground">{versionLabel}</code>	709	<code className="text-xs text-muted-foreground">{versionLabel}</code>
@@ -757,7 +728,7 @@ export function ProviderInstanceCard({ · 18 unmodified lines
757	className={cn(	728	className={cn(
758	// Sidebar-style selection with a fixed row height so the list stays	729	// Sidebar-style selection with a fixed row height so the list stays
759	// even; the status line clamps to two lines instead of growing.	730	// even; the status line clamps to two lines instead of growing.
760	"group flex h-19 items-start gap-3 rounded-md px-3 py-2 transition-colors",	731	"group flex min-h-19 items-start gap-3 rounded-md px-3 py-2 transition-colors",
761	// Foreground-alpha tint so the fill reads the same in light and dark themes.	732	// Foreground-alpha tint so the fill reads the same in light and dark themes.
762	selected ? "bg-foreground/8" : "hover:bg-foreground/4",	733	selected ? "bg-foreground/8" : "hover:bg-foreground/4",
763	)}	734	)}
@@ -839,7 +810,7 @@ export function ProviderInstanceCard({ · 75 unmodified lines
839	size="icon-xs"	810	size="icon-xs"
840	variant="ghost"	811	variant="ghost"
841	className={cn(	812	className={cn(
842	"size-5 rounded-sm p-0",	813	"size-5 rounded-sm p-0 [--control-icon-color:currentColor]",
843	versionAdvisory.emphasis === "strong"	814	versionAdvisory.emphasis === "strong"
844	? "text-warning hover:text-warning"	815	? "text-warning hover:text-warning"
845	: "text-muted-foreground hover:text-foreground",	816	: "text-muted-foreground hover:text-foreground",
@@ -947,6 +918,25 @@ export function ProviderInstanceCard({ · 101 unmodified lines
947	</p>	918	</p>
948	) : null}	919	) : null}
949	</div>	920	</div>
		921	{onDelete ? (
		922	<span
		923	inert={readOnly}
		924	aria-disabled={readOnly \|\| undefined}
		925	className={cn("shrink-0", readOnly && "opacity-50")}
		926	>
		927	<Button
		928	type="button"
		929	size="xs"
		930	variant="ghost"
		931	className="[--control-icon-color:currentColor] text-muted-foreground hover:text-destructive"
		932	onClick={onDelete}
		933	aria-label={`Delete instance ${instanceId}`}
		934	>
		935	<Trash2Icon className="size-3" />
		936	Delete instance
		937	</Button>
		938	</span>
		939	) : null}
950	</div>	940	</div>
951		941
952	<div className="flex h-11 shrink-0 border-b border-border/70 px-1">	942	<div className="flex h-11 shrink-0 border-b border-border/70 px-1">
@@ -962,10 +952,14 @@ export function ProviderInstanceCard({ · 9 unmodified lines
962	<button	952	<button
963	type="button"	953	type="button"
964	aria-pressed={visibleTab === "models"}	954	aria-pressed={visibleTab === "models"}
965	className={providerSettingsTabClassName(visibleTab === "models")}	955	className={cn(providerSettingsTabClassName(visibleTab === "models"), "gap-1.5")}
966	onClick={() => setActiveTab("models")}	956	onClick={() => setActiveTab("models")}
967	>	957	>
968	Models	958	Models
		959	<span className="font-normal text-muted-foreground/70">
		960	{modelsForDisplay.length}
		961	{hiddenModelCount > 0 ? ` · ${hiddenModelCount} hidden` : ""}
		962	</span>
969	</button>	963	</button>
970	) : null}	964	) : null}
971	</div>	965	</div>
@@ -980,76 +974,74 @@ export function ProviderInstanceCard({ · 8 unmodified lines
980	<div	974	<div
981	inert={readOnly}	975	inert={readOnly}
982	aria-disabled={readOnly \|\| undefined}	976	aria-disabled={readOnly \|\| undefined}
983	className={cn("space-y-5 px-4 py-5", readOnly && "opacity-50 select-none")}	977	className={cn("px-4 py-4", readOnly && "opacity-50 select-none")}
984	>	978	>
985	<div>	979	<div className={PROVIDER_FIELD_GRID_CLASS_NAME}>
986	<label htmlFor={`provider-instance-${instanceId}-display-name`} className="block">	980	<label
987	<span className="text-xs font-medium text-foreground">Display name</span>	981	htmlFor={`provider-instance-${instanceId}-display-name`}
		982	className="pt-1.5 text-xs font-medium text-foreground"
		983	>
		984	Display name
		985	</label>
		986	<div className="flex min-w-0 flex-wrap items-center gap-3">
988	<DraftInput	987	<DraftInput
989	id={`provider-instance-${instanceId}-display-name`}	988	id={`provider-instance-${instanceId}-display-name`}
990	className="mt-1.5"	989	className="w-44"
991	value={instance.displayName ?? ""}	990	value={instance.displayName ?? ""}
992	onCommit={updateDisplayName}	991	onCommit={updateDisplayName}
993	placeholder={driverOption?.label ?? "Instance label"}	992	placeholder={driverOption?.label ?? "Instance label"}
994	spellCheck={false}	993	spellCheck={false}
995	/>	994	/>
996	<span className="mt-1 block text-xs text-muted-foreground">	995	<ProviderAccentColorPicker
997	Optional label shown in the provider list.	996	layout="inline"
998	</span>	997	displayName={displayName}
999	</label>	998	value={accentColor}
1000	</div>	999	onCommit={updateAccentColor}
1001		1000	commitDelayMs={120}
1002	<div>	1001	/>
1003	<ProviderAccentColorPicker
1004	displayName={displayName}
1005	value={accentColor}
1006	onCommit={updateAccentColor}
1007	commitDelayMs={120}
1008	description="Used to distinguish this instance in picker rails and model lists."
1009	/>
1010	</div>
1011
1012	<div>
1013	{environmentFields.length > 0 ? (
1014	<div className="mb-4 grid gap-3">
1015	{environmentFields.map((field) => (
1016	<ProviderEnvironmentFieldRow
1017	key={field.name}
1018	field={field}
1019	variable={readProviderEnvironmentVariable(instance.environment, field.name)}
1020	idPrefix={`provider-instance-${instanceId}`}
1021	onCommit={updateEnvironmentField}
1022	onRemove={removeEnvironmentField}
1023	/>
1024	))}
1025	</div>
1026	) : null}
1027	<ProviderEnvironmentSection
1028	environment={genericEnvironment}
1029	onChange={updateGenericEnvironment}
1030	/>
1031	</div>
1032
1033	{driverOption ? (
1034	<ProviderSettingsForm
1035	definition={driverOption}
1036	value={instance.config}
1037	idPrefix={`provider-instance-${instanceId}`}
1038	variant="card"
1039	onChange={updateConfig}
1040	/>
1041	) : null}
1042
1043	{driverOption === undefined ? (
1044	<div>
1045	<p className="text-xs text-muted-foreground">
1046	This instance uses a driver (
1047	<code className="text-foreground">{String(instance.driver)}</code>) that is not
1048	shipped with the current build. Configuration values are preserved but cannot be
1049	edited from this surface.
1050	</p>
1051	</div>	1002	</div>
1052	) : null}	1003	<div className={PROVIDER_FIELD_GROUP_LABEL_CLASS_NAME}>Runtime</div>
		1004	{driverOption ? (
		1005	<ProviderSettingsForm
		1006	definition={driverOption}
		1007	value={instance.config}
		1008	idPrefix={`provider-instance-${instanceId}`}
		1009	variant="grid"
		1010	onChange={updateConfig}
		1011	/>
		1012	) : (
		1013	<>
		1014	<span className="pt-1.5 text-xs font-medium text-foreground">Driver</span>
		1015	<p className="text-xs text-muted-foreground">
		1016	This instance uses a driver (
		1017	<code className="text-foreground">{String(instance.driver)}</code>) that is not
		1018	shipped with the current build. Configuration values are preserved but cannot be
		1019	edited from this surface.
		1020	</p>
		1021	</>
		1022	)}
		1023	<div className={PROVIDER_FIELD_GROUP_LABEL_CLASS_NAME}>Environment</div>
		1024	<div className="col-span-full">
		1025	{environmentFields.length > 0 ? (
		1026	<div className="mb-4 grid gap-3">
		1027	{environmentFields.map((field) => (
		1028	<ProviderEnvironmentFieldRow
		1029	key={field.name}
		1030	field={field}
		1031	variable={readProviderEnvironmentVariable(instance.environment, field.name)}
		1032	idPrefix={`provider-instance-${instanceId}`}
		1033	onCommit={updateEnvironmentField}
		1034	onRemove={removeEnvironmentField}
		1035	/>
		1036	))}
		1037	</div>
		1038	) : null}
		1039	<ProviderEnvironmentSection
		1040	environment={genericEnvironment}
		1041	onChange={updateGenericEnvironment}
		1042	/>
		1043	</div>
		1044	</div>
1053	</div>	1045	</div>
1054	</ScrollArea>	1046	</ScrollArea>
1055	{driverOption !== undefined ? (	1047	{driverOption !== undefined ? (

apps/web/src/index.css+3−3

@@ -1821,8 +1821,8 @@ code { · 1820 unmodified lines
1821	}	1821	}
1822		1822
1823	.chat-markdown ul {	1823	.chat-markdown ul {
1824	/* Reset for nested uls under a widened ol — --list-gutter is an inherited	1824	/* Reset for nested uls under a widened ol. --list-gutter is an inherited
1825	custom property, so without this a task-list under a 3+ digit ordered	1825	custom property, so without this a task-list under a multi-digit ordered
1826	list would inherit the outer gutter instead of its own default. */	1826	list would inherit the outer gutter instead of its own default. */
1827	--list-gutter: 1.25rem;	1827	--list-gutter: 1.25rem;
1828	padding-left: 1.25rem;	1828	padding-left: 1.25rem;
@@ -1831,7 +1831,7 @@ code { · 2 unmodified lines
1831		1831
1832	/* --list-gutter defaults to the same 1.25rem as .chat-markdown ul, but	1832	/* --list-gutter defaults to the same 1.25rem as .chat-markdown ul, but
1833	ChatMarkdown's `ol` renderer widens it (via inline style) for lists whose	1833	ChatMarkdown's `ol` renderer widens it (via inline style) for lists whose
1834	widest marker is 3+ characters, so item 100+ isn't clipped by list-style-position:	1834	widest marker has multiple characters so it isn't clipped by list-style-position:
1835	outside painting the marker past the padding box. Reset it here too so a	1835	outside painting the marker past the padding box. Reset it here too so a
1836	nested ol without its own widened marker doesn't inherit the outer one. */	1836	nested ol without its own widened marker doesn't inherit the outer one. */
1837	.chat-markdown ol {	1837	.chat-markdown ol {

packages/contracts/src/settings.ts+8−0

   confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
   confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
   confirmThreadUnpin: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
+  continueThreadsAfterServerUpdate: Schema.Boolean.pipe(
+    Schema.withDecodingDefault(Effect.succeed(false)),
+  ),
   dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe(
     Schema.withDecodingDefault(Effect.succeed([])),
   ),
   // default UI; this beta flag restores it (plus the /plan and /default slash
   // commands) for users who still rely on the old workflow.
   planModeEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
+  // Legacy context window meter. The composer hides it by default; users who
+  // still want the old usage indicator can restore it from Settings.
+  contextWindowMeterEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
   showSkillsInSlashMenu: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
   // Legacy sidebar (the original per-project tree). Deliberately a fresh key
   // (was `sidebarV2Enabled` + `sidebarV2ConfiguredByUser`): decoding drops the
   confirmThreadArchive: Schema.optionalKey(Schema.Boolean),
   confirmThreadDelete: Schema.optionalKey(Schema.Boolean),
   confirmThreadUnpin: Schema.optionalKey(Schema.Boolean),
+  continueThreadsAfterServerUpdate: Schema.optionalKey(Schema.Boolean),
   diffIgnoreWhitespace: Schema.optionalKey(Schema.Boolean),
   environmentIdentificationMode: Schema.optionalKey(EnvironmentIdentificationMode),
   glassOpacity: Schema.optionalKey(GlassOpacity),
     ),
   ),
   planModeEnabled: Schema.optionalKey(Schema.Boolean),
+  contextWindowMeterEnabled: Schema.optionalKey(Schema.Boolean),
   showSkillsInSlashMenu: Schema.optionalKey(Schema.Boolean),
   legacySidebarEnabled: Schema.optionalKey(Schema.Boolean),
   sidebarProjectGroupingMode: Schema.optionalKey(SidebarProjectGroupingMode),

packages/shared/src/model.test.ts+17−0

@@ -3,6 +3,7 @@ import { ProviderDriverKind, ProviderInstanceId, type ModelCapabilities } from " · 2 unmodified lines
3		3
4	import {	4	import {
5	applyClaudePromptEffortPrefix,	5	applyClaudePromptEffortPrefix,
		6	buildExplicitProviderOptionSelectionsFromDescriptors,
6	buildProviderOptionSelectionsFromDescriptors,	7	buildProviderOptionSelectionsFromDescriptors,
7	createModelCapabilities,	8	createModelCapabilities,
8	createModelSelection,	9	createModelSelection,
@@ -127,6 +128,22 @@ describe("descriptor helpers", () => { · 118 unmodified lines
127	]);	128	]);
128	});	129	});
129		130
		131	it("builds dispatch options only from explicit selections", () => {
		132	const descriptors = getProviderOptionDescriptors({
		133	caps: codexCaps,
		134	selections: [{ id: "fastMode", value: true }],
		135	});
		136
		137	expect(buildExplicitProviderOptionSelectionsFromDescriptors(descriptors, undefined)).toBe(
		138	undefined,
		139	);
		140	expect(
		141	buildExplicitProviderOptionSelectionsFromDescriptors(descriptors, [
		142	{ id: "fastMode", value: true },
		143	]),
		144	).toEqual([{ id: "fastMode", value: true }]);
		145	});
		146
130	it("stores option selection arrays in model selections", () => {	147	it("stores option selection arrays in model selections", () => {
131	expect(	148	expect(
132	createModelSelection(ProviderInstanceId.make("codex"), "gpt-5.4", [	149	createModelSelection(ProviderInstanceId.make("codex"), "gpt-5.4", [

pnpm-lock.yaml+4−4

@@ -472,7 +472,7 @@ importers: · 471 unmodified lines
472	dependencies:	472	dependencies:
473	'@anthropic-ai/claude-agent-sdk':	473	'@anthropic-ai/claude-agent-sdk':
474	specifier: ^0.3.205	474	specifier: ^0.3.205
475	version: 0.3.252(@anthropic-ai/sdk@0.93.0(zod@4.4.3))(@modelcontextprotocol/sdk@1.29.0(zod@4.4.3))(zod@4.4.3)	475	version: 0.3.257(@anthropic-ai/sdk@0.93.0(zod@4.4.3))(@modelcontextprotocol/sdk@1.29.0(zod@4.4.3))(zod@4.4.3)
476	'@connectrpc/connect':	476	'@connectrpc/connect':
477	specifier: 1.7.0	477	specifier: 1.7.0
478	version: 1.7.0(@bufbuild/protobuf@1.10.0)	478	version: 1.7.0(@bufbuild/protobuf@1.10.0)
@@ -1012,8 +1012,8 @@ packages: · 533 unmodified lines
1012	'@alchemy.run/node-utils@0.0.5':	1012	'@alchemy.run/node-utils@0.0.5':
1013	resolution: {integrity: sha512-5agdhQxWBodxa5hDRyjnpx91RTU3g+qd5fxYB7uNDCaOzB0XC47UU/KHR6zf6jhz/NXf61gJS+vhYwn8NHeRoQ==}	1013	resolution: {integrity: sha512-5agdhQxWBodxa5hDRyjnpx91RTU3g+qd5fxYB7uNDCaOzB0XC47UU/KHR6zf6jhz/NXf61gJS+vhYwn8NHeRoQ==}
1014		1014
1015	'@anthropic-ai/claude-agent-sdk@0.3.252':	1015	'@anthropic-ai/claude-agent-sdk@0.3.257':
1016	resolution: {integrity: sha512-hCkyZFn3J46aAMNqS6AZbYz91FaLUmX5VvJOzYZqzlVBJN47OxXQugqOzqa6b6GOZRmwiqW2ck8J8TE7bQZswQ==}	1016	resolution: {integrity: sha512-Se55zXv48IYLg/WzoXzpbPLcq86suwDSbRUoNb69l4dkovorqS/47Xuy7MUo/gPNwwcPB4a+aqbXbshU33dcdQ==}
1017	engines: {node: '>=18.0.0'}	1017	engines: {node: '>=18.0.0'}
1018	peerDependencies:	1018	peerDependencies:
1019	'@anthropic-ai/sdk': '>=0.93.0'	1019	'@anthropic-ai/sdk': '>=0.93.0'
@@ -10540,7 +10540,7 @@ snapshots: · 9520 unmodified lines
10540		10540
10541	'@alchemy.run/node-utils@0.0.5': {}	10541	'@alchemy.run/node-utils@0.0.5': {}
10542		10542
10543	'@anthropic-ai/claude-agent-sdk@0.3.252(@anthropic-ai/sdk@0.93.0(zod@4.4.3))(@modelcontextprotocol/sdk@1.29.0(zod@4.4.3))(zod@4.4.3)':	10543	'@anthropic-ai/claude-agent-sdk@0.3.257(@anthropic-ai/sdk@0.93.0(zod@4.4.3))(@modelcontextprotocol/sdk@1.29.0(zod@4.4.3))(zod@4.4.3)':
10544	dependencies:	10544	dependencies:
10545	'@anthropic-ai/sdk': 0.93.0(zod@4.4.3)	10545	'@anthropic-ai/sdk': 0.93.0(zod@4.4.3)
10546	'@modelcontextprotocol/sdk': 1.29.0(zod@4.4.3)	10546	'@modelcontextprotocol/sdk': 1.29.0(zod@4.4.3)