chore: add notification settings and refactor gemini agent

- feat(settings): add configurable notification preferences with UI toggle
- refactor(gemini): inline session logic into index, simplify argv
- refactor(opencode): tidy argv construction and tests

Author: SDSLeon

src/main/sharedSettingsFile.test.ts

@@ -73,6 +73,7 @@ describe("sharedSettingsFile", () => {
       notificationSound: true,
       notificationFilter: "unfocused",
       notificationStatuses: { done: true, needsAttention: true, error: true },
+      notifyL2Cli: true,
       favoriteModels: [],
       recentModels: [],
       agentHookSupport: {},
@@ -126,6 +127,7 @@ describe("sharedSettingsFile", () => {
       notificationSound: true,
       notificationFilter: "unfocused",
       notificationStatuses: { done: true, needsAttention: true, error: true },
+      notifyL2Cli: true,
       favoriteModels: [],
       recentModels: [],
       agentHookSupport: {},

src/renderer/notifications.ts

@@ -202,6 +202,8 @@ export function handleThreadStateNotification(
 
   if (!settings.notificationStatuses[category]) return;
 
+  if (!settings.notifyL2Cli && oldThread.threadStatusSource === "terminal_parse") return;
+
   const projectName = getProjectName(oldThread.projectId);
   const threadId = oldThread.id;
   const threadTitle = oldThread.title;

src/renderer/state/sharedSettingsStore.ts

@@ -59,6 +59,7 @@ interface SharedSettingsState extends SharedSettings {
     needsAttention?: boolean;
     error?: boolean;
   }) => void;
+  setNotifyL2Cli: (value: boolean) => void;
   toggleFavoriteModel: (agentKind: string, modelId: string) => void;
   pushRecentModel: (agentKind: string, modelId: string) => void;
 }
@@ -298,6 +299,11 @@ export const useSharedSettings = create<SharedSettingsState>()((set, get) => ({
     set({ notificationStatuses: next });
     persistSettings(selectSharedSettings(get()));
   },
+  setNotifyL2Cli: (notifyL2Cli) => {
+    if (get().notifyL2Cli === notifyL2Cli) return;
+    set({ notifyL2Cli });
+    persistSettings(selectSharedSettings(get()));
+  },
   toggleFavoriteModel: (agentKind, modelId) => {
     const current = get().favoriteModels;
     const idx = current.findIndex((m) => m.agentKind === agentKind && m.modelId === modelId);
@@ -372,6 +378,7 @@ function selectSharedSettings(state: SharedSettingsState): SharedSettingsInput {
     notificationSound: state.notificationSound,
     notificationFilter: state.notificationFilter,
     notificationStatuses: state.notificationStatuses,
+    notifyL2Cli: state.notifyL2Cli,
     favoriteModels: state.favoriteModels,
     recentModels: state.recentModels,
   };

src/renderer/views/SettingsOverlay/parts/NotificationSettings.tsx

@@ -18,6 +18,8 @@ export function NotificationSettings() {
   const setNotificationFilter = useSharedSettings((s) => s.setNotificationFilter);
   const notificationStatuses = useSharedSettings((s) => s.notificationStatuses);
   const setNotificationStatuses = useSharedSettings((s) => s.setNotificationStatuses);
+  const notifyL2Cli = useSharedSettings((s) => s.notifyL2Cli);
+  const setNotifyL2Cli = useSharedSettings((s) => s.setNotifyL2Cli);
 
   return (
     <div className="h-full min-h-0 overflow-y-auto px-6 pb-8 pt-4">
@@ -147,6 +149,28 @@ export function NotificationSettings() {
                 </div>
               </div>
             </div>
+
+            <div className="flex items-center justify-between gap-4 pt-2">
+              <div className="min-w-0">
+                <p className="text-sm font-medium text-foreground">Notify for L2 CLI threads</p>
+                <p className="text-xs text-muted">
+                  When off, suppress notifications from terminal threads whose status comes from the
+                  OSC fallback (no CLI hook plugin).
+                </p>
+              </div>
+              <Switch
+                isSelected={notifyL2Cli}
+                onChange={(selected) => {
+                  startTransition(() => {
+                    setNotifyL2Cli(selected);
+                  });
+                }}
+              >
+                <Switch.Control>
+                  <Switch.Thumb />
+                </Switch.Control>
+              </Switch>
+            </div>
           </div>
         </div>
       </div>

src/shared/settings.ts

@@ -113,6 +113,13 @@ export const sharedSettingsSchema = z.object({
     needsAttention: z.boolean(),
     error: z.boolean(),
   }),
+  /**
+   * When false, suppress notifications for terminal-presentation threads whose
+   * status is derived from the OSC/heuristic fallback (L2) rather than the CLI
+   * hook plugin (L1). L2 status is less precise, so users can opt out of its
+   * noisier transitions.
+   */
+  notifyL2Cli: z.boolean(),
   /** User-starred (provider, model) entries surfaced at the top of the model picker. */
   favoriteModels: z.array(z.object({ agentKind: z.string().min(1), modelId: z.string().min(1) })),
   /**
@@ -185,6 +192,7 @@ export const defaultSharedSettings: SharedSettings = {
   notificationSound: true,
   notificationFilter: "unfocused",
   notificationStatuses: { done: true, needsAttention: true, error: true },
+  notifyL2Cli: true,
   favoriteModels: [],
   recentModels: [],
   disableCliHookPlugin: false,

src/supervisor/agents/gemini/argv.ts

@@ -4,11 +4,14 @@ export function buildGeminiArgs(
   config: ThreadConfig,
   prompt: string,
   resumeSessionId?: string,
+  assignedSessionId?: string,
 ): string[] {
   const args: string[] = [];
 
   if (resumeSessionId) {
     args.push("--resume", resumeSessionId);
+  } else if (assignedSessionId) {
+    args.push("--session-id", assignedSessionId);
   }
   if (config.model) {
     args.push("--model", config.model);

src/supervisor/agents/gemini/gemini.test.ts

@@ -1,9 +1,13 @@
 import { describe, expect, it } from "vitest";
+import type { ProjectLocation, ThreadConfig } from "@/shared/contracts";
 import { createGeminiAdapter } from ".";
+import { buildGeminiArgs } from "./argv";
 import { geminiIntentFor } from "./plugin/intentMap";
 import { detectGeminiInvalidSessionRef } from "./session";
 import { detectGeminiTerminalStatus } from "./terminal";
 
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
 describe("detectGeminiTerminalStatus", () => {
   it("detects idle from ◇ Ready title bar indicator", () => {
     const text = "0;◇  Ready (my-project)";
@@ -181,6 +185,68 @@ describe("detectGeminiTerminalStatus", () => {
   });
 });
 
+describe("buildGeminiArgs", () => {
+  const config: ThreadConfig = { model: "gemini-2.5-pro" };
+
+  it("emits --session-id when an assignedSessionId is provided", () => {
+    const args = buildGeminiArgs(config, "hello", undefined, "abc-uuid");
+    const sessionIdx = args.indexOf("--session-id");
+    expect(sessionIdx).toBeGreaterThanOrEqual(0);
+    expect(args[sessionIdx + 1]).toBe("abc-uuid");
+    expect(args).not.toContain("--resume");
+  });
+
+  it("prefers --resume over --session-id when both are provided", () => {
+    const args = buildGeminiArgs(config, "hello", "resume-uuid", "assigned-uuid");
+    expect(args).toContain("--resume");
+    expect(args).toContain("resume-uuid");
+    expect(args).not.toContain("--session-id");
+    expect(args).not.toContain("assigned-uuid");
+  });
+
+  it("omits both flags when neither is provided", () => {
+    const args = buildGeminiArgs(config, "hello");
+    expect(args).not.toContain("--resume");
+    expect(args).not.toContain("--session-id");
+  });
+});
+
+describe("createGeminiAdapter buildLaunchArgv", () => {
+  const project: ProjectLocation = {
+    kind: "windows",
+    path: "C:\\demo",
+  };
+  const config: ThreadConfig = { model: "gemini-2.5-pro" };
+
+  it("assigns a stable session UUID at launch and returns it as sessionRef", () => {
+    const adapter = createGeminiAdapter();
+    const argv = adapter.buildLaunchArgv(project, config, "hi");
+
+    if (argv === undefined) throw new Error("expected argv");
+    expect(argv.binary).toBe("gemini");
+
+    const sessionIdx = argv.args.indexOf("--session-id");
+    expect(sessionIdx).toBeGreaterThanOrEqual(0);
+    const uuid = argv.args[sessionIdx + 1]!;
+    expect(uuid).toMatch(UUID_RE);
+
+    expect(argv.sessionRef?.providerSessionId).toBe(uuid);
+  });
+
+  it("uses --resume (not --session-id) on resume", () => {
+    const adapter = createGeminiAdapter();
+    const argv = adapter.buildResumeArgv(project, config, "hi", {
+      providerSessionId: "11111111-1111-4111-8111-111111111111",
+      discoveredAt: "2026-05-15T00:00:00.000Z",
+    });
+
+    if (argv === undefined) throw new Error("expected argv");
+    expect(argv.args).toContain("--resume");
+    expect(argv.args).toContain("11111111-1111-4111-8111-111111111111");
+    expect(argv.args).not.toContain("--session-id");
+  });
+});
+
 describe("detectGeminiInvalidSessionRef", () => {
   it("detects Gemini invalid resume session errors", () => {
     expect(

src/supervisor/agents/gemini/index.ts

@@ -1,10 +1,11 @@
+import { randomUUID } from "node:crypto";
+
 import type { AgentCapability, PromptSegment } from "@/shared/contracts";
 import { EXTRACTION_PROMPT } from "@/supervisor/contextExtractor";
 import { createAcpStructuredSession } from "../acp";
 import {
   buildAgentCommand,
   createKnownSessionRef,
-  createRecursiveDirWatcher,
   detectAgentInstall,
   type AgentAdapter,
   type CreateStructuredSessionInput,
@@ -20,11 +21,7 @@ import {
   isGeminiPluginInstalled,
   readBundledGeminiPluginVersion,
 } from "./plugin/install";
-import {
-  detectGeminiInvalidSessionRef,
-  queryLatestSessionId,
-  resolveGeminiWatchPath,
-} from "./session";
+import { detectGeminiInvalidSessionRef } from "./session";
 import { detectGeminiTerminalStatus } from "./terminal";
 
 export { detectGeminiInvalidSessionRef } from "./session";
@@ -38,8 +35,6 @@ function geminiHookActiveTerminalFallback(hint: TerminalStatusHint): boolean {
 }
 
 export function createGeminiAdapter(): AgentAdapter {
-  /** Latest session ID seen before the TUI spawned — used to detect the new one. */
-  let preSpawnLatestId: string | undefined;
   let capabilities: AgentCapability = defaultGeminiCapabilities;
 
   return {
@@ -90,13 +85,18 @@ export function createGeminiAdapter(): AgentAdapter {
       return status;
     },
 
-    buildLaunchArgv(location, config, prompt) {
-      // Snapshot the latest session ID before TUI spawn so we can detect the new one
-      void queryLatestSessionId(location).then((id) => {
-        preSpawnLatestId = id;
-      });
-      const args = buildGeminiArgs(config, prompt);
-      return { binary: "gemini", args };
+    buildLaunchArgv(_location, config, prompt) {
+      // Pre-assign the session UUID via --session-id so we know it before
+      // spawn. Avoids racing post-spawn discovery against one-shot `gemini -p`
+      // calls (title gen, commit-msg, PR summary) that also create entries in
+      // --list-sessions and would otherwise be picked as "the new session".
+      const assignedId = randomUUID();
+      const args = buildGeminiArgs(config, prompt, undefined, assignedId);
+      return {
+        binary: "gemini",
+        args,
+        sessionRef: createKnownSessionRef(assignedId),
+      };
     },
 
     buildResumeArgv(_location, config, prompt, sessionRef) {
@@ -141,21 +141,6 @@ export function createGeminiAdapter(): AgentAdapter {
 
     defaultOneShotModel: "gemini-2.5-flash",
 
-    async discoverSessionRef(location) {
-      try {
-        const latestId = await queryLatestSessionId(location);
-        if (!latestId || latestId === preSpawnLatestId) return undefined;
-        return createKnownSessionRef(latestId);
-      } catch {
-        return undefined;
-      }
-    },
-    watchSessionRef(location, onChanged) {
-      const watchPath = resolveGeminiWatchPath(location);
-      if (!watchPath) return undefined;
-      return createRecursiveDirWatcher(watchPath, onChanged, `gemini:${location.kind}`);
-    },
-
     buildOneShotCommand(model, _effort, prompt) {
       if (!prompt) return undefined;
       return { command: "gemini", args: ["-p", prompt, "--model", model], stdin: "" };

src/supervisor/agents/gemini/session.ts

@@ -1,46 +1,5 @@
-import type { ProjectLocation } from "@/shared/contracts";
-import { getProjectName } from "@/shared/wsl";
-import {
-  readAgentCommandOutput,
-  resolveAgentHomeSubpath,
-  resolveExecutablePathAsync,
-} from "../base";
-import { resolveAgentBinaryPath } from "../binaryResolver";
-
-const SESSION_UUID_RE = /\[([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\]/;
 const INVALID_SESSION_RE = /Error resuming session:\s+Invalid session identifier/i;
 
-function parseAllSessionIds(output: string): string[] {
-  const ids: string[] = [];
-  for (const line of output.split(/\r?\n/)) {
-    const match = SESSION_UUID_RE.exec(line);
-    if (match?.[1]) ids.push(match[1]);
-  }
-  return ids;
-}
-
 export function detectGeminiInvalidSessionRef(output: string): boolean {
   return INVALID_SESSION_RE.test(output);
 }
-
-export async function queryLatestSessionId(location: ProjectLocation): Promise<string | undefined> {
-  const executablePath =
-    location.kind === "wsl"
-      ? (resolveAgentBinaryPath(location, "gemini") ?? "gemini")
-      : await resolveExecutablePathAsync("gemini");
-  if (!executablePath) return undefined;
-  const result = await readAgentCommandOutput(location, executablePath, ["--list-sessions"]);
-  if (!result.ok) {
-    if (location.kind === "wsl") {
-      console.log("[gemini] --list-sessions (wsl) failed: %s", result.stderr);
-    }
-    return undefined;
-  }
-  if (!result.stdout) return undefined;
-  const ids = parseAllSessionIds(result.stdout);
-  return ids[ids.length - 1];
-}
-
-export function resolveGeminiWatchPath(location: ProjectLocation): string | undefined {
-  return resolveAgentHomeSubpath(location, `.gemini/tmp/${getProjectName(location)}`);
-}

src/supervisor/agents/opencode/argv.ts

@@ -20,12 +20,11 @@ export function buildOpenCodeArgs(
   if (config.model) {
     args.push("--model", config.model);
   }
-  // OpenCode's `--variant` flag matches its SDK `variant` field — used to
-  // pick provider-specific reasoning effort (high, max, minimal, …) for
-  // models that publish a `variants` map in `opencode models --verbose`.
-  if (config.effort && config.effort.length > 0) {
-    args.push("--variant", config.effort);
-  }
+  // NOTE: `config.effort` (variant) is intentionally NOT forwarded here.
+  // The opencode CLI (verified against 1.14.30) does not accept `--variant`;
+  // passing it makes yargs abort with the help screen instead of starting the
+  // TUI. The SDK `session.promptAsync({ variant })` path still applies it for
+  // GUI threads; TUI launches fall back to the model default at session start.
   // Plan mode in the TUI is just the built-in `plan` agent (`opencode agent
   // list`). The default command accepts `--agent <name>` to pick it at
   // launch; the SDK runtime uses the same value via `prompt_async`.