Review fixes

Author: charlesvien

apps/code/src/main/services/agent/schemas.ts

@@ -2,8 +2,12 @@ import type {
   RequestPermissionRequest,
   PermissionOption as SdkPermissionOption,
 } from "@agentclientprotocol/sdk";
+import { effortLevelSchema } from "@shared/types.js";
 import { z } from "zod";
 
+export { effortLevelSchema };
+export type { EffortLevel } from "@shared/types.js";
+
 // Session credentials schema
 export const credentialsSchema = z.object({
   apiKey: z.string(),
@@ -46,7 +50,7 @@ export const startSessionInput = z.object({
   adapter: z.enum(["claude", "codex"]).optional(),
   additionalDirectories: z.array(z.string()).optional(),
   customInstructions: z.string().max(2000).optional(),
-  effort: z.enum(["low", "medium", "high", "max"]).optional(),
+  effort: effortLevelSchema.optional(),
 });
 
 export type StartSessionInput = z.infer<typeof startSessionInput>;
@@ -163,6 +167,7 @@ export const reconnectSessionInput = z.object({
   additionalDirectories: z.array(z.string()).optional(),
   permissionMode: z.string().optional(),
   customInstructions: z.string().max(2000).optional(),
+  effort: effortLevelSchema.optional(),
 });
 
 export type ReconnectSessionInput = z.infer<typeof reconnectSessionInput>;

apps/code/src/main/services/agent/service.ts

@@ -38,6 +38,7 @@ import {
   AgentServiceEvent,
   type AgentServiceEvents,
   type Credentials,
+  type EffortLevel,
   type InterruptReason,
   type PromptOutput,
   type ReconnectSessionInput,
@@ -201,7 +202,7 @@ interface SessionConfig {
   /** Custom instructions injected into the system prompt */
   customInstructions?: string;
   /** Effort level for Claude sessions */
-  effort?: "low" | "medium" | "high" | "max";
+  effort?: EffortLevel;
 }
 
 interface ManagedSession {

apps/code/src/renderer/features/message-editor/components/EditorToolbar.tsx

@@ -44,7 +44,7 @@ export function EditorToolbar({
   };
 
   return (
-    <Flex align="center" gap="3">
+    <Flex align="center" gap="1">
       <input
         ref={fileInputRef}
         type="file"

apps/code/src/renderer/features/sessions/service/service.ts

@@ -30,10 +30,12 @@ import { getIsOnline } from "@renderer/stores/connectivityStore";
 import { trpcClient } from "@renderer/trpc/client";
 import { toast } from "@renderer/utils/toast";
 import { getCloudUrlFromRegion } from "@shared/constants/oauth";
-import type {
-  CloudTaskUpdatePayload,
-  ExecutionMode,
-  Task,
+import {
+  type CloudTaskUpdatePayload,
+  type EffortLevel,
+  type ExecutionMode,
+  effortLevelSchema,
+  type Task,
 } from "@shared/types";
 import { ANALYTICS_EVENTS } from "@shared/types/analytics";
 import type { AcpMessage, StoredLogEntry } from "@shared/types/session-events";
@@ -537,7 +539,9 @@ export class SessionService {
       permissionMode: executionMode,
       adapter,
       customInstructions: startCustomInstructions || undefined,
-      effort: reasoningLevel as "low" | "medium" | "high" | "max" | undefined,
+      effort: effortLevelSchema.safeParse(reasoningLevel).success
+        ? (reasoningLevel as EffortLevel)
+        : undefined,
     });
 
     const session = this.createBaseSession(taskRun.id, taskId, taskTitle);

apps/code/src/shared/types.ts

@@ -10,6 +10,10 @@ export const executionModeSchema = z.enum([
 ]);
 export type ExecutionMode = z.infer<typeof executionModeSchema>;
 
+// Effort level schema and type - shared between main and renderer
+export const effortLevelSchema = z.enum(["low", "medium", "high", "max"]);
+export type EffortLevel = z.infer<typeof effortLevelSchema>;
+
 interface UserBasic {
   id: number;
   uuid: string;

packages/agent/src/adapters/claude/claude-agent.ts

@@ -73,6 +73,7 @@ import {
 } from "./tools.js";
 import type {
   BackgroundTerminal,
+  EffortLevel,
   NewSessionMeta,
   Session,
   ToolUseCache,
@@ -559,7 +560,9 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
       await this.session.query.setModel(sdkModelId);
       this.session.modelId = params.value;
     } else if (params.configId === "effort") {
-      this.session.effort = params.value as "low" | "medium" | "high" | "max";
+      const newEffort = params.value as EffortLevel;
+      this.session.effort = newEffort;
+      this.session.queryOptions.effort = newEffort;
     }
 
     this.session.configOptions = this.session.configOptions.map((o) =>
@@ -625,12 +628,7 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
 
     const meta = params._meta as NewSessionMeta | undefined;
     const taskId = meta?.persistence?.taskId;
-    const effort = meta?.claudeCode?.options?.effort as
-      | "low"
-      | "medium"
-      | "high"
-      | "max"
-      | undefined;
+    const effort = meta?.claudeCode?.options?.effort as EffortLevel | undefined;
 
     // We want to create a new session id unless it is resume,
     // but not resume + forkSession.
@@ -691,6 +689,7 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
 
     const session: Session = {
       query: q,
+      queryOptions: options,
       input,
       cancelled: false,
       settingsManager,
@@ -858,7 +857,7 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
       currentModelId: string;
       options: SessionConfigSelectOption[];
     },
-    currentEffort: "low" | "medium" | "high" | "max" = "high",
+    currentEffort: EffortLevel = "high",
   ): SessionConfigOption[] {
     const modeOptions = getAvailableModes().map((mode) => ({
       value: mode.id,

packages/agent/src/adapters/claude/session/options.ts

@@ -17,6 +17,7 @@ import {
   type OnModeChange,
 } from "../hooks.js";
 import type { CodeExecutionMode } from "../tools.js";
+import type { EffortLevel } from "../types.js";
 import { DEFAULT_MODEL } from "./models.js";
 import type { SettingsManager } from "./settings.js";
 
@@ -43,7 +44,7 @@ export interface BuildOptionsParams {
   onModeChange?: OnModeChange;
   onProcessSpawned?: (info: ProcessSpawnedInfo) => void;
   onProcessExited?: (pid: number) => void;
-  effort?: "low" | "medium" | "high" | "max";
+  effort?: EffortLevel;
 }
 
 const BRANCH_NAMING_INSTRUCTIONS = `

packages/agent/src/adapters/claude/types.ts

@@ -13,6 +13,8 @@ import type { BaseSession } from "../base-acp-agent.js";
 import type { SettingsManager } from "./session/settings.js";
 import type { CodeExecutionMode } from "./tools.js";
 
+export type EffortLevel = "low" | "medium" | "high" | "max";
+
 export type AccumulatedUsage = {
   inputTokens: number;
   outputTokens: number;
@@ -38,6 +40,8 @@ export type PendingMessage = {
 
 export type Session = BaseSession & {
   query: Query;
+  /** The Options object passed to query() — mutating it affects subsequent prompts */
+  queryOptions: Options;
   input: Pushable<SDKUserMessage>;
   settingsManager: SettingsManager;
   permissionMode: CodeExecutionMode;
@@ -46,7 +50,7 @@ export type Session = BaseSession & {
   taskRunId?: string;
   lastPlanFilePath?: string;
   lastPlanContent?: string;
-  effort?: "low" | "medium" | "high" | "max";
+  effort?: EffortLevel;
   configOptions: SessionConfigOption[];
   accumulatedUsage: AccumulatedUsage;
   promptRunning: boolean;