feat(claude): add Claude profile support (#155)

- add Claude profile management in settings and show profile entries in the sidebar, menus, and usage views
- persist profile instance config and update shared settings cleanup when profiles are added or removed
- scope Claude launches, auth, context extraction, and usage collection to each profile's config dir

Author: SDSLeon

src/main/ipc/localHandlers.ts

@@ -140,10 +140,23 @@ export function createLocalIpcHandlers(
       // Preserve supervisor-managed fields so the renderer's persist cycle
       // doesn't clobber writes made out-of-band by the supervisor.
       const onDisk = readSharedSettingsFile(settingsPath);
+      const rendererManagedInstances = Object.fromEntries(
+        Object.entries(settings.agentInstances).filter(
+          ([, instance]) => instance.driver !== "acp-generic",
+        ),
+      );
+      const supervisorManagedInstances = Object.fromEntries(
+        Object.entries(onDisk.agentInstances).filter(
+          ([, instance]) => instance.driver === "acp-generic",
+        ),
+      );
       writeSharedSettingsFile(settingsPath, {
         ...settings,
         acpRegistryInstalledAgents: onDisk.acpRegistryInstalledAgents,
-        agentInstances: onDisk.agentInstances,
+        agentInstances: {
+          ...rendererManagedInstances,
+          ...supervisorManagedInstances,
+        },
         agentHookSupport: onDisk.agentHookSupport,
       });
       options.updatePowerSaveBlocker();

src/renderer/components/common/ProviderModelMenu/ProviderModelMenu.test.tsx

@@ -389,6 +389,30 @@ describe("ProviderModelMenu", () => {
     });
   });
 
+  it("shows Claude profile models under the profile subprovider row", async () => {
+    const provider = makeNamedProvider("claude:work", "Claude Work", 2);
+    provider.capabilities.subProviders = [{ id: "claude-profile", label: "Work" }];
+    provider.capabilities.modelSubProvider = {
+      "model-1": "claude-profile",
+      "model-2": "claude-profile",
+    };
+
+    render(
+      <ProviderModelMenu
+        providers={[provider]}
+        currentAgentKind="claude:work"
+        currentModel="model-1"
+        onChange={vi.fn<(next: { agentKind: string; model: string }) => void>()}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "Select model" }));
+    const listbox = await screen.findByRole("listbox", { name: "Models" });
+
+    expect(within(listbox).getByText("Work")).toBeInTheDocument();
+    expect(within(listbox).getByText("Model 2")).toBeInTheDocument();
+  });
+
   it("resets the window when a long list shrinks so rows do not render blank", async () => {
     const { rerender } = render(
       <ProviderModelMenu

src/renderer/components/common/ProviderModelMenu/parts/buildItems.ts

@@ -1,4 +1,9 @@
-import type { AgentCapability, AgentStatus, ThreadPresentationMode } from "@/shared/contracts";
+import {
+  baseAgentKind,
+  type AgentCapability,
+  type AgentStatus,
+  type ThreadPresentationMode,
+} from "@/shared/contracts";
 import { deriveSubProvider, listSubProviderOrder } from "./deriveSubProvider";
 import {
   formatShortcutFallbackLabel,
@@ -86,7 +91,7 @@ function makeProviderSortKey(userOrder: readonly string[] | undefined): (kind: s
   const trimmed = userOrder?.filter((k) => k.length > 0) ?? [];
   if (trimmed.length === 0) {
     return (kind) => {
-      const idx = PROVIDER_ORDER.indexOf(kind);
+      const idx = PROVIDER_ORDER.indexOf(baseAgentKind(kind));
       return idx < 0 ? PROVIDER_ORDER.length : idx;
     };
   }
@@ -98,7 +103,7 @@ function makeProviderSortKey(userOrder: readonly string[] | undefined): (kind: s
   return (kind) => {
     const fromUser = userIndex.get(kind);
     if (fromUser !== undefined) return fromUser;
-    const fromDefault = PROVIDER_ORDER.indexOf(kind);
+    const fromDefault = PROVIDER_ORDER.indexOf(baseAgentKind(kind));
     return userTailBase + (fromDefault < 0 ? PROVIDER_ORDER.length : fromDefault);
   };
 }

src/renderer/components/composer/browserMcpScope.ts

@@ -1,4 +1,4 @@
-import type { ThreadPresentationMode } from "@/shared/contracts";
+import { baseAgentKind, type ThreadPresentationMode } from "@/shared/contracts";
 
 /**
  * How a given (agentKind, presentationMode) pair gates Browser MCP per-thread.
@@ -20,12 +20,13 @@ export function getBrowserMcpScope(
   agentKind: string,
   presentationMode: ThreadPresentationMode,
 ): BrowserMcpScope {
+  const baseKind = baseAgentKind(agentKind);
   if (presentationMode === "gui") {
-    if (agentKind === "claude") return "always";
-    if (agentKind === "opencode" || agentKind === "antigravity" || agentKind === "commandcode")
+    if (baseKind === "claude") return "always";
+    if (baseKind === "opencode" || baseKind === "antigravity" || baseKind === "commandcode")
       return "none";
     return "launch";
   }
-  if (agentKind === "codex") return "launch";
+  if (baseKind === "codex") return "launch";
   return "none";
 }

src/renderer/components/providers/ProviderIcon.test.tsx

@@ -0,0 +1,13 @@
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import { ProviderIcon } from "./ProviderIcon";
+import "./claude";
+
+describe("ProviderIcon", () => {
+  it("uses the Claude profile label for the profile badge initial", () => {
+    render(<ProviderIcon kind="claude:home" fallbackLabel="Claude Home" />);
+
+    expect(screen.getByText("H")).toBeInTheDocument();
+    expect(screen.queryByText("C")).not.toBeInTheDocument();
+  });
+});

src/renderer/components/providers/ProviderIcon.tsx

@@ -1,4 +1,5 @@
 import type { CSSProperties, ReactNode } from "react";
+import { baseAgentKind } from "@/shared/contracts";
 import type { StatusTone } from "./statusTone";
 import {
   getUtilityTaskCandidates,
@@ -74,6 +75,22 @@ function fallbackInitial(label: string | undefined): string {
   return (raw.match(/[A-Za-z0-9]/)?.[0] ?? "?").toUpperCase();
 }
 
+function claudeProfileBadgeLabel(kind: string, fallbackLabel: string | undefined): string {
+  const profileId = kind.slice("claude:".length);
+  const label = fallbackLabel?.trim();
+  if (!label) return profileId;
+  const profileLabel = label.replace(/^claude\s+/i, "").trim();
+  return profileLabel || profileId;
+}
+
+/** Registry lookup that falls back to the base kind for instance-scoped kinds. */
+function lookupByKind<T>(registry: Map<string, T>, kind: string): T | undefined {
+  const exact = registry.get(kind);
+  if (exact !== undefined) return exact;
+  const baseKind = baseAgentKind(kind);
+  return baseKind !== kind ? registry.get(baseKind) : undefined;
+}
+
 function GenericProviderIcon(props: { label?: string; tone: StatusTone; className?: string }) {
   return (
     <span
@@ -103,7 +120,7 @@ export function ProviderIcon(props: {
    */
   pending?: boolean | undefined;
 }) {
-  const Icon = ICON_REGISTRY.get(props.kind);
+  const Icon = lookupByKind(ICON_REGISTRY, props.kind);
   const tone = props.tone ?? "inactive";
   if (!Icon) {
     if (props.icon) {
@@ -126,7 +143,20 @@ export function ProviderIcon(props: {
       />
     );
   }
-  return <Icon tone={tone} {...(props.className ? { className: props.className } : {})} />;
+  const rendered = (
+    <Icon tone={tone} {...(props.className ? { className: props.className } : {})} />
+  );
+  if (props.kind.startsWith("claude:")) {
+    return (
+      <span className={`relative inline-flex ${props.className ?? ""}`}>
+        {rendered}
+        <span className="absolute -bottom-0.5 -right-0.5 flex size-2.5 items-center justify-center rounded-full border border-background bg-surface text-[6px] font-semibold leading-none text-foreground">
+          {fallbackInitial(claudeProfileBadgeLabel(props.kind, props.fallbackLabel))}
+        </span>
+      </span>
+    );
+  }
+  return rendered;
 }
 
 // --- Provider label registry ---
@@ -202,12 +232,7 @@ export function registerComposerControls(kind: string, registration: ComposerCon
 }
 
 export function getComposerControls(kind: string): ComposerControlsFactory | undefined {
-  const separatorIndex = kind.indexOf(":");
-  const registration =
-    COMPOSER_CONTROLS_REGISTRY.get(kind) ??
-    (separatorIndex > 0
-      ? COMPOSER_CONTROLS_REGISTRY.get(kind.slice(0, separatorIndex))
-      : undefined);
+  const registration = lookupByKind(COMPOSER_CONTROLS_REGISTRY, kind);
   if (!registration) return undefined;
   if (typeof registration === "function") return registration;
   return (input) => {
@@ -252,7 +277,7 @@ export function registerGuiSlashCommands(kind: string, registration: GuiSlashCom
 }
 
 export function getGuiSlashCommands(kind: string): GuiSlashCommandRegistration | undefined {
-  return GUI_SLASH_COMMAND_REGISTRY.get(kind);
+  return lookupByKind(GUI_SLASH_COMMAND_REGISTRY, kind);
 }
 
 // --- Config normalizer registry ---
@@ -276,7 +301,7 @@ export function registerConfigNormalizer(kind: string, normalizer: ConfigNormali
 }
 
 export function getConfigNormalizer(kind: string): ConfigNormalizer | undefined {
-  return CONFIG_NORMALIZER_REGISTRY.get(kind);
+  return lookupByKind(CONFIG_NORMALIZER_REGISTRY, kind);
 }
 
 // --- Trigger word registry ---
@@ -303,10 +328,7 @@ export function getTriggerWords(
   model: string | undefined,
 ): readonly TriggerWordDef[] {
   if (!kind) return [];
-  const separatorIndex = kind.indexOf(":");
-  const matcher =
-    TRIGGER_WORD_REGISTRY.get(kind) ??
-    (separatorIndex > 0 ? TRIGGER_WORD_REGISTRY.get(kind.slice(0, separatorIndex)) : undefined);
+  const matcher = lookupByKind(TRIGGER_WORD_REGISTRY, kind);
   return matcher ? matcher(model) : [];
 }
 
@@ -321,7 +343,7 @@ export function registerCommitGenDefaults(kind: string, defaults: CommitGenDefau
 }
 
 export function getCommitGenDefaults(kind: string): CommitGenDefaults | undefined {
-  return COMMIT_GEN_REGISTRY.get(kind);
+  return lookupByKind(COMMIT_GEN_REGISTRY, kind);
 }
 
 export function getCommitGenDefaultsHint(): string | undefined {
@@ -339,7 +361,7 @@ export function registerTitleGenDefaults(kind: string, defaults: TitleGenDefault
 }
 
 export function getTitleGenDefaults(kind: string): TitleGenDefaults | undefined {
-  return TITLE_GEN_REGISTRY.get(kind);
+  return lookupByKind(TITLE_GEN_REGISTRY, kind);
 }
 
 export function getTitleGenDefaultsHint(): string | undefined {
@@ -357,7 +379,7 @@ export function registerConflictResolverDefaults(kind: string, defaults: Conflic
 }
 
 export function getConflictResolverDefaults(kind: string): ConflictResolverDefaults | undefined {
-  return CONFLICT_RESOLVER_REGISTRY.get(kind);
+  return lookupByKind(CONFLICT_RESOLVER_REGISTRY, kind);
 }
 
 export function getConflictResolverDefaultsHint(): string | undefined {

src/renderer/components/providers/ProviderUsageRail.tsx

@@ -140,6 +140,7 @@ export function ProviderUsageRail(props: { orientation?: "row" | "column" }) {
   const showInSidebar = useSharedSettings((s) => s.usage.showInSidebar);
   const disabledProviders = useSharedSettings((s) => s.usage.disabledProviders);
   const providerOrder = useSharedSettings((s) => s.usage.providerOrder);
+  const agentInstances = useSharedSettings((s) => s.agentInstances);
   const setUsageSetting = useSharedSettings((s) => s.setUsageSetting);
 
   useEffect(() => {
@@ -166,7 +167,7 @@ export function ProviderUsageRail(props: { orientation?: "row" | "column" }) {
     KeyboardSensor,
   ];
 
-  const providers = resolveDisplayedProviders(providerOrder, disabledProviders);
+  const providers = resolveDisplayedProviders(providerOrder, disabledProviders, agentInstances);
 
   if (!showInSidebar || providers.length === 0) return null;
 

src/renderer/components/providers/claude/index.test.tsx

@@ -68,4 +68,15 @@ describe("Claude composer controls", () => {
       "bypassPermissions",
     );
   });
+
+  it("uses the Claude composer controls for profile-backed Claude providers", () => {
+    const controls = getComposerControls("claude:work")?.({
+      capabilities,
+      config: { model: "claude-fable-5" },
+      isDisabled: false,
+      onConfigChange: () => undefined,
+    });
+
+    expect(controls?.some(isPermissionControl)).toBe(true);
+  });
 });

src/renderer/components/providers/usageProviders.test.ts

@@ -0,0 +1,63 @@
+import { describe, expect, it } from "vitest";
+import type { UsageWindow } from "@lightcode/agents-usage";
+import type { AgentInstanceConfigMap } from "@/shared/contracts";
+import {
+  pickUsageRings,
+  resolveDisplayedProviders,
+  usageProvidersForAgentInstances,
+} from "./usageProviders";
+
+const agentInstances: AgentInstanceConfigMap = {
+  work: {
+    id: "work",
+    driver: "claude",
+    displayName: "Work",
+    config: { configDir: "~/.lightcode/claude-profiles/work" },
+  },
+  home: {
+    id: "home",
+    driver: "claude",
+    displayName: "Home",
+    config: { configDir: "~/.lightcode/claude-profiles/home" },
+  },
+  disabled: {
+    id: "disabled",
+    driver: "claude",
+    displayName: "Disabled",
+    enabled: false,
+    config: { configDir: "~/.lightcode/claude-profiles/disabled" },
+  },
+};
+
+describe("usageProviders", () => {
+  it("adds Claude profile providers after the base Claude provider", () => {
+    const providers = usageProvidersForAgentInstances(agentInstances);
+    const claudeIndex = providers.findIndex((provider) => provider.id === "claude");
+
+    expect(providers.slice(claudeIndex, claudeIndex + 3).map((provider) => provider.id)).toEqual([
+      "claude",
+      "claude:home",
+      "claude:work",
+    ]);
+    expect(providers.find((provider) => provider.id === "claude:home")?.label).toBe("Claude Home");
+  });
+
+  it("orders, disables, and rings Claude profiles like Claude", () => {
+    const providers = resolveDisplayedProviders(
+      ["claude:work", "claude"],
+      ["claude:home"],
+      agentInstances,
+    );
+    expect(providers.slice(0, 2).map((provider) => provider.id)).toEqual(["claude:work", "claude"]);
+    expect(providers.some((provider) => provider.id === "claude:home")).toBe(false);
+
+    const windows: UsageWindow[] = [
+      { id: "weekly", label: "Weekly", usedPercent: 20, unit: "percent" },
+      { id: "session-5h", label: "Session", usedPercent: 60, unit: "percent" },
+    ];
+    expect(pickUsageRings("claude:work", windows)).toEqual({
+      outer: windows[1],
+      inner: windows[0],
+    });
+  });
+});